Fix pcap_findalldevs for kernel with Bonding devices support enabled, bug #323425, thank Oliver Schmidt for report.

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

4 files changed, 102 insertions, 2 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 39e3be8cfd76..e6da2d254bba 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.145 2010/06/11 12:28:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.146 2010/06/11 18:26:07 pva Exp $
+
+*libpcap-1.1.1-r1 (11 Jun 2010)
+
+  11 Jun 2010; Peter Volkov <pva@gentoo.org> +libpcap-1.1.1-r1.ebuild,
+  +files/libpcap-1.1.1-ignore-ENODEV.patch:
+  Fix pcap_findalldevs for kernel with Bonding devices support enabled, bug
+  #323425, thank Oliver Schmidt for report.
 
   11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   libpcap-1.0.0-r2.ebuild, libpcap-1.0.1_pre20090812.ebuild,
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 9242f82c300e..2f2a8921cf46 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -15,6 +15,7 @@ AUX libpcap-1.0.1-autoconf.patch 560 RMD160 84f326621b6a3de48516a449c5a9a48b95a9
 AUX libpcap-1.0.1_pre20090708-libnl-automagic.patch 1018 RMD160 75c7caeca86951426b0fc140cc8919e0215a8471 SHA1 7fb4a68bfcd1f884907ca2e71c9340eff21b4548 SHA256 8b29e765a244161545f02ea702f555303a9914ccde73548258d79900691778f5
 AUX libpcap-1.0.1_pre20090812-poll-cpu-usage.patch 1060 RMD160 b4821a0b146dda4ff8cce822e5d86f3196ab0894 SHA1 1b017ce2e2edc978b757c886326da6cc7f6898d2 SHA256 44776d07b759061f27be568f1fef7eb3400f1a10ad11fe14557f676a0dbd04b9
 AUX libpcap-1.1-cross-linux.patch 1050 RMD160 ca856c3f295752de47f3d813c324720960ba5fd0 SHA1 7b33a9ec9c65f5e108cbcb3855f0b954cfb75210 SHA256 b1b6375abe00207c4ea69d0e7150eb2ed080eff4b7a1112e69af587f2004474a
+AUX libpcap-1.1.1-ignore-ENODEV.patch 1363 RMD160 ddbd33d8aa610d9f3653bfaa9bad5c29ae3097ca SHA1 40532cee84b5838c57468e02056b42e2a1721e5a SHA256 1fa73b0ce9552352df0024af5172433fbdd3fb856b6aa53b90ceb8a31fded00c
 AUX libpcap-cross-linux.patch 1114 RMD160 e76fd1ea94d34e8533416c476d95166ad13579ec SHA1 0853cb1cf102c6d9b41d22b4c62b0e1bac6d73a8 SHA256 4b3fe1e2b7ecefbf82e20120f8c3bf9c5050cb7ccc1e0be77a04af5ef7cbb459
 DIST libpcap-0.9.8.tar.gz 520526 RMD160 2f5ecbc9840d8bd646798c977b7a02abe191311e SHA1 11dfe67cfc1c279c7346d626a99ad4ba90621028 SHA256 c4158398de4411627b14f52626e4cef39443f4d5c1b9bce8c07f8526d18362f9
 DIST libpcap-1.0.0.tar.gz 524273 RMD160 20857fe6af5dc70fffb19da46e0fee908f55b3ea SHA1 9893654027ae11033d785045ff35583da43fe8fa SHA256 a214c4e1d7e22a758f66fe1d08f0ce41c3ba801a4c13dd1188e1e38288ac73c0
@@ -23,6 +24,7 @@ DIST libpcap-1.1.1.tar.gz 581984 RMD160 760159c594cc995c9e05c0cd8637a02a3b2725e2
 EBUILD libpcap-0.9.8-r2.ebuild 1893 RMD160 7eb603ca3e2cbe57ce3857536b1ecca7b8769742 SHA1 edcc59e68dc8a21036c1f5b9df87b9cb0516ef93 SHA256 f5c8ed79b684c390791df95dfaad5b2ab0a6f7108ca6048823f5101f18c24a4e
 EBUILD libpcap-1.0.0-r2.ebuild 1718 RMD160 c0224d9b4438c200c773111b62c939e734388526 SHA1 43829839f56b372e2e27e6e0ea2461a8b19f79e3 SHA256 0dbcd3d92390ca58e96522afbe0117fe33b7c46656750342c34a21a9936edf16
 EBUILD libpcap-1.0.1_pre20090812.ebuild 1956 RMD160 741cbe63281d455018b97214dcbff768f7a85b0b SHA1 51bff94fc648ed56eb6db396564885d703efcce1 SHA256 89aca7363ca08b2b61031269b539715b00d0f4e8c4047c2bd886329a0e8a6e6e
