<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cccbb7068dedc40d1a4e0dd4369ea7ab335cb58c">https://github.com/macports/macports-ports/commit/cccbb7068dedc40d1a4e0dd4369ea7ab335cb58c</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 cccbb7068de aircrack-ng: Remove bad patch that broke PowerPC build
</span>cccbb7068de is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cccbb7068dedc40d1a4e0dd4369ea7ab335cb58c
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sat Nov 16 12:32:07 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> aircrack-ng: Remove bad patch that broke PowerPC build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The patch was an attempted backport of an arm64 build fix from John the
</span><span style='display:block; white-space:pre;color:#404040;'> Ripper: openwall/john@c9825e688d1fb9fdd8942ceb0a6b4457b0f9f9b4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> But the patch was not backported properly, and instead of changing
</span><span style='display:block; white-space:pre;color:#404040;'> anything for the arm64 build, it introduced a syntax error for the
</span><span style='display:block; white-space:pre;color:#404040;'> PowerPC build.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The problem the patch was trying to fix was already fixed in aircrack-ng
</span><span style='display:block; white-space:pre;color:#404040;'> 1.7: aircrack-ng/aircrack-ng@a4cdb89cae06545d547a6c15a5a92f7972fad38d
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also indicate that C++11 is required and use path dep for pkgconfig.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/71326
</span>---
security/aircrack-ng/Portfile | 8 +++++---
security/aircrack-ng/files/patch-psedo_intrinsics.patch | 15 ---------------
2 files changed, 5 insertions(+), 18 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 a782f8bbc1f..bf622d6553c 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;'>@@ -38,7 +38,7 @@ depends_build port:autoconf \
</span> port:automake \
port:gmake \
port:libtool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib port:hwloc \
port:libpcap \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,8 +46,10 @@ depends_lib port:hwloc \
</span> port:pcre \
port:sqlite3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append aircrack_ng_mac.m4.patch\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-psedo_intrinsics.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append aircrack_ng_mac.m4.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2011
</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/patch-psedo_intrinsics.patch b/security/aircrack-ng/files/patch-psedo_intrinsics.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5e30689651c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/files/patch-psedo_intrinsics.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/aircrack-ng/ce-wpa/pseudo_intrinsics.h.old
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/aircrack-ng/ce-wpa/pseudo_intrinsics.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,8 +162,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define vloadu vloadu_emu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define VLOADU_EMULATED 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define vor(x, y) (vtype) vec_or((x).v32, (y).v32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define vroti_epi32(x, i) (vtype) vec_rl((x).v32, (vset1_epi32(i)).v32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define vroti_epi64(x, i) (vtype) vec_rl((x).v64, (vset1_epi64(i)).v64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define (i > 0 ? (vtype)vsliq_n_u32(vshrq_n_u32((x).v32, 32 - ((i) & 31)), (x).v32, (i) & 31) : \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (vtype)vsriq_n_u32(vshlq_n_u32((x).v32, (32 + (i)) & 31), (x).v32, (-(i)) & 31))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define (i > 0 ? (vtype)vsliq_n_u64(vshrq_n_u64((x).v64, 64 - ((i) & 63)), (x).v64, (i) & 63) : \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (vtype)vsriq_n_u64(vshlq_n_u64((x).v64, (64 + (i)) & 63), (x).v64, (-(i)) & 63))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define vroti16_epi32 vroti_epi32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define vset1_epi32(x) vset_epi32(x, x, x, x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define vset1_epi64(x) vset_epi64(x, x)
</span></pre><pre style='margin:0'>
</pre>