Summary for 1.4.0 libpcap release

        Add netfilter/nfqueue interface.
        If we don't have support for IPv6 address resolution, support,
            in filter expressions, what IPv6 stuff we can.
        Checks added for malloc()/realloc()/etc. failures.
        Fix pcap-config to include -lpthread if canusb support is
            present
        Try to fix "pcap_parse not defined" problems when --without-flex
            and --without-bison are used when you have Flex and Bison
        Fix some issues with the pcap_loop man page.
        Fix pcap_getnonblock() and pcap_setnonblock() to fill in the
            supplied error message buffer
        Fix typo that, it appeared, would cause pcap-libdlpi.c not to
            compile (perhaps systems with libdlpi also have BPF and use
            that instead)
        Catch attempts to call pcap_compile() on a non-activated pcap_t
        Fix crash on Linux with CAN-USB support without usbfs
        Fix addition of VLAN tags for Linux cooked captures
        Check for both EOPNOTSUPP and EINVAL after SIOCETHTOOL ioctl, so
            that the driver can report either one if it doesn't support
            SIOCETHTOOL
        Add DLT_INFINIBAND and DLT_SCTP
        Describe "proto XXX" and "protochain XXX" in the pcap-filter man
            page
        Handle either directories, or symlinks to directories, that
            correspond to interfaces in /sys/class/net
        Fix handling of VLAN tag insertion to check, on Linux 3.x
            kernels, for VLAN tag valid flag
        Clean up some man pages
        Support libnl3 as well as libnl1 and libnl2 on Linux

6 files changed, 24 insertions, 72 deletions

diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index 2df5015e588..09a74316c0c 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2013/03/30 22:21:10 tron Exp $
+# $NetBSD: Makefile,v 1.54 2013/06/15 21:01:22 adam Exp $
 
-DISTNAME=	libpcap-1.3.0
-PKGREVISION=	2
+DISTNAME=	libpcap-1.4.0
 SVR4_PKGNAME=	lpcap
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/release/
diff --git a/net/libpcap/PLIST b/net/libpcap/PLIST
index 266173ceff5..1ee11b5aa28 100644
--- a/net/libpcap/PLIST
+++ b/net/libpcap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2013/02/06 18:07:04 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/06/15 21:01:22 adam Exp $
 bin/pcap-config
 include/pcap-bpf.h
 include/pcap-int.h
@@ -79,6 +79,6 @@ man/man3/pcap_strerror.3
 man/man3/pcap_tstamp_type_name_to_val.3
 man/man3/pcap_tstamp_type_val_to_name.3
 man/man5/pcap-savefile.5
-man/man7/pcap-tstamp.7
 man/man7/pcap-filter.7
 man/man7/pcap-linktype.7
+man/man7/pcap-tstamp.7
diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index 9edaa9f7302..dbbe8ee73ab 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.27 2013/02/06 18:07:04 jperkin Exp $
+$NetBSD: distinfo,v 1.28 2013/06/15 21:01:22 adam Exp $
 
-SHA1 (libpcap-1.3.0.tar.gz) = 90aa2f0fcfb4bf79fc50ccdaa70f484d96295be3
-RMD160 (libpcap-1.3.0.tar.gz) = 3d80cd06c89b32bee1f344bfe720624c2c35763f
-Size (libpcap-1.3.0.tar.gz) = 608967 bytes
+SHA1 (libpcap-1.4.0.tar.gz) = 9c9710aab68be58ed1d41b5c36dc2599419a80e0
+RMD160 (libpcap-1.4.0.tar.gz) = 5c82a5b813b62fdd10c01c704e1c775ed74d0906
+Size (libpcap-1.4.0.tar.gz) = 619045 bytes
 SHA1 (patch-ac) = 859fc7f91a2831030a3b685ef6448a0c26065b3e
 SHA1 (patch-ad) = 3eb306bbd997f83b55d08cdda1573cf2fdef54f1
-SHA1 (patch-configure) = 25c1bb8f7ec0b493d3a37bb0d9454519312da3e4
-SHA1 (patch-gencode.c) = d232d89924ae59ac23b224a5d9b40b0677757656
-SHA1 (patch-pcap-libdlpi.c) = 5626ed40845ca3b96b6a599547f64b11a8f89f81
+SHA1 (patch-configure) = 441afc32ef24d01359d1e0aa568d5895ddc26236
+SHA1 (patch-gencode.c) = e3791f1cd33826907e7d1986799b22333d96dc42
+SHA1 (patch-pcap-libdlpi.c) = f5df74e9a747f1dddca18cee908a2f89eb5e6261
diff --git a/net/libpcap/patches/patch-configure b/net/libpcap/patches/patch-configure
index 8950bf56f67..ea19c4ed452 100644
--- a/net/libpcap/patches/patch-configure
+++ b/net/libpcap/patches/patch-configure
@@ -1,52 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2013/02/06 18:07:04 jperkin Exp $
+$NetBSD: patch-configure,v 1.2 2013/06/15 21:01:22 adam Exp $
 
