net-mgmt/aircrack-ng:

- Update to 1.3
- Remove timestamps from patchfiles

8 files changed, 66 insertions, 50 deletions

diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index 77290971e0bb..e30eb58ca96f 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	aircrack-ng
-DISTVERSION=	1.2
-PORTREVISION=	1
+DISTVERSION=	1.3
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://download.aircrack-ng.org/
 
-MAINTAINER=	lme@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	802.11 WEP and WPA-PSK keys cracking program
 
 LICENSE=	GPLv2 BSD3CLAUSE APACHE20
@@ -24,7 +23,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-experimental
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 CPE_UPDATE=	${DISTVERSION:C/^[^-]*$//:C/.*-//}
-DOS2UNIX_FILES=	src/osdep/byteorder.h
+DOS2UNIX_FILES=	src/aircrack-osdep/byteorder.h
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 # Don't call 'strip' target with WITH_DEBUG set
diff --git a/net-mgmt/aircrack-ng/distinfo b/net-mgmt/aircrack-ng/distinfo
index f61802cdfd21..e4455df9594f 100644
--- a/net-mgmt/aircrack-ng/distinfo
+++ b/net-mgmt/aircrack-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525326477
-SHA256 (aircrack-ng-1.2.tar.gz) = 794ffed5400f35cb78f3466eabb47546f050e0ac35287c174acce60763a0fa7c
-SIZE (aircrack-ng-1.2.tar.gz) = 4517658
+TIMESTAMP = 1531293118
+SHA256 (aircrack-ng-1.3.tar.gz) = 8ae08a7c28741f6ace2769267112053366550e7f746477081188ad38410383ca
+SIZE (aircrack-ng-1.3.tar.gz) = 4501507
diff --git a/net-mgmt/aircrack-ng/files/patch-scripts_airmon-ng.freebsd b/net-mgmt/aircrack-ng/files/patch-scripts_airmon-ng.freebsd
index 7dfacf626bf5..32f6b2fb9a66 100644
--- a/net-mgmt/aircrack-ng/files/patch-scripts_airmon-ng.freebsd
+++ b/net-mgmt/aircrack-ng/files/patch-scripts_airmon-ng.freebsd
@@ -1,5 +1,5 @@
---- scripts/airmon-ng.freebsd.orig	2018-04-15 22:57:19.000000000 +0200
-+++ scripts/airmon-ng.freebsd	2018-05-03 09:06:10.998358000 +0200
+--- scripts/airmon-ng.freebsd.orig
++++ scripts/airmon-ng.freebsd
 @@ -1,25 +1,31 @@
  #!/bin/sh
  
diff --git a/net-mgmt/aircrack-ng/files/patch-scripts_airodump-ng-oui-update b/net-mgmt/aircrack-ng/files/patch-scripts_airodump-ng-oui-update
index 3fb865ce4c6f..44dd3d28548c 100644
--- a/net-mgmt/aircrack-ng/files/patch-scripts_airodump-ng-oui-update
+++ b/net-mgmt/aircrack-ng/files/patch-scripts_airodump-ng-oui-update
@@ -1,4 +1,4 @@
---- scripts/airodump-ng-oui-update.orig	2015-07-02 23:53:33 UTC
+--- scripts/airodump-ng-oui-update.orig
 +++ scripts/airodump-ng-oui-update
 @@ -44,50 +44,37 @@ if [ ! -d "${OUI_PATH}" ]; then
  	mkdir -p ${OUI_PATH}
@@ -16,45 +16,30 @@
 -	else
 -		${CURL} -L ${OUI_DOWNLOAD_URL} > ${OUI_IEEE} 2>/dev/null
 -	fi
-+# Delete previous partially downloaded file (if the script was aborted)
-+rm -f ${OUI_IEEE} >/dev/null 2>/dev/null
- 
+-
 -	if [ "${?}" -ne 0 ]; then
 -		echo "[*] Error: Failed to download OUI list, aborting..."
 -		exit 1
 -	fi
-+# Download it
-+echo "[*] Downloading IEEE OUI file..."
- 
+-
 -	# Parse the downloaded OUI list
 -	echo "[*] Parsing OUI file..."
-+fetch -o "${OUI_IEEE}" ${OUI_DOWNLOAD_URL}
- 
+-
 -	# Keep the previous file
 -	if [ -f "${OUI_DOWNLOADED}" ]; then
 -		mv ${AIRODUMP_NG_OUI} ${OUI}-old
 -	fi
-+if [ "${?}" -ne 0 ]; then
-+	echo "[*] Error: Failed to download OUI list, aborting..."
-+	exit 1
-+fi
- 
+-
 -	# Parse it
 -	grep "(hex)" ${OUI_IEEE} | sed 's/^[ \t]*//g;s/[ \t]*$//g' > ${AIRODUMP_NG_OUI}
 -	if [ "${?}" -ne 0 ]; then
 -		echo "[*] Error: Failed to parse OUI, aborting..."
 -		exit 1
 -	fi
-+# Parse the downloaded OUI list
-+echo "[*] Parsing OUI file..."
- 
+-
 -	# Cleanup
 -	rm -f ${OUI_IEEE}
-+# Keep the previous file
-+if [ -f "${OUI_DOWNLOADED}" ]; then
-+	mv ${AIRODUMP_NG_OUI} ${OUI}-old
-+fi
- 
+-
 -	echo "[*] Airodump-ng OUI file successfully updated"
 -else
 -	if [ -f "${OUI}" ]; then
@@ -62,13 +47,34 @@
 -	else
 -		echo "[*] Please install curl or wget to install OUI list"
 -	fi
-+# Parse it
-+grep "(hex)" ${OUI_IEEE} | sed 's/^[ \t]*//g;s/[ \t]*$//g' > ${AIRODUMP_NG_OUI}
++# Delete previous partially downloaded file (if the script was aborted)
++rm -f ${OUI_IEEE} >/dev/null 2>/dev/null
++
++# Download it
++echo "[*] Downloading IEEE OUI file..."
++
++fetch -o "${OUI_IEEE}" ${OUI_DOWNLOAD_URL}
++
 +if [ "${?}" -ne 0 ]; then
-+	echo "[*] Error: Failed to parse OUI, aborting..."
++	echo "[*] Error: Failed to download OUI list, aborting..."
  	exit 1
  fi
  
++# Parse the downloaded OUI list
++echo "[*] Parsing OUI file..."
++
++# Keep the previous file
++if [ -f "${OUI_DOWNLOADED}" ]; then
++	mv ${AIRODUMP_NG_OUI} ${OUI}-old
++fi
++
++# Parse it
++grep "(hex)" ${OUI_IEEE} | sed 's/^[ \t]*//g;s/[ \t]*$//g' > ${AIRODUMP_NG_OUI}
++if [ "${?}" -ne 0 ]; then
++	echo "[*] Error: Failed to parse OUI, aborting..."
++	exit 1
++fi
++
 +# Cleanup
 +rm -f ${OUI_IEEE}
 +
diff --git a/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h b/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
index 159af3c5e06d..0f5831039112 100644
--- a/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
+++ b/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
@@ -1,11 +1,11 @@
---- src/osdep/byteorder.h.orig	2016-04-28 20:42:03 UTC
-+++ src/osdep/byteorder.h
-@@ -181,7 +181,7 @@
+--- src/aircrack-osdep/byteorder.h.orig
++++ src/aircrack-osdep/byteorder.h
+@@ -189,7 +189,7 @@ typedef uint8_t u_int8_t;
  	 * Solaris
  	 * -------
  	 */
--	#if defined(__SVR4) && defined(__sun__)
-+	#if defined(__sparc__) && defined(__SVR4) && defined(__sun__)
- 	#include <sys/byteorder.h>
- 	#include <sys/types.h>
- 	#include <unistd.h>
+-#if defined(__SVR4) && defined(__sun__)
++#if defined(__sparc__) && defined(__SVR4) && defined(__sun__)
+ #include <sys/byteorder.h>
+ #include <sys/types.h>
+ #include <unistd.h>
diff --git a/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c b/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c
index b29242d35265..d9e3967cc75c 100644
--- a/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c
+++ b/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c
@@ -1,5 +1,5 @@
---- src/osdep/file.c.orig	2018-01-11 15:45:35 UTC
-+++ src/osdep/file.c
+--- src/aircrack-osdep/file.c.orig
++++ src/aircrack-osdep/file.c
 @@ -33,7 +33,7 @@
  #include <err.h>
  
diff --git a/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c b/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c
index 55c5cd5d92cd..2cc5ed3b739f 100644
--- a/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c
+++ b/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c
@@ -1,5 +1,5 @@
---- src/osdep/radiotap/radiotap.c.orig	2016-02-08 04:12:03 UTC
-+++ src/osdep/radiotap/radiotap.c
+--- src/aircrack-osdep/radiotap/radiotap.c.orig
++++ src/aircrack-osdep/radiotap/radiotap.c
 @@ -20,6 +20,16 @@
  #endif
  
diff --git a/net-mgmt/aircrack-ng/pkg-plist b/net-mgmt/aircrack-ng/pkg-plist
index a68e41384aea..691778ea275a 100644
--- a/net-mgmt/aircrack-ng/pkg-plist
+++ b/net-mgmt/aircrack-ng/pkg-plist
@@ -9,10 +9,21 @@ bin/kstats
 bin/makeivs-ng
 bin/packetforge-ng
 bin/wpaclean
-libexec/aircrack-ng/aircrack-ng--avx
-libexec/aircrack-ng/aircrack-ng--avx2
-libexec/aircrack-ng/aircrack-ng--generic
-libexec/aircrack-ng/aircrack-ng--sse2
+lib/libaircrack-crypto-x86-avx.so
+lib/libaircrack-crypto-x86-avx.so.0
+lib/libaircrack-crypto-x86-avx.so.0.0.0
+lib/libaircrack-crypto-x86-avx2.so
+lib/libaircrack-crypto-x86-avx2.so.0
+lib/libaircrack-crypto-x86-avx2.so.0.0.0
+lib/libaircrack-crypto-x86-sse2.so
+lib/libaircrack-crypto-x86-sse2.so.0
+lib/libaircrack-crypto-x86-sse2.so.0.0.0
+lib/libaircrack-crypto.so
+lib/libaircrack-crypto.so.0
+lib/libaircrack-crypto.so.0.0.0
+lib/libaircrack-osdep.so
+lib/libaircrack-osdep.so.0
+lib/libaircrack-osdep.so.0.0.0
 man/man1/aircrack-ng.1.gz
 man/man1/airdecap-ng.1.gz
 man/man1/airdecloak-ng.1.gz