Index: net-mgmt/aircrack-ng/Makefile =================================================================== --- net-mgmt/aircrack-ng/Makefile +++ net-mgmt/aircrack-ng/Makefile @@ -1,8 +1,7 @@ # Created by: Lars Engels PORTNAME= aircrack-ng -DISTVERSION= 1.5.2 -PORTREVISION= 3 +DISTVERSION= 1.7 CATEGORIES= net-mgmt security MASTER_SITES= http://download.aircrack-ng.org/ @@ -16,15 +15,13 @@ BROKEN_armv6= fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major BROKEN_armv7= fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major -USES= autoreconf cpe dos2unix gmake libtool pkgconfig -USE_GCC= yes +USES= autoreconf cpe gmake libtool pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-experimental CPE_VERSION= ${DISTVERSION:C/-.*//} CPE_UPDATE= ${DISTVERSION:C/^[^-]*$//:C/.*-//} -DOS2UNIX_FILES= src/aircrack-osdep/byteorder.h INSTALL_TARGET= install-strip OPTIONS_DEFINE= GCRYPT HWLOC PCRE SQLITE Index: net-mgmt/aircrack-ng/distinfo =================================================================== --- net-mgmt/aircrack-ng/distinfo +++ net-mgmt/aircrack-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546504782 -SHA256 (aircrack-ng-1.5.2.tar.gz) = 9e592fe7658046220e0ac0a6d05c4026903f3077b248893e0056ccbe4ee88241 -SIZE (aircrack-ng-1.5.2.tar.gz) = 7138360 +TIMESTAMP = 1654520095 +SHA256 (aircrack-ng-1.7.tar.gz) = 05a704e3c8f7792a17315080a21214a4448fd2452c1b0dd5226a3a55f90b58c3 +SIZE (aircrack-ng-1.7.tar.gz) = 7740634 Index: net-mgmt/aircrack-ng/files/patch-src_aircrack-ng_aircrack-ng.c =================================================================== --- net-mgmt/aircrack-ng/files/patch-src_aircrack-ng_aircrack-ng.c +++ net-mgmt/aircrack-ng/files/patch-src_aircrack-ng_aircrack-ng.c @@ -1,15 +1,15 @@ ---- src/aircrack-ng.c.orig 2018-12-09 22:53:44 UTC -+++ src/aircrack-ng.c -@@ -149,7 +149,7 @@ struct WPA_data wpa_data[MAX_THREADS]; - int wpa_wordlists_done = 0; +--- src/aircrack-ng/aircrack-ng.c.orig 2022-06-06 20:18:48 UTC ++++ src/aircrack-ng/aircrack-ng.c +@@ -170,7 +170,7 @@ static pthread_mutex_t mx_wpastats = PTHREAD_MUTEX_INI + static volatile int wpa_wordlists_done = 0; static pthread_mutex_t mx_nb = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t mx_wpastats = PTHREAD_MUTEX_INITIALIZER; --ac_cpuset_t * cpuset = NULL; +-static ac_cpuset_t * cpuset = NULL; +static ac_cpuset_t * acng_cpuset = NULL; - #define GOT_IV 0x00000001 - #define USE_IV 0x00000002 -@@ -690,10 +690,10 @@ static void clean_exit(int ret) + typedef struct + { +@@ -711,10 +711,10 @@ static __attribute__((noinline)) void clean_exit(int r dso_ac_crypto_engine_destroy(&engine); ac_crypto_engine_loader_unload(); @@ -23,8 +23,8 @@ } if (opt.totaldicts) -@@ -5371,10 +5371,10 @@ static int perform_wpa_crack(struct AP_info * ap_cur) - return missing_wordlist_dictionary(ap_cur); +@@ -5629,10 +5629,10 @@ static int perform_wpa_crack(struct AP_info * ap_cur) + return (missing_wordlist_dictionary(ap_cur)); } - cpuset = ac_cpuset_new(); @@ -38,7 +38,7 @@ ap_cur = get_first_target(); -@@ -5462,7 +5462,7 @@ static int perform_wpa_crack(struct AP_info * ap_cur) +@@ -5719,7 +5719,7 @@ static int perform_wpa_crack(struct AP_info * ap_cur) return (FAILURE); } Index: net-mgmt/aircrack-ng/files/patch-src_aircrack-util_trampoline__ppc.c =================================================================== --- net-mgmt/aircrack-ng/files/patch-src_aircrack-util_trampoline__ppc.c +++ /dev/null @@ -1,26 +0,0 @@ ---- src/aircrack-util/trampoline_ppc.c.orig 2019-07-19 18:16:49 UTC -+++ src/aircrack-util/trampoline_ppc.c -@@ -19,8 +19,10 @@ - #if defined(__ppc__) || defined(__PPC__) - #ifdef HAS_AUXV - #include -+#ifndef __FreeBSD__ - #include - #endif -+#endif - #else - #error "The wrong CPU architecture file has been included." - #endif -@@ -35,7 +37,12 @@ int simd_get_supported_features(void) - { - int result = 0; - #ifdef HAS_AUXV -+#ifndef __FreeBSD__ - long hwcaps = getauxval(AT_HWCAP2); -+#else -+ u_long hwcaps; -+ elf_aux_info(AT_HWCAP2, &hwcaps, sizeof(hwcaps)); -+#endif - - #if defined(PPC_FEATURE2_ARCH_2_07) - if (hwcaps & PPC_FEATURE2_ARCH_2_07) Index: net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h =================================================================== --- net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/aircrack-osdep/byteorder.h.orig -+++ src/aircrack-osdep/byteorder.h -@@ -189,7 +189,7 @@ typedef uint8_t u_int8_t; - * Solaris - * ------- - */ --#if defined(__SVR4) && defined(__sun__) -+#if defined(__sparc__) && defined(__SVR4) && defined(__sun__) - #include - #include - #include Index: net-mgmt/aircrack-ng/files/patch-src_osdep_file.c =================================================================== --- net-mgmt/aircrack-ng/files/patch-src_osdep_file.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/aircrack-osdep/file.c.orig -+++ src/aircrack-osdep/file.c -@@ -33,7 +33,7 @@ - #include - - #include "osdep.h" --#include "pcap.h" -+#include "../pcap.h" - #include "radiotap/radiotap_iter.h" - - struct priv_file { Index: net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c =================================================================== --- net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/aircrack-osdep/radiotap/radiotap.c.orig -+++ src/aircrack-osdep/radiotap/radiotap.c -@@ -20,6 +20,16 @@ - #endif - - -+#ifdef _BSD_SOURCE -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+#define le16toh(x) (x) -+#define le32toh(x) (x) -+#else -+#define le32toh(x) bswap_32 (x) -+#endif -+#endif -+ -+ - /* function prototypes and related defs are in radiotap_iter.h */ - - static const struct radiotap_align_size rtap_namespace_sizes[] = { Index: net-mgmt/aircrack-ng/pkg-plist =================================================================== --- net-mgmt/aircrack-ng/pkg-plist +++ net-mgmt/aircrack-ng/pkg-plist @@ -9,19 +9,69 @@ bin/makeivs-ng bin/packetforge-ng bin/wpaclean -lib/libaircrack-crypto-1.3.0.so -%%PPC%%lib/libaircrack-crypto-ppc-altivec-1.3.0.so -%%PPC%%lib/libaircrack-crypto-ppc-altivec.so -%%PPC%%lib/libaircrack-crypto-ppc-power8-1.3.0.so -%%PPC%%lib/libaircrack-crypto-ppc-power8.so -%%X86%%lib/libaircrack-crypto-x86-avx-1.3.0.so -%%X86%%lib/libaircrack-crypto-x86-avx.so -%%X86%%lib/libaircrack-crypto-x86-avx2-1.3.0.so -%%X86%%lib/libaircrack-crypto-x86-avx2.so -%%X86%%lib/libaircrack-crypto-x86-sse2-1.3.0.so -%%X86%%lib/libaircrack-crypto-x86-sse2.so -lib/libaircrack-crypto.so -lib/libaircrack-osdep-1.3.0.so +include/aircrack-ng/adt/avl_tree.h +include/aircrack-ng/adt/circular_buffer.h +include/aircrack-ng/adt/circular_queue.h +include/aircrack-ng/aircrack-ng.h +include/aircrack-ng/ce-wep/uniqueiv.h +include/aircrack-ng/ce-wpa/aligned.h +include/aircrack-ng/ce-wpa/arch.h +include/aircrack-ng/ce-wpa/crypto_engine.h +include/aircrack-ng/ce-wpa/jcommon.h +include/aircrack-ng/ce-wpa/johnswap.h +include/aircrack-ng/ce-wpa/memory.h +include/aircrack-ng/ce-wpa/misc.h +include/aircrack-ng/ce-wpa/pseudo_intrinsics.h +include/aircrack-ng/ce-wpa/simd-intrinsics-load-flags.h +include/aircrack-ng/ce-wpa/simd-intrinsics.h +include/aircrack-ng/ce-wpa/wpapsk.h +include/aircrack-ng/compat.h +include/aircrack-ng/cowpatty/cowpatty.h +include/aircrack-ng/cpu/cpuset.h +include/aircrack-ng/cpu/simd_cpuid.h +include/aircrack-ng/cpu/trampoline.h +include/aircrack-ng/crypto/crctable.h +include/aircrack-ng/crypto/crypto.h +include/aircrack-ng/crypto/gcrypt-openssl-wrapper.h +include/aircrack-ng/crypto/sha1-git.h +include/aircrack-ng/crypto/sha1-sse2.h +include/aircrack-ng/defs.h +include/aircrack-ng/osdep/byteorder.h +include/aircrack-ng/osdep/channel.h +include/aircrack-ng/osdep/common.h +include/aircrack-ng/osdep/network.h +include/aircrack-ng/osdep/osdep.h +include/aircrack-ng/osdep/packed.h +include/aircrack-ng/ptw/aircrack-ptw-lib.h +include/aircrack-ng/support/common.h +include/aircrack-ng/support/communications.h +include/aircrack-ng/support/crypto_engine_loader.h +include/aircrack-ng/support/fragments.h +include/aircrack-ng/support/mcs_index_rates.h +include/aircrack-ng/support/pcap_local.h +include/aircrack-ng/support/station.h +include/aircrack-ng/third-party/eapol.h +include/aircrack-ng/third-party/ethernet.h +include/aircrack-ng/third-party/hashcat.h +include/aircrack-ng/third-party/ieee80211.h +include/aircrack-ng/third-party/if_arp.h +include/aircrack-ng/third-party/if_llc.h +include/aircrack-ng/tui/console.h +include/aircrack-ng/utf8/verifyssid.h +include/aircrack-ng/version.h +lib/libaircrack-ce-wpa-1.7.0.so +%%PPC%%lib/libaircrack-ce-wpa-ppc-altivec-1.7.0.so +%%PPC%%lib/libaircrack-ce-wpa-ppc-altivec.so +%%PPC%%lib/libaircrack-ce-wpa-ppc-power8-1.7.0.so +%%PPC%%lib/libaircrack-ce-wpa-ppc-power8.so +%%X86%%lib/libaircrack-ce-wpa-x86-avx-1.7.0.so +%%X86%%lib/libaircrack-ce-wpa-x86-avx.so +%%X86%%lib/libaircrack-ce-wpa-x86-avx2-1.7.0.so +%%X86%%lib/libaircrack-ce-wpa-x86-avx2.so +%%X86%%lib/libaircrack-ce-wpa-x86-sse2-1.7.0.so +%%X86%%lib/libaircrack-ce-wpa-x86-sse2.so +lib/libaircrack-ce-wpa.so +lib/libaircrack-osdep-1.7.0.so lib/libaircrack-osdep.so man/man1/aircrack-ng.1.gz man/man1/airdecap-ng.1.gz