[119478] trunk/dports/security/aircrack-ng
ryandesign at macports.org
ryandesign at macports.org
Sat Apr 26 15:42:43 PDT 2014
Revision: 119478
https://trac.macports.org/changeset/119478
Author: ryandesign at macports.org
Date: 2014-04-26 15:42:43 -0700 (Sat, 26 Apr 2014)
Log Message:
-----------
aircrack-ng: use patchfiles instead of reinplaces
Modified Paths:
--------------
trunk/dports/security/aircrack-ng/Portfile
Added Paths:
-----------
trunk/dports/security/aircrack-ng/files/
trunk/dports/security/aircrack-ng/files/patch-common.mak.diff
trunk/dports/security/aircrack-ng/files/patch-src-aircrack-ng.c.diff
trunk/dports/security/aircrack-ng/files/patch-src-common.h.diff
trunk/dports/security/aircrack-ng/files/patch-src-sha1-sse2.h.diff
Modified: trunk/dports/security/aircrack-ng/Portfile
===================================================================
--- trunk/dports/security/aircrack-ng/Portfile 2014-04-26 22:26:58 UTC (rev 119477)
+++ trunk/dports/security/aircrack-ng/Portfile 2014-04-26 22:42:43 UTC (rev 119478)
@@ -26,16 +26,11 @@
sha1 16eed1a8cf06eb8274ae382150b56589b23adf77 \
rmd160 7d70533b0397e801d4a85c1be3584699364f3d38
-post-patch {
- reinplace s@/usr/local@${prefix}@ ${worksrcpath}/common.mak
- reinplace s/-Werror// ${worksrcpath}/common.mak
+patchfiles patch-common.mak.diff \
+ patch-src-aircrack-ng.c.diff \
+ patch-src-common.h.diff \
+ patch-src-sha1-sse2.h.diff
- reinplace -E {s/#if defined.*/#if 0/} \
- ${worksrcpath}/src/aircrack-ng.c \
- ${worksrcpath}/src/common.h \
- ${worksrcpath}/src/sha1-sse2.h
-}
-
depends_build port:gmake
depends_lib port:openssl
@@ -48,7 +43,8 @@
build.cmd ${prefix}/bin/gmake
-build.args ASM_AC= \
+build.args prefix=${prefix} \
+ ASM_AC= \
CC="${configure.cc} [get_canonical_archflags cc]"
-destroot.args mandir=${prefix}/share/man/man1
+destroot.args prefix=${prefix}
Added: trunk/dports/security/aircrack-ng/files/patch-common.mak.diff
===================================================================
--- trunk/dports/security/aircrack-ng/files/patch-common.mak.diff (rev 0)
+++ trunk/dports/security/aircrack-ng/files/patch-common.mak.diff 2014-04-26 22:42:43 UTC (rev 119478)
@@ -0,0 +1,48 @@
+--- common.mak.orig 2010-02-13 16:32:28.000000000 -0600
++++ common.mak 2014-04-26 17:38:59.000000000 -0500
+@@ -1,3 +1,5 @@
++prefix = /usr/local
++
+ ifndef TOOL_PREFIX
+ TOOL_PREFIX =
+ endif
+@@ -31,16 +33,16 @@
+ endif
+
+ ifeq ($(SQLITE), true)
+- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
++ COMMON_CFLAGS += -I$(prefix)/include -DHAVE_SQLITE
+ else
+ ifeq ($(sqlite), true)
+- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
++ COMMON_CFLAGS += -I$(prefix)/include -DHAVE_SQLITE
+ else
+ ifeq ($(SQLITE), TRUE)
+- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
++ COMMON_CFLAGS += -I$(prefix)/include -DHAVE_SQLITE
+ else
+ ifeq ($(sqlite), TRUE)
+- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
++ COMMON_CFLAGS += -I$(prefix)/include -DHAVE_SQLITE
+ endif
+ endif
+ endif
+@@ -67,14 +69,13 @@
+ REVFLAGS = -D_REVISION=$(REVISION)
+
+ OPTFLAGS = -D_FILE_OFFSET_BITS=64
+-CFLAGS ?= -g -W -Wall -Werror -O3
++CFLAGS ?= -g -W -Wall -O3
+ CFLAGS += $(OPTFLAGS) $(REVFLAGS) $(COMMON_CFLAGS)
+
+-prefix = /usr/local
+ bindir = $(prefix)/bin
+ sbindir = $(prefix)/sbin
+-mandir = $(prefix)/man/man1
+ datadir = $(prefix)/share
+ docdir = $(datadir)/doc/aircrack-ng
++mandir = $(datadir)/man/man1
+ libdir = $(prefix)/lib
+-etcdir = $(prefix)/etc/aircrack-ng
+\ No newline at end of file
++etcdir = $(prefix)/etc/aircrack-ng
Added: trunk/dports/security/aircrack-ng/files/patch-src-aircrack-ng.c.diff
===================================================================
--- trunk/dports/security/aircrack-ng/files/patch-src-aircrack-ng.c.diff (rev 0)
+++ trunk/dports/security/aircrack-ng/files/patch-src-aircrack-ng.c.diff 2014-04-26 22:42:43 UTC (rev 119478)
@@ -0,0 +1,20 @@
+--- src/aircrack-ng.c.orig 2010-04-09 09:50:14.000000000 -0500
++++ src/aircrack-ng.c 2014-04-26 17:21:12.000000000 -0500
+@@ -3852,7 +3852,7 @@
+ int i, j, len, slen;
+ int nparallel = 1;
+
+-#if defined(__i386__) || defined(__x86_64__)
++#if 0
+ // Check for SSE2, with SSE2 the algorithm works with 4 keys
+ if (shasse2_cpuid()>=2)
+ nparallel = 4;
+@@ -4626,7 +4626,7 @@
+
+ case 'u' :
+ printf("Nb CPU detected: %d ", cpu_count);
+-#if defined(__i386__) || defined(__x86_64__)
++#if 0
+ unused = shasse2_cpuid();
+
+ if (unused == 1) {
Added: trunk/dports/security/aircrack-ng/files/patch-src-common.h.diff
===================================================================
--- trunk/dports/security/aircrack-ng/files/patch-src-common.h.diff (rev 0)
+++ trunk/dports/security/aircrack-ng/files/patch-src-common.h.diff 2014-04-26 22:42:43 UTC (rev 119478)
@@ -0,0 +1,11 @@
+--- src/common.h.orig 2009-06-13 21:06:59.000000000 -0500
++++ src/common.h 2014-04-26 17:21:12.000000000 -0500
+@@ -30,7 +30,7 @@
+ #define CPUID_SSE2_AVAILABLE 2
+ #define CPUID_NOTHING_AVAILABLE 0
+
+-#if defined(__i386__) || defined(__x86_64__)
++#if 0
+ #define CPUID() shasse2_cpuid()
+ #else
+ #define CPUID() CPUID_NOTHING_AVAILABLE
Added: trunk/dports/security/aircrack-ng/files/patch-src-sha1-sse2.h.diff
===================================================================
--- trunk/dports/security/aircrack-ng/files/patch-src-sha1-sse2.h.diff (rev 0)
+++ trunk/dports/security/aircrack-ng/files/patch-src-sha1-sse2.h.diff 2014-04-26 22:42:43 UTC (rev 119478)
@@ -0,0 +1,11 @@
+--- src/sha1-sse2.h.orig 2009-06-13 17:49:09.000000000 -0500
++++ src/sha1-sse2.h 2014-04-26 17:21:12.000000000 -0500
+@@ -15,7 +15,7 @@
+ #include "crypto.h"
+
+
+-#if defined(__i386__) || defined(__x86_64__)
++#if 0
+
+ void show_result(char* key, uchar* pmk)
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140426/6b704aa5/attachment.html>
More information about the macports-changes
mailing list