Hello community, here is the log from the commit of package libpcap for openSUSE:Factory checked in at 2012-03-02 13:48:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpcap (Old) and /work/SRC/openSUSE:Factory/.libpcap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpcap", Maintainer is "VCizek@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libpcap/libpcap.changes 2012-01-11 15:38:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libpcap.new/libpcap.changes 2012-03-02 13:48:53.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 14:43:12 CET 2012 - jslaby@suse.de + +- make it work also on kernels without netfilter (bnc#746356) + +------------------------------------------------------------------- New: ---- libpcap-1.2.1-netfilter-dont-fail-on-EPROTONOSUPPORT.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpcap.spec ++++++ --- /var/tmp/diff_new_pack.66I2Ar/_old 2012-03-02 13:48:54.000000000 +0100 +++ /var/tmp/diff_new_pack.66I2Ar/_new 2012-03-02 13:48:54.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libpcap Version: 1.2.1 Release: 0 @@ -32,6 +33,7 @@ Patch5: libpcap-1.0.0-man.patch Patch6: libpcap-1.0.0-mac_syntax.patch Patch7: libpcap-1.1.1-scanif.patch +Patch8: libpcap-1.2.1-netfilter-dont-fail-on-EPROTONOSUPPORT.patch BuildRequires: bison BuildRequires: bluez-devel BuildRequires: flex @@ -83,6 +85,7 @@ %patch5 %patch6 %patch7 +%patch8 -p1 %build %ifarch %sparc ++++++ libpcap-1.2.1-netfilter-dont-fail-on-EPROTONOSUPPORT.patch ++++++
From 5fad270aaa970512fc2aaf8f2ea361b247bb7477 Mon Sep 17 00:00:00 2001 From: Jiri Slaby
Date: Tue, 28 Feb 2012 14:36:43 +0100 Subject: [PATCH] netfilter: don't fail on EPROTONOSUPPORT
EPROTONOSUPPORT is what I get from the kernel if I don't have netfilter enabled. This bug prevents tcpdump/wireshark to work properly: tcpdump: Can't open netlink socket 93:Protocol not supported --- pcap-netfilter-linux.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c index 225e49f..86235d1 100644 --- a/pcap-netfilter-linux.c +++ b/pcap-netfilter-linux.c @@ -452,8 +452,8 @@ struct my_nfattr { sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER); if (sock < 0) { - /* if netlink is not supported this this is not fatal */ - if (errno == EAFNOSUPPORT) + /* if netlink is not supported, this is not fatal */ + if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) return 0; snprintf(err_str, PCAP_ERRBUF_SIZE, "Can't open netlink socket %d:%s", errno, pcap_strerror(errno)); -- 1.7.5.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org