[PR PATCH] aircrack-ng: update to 1.7.

[PR PATCH] aircrack-ng: update to 1.7.

[jbenden]

[-- Attachment #1: Type: text/plain, Size: 1185 bytes --]

There is a new pull request by jbenden against master on the void-packages repository

https://github.com/jbenden/void-packages aircrack-ng-1.7
https://github.com/void-linux/void-packages/pull/37956

aircrack-ng: update to 1.7.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`-`glibc`)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] x86_64-musl

#### Additional Notes
This patch rolls in all changes (AND supersedes!) as discussed in PR #34452. The extra scripts mentioned in that PR require non-cross builds (use of Python).

On an aside, there are some dependency issues with `libhwloc-devel` package that could be improved in the future. Namely, that `-devel` package requires extra packages for the `pkg-config` file to work. All of these extra dependencies are NOT included by the `-devel` package, nor the `libhwloc` package. It is only the main package `hwloc` that includes some, but still not all.

A patch file from https://github.com/void-linux/void-packages/pull/37956.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aircrack-ng-1.7-37956.patch --]
[-- Type: text/x-diff, Size: 2164 bytes --]

From d6083feb7261fae49891d4b874704013cd9171a0 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sat, 9 Jul 2022 15:43:30 -0700
Subject: [PATCH] aircrack-ng: update to 1.7.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/aircrack-ng/template | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index ef5d46cebac1..34a8af32c5a9 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,30 +1,36 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
-version=1.6
-revision=4
+version=1.7
+revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel libcap-devel"
+hostmakedepends="automake ethtool libtool pkg-config"
+makedepends="libhwloc-devel libnl3-devel libpcap-devel libpciaccess-devel
+ libxml2-devel  openssl-devel pcre-devel sqlite-devel zlib-devel"
+checkdepends="cmocka-devel expect"
 short_desc="Complete suite of tools to assess WiFi network security"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joseph Benden <joe@benden.us>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"
 homepage="https://www.aircrack-ng.org/"
 changelog="https://www.aircrack-ng.org/doku.php?id=changelog"
 distfiles="https://download.aircrack-ng.org/${pkgname}-${version}.tar.gz"
-checksum=4f0bfd486efc6ea7229f7fbc54340ff8b2094a0d73e9f617e0a39f878999a247
+checksum=05a704e3c8f7792a17315080a21214a4448fd2452c1b0dd5226a3a55f90b58c3
+configure_args+="--without-opt --with-experimental"
 
-CFLAGS="-fcommon"
+if [ -z "$CROSS_BUILD" ]; then
+	configure_args+=" --with-ext-scripts"
+	makedepends+=" python3-devel"
+fi
 
 pre_configure() {
-	ACLOCAL=/usr/bin/aclocal \
-	AUTOCONF=/usr/bin/autoconf \
-	AUTOHEADER=/usr/bin/autoheader \
-	AUTOMAKE=/usr/bin/automake \
-	LIBTOOLIZE=/usr/bin/libtoolize \
-	NOCONFIGURE=1 \
-		./autogen.sh
+	autoreconf -vif
 }
 
 post_install() {
+	vdoc AUTHORS
+	vdoc ChangeLog
+	vdoc README
+	vdoc README.md
+	vdoc SECURITY.md
+	vlicense LICENSE
 	vlicense LICENSE.OpenSSL
 }

Re: aircrack-ng: update to 1.7.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37956#issuecomment-1179655891

Comment:
I think it should be possible to build the extra python scripts on cross, but you may need to take a look at the python3 build style (common/build_style/python3-module) for inspiration

Re: [PR PATCH] [Updated] aircrack-ng: update to 1.7.

[jbenden]

[-- Attachment #1: Type: text/plain, Size: 1190 bytes --]

There is an updated pull request by jbenden against master on the void-packages repository

https://github.com/jbenden/void-packages aircrack-ng-1.7
https://github.com/void-linux/void-packages/pull/37956

aircrack-ng: update to 1.7.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`-`glibc`)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] x86_64-musl

#### Additional Notes
This patch rolls in all changes (AND supersedes!) as discussed in PR #34452. The extra scripts mentioned in that PR require non-cross builds (use of Python).

On an aside, there are some dependency issues with `libhwloc-devel` package that could be improved in the future. Namely, that `-devel` package requires extra packages for the `pkg-config` file to work. All of these extra dependencies are NOT included by the `-devel` package, nor the `libhwloc` package. It is only the main package `hwloc` that includes some, but still not all.

A patch file from https://github.com/void-linux/void-packages/pull/37956.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aircrack-ng-1.7-37956.patch --]
[-- Type: text/x-diff, Size: 6645 bytes --]

