<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2b29458a2074f9064c87d55a00de09d5571a3251">https://github.com/macports/macports-ports/commit/2b29458a2074f9064c87d55a00de09d5571a3251</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2b29458a2074f9064c87d55a00de09d5571a3251
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat May 14 01:20:01 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> aircrack-ng: Update to 1.7
</span>---
security/aircrack-ng/Portfile | 17 ++----
security/aircrack-ng/files/VERSION.patch | 44 ---------------
.../aircrack-ng/files/aircrack_ng_mac.m4.patch | 63 +++++++++++++++-------
security/aircrack-ng/files/airodump.c.patch | 13 -----
4 files changed, 50 insertions(+), 87 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/Portfile b/security/aircrack-ng/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc4d61c7417..1691b3359fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/aircrack-ng/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@ PortGroup legacysupport 1.1
</span> legacysupport.newest_darwin_requires_legacy 15
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup aircrack-ng aircrack-ng 1.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 895537d6c14f9ce5efa9913d2933a1bfe19604da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4f0bfd486efc6ea7229f7fbc54340ff8b2094a0d73e9f617e0a39f878999a247 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7933308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup aircrack-ng aircrack-ng 1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 aa9ff18ba8a667abed846f7d2a47d0992ce90d82 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 05a704e3c8f7792a17315080a21214a4448fd2452c1b0dd5226a3a55f90b58c3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7740634
</span>
categories security
license GPL-2+ BSD OpenSSL
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,13 +50,6 @@ depends_lib port:hwloc \
</span> port:sqlite3
patchfiles-append aircrack_ng_mac.m4.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append airodump.c.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append VERSION.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/VERSION ${worksrcpath}/AC_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/VERSION.in ${worksrcpath}/AC_VERSION.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# cpuid, cpuid_count, get_cpuid_max
# https://github.com/aircrack-ng/aircrack-ng/issues/1717
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/files/VERSION.patch b/security/aircrack-ng/files/VERSION.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 42a7cbe857c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/files/VERSION.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Do not use a file called VERSION. It interferes with the C++20 <version>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-header on case-insensitive filesystems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/aircrack-ng/aircrack-ng/commit/35169a66becf48fd014cb5124da3b61b4d25d812
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.am.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,7 +65,7 @@ bin_PROGRAMS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sbin_PROGRAMS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- noinst_LTLIBRARIES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib_LTLIBRARIES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--EXTRA_DIST = VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EXTRA_DIST = AC_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_PROGRAMS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TESTS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INTEGRATION_TESTS =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,6 +37,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If you delete this exception statement from all source files in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # program, then also delete it here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+m4_pattern_allow([AC_VERSION])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m4_define([version_date], "January 2020")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m4_define([version_major], 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m4_define([version_minor], 6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,7 +231,7 @@ LIBS="$opt_libs $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CONFIG_FILES([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/aircrack-ng/version.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- evalrev.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ evalrev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,7 @@ elif test -d "${DIR}/.svn"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SCM="_r1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- REVISION="$(cat ${DIR}/VERSION)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ REVISION="$(cat ${DIR}/AC_VERSION)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$CMD" = "xscm"; then
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/files/aircrack_ng_mac.m4.patch b/security/aircrack-ng/files/aircrack_ng_mac.m4.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index bf0726ed70f..9017a019b29 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/files/aircrack_ng_mac.m4.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/aircrack-ng/files/aircrack_ng_mac.m4.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,57 @@
</span> Do not look in default Homebrew or MacPorts paths.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/m4/aircrack_ng_mac.m4.orig 2018-07-10 13:05:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/m4/aircrack_ng_mac.m4 2018-07-16 11:30:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,40 +46,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/m4/aircrack_ng_mac.m4.orig 2022-05-10 18:01:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/m4/aircrack_ng_mac.m4 2022-05-14 01:13:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,67 +46,6 @@
</span>
case "$host_os" in
DARWIN*|MACOS*|darwin*|macos*)
- dnl
- dnl Homebrew
- dnl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_ARG_VAR([BREW],[Use this brew for macOS dependencies.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dnl Allow env override but do not be fooled by 'BREW=t'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test t = "$BREW" && unset BREW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_PROG([BREW], [brew], [$as_dir/$ac_word$ac_exec_ext], [], [$BREW_PATH$PATH_SEPARATOR$PATH$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR/usr/local/bin])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS_IF([test "x$BREW" = "x"],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_WARN([Homebrew not found])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BREW_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_ARG_VAR([BREW],[Use this brew for macOS dependencies.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl Allow env override but do not be fooled by 'BREW=t'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test t = "$BREW" && unset BREW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_PROG([BREW], [brew], [$as_dir/$ac_word$ac_exec_ext], [], [$BREW_PATH$PATH_SEPARATOR$PATH$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR/usr/local/bin])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([test "x$BREW" = "x"],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_WARN([Homebrew not found])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BREW_FOUND=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BREW_FOUND=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING([for openssl availability within Brew])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([! $BREW --prefix --installed openssl 2>/dev/null], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING([for openssl@1.1 availability within Brew])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([! $BREW --prefix --installed openssl@1.1 2>/dev/null], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING([for openssl@3 availability within Brew])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([! $BREW --prefix --installed openssl@3 2>/dev/null], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl@3)/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CXXFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl@3)/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl@3)/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="-L$($BREW --prefix openssl@3)/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-I$($BREW --prefix openssl@1.1)/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CXXFLAGS="-I$($BREW --prefix openssl@1.1)/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="-I$($BREW --prefix openssl@1.1)/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="-L$($BREW --prefix openssl@1.1)/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span> - ], [
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- BREW_FOUND=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl)/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CXXFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl)/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl)/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="-L$($BREW --prefix openssl)/lib"
</span> - ])
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$BREW_FOUND" = xyes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS -I$(brew --prefix openssl)/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS="$CXXFLAGS -I$(brew --prefix openssl)/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPPFLAGS="$CPPFLAGS -I$(brew --prefix openssl)/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="$LDFLAGS -L$(brew --prefix openssl)/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span> -
- AC_CHECK_FILE(/usr/local/Homebrew, [ CPPFLAGS="$CPPFLAGS -I/usr/local/include" ])
-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/files/airodump.c.patch b/security/aircrack-ng/files/airodump.c.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 45683bc8a3c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/files/airodump.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ld: duplicate symbol _h80211 in ./.libs/libaircrack.a(libaircrack_la-communications.o) and src/airodump-ng/airodump_ng-airodump-ng.o for architecture x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/airodump-ng/airodump-ng.c.orig 2022-04-27 22:45:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/airodump-ng/airodump-ng.c 2022-04-27 22:46:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,8 +92,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "radiotap/radiotap_iter.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct devices dev;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--uint8_t h80211[4096] __attribute__((aligned(16)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--uint8_t tmpbuf[4096] __attribute__((aligned(16)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const unsigned char llcnull[] = {0, 0, 0, 0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>