Hello community, here is the log from the commit of package libpcap for openSUSE:Factory checked in at Fri Nov 27 14:07:09 CET 2009. -------- --- libpcap/libpcap.changes 2009-10-29 18:12:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/libpcap/libpcap.changes 2009-11-03 20:19:57.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:09:28 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpcap.spec ++++++ --- /var/tmp/diff_new_pack.l1nw9v/_old 2009-11-27 14:06:34.000000000 +0100 +++ /var/tmp/diff_new_pack.l1nw9v/_new 2009-11-27 14:06:34.000000000 +0100 @@ -20,9 +20,9 @@ Name: libpcap Version: 1.0.0 -Release: 5 +Release: 6 Group: System/Libraries -License: BSD 3-clause (or similar) ; BSD 4-clause (or similar) +License: BSD3c(or similar) ; BSD4c(or similar) Url: http://www.tcpdump.org/ Summary: A Library for Network Sniffers Source: %{name}-%{version}.tar.bz2 @@ -61,7 +61,7 @@ Van Jacobson %package -n libpcap1 -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Summary: A Library for Network Sniffers Group: System/Libraries # bug437293 @@ -96,7 +96,7 @@ Van Jacobson %package devel -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Summary: A Library for Network Sniffers Group: Development/Libraries/C and C++ Requires: libpcap1 = %{version} ++++++ fix-usb-nic.patch ++++++ --- /var/tmp/diff_new_pack.l1nw9v/_old 2009-11-27 14:06:34.000000000 +0100 +++ /var/tmp/diff_new_pack.l1nw9v/_new 2009-11-27 14:06:34.000000000 +0100 @@ -5,11 +5,11 @@ as not to collide with the "usbN" names for USB-based networking devices. -diff --git a/inet.c b/inet.c -index 9cd7df7..11efbf4 100644 ---- a/inet.c -+++ b/inet.c -@@ -669,7 +669,7 @@ pcap_lookupnet(device, netp, maskp, errbuf) +Index: libpcap-1.0.0/inet.c +=================================================================== +--- libpcap-1.0.0.orig/inet.c ++++ libpcap-1.0.0/inet.c +@@ -669,7 +669,7 @@ pcap_lookupnet(device, netp, maskp, errb || strstr(device, "bluetooth") != NULL #endif #ifdef PCAP_SUPPORT_USB @@ -18,11 +18,11 @@ #endif ) { *netp = *maskp = 0; -diff --git a/pcap-linux.c b/pcap-linux.c -index 43dfe92..9314eec 100644 ---- a/pcap-linux.c -+++ b/pcap-linux.c -@@ -324,7 +324,7 @@ pcap_create(const char *device, char *ebuf) +Index: libpcap-1.0.0/pcap-linux.c +=================================================================== +--- libpcap-1.0.0.orig/pcap-linux.c ++++ libpcap-1.0.0/pcap-linux.c +@@ -322,7 +322,7 @@ pcap_create(const char *device, char *eb #endif #ifdef PCAP_SUPPORT_USB @@ -31,19 +31,16 @@ return usb_create(device, ebuf); } #endif -diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c -index 93c3f6d..358865c 100644 ---- a/pcap-usb-linux.c -+++ b/pcap-usb-linux.c -@@ -64,7 +64,7 @@ static const char rcsid[] _U_ = - #include <linux/usbdevice_fs.h> - #endif +Index: libpcap-1.0.0/pcap-usb-linux.c +=================================================================== +--- libpcap-1.0.0.orig/pcap-usb-linux.c ++++ libpcap-1.0.0/pcap-usb-linux.c +@@ -61,7 +61,7 @@ static const char rcsid[] _U_ = + #include <sys/ioctl.h> + #include <sys/mman.h> -#define USB_IFACE "usb" +#define USB_IFACE "usbmon" #define USB_TEXT_DIR "/sys/kernel/debug/usbmon" - #define SYS_USB_BUS_DIR "/sys/bus/usb/devices" - #define PROC_USB_BUS_DIR "/proc/bus/usb" --- -1.6.2 - + #define USB_BUS_DIR "/proc/bus/usb" + #define USB_LINE_LEN 4096 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org