+EBUILD libpcap-1.1.1-r1.ebuild 1675 RMD160 6a88daf34ec5123f8f6fce2982f1a3028edc67e1 SHA1 4568709e0406a852a80c09e961e43d1a4ea92eef SHA256 781905d2053f2aaacb8f444fa48813c87893f414653fed6c1c55d1161f1eba87
 EBUILD libpcap-1.1.1.ebuild 1620 RMD160 87433efc287ae2df7ed1a49540a880392aa45bf5 SHA1 3979a7c7b7555866d8a5aadb4ac811c2fe1354bc SHA256 1bee49ff0f9d0222596c4e9dbe3a041e61872b26531d145b57152c6fbc85c2e9
-MISC ChangeLog 19645 RMD160 b6536f5d8c6376cf5beabb3336ba35dd2d6cf857 SHA1 412acb62a4acdc4f363e4dc6168e07421193bea7 SHA256 e1ddfbe97f209b765e6dde4e9ca009a0f0deb941752a5f6e3e6f4b854b81fe2f
+MISC ChangeLog 19908 RMD160 25e89ca54f7bd995507000db2e27c424f2187f88 SHA1 76c6466ca4c5ee37c6a38e4d74e754b01347b981 SHA256 c73b6a0f3ed96e01c21771cf6608429d88af32d1c3ba9c6feff9bd3fc011f57a
 MISC metadata.xml 388 RMD160 3b1443ce61438e34f2f95c0f5cc30a084d6f0449 SHA1 2a2b22d69ff3531819eb0fb9878bb43ee2ca93fd SHA256 0b03dfcc45267fcf74372c8a6cebe9df940147c62c8c4fb6ef47fc9e34e7dce0
diff --git a/net-libs/libpcap/files/libpcap-1.1.1-ignore-ENODEV.patch b/net-libs/libpcap/files/libpcap-1.1.1-ignore-ENODEV.patch
new file mode 100644
index 000000000000..3dcbcae95210
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.1.1-ignore-ENODEV.patch
@@ -0,0 +1,36 @@
+commit 073a8b37f97b684a34d29800400879e4e902ff63
+Author: andy-1 <andy-1@sourceforge.net>
+Date:   Tue Apr 27 23:33:23 2010 -0700
+
+    Ignore /sys/net/dev files if we get ENODEV for them, not just ENXIO.
+    
+    Both of them are indications that there's no such interface, so the file
+    probably corresponds to something other than a device.
+    
+    Reviewed-By: Guy Harris <guy@alum.mit.edu>
+
+diff --git a/CREDITS b/CREDITS
+index 0d23783..6efc188 100644
+--- a/CREDITS
++++ b/CREDITS
+@@ -15,6 +15,7 @@ Additional people who have contributed patches:
+ 	Alexey Kuznetsov		<kuznet at ms2 dot inr dot ac dot ru>
+ 	Alon Bar-Lev			<alonbl at sourceforge dot net>
+ 	Andrew Brown			<atatat at atatdot dot net>
++					<andy-1 at sourceforge dot net>
+ 	Antti Kantee			<pooka at netbsd dot org>
+ 	Arien Vijn			<arienvijn at sourceforge dot net>
+ 	Arkadiusz Miskiewicz		<misiek at pld dot org dot pl>
+diff --git a/pcap-linux.c b/pcap-linux.c
+index af12543..de3239a 100644
+--- a/pcap-linux.c
++++ b/pcap-linux.c
+@@ -1883,7 +1883,7 @@ scan_sys_class_net(pcap_if_t **devlistp, char *errbuf)
+ 		 */
+ 		strncpy(ifrflags.ifr_name, name, sizeof(ifrflags.ifr_name));
+ 		if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
+-			if (errno == ENXIO)
++			if (errno == ENXIO || errno == ENODEV)
+ 				continue;
+ 			(void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
+ 			    "SIOCGIFFLAGS: %.*s: %s",
diff --git a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..c486d6a9f445
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1-r1.ebuild,v 1.1 2010/06/11 18:26:07 pva Exp $
+
+EAPI=2
+inherit autotools eutils multilib toolchain-funcs
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="http://www.tcpdump.org/"
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+	http://www.jp.tcpdump.org/release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth ipv6 libnl"
+
+RDEPEND="!virtual/libpcap
+	bluetooth? ( net-wireless/bluez )
+	libnl? ( dev-libs/libnl )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+PROVIDE="virtual/libpcap"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.1-cross-linux.patch"
+	epatch "${FILESDIR}/${P}-ignore-ENODEV.patch"
+	# Force usbmon device to avoid #318359
+	sed 's:\(ac_usb_dev_name=\).*udevinfo.*:\1"usbmon":' -i configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable ipv6) \
+		$(use_with libnl) \
+		$(use_enable bluetooth)
+}
+
+src_compile() {
+	emake all shared || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h || die "failed to install pcap-int.h"
+	fi
+
+	# We are not installing README.{Win32,aix,hpux,tru64} (bug 183057)
+	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} || die
+}