Fix building with GLIBC 2.10+ wrt #270845.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 21 insertions, 14 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 3f8bcaf8bcbb..32efef4b80d4 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.105 2009/04/15 13:43:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.106 2009/08/09 15:09:23 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  kismet-2008.05.1.ebuild, +files/kismet-2008.05.1-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #270845.
 
   15 Apr 2009; Hanno Boeck <hanno@gentoo.org> kismet-2008.05.1.ebuild:
   Add dbus use-flag.
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 7f1325cc7b40..2900e619ed70 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gcc-4.3.patch 1221 RMD160 6c9c7da7c90367a363dd5d6a4e23eeee89791552 SHA1 2aff87ae336cb27d8e96831a7ab57d3f328ca78e SHA256 5e98a582f93169f5525338b9842c9196ff8d2764c69f4dc412acafb67e3b002b
 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
+AUX kismet-2008.05.1-glibc-2.10.patch 408 RMD160 8a215877f85874a920c657956ca1309ce4698bb4 SHA1 e6e18c440b51bb786317878e526aa5f1cdbcad00 SHA256 a9a21167e0d000664c420f6eed2520119334b8d81cfc1730f70ac0396db4d716
 AUX kismet.confd 403 RMD160 cf6cad4dc844ccf9c807edfb5adec2351c0cd249 SHA1 50ce39c8989ddf214f72b3ac14f2a989d6121d15 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb
 AUX kismet.initd 742 RMD160 f91c46a9a3d1cac2610659e65a1a3538af4f2772 SHA1 54aa3d489e2fade47cca11a036cb1237dab7786a SHA256 b4420c22264ff3604bf956b65bca5b564cbb70676c3f48d5e444f3aa6687a624
 DIST kismet-2007-10-R1.tar.gz 646452 RMD160 7cb62a3fd964c9ee7e4ec6bef050558c806ab495 SHA1 a1c682797ad6842b53f9e0f038254aa8326e0fb4 SHA256 023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9
 DIST kismet-2008-05-R1.tar.gz 655362 RMD160 5613207b45f85fa72d146009434df984f721ccdc SHA1 8355aeb0374a39549dfdc0c73160125eadd7c6e2 SHA256 a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3
 EBUILD kismet-2007.10.1.ebuild 1419 RMD160 404a8e7728914df6ef7068f27defd4e5ec43f2b0 SHA1 8e24517a45032a0e751236c56d0c0b84924afc20 SHA256 03091b90c603852024258b63035840f3d1eb6f94772b07d76b24d153e32385c2
-EBUILD kismet-2008.05.1.ebuild 1526 RMD160 684d28b8a29e9cc70a8d6534899e66917f3632cb SHA1 ca014a6c728056b851eac01e735b33d13a13081e SHA256 83a185ba84b2d7c311ee22abfdcf59538d8593428a7442062d0407f99b34d604
-MISC ChangeLog 16355 RMD160 829cee872424c1dcec396cbc4518f39a3df0031e SHA1 c7a26f0ebce8f66f43de446a857a54debb182301 SHA256 5fac3dd99bc5ddc58c6bcf831341cfd96739b73413168f102d0690a606098b73
+EBUILD kismet-2008.05.1.ebuild 1574 RMD160 544efe108a3cde2c2da659b465d53e55149e23fb SHA1 78a0209330c2649cda6da1ace1f900dc7c1afe76 SHA256 61a51e9f1631fb853b0ee6ef4c63367b11b55c27d09ac8d252bd4607add9d3f0
+MISC ChangeLog 16528 RMD160 87fd0cfee2433a201ad4cf1271d9dc383d8c0b0a SHA1 3fc95e7a07787bdc743f1c9594965b854d671283 SHA256 373416de1d367f9fe7fc02bf159228d3843c2df24dc2025e56335a13dec2fdd6
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknl5H4ACgkQr2QksT29OyCh/wCeNudLPijcA/m+Qp7Gk5V8QSpJ
-EcQAn3Vpfslm1OPrg0bEolL5iGBpSzKq
-=d4Rn
------END PGP SIGNATURE-----
diff --git a/net-wireless/kismet/files/kismet-2008.05.1-glibc-2.10.patch b/net-wireless/kismet/files/kismet-2008.05.1-glibc-2.10.patch
new file mode 100644
index 000000000000..f14d5adfb3fa
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2008.05.1-glibc-2.10.patch
@@ -0,0 +1,11 @@
+--- macaddr.h.orig	2009-03-18 00:08:27.000000000 -0700
++++ macaddr.h	2009-03-18 00:09:30.000000000 -0700
+@@ -73,7 +73,7 @@
+ 			longmac |= (uint64_t) bs_in[5] << ((MAC_LEN - 5 - 1) * 8);
+ 
+             // If it has a mask component, get that
+-            char *in_mask = strchr(in, '/');
++            const char *in_mask = strchr(in, '/');
+             if (in_mask != NULL) {
+                 longmask = 0;
+ 
diff --git a/net-wireless/kismet/kismet-2008.05.1.ebuild b/net-wireless/kismet/kismet-2008.05.1.ebuild
index 9488994173dc..af74bf5e521e 100644
--- a/net-wireless/kismet/kismet-2008.05.1.ebuild
+++ b/net-wireless/kismet/kismet-2008.05.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2008.05.1.ebuild,v 1.4 2009/04/15 13:43:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2008.05.1.ebuild,v 1.5 2009/08/09 15:09:23 ssuominen Exp $
 
 inherit toolchain-funcs linux-info eutils
 
@@ -35,6 +35,7 @@ src_unpack() {
 		-e 's|@mangrp@|root|g' Makefile.in
 
 	epatch "${FILESDIR}"/gcc-4.3.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 }
 
 src_compile() {