commit libpcap for openSUSE:Factory
Hello community, here is the log from the commit of package libpcap for openSUSE:Factory checked in at 2016-04-22 16:17:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpcap (Old) and /work/SRC/openSUSE:Factory/.libpcap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpcap" Changes: -------- --- /work/SRC/openSUSE:Factory/libpcap/libpcap.changes 2015-06-30 10:15:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libpcap.new/libpcap.changes 2016-04-22 16:17:22.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Apr 17 02:42:52 UTC 2016 - crrodriguez@opensuse.org + +- libpcap-no-old-socket.patch: never fallback to the obsolete + SOCK_PACKET (kernel < 2.2) interface, this still happens + for example, when you update the kernel, run iftop and + the old kernel af_packet module wasn't loaded, program fails + and the kernel prints "iftop uses obsolete (PF_INET,SOCK_PACKET)" + +------------------------------------------------------------------- New: ---- libpcap-no-old-socket.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpcap.spec ++++++ --- /var/tmp/diff_new_pack.GDE7I2/_old 2016-04-22 16:17:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GDE7I2/_new 2016-04-22 16:17:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libpcap # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -35,6 +35,7 @@ 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: dbus-1-devel @@ -105,6 +106,7 @@ %patch2 %patch3 %patch4 -p1 +%patch5 -p1 %build %ifarch %sparc pic="PIC" ++++++ libpcap-no-old-socket.patch ++++++ Index: libpcap-1.7.3/pcap-linux.c =================================================================== --- libpcap-1.7.3.orig/pcap-linux.c +++ libpcap-1.7.3/pcap-linux.c @@ -1425,16 +1425,10 @@ pcap_activate_linux(pcap_t *handle) } } else if (ret == 0) { - /* Non-fatal error; try old way */ - if ((ret = activate_old(handle)) != 1) { - /* - * Both methods to open the packet socket failed. - * Tidy up and report our failure (handle->errbuf - * is expected to be set by the functions above). - */ - status = ret; - goto fail; - } + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "af_packet module unavailable, missing a reboot to new kernel?"); + status = PCAP_ERROR; + goto fail; } /*
participants (1)
-
root@hilbert.suse.de