Hello community, here is the log from the commit of package libpcap for openSUSE:Factory checked in at 2013-12-17 10:02:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-09-23 09:53:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libpcap.new/libpcap.changes 2013-12-17 10:02:08.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Dec 14 12:08:46 UTC 2013 - andreas.stie...@gmx.de + +- update to 1.5.2 + Version 1.5.0 revised for non-code related edits Version, + 1.5.1 revised for for interop against Linux 3.1.0 + * TPACKET_V3 support added for Linux + * Point users to the the-tcpdump-group repository on GitHub + rather than the mcr repository + * Checks added for malloc()/realloc()/etc. failures + * Support filtering filtering E1 SS7 traffic on MTP2 layer Annex A + * Use "ln -s" to link man pages by default + * Added pcap_open_dead_with_tstamp_precision API interface. + * Many changes to autoconf to deal better with non-GCC compilers + added many new DLT types +- require pkg-config for devel library support detection +- add support for D-Bus capture +- modified patches for upstream changes: + * libpcap-ocloexec.patch + * libpcap-1.0.0-filter-fix.patch to libpcap-1.5.2-filter-fix.patch + +------------------------------------------------------------------- Old: ---- libpcap-1.0.0-filter-fix.patch libpcap-1.4.0.tar.gz libpcap-1.4.0.tar.gz.sig New: ---- libpcap-1.5.2-filter-fix.patch libpcap-1.5.2.tar.gz libpcap-1.5.2.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpcap.spec ++++++ --- /var/tmp/diff_new_pack.gB6O6H/_old 2013-12-17 10:02:09.000000000 +0100 +++ /var/tmp/diff_new_pack.gB6O6H/_new 2013-12-17 10:02:09.000000000 +0100 @@ -17,7 +17,7 @@ Name: libpcap -Version: 1.4.0 +Version: 1.5.2 Release: 0 Summary: A Library for Network Sniffers License: BSD-3-Clause @@ -27,7 +27,7 @@ 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.0.0-filter-fix.patch +Patch0: libpcap-1.5.2-filter-fix.patch Patch1: libpcap-1.0.0-pcap-bpf.patch Patch2: libpcap-1.0.0-ppp.patch Patch3: libpcap-1.0.0-s390.patch @@ -35,8 +35,10 @@ BuildRequires: automake BuildRequires: bison BuildRequires: bluez-devel +BuildRequires: dbus-1-devel BuildRequires: flex BuildRequires: libusb-devel +BuildRequires: pkg-config %if %{?suse_version} >= 1210 BuildRequires: libnl3-devel %endif @@ -89,7 +91,7 @@ %prep %{?gpg_verify: %gpg_verify %{S:4}} %setup -q -%patch0 +%patch0 -p1 %patch1 %patch2 %patch3 ++++++ libpcap-1.0.0-filter-fix.patch -> libpcap-1.5.2-filter-fix.patch ++++++ --- /work/SRC/openSUSE:Factory/libpcap/libpcap-1.0.0-filter-fix.patch 2012-01-11 15:38:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libpcap.new/libpcap-1.5.2-filter-fix.patch 2013-12-17 10:02:08.000000000 +0100 @@ -1,8 +1,13 @@ -Index: pcap-bpf.c +--- + pcap-bpf.c | 2 +- + pcap-linux.c | 22 ++++++++++++++++++++++ + 2 files changed, 23 insertions(+), 1 deletion(-) + +Index: libpcap-1.5.2/pcap-bpf.c =================================================================== ---- pcap-bpf.c.orig -+++ pcap-bpf.c -@@ -483,7 +483,7 @@ bpf_open(pcap_t *p) +--- libpcap-1.5.2.orig/pcap-bpf.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/pcap-bpf.c 2013-12-14 11:28:40.000000000 +0000 +@@ -494,7 +494,7 @@ bpf_open(pcap_t *p) fd = open(device, O_RDWR); if (fd == -1 && errno == EACCES) fd = open(device, O_RDONLY); @@ -11,11 +16,11 @@ /* * XXX better message for all minors used -Index: pcap-linux.c +Index: libpcap-1.5.2/pcap-linux.c =================================================================== ---- pcap-linux.c.orig -+++ pcap-linux.c -@@ -2421,8 +2421,30 @@ pcap_setfilter_linux_common(pcap_t *hand +--- libpcap-1.5.2.orig/pcap-linux.c 2013-12-03 15:11:24.000000000 +0000 ++++ libpcap-1.5.2/pcap-linux.c 2013-12-14 11:30:29.000000000 +0000 +@@ -2475,8 +2475,30 @@ pcap_setfilter_linux_common(pcap_t *hand if (can_filter_in_kernel) { if ((err = set_kernel_filter(handle, &fcode)) == 0) { @@ -25,7 +30,7 @@ + unsigned int received = 0, rec_len = 0; + socklen_t optlen = sizeof(rec_len); /* Installation succeded - using kernel filter. */ - handle->md.use_bpf = 1; + handlep->filtering_in_kernel = 1; + + oldflags = fcntl(handle->fd, F_GETFL, 0); + oldflags |= O_NONBLOCK; ++++++ libpcap-1.4.0.tar.gz -> libpcap-1.5.2.tar.gz ++++++ ++++ 26771 lines of diff (skipped) ++++++ libpcap-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.gB6O6H/_old 2013-12-17 10:02:09.000000000 +0100 +++ /var/tmp/diff_new_pack.gB6O6H/_new 2013-12-17 10:02:09.000000000 +0100 @@ -18,11 +18,11 @@ sf-pcap.c | 2 +- 17 files changed, 39 insertions(+), 36 deletions(-) -Index: libpcap-1.4.0/configure.in +Index: libpcap-1.5.2/configure.in =================================================================== ---- libpcap-1.4.0.orig/configure.in 2013-03-25 14:51:40.000000000 +0000 -+++ libpcap-1.4.0/configure.in 2013-09-13 20:17:59.000000000 +0100 -@@ -22,7 +22,9 @@ AC_INIT(pcap.c) +--- libpcap-1.5.2.orig/configure.in 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/configure.in 2013-12-14 11:40:45.000000000 +0000 +@@ -21,7 +21,9 @@ AC_INIT(pcap.c) AC_CANONICAL_SYSTEM AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) @@ -33,10 +33,10 @@ AC_LBL_C_INIT(V_CCOPT, V_INCLS) AC_LBL_SHLIBS_INIT AC_LBL_C_INLINE -Index: libpcap-1.4.0/fad-gifc.c +Index: libpcap-1.5.2/fad-gifc.c =================================================================== ---- libpcap-1.4.0.orig/fad-gifc.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/fad-gifc.c 2013-09-13 20:17:59.000000000 +0100 +--- libpcap-1.5.2.orig/fad-gifc.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/fad-gifc.c 2013-12-14 11:40:45.000000000 +0000 @@ -157,7 +157,7 @@ pcap_findalldevs_interfaces(pcap_if_t ** /* * Create a socket from which to fetch the list of interfaces. @@ -46,10 +46,10 @@ if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -Index: libpcap-1.4.0/fad-glifc.c +Index: libpcap-1.5.2/fad-glifc.c =================================================================== ---- libpcap-1.4.0.orig/fad-glifc.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/fad-glifc.c 2013-09-13 20:17:59.000000000 +0100 +--- libpcap-1.5.2.orig/fad-glifc.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/fad-glifc.c 2013-12-14 11:40:45.000000000 +0000 @@ -100,7 +100,7 @@ pcap_findalldevs_interfaces(pcap_if_t ** * Create a socket from which to fetch the list of interfaces, * and from which to fetch IPv4 information. @@ -68,10 +68,10 @@ if (fd6 < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -Index: libpcap-1.4.0/inet.c +Index: libpcap-1.5.2/inet.c =================================================================== ---- libpcap-1.4.0.orig/inet.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/inet.c 2013-09-13 20:17:59.000000000 +0100 +--- libpcap-1.5.2.orig/inet.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/inet.c 2013-12-14 11:40:45.000000000 +0000 @@ -430,7 +430,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, */ memset(&ifrdesc, 0, sizeof ifrdesc); @@ -90,11 +90,11 @@ if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -Index: libpcap-1.4.0/nametoaddr.c +Index: libpcap-1.5.2/nametoaddr.c =================================================================== ---- libpcap-1.4.0.orig/nametoaddr.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/nametoaddr.c 2013-09-13 20:17:59.000000000 +0100 -@@ -441,7 +441,7 @@ pcap_ether_hostton(const char *name) +--- libpcap-1.5.2.orig/nametoaddr.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/nametoaddr.c 2013-12-14 11:40:45.000000000 +0000 +@@ -443,7 +443,7 @@ pcap_ether_hostton(const char *name) static int init = 0; if (!init) { @@ -103,11 +103,11 @@ ++init; if (fp == NULL) return (NULL); -Index: libpcap-1.4.0/pcap-bt-linux.c +Index: libpcap-1.5.2/pcap-bt-linux.c =================================================================== ---- libpcap-1.4.0.orig/pcap-bt-linux.c 2013-03-25 14:51:40.000000000 +0000 -+++ libpcap-1.4.0/pcap-bt-linux.c 2013-09-13 20:19:44.000000000 +0100 -@@ -79,7 +79,7 @@ bt_findalldevs(pcap_if_t **alldevsp, cha +--- libpcap-1.5.2.orig/pcap-bt-linux.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/pcap-bt-linux.c 2013-12-14 11:40:45.000000000 +0000 +@@ -85,7 +85,7 @@ bt_findalldevs(pcap_if_t **alldevsp, cha int i, sock; int ret = 0; @@ -116,8 +116,8 @@ if (sock < 0) { /* if bluetooth is not supported this this is not fatal*/ -@@ -211,7 +211,7 @@ bt_activate(pcap_t* handle) - handle->md.ifindex = dev_id; +@@ -218,7 +218,7 @@ bt_activate(pcap_t* handle) + handlep->dev_id = dev_id; /* Create HCI socket */ - handle->fd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI); @@ -125,7 +125,7 @@ if (handle->fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket: %s", strerror(errno)); -@@ -315,7 +315,7 @@ bt_read_linux(pcap_t *handle, int max_pa +@@ -322,7 +322,7 @@ bt_read_linux(pcap_t *handle, int max_pa /* ignore interrupt system call error */ do { @@ -134,11 +134,11 @@ if (handle->break_loop) { handle->break_loop = 0; -Index: libpcap-1.4.0/pcap-can-linux.c +Index: libpcap-1.5.2/pcap-can-linux.c =================================================================== ---- libpcap-1.4.0.orig/pcap-can-linux.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/pcap-can-linux.c 2013-09-13 20:17:59.000000000 +0100 -@@ -153,7 +153,7 @@ can_activate(pcap_t* handle) +--- libpcap-1.5.2.orig/pcap-can-linux.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/pcap-can-linux.c 2013-12-14 11:40:45.000000000 +0000 +@@ -161,7 +161,7 @@ can_activate(pcap_t* handle) handle->stats_op = can_stats_linux; /* Create socket */ @@ -147,7 +147,7 @@ if (handle->fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket %d:%s", -@@ -227,7 +227,7 @@ can_read_linux(pcap_t *handle, int max_p +@@ -235,7 +235,7 @@ can_read_linux(pcap_t *handle, int max_p do { @@ -156,10 +156,10 @@ if (handle->break_loop) { handle->break_loop = 0; -Index: libpcap-1.4.0/pcap-canusb-linux.c +Index: libpcap-1.5.2/pcap-canusb-linux.c =================================================================== ---- libpcap-1.4.0.orig/pcap-canusb-linux.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/pcap-canusb-linux.c 2013-09-13 20:21:19.000000000 +0100 +--- libpcap-1.5.2.orig/pcap-canusb-linux.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/pcap-canusb-linux.c 2013-12-14 11:40:45.000000000 +0000 @@ -36,6 +36,7 @@ #include "config.h" #endif @@ -167,8 +167,8 @@ +#include <pthread.h> #include <libusb-1.0/libusb.h> - #include "pcap-int.h" -@@ -297,7 +298,7 @@ static int canusb_startcapture(struct ca + #include <stdlib.h> +@@ -289,7 +290,7 @@ static int canusb_startcapture(struct pc { int pipefd[2]; @@ -176,12 +176,12 @@ + if (pipe2(pipefd, O_CLOEXEC) == -1) return -1; - canusb.rdpipe = pipefd[0]; -Index: libpcap-1.4.0/pcap-linux.c + this->rdpipe = pipefd[0]; +Index: libpcap-1.5.2/pcap-linux.c =================================================================== ---- libpcap-1.4.0.orig/pcap-linux.c 2013-09-13 20:15:43.000000000 +0100 -+++ libpcap-1.4.0/pcap-linux.c 2013-09-13 20:17:59.000000000 +0100 -@@ -894,7 +894,7 @@ pcap_can_set_rfmon_linux(pcap_t *handle) +--- libpcap-1.5.2.orig/pcap-linux.c 2013-12-14 11:32:03.000000000 +0000 ++++ libpcap-1.5.2/pcap-linux.c 2013-12-14 11:40:46.000000000 +0000 +@@ -962,7 +962,7 @@ pcap_can_set_rfmon_linux(pcap_t *handle) * (We assume that if we have Wireless Extensions support * we also have PF_PACKET support.) */ @@ -190,7 +190,7 @@ if (sock_fd == -1) { (void)snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -@@ -1422,7 +1422,7 @@ pcap_read_packet(pcap_t *handle, pcap_ha +@@ -1539,7 +1539,7 @@ pcap_read_packet(pcap_t *handle, pcap_ha } #if defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) @@ -199,7 +199,7 @@ #else /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) */ fromlen = sizeof(from); packet_len = recvfrom( -@@ -1900,7 +1900,7 @@ scan_sys_class_net(pcap_if_t **devlistp, +@@ -2030,7 +2030,7 @@ scan_sys_class_net(pcap_if_t **devlistp, /* * Create a socket from which to fetch interface information. */ @@ -208,7 +208,7 @@ if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -@@ -2077,7 +2077,7 @@ scan_proc_net_dev(pcap_if_t **devlistp, +@@ -2207,7 +2207,7 @@ scan_proc_net_dev(pcap_if_t **devlistp, /* * Create a socket from which to fetch interface information. */ @@ -217,7 +217,7 @@ if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -@@ -2824,8 +2824,8 @@ activate_new(pcap_t *handle) +@@ -3030,8 +3030,8 @@ activate_new(pcap_t *handle) * try a SOCK_RAW socket for the raw interface. */ sock_fd = is_any_device ? @@ -228,7 +228,7 @@ if (sock_fd == -1) { if (errno == EINVAL || errno == EAFNOSUPPORT) { -@@ -2941,7 +2941,7 @@ activate_new(pcap_t *handle) +@@ -3147,7 +3147,7 @@ activate_new(pcap_t *handle) "close: %s", pcap_strerror(errno)); return PCAP_ERROR; } @@ -237,7 +237,7 @@ htons(ETH_P_ALL)); if (sock_fd == -1) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, -@@ -4988,7 +4988,7 @@ activate_old(pcap_t *handle) +@@ -5465,7 +5465,7 @@ activate_old(pcap_t *handle) /* Open the socket */ @@ -246,11 +246,11 @@ if (handle->fd == -1) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -Index: libpcap-1.4.0/pcap-netfilter-linux.c +Index: libpcap-1.5.2/pcap-netfilter-linux.c =================================================================== ---- libpcap-1.4.0.orig/pcap-netfilter-linux.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/pcap-netfilter-linux.c 2013-09-13 20:17:59.000000000 +0100 -@@ -478,7 +478,7 @@ netfilter_activate(pcap_t* handle) +--- libpcap-1.5.2.orig/pcap-netfilter-linux.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/pcap-netfilter-linux.c 2013-12-14 11:40:46.000000000 +0000 +@@ -487,7 +487,7 @@ netfilter_activate(pcap_t* handle) handle->stats_op = netfilter_stats_linux; /* Create netlink socket */ @@ -259,8 +259,8 @@ if (handle->fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket %d:%s", errno, pcap_strerror(errno)); return PCAP_ERROR; -@@ -626,7 +626,7 @@ netfilter_findalldevs(pcap_if_t **alldev - pcap_if_t *found_dev = *alldevsp; +@@ -634,7 +634,7 @@ netfilter_findalldevs(pcap_if_t **alldev + { int sock; - sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER); @@ -268,11 +268,11 @@ if (sock < 0) { /* if netlink is not supported this is not fatal */ if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) -Index: libpcap-1.4.0/pcap-nit.c +Index: libpcap-1.5.2/pcap-nit.c =================================================================== ---- libpcap-1.4.0.orig/pcap-nit.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/pcap-nit.c 2013-09-13 20:17:59.000000000 +0100 -@@ -259,7 +259,7 @@ pcap_activate_nit(pcap_t *p) +--- libpcap-1.5.2.orig/pcap-nit.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/pcap-nit.c 2013-12-14 11:40:46.000000000 +0000 +@@ -282,7 +282,7 @@ pcap_activate_nit(pcap_t *p) p->snapshot = 96; memset(p, 0, sizeof(*p)); @@ -281,11 +281,11 @@ if (fd < 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -Index: libpcap-1.4.0/pcap-sita.c +Index: libpcap-1.5.2/pcap-sita.c =================================================================== ---- libpcap-1.4.0.orig/pcap-sita.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/pcap-sita.c 2013-09-13 20:17:59.000000000 +0100 -@@ -329,7 +329,7 @@ static int open_with_IOP(unit_t *u, int +--- libpcap-1.5.2.orig/pcap-sita.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/pcap-sita.c 2013-12-14 11:40:46.000000000 +0000 +@@ -326,7 +326,7 @@ static int open_with_IOP(unit_t *u, int u->serv_addr->sin_addr.s_addr = inet_addr(ip); u->serv_addr->sin_port = htons(IOP_SNIFFER_PORT); @@ -294,11 +294,11 @@ fprintf(stderr, "pcap can't open a socket for connecting to IOP at %s\n", ip); return 0; } -Index: libpcap-1.4.0/pcap-snit.c +Index: libpcap-1.5.2/pcap-snit.c =================================================================== ---- libpcap-1.4.0.orig/pcap-snit.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/pcap-snit.c 2013-09-13 20:17:59.000000000 +0100 -@@ -297,9 +297,9 @@ pcap_activate_snit(pcap_t *p) +--- libpcap-1.5.2.orig/pcap-snit.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/pcap-snit.c 2013-12-14 11:40:46.000000000 +0000 +@@ -321,9 +321,9 @@ pcap_activate_snit(pcap_t *p) * the device in question) can be indicated at open * time. */ @@ -310,11 +310,11 @@ if (fd < 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s", dev, pcap_strerror(errno)); -Index: libpcap-1.4.0/pcap-snoop.c +Index: libpcap-1.5.2/pcap-snoop.c =================================================================== ---- libpcap-1.4.0.orig/pcap-snoop.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/pcap-snoop.c 2013-09-13 20:17:59.000000000 +0100 -@@ -205,7 +205,7 @@ pcap_activate_snoop(pcap_t *p) +--- libpcap-1.5.2.orig/pcap-snoop.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/pcap-snoop.c 2013-12-14 11:40:46.000000000 +0000 +@@ -214,7 +214,7 @@ pcap_activate_snoop(pcap_t *p) int snooplen; struct ifreq ifr; @@ -323,11 +323,11 @@ if (fd < 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snoop socket: %s", pcap_strerror(errno)); -Index: libpcap-1.4.0/pcap-usb-linux.c +Index: libpcap-1.5.2/pcap-usb-linux.c =================================================================== ---- libpcap-1.4.0.orig/pcap-usb-linux.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/pcap-usb-linux.c 2013-09-13 20:17:59.000000000 +0100 -@@ -252,7 +252,7 @@ probe_devices(int bus) +--- libpcap-1.5.2.orig/pcap-usb-linux.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/pcap-usb-linux.c 2013-12-14 11:43:09.000000000 +0000 +@@ -263,7 +263,7 @@ probe_devices(int bus) snprintf(buf, sizeof(buf), "/dev/bus/usb/%03d/%s", bus, data->d_name); @@ -336,56 +336,56 @@ if (fd == -1) continue; -@@ -353,7 +353,7 @@ usb_activate(pcap_t* handle) +@@ -365,7 +365,7 @@ usb_activate(pcap_t* handle) /*now select the read method: try to open binary interface */ - snprintf(full_path, USB_LINE_LEN, LINUX_USB_MON_DEV"%d", handle->md.ifindex); + snprintf(full_path, USB_LINE_LEN, LINUX_USB_MON_DEV"%d", handlep->bus_index); - handle->fd = open(full_path, O_RDONLY, 0); + handle->fd = open(full_path, O_RDONLY|O_CLOEXEC, 0); if (handle->fd >= 0) { if (handle->opt.rfmon) { -@@ -388,7 +388,7 @@ usb_activate(pcap_t* handle) +@@ -400,7 +400,7 @@ usb_activate(pcap_t* handle) else { /*Binary interface not available, try open text interface */ - snprintf(full_path, USB_LINE_LEN, USB_TEXT_DIR"/%dt", handle->md.ifindex); + snprintf(full_path, USB_LINE_LEN, USB_TEXT_DIR"/%dt", handlep->bus_index); - handle->fd = open(full_path, O_RDONLY, 0); + handle->fd = open(full_path, O_RDONLY|O_CLOEXEC, 0); if (handle->fd < 0) { if (errno == ENOENT) -@@ -398,7 +398,7 @@ usb_activate(pcap_t* handle) +@@ -410,7 +410,7 @@ usb_activate(pcap_t* handle) * the old location. */ - snprintf(full_path, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%dt", handle->md.ifindex); + snprintf(full_path, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%dt", handlep->bus_index); - handle->fd = open(full_path, O_RDONLY, 0); + handle->fd = open(full_path, O_RDONLY|O_CLOEXEC, 0); } if (handle->fd < 0) { /* no more fallback, give it up*/ -@@ -664,7 +664,7 @@ usb_stats_linux(pcap_t *handle, struct p +@@ -678,7 +678,7 @@ usb_stats_linux(pcap_t *handle, struct p int fd; - snprintf(string, USB_LINE_LEN, USB_TEXT_DIR"/%ds", handle->md.ifindex); + snprintf(string, USB_LINE_LEN, USB_TEXT_DIR"/%ds", handlep->bus_index); - fd = open(string, O_RDONLY, 0); + fd = open(string, O_RDONLY|O_CLOEXEC, 0); if (fd < 0) { if (errno == ENOENT) -@@ -674,7 +674,7 @@ usb_stats_linux(pcap_t *handle, struct p +@@ -688,7 +688,7 @@ usb_stats_linux(pcap_t *handle, struct p * location. */ - snprintf(string, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%ds", handle->md.ifindex); + snprintf(string, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%ds", handlep->bus_index); - fd = open(string, O_RDONLY, 0); + fd = open(string, O_RDONLY|O_CLOEXEC, 0); } if (fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, -Index: libpcap-1.4.0/savefile.c +Index: libpcap-1.5.2/savefile.c =================================================================== ---- libpcap-1.4.0.orig/savefile.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/savefile.c 2013-09-13 20:17:59.000000000 +0100 -@@ -189,7 +189,7 @@ pcap_open_offline(const char *fname, cha +--- libpcap-1.5.2.orig/savefile.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/savefile.c 2013-12-14 11:40:46.000000000 +0000 +@@ -190,7 +190,7 @@ pcap_open_offline_with_tstamp_precision( } else { #if !defined(WIN32) && !defined(MSDOS) @@ -394,11 +394,11 @@ #else fp = fopen(fname, "rb"); #endif -Index: libpcap-1.4.0/sf-pcap.c +Index: libpcap-1.5.2/sf-pcap.c =================================================================== ---- libpcap-1.4.0.orig/sf-pcap.c 2013-02-21 03:51:49.000000000 +0000 -+++ libpcap-1.4.0/sf-pcap.c 2013-09-13 20:17:59.000000000 +0100 -@@ -550,7 +550,7 @@ pcap_dump_open(pcap_t *p, const char *fn +--- libpcap-1.5.2.orig/sf-pcap.c 2013-11-07 23:23:22.000000000 +0000 ++++ libpcap-1.5.2/sf-pcap.c 2013-12-14 11:40:46.000000000 +0000 +@@ -679,7 +679,7 @@ pcap_dump_open(pcap_t *p, const char *fn fname = "standard output"; } else { #if !defined(WIN32) && !defined(MSDOS) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
