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

Package-Manager: portage-2.1.10.48/cvs/Linux x86_64

4 files changed, 78 insertions, 7 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/Manifest b/net-wireless/kismet/Manifest
index 39494bdcc2a3..ee062246e8ac 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,5 +1,6 @@
 AUX bluechanfix_r3184.patch 452 RMD160 cc207c174d02c25f60f0e383f39435f35fa843e3 SHA1 a3c95e2cad5b105e2b875bec0631b85ec7e1018b SHA256 f7c9449039c76f5a919ad8399ce49b518c01046db1566bce25fd34496482faf0
 AUX gcc-4.3.patch 1221 RMD160 6c9c7da7c90367a363dd5d6a4e23eeee89791552 SHA1 2aff87ae336cb27d8e96831a7ab57d3f328ca78e SHA256 5e98a582f93169f5525338b9842c9196ff8d2764c69f4dc412acafb67e3b002b
+AUX header_alignment_r3326.patch 2031 RMD160 e6573980e79e9bfcaf91795b26709188d0daf021 SHA1 d17bd21180027f87aea6d8a7fdba4fe43eef7c06 SHA256 0a4afdc0cb74cb0ea7012f912fb886acb3d6bd42345835a26bf44f0a1ab63556
 AUX kismet-2007.10.1-Makefile.in.patch 2716 RMD160 abccd73749e80afe299ef46ed7ce39f132d8805c SHA1 4bbe30845e190e01dc495573f7bcedbd8da9c089 SHA256 d74c9b7c558beff78908e3d720d2b1783c101e12c2b719315b5ac3abb2c8808a
 AUX kismet-2007.10.1-conf.d 403 RMD160 cf6cad4dc844ccf9c807edfb5adec2351c0cd249 SHA1 50ce39c8989ddf214f72b3ac14f2a989d6121d15 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb
 AUX kismet-2007.10.1-init.d 749 RMD160 c9dfda5e93ae8fa59679194241dd9508830dc617 SHA1 b3efd2d802aa34eee278fa8b4933e3eec8c33308 SHA256 1dd3fd3fee724490908abe072577ab159c2371820561872f8af0e30ea2f83054
@@ -17,6 +18,6 @@ EBUILD kismet-2007.10.1.ebuild 1419 RMD160 404a8e7728914df6ef7068f27defd4e5ec43f
 EBUILD kismet-2008.05.1.ebuild 1574 RMD160 544efe108a3cde2c2da659b465d53e55149e23fb SHA1 78a0209330c2649cda6da1ace1f900dc7c1afe76 SHA256 61a51e9f1631fb853b0ee6ef4c63367b11b55c27d09ac8d252bd4607add9d3f0
 EBUILD kismet-2010.01.1-r1.ebuild 2443 RMD160 a5bf0a6344e0e115f2a42b2d6a7bd2ca04035bb4 SHA1 98b5279e60e95775fd768fa4bfdaa01a9bceb225 SHA256 bcbad0bd18327c39ae416898678f95ba073e10cf96b995bb760cab20e05ad8ce
 EBUILD kismet-2010.01.1.ebuild 2370 RMD160 681932115c9271e72b5ad079f4679da482fcb794 SHA1 515cad7e6f8eea9849e36af799e5ba4b278e3d28 SHA256 27bae72fc30903da6fb3b5db6d7c545ce520c9bf90f017ea0aa7b48f06063563
-EBUILD kismet-2011.03.2.ebuild 4275 RMD160 0accac91272f0ca27dad79200f3f48298098f720 SHA1 07e15c11f7628af7ecc8dfc265438d38e78de4ab SHA256 db84f8b8d6d8ebcdadeed88b092a67668c508c689fa810ea64598832f9b01a61
-MISC ChangeLog 17570 RMD160 5f70446a61d81e887f420da4d09a597f7e60c7d3 SHA1 1c38d151754fff45781b18ac1f085d29aacf612d SHA256 5066657cf04e0c084612eba845787bae2d5ddd88d34aaf9739ab3059be535c0f
+EBUILD kismet-2011.03.2-r1.ebuild 4452 RMD160 c517fbf6ca0f9f2c7990eb7270c246cb0cdd9279 SHA1 8783ff714024a8bb34a11b3b123fe457d13803dd SHA256 196a17b9275b39e0b17f6a9a9339f3af51da2d3b3a49bf2db56a7cf618429f5c
+MISC ChangeLog 17866 RMD160 0386e7731a868fd1db1217013701a7ff55aea0de SHA1 9eafe98570179dcb5d1a25b70be82d6f7b0e3acf SHA256 5fca4dbdd2c9a0c5f1f53466a8c54f83cdaa9e30376288dcce1a64985b2e6f4a
 MISC metadata.xml 1471 RMD160 fab31ad1b87137f94eea2d125743c88305b979fa SHA1 92ac5aef3b90f1a557311e39de094c0924447fc8 SHA256 74c18e6c799f8572c1376c44642ea65fd9ba19e4f10a4f755db30aff11c94c5b
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