Force usbmon device for USB capturing, bug #318359, thank David Relson for report.

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

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 7c58ff8f389f4d70d168409e965cf7616b15e103..29714abc8ffcaea9140c6e3d30187f542a64770e 100644 (file)
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.141 2010/05/12 20:04:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.142 2010/05/13 08:53:37 pva Exp $
+
+  13 May 2010; Peter Volkov <pva@gentoo.org> libpcap-1.1.1.ebuild:
+  Force usbmon device for USB capturing, bug #318359, thank David Relson for
+  report.
 
   12 May 2010; Brent Baude <ranger@gentoo.org> libpcap-1.1.1.ebuild:
   stable ppc64, bug 313827

diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 281344a46830096d830d2d21e3bb29f9453f9b4e..7fef4a5eb11d650c4c34c84e6b50f611f433da1f 100644 (file)
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -23,6 +23,6 @@ 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 1742 RMD160 c8cfe56d24f6ec5f36db1e5d7a78db07601067fc SHA1 8b5f1ff186e1c70d5c7fa3156bbadf71a6e5df1d SHA256 54d954551f24a905f5a1c7be53e9da380fe98f0757af51e1a7d1fd37d5e55de6
 EBUILD libpcap-1.0.1_pre20090812.ebuild 1985 RMD160 674a3e2bc35b129633b9b9a926af6d0af174c48e SHA1 1912b6bfcba993ebf75ba329880539e3ede4021f SHA256 d05afaa7104e00abc5789e386ec1bf4c8c52ffaddb86c55391cbeb55633c6536
-EBUILD libpcap-1.1.1.ebuild 1538 RMD160 51832afef1fb532fc95ef69cb25cdc4baa7b98e9 SHA1 35e6603b390d4f20646530b75e45d3093c6829e8 SHA256 b4b16ace77890692a26d13783b4223f1c56c8008ce1f461d91e70afbbdccd22e
-MISC ChangeLog 19088 RMD160 cb8bc94be651b7652dc70d10ccd1e0fffb8afdd8 SHA1 b44894211cef845ce2d07da027b34b613cb38ef5 SHA256 82c5c5de68c51a48b105a103d55adde9bf7bcfcd8ba50c8ddb791f4fd1360185
+EBUILD libpcap-1.1.1.ebuild 1652 RMD160 d51a1a73931a60d77b0979c70ea0a5a90a1eb256 SHA1 1a20c53fca9fa316f2a782f4959e4722c3970faf SHA256 62a506b529b039a521573d21800c21142d9e478cb00a00d65e9c26b810d7d1fb
+MISC ChangeLog 19240 RMD160 00a0201ba5f3ac22cf85b7c955317429a2c144ca SHA1 979b6339d0275d62c2ab496ad5c75402c0c9a7e3 SHA256 7084db4937b481979f29ec16bd3c37be4349bf4547891a8233d12faca4fd1f2e
 MISC metadata.xml 388 RMD160 3b1443ce61438e34f2f95c0f5cc30a084d6f0449 SHA1 2a2b22d69ff3531819eb0fb9878bb43ee2ca93fd SHA256 0b03dfcc45267fcf74372c8a6cebe9df940147c62c8c4fb6ef47fc9e34e7dce0

diff --git a/net-libs/libpcap/libpcap-1.1.1.ebuild b/net-libs/libpcap/libpcap-1.1.1.ebuild
index 659a2a8081bbfe36ab29f6846545eaa75eccddef..c6c7177b7201f3ecf1cf2871b22d1b0670a68d37 100644 (file)
--- a/net-libs/libpcap/libpcap-1.1.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.5 2010/05/12 20:04:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1.ebuild,v 1.6 2010/05/13 08:53:37 pva Exp $
 
 EAPI=2
 inherit autotools eutils multilib toolchain-funcs
@@ -25,6 +25,8 @@ PROVIDE="virtual/libpcap"
 
 src_prepare() {
        epatch "${FILESDIR}/${PN}-1.1-cross-linux.patch"
+       # Force usbmon device to avoid #318359
+       sed 's:\(ac_usb_dev_name=\).*udevinfo.*:\1"usbmon":' -i configure.in || die
        eautoreconf
 }