[133700] trunk/dports/security/aircrack-ng

ryandesign at macports.org ryandesign at macports.org
Sun Mar 8 23:25:39 PDT 2015


Revision: 133700
          https://trac.macports.org/changeset/133700
Author:   ryandesign at macports.org
Date:     2015-03-08 23:25:38 -0700 (Sun, 08 Mar 2015)
Log Message:
-----------
aircrack-ng: update to 1.2-rc1

Modified Paths:
--------------
    trunk/dports/security/aircrack-ng/Portfile
    trunk/dports/security/aircrack-ng/files/patch-common.mak.diff
    trunk/dports/security/aircrack-ng/files/patch-src-Makefile.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

Added Paths:
-----------
    trunk/dports/security/aircrack-ng/files/patch-src-osdep-radiotap-platform.h.diff
    trunk/dports/security/aircrack-ng/files/portable_endian.h

Modified: trunk/dports/security/aircrack-ng/Portfile
===================================================================
--- trunk/dports/security/aircrack-ng/Portfile	2015-03-09 05:47:32 UTC (rev 133699)
+++ trunk/dports/security/aircrack-ng/Portfile	2015-03-09 06:25:38 UTC (rev 133700)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                aircrack-ng
-version             1.1
-revision            1
+version             1.2-rc1
 categories          security
 license             GPL-2
 platforms           darwin
@@ -24,19 +23,21 @@
 homepage            http://aircrack-ng.org/
 master_sites        http://download.aircrack-ng.org/
 
-checksums           md5     f7a24ed8fad122c4187d06bfd6f998b4 \
-                    sha1    16eed1a8cf06eb8274ae382150b56589b23adf77 \
-                    rmd160  7d70533b0397e801d4a85c1be3584699364f3d38
+checksums           rmd160  9c27291de607207b10f3ac43fbe44c63b408ff1d \
+                    sha256  cf3134521e1c3d7aed4e384e3e5e7b6959e2d485bd1554474608a3a9328e35fd
 
 patchfiles          patch-common.mak.diff \
                     patch-src-Makefile.diff \
                     patch-src-aircrack-ng.c.diff \
                     patch-src-common.h.diff \
+                    patch-src-osdep-radiotap-platform.h.diff \
                     patch-src-sha1-sse2.h.diff
 
-depends_build       port:gmake
+depends_build       port:gmake \
+                    port:pkgconfig
 
 depends_lib         port:openssl \
+                    port:pcre \
                     port:sqlite3
 
 use_configure       no
@@ -48,8 +49,13 @@
 build.cmd           ${prefix}/bin/gmake
 
 build.args          prefix=${prefix} \
+                    libnl=false \
+                    pcre=true \
                     sqlite=true \
                     ASM_AC= \
-                    CC="${configure.cc} [get_canonical_archflags cc]"
+                    CC="${configure.cc} [get_canonical_archflags cc] -I${filespath}"
 
 destroot.args       prefix=${prefix}
+
+livecheck.type      regex
+livecheck.regex     ${name}-(\[0-9a-z.-\]+)${extract.suffix}

Modified: trunk/dports/security/aircrack-ng/files/patch-common.mak.diff
===================================================================
--- trunk/dports/security/aircrack-ng/files/patch-common.mak.diff	2015-03-09 05:47:32 UTC (rev 133699)
+++ trunk/dports/security/aircrack-ng/files/patch-common.mak.diff	2015-03-09 06:25:38 UTC (rev 133700)
@@ -1,48 +1,11 @@
---- 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	=
+--- ../aircrack-ng-1.2-rc1-orig/common.mak	2014-07-24 18:39:05.000000000 -0500
++++ common.mak	2015-03-09 01:16:34.000000000 -0500
+@@ -39,7 +39,7 @@
  endif
-@@ -31,16 +33,16 @@
+ 
+ ifeq ($(PCRE), true)
+-COMMON_CFLAGS += $(shell pcre-config --cflags) -DHAVE_PCRE
++COMMON_CFLAGS += $(shell pcre-config --cflags | sed -e 's%-I$(prefix)%-isystem$(prefix)%g') -DHAVE_PCRE
  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 
+ ifeq ($(OSNAME), cygwin)