-* Fix sys/bufmod.h and linking issues on Solaris.
-* Use standard manpage layout on all platforms.
-
---- configure.orig	2012-03-29 12:57:32.000000000 +0000
+--- configure.orig	2013-03-25 14:51:40.000000000 +0000
 +++ configure
-@@ -5225,6 +5225,20 @@ dlpi)
- 	# Also, due to the bug above applications that link to libpcap with
- 	# libdlpi will have to add "-L/lib" option to "configure".
- 	#
-+			for ac_header in sys/bufmod.h sys/dlpi_ext.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+		 	SSRC="dlpisubs.c"
-+
- 	saved_ldflags=$LDFLAGS
- 	LDFLAGS="$LIBS -L/lib"
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlpi_walk in -ldlpi" >&5
-@@ -5763,19 +5777,6 @@ else
- 		case "$V_PCAP" in
- 
- 		dlpi|libdlpi)
--			for ac_header in sys/bufmod.h sys/dlpi_ext.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
- 			#
- 			# This might be Solaris 8 or later, with
- 			# SIOCGLIFCONF, or it might be some other OS
-@@ -5820,7 +5821,6 @@ $as_echo "$ac_cv_lbl_have_siocglifconf"
+@@ -8835,7 +8835,6 @@ echo "${ECHO_T}$ac_cv_lbl_have_siocglifc
  			#
  			# Needed for common functions used by pcap-[dlpi,libdlpi].c
  			#
@@ -54,7 +10,7 @@ $NetBSD: patch-configure,v 1.1 2013/02/06 18:07:04 jperkin Exp $
  			;;
  
  		*)
-@@ -6688,8 +6688,6 @@ fi
+@@ -9986,8 +9985,6 @@ fi
  # Individual cases can override this.
  #
  DYEXT="none"
@@ -63,9 +19,9 @@ $NetBSD: patch-configure,v 1.1 2013/02/06 18:07:04 jperkin Exp $
  case "$host_os" in
  
  aix*)
-@@ -6916,6 +6914,9 @@ $as_echo "#define HAVE_SOLARIS 1" >>conf
- 	;;
- esac
+@@ -10255,6 +10252,9 @@ fi
+ 
+ test "x$enable_shared" = "xno" && DYEXT="none"
  
 +MAN_FILE_FORMATS=5
 +MAN_MISC_INFO=7
diff --git a/net/libpcap/patches/patch-gencode.c b/net/libpcap/patches/patch-gencode.c
index 29c2252fdbd..448bd912584 100644
--- a/net/libpcap/patches/patch-gencode.c
+++ b/net/libpcap/patches/patch-gencode.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-gencode.c,v 1.1 2013/02/06 18:07:04 jperkin Exp $
+$NetBSD: patch-gencode.c,v 1.2 2013/06/15 21:01:22 adam Exp $
 
 * Correctly limit Linux interfaces to Linux-only.
 
@@ -13,7 +13,7 @@ $NetBSD: patch-gencode.c,v 1.1 2013/02/06 18:07:04 jperkin Exp $
  #include <linux/types.h>
  #include <linux/if_packet.h>
  #include <linux/filter.h>
-@@ -7583,7 +7583,7 @@ gen_inbound(dir)
+@@ -7533,7 +7533,7 @@ gen_inbound(dir)
  		 * check it, otherwise give up as this link-layer type
  		 * has nothing in the packet data.
  		 */
diff --git a/net/libpcap/patches/patch-pcap-libdlpi.c b/net/libpcap/patches/patch-pcap-libdlpi.c
index 9b405154472..8465f6bcffc 100644
--- a/net/libpcap/patches/patch-pcap-libdlpi.c
+++ b/net/libpcap/patches/patch-pcap-libdlpi.c
@@ -1,18 +1,15 @@
-$NetBSD: patch-pcap-libdlpi.c,v 1.1 2013/02/06 18:07:04 jperkin Exp $
+$NetBSD: patch-pcap-libdlpi.c,v 1.2 2013/06/15 21:01:22 adam Exp $
 
 * Fix compile on Solaris.
 
---- pcap-libdlpi.c.orig	2012-03-29 12:57:32.000000000 +0000
+--- pcap-libdlpi.c.orig	2013-02-21 03:51:49.000000000 +0000
 +++ pcap-libdlpi.c
-@@ -235,9 +235,9 @@ bad:
+@@ -235,7 +235,7 @@ bad:
  static int
  dlpromiscon(pcap_t *p, bpf_u_int32 level)
  {
 -	int err;
 +	int err, retv;
  
--	retv = dlpi_promiscon(p->hd, level);
-+	retv = dlpi_promiscon(p->dlpi_hd, level);
+ 	retv = dlpi_promiscon(p->dlpi_hd, level);
  	if (retv != DLPI_SUCCESS) {
- 		if (retv == DL_SYSERR &&
- 		    (errno == EPERM || errno == EACCES))