Remove kismest 2011.03.2 ebuild. Revbump to add a critical patch from svn. Fix the bluez dependency issue.

(Portage version: 2.1.10.48/cvs/Linux x86_64)

3 files changed, 75 insertions, 5 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 332d17dae741..f513cdac9e46 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.110 2012/02/17 04:52:21 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.111 2012/02/21 04:22:30 steev Exp $
+
+*kismet-2011.03.2-r1 (21 Feb 2012)
+
+  21 Feb 2012; Steev Klimaszewsk <steev@gentoo.org>
+  +files/header_alignment_r3326.patch, -kismet-2011.03.2.ebuild,
+  +kismet-2011.03.2-r1.ebuild:
+  Remove kismest 2011.03.2 ebuild. Revbump to add a critical patch from svn.
+  Fix the bluez dependency issue.
 
 *kismet-2011.03.2 (17 Feb 2012)
 
diff --git a/net-wireless/kismet/files/header_alignment_r3326.patch b/net-wireless/kismet/files/header_alignment_r3326.patch
new file mode 100644
index 000000000000..408456ecafec
--- /dev/null
+++ b/net-wireless/kismet/files/header_alignment_r3326.patch
@@ -0,0 +1,58 @@
+diff -Naur kismet-2011-03-R2-orig/packetsource_pcap.cc kismet-2011-03-R2/packetsource_pcap.cc
+--- kismet-2011-03-R2-orig/packetsource_pcap.cc	2011-01-05 16:52:51.000000000 -0500
++++ kismet-2011-03-R2/packetsource_pcap.cc	2012-02-20 22:37:17.973526919 -0500
+@@ -553,6 +553,9 @@
+ }
+ #endif
+ 
++#define ALIGN_OFFSET(offset, width) \
++	    ( (((offset) + ((width) - 1)) & (~((width) - 1))) - offset )
++
+ /*
+  * Useful combinations of channel characteristics.
+  */
+@@ -617,6 +620,8 @@
+ 	enum ieee80211_radiotap_type bit;
+ 	int bit0;
+ 	const u_char *iter;
++	const u_char *iter_start;
++	unsigned int iter_align;
+ 	int fcs_cut = 0; // Is the FCS bit set?
+ 	char errstr[STATUS_MAX];
+ 
+@@ -658,7 +663,7 @@
+ 
+ 	eight11chunk->dlt = KDLT_IEEE802_11;
+ 	
+-    iter = (u_char*)(last_presentp + 1);
++    iter_start = iter = (u_char*)(last_presentp + 1);
+ 
+     for (bit0 = 0, presentp = &hdr->it_present; presentp <= last_presentp;
+          presentp++, bit0 += 32) {
+@@ -686,6 +691,9 @@
+                     u.i8 = *iter++;
+                     break;
+                 case IEEE80211_RADIOTAP_CHANNEL:
++					iter_align = ALIGN_OFFSET((unsigned int) (iter - iter_start), 2);
++					iter += iter_align;
++
+                     u.u16 = EXTRACT_LE_16BITS(iter);
+                     iter += sizeof(u.u16);
+                     u2.u16 = EXTRACT_LE_16BITS(iter);
+@@ -695,10 +703,16 @@
+                 case IEEE80211_RADIOTAP_LOCK_QUALITY:
+                 case IEEE80211_RADIOTAP_TX_ATTENUATION:
+                 case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
++					iter_align = ALIGN_OFFSET((unsigned int) (iter - iter_start), 2);
++					iter += iter_align;
++
+                     u.u16 = EXTRACT_LE_16BITS(iter);
+                     iter += sizeof(u.u16);
+                     break;
+                 case IEEE80211_RADIOTAP_TSFT:
++					iter_align = ALIGN_OFFSET((unsigned int) (iter - iter_start), 8);
++					iter += iter_align;
++
+                     u.u64 = EXTRACT_LE_64BITS(iter);
+                     iter += sizeof(u.u64);
+                     break;
diff --git a/net-wireless/kismet/kismet-2011.03.2.ebuild b/net-wireless/kismet/kismet-2011.03.2-r1.ebuild
index d03fa109dcb5..cdf1399dc64f 100644
--- a/net-wireless/kismet/kismet-2011.03.2.ebuild
+++ b/net-wireless/kismet/kismet-2011.03.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2.ebuild,v 1.1 2012/02/17 04:52:21 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r1.ebuild,v 1.1 2012/02/21 04:22:30 steev Exp $
 
 EAPI=4
 
@@ -26,6 +26,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="+ncurses +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +ruby +suid"
 
+# Bluez 4.98 breaks c++ building, so we choose to use -r2 which has the patch
+# or 4.96 which still builds properly.
 RDEPEND="net-wireless/wireless-tools
 	kernel_linux? ( sys-libs/libcap
 		>=dev-libs/libnl-1.1 )
@@ -35,8 +37,10 @@ RDEPEND="net-wireless/wireless-tools
 	ncurses? ( sys-libs/ncurses )
 	!arm? ( speech? ( app-accessibility/flite ) )
 	ruby? ( dev-lang/ruby )
-	plugin-btscan? ( net-wireless/bluez \
-			!=net-wireless/bluez-4.98-r1 )
+	plugin-btscan? ( || (
+			>=net-wireless/bluez-4.98-r2
+			=net-wireless/bluez-4.96
+			) )
 	plugin-dot15d4? ( <dev-libs/libusb-1 )
 	plugin-spectools? ( net-wireless/spectools )"
 
@@ -55,6 +59,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/plugins-ldflags.patch
 	epatch "${FILESDIR}"/bluechanfix_r3184.patch
 	epatch "${FILESDIR}"/kismet-console-scrolling-backport.patch
+	epatch "${FILESDIR}"/header_alignment_r3326.patch
 }
 
 src_configure() {
@@ -71,7 +76,6 @@ src_configure() {
 }
 
 src_compile() {
-	emake dep
 	emake
 
 	if use plugin-autowep; then