packages: libpcap/libpcap.spec, libpcap/libpcap-usb.patch (NEW)=?UTF-8?Q?=20?=- updated t...

[qboosh]

Author: qboosh                       Date: Mon Jun 25 15:32:59 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.3.0
- added usb patch: hardcode "usbmon" dev name instead of detection via udev on compile time,
  link with libpthread when building with canusb support (canusb code uses pthreads)

---- Files affected:
packages/libpcap:
   libpcap.spec (1.95 -> 1.96) , libpcap-usb.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libpcap/libpcap.spec
diff -u packages/libpcap/libpcap.spec:1.95 packages/libpcap/libpcap.spec:1.96
--- packages/libpcap/libpcap.spec:1.95	Tue Jan  3 07:01:11 2012
+++ packages/libpcap/libpcap.spec	Mon Jun 25 17:32:54 2012
@@ -11,15 +11,16 @@
 Summary(ru.UTF-8):	Предоставляет доступ к сетевым интерфейсам в promiscuous-режиме
 Summary(uk.UTF-8):	Надає доступ до мережевих інтерфейсів в promiscuous-режимі
 Name:		libpcap
-Version:	1.2.1
+Version:	1.3.0
 Release:	1
 Epoch:		2
 License:	BSD
 Group:		Libraries
 Source0:	http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	06046e0e81efc60566daf1cc96c77d46
+# Source0-md5:	f78455a92622b7a3c05c58b6ad1cec7e
 Patch0:		%{name}-bonding.patch
-Patch1:		%{name}-pf_ring.patch
+Patch1:		%{name}-usb.patch
+Patch2:		%{name}-pf_ring.patch
 URL:		http://www.tcpdump.org/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -28,6 +29,7 @@
 BuildRequires:	flex
 BuildRequires:	libnl1-devel >= 1.0
 %{?with_pfring:BuildRequires:	libpfring-devel}
+BuildRequires:	libusb-devel >= 1.0
 Obsoletes:	libpcap0
 Obsoletes:	libpcap_mmap
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -153,7 +155,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%{?with_pfring:%patch1 -p0}
+%patch1 -p1
+%{?with_pfring:%patch2 -p0}
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -162,7 +165,7 @@
 	--with-pcap=linux \
 	--enable-ipv6
 %{__make} \
-%{?with_pfring:CCOPT="%{rpmcflags} -O0"}
+	%{?with_pfring:CCOPT="%{rpmcflags} -O0"}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -213,6 +216,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.96  2012/06/25 15:32:54  qboosh
+- updated to 1.3.0
+- added usb patch: hardcode "usbmon" dev name instead of detection via udev on compile time,
+  link with libpthread when building with canusb support (canusb code uses pthreads)
+
 Revision 1.95  2012/01/03 06:01:11  arekm
 - up to 1.2.1
 

================================================================
Index: packages/libpcap/libpcap-usb.patch
diff -u /dev/null packages/libpcap/libpcap-usb.patch:1.1
--- /dev/null	Mon Jun 25 17:32:59 2012
+++ packages/libpcap/libpcap-usb.patch	Mon Jun 25 17:32:54 2012
@@ -0,0 +1,23 @@
+--- libpcap-1.3.0/configure.in.orig	2012-03-29 15:42:04.000000000 +0200
++++ libpcap-1.3.0/configure.in	2012-06-25 17:23:24.365976729 +0200
+@@ -1275,10 +1275,7 @@
+ 	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)
+ 	#
+@@ -1406,7 +1403,7 @@
+ 		[
+ 		    AC_DEFINE(PCAP_SUPPORT_CANUSB, 1, [target host supports canusb])
+ 		    CANUSB_SRC=pcap-canusb-linux.c
+-		    LIBS="-lusb-1.0 $LIBS"
++		    LIBS="-lusb-1.0 -lpthread $LIBS"
+ 		    AC_MSG_NOTICE(canusb sniffing is supported)
+ 		],
+ 		AC_MSG_NOTICE(canusb sniffing is not supported; install libusb1.0 lib devel to enable it)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/libpcap/libpcap.spec?r1=1.95&r2=1.96