From 9fcabd3e22a83ce9fe315fc22be51641fbc1715109f4562fdb1e2e7c2aabd1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Fri, 13 Mar 2015 12:25:03 +0000 Subject: [PATCH] Accepting request 290619 from home:vitezslav_cizek:branches:Base:System - update to 1.7.2 * Support for filtering Geneve encapsulated packets. * Fix handling of zones for BPF on Solaris * new DLT for ZWAVE * clarifications for read timeouts. * added bpf_filter1() with extensions * some fixes to compilation without stdint.h * EBUSY can now be returned by SNFv3 code. - refreshed libpcap-ocloexec.patch OBS-URL: https://build.opensuse.org/request/show/290619 OBS-URL: https://build.opensuse.org/package/show/Base:System/libpcap?expand=0&rev=44 --- libpcap-1.6.2.tar.gz | 3 - libpcap-1.6.2.tar.gz.sig | Bin 419 -> 0 bytes libpcap-1.7.2.tar.gz | 3 + libpcap-1.7.2.tar.gz.sig | Bin 0 -> 419 bytes libpcap-ocloexec.patch | 180 +++++++++++++++++++-------------------- libpcap.changes | 13 +++ libpcap.spec | 4 +- 7 files changed, 108 insertions(+), 95 deletions(-) delete mode 100644 libpcap-1.6.2.tar.gz delete mode 100644 libpcap-1.6.2.tar.gz.sig create mode 100644 libpcap-1.7.2.tar.gz create mode 100644 libpcap-1.7.2.tar.gz.sig diff --git a/libpcap-1.6.2.tar.gz b/libpcap-1.6.2.tar.gz deleted file mode 100644 index 06de7b9..0000000 --- a/libpcap-1.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5db3e2998f1eeba2c76da55da5d474248fe19c44f49e15cac8a796a2c7e19690 -size 651237 diff --git a/libpcap-1.6.2.tar.gz.sig b/libpcap-1.6.2.tar.gz.sig deleted file mode 100644 index 3ee8fb7a2a7a98192e3f5f11f4960bb18601c7b7618bf4977e9f0a22d9b4676d..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmV;U0bKrx0iXl`0RjL91p-tCTY&%y2@v3k-tpPNT@4Ds3?QQ{;B_2t?k$A0gCMXZ z;lfKgK@E(~0gi7_MLeR9aeS>Qe3OSlcgJ_M3Bq9#^EjwE+#~Gj zQ7y+ktGsxxNS-YCty$E%;is_nV&m+9-94|1L4 zkK3xQPe56k=s2;`+88E3N9MLo5CD?cGNJ2=lw){buh0B%O6zYrdP)*R^aYShhr=26!ThA4F&<^Rp;9%|2#zMQVL|<;p;9M?B NlCjU%zH`!?g*y?J$kPA- diff --git a/libpcap-1.7.2.tar.gz b/libpcap-1.7.2.tar.gz new file mode 100644 index 0000000..a76f5c7 --- /dev/null +++ b/libpcap-1.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a4abc1f268b68f97e69a497f53695c9acc7a13f1d522a4d940dea276e6698ae +size 662162 diff --git a/libpcap-1.7.2.tar.gz.sig b/libpcap-1.7.2.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..14e664443190b8e6bd3118b04fe851d409056893d076fd91e023ab043a75866c GIT binary patch literal 419 zcmV;U0bKrx0iXl`0RjL91p-w6kC6Zh2@v3k-tpPNT@CQu3?EDrea|1Otp}Vz4i6nL zJ>*Dk{S^7pn5XZEEGHfm1lB8o-^Lv*ju_M~$G0JBxOAl^aPmGuj(KIZm!03oM=m(b ze2A0Lc2vpZ5#HNn64&Ow;ILl-tQ~gJFRf6gr_BMj0R2aMZ3VQtjUZfmEfSh~=?W&x z-)5M|_OO}eoiPulJ{>N7biv(8NygfLoX2rL9}CXL4I0}?(y3|8(PlAK+-;Z%poy?);VYA)(~a0DTl{*mJKdhdqDh8F zUb$FbHDtDyWJkIxI=^zFJ~Tx4uM?goJuC<};$;a-(QX)CF5=mcY;MctaX4=7rkIDaA= 0) { #ifdef __FreeBSD__ /* -@@ -745,7 +745,7 @@ pcap_lookupnet(device, netp, maskp, errb +@@ -913,7 +913,7 @@ pcap_lookupnet(device, netp, maskp, errb return 0; } @@ -90,11 +90,11 @@ Index: libpcap-1.5.2/inet.c if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -Index: libpcap-1.5.2/nametoaddr.c +Index: libpcap-1.7.2/nametoaddr.c =================================================================== ---- 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) +--- libpcap-1.7.2.orig/nametoaddr.c 2015-03-13 13:05:08.909309412 +0100 ++++ libpcap-1.7.2/nametoaddr.c 2015-03-13 13:05:09.886323907 +0100 +@@ -438,7 +438,7 @@ pcap_ether_hostton(const char *name) static int init = 0; if (!init) { @@ -103,11 +103,11 @@ Index: libpcap-1.5.2/nametoaddr.c ++init; if (fp == NULL) return (NULL); -Index: libpcap-1.5.2/pcap-bt-linux.c +Index: libpcap-1.7.2/pcap-bt-linux.c =================================================================== ---- 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 +--- libpcap-1.7.2.orig/pcap-bt-linux.c 2015-03-13 13:05:08.909309412 +0100 ++++ libpcap-1.7.2/pcap-bt-linux.c 2015-03-13 13:05:09.886323907 +0100 +@@ -81,7 +81,7 @@ bt_findalldevs(pcap_if_t **alldevsp, cha int i, sock; int ret = 0; @@ -115,17 +115,17 @@ Index: libpcap-1.5.2/pcap-bt-linux.c + sock = socket(AF_BLUETOOTH, SOCK_RAW|SOCK_CLOEXEC, BTPROTO_HCI); if (sock < 0) { - /* if bluetooth is not supported this this is not fatal*/ -@@ -218,7 +218,7 @@ bt_activate(pcap_t* handle) + /* if bluetooth is not supported this this is not fatal*/ +@@ -214,7 +214,7 @@ bt_activate(pcap_t* handle) handlep->dev_id = dev_id; - + /* Create HCI socket */ - handle->fd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI); + handle->fd = socket(AF_BLUETOOTH, SOCK_RAW|SOCK_CLOEXEC, BTPROTO_HCI); if (handle->fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket: %s", strerror(errno)); -@@ -322,7 +322,7 @@ bt_read_linux(pcap_t *handle, int max_pa +@@ -318,7 +318,7 @@ bt_read_linux(pcap_t *handle, int max_pa /* ignore interrupt system call error */ do { @@ -134,10 +134,10 @@ Index: libpcap-1.5.2/pcap-bt-linux.c if (handle->break_loop) { handle->break_loop = 0; -Index: libpcap-1.5.2/pcap-can-linux.c +Index: libpcap-1.7.2/pcap-can-linux.c =================================================================== ---- 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 +--- libpcap-1.7.2.orig/pcap-can-linux.c 2015-03-13 13:05:08.909309412 +0100 ++++ libpcap-1.7.2/pcap-can-linux.c 2015-03-13 13:05:09.886323907 +0100 @@ -161,7 +161,7 @@ can_activate(pcap_t* handle) handle->stats_op = can_stats_linux; @@ -156,10 +156,10 @@ Index: libpcap-1.5.2/pcap-can-linux.c if (handle->break_loop) { handle->break_loop = 0; -Index: libpcap-1.5.2/pcap-canusb-linux.c +Index: libpcap-1.7.2/pcap-canusb-linux.c =================================================================== ---- 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 +--- libpcap-1.7.2.orig/pcap-canusb-linux.c 2015-03-13 13:05:08.910309427 +0100 ++++ libpcap-1.7.2/pcap-canusb-linux.c 2015-03-13 13:05:09.887323922 +0100 @@ -36,6 +36,7 @@ #include "config.h" #endif @@ -168,7 +168,7 @@ Index: libpcap-1.5.2/pcap-canusb-linux.c #include #include -@@ -289,7 +290,7 @@ static int canusb_startcapture(struct pc +@@ -291,7 +292,7 @@ static int canusb_startcapture(struct pc { int pipefd[2]; @@ -177,11 +177,11 @@ Index: libpcap-1.5.2/pcap-canusb-linux.c return -1; this->rdpipe = pipefd[0]; -Index: libpcap-1.5.2/pcap-linux.c +Index: libpcap-1.7.2/pcap-linux.c =================================================================== ---- 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) +--- libpcap-1.7.2.orig/pcap-linux.c 2015-03-13 13:05:08.913309471 +0100 ++++ libpcap-1.7.2/pcap-linux.c 2015-03-13 13:05:09.888323937 +0100 +@@ -985,7 +985,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 @@ Index: libpcap-1.5.2/pcap-linux.c if (sock_fd == -1) { (void)snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -@@ -1539,7 +1539,7 @@ pcap_read_packet(pcap_t *handle, pcap_ha +@@ -1580,7 +1580,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 @@ Index: libpcap-1.5.2/pcap-linux.c #else /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) */ fromlen = sizeof(from); packet_len = recvfrom( -@@ -2030,7 +2030,7 @@ scan_sys_class_net(pcap_if_t **devlistp, +@@ -2144,7 +2144,7 @@ scan_sys_class_net(pcap_if_t **devlistp, /* * Create a socket from which to fetch interface information. */ @@ -208,7 +208,7 @@ Index: libpcap-1.5.2/pcap-linux.c if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -@@ -2207,7 +2207,7 @@ scan_proc_net_dev(pcap_if_t **devlistp, +@@ -2262,7 +2262,7 @@ scan_proc_net_dev(pcap_if_t **devlistp, /* * Create a socket from which to fetch interface information. */ @@ -217,7 +217,7 @@ Index: libpcap-1.5.2/pcap-linux.c if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -@@ -3030,8 +3030,8 @@ activate_new(pcap_t *handle) +@@ -3133,8 +3133,8 @@ activate_new(pcap_t *handle) * try a SOCK_RAW socket for the raw interface. */ sock_fd = is_any_device ? @@ -228,7 +228,7 @@ Index: libpcap-1.5.2/pcap-linux.c if (sock_fd == -1) { if (errno == EINVAL || errno == EAFNOSUPPORT) { -@@ -3147,7 +3147,7 @@ activate_new(pcap_t *handle) +@@ -3251,7 +3251,7 @@ activate_new(pcap_t *handle) "close: %s", pcap_strerror(errno)); return PCAP_ERROR; } @@ -237,7 +237,7 @@ Index: libpcap-1.5.2/pcap-linux.c htons(ETH_P_ALL)); if (sock_fd == -1) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, -@@ -5465,7 +5465,7 @@ activate_old(pcap_t *handle) +@@ -6022,7 +6022,7 @@ activate_old(pcap_t *handle) /* Open the socket */ @@ -246,11 +246,11 @@ Index: libpcap-1.5.2/pcap-linux.c if (handle->fd == -1) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -Index: libpcap-1.5.2/pcap-netfilter-linux.c +Index: libpcap-1.7.2/pcap-netfilter-linux.c =================================================================== ---- 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) +--- libpcap-1.7.2.orig/pcap-netfilter-linux.c 2015-03-13 13:05:08.913309471 +0100 ++++ libpcap-1.7.2/pcap-netfilter-linux.c 2015-03-13 13:06:27.048468585 +0100 +@@ -489,7 +489,7 @@ netfilter_activate(pcap_t* handle) handle->stats_op = netfilter_stats_linux; /* Create netlink socket */ @@ -259,20 +259,20 @@ Index: libpcap-1.5.2/pcap-netfilter-linux.c if (handle->fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket %d:%s", errno, pcap_strerror(errno)); return PCAP_ERROR; -@@ -634,7 +634,7 @@ netfilter_findalldevs(pcap_if_t **alldev +@@ -636,7 +636,7 @@ netfilter_findalldevs(pcap_if_t **alldev { int sock; - + - sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER); + sock = socket(AF_NETLINK, SOCK_RAW|SOCK_CLOEXEC, NETLINK_NETFILTER); if (sock < 0) { /* if netlink is not supported this is not fatal */ if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) -Index: libpcap-1.5.2/pcap-nit.c +Index: libpcap-1.7.2/pcap-nit.c =================================================================== ---- 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) +--- libpcap-1.7.2.orig/pcap-nit.c 2015-03-13 13:05:08.913309471 +0100 ++++ libpcap-1.7.2/pcap-nit.c 2015-03-13 13:05:09.888323937 +0100 +@@ -278,7 +278,7 @@ pcap_activate_nit(pcap_t *p) p->snapshot = 96; memset(p, 0, sizeof(*p)); @@ -281,11 +281,11 @@ Index: libpcap-1.5.2/pcap-nit.c if (fd < 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); -Index: libpcap-1.5.2/pcap-sita.c +Index: libpcap-1.7.2/pcap-sita.c =================================================================== ---- 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 +--- libpcap-1.7.2.orig/pcap-sita.c 2015-03-13 13:05:08.914309486 +0100 ++++ libpcap-1.7.2/pcap-sita.c 2015-03-13 13:05:09.889323952 +0100 +@@ -324,7 +324,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 @@ Index: libpcap-1.5.2/pcap-sita.c fprintf(stderr, "pcap can't open a socket for connecting to IOP at %s\n", ip); return 0; } -Index: libpcap-1.5.2/pcap-snit.c +Index: libpcap-1.7.2/pcap-snit.c =================================================================== ---- 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) +--- libpcap-1.7.2.orig/pcap-snit.c 2015-03-13 13:05:08.914309486 +0100 ++++ libpcap-1.7.2/pcap-snit.c 2015-03-13 13:05:09.889323952 +0100 +@@ -316,9 +316,9 @@ pcap_activate_snit(pcap_t *p) * the device in question) can be indicated at open * time. */ @@ -310,11 +310,11 @@ Index: libpcap-1.5.2/pcap-snit.c if (fd < 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s", dev, pcap_strerror(errno)); -Index: libpcap-1.5.2/pcap-snoop.c +Index: libpcap-1.7.2/pcap-snoop.c =================================================================== ---- 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) +--- libpcap-1.7.2.orig/pcap-snoop.c 2015-03-13 13:05:08.914309486 +0100 ++++ libpcap-1.7.2/pcap-snoop.c 2015-03-13 13:05:09.889323952 +0100 +@@ -210,7 +210,7 @@ pcap_activate_snoop(pcap_t *p) int snooplen; struct ifreq ifr; @@ -323,47 +323,47 @@ Index: libpcap-1.5.2/pcap-snoop.c if (fd < 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snoop socket: %s", pcap_strerror(errno)); -Index: libpcap-1.5.2/pcap-usb-linux.c +Index: libpcap-1.7.2/pcap-usb-linux.c =================================================================== ---- 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) +--- libpcap-1.7.2.orig/pcap-usb-linux.c 2015-03-13 13:05:08.915309501 +0100 ++++ libpcap-1.7.2/pcap-usb-linux.c 2015-03-13 13:07:28.072373687 +0100 +@@ -261,7 +261,7 @@ probe_devices(int bus) snprintf(buf, sizeof(buf), "/dev/bus/usb/%03d/%s", bus, data->d_name); - + - fd = open(buf, O_RDWR); + fd = open(buf, O_RDWR|O_CLOEXEC); if (fd == -1) continue; -@@ -365,7 +365,7 @@ usb_activate(pcap_t* handle) +@@ -364,7 +364,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", handlep->bus_index); + 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) { -@@ -400,7 +400,7 @@ usb_activate(pcap_t* handle) +@@ -403,7 +403,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", handlep->bus_index); + 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) -@@ -410,7 +410,7 @@ usb_activate(pcap_t* handle) +@@ -413,7 +413,7 @@ usb_activate(pcap_t* handle) * the old location. */ - snprintf(full_path, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%dt", handlep->bus_index); + 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*/ -@@ -678,7 +678,7 @@ usb_stats_linux(pcap_t *handle, struct p +@@ -681,7 +681,7 @@ usb_stats_linux(pcap_t *handle, struct p int fd; snprintf(string, USB_LINE_LEN, USB_TEXT_DIR"/%ds", handlep->bus_index); @@ -372,7 +372,7 @@ Index: libpcap-1.5.2/pcap-usb-linux.c if (fd < 0) { if (errno == ENOENT) -@@ -688,7 +688,7 @@ usb_stats_linux(pcap_t *handle, struct p +@@ -691,7 +691,7 @@ usb_stats_linux(pcap_t *handle, struct p * location. */ snprintf(string, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%ds", handlep->bus_index); @@ -381,11 +381,11 @@ Index: libpcap-1.5.2/pcap-usb-linux.c } if (fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, -Index: libpcap-1.5.2/savefile.c +Index: libpcap-1.7.2/savefile.c =================================================================== ---- 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( +--- libpcap-1.7.2.orig/savefile.c 2015-03-13 13:05:08.915309501 +0100 ++++ libpcap-1.7.2/savefile.c 2015-03-13 13:05:09.890323967 +0100 +@@ -185,7 +185,7 @@ pcap_open_offline_with_tstamp_precision( } else { #if !defined(WIN32) && !defined(MSDOS) @@ -394,11 +394,11 @@ Index: libpcap-1.5.2/savefile.c #else fp = fopen(fname, "rb"); #endif -Index: libpcap-1.5.2/sf-pcap.c +Index: libpcap-1.7.2/sf-pcap.c =================================================================== ---- 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 +--- libpcap-1.7.2.orig/sf-pcap.c 2015-03-13 13:05:08.915309501 +0100 ++++ libpcap-1.7.2/sf-pcap.c 2015-03-13 13:05:09.890323967 +0100 +@@ -664,7 +664,7 @@ pcap_dump_open(pcap_t *p, const char *fn fname = "standard output"; } else { #if !defined(WIN32) && !defined(MSDOS) diff --git a/libpcap.changes b/libpcap.changes index 9ce700c..59e1d91 100644 --- a/libpcap.changes +++ b/libpcap.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Mar 13 12:02:35 UTC 2015 - vcizek@suse.com + +- update to 1.7.2 + * Support for filtering Geneve encapsulated packets. + * Fix handling of zones for BPF on Solaris + * new DLT for ZWAVE + * clarifications for read timeouts. + * added bpf_filter1() with extensions + * some fixes to compilation without stdint.h + * EBUSY can now be returned by SNFv3 code. +- refreshed libpcap-ocloexec.patch + ------------------------------------------------------------------- Fri Nov 14 09:18:45 UTC 2014 - dimstar@opensuse.org diff --git a/libpcap.spec b/libpcap.spec index 10c0502..f3006f0 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -1,7 +1,7 @@ # # spec file for package libpcap # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -20,7 +20,7 @@ %bcond_with bluetooth Name: libpcap -Version: 1.6.2 +Version: 1.7.2 Release: 0 Summary: A Library for Network Sniffers License: BSD-3-Clause