Index: head/net/libpcap/Makefile =================================================================== --- head/net/libpcap/Makefile (revision 475195) +++ head/net/libpcap/Makefile (revision 475196) @@ -1,34 +1,34 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= libpcap -PORTVERSION= 1.8.1 +PORTVERSION= 1.9.0 CATEGORIES= net ipv6 MASTER_SITES= http://www.tcpdump.org/release/ MAINTAINER= garga@FreeBSD.org COMMENT= Ubiquitous network traffic capture library LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex GNU_CONFIGURE= yes USES= bison gmake USE_LDCONFIG= yes CONFIGURE_ARGS+=--enable-dbus=no \ --with-pcap=bpf CONFIGURE_ENV+= LEX=${LOCALBASE}/bin/flex CFLAGS_amd64= -fPIC CFLAGS_sparc64= -fPIC PLIST_SUB+= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DAG IPV6 DAG_DESC= Support for Endace DAG hardware IPV6_CONFIGURE_ENABLE= ipv6 DAG_CONFIGURE_WITH= dag DAG_LDFLAGS= -L${LOCALBASE}/lib .include Index: head/net/libpcap/distinfo =================================================================== --- head/net/libpcap/distinfo (revision 475195) +++ head/net/libpcap/distinfo (revision 475196) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477480513 -SHA256 (libpcap-1.8.1.tar.gz) = 673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e -SIZE (libpcap-1.8.1.tar.gz) = 739163 +TIMESTAMP = 1532355961 +SHA256 (libpcap-1.9.0.tar.gz) = 2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019 +SIZE (libpcap-1.9.0.tar.gz) = 832079 Index: head/net/libpcap/files/patch-gencode.c =================================================================== --- head/net/libpcap/files/patch-gencode.c (revision 475195) +++ head/net/libpcap/files/patch-gencode.c (nonexistent) @@ -1,45 +0,0 @@ ---- gencode.c.orig 2016-07-30 13:42:44 UTC -+++ gencode.c -@@ -523,7 +523,8 @@ static struct block *gen_host6(compiler_ - struct in6_addr *, int, int, int); - #endif - #ifndef INET6 --static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int); -+static struct block *gen_gateway(compiler_state_t *, const u_char *, -+ bpf_u_int32 **, int, int); - #endif - static struct block *gen_ipfrag(compiler_state_t *); - static struct block *gen_portatom(compiler_state_t *, int, bpf_int32); -@@ -690,7 +691,9 @@ pcap_compile(pcap_t *p, struct bpf_progr - } - initchunks(&cstate); - cstate.no_optimize = 0; -+#ifdef INET6 - cstate.ai = NULL; -+#endif - cstate.ic.root = NULL; - cstate.ic.cur_mark = 0; - cstate.bpf_pcap = p; -@@ -4846,11 +4849,8 @@ gen_host6(compiler_state_t *cstate, stru - - #ifndef INET6 - static struct block * --gen_gateway(eaddr, alist, proto, dir) -- const u_char *eaddr; -- bpf_u_int32 **alist; -- int proto; -- int dir; -+gen_gateway(compiler_state_t *cstate, const u_char *eaddr, -+ bpf_u_int32 **alist, int proto, int dir) - { - struct block *b0, *b1, *tmp; - -@@ -6414,7 +6414,7 @@ gen_scode(compiler_state_t *cstate, cons - alist = pcap_nametoaddr(name); - if (alist == NULL || *alist == NULL) - bpf_error(cstate, "unknown host '%s'", name); -- b = gen_gateway(eaddr, alist, proto, dir); -+ b = gen_gateway(cstate, eaddr, alist, proto, dir); - free(eaddr); - return b; - #else Property changes on: head/net/libpcap/files/patch-gencode.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/libpcap/files/patch-Makefile.in =================================================================== --- head/net/libpcap/files/patch-Makefile.in (revision 475195) +++ head/net/libpcap/files/patch-Makefile.in (revision 475196) @@ -1,60 +1,62 @@ ---- Makefile.in.orig 2015-06-28 01:03:37 UTC +--- Makefile.in.orig 2018-07-23 16:09:48 UTC +++ Makefile.in -@@ -569,51 +569,19 @@ install: install-shared install-archive +@@ -558,7 +558,7 @@ install: install-shared install-archive libpcap.pc pca $(DESTDIR)$(includedir)/$$i; done [ -d $(DESTDIR)$(bindir) ] || \ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) - $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config -+ $(INSTALL_DATA) pcap-config $(DESTDIR)$(bindir)/pcap-config -+ chmod 755 $(DESTDIR)$(bindir)/pcap-config - for i in $(MAN1); do \ ++ $(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 +@@ -566,46 +566,13 @@ install: install-shared install-archive libpcap.pc pca $(INSTALL_DATA) $(srcdir)/$$i \ $(DESTDIR)$(mandir)/man1/$$i; done for i in $(MAN3PCAP_NOEXPAND); do \ + j=$$(echo $$i | sed -e 's/3pcap/3/') ; \ $(INSTALL_DATA) $(srcdir)/$$i \ - $(DESTDIR)$(mandir)/man3/$$i; done + $(DESTDIR)$(mandir)/man3/$$j; done for i in $(MAN3PCAP_EXPAND:.in=); do \ + j=$$(echo $$i | sed -e 's/3pcap/3/') ; \ $(INSTALL_DATA) $$i \ - $(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) -+ $(DESTDIR)$(mandir)/man3/$$j; done ++ $(DESTDIR)$(mandir)/man3/$$j; done 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 Index: head/net/libpcap/pkg-plist =================================================================== --- head/net/libpcap/pkg-plist (revision 475195) +++ head/net/libpcap/pkg-plist (revision 475196) @@ -1,80 +1,85 @@ bin/pcap-config include/pcap-bpf.h include/pcap-namedb.h include/pcap.h 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.a lib/libpcap.so lib/libpcap.so.1 lib/libpcap.so.%%PORTVERSION%% +libdata/pkgconfig/libpcap.pc man/man1/pcap-config.1.gz man/man3/pcap.3.gz man/man3/pcap_activate.3.gz man/man3/pcap_breakloop.3.gz man/man3/pcap_can_set_rfmon.3.gz man/man3/pcap_close.3.gz man/man3/pcap_compile.3.gz man/man3/pcap_create.3.gz man/man3/pcap_datalink.3.gz man/man3/pcap_datalink_name_to_val.3.gz man/man3/pcap_datalink_val_to_name.3.gz man/man3/pcap_dump.3.gz man/man3/pcap_dump_close.3.gz man/man3/pcap_dump_file.3.gz man/man3/pcap_dump_flush.3.gz man/man3/pcap_dump_ftell.3.gz man/man3/pcap_dump_open.3.gz man/man3/pcap_file.3.gz man/man3/pcap_fileno.3.gz man/man3/pcap_findalldevs.3.gz man/man3/pcap_freecode.3.gz +man/man3/pcap_get_required_select_timeout.3.gz man/man3/pcap_get_selectable_fd.3.gz man/man3/pcap_get_tstamp_precision.3.gz man/man3/pcap_geterr.3.gz man/man3/pcap_inject.3.gz man/man3/pcap_is_swapped.3.gz man/man3/pcap_lib_version.3.gz man/man3/pcap_list_datalinks.3.gz man/man3/pcap_list_tstamp_types.3.gz man/man3/pcap_lookupdev.3.gz man/man3/pcap_lookupnet.3.gz man/man3/pcap_loop.3.gz man/man3/pcap_major_version.3.gz man/man3/pcap_next_ex.3.gz man/man3/pcap_offline_filter.3.gz man/man3/pcap_open_dead.3.gz man/man3/pcap_open_live.3.gz man/man3/pcap_open_offline.3.gz man/man3/pcap_set_buffer_size.3.gz man/man3/pcap_set_datalink.3.gz man/man3/pcap_set_immediate_mode.3.gz man/man3/pcap_set_promisc.3.gz +man/man3/pcap_set_protocol_linux.3.gz man/man3/pcap_set_rfmon.3.gz man/man3/pcap_set_snaplen.3.gz man/man3/pcap_set_timeout.3.gz man/man3/pcap_set_tstamp_precision.3.gz man/man3/pcap_set_tstamp_type.3.gz man/man3/pcap_setdirection.3.gz man/man3/pcap_setfilter.3.gz man/man3/pcap_setnonblock.3.gz man/man3/pcap_snapshot.3.gz man/man3/pcap_stats.3.gz man/man3/pcap_statustostr.3.gz man/man3/pcap_strerror.3.gz man/man3/pcap_tstamp_type_name_to_val.3.gz man/man3/pcap_tstamp_type_val_to_name.3.gz man/man5/pcap-savefile.5.gz man/man7/pcap-filter.7.gz man/man7/pcap-linktype.7.gz man/man7/pcap-tstamp.7.gz