<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/f23f9368c07a542db10ad8760b28d40681246ac5">https://github.com/macports/macports-ports/commit/f23f9368c07a542db10ad8760b28d40681246ac5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f23f9368c07 aircrack-ng: remove obsolete patch and fix 10.6 build
</span>f23f9368c07 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f23f9368c07a542db10ad8760b28d40681246ac5
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Thu Apr 28 07:36:40 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> aircrack-ng: remove obsolete patch and fix 10.6 build
</span>---
security/aircrack-ng/Portfile | 6 +++---
security/aircrack-ng/files/airodump.c.patch | 13 +++++++++++++
security/aircrack-ng/files/dprintf.patch | 24 ------------------------
3 files changed, 16 insertions(+), 27 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 fa6be1f1f8f..cc4d61c7417 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;'>@@ -4,10 +4,10 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# strnlen, getline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# strnlen, getline, dprintf
</span> # https://github.com/aircrack-ng/aircrack-ng/issues/1682
# clock_gettime
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span> legacysupport.newest_darwin_requires_legacy 15
epoch 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ 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 dprintf.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append airodump.c.patch
</span>
patchfiles-append VERSION.patch
post-patch {
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..45683bc8a3c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/aircrack-ng/files/airodump.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/airodump-ng/airodump-ng.c.orig 2022-04-27 22:45:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/airodump-ng/airodump-ng.c 2022-04-27 22:46:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,8 +92,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "radiotap/radiotap_iter.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct devices dev;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-uint8_t h80211[4096] __attribute__((aligned(16)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-uint8_t tmpbuf[4096] __attribute__((aligned(16)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const unsigned char llcnull[] = {0, 0, 0, 0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/files/dprintf.patch b/security/aircrack-ng/files/dprintf.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aa192dc8a4e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/files/dprintf.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't use dprintf when the deployment target is 10.6 or earlier; dprintf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-was introduced in 10.7.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/airodump-ng/airodump-ng.c.orig 2020-01-25 14:20:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/airodump-ng/airodump-ng.c 2020-01-28 06:18:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,6 +72,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pcre.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "aircrack-ng/defs.h"
</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;'>- #include "aircrack-ng/support/pcap_local.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4894,7 +4898,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (signum == SIGALRM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__sun__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__sun__) || (defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stdout,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dprintf(STDERR_FILENO,
</span></pre><pre style='margin:0'>
</pre>