Index: head/net-mgmt/aircrack-ng/Makefile
===================================================================
--- head/net-mgmt/aircrack-ng/Makefile	(revision 474425)
+++ head/net-mgmt/aircrack-ng/Makefile	(revision 474426)
@@ -1,53 +1,52 @@
 # Created by: Lars Engels <lars.engels@0x20.net>
 # $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
 LICENSE_COMB=	dual
 
 BROKEN_aarch64=		fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major
 BROKEN_armv6=		fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major
 BROKEN_armv7=		fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major
 BROKEN_powerpc64=	fails to compile: sse-intrinsics.c: error: emmintrin.h: No such file or directory
 
 USES=		autoreconf cpe dos2unix gmake libtool ssl
 USE_GCC=	yes
 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
 #INSTALL_TARGET=	${STRIP:S/-s/strip/} install
 
 OPTIONS_DEFINE=	PCRE SQLITE
 OPTIONS_DEFAULT=PCRE SQLITE
 OPTIONS_SUB=	yes
 
 PCRE_DESC=	Use Perl Compatible Regular Expressions for wesside
 PCRE_MAKE_ARGS=	pcre=true
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_USES=	pkgconfig
 
 SQLITE_DESC=	Use SQLite for storing pre-computed key tables
 SQLITE_USES=	sqlite
 SQLITE_MAKE_ARGS=	sqlite=true
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|%%ETCDIR%%|${ETCDIR}|' ${WRKSRC}/scripts/airodump-ng-oui-update
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
Index: head/net-mgmt/aircrack-ng/distinfo
===================================================================
--- head/net-mgmt/aircrack-ng/distinfo	(revision 474425)
+++ head/net-mgmt/aircrack-ng/distinfo	(revision 474426)
@@ -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
Index: head/net-mgmt/aircrack-ng/files/patch-scripts_airmon-ng.freebsd
===================================================================
--- head/net-mgmt/aircrack-ng/files/patch-scripts_airmon-ng.freebsd	(revision 474425)
+++ head/net-mgmt/aircrack-ng/files/patch-scripts_airmon-ng.freebsd	(revision 474426)
@@ -1,292 +1,292 @@
---- 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
  
 -
 -
  if [ -n "$1" ] && [ -z "$2" ]; then
 -	echo "Invalid command. Valid commands: [start|stop] INTERFACE."
 -	exit 1
 +    echo "Invalid command. Valid commands: [start|stop] INTERFACE"
 +    exit 1
  fi
  
  if [ -n "$1" ]; then
 -	if [ "$1" != 'stop' ] && [ "$1" != 'start' ]; then
 -		echo "Invalid command. Valid commands: [start|stop] INTERFACE."
 -		exit 1
 -	fi
 +    if [ "$1" != 'stop' ] && [ "$1" != 'start' ]; then
 +        echo "Invalid command. Valid commands: [start|stop] INTERFACE."
 +        exit 1
 +    fi
  fi
  
 +# Get device names from sysctl(8) for parent interfaces and ifconfig(8) for
 +PHYSICAL_DEVICES="$(sysctl -n net.wlan.devices)"
 +VIRTUAL_DEVICES="$(ifconfig -l | grep -Eo 'wlan[0-9]+')"
 +
  if [ -n "$2" ]; then
 -	ifconfig $2 >/dev/null 2>/dev/null
 -	if [ $? -ne 0 ]; then
 -		echo "Error: Interface $2 does not exist."
 -		exit 1
 -	fi
 +    if [ "$(echo ${2} | grep -Eo 'wlan[0-9]+')" ]; then
 +       echo "Please use physical device names, e.g. 'ath0'" 
 +       exit 1
 +    fi
 +    echo ${PHYSICAL_DEVICES} ${VIRTUAL_DEVICES} | grep -q $2
 +    if [ $? -ne 0 ]; then
 +        echo "Error: Interface $2 does not exist."
 +        exit 1
 +    fi
  fi
  
  COMMAND=$1
 @@ -28,103 +34,151 @@ INTERFACE_TO_USE=$2
  CHIPSET=""
  DRIVER=""
  PARENT=""
 +MODE=""
 +
 +WIFI_IF_REGEX='^(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rum|run|uath|upgt|ural|urtw|urtwn|wi|wpi|wtap|zyd)[0-9]+$'
 +
 +chipset_from_pciconf() {
 +    pciconf -lv $1 2>/dev/null | awk -F" = " '/device/ {print $2}'
 +}
 +
 +chipset_from_usbconfig() {
 +    USB_INFO=$(dmesg | grep -E "^$1: <" | tail -n 1 | tr ',' '\n' | tail -n 1 | tr '>' ' ')
 +    USB_ADDR=$(echo ${USB_INFO} | awk '{print $2}')
 +    USB_BUS=$(echo ${USB_INFO} | awk '{print $4}' | sed 's/[^0-9]*//g')
 +    VENDOR_ID=$(usbconfig -u ${USB_BUS} -a ${USB_ADDR} dump_device_desc | grep idVendor | awk '{print $3}')
 +    PRODUCT_ID=$(usbconfig -u ${USB_BUS} -a ${USB_ADDR} dump_device_desc | grep idProduct | awk '{print $3}')
 +    if [ "${VENDOR_ID}" = "0x0bda" ]; then
 +        [ "${PRODUCT_ID}" = "0x8171" ] && CHIPSET="RTL8188SU"
 +        [ "${PRODUCT_ID}" = "0x8172" ] && CHIPSET="RTL8191SU"
 +        [ "${PRODUCT_ID}" = "0x8174" ] && CHIPSET="RTL8192SU"
 +        [ "${PRODUCT_ID}" = "0x8176" ] && CHIPSET="RTL8188CUS"
 +        [ "${PRODUCT_ID}" = "0x8178" ] && CHIPSET="RTL8192CU"
 +        [ "${PRODUCT_ID}" = "0x8179" ] && CHIPSET="RTL8188EUS"
 +        [ "${PRODUCT_ID}" = "0x817f" ] && CHIPSET="RTL8188RU"
 +        [ "${PRODUCT_ID}" = "0x8192" ] && CHIPSET="RTL8191SU"
 +        [ "${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
 +        CHIPSET="RTL8188CUS"
 +    elif [ "${VENDOR_ID}" = "0x20f4" ] && [ "${PRODUCT_ID}" = "0x648b" ]; then
 +        CHIPSET="RTL8188CUS"
 +    elif [ "${VENDOR_ID}" = "0x7392" ] && [ "${PRODUCT_ID}" = "0x7811" ]; then
 +        CHIPSET="RTL8188CUS"
 +    elif [ "${VENDOR_ID}" = "0x2019" ]; then
 +        [ "${PRODUCT_ID}" = "0xab2a" ] && CHIPSET="RTL8188CUS"
 +        [ "${PRODUCT_ID}" = "0xed17" ] && CHIPSET="RTL8188CUS"
 +    elif [ "${VENDOR_ID}" = "0x050d" ]; then
 +        [ "${PRODUCT_ID}" = "0x1102" ] && CHIPSET="RTL8188CUS"
 +        [ "${PRODUCT_ID}" = "0x11f2" ] && CHIPSET="RTL8188CUS"
 +    elif [ "${VENDOR_ID}" = "0x0846" ]; then
 +        [ "${PRODUCT_ID}" = "0x9041" ] && CHIPSET="RTL8188CUS"
 +        [ "${PRODUCT_ID}" = "0x9042" ] && CHIPSET="RTL8188CUS"
 +        [ "${PRODUCT_ID}" = "0x9043" ] && CHIPSET="RTL8188CUS"
 +    [ -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() {
 -	[ -z "$1" ] && return
 -	if [ -n "$(echo $1 | grep -E '^(ath|otus|urtwn)[0-9]+$' )" ]; then
 -		DRIVER="$(echo $1 | sed 's/[0-9]*//g')"
 -	elif [ -n "$(echo $1 | grep -E ^wlan[0-9]+$)" ]; then
 -		# It most likely is a monitor interface.
 -		IFACE_IDX=$(echo $1 | sed 's/[^0-9]*//g')
 -		PARENT=$(sysctl net.wlan.${IFACE_IDX}.%parent | awk '{print $2}')
 -		if [ -n "${PARENT}" ]; then
 -			get_interface_info ${PARENT}
 -			return
 -		fi
 -	fi	
 -
 -	if [ "${DRIVER}" = "ath" ]; then
 -		CHIPSET=$(dmesg | grep -E "^$1: <" | tail -n 1 | awk -F\< '{print $2}' | awk -F\> '{print $1}' )
 -	elif [ "${DRIVER}" = "urtwn" ]; then
 -		USB_INFO=$(dmesg | grep -E "^$1: <" | tail -n 1 | tr ',' '\n' | tail -n 1 | tr '>' ' ')
 -		USB_ADDR=$(echo ${USB_INFO} | awk '{print $2}')
 -		USB_BUS=$(echo ${USB_INFO} | awk '{print $4}' | sed 's/[^0-9]*//g')
 -		VENDOR_ID=$(usbconfig -u ${USB_BUS} -a ${USB_ADDR} dump_device_desc | grep idVendor | awk '{print $3}')
 -		PRODUCT_ID=$(usbconfig -u ${USB_BUS} -a ${USB_ADDR} dump_device_desc | grep idProduct | awk '{print $3}')
 -		if [ "${VENDOR_ID}" = "0x0bda" ]; then
 -			[ "${PRODUCT_ID}" = "0x8171" ] && CHIPSET="RTL8188SU"
 -			[ "${PRODUCT_ID}" = "0x8172" ] && CHIPSET="RTL8191SU"
 -			[ "${PRODUCT_ID}" = "0x8174" ] && CHIPSET="RTL8192SU"
 -			[ "${PRODUCT_ID}" = "0x8176" ] && CHIPSET="RTL8188CUS"
 -			[ "${PRODUCT_ID}" = "0x8178" ] && CHIPSET="RTL8192CU"
 -			[ "${PRODUCT_ID}" = "0x8179" ] && CHIPSET="RTL8188EUS"
 -			[ "${PRODUCT_ID}" = "0x817f" ] && CHIPSET="RTL8188RU"
 -			[ "${PRODUCT_ID}" = "0x8192" ] && CHIPSET="RTL8191SU"
 -			[ "${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
 -			CHIPSET="RTL8188CUS"
 -		elif [ "${VENDOR_ID}" = "0x20f4" ] && [ "${PRODUCT_ID}" = "0x648b" ]; then
 -			CHIPSET="RTL8188CUS"
 -		elif [ "${VENDOR_ID}" = "0x7392" ] && [ "${PRODUCT_ID}" = "0x7811" ]; then
 -			CHIPSET="RTL8188CUS"
 -		elif [ "${VENDOR_ID}" = "0x2019" ]; then
 -			[ "${PRODUCT_ID}" = "0xab2a" ] && CHIPSET="RTL8188CUS"
 -			[ "${PRODUCT_ID}" = "0xed17" ] && CHIPSET="RTL8188CUS"
 -		elif [ "${VENDOR_ID}" = "0x050d" ]; then
 -			[ "${PRODUCT_ID}" = "0x1102" ] && CHIPSET="RTL8188CUS"
 -			[ "${PRODUCT_ID}" = "0x11f2" ] && CHIPSET="RTL8188CUS"
 -		elif [ "${VENDOR_ID}" = "0x0846" ]; then
 -			[ "${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
 +    [ -z "$1" ] && return
 +
 +    ### Driver information
 +    # Parent interface check
 +    if [ -n "$(echo $1 | grep -E ${WIFI_IF_REGEX})" ]; then
 +        DRIVER="$(echo $1 | sed 's/[0-9]*//g')"
 +    # Child interface check
 +    elif [ -n "$(echo $1 | grep -E ^wlan[0-9]+$)" ]; then
 +        IFACE_IDX=$(echo $1 | sed 's/[^0-9]*//g')
 +        PARENT=$(sysctl -n net.wlan.${IFACE_IDX}.%parent)
 +        MODE=$(ifconfig $1 | awk '/media:/ { if ($NF ~ /<[^>]+>/) {print $NF} }' | tr -d '[<>()]')
 +        if [ -z "${MODE}" ]; then
 +            MODE=client
 +        fi
 +        if [ -n "${PARENT}" ]; then
 +            get_interface_info ${PARENT}
 +            return
 +        fi
 +    fi
 +
 +    ### Chipset information
 +    # PCI devices
 +    CHIPSET="$(chipset_from_pciconf $1)"
 +
 +    # USB devices
 +    if [ -z "${CHIPSET}" ]; then
 +        CHIPSET="$(chipset_from_usbconfig $1)"
 +    fi
 +
 +    if [ -z "${CHIPSET}" ]; then
 +        CHIPSET="Report dmesg and usbconfig (dump commands) to http://trac.aircrack-ng.org"
 +    fi
 +
 +    if [ -z "${DRIVER}" ]; then
 +        DRIVER="Unknown"
 +    fi
 +}
 +
 +destroy_other_children() {
 +    for iface in ${VIRTUAL_DEVICES}; do
 +        local iface_idx=$(echo $1 | sed 's/[^0-9]*//g')
 +        local parent=$(sysctl -n net.wlan.${iface_idx}.%parent)
 +        if [ "${parent}" = "${1}" ]; then
 +            ifconfig ${iface} destroy
 +            if [ $? -ne 0 ]; then
 +                printf "Failed to remove virtual interface ${iface}\n"
 +            else
 +                printf "Destroyed virtual interface ${iface}\n"
 +            fi
 +        fi
 +    done
 +}
 +
 +create_device() {
 +   local iface=$(ifconfig wlan create wlandev ${1} wlanmode ${2})
 +   if [ $? -eq 0 ]; then
 +        printf "Created ${2} mode interface ${iface} from ${1}\n"
 +   else
 +       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
 -				printf "\t Interface is already in monitor mode, ignoring\n"
 -			else
 -				MONITOR_IFACE=$(ifconfig wlan create wlandev ${IFACE} wlanmode monitor)
 -				if [ $? -eq 0 ]; then
 -					 printf "\tCreated monitor mode interface ${MONITOR_IFACE} from ${IFACE}\n"
 -				else
 -					printf "\tFailed creating monitor interface\n"
 -				fi
 -			fi
 -		elif [ "${COMMAND}" = 'stop' ]; then
 -			ifconfig ${IFACE} destroy 2>/dev/null
 -			if [ $? -ne 0 ]; then
 -				printf "\tFailed to remove monitor mode interface ${IFACE}\n"
 -			else
 -				printf "\tDestroyed monitor interface ${IFACE}\n"
 -			fi
 -		fi
 -	fi 
 +printf "\nVirtual Interfaces:\n"
 +printf "===================\n"
 +printf "Interface\tMode\t\tParent\n"
 +
 +for IFACE in ${VIRTUAL_DEVICES}; do
 +    get_interface_info ${IFACE}
 +    printf "${IFACE}\t\t${MODE}\t\t${PARENT}\n"
  done
  
 -exit 0
Index: head/net-mgmt/aircrack-ng/files/patch-scripts_airodump-ng-oui-update
===================================================================
--- head/net-mgmt/aircrack-ng/files/patch-scripts_airodump-ng-oui-update	(revision 474425)
+++ head/net-mgmt/aircrack-ng/files/patch-scripts_airodump-ng-oui-update	(revision 474426)
@@ -1,77 +1,83 @@
---- 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}
  fi
  
 -if [ ${CURL} ] || [ ${WGET} ]; then
 -	# 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..."
 -
 -	if [ ${WGET} ]; then
 -		${WGET} ${OUI_DOWNLOAD_URL} -O ${OUI_IEEE} >/dev/null 2>/dev/null
 -	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
 -		echo "[*] Please install curl or wget to update OUI list"
 -	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}
 +
 +echo "[*] Airodump-ng OUI file successfully updated"
 +
  exit 0
Index: head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
===================================================================
--- head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h	(revision 474425)
+++ head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h	(revision 474426)
@@ -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>
Index: head/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c
===================================================================
--- head/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c	(revision 474425)
+++ head/net-mgmt/aircrack-ng/files/patch-src_osdep_file.c	(revision 474426)
@@ -1,11 +1,11 @@
---- 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>
  
  #include "osdep.h"
 -#include "pcap.h"
 +#include "../pcap.h"
  #include "radiotap/radiotap_iter.h"
  
  struct priv_file {
Index: head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c
===================================================================
--- head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c	(revision 474425)
+++ head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c	(revision 474426)
@@ -1,19 +1,19 @@
---- 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
  
  
 +#ifdef _BSD_SOURCE
 +#if __BYTE_ORDER == __LITTLE_ENDIAN
 +#define le16toh(x) (x)
 +#define le32toh(x) (x)
 +#else
 +#define le32toh(x) bswap_32 (x)
 +#endif
 +#endif
 +
 +
  /* function prototypes and related defs are in radiotap_iter.h */
  
  static const struct radiotap_align_size rtap_namespace_sizes[] = {
Index: head/net-mgmt/aircrack-ng/pkg-plist
===================================================================
--- head/net-mgmt/aircrack-ng/pkg-plist	(revision 474425)
+++ head/net-mgmt/aircrack-ng/pkg-plist	(revision 474426)
@@ -1,51 +1,62 @@
 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
+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
 %%SQLITE%%man/man1/airolib-ng.1.gz
 man/man1/besside-ng-crawler.1.gz
 man/man1/buddy-ng.1.gz
 man/man1/ivstools.1.gz
 man/man1/kstats.1.gz
 man/man1/makeivs-ng.1.gz
 man/man1/packetforge-ng.1.gz
 man/man1/wpaclean.1.gz
 man/man8/airbase-ng.8.gz
 man/man8/aireplay-ng.8.gz
 man/man8/airmon-ng.8.gz
 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
 man/man8/wesside-ng.8.gz
 sbin/airbase-ng
 sbin/aireplay-ng
 sbin/airmon-ng
 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
 sbin/wesside-ng
 @dir %%ETCDIR%%