diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile index 796cc2f73569..07c77bba8d4a 100644 --- a/net/libpcap/Makefile +++ b/net/libpcap/Makefile @@ -1,36 +1,49 @@ PORTNAME= libpcap -PORTVERSION= 1.10.6 +DISTVERSION= 1.10.7 CATEGORIES= net -MASTER_SITES= http://www.tcpdump.org/release/ +MASTER_SITES= https://www.tcpdump.org/release/ MAINTAINER= garga@FreeBSD.org COMMENT= Ubiquitous network traffic capture library WWW= https://www.tcpdump.org/ LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex -USES= bison cpe gmake ssl - +USES= cmake cpe localbase:ldflags pathfix CPE_VENDOR= tcpdump - USE_LDCONFIG= yes -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS+=--enable-dbus=no \ - --with-pcap=bpf -CONFIGURE_ENV+= LEX=${LOCALBASE}/bin/flex -CFLAGS_amd64= -fPIC -PLIST_SUB+= PORTVERSION=${PORTVERSION} -OPTIONS_DEFINE= IPV6 REMOTE +PLIST_SUB+= DISTVERSION=${DISTVERSION} + +CMAKE_ON= DISABLE_AIRPCAP \ + DISABLE_DAG \ + DISABLE_DBUS \ + DISABLE_RDMA \ + DISABLE_SNF \ + DISABLE_TC +CMAKE_ARGS= -DPCAP_TYPE=bpf +OPTIONS_DEFINE= IPV6 REMOTE OPTIONS_SUB= yes REMOTE_DESC= Remote packet capture -IPV6_CONFIGURE_ENABLE= ipv6 -REMOTE_CONFIGURE_ENABLE=remote +IPV6_CMAKE_BOOL= INET6 + +REMOTE_USES= ssl +REMOTE_CMAKE_BOOL= ENABLE_REMOTE + +post-patch: + @${REINPLACE_CMD} -e "/^ install_manpage_symlink/d" \ + ${PATCH_WRKSRC}/CMakeLists.txt + +post-install: + @${ECHO_MSG} "====> Fixing file extensions for manpages" + @cd ${STAGEDIR}${PREFIX}/share/man/man3 && for f in *.3pcap; do \ + ${MV} "$$f" `${ECHO_CMD} "$$f" | ${SED} -e 's|3pcap|3|g'`; \ + done .include diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo index 91bd2ae655c8..c043f4f52636 100644 --- a/net/libpcap/distinfo +++ b/net/libpcap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1768414332 -SHA256 (libpcap-1.10.6.tar.gz) = 872dd11337fe1ab02ad9d4fee047c9da244d695c6ddf34e2ebb733efd4ed8aa9 -SIZE (libpcap-1.10.6.tar.gz) = 987897 +TIMESTAMP = 1788738101 +SHA256 (libpcap-1.10.7.tar.gz) = 0b394ac90dbc0a9838ff97468e05c9c9a3e873dec2514cd58db65d859d296e31 +SIZE (libpcap-1.10.7.tar.gz) = 994575 diff --git a/net/libpcap/files/patch-Makefile.in b/net/libpcap/files/patch-Makefile.in deleted file mode 100644 index 6ffaaf550ee5..000000000000 --- a/net/libpcap/files/patch-Makefile.in +++ /dev/null @@ -1,65 +0,0 @@ ---- Makefile.in.orig 2019-09-30 14:39:22 UTC -+++ Makefile.in -@@ -573,7 +573,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 -+ $(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 -@@ -581,49 +581,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_datalink_val_to_description_or_dlt.3pcap && \ -- $(LN_S) pcap_datalink_val_to_name.3pcap \ -- pcap_datalink_val_to_description_or_dlt.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 - 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 diff --git a/net/libpcap/pkg-plist b/net/libpcap/pkg-plist index babfa7a961c1..5fe98cd8b0ea 100644 --- a/net/libpcap/pkg-plist +++ b/net/libpcap/pkg-plist @@ -1,90 +1,90 @@ 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/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/socket.h include/pcap/usb.h include/pcap/vlan.h lib/libpcap.a lib/libpcap.so -lib/libpcap.so.%%PORTVERSION%% +lib/libpcap.so.%%DISTVERSION%% lib/libpcap.so.1 libdata/pkgconfig/libpcap.pc share/man/man1/pcap-config.1.gz share/man/man3/pcap.3.gz share/man/man3/pcap_activate.3.gz share/man/man3/pcap_breakloop.3.gz share/man/man3/pcap_can_set_rfmon.3.gz share/man/man3/pcap_close.3.gz share/man/man3/pcap_compile.3.gz share/man/man3/pcap_create.3.gz share/man/man3/pcap_datalink.3.gz share/man/man3/pcap_datalink_name_to_val.3.gz share/man/man3/pcap_datalink_val_to_name.3.gz share/man/man3/pcap_dump.3.gz share/man/man3/pcap_dump_close.3.gz share/man/man3/pcap_dump_file.3.gz share/man/man3/pcap_dump_flush.3.gz share/man/man3/pcap_dump_ftell.3.gz share/man/man3/pcap_dump_open.3.gz share/man/man3/pcap_file.3.gz share/man/man3/pcap_fileno.3.gz share/man/man3/pcap_findalldevs.3.gz share/man/man3/pcap_freecode.3.gz share/man/man3/pcap_get_required_select_timeout.3.gz share/man/man3/pcap_get_selectable_fd.3.gz share/man/man3/pcap_get_tstamp_precision.3.gz share/man/man3/pcap_geterr.3.gz share/man/man3/pcap_init.3.gz share/man/man3/pcap_inject.3.gz share/man/man3/pcap_is_swapped.3.gz share/man/man3/pcap_lib_version.3.gz share/man/man3/pcap_list_datalinks.3.gz share/man/man3/pcap_list_tstamp_types.3.gz share/man/man3/pcap_lookupdev.3.gz share/man/man3/pcap_lookupnet.3.gz share/man/man3/pcap_loop.3.gz share/man/man3/pcap_major_version.3.gz share/man/man3/pcap_next_ex.3.gz share/man/man3/pcap_offline_filter.3.gz share/man/man3/pcap_open_dead.3.gz share/man/man3/pcap_open_live.3.gz share/man/man3/pcap_open_offline.3.gz share/man/man3/pcap_set_buffer_size.3.gz share/man/man3/pcap_set_datalink.3.gz share/man/man3/pcap_set_immediate_mode.3.gz share/man/man3/pcap_set_promisc.3.gz share/man/man3/pcap_set_protocol_linux.3.gz share/man/man3/pcap_set_rfmon.3.gz share/man/man3/pcap_set_snaplen.3.gz share/man/man3/pcap_set_timeout.3.gz share/man/man3/pcap_set_tstamp_precision.3.gz share/man/man3/pcap_set_tstamp_type.3.gz share/man/man3/pcap_setdirection.3.gz share/man/man3/pcap_setfilter.3.gz share/man/man3/pcap_setnonblock.3.gz share/man/man3/pcap_snapshot.3.gz share/man/man3/pcap_stats.3.gz share/man/man3/pcap_statustostr.3.gz share/man/man3/pcap_strerror.3.gz share/man/man3/pcap_tstamp_type_name_to_val.3.gz share/man/man3/pcap_tstamp_type_val_to_name.3.gz share/man/man5/pcap-savefile.5.gz %%REMOTE%%share/man/man5/rpcapd-config.5.gz share/man/man7/pcap-filter.7.gz share/man/man7/pcap-linktype.7.gz share/man/man7/pcap-tstamp.7.gz %%REMOTE%%share/man/man8/rpcapd.8.gz %%REMOTE%%sbin/rpcapd