Modified: trunk/dports/security/aircrack-ng/files/patch-src-Makefile.diff
===================================================================
--- trunk/dports/security/aircrack-ng/files/patch-src-Makefile.diff	2015-03-09 05:47:32 UTC (rev 133699)
+++ trunk/dports/security/aircrack-ng/files/patch-src-Makefile.diff	2015-03-09 06:25:38 UTC (rev 133700)
@@ -1,23 +1,11 @@
---- src/Makefile.orig	2010-02-13 16:32:28.000000000 -0600
-+++ src/Makefile	2014-04-26 18:05:02.000000000 -0500
-@@ -99,16 +99,16 @@
- LIBSSL		= -lssl -lcrypto $(LDFLAGS)
- LIBSQL		=
- ifeq ($(SQLITE), true)
+--- src/Makefile.orig	2014-03-22 15:26:59.000000000 -0500
++++ src/Makefile	2014-04-26 18:14:19.000000000 -0500
+@@ -101,7 +101,7 @@
+ 
+ 
+ ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true)
 -	LIBSQL		= -L/usr/local/lib -lsqlite3
 +	LIBSQL		= -L$(prefix)/lib -lsqlite3
  else
- 	ifeq ($(sqlite), true)
--		LIBSQL          = -L/usr/local/lib -lsqlite3
-+		LIBSQL          = -L$(prefix)/lib -lsqlite3
- 	else
- 		ifeq ($(SQLITE), TRUE)
--			LIBSQL          = -L/usr/local/lib -lsqlite3
-+			LIBSQL          = -L$(prefix)/lib -lsqlite3
- 		else
- 			ifeq ($(sqlite), TRUE)
--				LIBSQL          = -L/usr/local/lib -lsqlite3
-+				LIBSQL          = -L$(prefix)/lib -lsqlite3
- 			endif
- 		endif
- 	endif
+ 	LIBSQL		=
+ endif

Modified: trunk/dports/security/aircrack-ng/files/patch-src-aircrack-ng.c.diff
===================================================================
--- trunk/dports/security/aircrack-ng/files/patch-src-aircrack-ng.c.diff	2015-03-09 05:47:32 UTC (rev 133699)
+++ trunk/dports/security/aircrack-ng/files/patch-src-aircrack-ng.c.diff	2015-03-09 06:25:38 UTC (rev 133700)
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/aircrack-ng.c.orig	2014-03-30 20:39:15.000000000 -0500
++++ src/aircrack-ng.c	2014-04-26 18:15:48.000000000 -0500
+@@ -3933,7 +3933,7 @@
  	int i, j, len, slen;
  	int nparallel = 1;
  
@@ -9,7 +9,7 @@
  	// Check for SSE2, with SSE2 the algorithm works with 4 keys
  	if (shasse2_cpuid()>=2)
  		nparallel = 4;
-@@ -4626,7 +4626,7 @@
+@@ -5059,7 +5059,7 @@
  
  			case 'u' :
  				printf("Nb CPU detected: %d ", cpu_count);

Modified: trunk/dports/security/aircrack-ng/files/patch-src-common.h.diff
===================================================================
--- trunk/dports/security/aircrack-ng/files/patch-src-common.h.diff	2015-03-09 05:47:32 UTC (rev 133699)
+++ trunk/dports/security/aircrack-ng/files/patch-src-common.h.diff	2015-03-09 06:25:38 UTC (rev 133700)
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/common.h.orig	2012-02-09 09:14:11.000000000 -0600
++++ src/common.h	2014-04-26 18:15:48.000000000 -0500
+@@ -59,7 +59,7 @@
  #define CPUID_SSE2_AVAILABLE 2
  #define CPUID_NOTHING_AVAILABLE 0
  

Added: trunk/dports/security/aircrack-ng/files/patch-src-osdep-radiotap-platform.h.diff
===================================================================
--- trunk/dports/security/aircrack-ng/files/patch-src-osdep-radiotap-platform.h.diff	                        (rev 0)
+++ trunk/dports/security/aircrack-ng/files/patch-src-osdep-radiotap-platform.h.diff	2015-03-09 06:25:38 UTC (rev 133700)
@@ -0,0 +1,11 @@
+--- src/osdep/radiotap/platform.h.orig	2014-03-22 15:26:59.000000000 -0500
++++ src/osdep/radiotap/platform.h	2015-03-09 01:18:42.000000000 -0500
+@@ -3,7 +3,7 @@
+ #ifndef _BSD_SOURCE
+ #define _BSD_SOURCE
+ #endif
+-#include <endian.h>
++#include "portable_endian.h"
+ 
+ #define le16_to_cpu		le16toh
+ #define le32_to_cpu		le32toh

Modified: trunk/dports/security/aircrack-ng/files/patch-src-sha1-sse2.h.diff
===================================================================
--- trunk/dports/security/aircrack-ng/files/patch-src-sha1-sse2.h.diff	2015-03-09 05:47:32 UTC (rev 133699)
+++ trunk/dports/security/aircrack-ng/files/patch-src-sha1-sse2.h.diff	2015-03-09 06:25:38 UTC (rev 133700)
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/sha1-sse2.h.orig	2012-02-07 03:09:06.000000000 -0600
++++ src/sha1-sse2.h	2014-04-26 18:15:48.000000000 -0500
+@@ -43,7 +43,7 @@
  #include "crypto.h"
  
  

