Re: UPDATE: Aircrack-ng 1.7

On Sat, Jun 25, 2022 at 05:32:25PM -0400, Brad Smith wrote:
> Here is an update to Aircrack-ng 1.7.
>
> Still lookg for end users to test.

Updated diff with minor update to sync a patch with what was commited upstream.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/security/aircrack-ng/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile 11 Mar 2022 19:53:17 -0000 1.36
+++ Makefile 25 Jun 2022 21:10:05 -0000
@@ -1,6 +1,7 @@
COMMENT= 802.11 WEP and WPA-PSK keys cracking program
-DISTNAME= aircrack-ng-1.5.2
-REVISION= 7
+
+VER= 1.7
+DISTNAME= aircrack-ng-${VER}
CATEGORIES= security

HOMEPAGE= https://www.aircrack-ng.org/
@@ -8,8 +9,7 @@ HOMEPAGE= https://www.aircrack-ng.org/
# GPLv2
PERMIT_PACKAGE= Yes

-WANTLIB+= c pthread crypto z pcre
-WANTLIB+= ${COMPILER_LIBCXX} m sqlite3
+WANTLIB+= ${COMPILER_LIBCXX} c crypto m pcap pcre pthread sqlite3 ssl z

MASTER_SITES= https://download.aircrack-ng.org/

@@ -21,10 +21,6 @@ LIB_DEPENDS= databases/sqlite3 \
RUN_DEPENDS+= net/arp-scan,-mac>=20190128

USE_GMAKE= Yes
-.if ${MACHINE_ARCH} == "i386"
-# ld: error: undefined symbol: __i686.get_pc_thunk.bx
-USE_LLD= No
-.endif
LIBTOOL_FLAGS= --tag=disable-static
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.16
@@ -42,21 +38,18 @@ PKG_ARGS+= -Dx86=1
.else
PKG_ARGS+= -Dx86=0
.endif
-# XXX PFRAG.arm files relate to NEON optimizations, disabled above.
-#.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "aarch64"
-#PKG_ARGS+= -Darm=1
-#.else
-PKG_ARGS+= -Darm=0
-#.endif
-# XXX AltiVec optimizations can't be built with clang, and POWER8 ones
+
+# XXX AltiVec optimizations can't be built with Clang, and POWER8 ones
# are useless on powerpc
.if ${MACHINE_ARCH} == "powerpc"
MAKE_ENV+= ALTIVEC=false POWER8=false
.endif

+API_REV= ${VER}.0
+SUBST_VARS+= API_REV

pre-configure:
- ${SUBST_CMD} ${WRKSRC}/src/airodump-ng.h
+ ${SUBST_CMD} ${WRKSRC}/src/airodump-ng/airodump-ng.c

.include <bsd.port.arch.mk>
.if !${PROPERTIES:Mclang}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/security/aircrack-ng/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 23 Feb 2019 22:23:25 -0000 1.4
+++ distinfo 25 Jun 2022 21:10:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (aircrack-ng-1.5.2.tar.gz) = nlkv52WARiIOCsCm0FxAJpA/MHeySIk+AFbMvk7ogkE=
-SIZE (aircrack-ng-1.5.2.tar.gz) = 7138360
+SHA256 (aircrack-ng-1.7.tar.gz) = BacE48j3eSoXMVCAohIUpESP0kUsGw3VImo6VfkLWMM=
+SIZE (aircrack-ng-1.7.tar.gz) = 7740634
Index: patches/patch-build_m4_aircrack_ng_simd_m4
===================================================================
RCS file: patches/patch-build_m4_aircrack_ng_simd_m4
diff -N patches/patch-build_m4_aircrack_ng_simd_m4
--- patches/patch-build_m4_aircrack_ng_simd_m4 11 Mar 2022 19:53:17 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-Ensure that disabling AltiVec and POWER8 instructions with MAKE_ENV is honoured
-even if the build machine supports them, from:
-https://github.com/aircrack-ng/aircrack-ng/issues/1941
-
-Index: build/m4/aircrack_ng_simd.m4
---- build/m4/aircrack_ng_simd.m4.orig
-+++ build/m4/aircrack_ng_simd.m4
-@@ -132,7 +132,6 @@ then
- AX_CHECK_COMPILE_FLAG([-maltivec], [
- AX_APPEND_FLAG(-maltivec, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
- AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
-- ALTIVEC_FOUND=1
- ])
-
- AX_CHECK_COMPILE_FLAG([-mabi=altivec], [
-@@ -148,7 +147,6 @@ then
- AX_CHECK_COMPILE_FLAG([-mpower8-vector], [
- AX_APPEND_FLAG(-mpower8-vector, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
- AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
-- POWER8_FOUND=1
- ])
- fi
-
Index: patches/patch-lib_libac_support_common_c
===================================================================
RCS file: patches/patch-lib_libac_support_common_c
diff -N patches/patch-lib_libac_support_common_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_libac_support_common_c 6 Jul 2022 00:59:39 -0000
@@ -0,0 +1,68 @@
+lib/libac: Improved sysctl usage for *BSD
+53f86766c891c6c7fcf0ab4a4b6d6d282030b6b9
+
+Index: lib/libac/support/common.c
+--- lib/libac/support/common.c.orig
++++ lib/libac/support/common.c
+@@ -54,11 +54,13 @@
+
+ #include <aircrack-ng/support/common.h>
+
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \
+- || defined(__MidnightBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) \
++ || defined(__DragonFly__) || defined(__MidnightBSD__)
+ #include <sys/sysctl.h>
++#ifndef __NetBSD__
+ #include <sys/user.h>
+