From 06d66a6af706597c24aa496fe4369aff14a3f345 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sat, 9 Jul 2022 15:43:30 -0700
Subject: [PATCH] aircrack-ng: update to 1.7.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/aircrack-ng/patches/evalrev.patch | 13 ++++++
 srcpkgs/aircrack-ng/patches/python.patch  | 49 +++++++++++++++++++++++
 srcpkgs/aircrack-ng/patches/sqlite3.patch | 25 ++++++++++++
 srcpkgs/aircrack-ng/template              | 31 +++++++-------
 4 files changed, 103 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/aircrack-ng/patches/evalrev.patch
 create mode 100644 srcpkgs/aircrack-ng/patches/python.patch
 create mode 100644 srcpkgs/aircrack-ng/patches/sqlite3.patch

diff --git a/srcpkgs/aircrack-ng/patches/evalrev.patch b/srcpkgs/aircrack-ng/patches/evalrev.patch
new file mode 100644
index 000000000000..fd66c0dcf1f8
--- /dev/null
+++ b/srcpkgs/aircrack-ng/patches/evalrev.patch
@@ -0,0 +1,13 @@
+diff --git a/evalrev b/evalrev
+index 19b38d6b..afb4157e 100755
+--- a/evalrev
++++ b/evalrev
+@@ -49,7 +49,7 @@ elif test -d "${DIR}/.svn"; then
+         SCM="_r1"
+     fi
+ else
+-    REVISION="$(cat ${DIR}/AC_VERSION)"
++    REVISION="$(cat ${DIR}/AC_VERSION 2>/dev/null)"
+ fi
+ 
+ if test "x$CMD" = "xscm"; then
diff --git a/srcpkgs/aircrack-ng/patches/python.patch b/srcpkgs/aircrack-ng/patches/python.patch
new file mode 100644
index 000000000000..29f41f59124c
--- /dev/null
+++ b/srcpkgs/aircrack-ng/patches/python.patch
@@ -0,0 +1,49 @@
+diff --git a/build/m4/aircrack_ng_ext_scripts.m4 b/build/m4/aircrack_ng_ext_scripts.m4
+index db464944..4d0e9b62 100644
+--- a/build/m4/aircrack_ng_ext_scripts.m4
++++ b/build/m4/aircrack_ng_ext_scripts.m4
+@@ -39,20 +39,14 @@ dnl program, then also delete it here.
+ 
+ AC_DEFUN([AIRCRACK_NG_EXT_SCRIPTS], [
+ 
+-if test "$cross_compiling" = no;
+-then
+-	AC_CHECK_PROGS([PYTHON], [python python3 python2])
+-	if test $PYTHON = no; then
+-		AC_MSG_FAILURE(failed to find Python)
+-	fi
+-
+-    if test "x$PYTHON" != "x"; then
+-        pc_cv_python_site_dir=`$PYTHON -c 'import site; print(site.getsitepackages()[[-1]])'`
+-        dnl AC_SUBST([pythondir], [\${prefix}/$pc_cv_python_site_dir])
+-        AC_SUBST([pythondir], [$pc_cv_python_site_dir])
+-        AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE_NAME])
+-    fi
+-fi
++AC_CHECK_PROGS([PYTHON], [python python3 python2])
++AS_IF([test x"$PYTHON" = x], [
++    AC_MSG_RESULT(failed to find Python)
++], [
++    pc_cv_python_site_dir=`$PYTHON -c 'import site; print(site.getsitepackages()[[-1]])'`
++    AC_SUBST([pythondir], [$pc_cv_python_site_dir])
++    AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE_NAME])
++])
+ 
+ AC_CHECK_PROGS([READLINK], [greadlink readlink])
+ 
+@@ -62,12 +56,11 @@ AC_ARG_WITH(ext-scripts,
+ case "$with_ext_scripts" in
+     yes)
+         AC_MSG_CHECKING([for Python requirement for ext-scripts])
+-        if test "x$PYTHON" = x ; then
++        AS_IF([test "x$PYTHON" = x], [
+            AC_MSG_FAILURE([not found])
+-        else
++        ], [
+            AC_MSG_RESULT([found; $PYTHON])
+-        fi
+-
++        ])
+         EXT_SCRIPTS=yes
+         ;;
+     *)
diff --git a/srcpkgs/aircrack-ng/patches/sqlite3.patch b/srcpkgs/aircrack-ng/patches/sqlite3.patch
new file mode 100644
index 000000000000..ff59c4287bd9
--- /dev/null
+++ b/srcpkgs/aircrack-ng/patches/sqlite3.patch
@@ -0,0 +1,25 @@
+diff --git a/build/m4/ax_lib_sqlite3.m4 b/build/m4/ax_lib_sqlite3.m4
+index 5d5c3a8d..fcb1f3c1 100644
+--- a/build/m4/ax_lib_sqlite3.m4
++++ b/build/m4/ax_lib_sqlite3.m4
+@@ -88,7 +88,7 @@ AC_DEFUN([AX_LIB_SQLITE3],
+             ac_sqlite3_cppflags="-I$ac_sqlite3_path/include"
+             AC_MSG_RESULT([explicitly set; $ac_sqlite3_path])
+         else
+-            for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do
++            for ac_sqlite3_path_tmp in /usr /usr/local /opt $lt_sysroot ; do
+                 if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
+                     && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
+                     ac_sqlite3_path=$ac_sqlite3_path_tmp
+@@ -159,9 +159,9 @@ AC_DEFUN([AX_LIB_SQLITE3],
+             dnl Retrieve SQLite release version
+             if test "x$ac_sqlite3_header_path" != "x"; then
+                 ac_sqlite3_version=`cat $ac_sqlite3_header_path \
+-                    | grep '#define.*SQLITE_VERSION.*\"' | sed -e 's/.* "//' \
++                    | grep '#define.*SQLITE_VERSION.*\"' | tail -n 1 | sed -e 's/.* "//' \
+                         | sed -e 's/"//'`
+-                if test $ac_sqlite3_version != ""; then
++                if test "$ac_sqlite3_version" != ""; then
+                     SQLITE3_VERSION=$ac_sqlite3_version
+                 else
+                     AC_MSG_WARN([Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!])
diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index ef5d46cebac1..10e1677483d6 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,30 +1,31 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
-version=1.6
-revision=4
+version=1.7
+revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel libcap-devel"
+hostmakedepends="automake ethtool libtool pkg-config python3"
+makedepends="libhwloc-devel libnl3-devel libpcap-devel libpciaccess-devel
+ libxml2-devel  openssl-devel pcre-devel python3-devel sqlite-devel zlib-devel"
+checkdepends="cmocka-devel expect"
 short_desc="Complete suite of tools to assess WiFi network security"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Joseph Benden <joe@benden.us>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"
 homepage="https://www.aircrack-ng.org/"
 changelog="https://www.aircrack-ng.org/doku.php?id=changelog"
 distfiles="https://download.aircrack-ng.org/${pkgname}-${version}.tar.gz"
-checksum=4f0bfd486efc6ea7229f7fbc54340ff8b2094a0d73e9f617e0a39f878999a247
-
-CFLAGS="-fcommon"
+checksum=05a704e3c8f7792a17315080a21214a4448fd2452c1b0dd5226a3a55f90b58c3
+configure_args+="--without-opt --with-experimental --with-ext-scripts"
 
 pre_configure() {
-	ACLOCAL=/usr/bin/aclocal \
-	AUTOCONF=/usr/bin/autoconf \
-	AUTOHEADER=/usr/bin/autoheader \
-	AUTOMAKE=/usr/bin/automake \
-	LIBTOOLIZE=/usr/bin/libtoolize \
-	NOCONFIGURE=1 \
-		./autogen.sh
+	autoreconf -vif
 }
 
 post_install() {
+	vdoc AUTHORS
+	vdoc ChangeLog
+	vdoc README
+	vdoc README.md
+	vdoc SECURITY.md
+	vlicense LICENSE
 	vlicense LICENSE.OpenSSL
 }

Re: aircrack-ng: update to 1.7.

[jbenden]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New comment by jbenden on void-packages repository

https://github.com/void-linux/void-packages/pull/37956#issuecomment-1179792482

Comment:
@classabbyamp Thanks for that reference! I got it all working, but it required a few patches - that I will apply upstream! Thanks! -Joe

Re: [PR PATCH] [Merged]: aircrack-ng: update to 1.7.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1026 bytes --]

There's a merged pull request on the void-packages repository

aircrack-ng: update to 1.7.
https://github.com/void-linux/void-packages/pull/37956

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`-`glibc`)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] x86_64-musl

#### Additional Notes
This patch rolls in all changes (AND supersedes!) as discussed in PR #34452. The extra scripts mentioned in that PR require non-cross builds (use of Python).

On an aside, there are some dependency issues with `libhwloc-devel` package that could be improved in the future. Namely, that `-devel` package requires extra packages for the `pkg-config` file to work. All of these extra dependencies are NOT included by the `-devel` package, nor the `libhwloc` package. It is only the main package `hwloc` that includes some, but still not all.