Skip to contentSkip to conversation

aircrack-ng: bump to version 1.3

PATCH New Laurent Cans 3 participants 3 messages Jul 17, 2018 – Jul 18, 2018

lore
Share & tools
lore

Laurent Cans

author
#0 lore raw

PATCH 1/1 aircrack-ng: bump to version 1.3

- Remove patches (already in version)
- Add optional dependency to jemalloc

Signed-off-by Laurent Cans <[email protected]>
---
 .../0001-Fix-compilation-without-getauxval.patch   | 81 ----------------------
 ...g-without-opt-should-skip-stack-protector.patch | 52 --------------
 ...003-Autoconf-Added-NEON-intrinsic-support.patch | 64 -----------------
 ...compilation-with-gcrypt-on-some-platforms.patch | 53 --------------
 package/aircrack-ng/aircrack-ng.hash               |  4 +-
 package/aircrack-ng/aircrack-ng.mk                 |  9 ++-
 6 files changed, 10 insertions(+), 253 deletions(-)
 delete mode 100644 package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch
 delete mode 100644 package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch
 delete mode 100644 package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch
 delete mode 100644 package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch
package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch deleted +0 -81
deleted file mode 100644
index 8a291356ca..0000000000
@@ -1,81 +0,0 @@
-From 0017bae95dbcf336495e36ac83c868ca1d7f2846 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sat, 26 May 2018 22:52:30 +0200
-Subject: [PATCH] Fix compilation without getauxval
-
-Protect getauxval call and sys/auxv.h include by #ifdef HAS_AUXV in
-trampoline_arm.c and trampoline_ppc.c.
-Indeed, auxv is not available on some toolchains such as uclibc
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: merged (https://github.com/aircrack-ng/aircrack-ng/pull/1896)]
----
- src/trampoline_arm.c | 4 ++++
- src/trampoline_ppc.c | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/src/trampoline_arm.c b/src/trampoline_arm.c
-index 45db82db..e653109a 100644
---- a/src/trampoline_arm.c
-+++ b/src/trampoline_arm.c
-@@ -17,8 +17,10 @@
-  */
- 
- #if defined(__arm__) || defined(__aarch64__)
-+#ifdef HAS_AUXV
- #include <sys/auxv.h>
- #include <asm/hwcap.h>
-+#endif
- #else
- #error "The wrong CPU architecture file has been included."
- #endif
-@@ -39,6 +41,7 @@ int
- simd_get_supported_features (void)
- {
-   int result = 0;
-+#ifdef HAS_AUXV
-   long hwcaps = getauxval (AT_HWCAP);
- 
- #if defined(HWCAP_ASIMD)
-@@ -53,6 +56,7 @@ simd_get_supported_features (void)
-   {
-     result |= SIMD_SUPPORTS_NEON;
-   }
-+#endif
- #endif
- 
-   return (result);
-diff --git a/src/trampoline_ppc.c b/src/trampoline_ppc.c
-index 0d439776..b5c0cb2b 100644
---- a/src/trampoline_ppc.c
-+++ b/src/trampoline_ppc.c
-@@ -17,8 +17,10 @@
-  */
- 
- #if defined(__ppc__) || defined(__PPC__)
-+#ifdef HAS_AUXV
- #include <sys/auxv.h>
- #include <bits/hwcap.h>
-+#endif
- #else
- #error "The wrong CPU architecture file has been included."
- #endif
-@@ -39,6 +41,7 @@ int
- simd_get_supported_features (void)
- {
-   int result = 0;
-+#ifdef HAS_AUXV
-   long hwcaps = getauxval (AT_HWCAP2);
- 
- #if defined(PPC_FEATURE2_ARCH_2_07)
-@@ -46,6 +49,7 @@ simd_get_supported_features (void)
-   {
-     result |= SIMD_SUPPORTS_POWER8;
-   }
-+#endif
- #endif
- 
-   return (result);
--- 
-2.14.1
-
package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch deleted +0 -52

52 lines not on this page · raw message

package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch deleted +0 -64

64 lines not on this page · raw message

package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch deleted +0 -53

53 lines not on this page · raw message

package/aircrack-ng/aircrack-ng.hash +2 -2
index a5fbbcfd31..7c5fe9f0de 100644
@@ -1,6 +1,6 @@
 # From http://www.aircrack-ng.org/downloads.html
-sha1 ccc7a44ad2243c66b9a45fe133514485a72d674f aircrack-ng-1.2.tar.gz
-md5 bb11ec14e1fe505d8d0d51cee0c54df9 aircrack-ng-1.2.tar.gz
+sha1 245464585dfd24622807a8f868d62d9d00f6a22c aircrack-ng-1.3.tar.gz
+md5 c7c5b076dee0c25ee580b0f56f455623 aircrack-ng-1.3.tar.gz
 
 # Hash for license file:
 sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE
package/aircrack-ng/aircrack-ng.mk +8 -1
index fe0f504ed1..f338121a48 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AIRCRACK_NG_VERSION = 1.2
+AIRCRACK_NG_VERSION = 1.3
 AIRCRACK_NG_SITE = http://download.aircrack-ng.org
 AIRCRACK_NG_LICENSE = GPL-2.0+
 AIRCRACK_NG_LICENSE_FILES = LICENSE

@@ -31,6 +31,13 @@ else
 AIRCRACK_NG_CONF_OPTS += --without-duma
 endif
 
+ifeq ($(BR2_PACKAGE_JEMALLOC),y)
+AIRCRACK_NG_DEPENDENCIES += jemalloc
+AIRCRACK_NG_CONF_OPTS += --with-jemalloc
+else
+AIRCRACK_NG_CONF_OPTS += --without-jemalloc
+endif
+
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 AIRCRACK_NG_DEPENDENCIES += libgcrypt
 AIRCRACK_NG_CONF_OPTS += \
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 aircrack-ng: bump to version 1.3

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Laurent" == Laurent Cans <[email protected]> writes:

- Remove patches (already in version)
- Add optional dependency to jemalloc

Signed-off-by Laurent Cans <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 aircrack-ng: bump to version 1.3

In reply to Laurent Cans

Hello,

Quoted 4 lines · Laurent Cans

- Remove patches (already in version)
- Add optional dependency to jemalloc

Signed-off-by Laurent Cans <[email protected]>

It seems like this new aircrack-ng version is using dlfcn.h, and therefore requires dynamic library support. However, I am not sure it is actually using dlfcn.h functionality, so it would be worth checking this before adding a !BR2_STATIC_LIBS dependency.

See:

http://autobuild.buildroot.net/results/e68/e684f8967a7c8cb14db1afa90e379a6d335ca0db/build-end.log

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com