From patchwork Tue Jul 17 15:29:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Cans X-Patchwork-Id: 945142 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u/j6vjC2"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41VPNM3XQCz9rxs for ; Wed, 18 Jul 2018 01:29:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 60EB830612; Tue, 17 Jul 2018 15:29:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mbIxNURRvkql; Tue, 17 Jul 2018 15:29:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 68033305EC; Tue, 17 Jul 2018 15:29:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B4EE11BFF8E for ; Tue, 17 Jul 2018 15:29:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B2395897EE for ; Tue, 17 Jul 2018 15:29:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EV5Ylmevpwzs for ; Tue, 17 Jul 2018 15:29:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 626B7897E6 for ; Tue, 17 Jul 2018 15:29:46 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id c14-v6so1946129wmb.4 for ; Tue, 17 Jul 2018 08:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=R8kuCV8B/DLDUjIN6qHJM6mScLPSjUARpAj82+gYzQ0=; b=u/j6vjC2lmcfIHitlNb73zbqpde0MXOmDOzrBN8E7XOkLSZr/LV90hqYGcYfOssu9g eViNH+CjPB8UhdLlprZ/CyPNV2axAqxFeZBUDI5Ipu9J50yIegZvoE/W9Wa99SWxFYBP xYZ4bM7ret7eYOmSiEVazSbYZSrJdJ+KR7ArDyRwG+rRyOL1WmsBxTu0W5rSNNwslJON tDk6Yd/D3vhdEoUSa9SL8dtTBWWSAFW5WGixo+OQDcnOXX725bc60YPbaR0Cwz+XHeDz rUaJAA2axNX5debXc6mTQngr+fdbxESeQoY+hw+p3G9A5vEsCKVAKxfXcRey/565KJq1 B//g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=R8kuCV8B/DLDUjIN6qHJM6mScLPSjUARpAj82+gYzQ0=; b=atCW8tFnIs8OezmqBle3ya4fbB+cOERstWisrkMG0FBYhsHs+sb4knTVNGQE+CJcXV m+g+uXyfyim6hHxCSXbSBqVtwRV9nf0oYlsP5W1luLKIf4wIH1mCTOmSL/7iG0RO5rRy F41y+zOBLbkIS0ppP9X46zM2/KNL4r2TEJSzcAGTdPyqJvu4pXx2ANPHIScZNH8yJ6C6 tJxHUn/oeWGLArA77JErYzboC/NPTO40LgAbLsEZMe0R3po/6MpLy36Dkpwhdlo8H0dm y6M6G+qyqsxEr+RI+3PZ6EDn6EdPPlfvUaKN3hcSwfRU1uERh26NSkvS/+S32d7qTnAF fdpA== X-Gm-Message-State: AOUpUlGEsook+pvHjMgiYoZdSFXx41XTDv3zPYyc8bkFEE/a3flsAIHl vka8/Lqi6ln+NVz+YkANl8Zz9bwa X-Google-Smtp-Source: AAOMgpe5923ylm43/RW1o4r+rpNPpQE4K2pSTZJFqs8z6FXBSDz15NYmPNKejRpbQJe9g0fBO7lSRg== X-Received: by 2002:a1c:ee5d:: with SMTP id m90-v6mr1700158wmh.107.1531841384627; Tue, 17 Jul 2018 08:29:44 -0700 (PDT) Received: from debian-3770.numericable.fr (81-64-230-242.rev.numericable.fr. [81.64.230.242]) by smtp.gmail.com with ESMTPSA id c7-v6sm776491wre.73.2018.07.17.08.29.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 08:29:43 -0700 (PDT) From: Laurent Cans To: buildroot@busybox.net Date: Tue, 17 Jul 2018 17:29:06 +0200 Message-Id: <20180717152906.28173-1-laurent.cans@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH 1/1] aircrack-ng: bump to version 1.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Remove patches (already in version) - Add optional dependency to jemalloc Signed-off-by: Laurent Cans --- .../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 diff --git a/package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch b/package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch deleted file mode 100644 index 8a291356ca..0000000000 --- a/package/aircrack-ng/0001-Fix-compilation-without-getauxval.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 0017bae95dbcf336495e36ac83c868ca1d7f2846 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -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 -[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 - #include -+#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 - #include -+#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 - diff --git a/package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch b/package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch deleted file mode 100644 index 8563c78d33..0000000000 --- a/package/aircrack-ng/0002-autotools-The-flag-without-opt-should-skip-stack-protector.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 58fe40daf3e082d9e63d689d795a3bbecf72fedb Mon Sep 17 00:00:00 2001 -From: Joseph Benden -Date: Mon, 16 Apr 2018 11:26:23 -0700 -Subject: [PATCH] autotools: The flag --without-opt should skip stack protector - flags. (#1864) - -Signed-off-by: Fabrice Fontaine -[Retrieved from upstream: https://github.com/aircrack-ng/aircrack-ng/commit/58fe40daf3e082d9e63d689d795a3bbecf72fedb] ---- - build/m4/aircrack_ng_compiler.m4 | 28 ++++++++++++++++------------ - 1 file changed, 16 insertions(+), 12 deletions(-) - -diff --git a/build/m4/aircrack_ng_compiler.m4 b/build/m4/aircrack_ng_compiler.m4 -index 0fb19726..8a973dbf 100644 ---- a/build/m4/aircrack_ng_compiler.m4 -+++ b/build/m4/aircrack_ng_compiler.m4 -@@ -108,19 +108,23 @@ case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in - CYGWIN*|MSYS*|cygwin*|msys*) - ;; - *) -- AS_IF([test "x$gcc_over49" = "xno"], [ -- AS_IF([test "x$gcc_over41" = "xyes"], [ -- AX_CHECK_COMPILE_FLAG([-fstack-protector], [ -- AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags]) -- ]) -- ], []) -- ], []) -+ case $with_opt in -+ yes | "") -+ AS_IF([test "x$gcc_over49" = "xno"], [ -+ AS_IF([test "x$gcc_over41" = "xyes"], [ -+ AX_CHECK_COMPILE_FLAG([-fstack-protector], [ -+ AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags]) -+ ]) -+ ], []) -+ ], []) - -- AS_IF([test "x$gcc_over49" = "xyes"], [ -- AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [ -- AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags]) -- ]) -- ], []) -+ AS_IF([test "x$gcc_over49" = "xyes"], [ -+ AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [ -+ AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags]) -+ ]) -+ ], []) -+ ;; -+ esac - ;; - esac - ;; diff --git a/package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch b/package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch deleted file mode 100644 index 59c7ade4e9..0000000000 --- a/package/aircrack-ng/0003-Autoconf-Added-NEON-intrinsic-support.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 149929109eab1f79c4b90aa423f6d6eb4ee0e882 Mon Sep 17 00:00:00 2001 -From: Joseph Benden -Date: Tue, 8 May 2018 11:49:22 -0700 -Subject: [PATCH] Autoconf: Added NEON intrinsic support. (#1879, #1872) - -Perform NEON intrinsic support using Autoconf, instead of failing to build on older ARM processors without NEON features. - -Signed-off-by: Fabrice Fontaine -[Retrieved from upstream: https://github.com/aircrack-ng/aircrack-ng/commit/149929109eab1f79c4b90aa423f6d6eb4ee0e882] ---- - build/m4/aircrack_ng_simd.m4 | 16 ++++++++++++++++ - src/Makefile.am | 2 ++ - 2 files changed, 18 insertions(+) - -diff --git a/build/m4/aircrack_ng_simd.m4 b/build/m4/aircrack_ng_simd.m4 -index 9d13031e..74135f32 100644 ---- a/build/m4/aircrack_ng_simd.m4 -+++ b/build/m4/aircrack_ng_simd.m4 -@@ -95,6 +95,21 @@ then - AX_APPEND_FLAG(-mfpu=neon, [arm_neon_[]_AC_LANG_ABBREV[]flags]) - AC_SUBST(arm_neon_[]_AC_LANG_ABBREV[]flags) - ]) -+ -+ AS_VAR_PUSHDEF([CACHEVAR], [ax_cv_neon_[]_AC_LANG_ABBREV[]flags]) -+ AC_CACHE_CHECK([whether _AC_LANG compiler supports NEON instructions], CACHEVAR, [ -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $arm_neon_[]_AC_LANG_ABBREV[]flags" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+#if !defined(__ARM_NEON) && !defined(__ARM_NEON__) && !defined(__aarch64) && !defined(__aarch64__) -+#error macro not defined -+#endif -+ ]])], [AS_VAR_SET(CACHEVAR,[yes])], [AS_VAR_SET(CACHEVAR,[no])]) -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags -+ ]) -+ AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], -+ [NEON_FOUND=1], [NEON_FOUND=0]) -+ AS_VAR_POPDEF([CACHEVAR]) - fi - - if test $IS_PPC -eq 1 -@@ -185,6 +200,7 @@ fi - AM_CONDITIONAL([X86], [test "$IS_X86" = 1]) - AM_CONDITIONAL([ARM], [test "$IS_ARM" = 1]) - AM_CONDITIONAL([PPC], [test "$IS_PPC" = 1]) -+AM_CONDITIONAL([NEON], [test "$NEON_FOUND" = 1]) - ]) - - AC_DEFUN([AIRCRACK_NG_SIMD_C], [ -diff --git a/src/Makefile.am b/src/Makefile.am -index 3cc8ebdc..beac9dce 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -116,9 +116,11 @@ endif - pkglibexec_PROGRAMS = aircrack-ng--generic - - if ARM -+if NEON - pkglibexec_PROGRAMS += aircrack-ng--neon \ - aircrack-ng--asimd - endif -+endif - - if PPC - pkglibexec_PROGRAMS += aircrack-ng--altivec \ diff --git a/package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch b/package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch deleted file mode 100644 index b32f29f800..0000000000 --- a/package/aircrack-ng/0004-Fixed-compilation-with-gcrypt-on-some-platforms.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 208c0d4810f24e03b4def637ebe130f8777ef3e1 Mon Sep 17 00:00:00 2001 -From: Mister X <3520734+Mister-X-@users.noreply.github.com> -Date: Sat, 5 May 2018 00:28:30 +0000 -Subject: [PATCH] Fixed compilation with gcrypt on some platforms. - -Retrieved from upstream: https://github.com/aircrack-ng/aircrack-ng/commit/208c0d4810f24e03b4def637ebe130f8777ef3e1 - -Signed-off-by: Fabrice Fontaine ---- - src/gcrypt-openssl-wrapper.h | 13 +++++++++++++ - src/md5.h | 6 +++++- - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/src/gcrypt-openssl-wrapper.h b/src/gcrypt-openssl-wrapper.h -index 79a0376e..db3e0462 100644 ---- a/src/gcrypt-openssl-wrapper.h -+++ b/src/gcrypt-openssl-wrapper.h -@@ -82,5 +82,18 @@ - gcry_md_get_algo_dlen (algo)); \ - gcry_md_close(mdh); \ - } while (0) -+// MD5 -+#define MD5_CTX gcry_md_hd_t -+#define MD5_Init(ctx) gcry_md_open(ctx, GCRY_MD_MD5, 0) -+#define MD5_Update(ctx, data, len) gcry_md_write(*ctx, data, len) -+ // HMAC_Update(ctx, data, len) -+#define MD5_Final(ctx, md) do { \ -+ memcpy( md, \ -+ gcry_md_read(*(gcry_md_hd_t*)ctx, GCRY_MD_MD5), \ -+ gcry_md_get_algo_dlen(gcry_md_get_algo(*(gcry_md_hd_t*)ctx)) \ -+ ); \ -+ gcry_md_close(*(gcry_md_hd_t*)ctx); \ -+ } while (0) -+ - // http://tumblr.spantz.org/post/214737529/the-use-of-do-while-0-in-c-macros - #endif // _GCRYPT_OPENSSL_WRAPPER_H -diff --git a/src/md5.h b/src/md5.h -index e9edeb81..d8d3d6b3 100644 ---- a/src/md5.h -+++ b/src/md5.h -@@ -61,7 +61,11 @@ typedef unsigned int MD5_u32plus; - - #include "arch.h" - #ifdef SIMD_PARA_MD5 --#include -+ #ifndef USE_GCRYPT -+ #include -+ #else -+ #include "gcrypt-openssl-wrapper.h" -+ #endif - #endif - - #endif /* _MD5_H */ diff --git a/package/aircrack-ng/aircrack-ng.hash b/package/aircrack-ng/aircrack-ng.hash index a5fbbcfd31..7c5fe9f0de 100644 --- a/package/aircrack-ng/aircrack-ng.hash +++ b/package/aircrack-ng/aircrack-ng.hash @@ -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 diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk index fe0f504ed1..f338121a48 100644 --- a/package/aircrack-ng/aircrack-ng.mk +++ b/package/aircrack-ng/aircrack-ng.mk @@ -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 += \