<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/04f1b1c756836a7194b320d3798a40793b95bfad">https://github.com/macports/macports-ports/commit/04f1b1c756836a7194b320d3798a40793b95bfad</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 04f1b1c aircrack-ng: Update to 1.2-rc4
</span>04f1b1c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 04f1b1c756836a7194b320d3798a40793b95bfad
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 18 03:13:16 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> aircrack-ng: Update to 1.2-rc4
</span>---
security/aircrack-ng/Portfile | 23 +++++++++++-----------
security/aircrack-ng/files/patch-autocfg.diff | 11 +++++++++++
security/aircrack-ng/files/patch-common.mak.diff | 17 +++++++++++++---
security/aircrack-ng/files/patch-src-Makefile.diff | 15 +++++++++++---
.../aircrack-ng/files/patch-src-aircrack-ng.c.diff | 21 --------------------
security/aircrack-ng/files/patch-src-common.h.diff | 12 -----------
.../aircrack-ng/files/patch-src-sha1-sse2.h.diff | 12 -----------
7 files changed, 48 insertions(+), 63 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 1eb0e24..6a0b20d 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;'>@@ -3,10 +3,9 @@
</span> PortSystem 1.0
name aircrack-ng
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2-rc3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2-rc4
</span> categories security
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2 BSD OpenSSL
</span> platforms darwin
maintainers ryandesign openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,14 +22,12 @@ long_description aircrack is an 802.11 WEP and WPA-PSK keys cracking \
</span> homepage http://aircrack-ng.org/
master_sites http://download.aircrack-ng.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8b6235217eabbbc1d86d0d96378dac4d1082c113 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8e595ccab9fe90fc7c770634ad13e30da2d7fef21497b34d56d7014b991a4585
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ed14c05762ba68598819238ed0152fc7c727a929 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d93ac16aade5b4d37ab8cdf6ce4b855835096ccf83deb65ffdeff6d666eaff36
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-common.mak.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-aircrack-ng.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-common.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-sha1-sse2.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-autocfg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-common.mak.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-Makefile.diff
</span>
depends_build port:gmake \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,12 +46,14 @@ build.cmd ${prefix}/bin/gmake
</span>
build.args prefix=${prefix} \
libnl=false \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ macport=true \
</span> pcre=true \
sqlite=true \
ASM_AC= \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc} [get_canonical_archflags cc] -I${filespath}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC="${configure.cc} ${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args {*}${build.args}
</span>
livecheck.type regex
livecheck.regex ${name}-(\[0-9a-z.-\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/files/patch-autocfg.diff b/security/aircrack-ng/files/patch-autocfg.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..084f81b
</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/patch-autocfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- autocfg.orig 2016-02-07 23:12:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ autocfg 2017-01-18 02:37:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SIMDSIZE=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SIMDFLAG=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ ! $1 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ ! "$1" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Usage: $0 <compiler> [cfgpath]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 127
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/files/patch-common.mak.diff b/security/aircrack-ng/files/patch-common.mak.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b2a1bbc..5e5cc31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/files/patch-common.mak.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/aircrack-ng/files/patch-common.mak.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- common.mak.orig 2015-04-02 00:24:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ common.mak 2015-05-09 02:01:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common.mak.orig 2015-12-31 13:42:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common.mak 2017-01-18 02:49:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,8 +46,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(subst TRUE,true,$(filter TRUE true,$(macport) $(MACPORT))),true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMON_CFLAGS += -I/opt/local/include -I../..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS += -L/opt/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMON_CFLAGS += -isystem$(prefix)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS += -L$(prefix)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@
</span> endif
ifeq ($(PCRE), true)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/files/patch-src-Makefile.diff b/security/aircrack-ng/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a99c96..4221297 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/aircrack-ng/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2015-04-08 23:22:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2015-05-09 02:03:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -102,7 +102,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2015-12-30 02:23:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2016-03-17 09:28:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,7 +132,7 @@
</span>
ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,12 @@
</span> else
LIBSQL =
endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,7 +144,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config: $(AC_ROOT)/common.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(AC_ROOT)/common.cfg:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sh $(AC_ROOT)/autocfg $(CC) $(AC_ROOT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sh $(AC_ROOT)/autocfg "$(CC)" $(AC_ROOT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LIBLINECOUNT): $(SRC_LINECOUNT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(AR) cru $(LIBLINECOUNT) $(SRC_LINECOUNT)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/files/patch-src-aircrack-ng.c.diff b/security/aircrack-ng/files/patch-src-aircrack-ng.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aaf2e16..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/files/patch-src-aircrack-ng.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.aircrack-ng.org/ticket/1655
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aircrack-ng.c.orig 2015-04-08 23:47:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aircrack-ng.c 2015-05-09 02:03:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3929,7 +3929,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i, j, len, slen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int nparallel = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__i386__) || defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Check for SSE2, with SSE2 the algorithm works with 4 keys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (shasse2_cpuid()>=2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nparallel = 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5042,7 +5042,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 'u' :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("Nb CPU detected: %d ", cpu_count);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__i386__) || defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unused = shasse2_cpuid();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (unused == 1) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/files/patch-src-common.h.diff b/security/aircrack-ng/files/patch-src-common.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aa3e469..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/files/patch-src-common.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.aircrack-ng.org/ticket/1655
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/common.h.orig 2012-02-09 09:14:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/common.h 2014-04-26 18:15:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CPUID_SSE2_AVAILABLE 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CPUID_NOTHING_AVAILABLE 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__i386__) || defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CPUID() shasse2_cpuid()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CPUID() CPUID_NOTHING_AVAILABLE
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aircrack-ng/files/patch-src-sha1-sse2.h.diff b/security/aircrack-ng/files/patch-src-sha1-sse2.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f8028ba..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aircrack-ng/files/patch-src-sha1-sse2.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.aircrack-ng.org/ticket/1655
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/sha1-sse2.h.orig 2014-07-11 21:24:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/sha1-sse2.h 2015-05-09 02:03:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "crypto.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__i386__) || defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void show_result(char* key, unsigned char* pmk)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>