pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/libpcap libpcap: updated to 1.9.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/f313445c945f
branches: trunk
changeset: 397815:f313445c945f
user: adam <adam%pkgsrc.org@localhost>
date: Thu Jul 04 07:17:24 2019 +0000
description:
libpcap: updated to 1.9.0
Summary for 1.9.0 libpcap release
Added testing system to libpcap, independent of tcpdump
Changes to how pcap_t is activated
Adding support for Large stream buffers on Endace DAG cards
Changes to BSD 3-clause license to 2-clause licence
Additions to TCP header parsing, per RFC3168
Add CMake build process (extensive number of changes)
Assign a value for OpenBSD DLT_OPENFLOW.
Support setting non-blocking mode before activating.
Extensive build support for Windows VS2010 and MINGW (many many changes, over many months)
Added RPCAPD support when --enable-remote (default no)
Add the rpcap daemon source and build instructions.
Put back the greasy "save the capture filter string so we can tweak it"
hack, that keeps libpcap from capturing rpcap traffic.
Fixes for captures on MacOS, utun0
fixes so that non-AF_INET addresses, are not ==AF_INET6 addresses.
Add a linktype for IBM SDLC frames containing SNA PDUs.
pcap_compile() in 1.8.0 and later is newly thread-safe.
bound snaplen for linux tpacket_v2 to ~64k
Make VLAN filter handle both metadata and inline tags
D-Bus captures can now be up to 128MB in size
Added LORATAP DLT value
Added DLT_VSOCK for http://qemu-project.org/Features/VirtioVsock
probe_devices() fixes not to overrun buffer for name of device
Add linux-specific pcap_set_protocol_linux() to allow specifying a specific capture protocol.
RDMA sniffing support for pcap
Add Nordic Semiconductor Bluetooth LE sniffer link-layer header type.
fixes for reading /etc/ethers
Make it possible to build on Windows without packet.dll.
Add tests for large file support on UN*X.
Solaris fixes to work with 2.8.6
configuration test now looks for header files, not capture devices present
Fix to work with Berkeley YACC.
fixes for DragonBSD compilation of pcap-netmap.c
Clean up the ether_hostton() stuff.
Add an option to disable Linux memory-mapped capture support.
Add DAG API support checks.
Add Septel, Myricom SNF, and Riverbed TurboCap checks.
Add checks for Linux USB, Linux Bluetooth, D-Bus, and RDMA sniffing support.
Add a check for hardware time stamping on Linux.
Don't bother supporting pre-2005 Visual Studio.
Increased minimum autoconf version requirement to 2.64
Add DLT value 273 for XRA-31 sniffer
Clean up handing of signal interrupts in pcap_read_nocb_remote().
Use the XPG 4.2 versions of the networking APIs in Solaris.
Fix, and better explain, the "IPv6 means IPv6, not IPv4" option setting.
Explicitly warn that negative packet buffer timeouts should not be used.
rpcapd: Add support inetd-likes, including xinetd.conf, and systemd units
Rename DLT_IEEE802_15_4 to DLT_IEEE802_15_4_WITHFCS.
Add DISPLAYPORT AUX link type
Remove the sunos4 kernel modules and all references to them.
Add more interface flags to pcap_findalldevs().
diffstat:
net/libpcap/Makefile | 5 +-
net/libpcap/PLIST | 9 +-
net/libpcap/distinfo | 16 +-
net/libpcap/patches/patch-Makefile.in | 216 ++++++++++++++++++++++++++
net/libpcap/patches/patch-ac | 282 ----------------------------------
net/libpcap/patches/patch-ad | 32 ---
net/libpcap/patches/patch-configure | 36 +--
net/libpcap/patches/patch-fad-getad.c | 32 +++
8 files changed, 281 insertions(+), 347 deletions(-)
diffs (truncated from 726 to 300 lines):
diff -r 6519b08e5f43 -r f313445c945f net/libpcap/Makefile
--- a/net/libpcap/Makefile Thu Jul 04 07:15:35 2019 +0000
+++ b/net/libpcap/Makefile Thu Jul 04 07:17:24 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2017/02/02 18:46:39 maya Exp $
+# $NetBSD: Makefile,v 1.64 2019/07/04 07:17:24 adam Exp $
-DISTNAME= libpcap-1.8.1
+DISTNAME= libpcap-1.9.0
CATEGORIES= net
MASTER_SITES= http://www.tcpdump.org/release/
@@ -15,6 +15,7 @@
USE_TOOLS+= bison flex gm4
GNU_CONFIGURE= yes
CONFIGURE_ARGS.Darwin+= --disable-universal
+PKGCONFIG_OVERRIDE= libpcap.pc.in
# Versions of SunOS which include getifaddrs confuse the configure script,
# and result in dlpi stubs not being enabled.
diff -r 6519b08e5f43 -r f313445c945f net/libpcap/PLIST
--- a/net/libpcap/PLIST Thu Jul 04 07:15:35 2019 +0000
+++ b/net/libpcap/PLIST Thu Jul 04 07:17:24 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2017/02/02 18:46:39 maya Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/07/04 07:17:24 adam Exp $
bin/pcap-config
include/pcap-bpf.h
include/pcap-int.h
@@ -7,16 +7,19 @@
include/pcap/bluetooth.h
include/pcap/bpf.h
include/pcap/can_socketcan.h
+include/pcap/compiler-tests.h
include/pcap/dlt.h
-include/pcap/export-defs.h
+include/pcap/funcattrs.h
include/pcap/ipnet.h
include/pcap/namedb.h
include/pcap/nflog.h
+include/pcap/pcap-inttypes.h
include/pcap/pcap.h
include/pcap/sll.h
include/pcap/usb.h
include/pcap/vlan.h
lib/libpcap.la
+lib/pkgconfig/libpcap.pc
man/man1/pcap-config.1
man/man3/pcap.3
man/man3/pcap_activate.3
@@ -46,6 +49,7 @@
man/man3/pcap_free_tstamp_types.3
man/man3/pcap_freealldevs.3
man/man3/pcap_freecode.3
+man/man3/pcap_get_required_select_timeout.3
man/man3/pcap_get_selectable_fd.3
man/man3/pcap_get_tstamp_precision.3
man/man3/pcap_geterr.3
@@ -74,6 +78,7 @@
man/man3/pcap_set_datalink.3
man/man3/pcap_set_immediate_mode.3
man/man3/pcap_set_promisc.3
+man/man3/pcap_set_protocol_linux.3
man/man3/pcap_set_rfmon.3
man/man3/pcap_set_snaplen.3
man/man3/pcap_set_timeout.3
diff -r 6519b08e5f43 -r f313445c945f net/libpcap/distinfo
--- a/net/libpcap/distinfo Thu Jul 04 07:15:35 2019 +0000
+++ b/net/libpcap/distinfo Thu Jul 04 07:17:24 2019 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.34 2017/04/19 11:50:18 dsainty Exp $
+$NetBSD: distinfo,v 1.35 2019/07/04 07:17:24 adam Exp $
-SHA1 (libpcap-1.8.1.tar.gz) = 32d7526dde8f8a2f75baf40c01670602aeef7e39
-RMD160 (libpcap-1.8.1.tar.gz) = 295766ab2646c05c330aa04cabc30c5737200279
-SHA512 (libpcap-1.8.1.tar.gz) = bff5ff53fe53324f423e38eb4062c3fbb9125f86ca90d5e88aca9f0b3da72bc0acc6221c022b0f88cb3f000267580719119824c388da545c6f35117660cbb53b
-Size (libpcap-1.8.1.tar.gz) = 739163 bytes
-SHA1 (patch-ac) = bcbb2a5de2eedf10b7cb38d6b78f68540bf4161c
-SHA1 (patch-ad) = ea818a5fb146488f909483d96d943941ea1873e4
-SHA1 (patch-configure) = 36557d7db9f09467fc9699b96d96c4c49173246b
+SHA1 (libpcap-1.9.0.tar.gz) = c565f591c9a921fb5938cc16407c321c1ca8b9e8
+RMD160 (libpcap-1.9.0.tar.gz) = 81d3bad9e4caddb955fdb984c7ba404902f74c14
+SHA512 (libpcap-1.9.0.tar.gz) = 0ff25641f1e9d29082766caef45888c19214f770c4f378818caa73fcbc4ae54ad9195549c2499d4879ff46e35741d93b2b02cc5f3d6aa99e85a32194cf10bfe7
+Size (libpcap-1.9.0.tar.gz) = 832079 bytes
+SHA1 (patch-Makefile.in) = d14bd32d23bbbbe69e1fcdc7b8c2cd0ccd9f2808
+SHA1 (patch-configure) = 28d773e2a25fd029291c2b12f5cad141e46d51b7
+SHA1 (patch-fad-getad.c) = f7a29d558e1f3c54a143d0977deffb2be3f494ef
diff -r 6519b08e5f43 -r f313445c945f net/libpcap/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libpcap/patches/patch-Makefile.in Thu Jul 04 07:17:24 2019 +0000
@@ -0,0 +1,216 @@
+$NetBSD: patch-Makefile.in,v 1.1 2019/07/04 07:17:25 adam Exp $
+
+Add libtoolization.
+Fix manpage installation.
+
+--- Makefile.in.orig 2018-07-22 17:08:39.000000000 +0000
++++ Makefile.in
+@@ -45,7 +45,7 @@ VPATH = @srcdir@
+ #
+
+ LD = /usr/bin/ld
+-CC = @CC@
++CC = ${LIBTOOL} --mode=compile @CC@
+ AR = @AR@
+ LN_S = @LN_S@
+ MKDEP = @MKDEP@
+@@ -82,7 +82,8 @@ YACC = @YACC@
+ # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
+ # Also, gcc does not remove the .o before forking 'as', which can be a
+ # problem if you don't own the file but can write to the directory.
+-.c.o:
++.SUFFIXES: .lo
++.c.lo:
+ @rm -f $@
+ $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
+
+@@ -94,13 +95,13 @@ CSRC = pcap.c gencode.c optimize.c namet
+ savefile.c sf-pcap.c sf-pcapng.c pcap-common.c \
+ bpf_image.c bpf_filter.c bpf_dump.c
+ GENSRC = scanner.c grammar.c
+-LIBOBJS = @LIBOBJS@
++LIBOBJS = @LTLIBOBJS@
+
+ SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
+
+ # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
+ # hack the extra indirection
+-OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
++OBJ = $(PSRC:.c=.lo) $(FSRC:.c=.lo) $(CSRC:.c=.lo) $(SSRC:.c=.lo) $(GENSRC:.c=.lo) $(LIBOBJS)
+ PUBHDR = \
+ pcap.h \
+ pcap-bpf.h \
+@@ -379,12 +380,10 @@ EXTRA_DIST = \
+ Win32/Prj/wpcap.vcxproj \
+ Win32/Prj/wpcap.vcxproj.filters
+
+-all: libpcap.a shared $(BUILD_RPCAPD) libpcap.pc pcap-config
++all: libpcap.la $(BUILD_RPCAPD) libpcap.pc pcap-config
+
+-libpcap.a: $(OBJ)
+- @rm -f $@
+- $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
+- $(RANLIB) $@
++libpcap.la: $(OBJ)
++ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) $(LIBS) -o libpcap.la
+
+ shared: libpcap.$(DYEXT)
+
+@@ -471,7 +470,7 @@ scanner.h: scanner.c
+ $(MAKE) $(MAKEFLAGS) scanner.c; \
+ fi
+
+-scanner.o: scanner.c grammar.h
++scanner.lo: scanner.c grammar.h
+ $(CC) $(FULL_CFLAGS) -c scanner.c
+
+ grammar.c: $(srcdir)/grammar.y
+@@ -483,16 +482,16 @@ grammar.h: grammar.c
+ $(MAKE) $(MAKEFLAGS) grammar.c; \
+ fi
+
+-grammar.o: grammar.c scanner.h
++grammar.lo: grammar.c scanner.h
+ $(CC) $(FULL_CFLAGS) -c grammar.c
+
+-gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
++gencode.lo: $(srcdir)/gencode.c grammar.h scanner.h
+ $(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c
+
+-snprintf.o: $(srcdir)/missing/snprintf.c
++snprintf.lo: $(srcdir)/missing/snprintf.c
+ $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
+
+-strtok_r.o: $(srcdir)/missing/strtok_r.c
++strtok_r.lo: $(srcdir)/missing/strtok_r.c
+ $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strtok_r.c
+
+ #
+@@ -538,7 +537,7 @@ testprogs: FORCE
+
+ FORCE:
+
+-install: install-shared install-archive libpcap.pc pcap-config @INSTALL_RPCAPD@
++install: libpcap.pc pcap-config @INSTALL_RPCAPD@
+ [ -d $(DESTDIR)$(libdir) ] || \
+ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+ [ -d $(DESTDIR)$(includedir) ] || \
+@@ -553,59 +552,60 @@ install: install-shared install-archive
+ (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
+ [ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
+ (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
++ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir)
+ for i in $(PUBHDR); do \
+ $(INSTALL_DATA) $(srcdir)/$$i \
+ $(DESTDIR)$(includedir)/$$i; done
+ [ -d $(DESTDIR)$(bindir) ] || \
+ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
+- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
++ $(BSD_INSTALL_SCRIPT) pcap-config $(DESTDIR)$(bindir)/pcap-config
+ [ -d $(DESTDIR)$(libdir)/pkgconfig ] || \
+ (mkdir -p $(DESTDIR)$(libdir)/pkgconfig; chmod 755 $(DESTDIR)$(libdir)/pkgconfig)
+ $(INSTALL_DATA) libpcap.pc $(DESTDIR)$(libdir)/pkgconfig/libpcap.pc
+ for i in $(MAN1); do \
+ $(INSTALL_DATA) $(srcdir)/$$i \
+ $(DESTDIR)$(mandir)/man1/$$i; done
+- for i in $(MAN3PCAP_NOEXPAND); do \
+- $(INSTALL_DATA) $(srcdir)/$$i \
++ for i in $(MAN3PCAP_NOEXPAND:.3pcap=.3); do \
++ $(INSTALL_DATA) $(srcdir)/$${i}pcap \
+ $(DESTDIR)$(mandir)/man3/$$i; done
+- for i in $(MAN3PCAP_EXPAND:.in=); do \
+- $(INSTALL_DATA) $$i \
++ for i in $(MAN3PCAP_EXPAND:.3pcap.in=.3); do \
++ $(INSTALL_DATA) $${i}pcap \
+ $(DESTDIR)$(mandir)/man3/$$i; done
+ (cd $(DESTDIR)$(mandir)/man3 && \
+- rm -f pcap_datalink_val_to_description.3pcap && \
+- $(LN_S) pcap_datalink_val_to_name.3pcap \
+- pcap_datalink_val_to_description.3pcap && \
+- rm -f pcap_dump_fopen.3pcap && \
+- $(LN_S) pcap_dump_open.3pcap pcap_dump_fopen.3pcap && \
+- rm -f pcap_freealldevs.3pcap && \
+- $(LN_S) pcap_findalldevs.3pcap pcap_freealldevs.3pcap && \
+- rm -f pcap_perror.3pcap && \
+- $(LN_S) pcap_geterr.3pcap pcap_perror.3pcap && \
+- rm -f pcap_sendpacket.3pcap && \
+- $(LN_S) pcap_inject.3pcap pcap_sendpacket.3pcap && \
+- rm -f pcap_free_datalinks.3pcap && \
+- $(LN_S) pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap && \
+- rm -f pcap_free_tstamp_types.3pcap && \
+- $(LN_S) pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap && \
+- rm -f pcap_dispatch.3pcap && \
+- $(LN_S) pcap_loop.3pcap pcap_dispatch.3pcap && \
+- rm -f pcap_minor_version.3pcap && \
+- $(LN_S) pcap_major_version.3pcap pcap_minor_version.3pcap && \
+- rm -f pcap_next.3pcap && \
+- $(LN_S) pcap_next_ex.3pcap pcap_next.3pcap && \
+- rm -f pcap_open_dead_with_tstamp_precision.3pcap && \
+- $(LN_S) pcap_open_dead.3pcap \
+- pcap_open_dead_with_tstamp_precision.3pcap && \
+- rm -f pcap_open_offline_with_tstamp_precision.3pcap && \
+- $(LN_S) pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap && \
+- rm -f pcap_fopen_offline.3pcap && \
+- $(LN_S) pcap_open_offline.3pcap pcap_fopen_offline.3pcap && \
+- rm -f pcap_fopen_offline_with_tstamp_precision.3pcap && \
+- $(LN_S) pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap && \
+- rm -f pcap_tstamp_type_val_to_description.3pcap && \
+- $(LN_S) pcap_tstamp_type_val_to_name.3pcap pcap_tstamp_type_val_to_description.3pcap && \
+- rm -f pcap_getnonblock.3pcap && \
+- $(LN_S) pcap_setnonblock.3pcap pcap_getnonblock.3pcap)
++ rm -f pcap_datalink_val_to_description.3 && \
++ $(LN_S) pcap_datalink_val_to_name.3 \
++ pcap_datalink_val_to_description.3 && \
++ rm -f pcap_dump_fopen.3 && \
++ $(LN_S) pcap_dump_open.3 pcap_dump_fopen.3 && \
++ rm -f pcap_freealldevs.3 && \
++ $(LN_S) pcap_findalldevs.3 pcap_freealldevs.3 && \
++ rm -f pcap_perror.3 && \
++ $(LN_S) pcap_geterr.3 pcap_perror.3 && \
++ rm -f pcap_sendpacket.3 && \
++ $(LN_S) pcap_inject.3 pcap_sendpacket.3 && \
++ rm -f pcap_free_datalinks.3 && \
++ $(LN_S) pcap_list_datalinks.3 pcap_free_datalinks.3 && \
++ rm -f pcap_free_tstamp_types.3 && \
++ $(LN_S) pcap_list_tstamp_types.3 pcap_free_tstamp_types.3 && \
++ rm -f pcap_dispatch.3 && \
++ $(LN_S) pcap_loop.3 pcap_dispatch.3 && \
++ rm -f pcap_minor_version.3 && \
++ $(LN_S) pcap_major_version.3 pcap_minor_version.3 && \
++ rm -f pcap_next.3 && \
++ $(LN_S) pcap_next_ex.3 pcap_next.3 && \
++ rm -f pcap_open_dead_with_tstamp_precision.3 && \
++ $(LN_S) pcap_open_dead.3 \
++ pcap_open_dead_with_tstamp_precision.3 && \
++ rm -f pcap_open_offline_with_tstamp_precision.3 && \
++ $(LN_S) pcap_open_offline.3 pcap_open_offline_with_tstamp_precision.3 && \
++ rm -f pcap_fopen_offline.3 && \
++ $(LN_S) pcap_open_offline.3 pcap_fopen_offline.3 && \
++ rm -f pcap_fopen_offline_with_tstamp_precision.3 && \
++ $(LN_S) pcap_open_offline.3 pcap_fopen_offline_with_tstamp_precision.3 && \
++ rm -f pcap_tstamp_type_val_to_description.3 && \
++ $(LN_S) pcap_tstamp_type_val_to_name.3 pcap_tstamp_type_val_to_description.3 && \
++ rm -f pcap_getnonblock.3 && \
++ $(LN_S) pcap_setnonblock.3 pcap_getnonblock.3)
+ for i in $(MANFILE); do \
+ $(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
+ $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
+@@ -647,15 +647,15 @@ install-shared-shareda: libpcap.shareda
+ install-shared-none:
+
+ install-archive: install-archive-$(DYEXT)
+-install-archive-so install-archive-dylib install-archive-sl install-archive-none: libpcap.a
++install-archive-so install-archive-dylib install-archive-sl install-archive-none: libpcap.la
+ #
+ # Most platforms have separate suffixes for shared and
+ # archive libraries, so we install both.
+ #
+ [ -d $(DESTDIR)$(libdir) ] || \
+ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
Home |
Main Index |
Thread Index |
Old Index