net-mgmt/aircrack-ng:

Update to 1.2

4 files changed, 66 insertions, 47 deletions

diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index 2fedfd48a58a..b83de289c7a1 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aircrack-ng
-DISTVERSION=	1.2-rc4
-PORTREVISION=	1
+DISTVERSION=	1.2
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://download.aircrack-ng.org/
 
@@ -15,15 +14,17 @@ LICENSE_COMB=	dual
 
 BROKEN_powerpc64=	fails to compile: sse-intrinsics.c: error: emmintrin.h: No such file or directory
 
-USES=		cpe dos2unix gmake ssl
+USES=		autoreconf cpe dos2unix gmake libtool ssl
+USE_GCC=	7.0+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-experimental
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 CPE_UPDATE=	${DISTVERSION:C/^[^-]*$//:C/.*-//}
 DOS2UNIX_FILES=	src/osdep/byteorder.h
-MAKE_ARGS=	experimental=true libnl=false prefix=${PREFIX}
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 # Don't call 'strip' target with WITH_DEBUG set
-INSTALL_TARGET=	${STRIP:S/-s/strip/} install
+#INSTALL_TARGET=	${STRIP:S/-s/strip/} install
 
 OPTIONS_DEFINE=	PCRE SQLITE
 OPTIONS_DEFAULT=PCRE SQLITE
@@ -40,9 +41,6 @@ SQLITE_MAKE_ARGS=	sqlite=true
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|share/\(man/man[1-9]\)|\1|' \
-			${WRKSRC}/common.mak
-	@${REINPLACE_CMD} \
 		-e 's|%%ETCDIR%%|${ETCDIR}|' ${WRKSRC}/scripts/airodump-ng-oui-update
 
 post-install:
diff --git a/net-mgmt/aircrack-ng/distinfo b/net-mgmt/aircrack-ng/distinfo
index 3bdb1f0f2472..f61802cdfd21 100644
--- a/net-mgmt/aircrack-ng/distinfo
+++ b/net-mgmt/aircrack-ng/distinfo
@@ -1,2 +1,3 @@
-SHA256 (aircrack-ng-1.2-rc4.tar.gz) = d93ac16aade5b4d37ab8cdf6ce4b855835096ccf83deb65ffdeff6d666eaff36
-SIZE (aircrack-ng-1.2-rc4.tar.gz) = 4379880
+TIMESTAMP = 1525326477
+SHA256 (aircrack-ng-1.2.tar.gz) = 794ffed5400f35cb78f3466eabb47546f050e0ac35287c174acce60763a0fa7c
+SIZE (aircrack-ng-1.2.tar.gz) = 4517658
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 8a9f441fce4e..7dfacf626bf5 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	2015-12-12 03:13:15 UTC
-+++ scripts/airmon-ng.freebsd
+--- 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
 @@ -1,25 +1,31 @@
  #!/bin/sh
  
@@ -45,7 +45,7 @@
  fi
  
  COMMAND=$1
-@@ -28,100 +34,143 @@ INTERFACE_TO_USE=$2
+@@ -28,103 +34,151 @@ INTERFACE_TO_USE=$2
  CHIPSET=""
  DRIVER=""
  PARENT=""
@@ -75,6 +75,7 @@
 +        [ "${PRODUCT_ID}" = "0x8193" ] && CHIPSET="RTL8192DU"
 +        [ "${PRODUCT_ID}" = "0x8199" ] && CHIPSET="RTL8187SU"
 +        [ "${PRODUCT_ID}" = "0x8812" ] && CHIPSET="RTL8812AU"
++        [ "${PRODUCT_ID}" = "0x8187" ] && CHIPSET="RTL8187L"
 +    elif [ "${VENDOR_ID}" = "0x06f8" ] && [ "${PRODUCT_ID}" = "0xe033" ]; then
 +        CHIPSET="RTL8188CUS"
 +    elif [ "${VENDOR_ID}" = "0x2001" ] && [ "${PRODUCT_ID}" = "0x3308" ]; then
@@ -93,8 +94,15 @@
 +        [ "${PRODUCT_ID}" = "0x9041" ] && CHIPSET="RTL8188CUS"
 +        [ "${PRODUCT_ID}" = "0x9042" ] && CHIPSET="RTL8188CUS"
 +        [ "${PRODUCT_ID}" = "0x9043" ] && CHIPSET="RTL8188CUS"
-+    fi
 +    [ -z "${CHIPSET}" ] && CHIPSET="Report dmesg and usbconfig (dump commands) to http://trac.aircrack-ng.org"
++    elif [ "${DRIVER}" = "run" ]; then
++    	CHIPSET="Ralink/Mediatek"
++    elif [ -n "${DRIVER}" ]; then
++    	CHIPSET="Report dmesg and usbconfig (dump commands) to http://trac.aircrack-ng.org"
++    else
++    	CHIPSET="Unknown"
++    	[ -z "${DRIVER}" ] && DRIVER="Unknown"
++    fi
 +}
  
  get_interface_info() {
@@ -110,8 +118,7 @@
 -			return
 -		fi
 -	fi	
-+    [ -z "$1" ] && return
- 
+-
 -	if [ "${DRIVER}" = "ath" ]; then
 -		CHIPSET=$(dmesg | grep -E "^$1: <" | tail -n 1 | awk -F\< '{print $2}' | awk -F\> '{print $1}' )
 -	elif [ "${DRIVER}" = "urtwn" ]; then
@@ -132,6 +139,7 @@
 -			[ "${PRODUCT_ID}" = "0x8193" ] && CHIPSET="RTL8192DU"
 -			[ "${PRODUCT_ID}" = "0x8199" ] && CHIPSET="RTL8187SU"
 -			[ "${PRODUCT_ID}" = "0x8812" ] && CHIPSET="RTL8812AU"
+-			[ "${PRODUCT_ID}" = "0x8187" ] && CHIPSET="RTL8187L"
 -		elif [ "${VENDOR_ID}" = "0x06f8" ] && [ "${PRODUCT_ID}" = "0xe033" ]; then
 -			CHIPSET="RTL8188CUS"
 -		elif [ "${VENDOR_ID}" = "0x2001" ] && [ "${PRODUCT_ID}" = "0x3308" ]; then
@@ -152,12 +160,16 @@
 -			[ "${PRODUCT_ID}" = "0x9043" ] && CHIPSET="RTL8188CUS"
 -		fi
 -		[ -z "${CHIPSET}" ] && CHIPSET="Report dmesg and usbconfig (dump commands) to http://trac.aircrack-ng.org" 
+-	elif [ "${DRIVER}" = "run" ]; then
+-		CHIPSET="Ralink/Mediatek"
 -	elif [ -n "${DRIVER}" ]; then
 -		CHIPSET="Report dmesg and usbconfig (dump commands) to http://trac.aircrack-ng.org"
 -	else
 -		CHIPSET="Unknown"
 -		[ -z "${DRIVER}" ] && DRIVER="Unknown"
 -	fi
++    [ -z "$1" ] && return
++
 +    ### Driver information
 +    # Parent interface check
 +    if [ -n "$(echo $1 | grep -E ${WIFI_IF_REGEX})" ]; then
@@ -192,9 +204,8 @@
 +    if [ -z "${DRIVER}" ]; then
 +        DRIVER="Unknown"
 +    fi
- }
- 
--printf "\nInterface\tDriver\t\tChipset\n\n"
++}
++
 +destroy_other_children() {
 +    for iface in ${VIRTUAL_DEVICES}; do
 +        local iface_idx=$(echo $1 | sed 's/[^0-9]*//g')
@@ -209,14 +220,7 @@
 +        fi
 +    done
 +}