Added: trunk/dports/security/aircrack-ng/files/portable_endian.h
===================================================================
--- trunk/dports/security/aircrack-ng/files/portable_endian.h	                        (rev 0)
+++ trunk/dports/security/aircrack-ng/files/portable_endian.h	2015-03-09 06:25:38 UTC (rev 133700)
@@ -0,0 +1,115 @@
+// "License": Public Domain
+// I, Mathias Panzenböck, place this file hereby into the public domain. Use it at your own risk for whatever you like.
+
+#ifndef PORTABLE_ENDIAN_H__
+#define PORTABLE_ENDIAN_H__
+
+#if (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) && !defined(__WINDOWS__)
+
+#	define __WINDOWS__
+
+#endif
+
+#if defined(__linux__) || defined(__CYGWIN__)
+
+#	include <endian.h>
+
+#elif defined(__APPLE__)
+
+#	include <libkern/OSByteOrder.h>
+
+#	define htobe16(x) OSSwapHostToBigInt16(x)
+#	define htole16(x) OSSwapHostToLittleInt16(x)
+#	define be16toh(x) OSSwapBigToHostInt16(x)
+#	define le16toh(x) OSSwapLittleToHostInt16(x)
+ 
+#	define htobe32(x) OSSwapHostToBigInt32(x)
+#	define htole32(x) OSSwapHostToLittleInt32(x)
+#	define be32toh(x) OSSwapBigToHostInt32(x)
+#	define le32toh(x) OSSwapLittleToHostInt32(x)
+ 
+#	define htobe64(x) OSSwapHostToBigInt64(x)
+#	define htole64(x) OSSwapHostToLittleInt64(x)
+#	define be64toh(x) OSSwapBigToHostInt64(x)
+#	define le64toh(x) OSSwapLittleToHostInt64(x)
+
+#	define __BYTE_ORDER    BYTE_ORDER
+#	define __BIG_ENDIAN    BIG_ENDIAN
+#	define __LITTLE_ENDIAN LITTLE_ENDIAN
+#	define __PDP_ENDIAN    PDP_ENDIAN
+
+#elif defined(__OpenBSD__)
+
+#	include <sys/endian.h>
+
+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+
+#	include <sys/endian.h>
+
+#	define be16toh(x) betoh16(x)
+#	define le16toh(x) letoh16(x)
+
+#	define be32toh(x) betoh32(x)
+#	define le32toh(x) letoh32(x)
+
+#	define be64toh(x) betoh64(x)
+#	define le64toh(x) letoh64(x)
+
+#elif defined(__WINDOWS__)
+
+#	include <winsock2.h>
+#	include <sys/param.h>
+
+#	if BYTE_ORDER == LITTLE_ENDIAN
+
+#		define htobe16(x) htons(x)
+#		define htole16(x) (x)
+#		define be16toh(x) ntohs(x)
+#		define le16toh(x) (x)
+ 
+#		define htobe32(x) htonl(x)
+#		define htole32(x) (x)
+#		define be32toh(x) ntohl(x)
+#		define le32toh(x) (x)
+ 
+#		define htobe64(x) htonll(x)
+#		define htole64(x) (x)
+#		define be64toh(x) ntohll(x)
+#		define le64toh(x) (x)
+
+#	elif BYTE_ORDER == BIG_ENDIAN
+
+		/* that would be xbox 360 */
+#		define htobe16(x) (x)
+#		define htole16(x) __builtin_bswap16(x)
+#		define be16toh(x) (x)
+#		define le16toh(x) __builtin_bswap16(x)
+ 
+#		define htobe32(x) (x)
+#		define htole32(x) __builtin_bswap32(x)
+#		define be32toh(x) (x)
+#		define le32toh(x) __builtin_bswap32(x)
+ 
+#		define htobe64(x) (x)
+#		define htole64(x) __builtin_bswap64(x)
+#		define be64toh(x) (x)
+#		define le64toh(x) __builtin_bswap64(x)
+
+#	else
+
+#		error byte order not supported
+
+#	endif
+
+#	define __BYTE_ORDER    BYTE_ORDER
+#	define __BIG_ENDIAN    BIG_ENDIAN
+#	define __LITTLE_ENDIAN LITTLE_ENDIAN
+#	define __PDP_ENDIAN    PDP_ENDIAN
+
+#else
+
+#	error platform not supported
+
+#endif
+
+#endif


Property changes on: trunk/dports/security/aircrack-ng/files/portable_endian.h
___________________________________________________________________
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150308/0fd5acb3/attachment-0001.html>


More information about the macports-changes mailing list