Reintroduce iw as a dep on Linux that got dropped in the bump (bug # 260177),

  Improve support for current FreeBSD (bug #253803): applied some patches and
  remove airmon-ng application.
Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 147 insertions, 10 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index 9944a86694cc..1ed8797337d8 100644
--- a/net-wireless/aircrack-ng/ChangeLog
+++ b/net-wireless/aircrack-ng/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/aircrack-ng
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.37 2009/03/01 16:57:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.38 2009/03/12 17:59:10 rbu Exp $
+
+*aircrack-ng-1.0_rc2-r1 (12 Mar 2009)
+
+  12 Mar 2009; Robert Buchholz <rbu@gentoo.org>
+  +files/aircrack-ng-1.0_rc2-freebsd.patch, -aircrack-ng-1.0_rc2.ebuild,
+  +aircrack-ng-1.0_rc2-r1.ebuild:
+  Reintroduce iw as a dep on Linux that got dropped in the bump (bug # 260177),
+  Improve support for current FreeBSD (bug #253803): applied some patches and
+  remove airmon-ng application.
 
 *aircrack-ng-1.0_rc2 (01 Mar 2009)
 
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 967a492c976a..e7b8db4297ef 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,3 +1,4 @@
+AUX aircrack-ng-1.0_rc2-freebsd.patch 3062 RMD160 4aa58a0f661f308444fc59a9c36fc32fe6e5514e SHA1 9fb261f4db2418b21c3327d1eca28e557c83887f SHA256 1376eff217f6577865d1425c85f50fd7eb054a2749ebefb8e11bed1065507a7a
 AUX process-group-leader.c 373 RMD160 2ce7341f5a58d2223590f1edfbcd1230a909024b SHA1 4653e2329b901dbb96f1380b478ea1de63d2a08b SHA256 153666625e942384648dafedbc8f37577fdf6a24060b04237913fd7f693f7bf7
 AUX sha-compile-fix-64bit.patch 568 RMD160 e6e018219508cc283ce448888cff9f408c950ecf SHA1 7ede579ab752ed657a049513be2050b1aaac2f5b SHA256 c4e6287c3cd62ed573b37b2471756f3226497b8bdd59847f716db193cc01cf9d
 DIST aircrack-ng-0.9.3.tar.gz 1031441 RMD160 29c7d454da26167fb24e5a0f2b6eeeddc98e697d SHA1 b2f671324d056408b83d32eb1ab6061b7fa87ac5 SHA256 71bca53eae0261d5bdd72e4363f43f5a6e40b2375dc4852a4029a061c789da58
@@ -5,6 +6,6 @@ DIST aircrack-ng-1.0-rc1.tar.gz 1208442 RMD160 e9805870c27119c06a1069c50bfea5e22
 DIST aircrack-ng-1.0-rc2.tar.gz 1472691 RMD160 aa96e5d3210f0c0dbc48f15744e8831ffb61dba3 SHA1 67c512d9e48dce2aab4f5523ad2380a676d75a4a SHA256 9d52f15f3fca52775ecb9cfc1f0aeb04c3c3bd3101665d5760d395f7d2a87d8b
 EBUILD aircrack-ng-0.9.3.ebuild 1331 RMD160 c4ee2d1098341aa83a51756279aa7633be1827af SHA1 0366fdddc409b013078a43d3861391aecc1404e9 SHA256 7c02727963d713fbdc18c8181bfc06a161488909e4777e653882a49ccb6c9958
 EBUILD aircrack-ng-1.0_rc1.ebuild 1036 RMD160 5f50e4151154b47f107f0c3111b0f1a4713fa8d5 SHA1 2b4eafbe3b9088d52f4db28f75f696ba869c5332 SHA256 70cc2c288e79159f53cddcdaabb4cd2a79e60a35e11263831682eefc0e8dd42f
-EBUILD aircrack-ng-1.0_rc2.ebuild 1122 RMD160 52dc4f5233d65c86e08fc3df656c4a2ab9766e09 SHA1 9b0c98010a7afd099e9a9625044015c5a50b66f3 SHA256 531c6adb51b8f0cbf47e146061a904c579125fb720fc18b0542b16521514d624
-MISC ChangeLog 5716 RMD160 db6931072f34018d9e52ac6d48226bc3790d2a0c SHA1 0cc7595b4fedac42fc871855fb01adbc6f5440ef SHA256 c28aa2f2850b4df1541bc9711d0879b0aeb66b91b6ea2f4895f555db5ae82d89
+EBUILD aircrack-ng-1.0_rc2-r1.ebuild 1948 RMD160 65c4a5ff3e1f1c4875bd5fc2ad0bea22bd20db00 SHA1 2e32cfd5f548f4d3dc72e047e82fee091553814f SHA256 3a539479596c36f8529fc67ef7cd45c0b6191eb3b36ef3e2404bacc6682e56aa
+MISC ChangeLog 6097 RMD160 a1f9664c0cd1eaaad2a8d6d3cd1ce61334ff0ae1 SHA1 99c9886e1c4f452ffae57c396556a92cf003f8bb SHA256 13c02eeecd8eb68e9539d44390071a7e38c09b2343f1d0220ffc9a15ed8edd25
 MISC metadata.xml 545 RMD160 74b28f94434b9af081b71806679b128b42cb8068 SHA1 b9b41decbf07297e72c3f682be1c13415df1f402 SHA256 af8903a9f2e95968febae6760b251c2145e3a26569f71ff64266ae2b4fcbbb2a
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.0_rc2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.0_rc2-r1.ebuild
index d1fe1b3204b9..ac030802e2f0 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.0_rc2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.0_rc2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 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_rc2.ebuild,v 1.1 2009/03/01 16:57:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.0_rc2-r1.ebuild,v 1.1 2009/03/12 17:59:10 rbu Exp $
 
-EAPI=1
+EAPI=2
 inherit versionator eutils toolchain-funcs
 
 MY_PV=$(replace_version_separator 2 '-')
@@ -14,11 +14,12 @@ SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite"
+IUSE="+sqlite kernel_linux kernel_FreeBSD"
 
 DEPEND="dev-libs/openssl
 	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	kernel_linux? ( net-wireless/iw )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
@@ -26,10 +27,13 @@ have_sqlite() {
 	use sqlite && echo "true" || echo "false"
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/sha-compile-fix-64bit.patch"
+	if use kernel_FreeBSD ; then
+		epatch "${FILESDIR}/${P}-freebsd.patch"
+		sed -i -e "s:^\(SCRIPTS.*\)airmon-ng:\1:g" Makefile
+		sed -i -e "s:airmon-ng.1::g" manpages/Makefile
+	fi
 }
 
 src_compile() {
@@ -47,3 +51,18 @@ src_install() {
 
 	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/files/aircrack-ng-1.0_rc2-freebsd.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.0_rc2-freebsd.patch
new file mode 100644
index 000000000000..e3e0ebabd7bf
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/aircrack-ng-1.0_rc2-freebsd.patch
@@ -0,0 +1,108 @@
+http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/patch-src_airserv-ng.c?rev=1.1
+--- src/airserv-ng.c.orig	2008-06-10 02:55:09.000000000 +0700
++++ src/airserv-ng.c	2008-08-11 13:39:46.000000000 +0700
+@@ -37,6 +37,15 @@
+ 
+ #ifdef __MACH__
+ #include <libkern/OSByteOrder.h>
++#elif defined(__FreeBSD__)
++#include <machine/endian.h>
++#if BYTE_ORDER == BIG_ENDIAN
++# define __cpu_to_be32(x)	(x)
++# define __cpu_to_be64(x)	(x)
++#elif BYTE_ORDER == LITTLE_ENDIAN
++# define __cpu_to_be32(x)	__bswap32(x)
++# define __cpu_to_be64(x)	__bswap64(x)
++#endif
+ #else
+ #include <asm/byteorder.h>
+ #endif /* __MACH__ */
+
+
+http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/patch-src_osdep_network.c?rev=1.1
+--- src/osdep/network.c.orig	2008-06-10 02:55:09.000000000 +0700
++++ src/osdep/network.c	2008-08-11 13:29:42.000000000 +0700
+@@ -32,6 +32,15 @@
+ 
+ #ifdef __MACH__ 
+ #include <libkern/OSByteOrder.h>
++#elif defined(__FreeBSD__)
++#include <machine/endian.h>
++#if BYTE_ORDER == BIG_ENDIAN
++# define __be32_to_cpu(x)	(x)
++# define __be64_to_cpu(x)	(x)
++#elif BYTE_ORDER == LITTLE_ENDIAN
++# define __be32_to_cpu(x)	__bswap32(x)
++# define __be64_to_cpu(x)	__bswap64(x)
++#endif
+ #elif defined (__sun) && defined (__sparc) /* Solaris SPARC, not Solaris x86 */
+ #include <sys/byteorder.h>
+ #else
+
+
+http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c?rev=1.1
+--- src/osdep/freebsd.c.orig	2008-06-10 02:55:09.000000000 +0700
++++ src/osdep/freebsd.c	2008-08-11 20:01:53.000000000 +0700
+@@ -53,7 +53,9 @@
+ 	unsigned char			pf_buf[4096];
+ 	unsigned char			*pf_next;
+ 	int				pf_totlen;
++#if __FreeBSD_version > 700018
+         struct ieee80211_bpf_params	pf_txparams;
++#endif
+ 
+ 	/* setchan */
+ 	int				pf_s;
+@@ -280,13 +282,16 @@
+ static int fbsd_write(struct wif *wi, unsigned char *h80211, int len,
+ 		      struct tx_info *ti)
+ {
++#if __FreeBSD_version > 700018
+         struct iovec iov[2];
++#endif
+ 	struct priv_fbsd *pf = wi_priv(wi);
+ 	int rc;
+ 
+ 	/* XXX make use of ti */
+ 	if (ti) {}
+ 
++#if __FreeBSD_version > 700018
+ 	iov[0].iov_base = &pf->pf_txparams;
+ 	iov[0].iov_len = pf->pf_txparams.ibp_len;
+ 
+@@ -294,12 +299,19 @@
+         iov[1].iov_len = len;
+ 
+ 	rc = writev(pf->pf_fd, iov, 2);
++#else
++	rc = write(pf->pf_fd, h80211, len);
++#endif
+ 	if (rc == -1)
+ 		return rc;
++#if __FreeBSD_version > 700018
+ 	if (rc < (int) iov[0].iov_len)
+ 		return 0;
+ 
+ 	return rc - iov[0].iov_len;
++#else
++	return 0;
++#endif
+ }
+ 
+ static int fbsd_set_channel(struct wif *wi, int chan)
+@@ -542,6 +554,7 @@
+ 	/* setup private state */
+ 	pf = wi_priv(wi);
+ 	pf->pf_fd = fd;
++#if __FreeBSD_version > 700018
+         pf->pf_txparams.ibp_vers = IEEE80211_BPF_VERSION;
+ 	pf->pf_txparams.ibp_len = sizeof(struct ieee80211_bpf_params) - 6;
+ 	pf->pf_txparams.ibp_rate1 = 2;         /* 1 MB/s XXX */
+@@ -549,6 +562,7 @@
+ 	pf->pf_txparams.ibp_flags = IEEE80211_BPF_NOACK;
+ 	pf->pf_txparams.ibp_power = 100;       /* nominal max */
+ 	pf->pf_txparams.ibp_pri = WME_AC_VO;   /* high priority */
++#endif
+ 
+ 	return wi;
+ }