diff --git a/net-libs/libpcap/libpcap-1.7.4.recipe b/net-libs/libpcap/libpcap-1.8.0.recipe similarity index 90% rename from net-libs/libpcap/libpcap-1.7.4.recipe rename to net-libs/libpcap/libpcap-1.8.0.recipe index 730567a5f..a6047c0c8 100644 --- a/net-libs/libpcap/libpcap-1.7.4.recipe +++ b/net-libs/libpcap/libpcap-1.8.0.recipe @@ -23,8 +23,9 @@ COPYRIGHT="1988-1998 The Regents of the University of California 2014 Michal Labedzki for Tieto Corporation" LICENSE="BSD (3-clause)" REVISION="1" -SOURCE_URI="http://www.tcpdump.org/release/libpcap-$portVersion.tar.gz" -CHECKSUM_SHA256="7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7f448b0" +SOURCE_URI="https://github.com/the-tcpdump-group/libpcap/archive/libpcap-$portVersion.tar.gz" +CHECKSUM_SHA256="aef925af509cfe8c50224299a2748b0fbf85e4ae6cf1c5ce332f9eb240d8761f" +SOURCE_DIR="libpcap-libpcap-$portVersion" PATCHES="libpcap-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" diff --git a/net-libs/libpcap/patches/libpcap-1.7.4.patchset b/net-libs/libpcap/patches/libpcap-1.8.0.patchset similarity index 93% rename from net-libs/libpcap/patches/libpcap-1.7.4.patchset rename to net-libs/libpcap/patches/libpcap-1.8.0.patchset index cd646f125..04b2e9c85 100644 --- a/net-libs/libpcap/patches/libpcap-1.7.4.patchset +++ b/net-libs/libpcap/patches/libpcap-1.8.0.patchset @@ -1,11 +1,11 @@ -From b9604a82355c7b91c207c35c137dcef6eeb3a6d3 Mon Sep 17 00:00:00 2001 +From 2281bc07969d3be93cbddc7910d3ebfeddd0e165 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 28 Apr 2015 18:39:03 +0000 Subject: Haiku patch diff --git a/Makefile.in b/Makefile.in -index 4c35bde..5e088a5 100644 +index 061c102..67196de 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,6 +63,7 @@ PROG=libpcap @@ -16,7 +16,7 @@ index 4c35bde..5e088a5 100644 INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -84,7 +85,12 @@ YACC = @V_YACC@ +@@ -79,7 +80,12 @@ YACC = @YACC@ @rm -f $@ $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c @@ -27,10 +27,10 @@ index 4c35bde..5e088a5 100644 +PCAPSRC = pcap-@V_PCAP@.c +endif +PSRC = $(PCAPSRC) @USB_SRC@ @BT_SRC@ @BT_MONITOR_SRC@ @CAN_SRC@ @NETFILTER_SRC@ @CANUSB_SRC@ @DBUS_SRC@ - FSRC = fad-@V_FINDALLDEVS@.c + FSRC = @V_FINDALLDEVS@ SSRC = @SSRC@ - CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \ -@@ -97,7 +103,7 @@ SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC) + CSRC = pcap.c inet.c fad-helpers.c gencode.c optimize.c nametoaddr.c \ +@@ -92,7 +98,7 @@ SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC) # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot # hack the extra indirection @@ -40,10 +40,10 @@ index 4c35bde..5e088a5 100644 pcap.h \ pcap-bpf.h \ diff --git a/aclocal.m4 b/aclocal.m4 -index 02502b2..452c41a 100644 +index fd5b751..2ac6952 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -415,7 +415,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT, +@@ -447,7 +447,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT, aix*) ;; @@ -52,7 +52,7 @@ index 02502b2..452c41a 100644 # # Platforms where the linker is the GNU linker # or accepts command-line arguments like -@@ -1105,7 +1105,7 @@ AC_DEFUN(AC_LBL_LIBRARY_NET, [ +@@ -1062,7 +1062,7 @@ AC_DEFUN(AC_LBL_LIBRARY_NET, [ AC_CHECK_LIB(socket, gethostbyname, LIBS="-lsocket -lnsl $LIBS", , -lnsl) fi @@ -62,10 +62,10 @@ index 02502b2..452c41a 100644 # DLPI needs putmsg under HPUX so test for -lstr while we're at it AC_SEARCH_LIBS(putmsg, str) diff --git a/configure.in b/configure.in -index be4b29e..0c019f2 100644 +index a1fa012..21f4adb 100644 --- a/configure.in +++ b/configure.in -@@ -347,6 +347,8 @@ elif test -c /dev/enet ; then # check again in case not readable +@@ -374,6 +374,8 @@ elif test -c /dev/enet ; then # check again in case not readable V_PCAP=enet elif test -c /dev/nit ; then # check again in case not readable V_PCAP=snit @@ -74,7 +74,7 @@ index be4b29e..0c019f2 100644 else V_PCAP=null fi -@@ -1270,7 +1272,7 @@ irix*) +@@ -1377,7 +1379,7 @@ irix*) MAN_MISC_INFO=5 ;; @@ -85,7 +85,7 @@ index be4b29e..0c019f2 100644 # diff --git a/pcap-haiku.cpp b/pcap-haiku.cpp new file mode 100644 -index 0000000..9b2b598 +index 0000000..a69a388 --- /dev/null +++ b/pcap-haiku.cpp @@ -0,0 +1,354 @@ @@ -144,7 +144,7 @@ index 0000000..9b2b598 + // Receive a single packet + + struct pcap_haiku* handlep = (struct pcap_haiku*)handle->priv; -+ u_char* buffer = handle->buffer + handle->offset; ++ u_char* buffer = (u_char*)handle->buffer + handle->offset; + struct sockaddr_dl from; + ssize_t bytesReceived; + do { @@ -253,7 +253,7 @@ index 0000000..9b2b598 +{ + struct pcap_haiku* handlep = (struct pcap_haiku*)handle->priv; + -+ const char* device = handle->opt.source; ++ const char* device = handle->opt.device; + + handle->read_op = pcap_read_haiku; + handle->setfilter_op = pcap_setfilter_haiku; @@ -343,7 +343,7 @@ index 0000000..9b2b598 + return NULL; + } + -+ pcap_t* handle = pcap_create_common(device, errorBuffer, ++ pcap_t* handle = pcap_create_common(errorBuffer, + sizeof (struct pcap_haiku)); + if (handle == NULL) { + snprintf(errorBuffer, PCAP_ERRBUF_SIZE, "malloc: %s", strerror(errno)); @@ -444,5 +444,5 @@ index 0000000..9b2b598 + return 0; +} -- -2.2.2 +2.7.0