Accepting request 125176 from home:jirislaby:branches:Base:System

remove some patches

OBS-URL: https://build.opensuse.org/request/show/125176
OBS-URL: https://build.opensuse.org/package/show/Base:System/libpcap?expand=0&rev=28

libpcap-1.0.0-fcode.patch

@@ -1,23 +0,0 @@
-Index: pcap-linux.c
-===================================================================
---- pcap-linux.c.orig
-+++ pcap-linux.c
-@@ -2313,6 +2313,9 @@ pcap_setfilter_linux_common(pcap_t *hand
- 	struct sock_fprog	fcode;
- 	int			can_filter_in_kernel;
- 	int			err = 0;
-+	memset(&fcode, 0, sizeof(fcode)); 
-+	fcode.len = 0; 
-+	fcode.filter = NULL; 
- #endif
- 
- 	if (!handle)
-@@ -2347,8 +2350,6 @@ pcap_setfilter_linux_common(pcap_t *hand
- 		 * sake of correctness I added this check.
- 		 */
- 		fprintf(stderr, "Warning: Filter too complex for kernel\n");
--		fcode.len = 0;
--		fcode.filter = NULL;
- 		can_filter_in_kernel = 0;
- 	} else
- #endif /* USHRT_MAX */

libpcap-1.0.0-mac_syntax.patch

@@ -1,21 +0,0 @@
-Index: scanner.l
-===================================================================
---- scanner.l.orig
-+++ scanner.l
-@@ -96,6 +96,7 @@ N		([0-9]+|(0X|0x)[0-9A-Fa-f]+)
- B		([0-9A-Fa-f][0-9A-Fa-f]?)
- B2		([0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f])
- W		([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?)
-+X		[0-9A-Fa-f]
- 
- %a 18400
- %o 21500
-@@ -360,6 +361,8 @@ ${B}			{ yylval.e = pcap_ether_aton(((ch
- #endif /*INET6*/
- 			}
- {B}:+({B}:+)+		{ bpf_error("bogus ethernet address %s", yytext); }
-+{X}{12}			{ yylval.e = pcap_ether_aton((char *)yytext); return EID;}
-+
- icmptype		{ yylval.i = 0; return NUM; }
- icmpcode		{ yylval.i = 1; return NUM; }
- icmp-echoreply		{ yylval.i = 0; return NUM; }

libpcap-1.0.0-man.patch

@@ -1,13 +0,0 @@
-Index: pcap.3pcap.in
-===================================================================
---- pcap.3pcap.in.orig
-+++ pcap.3pcap.in
-@@ -860,7 +860,7 @@ use an
- script or some other configuration script to check whether the libpcap
- 1.0 APIs are available and use them only if they are.
- .SH SEE ALSO
--autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
-+autoconf(1), tcpdump(8), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
- usermod(1M)
- .SH AUTHORS
- The original authors of libpcap are:

libpcap-1.1.1-scanif.patch

@@ -1,22 +0,0 @@
-pcap_findalldevs was failing when use bonding device.
-
-In /sys/class/net, there are these for bonding:
-drwxr-xr-x 4 root root 0 Apr 27 16:12 bond0
--rw-r--r-- 1 root root 4096 Apr 27 16:11 bonding_masters
-
-When scan_sys_class_net encounters the bonding_masters file, the ioctl below fails with "no device".
-
-This patch fixes it.
-Index: pcap-linux.c
-===================================================================
---- pcap-linux.c.orig
-+++ pcap-linux.c
-@@ -2176,7 +2176,7 @@ scan_proc_net_dev(pcap_if_t **devlistp,
- 		 */
- 		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",

libpcap.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jun 15 15:24:46 CEST 2012 - jslaby@suse.de
+
+- remove some patches
+  - libpcap-1.0.0-fcode.patch -- not needed, if this emitted a warning,
+    it was a compiler bug
+  - libpcap-1.0.0-mac_syntax.patch -- already handled by MAC rule
+  - libpcap-1.0.0-man.patch -- tcpdump is man 1, not 8
+  - libpcap-1.1.1-scanif.patch -- misapplied, this was fixed upstream
+    already
+
 -------------------------------------------------------------------
 Thu Jun 14 23:21:10 CEST 2012 - jslaby@suse.de
 

libpcap.spec

@@ -26,13 +26,9 @@ Url:            http://www.tcpdump.org/
 Source:         http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 Source2:        baselibs.conf
 Patch0:         libpcap-1.0.0-filter-fix.patch
-Patch1:         libpcap-1.0.0-fcode.patch
+Patch1:         libpcap-1.0.0-pcap-bpf.patch
-Patch2:         libpcap-1.0.0-pcap-bpf.patch
+Patch2:         libpcap-1.0.0-ppp.patch
-Patch3:         libpcap-1.0.0-ppp.patch
+Patch3:         libpcap-1.0.0-s390.patch
-Patch4:         libpcap-1.0.0-s390.patch
-Patch5:         libpcap-1.0.0-man.patch
-Patch6:         libpcap-1.0.0-mac_syntax.patch
-Patch7:         libpcap-1.1.1-scanif.patch
 BuildRequires:  bison
 BuildRequires:  bluez-devel
 BuildRequires:  flex
@@ -80,10 +76,6 @@ program yourself.
 %patch1
 %patch2
 %patch3
-%patch4
-%patch5
-%patch6
-%patch7
 
 %build
 %ifarch %sparc