summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-10-26 10:48:10 +0200
committerJeroen Roovers <jer@gentoo.org>2016-10-26 11:04:07 +0200
commit4a3fc3e111161b3c7b8d15b1e9cefa2c2467f017 (patch)
treec2ac975f8dc5397786c5a0b6ec049962749e70c0
parentnet-libs/libpcap: Version bump. (diff)
downloadgentoo-4a3fc3e111161b3c7b8d15b1e9cefa2c2467f017.tar.gz
gentoo-4a3fc3e111161b3c7b8d15b1e9cefa2c2467f017.tar.bz2
gentoo-4a3fc3e111161b3c7b8d15b1e9cefa2c2467f017.zip
net-libs/libpcap: Default USB monitor name should not depend on local host.
Package-Manager: portage-2.3.2
-rw-r--r--net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch16
-rw-r--r--net-libs/libpcap/libpcap-1.8.1.ebuild1
2 files changed, 17 insertions, 0 deletions
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch b/net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch
new file mode 100644
index 000000000000..0b69e43a3f7d
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1493,10 +1493,9 @@
+ AC_DEFINE(PCAP_SUPPORT_USB, 1, [target host supports USB sniffing])
+ USB_SRC=pcap-usb-linux.c
+ AC_MSG_RESULT(yes)
+- ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
+- if test $? -ne 0 ; then
+- ac_usb_dev_name="usbmon"
+- fi
++
++ ac_usb_dev_name="usbmon"
++
+ AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
+ AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
+ #
diff --git a/net-libs/libpcap/libpcap-1.8.1.ebuild b/net-libs/libpcap/libpcap-1.8.1.ebuild
index 96ea6bcb2011..5231472dd09f 100644
--- a/net-libs/libpcap/libpcap-1.8.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
"${FILESDIR}"/${PN}-1.8.1-darwin.patch
"${FILESDIR}"/${PN}-1.8.1-libnl.patch
+ "${FILESDIR}"/${PN}-1.8.1-usbmon.patch
)
src_prepare() {