Hello community, here is the log from the commit of package libpcap for openSUSE:Factory checked in at 2017-03-05 17:53:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpcap (Old) and /work/SRC/openSUSE:Factory/.libpcap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpcap" Sun Mar 5 17:53:40 2017 rev:51 rq:457407 version:1.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libpcap/libpcap.changes 2016-04-22 16:17:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libpcap.new/libpcap.changes 2017-03-05 17:53:42.275283717 +0100 @@ -1,0 +2,49 @@ +Wed Feb 15 10:03:07 UTC 2017 - [email protected] + +- Dropped patches not required after review + * libpcap-1.0.0-pcap-bpf.patch + * libpcap-1.5.2-filter-fix.patch +- Reference of the pull request for the rest of the patches + * https://github.com/the-tcpdump-group/libpcap/issues/196 +- Changed libpcap-1.0.0-s390.patch to the git formatted one + +------------------------------------------------------------------- +Thu Feb 2 13:37:19 UTC 2017 - [email protected] + +- Formatted the specs file using spec-cleaner. + +------------------------------------------------------------------- +Thu Feb 2 13:28:11 UTC 2017 - [email protected] + +- Allow bluetooth monitoring support unconditionally. + +------------------------------------------------------------------- +Thu Feb 2 13:09:23 UTC 2017 - [email protected] + +- update to 1.8.1 + * Clean up the name-to-DLT mapping table. + * Add some newer DLT_ values: + IPMI_HPM_2,ZWAVE_R1_R2,ZWAVE_R3,WATTSTOPPER_DLM,ISO_14443,RDS + * Fix handling of packet count in the TPACKET_V3 inner loop: GitHub issue + #493. + * Filter out duplicate looped back CAN frames. + * Fix the handling of loopback filters for IPv6 packets. + * Add a link-layer header type for RDS (IEC 62106) groups. + * On Linux, handle all CAN captures with pcap-linux.c, in cooked mode. + * Removes the need for the "host-endian" link-layer header type. + * Compile with '-Wused-but-marked-unused' in devel mode if supported + * Have separate DLTs for big-endian and host-endian SocketCAN headers. + * Require that version.h be generated: all build procedures we support generate version.h (autoconf, CMake, MSVC)! + * Properly check for sock_recv() errors. + * Re-impose some of Winsock's limitations on sock_recv(). + * Replace sprintf() with pcap_snprintf(). + * Fix signature of pcap_stats_ex_remote(). + * Have rpcap_remoteact_getsock() return a SOCKET and supply an "is active" flag. + * Clean up {DAG, Septel, Myricom SNF}-only builds. + * pcap_create_interface() needs the interface name on Linux. + * Clean up hardware time stamp support: the "any" device does not support any time stamp types. + * Recognize 802.1ad nested VLAN tag in vlan filter. +- dropped libpcap-ocloexec.patch, never upstreamed. +- refreshed libpcap-1.0.0-ppp.patch + +------------------------------------------------------------------- Old: ---- libpcap-1.0.0-pcap-bpf.patch libpcap-1.5.2-filter-fix.patch libpcap-1.7.3.tar.gz libpcap-1.7.3.tar.gz.sig libpcap-ocloexec.patch New: ---- libpcap-1.8.1.tar.gz libpcap-1.8.1.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpcap.spec ++++++ --- /var/tmp/diff_new_pack.UqKFbL/_old 2017-03-05 17:53:42.855201636 +0100 +++ /var/tmp/diff_new_pack.UqKFbL/_new 2017-03-05 17:53:42.855201636 +0100 @@ -1,7 +1,7 @@ # # spec file for package libpcap # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,8 @@ # -# bluetooth not working with bluez 5.21 -%bcond_with bluetooth - Name: libpcap -Version: 1.7.3 +Version: 1.8.1 Release: 0 Summary: A Library for Network Sniffers License: BSD-3-Clause @@ -30,22 +27,18 @@ Source2: baselibs.conf Source3: http://www.tcpdump.org/tcpdump-workers.asc#/%{name}.keyring Source4: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz.sig -Patch0: libpcap-1.5.2-filter-fix.patch -Patch1: libpcap-1.0.0-pcap-bpf.patch +# https://github.com/the-tcpdump-group/libpcap/pull/556 Patch2: libpcap-1.0.0-ppp.patch Patch3: libpcap-1.0.0-s390.patch -Patch4: libpcap-ocloexec.patch Patch5: libpcap-no-old-socket.patch BuildRequires: automake BuildRequires: bison +BuildRequires: bluez-devel BuildRequires: dbus-1-devel BuildRequires: flex BuildRequires: libnl3-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libusb-1.0) -%if %{with bluetooth} -BuildRequires: bluez-devel -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,10 +50,6 @@ %package -n libpcap1 Summary: A Library for Network Sniffers Group: System/Libraries -# bug437293 -%ifarch ppc64 -Obsoletes: libpcap-64bit -%endif # %if 0%{?suse_version} > 1100 Provides: libpcap = %{version} @@ -89,26 +78,22 @@ Summary: A Library for Network Sniffers Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} +Requires: bluez-devel Requires: dbus-1-devel Requires: libnl3-devel Requires: pkgconfig(libusb-1.0) -%if %{with bluetooth} -Requires: bluez-devel -%endif %description devel-static libpcap static libraries %prep %setup -q -%patch0 -p1 -%patch1 %patch2 -%patch3 -%patch4 -p1 +%patch3 -p1 %patch5 -p1 + %build -%ifarch %sparc +%ifarch %{sparc} pic="PIC" %else pic="pic" @@ -116,11 +101,7 @@ autoreconf -fiv export CFLAGS="%{optflags} -f$pic" CXXFLAGS="%{optflags} -f$pic" %configure \ -%if %{with bluetooth} --enable-bluetooth=yes \ -%else - --enable-bluetooth=no \ -%endif --enable-ipv6 make %{?_smp_mflags} all shared @@ -129,14 +110,13 @@ make DESTDIR=%{buildroot} install install-shared %post -n libpcap1 -p /sbin/ldconfig - %postun -n libpcap1 -p /sbin/ldconfig %files -n libpcap1 %defattr(-, root, root) %doc CHANGES CREDITS LICENSE README README.linux TODO %{_libdir}/*.so.* -%doc %{_mandir}/man7/* +%{_mandir}/man7/* %files devel-static %defattr(-, root, root) @@ -144,7 +124,7 @@ %files devel %defattr(-, root, root) -%doc %{_mandir}/man[1-6]/* +%{_mandir}/man[1-6]/* %{_includedir}/* %{_bindir}/pcap-config %{_libdir}/*.so ++++++ libpcap-1.0.0-ppp.patch ++++++ --- /var/tmp/diff_new_pack.UqKFbL/_old 2017-03-05 17:53:42.891196541 +0100 +++ /var/tmp/diff_new_pack.UqKFbL/_new 2017-03-05 17:53:42.895195975 +0100 @@ -2,11 +2,11 @@ =================================================================== --- gencode.c.orig +++ gencode.c -@@ -7483,6 +7483,7 @@ gen_inbound(dir) +@@ -7549,6 +7549,7 @@ gen_inbound(compiler_state_t *cstate, in */ - switch (linktype) { + switch (cstate->linktype) { case DLT_SLIP: -+ case DLT_PPP: - b0 = gen_relation(BPF_JEQ, - gen_load(Q_LINK, gen_loadi(0), 1), - gen_loadi(0), ++ case DLT_PPP: + b0 = gen_relation(cstate, BPF_JEQ, + gen_load(cstate, Q_LINK, gen_loadi(cstate, 0), 1), + gen_loadi(cstate, 0), ++++++ libpcap-1.0.0-s390.patch ++++++ --- /var/tmp/diff_new_pack.UqKFbL/_old 2017-03-05 17:53:42.903194843 +0100 +++ /var/tmp/diff_new_pack.UqKFbL/_new 2017-03-05 17:53:42.903194843 +0100 @@ -1,14 +1,28 @@ -Index: pcap-linux.c -=================================================================== ---- pcap-linux.c.orig -+++ pcap-linux.c -@@ -3092,6 +3092,9 @@ activate_new(pcap_t *handle) - else - return 0; /* try old mechanism */ +From b9fa92532328daad84766753422e8a21fd474e6f Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <[email protected]> +Date: Mon, 29 Sep 2014 08:37:25 +0200 +Subject: [PATCH 3/4] pcap-linux: apparently ctc interfaces on s390 has + ethernet DLT + +--- + pcap-linux.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/pcap-linux.c b/pcap-linux.c +index 900ebbc..58292c3 100644 +--- a/pcap-linux.c ++++ b/pcap-linux.c +@@ -3197,6 +3197,10 @@ activate_new(pcap_t *handle) + handle->linktype = DLT_LINUX_SLL; } + + /* Hack to make things work on s390 ctc interfaces */ + if (strncmp("ctc", device, 3) == 0) + handle->linktype = DLT_EN10MB; - } else { - /* - * The "any" device. ++ + handlep->ifindex = iface_get_id(sock_fd, device, + handle->errbuf); + if (handlep->ifindex == -1) { +-- +1.8.3.1 + ++++++ libpcap-1.7.3.tar.gz -> libpcap-1.8.1.tar.gz ++++++ ++++ 61228 lines of diff (skipped)
