[Midnightbsd-cvs] mports [24720] trunk/net/libpcap: update libpcap to 1.9.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Nov 27 08:58:28 EST 2018 

Revision: 24720
          http://svnweb.midnightbsd.org/mports/?rev=24720
Author:   laffer1
Date:     2018-11-27 08:58:28 -0500 (Tue, 27 Nov 2018)
Log Message:
-----------
update libpcap to 1.9.0

Modified Paths:
--------------
    trunk/net/libpcap/Makefile
    trunk/net/libpcap/distinfo
    trunk/net/libpcap/files/patch-Makefile.in

Added Paths:
-----------
    trunk/net/libpcap/files/dag-patch-pcap-dag.c

Removed Paths:
-------------
    trunk/net/libpcap/files/pkg-message-base

Modified: trunk/net/libpcap/Makefile
===================================================================
--- trunk/net/libpcap/Makefile	2018-11-27 13:52:41 UTC (rev 24719)
+++ trunk/net/libpcap/Makefile	2018-11-27 13:58:28 UTC (rev 24720)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	libpcap
-PORTVERSION=	1.6.2
+PORTVERSION=	1.9.0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.tcpdump.org/release/
 
@@ -10,133 +10,31 @@
 
 LICENSE=	bsd3
 
+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
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd10.4
+CFLAGS_amd64=	-fPIC
+CFLAGS_sparc64=	-fPIC
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-.if defined(LIBPCAP_OVERWRITE_BASE)
-PREFIX=		/usr
-PKGNAMESUFFIX=	-overwrite-base
-MANPREFIX=	${PREFIX}/share
-PKGMESSAGE=	${FILESDIR}/pkg-message-base
-.endif
-
-PLIST_FILES+=	bin/pcap-config \
-		include/pcap/bluetooth.h \
-		include/pcap/bpf.h \
-		include/pcap/ipnet.h \
-		include/pcap/namedb.h \
-		include/pcap/nflog.h \
-		include/pcap/pcap.h \
-		include/pcap/sll.h \
-		include/pcap/usb.h \
-		include/pcap/vlan.h \
-		include/pcap.h \
-		include/pcap-namedb.h \
-		include/pcap-bpf.h \
-		lib/libpcap.a \
-		lib/libpcap.so.1 \
-		lib/libpcap.so.${PORTVERSION} \
-		lib/libpcap.so \
-		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_tstamp_precision.3.gz \
-		man/man3/pcap_get_selectable_fd.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_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
-
 OPTIONS_DEFINE=	DAG IPV6
 
 DAG_DESC=	Support for Endace DAG hardware
 
-OPTIONS_DEFAULT=	IPV6
+IPV6_CONFIGURE_ENABLE=	ipv6
+DAG_CONFIGURE_WITH=	dag
+DAG_CFLAGS=		-I${LOCALBASE}/include
+DAG_LDFLAGS=		-L${LOCALBASE}/lib
+DAG_EXTRA_PATCHES=	${FILESDIR}/dag-patch-pcap-dag.c
 
-.include <bsd.mport.options.mk>
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MDAG}
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--without-dag
-.endif
-
-# Maybe make this into an OPTION?
-.if defined(LIBPCAP_OVERWRITE_BASE)
 post-install:
-	${CAT} ${PKGMESSAGE}
-.endif
+	-${MKDIR} ${PREFIX}/libdata/pkgconfig
+	-${CP} ${PREFIX}/lib/pkgconfig/*.pc ${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.pre.mk>
-
-# Packages are built on a kernel that has cloning, but the resulting
-# package will be run on a system that does not have cloning (7.x).
-# Always use bpf device, but specify CFLAGS if we have cloning.
-CONFIGURE_ARGS+=	--with-pcap=bpf
-.if ${OSVERSION} > 800043
-CFLAGS+=	-DHAVE_DEVICE_CLONING=1
-.endif
-
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-CFLAGS+=	-fPIC
-.endif
-
-CONFIGURE_ARGS+=	--enable-dbus=no
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/net/libpcap/distinfo
===================================================================
--- trunk/net/libpcap/distinfo	2018-11-27 13:52:41 UTC (rev 24719)
+++ trunk/net/libpcap/distinfo	2018-11-27 13:58:28 UTC (rev 24720)
@@ -1,2 +1,3 @@
-SHA256 (libpcap-1.6.2.tar.gz) = 5db3e2998f1eeba2c76da55da5d474248fe19c44f49e15cac8a796a2c7e19690
-SIZE (libpcap-1.6.2.tar.gz) = 651237
+TIMESTAMP = 1532355961
+SHA256 (libpcap-1.9.0.tar.gz) = 2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019
+SIZE (libpcap-1.9.0.tar.gz) = 832079

Added: trunk/net/libpcap/files/dag-patch-pcap-dag.c
===================================================================
--- trunk/net/libpcap/files/dag-patch-pcap-dag.c	                        (rev 0)
+++ trunk/net/libpcap/files/dag-patch-pcap-dag.c	2018-11-27 13:58:28 UTC (rev 24720)
@@ -0,0 +1,11 @@
+--- pcap-dag.c.orig	2018-08-26 13:02:37 UTC
++++ pcap-dag.c
+@@ -1103,7 +1103,7 @@ dag_findalldevs(pcap_if_list_t *devlistp
+ 	char dagname[DAGNAME_BUFSIZE];
+ 	int dagstream;
+ 	int dagfd;
+-	dag_card_inf_t *inf;
++	daginf_t *inf;
+ 	char *description;
+ 	int stream, rxstreams;
+ 


Property changes on: trunk/net/libpcap/files/dag-patch-pcap-dag.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/net/libpcap/files/patch-Makefile.in
===================================================================
--- trunk/net/libpcap/files/patch-Makefile.in	2018-11-27 13:52:41 UTC (rev 24719)
+++ trunk/net/libpcap/files/patch-Makefile.in	2018-11-27 13:58:28 UTC (rev 24720)
@@ -1,13 +1,15 @@
---- Makefile.in.orig	2015-01-06 19:12:16.000000000 +0100
-+++ Makefile.in	2015-01-06 19:16:34.000000000 +0100
-@@ -565,51 +565,19 @@
+--- Makefile.in.orig	2018-07-23 16:09:48 UTC
++++ Makefile.in
+@@ -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 \
@@ -54,7 +56,7 @@
 -	$(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 at MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/. at MAN_FILE_FORMATS@/'`; done

Deleted: trunk/net/libpcap/files/pkg-message-base
===================================================================
--- trunk/net/libpcap/files/pkg-message-base	2018-11-27 13:52:41 UTC (rev 24719)
+++ trunk/net/libpcap/files/pkg-message-base	2018-11-27 13:58:28 UTC (rev 24720)
@@ -1,13 +0,0 @@
-***************************************
-* You might run into troubles running *
-* tcpdump, you should recompile it if *
-* it segfaults:                       *
-* $ cd /usr/src/usr.sbin/tcpdump      *
-* $ make && make install              *
-***************************************
-* You can always reinstall the older  *
-* libraries via the source directory  *
-* of the base system:                 *
-* $ cd /usr/src/lib/libpcap           *
-* $ make && make install              *
-***************************************

More information about the Midnightbsd-cvs mailing list