- 
--for IFACE in $(ifconfig -a | grep -E '^(wlan|ath|otus|urtwn)[0-9]+' | awk -F: '{print $1}' )
--do
--	get_interface_info ${IFACE}
--	printf "${IFACE}\t\t${DRIVER}\t\t${CHIPSET}\n\n"
--	if [ -n "${PARENT}" ]; then
--		printf "\t(monitor mode interface. Parent: ${PARENT})\n"
--	fi
++
 +create_device() {
 +   local iface=$(ifconfig wlan create wlandev ${1} wlanmode ${2})
 +   if [ $? -eq 0 ]; then
@@ -225,8 +229,36 @@
 +       printf "Failed to create ${sta} mode interface from ${1}\n"
 +       exit 1
 +   fi
-+}
+ }
+ 
+-printf "\nInterface\tDriver\t\tChipset\n\n"
++if [ -n "${COMMAND}" ]; then
++    get_interface_info ${INTERFACE_TO_USE}
++    destroy_other_children ${INTERFACE_TO_USE}
++    case ${COMMAND} in
++        start) NEW_MODE=monitor ;;
++        stop) NEW_MODE=sta ;;
++    esac
++    create_device ${INTERFACE_TO_USE} ${NEW_MODE}
++fi
++
++printf "\nPhysical Interfaces:\n"
++printf "==================\n"
++printf "Interface\tDriver\t\tChipset\n"
++
++for IFACE in ${PHYSICAL_DEVICES}; do
++    get_interface_info ${IFACE}
++    printf "${IFACE}\t\t${DRIVER}\t\t${CHIPSET}\n"
++done
  
