Hello community, here is the log from the commit of package libpcap for openSUSE:Factory checked in at 2012-01-11 15:37:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpcap (Old) and /work/SRC/openSUSE:Factory/.libpcap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpcap", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libpcap/libpcap.changes 2011-09-23 02:09:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libpcap.new/libpcap.changes 2012-01-11 15:38:10.000000000 +0100 @@ -1,0 +2,21 @@ +Tue Jan 3 14:35:47 UTC 2012 - [email protected] + +- update to libpcap-1.2.1 + - Support 802.1 QinQ as a form of VLAN in filters. + - Treat "carp" as equivalent to "vrrp" in filters. + - Fix code generated for "ip6 protochain". + - Add some new link-layer header types. + - Support capturing NetFilter log messages on Linux. + - Turn off monitor mode on exit for mac80211 interfaces on Linux. + - Fix problems turning monitor mode on for non-mac80211 interfaces + - on Linux. + - Properly fail if /sys/class/net or /proc/net/dev exist but can't + - be opened. + - Fail if pcap_activate() is called on an already-activated + - pcap_t, and add a test program for that. + - Fix filtering in pcap-ng files. + - Simplify handling of new DLT_/LINKTYPE_ values. + - Expand pcap(3PCAP) man page. +- drop libpcap-fix-calculation-of-frame-size.patch (upstream) + +------------------------------------------------------------------- Old: ---- libpcap-1.1.1.tar.bz2 libpcap-fix-calculation-of-frame-size.patch New: ---- libpcap-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpcap.spec ++++++ --- /var/tmp/diff_new_pack.8uBxj4/_old 2012-01-11 15:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8uBxj4/_new 2012-01-11 15:38:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libpcap # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,16 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: libpcap -Version: 1.1.1 -Release: 9 -License: BSD-3-Clause +Version: 1.2.1 +Release: 0 Summary: A Library for Network Sniffers -Url: http://www.tcpdump.org/ +License: BSD-3-Clause Group: System/Libraries -Source: %{name}-%{version}.tar.bz2 +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 @@ -34,7 +32,6 @@ Patch5: libpcap-1.0.0-man.patch Patch6: libpcap-1.0.0-mac_syntax.patch Patch7: libpcap-1.1.1-scanif.patch -Patch8: libpcap-fix-calculation-of-frame-size.patch BuildRequires: bison BuildRequires: bluez-devel BuildRequires: flex @@ -47,7 +44,6 @@ program yourself. %package -n libpcap1 -License: BSD-3-Clause Summary: A Library for Network Sniffers Group: System/Libraries # bug437293 @@ -67,7 +63,6 @@ program yourself. %package devel -License: BSD-3-Clause Summary: A Library for Network Sniffers Group: Development/Libraries/C and C++ Requires: libpcap1 = %{version} @@ -88,7 +83,6 @@ %patch5 %patch6 %patch7 -%patch8 -p1 %build %ifarch %sparc ++++++ libpcap-1.0.0-fcode.patch ++++++ --- /var/tmp/diff_new_pack.8uBxj4/_old 2012-01-11 15:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8uBxj4/_new 2012-01-11 15:38:13.000000000 +0100 @@ -1,6 +1,8 @@ ---- pcap-linux.c +Index: pcap-linux.c +=================================================================== +--- pcap-linux.c.orig +++ pcap-linux.c -@@ -1060,6 +1060,9 @@ +@@ -2313,6 +2313,9 @@ pcap_setfilter_linux_common(pcap_t *hand struct sock_fprog fcode; int can_filter_in_kernel; int err = 0; @@ -10,7 +12,7 @@ #endif if (!handle) -@@ -1094,8 +1097,6 @@ +@@ -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"); ++++++ libpcap-1.0.0-filter-fix.patch ++++++ --- /var/tmp/diff_new_pack.8uBxj4/_old 2012-01-11 15:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8uBxj4/_new 2012-01-11 15:38:13.000000000 +0100 @@ -1,6 +1,8 @@ ---- pcap-bpf.c +Index: pcap-bpf.c +=================================================================== +--- pcap-bpf.c.orig +++ pcap-bpf.c -@@ -231,7 +231,7 @@ +@@ -483,7 +483,7 @@ bpf_open(pcap_t *p) fd = open(device, O_RDWR); if (fd == -1 && errno == EACCES) fd = open(device, O_RDONLY); @@ -9,9 +11,11 @@ /* * XXX better message for all minors used ---- pcap-linux.c +Index: pcap-linux.c +=================================================================== +--- pcap-linux.c.orig +++ pcap-linux.c -@@ -1144,8 +1144,30 @@ +@@ -2421,8 +2421,30 @@ pcap_setfilter_linux_common(pcap_t *hand if (can_filter_in_kernel) { if ((err = set_kernel_filter(handle, &fcode)) == 0) { ++++++ libpcap-1.0.0-mac_syntax.patch ++++++ --- /var/tmp/diff_new_pack.8uBxj4/_old 2012-01-11 15:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8uBxj4/_new 2012-01-11 15:38:13.000000000 +0100 @@ -1,6 +1,8 @@ ---- scanner.l +Index: scanner.l +=================================================================== +--- scanner.l.orig +++ scanner.l -@@ -81,6 +81,7 @@ +@@ -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]?) @@ -8,7 +10,7 @@ %a 18400 %o 21500 -@@ -341,6 +342,8 @@ +@@ -360,6 +361,8 @@ ${B} { yylval.e = pcap_ether_aton(((ch #endif /*INET6*/ } {B}:+({B}:+)+ { bpf_error("bogus ethernet address %s", yytext); } ++++++ libpcap-1.0.0-man.patch ++++++ --- /var/tmp/diff_new_pack.8uBxj4/_old 2012-01-11 15:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8uBxj4/_new 2012-01-11 15:38:13.000000000 +0100 @@ -1,6 +1,8 @@ ---- pcap.3pcap.in +Index: pcap.3pcap.in +=================================================================== +--- pcap.3pcap.in.orig +++ pcap.3pcap.in -@@ -363,7 +363,7 @@ +@@ -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 ++++++ libpcap-1.0.0-pcap-bpf.patch ++++++ --- /var/tmp/diff_new_pack.8uBxj4/_old 2012-01-11 15:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8uBxj4/_new 2012-01-11 15:38:13.000000000 +0100 @@ -1,7 +1,9 @@ ---- pcap/bpf.h +Index: pcap/bpf.h +=================================================================== +--- pcap/bpf.h.orig +++ pcap/bpf.h -@@ -83,6 +83,25 @@ - #define BPF_MINBUFSIZE 32 +@@ -102,6 +102,25 @@ typedef u_int bpf_u_int32; + #define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1)) /* + * Struct returned by BIOCGSTATS. ++++++ libpcap-1.0.0-ppp.patch ++++++ --- /var/tmp/diff_new_pack.8uBxj4/_old 2012-01-11 15:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8uBxj4/_new 2012-01-11 15:38:13.000000000 +0100 @@ -1,6 +1,8 @@ ---- gencode.c +Index: gencode.c +=================================================================== +--- gencode.c.orig +++ gencode.c -@@ -7233,6 +7233,7 @@ +@@ -7483,6 +7483,7 @@ gen_inbound(dir) */ switch (linktype) { case DLT_SLIP: ++++++ libpcap-1.0.0-s390.patch ++++++ --- /var/tmp/diff_new_pack.8uBxj4/_old 2012-01-11 15:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8uBxj4/_new 2012-01-11 15:38:13.000000000 +0100 @@ -1,8 +1,8 @@ Index: pcap-linux.c =================================================================== ---- pcap-linux.c.orig 2010-04-06 10:17:29.000000000 +0200 -+++ pcap-linux.c 2010-04-06 10:17:51.000000000 +0200 -@@ -2865,6 +2865,9 @@ activate_new(pcap_t *handle) +--- pcap-linux.c.orig ++++ pcap-linux.c +@@ -3092,6 +3092,9 @@ activate_new(pcap_t *handle) else return 0; /* try old mechanism */ } ++++++ libpcap-1.1.1-scanif.patch ++++++ --- /var/tmp/diff_new_pack.8uBxj4/_old 2012-01-11 15:38:13.000000000 +0100 +++ /var/tmp/diff_new_pack.8uBxj4/_new 2012-01-11 15:38:13.000000000 +0100 @@ -9,9 +9,9 @@ This patch fixes it. Index: pcap-linux.c =================================================================== ---- pcap-linux.c +--- pcap-linux.c.orig +++ pcap-linux.c -@@ -1883,7 +1883,7 @@ scan_sys_class_net(pcap_if_t **devlistp, +@@ -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) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
