pool/libpcap
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 290620 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/290620
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libpcap?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2015-03-16 05:53:26 +00:00 committed by Git OBS Bridge
commit 02e90611c4
7 changed files with 108 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libpcap-1.6.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5db3e2998f1eeba2c76da55da5d474248fe19c44f49e15cac8a796a2c7e19690
size 651237

BIN
libpcap-1.6.2.tar.gz.sig
View File

Binary file not shown.

3
libpcap-1.7.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1a4abc1f268b68f97e69a497f53695c9acc7a13f1d522a4d940dea276e6698ae
size 662162

BIN
libpcap-1.7.2.tar.gz.sig Normal file
View File

Binary file not shown.

166
libpcap-ocloexec.patch
View File

@ -18,11 +18,11 @@
sf-pcap.c | 2 +- sf-pcap.c | 2 +-
17 files changed, 39 insertions(+), 36 deletions(-) 17 files changed, 39 insertions(+), 36 deletions(-)
Index: libpcap-1.5.2/configure.in Index: libpcap-1.7.2/configure.in
=================================================================== ===================================================================
--- libpcap-1.5.2.orig/configure.in 2013-11-07 23:23:22.000000000 +0000 --- libpcap-1.7.2.orig/configure.in 2015-03-13 13:05:08.908309397 +0100
+++ libpcap-1.5.2/configure.in 2013-12-14 11:40:45.000000000 +0000 +++ libpcap-1.7.2/configure.in 2015-03-13 13:05:09.885323892 +0100
@@ -21,7 +21,9 @@ AC_INIT(pcap.c) @@ -20,7 +20,9 @@ AC_INIT(pcap.c)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS)
@ -33,11 +33,11 @@ Index: libpcap-1.5.2/configure.in
AC_LBL_C_INIT(V_CCOPT, V_INCLS) AC_LBL_C_INIT(V_CCOPT, V_INCLS)
AC_LBL_SHLIBS_INIT AC_LBL_SHLIBS_INIT
AC_LBL_C_INLINE AC_LBL_C_INLINE
Index: libpcap-1.5.2/fad-gifc.c Index: libpcap-1.7.2/fad-gifc.c
=================================================================== ===================================================================
--- libpcap-1.5.2.orig/fad-gifc.c 2013-11-07 23:23:22.000000000 +0000 --- libpcap-1.7.2.orig/fad-gifc.c 2015-03-13 13:05:08.908309397 +0100
+++ libpcap-1.5.2/fad-gifc.c 2013-12-14 11:40:45.000000000 +0000 +++ libpcap-1.7.2/fad-gifc.c 2015-03-13 13:05:09.885323892 +0100
@@ -157,7 +157,7 @@ pcap_findalldevs_interfaces(pcap_if_t ** @@ -152,7 +152,7 @@ pcap_findalldevs_interfaces(pcap_if_t **
/* /*
* Create a socket from which to fetch the list of interfaces. * Create a socket from which to fetch the list of interfaces.
*/ */
@ -46,11 +46,11 @@ Index: libpcap-1.5.2/fad-gifc.c
if (fd < 0) { if (fd < 0) {
(void)snprintf(errbuf, PCAP_ERRBUF_SIZE, (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno)); "socket: %s", pcap_strerror(errno));
Index: libpcap-1.5.2/fad-glifc.c Index: libpcap-1.7.2/fad-glifc.c
=================================================================== ===================================================================
--- libpcap-1.5.2.orig/fad-glifc.c 2013-11-07 23:23:22.000000000 +0000 --- libpcap-1.7.2.orig/fad-glifc.c 2015-03-13 13:05:08.908309397 +0100
+++ libpcap-1.5.2/fad-glifc.c 2013-12-14 11:40:45.000000000 +0000 +++ libpcap-1.7.2/fad-glifc.c 2015-03-13 13:05:09.885323892 +0100
@@ -100,7 +100,7 @@ pcap_findalldevs_interfaces(pcap_if_t ** @@ -95,7 +95,7 @@ pcap_findalldevs_interfaces(pcap_if_t **
* Create a socket from which to fetch the list of interfaces, * Create a socket from which to fetch the list of interfaces,
* and from which to fetch IPv4 information. * and from which to fetch IPv4 information.
*/ */
@ -59,7 +59,7 @@ Index: libpcap-1.5.2/fad-glifc.c
if (fd4 < 0) { if (fd4 < 0) {
(void)snprintf(errbuf, PCAP_ERRBUF_SIZE, (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno)); "socket: %s", pcap_strerror(errno));
@@ -110,7 +110,7 @@ pcap_findalldevs_interfaces(pcap_if_t ** @@ -105,7 +105,7 @@ pcap_findalldevs_interfaces(pcap_if_t **
/* /*
* Create a socket from which to fetch IPv6 information. * Create a socket from which to fetch IPv6 information.
*/ */
@ -68,11 +68,11 @@ Index: libpcap-1.5.2/fad-glifc.c
if (fd6 < 0) { if (fd6 < 0) {
(void)snprintf(errbuf, PCAP_ERRBUF_SIZE, (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno)); "socket: %s", pcap_strerror(errno));
Index: libpcap-1.5.2/inet.c Index: libpcap-1.7.2/inet.c
=================================================================== ===================================================================
--- libpcap-1.5.2.orig/inet.c 2013-11-07 23:23:22.000000000 +0000 --- libpcap-1.7.2.orig/inet.c 2015-03-13 13:05:08.909309412 +0100
+++ libpcap-1.5.2/inet.c 2013-12-14 11:40:45.000000000 +0000 +++ libpcap-1.7.2/inet.c 2015-03-13 13:05:09.886323907 +0100
@@ -430,7 +430,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, @@ -506,7 +506,7 @@ get_if_description(const char *name)
*/ */
memset(&ifrdesc, 0, sizeof ifrdesc); memset(&ifrdesc, 0, sizeof ifrdesc);
strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name); strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name);
@ -81,7 +81,7 @@ Index: libpcap-1.5.2/inet.c
if (s >= 0) { if (s >= 0) {
#ifdef __FreeBSD__ #ifdef __FreeBSD__
/* /*
@@ -745,7 +745,7 @@ pcap_lookupnet(device, netp, maskp, errb @@ -913,7 +913,7 @@ pcap_lookupnet(device, netp, maskp, errb
return 0; return 0;
} }
@ -90,11 +90,11 @@ Index: libpcap-1.5.2/inet.c
if (fd < 0) { if (fd < 0) {
(void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s",
pcap_strerror(errno)); 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.7.2.orig/nametoaddr.c 2015-03-13 13:05:08.909309412 +0100
+++ libpcap-1.5.2/nametoaddr.c 2013-12-14 11:40:45.000000000 +0000 +++ libpcap-1.7.2/nametoaddr.c 2015-03-13 13:05:09.886323907 +0100
@@ -443,7 +443,7 @@ pcap_ether_hostton(const char *name) @@ -438,7 +438,7 @@ pcap_ether_hostton(const char *name)
static int init = 0; static int init = 0;
if (!init) { if (!init) {
@ -103,11 +103,11 @@ Index: libpcap-1.5.2/nametoaddr.c
++init; ++init;
if (fp == NULL) if (fp == NULL)
return (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.7.2.orig/pcap-bt-linux.c 2015-03-13 13:05:08.909309412 +0100
+++ libpcap-1.5.2/pcap-bt-linux.c 2013-12-14 11:40:45.000000000 +0000 +++ libpcap-1.7.2/pcap-bt-linux.c 2015-03-13 13:05:09.886323907 +0100
@@ -85,7 +85,7 @@ bt_findalldevs(pcap_if_t **alldevsp, cha @@ -81,7 +81,7 @@ bt_findalldevs(pcap_if_t **alldevsp, cha
int i, sock; int i, sock;
int ret = 0; int ret = 0;
@ -116,7 +116,7 @@ Index: libpcap-1.5.2/pcap-bt-linux.c
if (sock < 0) if (sock < 0)
{ {
/* if bluetooth is not supported this this is not fatal*/ /* if bluetooth is not supported this this is not fatal*/
@@ -218,7 +218,7 @@ bt_activate(pcap_t* handle) @@ -214,7 +214,7 @@ bt_activate(pcap_t* handle)
handlep->dev_id = dev_id; handlep->dev_id = dev_id;
/* Create HCI socket */ /* Create HCI socket */
@ -125,7 +125,7 @@ Index: libpcap-1.5.2/pcap-bt-linux.c
if (handle->fd < 0) { if (handle->fd < 0) {
snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
"Can't create raw socket: %s", strerror(errno)); "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 */ /* ignore interrupt system call error */
do { do {
@ -134,10 +134,10 @@ Index: libpcap-1.5.2/pcap-bt-linux.c
if (handle->break_loop) if (handle->break_loop)
{ {
handle->break_loop = 0; 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.7.2.orig/pcap-can-linux.c 2015-03-13 13:05:08.909309412 +0100
+++ libpcap-1.5.2/pcap-can-linux.c 2013-12-14 11:40:45.000000000 +0000 +++ 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) @@ -161,7 +161,7 @@ can_activate(pcap_t* handle)
handle->stats_op = can_stats_linux; handle->stats_op = can_stats_linux;
@ -156,10 +156,10 @@ Index: libpcap-1.5.2/pcap-can-linux.c
if (handle->break_loop) if (handle->break_loop)
{ {
handle->break_loop = 0; 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.7.2.orig/pcap-canusb-linux.c 2015-03-13 13:05:08.910309427 +0100
+++ libpcap-1.5.2/pcap-canusb-linux.c 2013-12-14 11:40:45.000000000 +0000 +++ libpcap-1.7.2/pcap-canusb-linux.c 2015-03-13 13:05:09.887323922 +0100
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
#include "config.h" #include "config.h"
#endif #endif
@ -168,7 +168,7 @@ Index: libpcap-1.5.2/pcap-canusb-linux.c
#include <libusb-1.0/libusb.h> #include <libusb-1.0/libusb.h>
#include <stdlib.h> #include <stdlib.h>
@@ -289,7 +290,7 @@ static int canusb_startcapture(struct pc @@ -291,7 +292,7 @@ static int canusb_startcapture(struct pc
{ {
int pipefd[2]; int pipefd[2];
@ -177,11 +177,11 @@ Index: libpcap-1.5.2/pcap-canusb-linux.c
return -1; return -1;
this->rdpipe = pipefd[0]; 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.7.2.orig/pcap-linux.c 2015-03-13 13:05:08.913309471 +0100
+++ libpcap-1.5.2/pcap-linux.c 2013-12-14 11:40:46.000000000 +0000 +++ libpcap-1.7.2/pcap-linux.c 2015-03-13 13:05:09.888323937 +0100
@@ -962,7 +962,7 @@ pcap_can_set_rfmon_linux(pcap_t *handle) @@ -985,7 +985,7 @@ pcap_can_set_rfmon_linux(pcap_t *handle)
* (We assume that if we have Wireless Extensions support * (We assume that if we have Wireless Extensions support
* we also have PF_PACKET support.) * we also have PF_PACKET support.)
*/ */
@ -190,7 +190,7 @@ Index: libpcap-1.5.2/pcap-linux.c
if (sock_fd == -1) { if (sock_fd == -1) {
(void)snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, (void)snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno)); "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) #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) */ #else /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) */
fromlen = sizeof(from); fromlen = sizeof(from);
packet_len = recvfrom( 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. * Create a socket from which to fetch interface information.
*/ */
@ -208,7 +208,7 @@ Index: libpcap-1.5.2/pcap-linux.c
if (fd < 0) { if (fd < 0) {
(void)snprintf(errbuf, PCAP_ERRBUF_SIZE, (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno)); "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. * Create a socket from which to fetch interface information.
*/ */
@ -217,7 +217,7 @@ Index: libpcap-1.5.2/pcap-linux.c
if (fd < 0) { if (fd < 0) {
(void)snprintf(errbuf, PCAP_ERRBUF_SIZE, (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno)); "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. * try a SOCK_RAW socket for the raw interface.
*/ */
sock_fd = is_any_device ? sock_fd = is_any_device ?
@ -228,7 +228,7 @@ Index: libpcap-1.5.2/pcap-linux.c
if (sock_fd == -1) { if (sock_fd == -1) {
if (errno == EINVAL || errno == EAFNOSUPPORT) { 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)); "close: %s", pcap_strerror(errno));
return PCAP_ERROR; return PCAP_ERROR;
} }
@ -237,7 +237,7 @@ Index: libpcap-1.5.2/pcap-linux.c
htons(ETH_P_ALL)); htons(ETH_P_ALL));
if (sock_fd == -1) { if (sock_fd == -1) {
snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, 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 */ /* Open the socket */
@ -246,11 +246,11 @@ Index: libpcap-1.5.2/pcap-linux.c
if (handle->fd == -1) { if (handle->fd == -1) {
snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno)); "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.7.2.orig/pcap-netfilter-linux.c 2015-03-13 13:05:08.913309471 +0100
+++ libpcap-1.5.2/pcap-netfilter-linux.c 2013-12-14 11:40:46.000000000 +0000 +++ libpcap-1.7.2/pcap-netfilter-linux.c 2015-03-13 13:06:27.048468585 +0100
@@ -487,7 +487,7 @@ netfilter_activate(pcap_t* handle) @@ -489,7 +489,7 @@ netfilter_activate(pcap_t* handle)
handle->stats_op = netfilter_stats_linux; handle->stats_op = netfilter_stats_linux;
/* Create netlink socket */ /* Create netlink socket */
@ -259,7 +259,7 @@ Index: libpcap-1.5.2/pcap-netfilter-linux.c
if (handle->fd < 0) { if (handle->fd < 0) {
snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket %d:%s", errno, pcap_strerror(errno)); snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket %d:%s", errno, pcap_strerror(errno));
return PCAP_ERROR; 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; int sock;
@ -268,11 +268,11 @@ Index: libpcap-1.5.2/pcap-netfilter-linux.c
if (sock < 0) { if (sock < 0) {
/* if netlink is not supported this is not fatal */ /* if netlink is not supported this is not fatal */
if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) 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.7.2.orig/pcap-nit.c 2015-03-13 13:05:08.913309471 +0100
+++ libpcap-1.5.2/pcap-nit.c 2013-12-14 11:40:46.000000000 +0000 +++ libpcap-1.7.2/pcap-nit.c 2015-03-13 13:05:09.888323937 +0100
@@ -282,7 +282,7 @@ pcap_activate_nit(pcap_t *p) @@ -278,7 +278,7 @@ pcap_activate_nit(pcap_t *p)
p->snapshot = 96; p->snapshot = 96;
memset(p, 0, sizeof(*p)); memset(p, 0, sizeof(*p));
@ -281,11 +281,11 @@ Index: libpcap-1.5.2/pcap-nit.c
if (fd < 0) { if (fd < 0) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE, snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
"socket: %s", pcap_strerror(errno)); "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.7.2.orig/pcap-sita.c 2015-03-13 13:05:08.914309486 +0100
+++ libpcap-1.5.2/pcap-sita.c 2013-12-14 11:40:46.000000000 +0000 +++ libpcap-1.7.2/pcap-sita.c 2015-03-13 13:05:09.889323952 +0100
@@ -326,7 +326,7 @@ static int open_with_IOP(unit_t *u, int @@ -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_addr.s_addr = inet_addr(ip);
u->serv_addr->sin_port = htons(IOP_SNIFFER_PORT); 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); fprintf(stderr, "pcap can't open a socket for connecting to IOP at %s\n", ip);
return 0; 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.7.2.orig/pcap-snit.c 2015-03-13 13:05:08.914309486 +0100
+++ libpcap-1.5.2/pcap-snit.c 2013-12-14 11:40:46.000000000 +0000 +++ libpcap-1.7.2/pcap-snit.c 2015-03-13 13:05:09.889323952 +0100
@@ -321,9 +321,9 @@ pcap_activate_snit(pcap_t *p) @@ -316,9 +316,9 @@ pcap_activate_snit(pcap_t *p)
* the device in question) can be indicated at open * the device in question) can be indicated at open
* time. * time.
*/ */
@ -310,11 +310,11 @@ Index: libpcap-1.5.2/pcap-snit.c
if (fd < 0) { if (fd < 0) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s", dev, snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s", dev,
pcap_strerror(errno)); 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.7.2.orig/pcap-snoop.c 2015-03-13 13:05:08.914309486 +0100
+++ libpcap-1.5.2/pcap-snoop.c 2013-12-14 11:40:46.000000000 +0000 +++ libpcap-1.7.2/pcap-snoop.c 2015-03-13 13:05:09.889323952 +0100
@@ -214,7 +214,7 @@ pcap_activate_snoop(pcap_t *p) @@ -210,7 +210,7 @@ pcap_activate_snoop(pcap_t *p)
int snooplen; int snooplen;
struct ifreq ifr; struct ifreq ifr;
@ -323,11 +323,11 @@ Index: libpcap-1.5.2/pcap-snoop.c
if (fd < 0) { if (fd < 0) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snoop socket: %s", snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snoop socket: %s",
pcap_strerror(errno)); 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.7.2.orig/pcap-usb-linux.c 2015-03-13 13:05:08.915309501 +0100
+++ libpcap-1.5.2/pcap-usb-linux.c 2013-12-14 11:43:09.000000000 +0000 +++ libpcap-1.7.2/pcap-usb-linux.c 2015-03-13 13:07:28.072373687 +0100
@@ -263,7 +263,7 @@ probe_devices(int bus) @@ -261,7 +261,7 @@ probe_devices(int bus)
snprintf(buf, sizeof(buf), "/dev/bus/usb/%03d/%s", bus, data->d_name); snprintf(buf, sizeof(buf), "/dev/bus/usb/%03d/%s", bus, data->d_name);
@ -336,7 +336,7 @@ Index: libpcap-1.5.2/pcap-usb-linux.c
if (fd == -1) if (fd == -1)
continue; 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 */ /*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);
@ -345,7 +345,7 @@ Index: libpcap-1.5.2/pcap-usb-linux.c
if (handle->fd >= 0) if (handle->fd >= 0)
{ {
if (handle->opt.rfmon) { if (handle->opt.rfmon) {
@@ -400,7 +400,7 @@ usb_activate(pcap_t* handle) @@ -403,7 +403,7 @@ usb_activate(pcap_t* handle)
else { else {
/*Binary interface not available, try open text interface */ /*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);
@ -354,7 +354,7 @@ Index: libpcap-1.5.2/pcap-usb-linux.c
if (handle->fd < 0) if (handle->fd < 0)
{ {
if (errno == ENOENT) if (errno == ENOENT)
@@ -410,7 +410,7 @@ usb_activate(pcap_t* handle) @@ -413,7 +413,7 @@ usb_activate(pcap_t* handle)
* the old location. * 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);
@ -363,7 +363,7 @@ Index: libpcap-1.5.2/pcap-usb-linux.c
} }
if (handle->fd < 0) { if (handle->fd < 0) {
/* no more fallback, give it up*/ /* 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; int fd;
snprintf(string, USB_LINE_LEN, USB_TEXT_DIR"/%ds", handlep->bus_index); 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 (fd < 0)
{ {
if (errno == ENOENT) 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. * location.
*/ */
snprintf(string, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%ds", handlep->bus_index); 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) { if (fd < 0) {
snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, 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.7.2.orig/savefile.c 2015-03-13 13:05:08.915309501 +0100
+++ libpcap-1.5.2/savefile.c 2013-12-14 11:40:46.000000000 +0000 +++ libpcap-1.7.2/savefile.c 2015-03-13 13:05:09.890323967 +0100
@@ -190,7 +190,7 @@ pcap_open_offline_with_tstamp_precision( @@ -185,7 +185,7 @@ pcap_open_offline_with_tstamp_precision(
} }
else { else {
#if !defined(WIN32) && !defined(MSDOS) #if !defined(WIN32) && !defined(MSDOS)
@ -394,11 +394,11 @@ Index: libpcap-1.5.2/savefile.c
#else #else
fp = fopen(fname, "rb"); fp = fopen(fname, "rb");
#endif #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.7.2.orig/sf-pcap.c 2015-03-13 13:05:08.915309501 +0100
+++ libpcap-1.5.2/sf-pcap.c 2013-12-14 11:40:46.000000000 +0000 +++ libpcap-1.7.2/sf-pcap.c 2015-03-13 13:05:09.890323967 +0100
@@ -679,7 +679,7 @@ pcap_dump_open(pcap_t *p, const char *fn @@ -664,7 +664,7 @@ pcap_dump_open(pcap_t *p, const char *fn
fname = "standard output"; fname = "standard output";
} else { } else {
#if !defined(WIN32) && !defined(MSDOS) #if !defined(WIN32) && !defined(MSDOS)

13
libpcap.changes
View File

@ -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 Fri Nov 14 09:18:45 UTC 2014 - dimstar@opensuse.org

4
libpcap.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libpcap # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%bcond_with bluetooth %bcond_with bluetooth
Name: libpcap Name: libpcap
Version: 1.6.2 Version: 1.7.2
Release: 0 Release: 0
Summary: A Library for Network Sniffers Summary: A Library for Network Sniffers
License: BSD-3-Clause License: BSD-3-Clause