aircrack-ng: bump to version 1.2
PATCH v2 1/1 aircrack-ng: bump to version 1.2
- Remove patch (already in version)
- Add three patches (first one sent and merged upstream, second and third patchs retrieved upstream)
- Move to autotools-package
- Remove workaround for static handling of pthread as it isn't needed anymore
- Remove deactivation of libnl in static build as it isn't needed anymore
- Set libnl and zlib dependencies as optional and not mandatory
- Add duma and libgcrypt optional dependencies
- Update workaround for static handling of libpcap
- Add hash for license file
---
Changes v1 -> v2 (after review of Peter Korsgaard):
- Make libnl and zlib optional
- Add libgcrypt support
- Add duma optional dependency
.../0001-Fix-compilation-without-getauxval.patch | 81 ++++++++++++++++++++++ package/aircrack-ng/0001-stack-protector.patch | 58 ---------------- ...g-without-opt-should-skip-stack-protector.patch | 52 ++++++++++++++ ...003-Autoconf-Added-NEON-intrinsic-support.patch | 64 +++++++++++++++++ package/aircrack-ng/Config.in | 6 +- package/aircrack-ng/aircrack-ng.hash | 7 +- package/aircrack-ng/aircrack-ng.mk | 77 +++++++++----------- 7 files changed, 236 insertions(+), 109 deletions(-) create mode 100644 package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch delete mode 100644 package/aircrack-ng/0001-stack-protector.patch create mode 100644 package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch create mode 100644 package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch
package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch new file +81 -0
@@ -0,0 +1,81 @@ +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/0001-stack-protector.patch deleted +0 -58
58 lines not on this page · raw message
package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch new file +52 -0
52 lines not on this page · raw message
package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch new file +64 -0
64 lines not on this page · raw message
package/aircrack-ng/Config.in +1 -5
@@ -3,11 +3,7 @@ config BR2_PACKAGE_AIRCRACK_NG depends on BR2_USE_MMU # uses fork() depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - # libnl has issues when linking statically - # they need fixing in libnl itself - select BR2_PACKAGE_LIBNL if !BR2_STATIC_LIBS - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT help A set of tools for auditing wireless networks
package/aircrack-ng/aircrack-ng.hash +5 -2
@@ -1,3 +1,6 @@ # From http://www.aircrack-ng.org/downloads.html -sha1 2b2fbe50fedb606b3bd96a34d49f07760e8e618a aircrack-ng-1.2-rc4.tar.gz -md5 3bbc7d5035a98ec01e78774d05c3fcce aircrack-ng-1.2-rc4.tar.gz +sha1 ccc7a44ad2243c66b9a45fe133514485a72d674f aircrack-ng-1.2.tar.gz +md5 bb11ec14e1fe505d8d0d51cee0c54df9 aircrack-ng-1.2.tar.gz + +# Hash for license file: +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE
package/aircrack-ng/aircrack-ng.mk +33 -44
102 lines not on this page · raw message
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 1/1 aircrack-ng: bump to version 1.2
Hello,
Quoted 13 lines · Fabrice Fontaine
- Remove patch (already in version)
- Add three patches (first one sent and merged upstream, second and third patchs retrieved upstream)
- Move to autotools-package
- Remove workaround for static handling of pthread as it isn't needed anymore
- Remove deactivation of libnl in static build as it isn't needed anymore
- Set libnl and zlib dependencies as optional and not mandatory
- Add duma and libgcrypt optional dependencies
- Update workaround for static handling of libpcap
- Add hash for license file
Quoted 6 lines
Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2 (after review of Peter Korsgaard):
- Make libnl and zlib optional
- Add libgcrypt support
- Add duma optional dependency
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com