aircrack-ng: with latest backports and oui fixes

net-wireless/aircrack-ng/Manifest

@@ -1,5 +1,7 @@
 AUX aircrack-ng-1.1-respect_LDFLAGS.patch 3144 RMD160 322ec5d7592236f30456226de5cf433dde00deef SHA1 b73ef91057609910782fdd1581c0f7f8e8e6d47f SHA256 543d8efee610cd32874abb0ebc7371619526613ed04fa70db35d1caf473efff8
+AUX airodump-ng-oui-update-path-fix.patch 572 RMD160 c0a97434709b31714e08b4e934b242981cd9584f SHA1 b3984e7546989399a29ef0d0399cfbc3c661f855 SHA256 07cc244595a511d601e9bd6655a2939751ff1a16892529db5210bc4484af1cc9
 AUX airodump-ng.ignore-negative-one.v4.patch 5705 RMD160 d9d61e4229e2eda8afa0788826ada1b5fbb21524 SHA1 ad4f92e6e5200dab7e7fb177bab61894e8b7d7c4 SHA256 d77f676f0ccd83e1e192f78473ff77ea55be6b3c652e14921938cc3a79ac6a10
+AUX changeset_r1921_backport.diff 1941 RMD160 0f9cad828e631e053c2154da5af35bdf05ce88bb SHA1 44b16caa49cb58fbcb2d0de9c6bb4b921e47964b SHA256 a4655b208358b62a710f84206a69a5b0bb2091aeb47d73adbf0b7e8cd5a30c46
 AUX diff-wpa-migration-mode-aircrack-ng.diff 25165 RMD160 0a4ec44ab6580596f3f076e7b4a50a88118a4010 SHA1 be4c01c5128dd9c60f2074f616e5992112cc5735 SHA256 d36f2380d83fbfcbc48698cfd6d08de5a82a5a624a5d9f9cc3dbaaf7b7731fd8
 AUX ignore-channel-1-error.patch 2270 RMD160 8347757e50f637d2a5dcb98c92bea0218ee49998 SHA1 a760259c3f19b1b2a6e8caf3ab2567e78b09822a SHA256 aa2345b9ba7b59c79e54a5546f28398aaea4068c7030b520069e25f71cd029e4
 AUX pic-fix.patch 4838 RMD160 c2022a1cc2a3fc546d9e5f9a8343c0276fb710de SHA1 4a15018748f784408318475b0238d11a07bc8faf SHA256 33d1693ec0cbea1933bdfcaa30a16bab2d566927a0c7eaf57cd7cb08886c4cba
@@ -10,4 +12,5 @@ EBUILD aircrack-ng-1.1-r1.ebuild 1311 RMD160 8021ed6c6f0dc26ddd68930aa07f7fb7cc2
 EBUILD aircrack-ng-1.1-r2.ebuild 1348 RMD160 bf9c69f91594d5e6aa5a5f993dc3f3e98b2114b0 SHA1 e65ca68f584bc6a4a72e876c0486b3a0ffa95990 SHA256 b19b177c412c5087874ee04214c47e3a9d4d8a81b1ee17371c9b1b5778318a1e
 EBUILD aircrack-ng-1.1-r3.ebuild 1292 RMD160 3e21c3543493d1ff6fe657fa86a234349bee68f5 SHA1 e8d5743ab3b769942493a01e001d12f05ca6904b SHA256 bb9bc269d1f1779d311f68a62dddc61715046f3c94cd1522cc79fa5d3e659b67
 EBUILD aircrack-ng-1.1-r4.ebuild 1471 RMD160 aad6f772f725eb0736c9999b514f7e997f1d8973 SHA1 687f017e5856ce9259cd72bd571c8f73787361a4 SHA256 bae72916c573d0995ae6f727f4053837807044918f584455eabceadda87a48d9
+EBUILD aircrack-ng-1.1-r5.ebuild 1641 RMD160 97f0d61a11eb4e22a1e935b27c1c83e82d3dc7ed SHA1 abe2b826318a98a201fdb798faf45bd43e3d8fbf SHA256 4f0be9fe3a546002b06d9cc305ea6aaf2b06bc218c14ae204a9c01e243142a19
 EBUILD aircrack-ng-1.1.ebuild 1036 RMD160 59f04ea637fef17a894402e111a83e8400309599 SHA1 f478461f19068df386a2cc00288c75aa9aeadee7 SHA256 b0293724ef712844120b165aac7f3d4448f70add05ec1eda9c94b88d0f950cc0

net-wireless/aircrack-ng/aircrack-ng-1.1-r5.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit 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="x86 amd64 arm"
+
+IUSE="+sqlite +unstable"
+
+DEPEND="dev-libs/openssl
+		sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}
+	net-wireless/iw"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+have_sqlite() {
+	use sqlite && echo "true" || echo "false"
+}
+
+have_unstable() {
+	use unstable && echo "true" || echo "false"
+}
+
+src_prepare() {
+	#backports
+	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}"/pic-fix.patch
+	epatch "${FILESDIR}"/changeset_r1921_backport.diff
+
+	#likely to stay after version bump
+	epatch "${FILESDIR}"/airodump-ng-oui-update-path-fix.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" sqlite=$(have_sqlite) unstable=$(have_unstable) || die "emake failed"
+}
+
+src_install() {
+	emake \
+		prefix="${ROOT}/usr" \
+		mandir="${ROOT}/usr/share/man/man1" \
+		DESTDIR="${ED}" \
+		sqlite=$(have_sqlite) \
+		unstable=$(have_unstable) \
+		install \
+		|| die "emake install failed"
+
+	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
+}

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=""

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;