+-for IFACE in $(ifconfig -a | grep -E '^(wlan|ath|otus|urtwn)[0-9]+' | awk -F: '{print $1}' )
+-do
+-	get_interface_info ${IFACE}
+-	printf "${IFACE}\t\t${DRIVER}\t\t${CHIPSET}\n\n"
+-	if [ -n "${PARENT}" ]; then
+-		printf "\t(monitor mode interface. Parent: ${PARENT})\n"
+-	fi
+-
 -	if [ "${INTERFACE_TO_USE}" = "${IFACE}" ]; then
 -		if [ "${COMMAND}" = 'start' ]; then
 -			if [ -n "${PARENT}" ]; then
@@ -248,25 +280,6 @@
 -			fi
 -		fi
 -	fi 
-+if [ -n "${COMMAND}" ]; then
-+    get_interface_info ${INTERFACE_TO_USE}
-+    destroy_other_children ${INTERFACE_TO_USE}
-+    case ${COMMAND} in
-+        start) NEW_MODE=monitor ;;
-+        stop) NEW_MODE=sta ;;
-+    esac
-+    create_device ${INTERFACE_TO_USE} ${NEW_MODE}
-+fi
-+
-+printf "\nPhysical Interfaces:\n"
-+printf "==================\n"
-+printf "Interface\tDriver\t\tChipset\n"
-+
-+for IFACE in ${PHYSICAL_DEVICES}; do
-+    get_interface_info ${IFACE}
-+    printf "${IFACE}\t\t${DRIVER}\t\t${CHIPSET}\n"
-+done
-+
 +printf "\nVirtual Interfaces:\n"
 +printf "===================\n"
 +printf "Interface\tMode\t\tParent\n"
diff --git a/net-mgmt/aircrack-ng/pkg-plist b/net-mgmt/aircrack-ng/pkg-plist
index 0798f0ef3b74..a68e41384aea 100644
--- a/net-mgmt/aircrack-ng/pkg-plist
+++ b/net-mgmt/aircrack-ng/pkg-plist
@@ -2,12 +2,17 @@ bin/aircrack-ng
 bin/airdecap-ng
 bin/airdecloak-ng
 %%SQLITE%%bin/airolib-ng
+bin/besside-ng-crawler
 bin/buddy-ng
 bin/ivstools
 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
 man/man1/aircrack-ng.1.gz
 man/man1/airdecap-ng.1.gz
 man/man1/airdecloak-ng.1.gz
@@ -26,6 +31,7 @@ man/man8/airodump-ng-oui-update.8.gz
 man/man8/airodump-ng.8.gz
 man/man8/airserv-ng.8.gz
 man/man8/airtun-ng.8.gz
+man/man8/airventriloquist-ng.8.gz
 man/man8/besside-ng.8.gz
 man/man8/easside-ng.8.gz
 man/man8/tkiptun-ng.8.gz
@@ -37,6 +43,7 @@ sbin/airodump-ng
 sbin/airodump-ng-oui-update
 sbin/airserv-ng
 sbin/airtun-ng
+sbin/airventriloquist-ng
 sbin/besside-ng
 sbin/easside-ng
 sbin/tkiptun-ng