public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/aircrack-ng/, net-wireless/aircrack-ng/files/
@ 2018-08-07  2:15 Richard Farina
  0 siblings, 0 replies; 2+ messages in thread
From: Richard Farina @ 2018-08-07  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     e26377c50b9cf56f36ca30d91fee1eeca4b9baab
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 02:14:16 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 02:14:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e26377c5

net-wireless/aircrack-ng: support 8812au

add upstream patch to support realtek 8812au and variants

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 ...ack-ng-1.3.ebuild => aircrack-ng-1.3-r1.ebuild} |   1 +
 .../aircrack-ng/files/aircrack-ng-1.3-8812au.patch | 118 +++++++++++++++++++++
 2 files changed, 119 insertions(+)

diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3-r1.ebuild
similarity index 98%
rename from net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild
rename to net-wireless/aircrack-ng/aircrack-ng-1.3-r1.ebuild
index af3515cb463..c35e3fb3d4a 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.3.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.3-r1.ebuild
@@ -60,6 +60,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}/${P}-8812au.patch"
 	eapply_user
 	eautoreconf
 }

diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
new file mode 100644
index 00000000000..6ce0fbc51eb
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
@@ -0,0 +1,118 @@
+commit 3cc9de5e7cbe6565c7e1fe12ebbcf2c6f7413c8d
+Author: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
+Date:   Tue Aug 7 01:27:05 2018 +0000
+
+    airmon-ng support 8812au
+
+diff --git a/scripts/airmon-ng.linux b/scripts/airmon-ng.linux
+index 14e4bdcd..d7328f4b 100755
+--- a/scripts/airmon-ng.linux
++++ b/scripts/airmon-ng.linux
+@@ -354,21 +354,21 @@ ifaceIsUp() {
+ #	fi
+ #}
+ 
+-#startDeprecatedIface() {
+-#	iwconfig ${1} mode monitor > /dev/null 2>&1
+-#	if [ -n "${2}" ]; then
+-#		if [ ${2} -lt 1000 ]; then
+-#			iwconfig ${1} channel ${2} > /dev/null 2>&1
+-#		else
+-#			iwconfig ${1} freq ${2}000000 > /dev/null 2>&1
+-#		fi
+-#	else
+-#		iwconfig ${1} channel ${CH} > /dev/null 2>&1
+-#	fi
+-#	iwconfig ${1} key off > /dev/null 2>&1
+-#	setLink ${1} up
+-#	printf " (monitor mode enabled)"
+-#}
++startDeprecatedIface() {
++	iwconfig ${1} mode monitor > /dev/null 2>&1
++	if [ -n "${2}" ]; then
++		if [ ${2} -lt 1000 ]; then
++			iwconfig ${1} channel ${2} > /dev/null 2>&1
++		else
++			iwconfig ${1} freq ${2}000000 > /dev/null 2>&1
++		fi
++	else
++		iwconfig ${1} channel ${CH} > /dev/null 2>&1
++	fi
++	iwconfig ${1} key off > /dev/null 2>&1
++	setLink ${1} up
++	printf " (monitor mode enabled)"
++}
+ 
+ yesorno() {
+ 	read input
+@@ -426,7 +426,7 @@ startMac80211Iface() {
+ 		done
+ 	fi
+ 	#we didn't bail means we need a monitor interface
+-        if [ ${#1} -gt 12 ]; then
++	if [ ${#1} -gt 12 ]; then
+ 		printf "Interface ${1}mon is too long for linux so it will be renamed to the old style (wlan#) name.\n"
+ 		findFreeInterface monitor
+ 	else
+@@ -438,10 +438,16 @@ startMac80211Iface() {
+ 		fi
+ 		#we didn't bail means our target interface is available
+ 		setLink ${1} down
++		if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ] || [ "${DRIVER}" = "rtl8812au" ]; then
++			#grumble grumble, seriously crap vendor driver
++			startDeprecatedIface ${1}
++			setChannelMac80211 ${1}
++			return
++		fi
+ 		IW_ERROR="$(iw phy ${PHYDEV} interface add ${1}mon type monitor 2>&1)"
+ 		if [ -z "${IW_ERROR}" ]; then
+ 			sleep 1
+-			if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type)" = "803" ]; then
++			if [ -r "/sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type" ] && [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type)" = "803" ]; then
+ 				setChannelMac80211 ${1}mon
+ 			else
+ 				printf "\nNewly created monitor mode interface ${1}mon is *NOT* in monitor mode.\n"
+@@ -569,12 +575,12 @@ setChannelMac80211() {
+ 	fi
+ }
+ 
+-#stopDeprecatedIface() {
+-#	setLink $1 down
+-#	iwconfig $1 mode Managed > /dev/null 2>&1
+-#	setLink $1 up
+-#	printf " (monitor mode disabled)"
+-#}
++stopDeprecatedIface() {
++	setLink $1 down
++	iwconfig $1 mode Managed > /dev/null 2>&1
++	setLink $1 up
++	printf " (monitor mode disabled)"
++}
+ 
+ stopMac80211Iface() {
+ 	if [ -f /sys/class/net/${1}/type ]; then
+@@ -587,6 +593,11 @@ stopMac80211Iface() {
+ 			printf "please report it.\n"
+ 			exit 1
+ 		else
++			if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ] || [ "${DRIVER}" = "rtl8812au" ]; then
++				#grumble grumble, seriously crap vendor driver
++				stopDeprecatedIface ${1}
++				return
++			fi
+ 			if [ "${ELITE}" = "0" ]; then
+ 				local need_sta=1
+ 				if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
+@@ -1316,8 +1327,10 @@ if [ "$DEBUG" = "1" ]; then
+ 	fi
+ fi
+ if [ "$VERBOSE" = "1" ]; then
+-	lsb_release -a
+-	printf "\n"
++	if [ -n "$(command -v lsb_release 2> /dev/null)" ]; then
++		lsb_release -a
++		printf "\n"
++	fi
+ 	uname -a
+ 
+ 	checkvm


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-wireless/aircrack-ng/, net-wireless/aircrack-ng/files/
@ 2019-04-02 10:32 Alon Bar-Lev
  0 siblings, 0 replies; 2+ messages in thread
From: Alon Bar-Lev @ 2019-04-02 10:32 UTC (permalink / raw
  To: gentoo-commits

commit:     fa69420b6bde916fe20f6fb0fe16d2986caffe2a
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 10:30:17 2019 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Tue Apr  2 10:31:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa69420b

net-wireless/aircrack-ng: clean old

Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-wireless/aircrack-ng/Manifest                  |   3 -
 .../aircrack-ng/aircrack-ng-1.2_rc1-r1.ebuild      | 137 ------------
 net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild | 119 ----------
 net-wireless/aircrack-ng/aircrack-ng-1.4.ebuild    | 116 ----------
 .../aircrack-ng/files/aircrack-ng-1.3-8812au.patch | 245 ---------------------
 net-wireless/aircrack-ng/metadata.xml              |   1 -
 6 files changed, 621 deletions(-)

diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index da49239d733..b5f3291b13d 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,4 +1 @@
-DIST aircrack-ng-1.2-rc1.tar.gz 2046476 BLAKE2B aec848a3dedae564cc29fc94475d0dec9cfb33af5185a4bceb9f88c1a3cce7a910439405fd76390ca352e52393b9094e570bf54980af27a50709a36ffab33752 SHA512 897427c535846c0ede58b2f99ed469bc01f50f9b38fc70d5711261fca7342339192cc0c71a724fc04c99114db7534d825a44f09e7bc5754286ec44933a33e40d
-DIST aircrack-ng-1.3.tar.gz 4501507 BLAKE2B ae73303fbc0c632faa2468d5fbf0daa318767633bf92571cc53fd79d8df518c1fc03ad83397e12585a804f0171e3fe3865c070ccdb39cb43ae46edbfc880b37e SHA512 0c2376ac702cd36021b9017b40c5af9466c5689832a0e40debcb8c0a2cd13ec942170930903c4e2e06678c429a89cd4d78ab43e925b707f816bf48d6c9514ec9
-DIST aircrack-ng-1.4.tar.gz 7138756 BLAKE2B 35a499877671be99271116eb4c5a26c7c803485e46d5e8e429b5beafe900455e88d52350107f96f5fb1f46643120a1ad63c96ab45672efdcbd23bdcc54aeedf4 SHA512 cad82b6fcd64c094d427a985cd1f5bc95434f83db1811e2c8798932983759e0846cf66034e444ba8ec861547d3107560e0f1430ec03e3d3a080c5fb1207a2a09
 DIST aircrack-ng-1.5.2.tar.gz 7138360 BLAKE2B cfc178d76273bb1cf6c34b1656a710d046a094f9c772a562f19ae783c30810cf7b6aa8668566ef6998af79090266771aeea8037b446eb0b9755b602ddcebc0d2 SHA512 72c249782dda3a875fbec98e4fe0e6044a6f123ebd36341a5f42733dfe6c26d96b5c74f67c0547b81c5dd5e2f52a6f475b424885f8e6fa21279ac539228038f5

diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.2_rc1-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2_rc1-r1.ebuild
deleted file mode 100644
index 9354eacf13e..00000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.2_rc1-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit toolchain-funcs distutils-r1 flag-o-matic
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-	ESVN_REPO_URI="http://svn.aircrack-ng.org/trunk"
-	KEYWORDS=""
-	S="${WORKDIR}/${PN}"
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="amd64 arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +unstable"
-
-DEPEND="net-libs/libpcap
-	dev-libs/openssl:*
-	netlink? ( dev-libs/libnl:3 )
-	pcre? ( dev-libs/libpcre )
-	airdrop-ng? ( ${PYTHON_DEPS} )
-	airgraph-ng? ( ${PYTHON_DEPS} )
-	sqlite? ( >=dev-db/sqlite-3.4 )
-	unstable? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	kernel_linux? (
-		net-wireless/iw
-		net-wireless/wireless-tools
-		sys-apps/ethtool
-		sys-apps/usbutils
-		sys-apps/pciutils )
-	sys-apps/hwids
-	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-		airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-src_compile() {
-	if [[ $($(tc-getCC) --version) == clang* ]] ; then
-		die "Please use gcc, upstream bug http://trac.aircrack-ng.org/ticket/1144"
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
-	fi
-
-	emake \
-	CC="$(tc-getCC)" \
-	AR="$(tc-getAR)" \
-	LD="$(tc-getLD)" \
-	RANLIB="$(tc-getRANLIB)" \
-	libnl=$(usex netlink true false) \
-	pcre=$(usex pcre true false) \
-	sqlite=$(usex sqlite true false) \
-	unstable=$(usex unstable true false) \
-	${liveflags}
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_compile
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	if [[ ${PV} == "9999" ]] ; then
-		liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
-	fi
-
-	emake check \
-		libnl=$(usex netlink true false) \
-		pcre=$(usex pcre true false) \
-		sqlite=$(usex sqlite true false) \
-		unstable=$(usex unstable true false) \
-		${liveflags}
-}
-
-src_install() {
-	if [[ ${PV} == "9999" ]] ; then
-		liveflags=REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
-	fi
-
-	emake \
-		prefix="${ED}/usr" \
-		libnl=$(usex netlink true false) \
-		pcre=$(usex pcre true false) \
-		sqlite=$(usex sqlite true false) \
-		unstable=$(usex unstable true false) \
-		${liveflags} \
-		install
-
-	dodoc AUTHORS ChangeLog INSTALLING README
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_install
-	fi
-
-	#we don't need aircrack-ng's oui updater, we have our own
-	rm "${ED}"/usr/sbin/airodump-ng-oui-update
-}
-
-pkg_postinst() {
-	# Message is (c) FreeBSD
-	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
-	if use kernel_FreeBSD ; then
-		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
-		einfo "mode of your wireless card.  So do not care about what the manpages say about"
-		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
-		echo
-		einfo "To return from monitor mode, issue the following command:"
-		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
-		einfo
-		einfo "For aireplay-ng you need FreeBSD >= 7.0."
-	fi
-}

diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild
deleted file mode 100644
index 5e921f46691..00000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit toolchain-funcs distutils-r1 flag-o-matic autotools
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
-	KEYWORDS="amd64 arm x86"
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
-
-DEPEND="net-libs/libpcap
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	netlink? ( dev-libs/libnl:3 )
-	pcre? ( dev-libs/libpcre )
-	airdrop-ng? ( ${PYTHON_DEPS} )
-	airgraph-ng? ( ${PYTHON_DEPS} )
-	experimental? ( sys-libs/zlib )
-	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}"
-PDEPEND="kernel_linux? (
-		net-wireless/iw
-		net-wireless/wireless-tools
-		sys-apps/ethtool
-		sys-apps/usbutils
-		sys-apps/pciutils )
-	sys-apps/hwids
-	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
-	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-8812au.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-asan \
-		--enable-shared \
-		--disable-static \
-		--without-opt \
-		$(use_enable netlink libnl) \
-		$(use_with experimental) \
-		$(use_with sqlite sqlite3)
-}
-
-src_compile() {
-	if [[ $($(tc-getCC) --version) == clang* ]] ; then
-		#https://bugs.gentoo.org/show_bug.cgi?id=472890
-		filter-flags -frecord-gcc-switches
-	fi
-
-	default
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_compile
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_install
-	fi
-
-	# we don't need aircrack-ng's oui updater, we have our own
-	rm "${ED}"/usr/sbin/airodump-ng-oui-update
-}
-
-pkg_postinst() {
-	# Message is (c) FreeBSD
-	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
-	if use kernel_FreeBSD ; then
-		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
-		einfo "mode of your wireless card.  So do not care about what the manpages say about"
-		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
-		echo
-		einfo "To return from monitor mode, issue the following command:"
-		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
-		einfo
-		einfo "For aireplay-ng you need FreeBSD >= 7.0."
-	fi
-}

diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.4.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.4.ebuild
deleted file mode 100644
index f5006d8091e..00000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit toolchain-funcs distutils-r1 flag-o-matic autotools
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
-
-DEPEND="net-libs/libpcap
-	sys-apps/hwloc
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	netlink? ( dev-libs/libnl:3 )
-	pcre? ( dev-libs/libpcre )
-	airdrop-ng? ( ${PYTHON_DEPS} )
-	airgraph-ng? ( ${PYTHON_DEPS} )
-	experimental? ( sys-libs/zlib )
-	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}"
-PDEPEND="kernel_linux? (
-		net-wireless/iw
-		net-wireless/wireless-tools
-		sys-apps/ethtool
-		sys-apps/usbutils
-		sys-apps/pciutils )
-	sys-apps/hwids
-	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
-	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-asan \
-		--enable-shared \
-		--disable-static \
-		--without-opt \
-		$(use_enable netlink libnl) \
-		$(use_with experimental) \
-		$(use_with sqlite sqlite3)
-}
-
-src_compile() {
-	if [[ $($(tc-getCC) --version) == clang* ]] ; then
-		#https://bugs.gentoo.org/show_bug.cgi?id=472890
-		filter-flags -frecord-gcc-switches
-	fi
-
-	default
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_compile
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_install
-	fi
-
-	# we don't need aircrack-ng's oui updater, we have our own
-	rm "${ED}"/usr/sbin/airodump-ng-oui-update
-}
-
-pkg_postinst() {
-	# Message is (c) FreeBSD
-	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
-	if use kernel_FreeBSD ; then
-		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
-		einfo "mode of your wireless card.  So do not care about what the manpages say about"
-		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
-		echo
-		einfo "To return from monitor mode, issue the following command:"
-		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
-		einfo
-		einfo "For aireplay-ng you need FreeBSD >= 7.0."
-	fi
-}

diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
deleted file mode 100644
index e5343023aae..00000000000
--- a/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff --git a/scripts/airmon-ng.linux b/scripts/airmon-ng.linux
-index 7f488391..4d0a5e0c 100755
---- a/scripts/airmon-ng.linux
-+++ b/scripts/airmon-ng.linux
-@@ -106,7 +106,18 @@ else
- fi
- 
- if [ -d /sys/bus/pci ] || [ -d /sys/bus/pci_express ] || [ -d /proc/bus/pci ]; then
--	if [ ! -x "$(command -v lspci 2>&1)" ]; then
-+	PCI_DEVICES=0
-+	if [ -d /sys/bus/pci/devices ] && [ "$(ls -1 /sys/bus/pci/devices 2>/dev/null | wc -l)" != '0' ]; then
-+		PCI_DEVICES=1
-+	elif [ -r /proc/bus/pci/devices ] && [ -n "$(cat /proc/bus/pci/devices 2>/dev/null)" ]; then
-+		PCI_DEVICES=1
-+	elif [ -d /sys/bus/pci_express/devices ] && [ -n "$(ls -1 /sys/bus/pci_express/devices 2>/dev/null | wc -l)" != '0' ]; then
-+		PCI_DEVICES=1
-+	fi
-+
-+	if [ ${PCI_DEVICES} -eq 0 ]; then
-+		LSPCI=0
-+	elif [ ! -x "$(command -v lspci 2>&1)" ]; then
- 		printf "Please install lspci from your distro's package manager.\n"
- 		exit 1
- 	else
-@@ -347,21 +358,21 @@ ifaceIsUp() {
- #	fi
- #}
- 
--#startDeprecatedIface() {
--#	iwconfig ${1} mode monitor > /dev/null 2>&1
--#	if [ -n "${2}" ]; then
--#		if [ ${2} -lt 1000 ]; then
--#			iwconfig ${1} channel ${2} > /dev/null 2>&1
--#		else
--#			iwconfig ${1} freq ${2}000000 > /dev/null 2>&1
--#		fi
--#	else
--#		iwconfig ${1} channel ${CH} > /dev/null 2>&1
--#	fi
--#	iwconfig ${1} key off > /dev/null 2>&1
--#	setLink ${1} up
--#	printf " (monitor mode enabled)"
--#}
-+startDeprecatedIface() {
-+	iwconfig ${1} mode monitor > /dev/null 2>&1
-+	if [ -n "${2}" ]; then
-+		if [ ${2} -lt 1000 ]; then
-+			iwconfig ${1} channel ${2} > /dev/null 2>&1
-+		else
-+			iwconfig ${1} freq ${2}000000 > /dev/null 2>&1
-+		fi
-+	else
-+		iwconfig ${1} channel ${CH} > /dev/null 2>&1
-+	fi
-+	iwconfig ${1} key off > /dev/null 2>&1
-+	setLink ${1} up
-+	printf " (monitor mode enabled)"
-+}
- 
- yesorno() {
- 	read input
-@@ -419,7 +430,7 @@ startMac80211Iface() {
- 		done
- 	fi
- 	#we didn't bail means we need a monitor interface
--        if [ ${#1} -gt 12 ]; then
-+	if [ ${#1} -gt 12 ]; then
- 		printf "Interface ${1}mon is too long for linux so it will be renamed to the old style (wlan#) name.\n"
- 		findFreeInterface monitor
- 	else
-@@ -431,10 +442,16 @@ startMac80211Iface() {
- 		fi
- 		#we didn't bail means our target interface is available
- 		setLink ${1} down
-+		if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ]; then
-+			#grumble grumble, seriously crap vendor driver
-+			startDeprecatedIface ${1}
-+			setChannelMac80211 ${1}
-+			return
-+		fi
- 		IW_ERROR="$(iw phy ${PHYDEV} interface add ${1}mon type monitor 2>&1)"
- 		if [ -z "${IW_ERROR}" ]; then
- 			sleep 1
--			if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type)" = "803" ]; then
-+			if [ -r "/sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type" ] && [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type)" = "803" ]; then
- 				setChannelMac80211 ${1}mon
- 			else
- 				printf "\nNewly created monitor mode interface ${1}mon is *NOT* in monitor mode.\n"
-@@ -456,15 +473,12 @@ startMac80211Iface() {
- 			printf "\nPlease run \"airmon-ng check kill\" and/or kill your network manager."
- 		fi
- 	else
--		iw ${1} del
-+		isRPiWireless && iw ${1} del
- 		printf "\t\t(mac80211 station mode vif disabled for [${PHYDEV}]${1})\n"
- 	fi
- }
- 
--NEXMON_FIRMWARE_DIR=/opt
--NEXMON_DRIVER_DIR=/opt
--
--hasRPiWireless() {
-+isRPiWireless() {
- 	local HW_REV=$(grep Revision /proc/cpuinfo | awk '{print $3}')
- 	[ -z "${HW_REV}" ] && return 0
- 	# http://www.raspberrypi-spy.co.uk/2012/09/checking-your-raspberry-pi-board-version/
-@@ -475,29 +489,6 @@ hasRPiWireless() {
- 	return 0
- }
- 
--isNexutilPresent() {
--	type nexutil >/dev/null 2>/dev/null
--	if [ $? -eq 0 ]; then
--		return 1
--	fi
--	return 0
--}
--
--startNexmonIface() {
--	[ -z $1 ] && return
--
--	if [ -n "$(iwconfig $1 | grep 'Mode:Monitor')" ] && [ -n "$(nexutil -m | grep 'monitor: 2')" ]; then
--		printf "\n\tInterface $1 is already in monitor mode\n"
--	else
--		ifconfig $1 up 2>/dev/null
--		iwconfig $1 mode monitor 2>/dev/null
--		[ "$1" = "wlan0" ] && nexutil -m2
--		[ "$1" = "wlan0" ] || nexutil -m2 -I $1
--		iwconfig $1 channel ${CH}
--		printf "\n\t\t(monitor mode enabled for [${PHYDEV}]${1})\n"
--	fi
--}
--
- startwlIface() {
- 	if [ -f "/proc/brcm_monitor0" ]; then
- 		if [ -r "/proc/brcm_monitor0" ]; then
-@@ -587,12 +578,12 @@ setChannelMac80211() {
- 	fi
- }
- 
--#stopDeprecatedIface() {
--#	setLink $1 down
--#	iwconfig $1 mode Managed > /dev/null 2>&1
--#	setLink $1 up
--#	printf " (monitor mode disabled)"
--#}
-+stopDeprecatedIface() {
-+	setLink $1 down
-+	iwconfig $1 mode Managed > /dev/null 2>&1
-+	setLink $1 up
-+	printf " (monitor mode disabled)"
-+}
- 
- stopMac80211Iface() {
- 	if [ -f /sys/class/net/${1}/type ]; then
-@@ -605,6 +596,11 @@ stopMac80211Iface() {
- 			printf "please report it.\n"
- 			exit 1
- 		else
-+			if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ]; then
-+				#grumble grumble, seriously crap vendor driver
-+				stopDeprecatedIface ${1}
-+				return
-+			fi
- 			if [ "${ELITE}" = "0" ]; then
- 				local need_sta=1
- 				if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
-@@ -665,18 +661,6 @@ stopMac80211Iface() {
- 	fi
- }
- 
--stopNexmonIface() {
--	[ -z $1 ] && return
--	ifconfig $1 down
--	# Running nexutil is not necessary, it gets reset when putting interface down
--	[ "$1" = "wlan0" ] && nexutil -m0
--	[ "$1" = "wlan0" ] || nexutil -m0 -I $1
--	ifconfig $1 down
--	ifconfig $1 up 2> /dev/null
--	iwconfig $1 mode managed 2> /dev/null
--	printf "\n\t\t(monitor mode disabled for [${PHYDEV}]${1})\n"
--}
--
- stopwlIface() {
- 	if [ -f "/proc/brcm_monitor0" ]; then
- 		if [ -r "/proc/brcm_monitor0" ]; then
-@@ -751,6 +735,12 @@ getDriver() {
- 	if [ "$DRIVER" = "rtl8187" ] && [ "$STACK" = "ieee80211" ]; then
- 		DRIVER="r8187"
- 	fi
-+	if [ "$DRIVER" = "rtl88xxau" ]; then
-+		DRIVER="88XXau"
-+	fi
-+	if [ "$DRIVER" = "rtl8812au" ]; then
-+		DRIVER="8812au"
-+	fi
- 
- 	#Here we will catch the broken lying drivers not caught above
- 	#currently this only functions for pci devices and not usb since lsusb has no -k option
-@@ -795,6 +785,8 @@ getFrom() {
- 				FROM="V"
- 			elif [ "$DRIVER" = "rt5390sta" ]; then
- 				FROM="V"
-+			elif [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ]; then
-+				FROM="V"
- 			fi
- 		elif modinfo -F filename $DRIVER 2>&1 | grep -q 'updates/drivers'
- 		then
-@@ -1346,8 +1338,10 @@ if [ "$DEBUG" = "1" ]; then
- 	fi
- fi
- if [ "$VERBOSE" = "1" ]; then
--	lsb_release -a
--	printf "\n"
-+	if [ -n "$(command -v lsb_release 2> /dev/null)" ]; then
-+		lsb_release -a
-+		printf "\n"
-+	fi
- 	uname -a
- 
- 	checkvm
-@@ -1493,23 +1487,6 @@ for iface in $(printf "${iface_list}"); do
- 		if [ "$1" = "stop" ] && [ "$2" = "$iface" ]; then
- 			stopwlIface $iface
- 		fi
--	elif [ "${CHIPSET}" = 'Broadcom 43430' ] || [ "${CHIPSET}" = 'Broadcom 43455' ]; then
--		hasRPiWireless
--		if [ $? -eq 0 ]; then
--			printf "\n\tNot a Raspberry Pi 3, 3B+ or Zero Wireless, cannot put in monitor mode.\n"
--		else
--			isNexutilPresent
--			if [ $? -eq 0 ]; then
--				printf "\n\tMissing nexutil, cannot switch to monitor mode.\n"
--			else
--				if [ "$1" = "start" ] && [ "$2" = "$iface" ]; then
--					startNexmonIface $iface
--				fi
--				if [ "$1" = "stop" ] && [ "$2" = "$iface" ]; then
--					stopNexmonIface $iface
--				fi
--			fi
--		fi
- 	elif [ "$MAC80211" = "1" ]; then
- 		if [ "$1" = "start" ] && [ "$2" = "$iface" ]; then
- 			startMac80211Iface $iface

diff --git a/net-wireless/aircrack-ng/metadata.xml b/net-wireless/aircrack-ng/metadata.xml
index 7e8481fd0b0..79298996015 100644
--- a/net-wireless/aircrack-ng/metadata.xml
+++ b/net-wireless/aircrack-ng/metadata.xml
@@ -24,6 +24,5 @@
 	<flag name="airgraph-ng">Build airgraph-ng</flag>
 	<flag name="experimental">Build the "experimental" tools which may randomly fail to run properly</flag>
 	<flag name="netlink">Use netlink for channel control instead of WEXT</flag>
-	<flag name="unstable">Build the "unstable" tools which may randomly fail to run properly</flag>
 </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-04-02 10:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-02 10:32 [gentoo-commits] repo/gentoo:master commit in: net-wireless/aircrack-ng/, net-wireless/aircrack-ng/files/ Alon Bar-Lev
  -- strict thread matches above, loose matches on Subject: below --
2018-08-07  2:15 Richard Farina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox