Wed Mar 11 21:05:09 2015 UTC ()
Thursday Feb. 12, 2015 guy@alum.mit.edu/mcr@sandelman.ca
  Summary for 1.7.2 libpcap release
	Support for filtering Geneve encapsulated packets.

Wednesday Nov. 12, 2014 guy@alum.mit.edu/mcr@sandelman.ca
  Summary for 1.7.0 libpcap release
	Fix handling of zones for BPF on Solaris
	new DLT for ZWAVE
	clarifications for read timeouts.
	added bpf_filter1() with extensions
	some fixes to compilation without stdint.h
	EBUSY can now be returned by SNFv3 code.

Monday Aug. 12, 2014 guy@alum.mit.edu
  Summary for 1.6.2 libpcap release
	Don't crash on filters testing a non-existent link-layer type
	    field.
	Fix sending in non-blocking mode on Linux with memory-mapped
	    capture.
	Fix timestamps when reading pcap-ng files on big-endian
	    machines.

Saturday  Jul. 19, 2014 mcr@sandelman.ca
  Summary for 1.6.1 libpcap release
	some fixes for the any device
	changes for how --enable-XXX (--enable-sniffing, --enable-can) works

Wednesday Jul. 2, 2014 mcr@sandelman.ca
  Summary for 1.6.0 libpcap release
        Don't support D-Bus sniffing on OS X
        fixes for byte order issues with NFLOG captures
        Handle using cooked mode for DLT_NETLINK in activate_new().
        on platforms where you can not capture on down interfaces, do not list them
        but: do list interfaces which are down, if you can capture on them!

Wednesday December 18, 2013 guy@alum.mit.edu
Summary for 1.5.3 libpcap release
	Don't let packets that don't match the current filter get to the
	    application when TPACKET_V3 is used. (GitHub issue #331)
	Fix handling of pcap_loop()/pcap_dispatch() with a packet count
	    of 0 on some platforms (including Linux with TPACKET_V3).
	    (GitHub issue #333)
	Work around TPACKET_V3 deficiency that causes packets to be lost
	    when a timeout of 0 is specified. (GitHub issue #335)
	Man page formatting fixes.

Wednesday December 4, 2013 guy@alum.mit.edu
Summary for 1.5.2 libpcap release
	Fix libpcap to work when compiled with TPACKET_V3 support and
	    running on a kernel without TPACKET_V3 support. (GitHub
	    issue #329)

Wednesday November 20, 2013 guy@alum.mit.edu
Summary for 1.5.1 libpcap release
	Report an error, rather than crashing, if an IPv6 address is
	    used for link-layer filtering.  (Wireshark bug 9376)

Wednesday October 30, 2013 guy@alum.mit.edu
Summary for 1.5.0 libpcap release
	TPACKET_V3 support added for Linux
	Point users to the the-tcpdump-group repository on GitHub rather
	    than the mcr repository
	Checks added for malloc()/realloc()/etc. failures
	Fixed build on Solaris 11
	Support filtering filtering E1 SS7 traffic on MTP2 layer Annex A
	Use "ln -s" to link man pages by default
        Add support for getting nanosecond-resolution time stamps when
	    capturing and reading capture files
        Many changes to autoconf to deal better with non-GCC compilers
        added many new DLT types


(tnn)
diff -r1.58 -r1.59 pkgsrc/net/libpcap/Makefile
diff -r1.11 -r1.12 pkgsrc/net/libpcap/PLIST
diff -r1.29 -r1.30 pkgsrc/net/libpcap/distinfo
diff -r1.8 -r1.9 pkgsrc/net/libpcap/patches/patch-ac
diff -r1.6 -r1.7 pkgsrc/net/libpcap/patches/patch-ad
diff -r1.3 -r1.4 pkgsrc/net/libpcap/patches/patch-configure
diff -r1.2 -r0 pkgsrc/net/libpcap/patches/patch-gencode.c
diff -r1.2 -r0 pkgsrc/net/libpcap/patches/patch-pcap-libdlpi.c
cvs diff -r1.58 -r1.59 pkgsrc/net/libpcap/Makefile (expand / switch to context diff)
--- pkgsrc/net/libpcap/Makefile 2014/10/09 14:06:45 1.58
+++ pkgsrc/net/libpcap/Makefile 2015/03/11 21:05:09 1.59
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2014/10/09 14:06:45 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2015/03/11 21:05:09 tnn Exp $
 
-DISTNAME=	libpcap-1.4.0
-PKGREVISION=	1
+DISTNAME=	libpcap-1.7.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/release/
cvs diff -r1.11 -r1.12 pkgsrc/net/libpcap/PLIST (expand / switch to context diff)
--- pkgsrc/net/libpcap/PLIST 2013/06/15 21:01:22 1.11
+++ pkgsrc/net/libpcap/PLIST 2015/03/11 21:05:09 1.12
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/06/15 21:01:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/03/11 21:05:09 tnn Exp $
 bin/pcap-config
 include/pcap-bpf.h
 include/pcap-int.h
@@ -8,6 +8,7 @@
 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
@@ -37,11 +38,13 @@
 man/man3/pcap_fileno.3
 man/man3/pcap_findalldevs.3
 man/man3/pcap_fopen_offline.3
+man/man3/pcap_fopen_offline_with_tstamp_precision.3
 man/man3/pcap_free_datalinks.3
 man/man3/pcap_free_tstamp_types.3
 man/man3/pcap_freealldevs.3
 man/man3/pcap_freecode.3
 man/man3/pcap_get_selectable_fd.3
+man/man3/pcap_get_tstamp_precision.3
 man/man3/pcap_geterr.3
 man/man3/pcap_getnonblock.3
 man/man3/pcap_inject.3
@@ -58,16 +61,20 @@
 man/man3/pcap_next_ex.3
 man/man3/pcap_offline_filter.3
 man/man3/pcap_open_dead.3
+man/man3/pcap_open_dead_with_tstamp_precision.3
 man/man3/pcap_open_live.3
 man/man3/pcap_open_offline.3
+man/man3/pcap_open_offline_with_tstamp_precision.3
 man/man3/pcap_perror.3
 man/man3/pcap_sendpacket.3
 man/man3/pcap_set_buffer_size.3
 man/man3/pcap_set_datalink.3
+man/man3/pcap_set_immediate_mode.3
 man/man3/pcap_set_promisc.3
 man/man3/pcap_set_rfmon.3
 man/man3/pcap_set_snaplen.3
 man/man3/pcap_set_timeout.3
+man/man3/pcap_set_tstamp_precision.3
 man/man3/pcap_set_tstamp_type.3
 man/man3/pcap_setdirection.3
 man/man3/pcap_setfilter.3
@@ -77,6 +84,7 @@
 man/man3/pcap_statustostr.3
 man/man3/pcap_strerror.3
 man/man3/pcap_tstamp_type_name_to_val.3
+man/man3/pcap_tstamp_type_val_to_description.3
 man/man3/pcap_tstamp_type_val_to_name.3
 man/man5/pcap-savefile.5
 man/man7/pcap-filter.7
cvs diff -r1.29 -r1.30 pkgsrc/net/libpcap/distinfo (expand / switch to context diff)
--- pkgsrc/net/libpcap/distinfo 2013/06/21 13:35:06 1.29
+++ pkgsrc/net/libpcap/distinfo 2015/03/11 21:05:09 1.30
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.29 2013/06/21 13:35:06 jperkin Exp $
+$NetBSD: distinfo,v 1.30 2015/03/11 21:05:09 tnn Exp $
 
-SHA1 (libpcap-1.4.0.tar.gz) = 9c9710aab68be58ed1d41b5c36dc2599419a80e0
+SHA1 (libpcap-1.7.2.tar.gz) = 97aed0270bc201dfdeacccddc61179d27c68e42c
-RMD160 (libpcap-1.4.0.tar.gz) = 5c82a5b813b62fdd10c01c704e1c775ed74d0906
+RMD160 (libpcap-1.7.2.tar.gz) = ff94bfb4c81645dcf5f3a4252f4049e023f43946
-Size (libpcap-1.4.0.tar.gz) = 619045 bytes
+Size (libpcap-1.7.2.tar.gz) = 662162 bytes
-SHA1 (patch-ac) = 859fc7f91a2831030a3b685ef6448a0c26065b3e
+SHA1 (patch-ac) = baa9cadd0af714d0808189777750b506cf726657
-SHA1 (patch-ad) = 3eb306bbd997f83b55d08cdda1573cf2fdef54f1
+SHA1 (patch-ad) = ea818a5fb146488f909483d96d943941ea1873e4
-SHA1 (patch-configure) = a883a0028075cddadf198c50bef0a052e796804e
+SHA1 (patch-configure) = 361a6bbf5cadad40ea54ddaf8fcf6683d0e6a9c7
-SHA1 (patch-gencode.c) = e3791f1cd33826907e7d1986799b22333d96dc42
-SHA1 (patch-pcap-libdlpi.c) = f5df74e9a747f1dddca18cee908a2f89eb5e6261
cvs diff -r1.8 -r1.9 pkgsrc/net/libpcap/patches/Attic/patch-ac (expand / switch to context diff)
--- pkgsrc/net/libpcap/patches/Attic/patch-ac 2013/02/06 18:07:04 1.8
+++ pkgsrc/net/libpcap/patches/Attic/patch-ac 2015/03/11 21:05:09 1.9
@@ -1,17 +1,20 @@
-$NetBSD: patch-ac,v 1.8 2013/02/06 18:07:04 jperkin Exp $
+$NetBSD: patch-ac,v 1.9 2015/03/11 21:05:09 tnn Exp $
 
---- Makefile.in.orig	2012-03-29 12:57:32.000000000 +0000
+Add libtoolization
+Fix manpage installation
+
+--- Makefile.in.orig	2015-03-09 19:22:07.000000000 +0000
 +++ Makefile.in
-@@ -45,7 +45,7 @@ VPATH = @srcdir@
+@@ -43,7 +43,7 @@ VPATH = @srcdir@
  #
  
  LD = /usr/bin/ld
 -CC = @CC@
 +CC = ${LIBTOOL} --mode=compile @CC@
  AR = @AR@
- CCOPT = @V_CCOPT@
- INCLS = -I. @V_INCLS@
-@@ -78,7 +78,8 @@ YACC = @V_YACC@
+ LN_S = @LN_S@
+ MKDEP = @MKDEP@
+@@ -80,7 +80,8 @@ YACC = @V_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.
@@ -21,7 +24,7 @@
  	@rm -f $@
  	$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
  
-@@ -89,13 +90,13 @@ CSRC =	pcap.c inet.c gencode.c optimize.
+@@ -91,13 +92,13 @@ CSRC =	pcap.c inet.c gencode.c optimize.
  	savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
  	bpf_image.c bpf_dump.c
  GENSRC = scanner.c grammar.c bpf_filter.c version.c
@@ -37,7 +40,7 @@
  PUBHDR = \
  	pcap.h \
  	pcap-bpf.h \
-@@ -345,12 +346,10 @@ EXTRA_DIST = \
+@@ -358,12 +359,10 @@ EXTRA_DIST = \
  	Win32/Src/inet_net.c \
  	Win32/Src/inet_pton.c
  
@@ -53,9 +56,9 @@
  
  shared: libpcap.$(DYEXT)
  
-@@ -434,10 +433,10 @@ scanner.c: $(srcdir)/scanner.l
- 	@rm -f $@
- 	$(srcdir)/runlex.sh $(LEX) -o$@ $<
+@@ -450,10 +449,10 @@ scanner.c: $(srcdir)/scanner.l
+ 	cat $@.top $@.bottom > $@
+ 	@rm $@.bottom
  
 -scanner.o: scanner.c tokdefs.h
 +scanner.lo: scanner.c tokdefs.h
@@ -66,7 +69,7 @@
  
  tokdefs.h: grammar.c
  grammar.c: $(srcdir)/grammar.y
-@@ -446,17 +445,17 @@ grammar.c: $(srcdir)/grammar.y
+@@ -462,17 +461,17 @@ grammar.c: $(srcdir)/grammar.y
  	mv y.tab.c grammar.c
  	mv y.tab.h tokdefs.h
  
@@ -88,7 +91,7 @@
  	@rm -f $@
  	if grep GIT ${srcdir}/VERSION >/dev/null; then \
  		read ver <${srcdir}/VERSION; \
-@@ -473,7 +472,7 @@ version.c: $(srcdir)/VERSION
+@@ -489,7 +488,7 @@ version.c: $(srcdir)/VERSION
  # so we make the version string static and return it from
  # a function, which does work.
  #
@@ -97,7 +100,7 @@
  	@rm -f $@
  	if grep GIT ${srcdir}/VERSION >/dev/null; then \
  		read ver <${srcdir}/VERSION; \
-@@ -487,7 +486,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
+@@ -503,7 +502,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
  	rm -f bpf_filter.c
  	ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
  
@@ -106,16 +109,16 @@
  	$(CC) $(FULL_CFLAGS) -c bpf_filter.c
  
  #
-@@ -530,7 +529,7 @@ opentest: tests/opentest.c libpcap.a
- selpolltest: tests/selpolltest.c libpcap.a
- 	$(CC) $(FULL_CFLAGS) -I. -L. -o selpolltest $(srcdir)/tests/selpolltest.c libpcap.a $(LIBS)
+@@ -549,7 +548,7 @@ selpolltest: tests/selpolltest.c libpcap
+ valgrindtest: tests/valgrindtest.c libpcap.a
+ 	$(CC) $(FULL_CFLAGS) -I. -L. -o valgrindtest $(srcdir)/tests/valgrindtest.c libpcap.a $(LIBS)
  
 -install: install-shared install-archive pcap-config
 +install: libpcap.la pcap-config
  	[ -d $(DESTDIR)$(libdir) ] || \
  	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
  	[ -d $(DESTDIR)$(includedir) ] || \
-@@ -545,57 +544,58 @@ install: install-shared install-archive 
+@@ -564,56 +563,73 @@ 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@)
@@ -140,42 +143,41 @@
 +	for i in $(MAN3PCAP_EXPAND:.3pcap.in=.3); do \
 +		$(INSTALL_DATA) $${i}pcap \
  		    $(DESTDIR)$(mandir)/man3/$$i; done
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_findalldevs.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_list_datalinks.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_list_tstamp_types.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
--	rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
--		 $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
+-	(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 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
 +	ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3 \
 +		 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
@@ -206,9 +208,24 @@
 +	rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3
 +	ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3 \
 +		 $(DESTDIR)$(mandir)/man3/pcap_next.3
++	rm -f $(DESTDIR)$(mandir)/man3/pcap_open_dead_with_tstamp_precision.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_open_dead.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_open_dead_with_tstamp_precision.3
++	rm -f $(DESTDIR)$(mandir)/man3/pcap_open_offline_with_tstamp_precision.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_open_offline_with_tstamp_precision.3
 +	rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
 +	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
 +		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
++	rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline_with_tstamp_precision.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline_with_tstamp_precision.3
++	rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
++	rm -f $(DESTDIR)$(mandir)/man3/pcap_tstamp_type_val_to_description.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_tstamp_type_val_to_name.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_tstamp_type_val_to_description.3
 +	rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
 +	ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3 \
 +		 $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
cvs diff -r1.6 -r1.7 pkgsrc/net/libpcap/patches/Attic/patch-ad (expand / switch to context diff)
--- pkgsrc/net/libpcap/patches/Attic/patch-ad 2013/02/06 18:07:04 1.6
+++ pkgsrc/net/libpcap/patches/Attic/patch-ad 2015/03/11 21:05:09 1.7
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.6 2013/02/06 18:07:04 jperkin Exp $
+$NetBSD: patch-ad,v 1.7 2015/03/11 21:05:09 tnn Exp $
 
 * Re-order includes to avoid bpf_program re-definition.
 
---- fad-getad.c.orig	2012-03-29 12:57:32.000000000 +0000
+--- fad-getad.c.orig	2014-11-13 08:58:52.000000000 +0000
 +++ fad-getad.c
-@@ -54,12 +54,6 @@ static const char rcsid[] _U_ =
+@@ -49,12 +49,6 @@
  #include <string.h>
  #include <ifaddrs.h>
  
@@ -14,12 +14,12 @@
 -#include "os-proto.h"
 -#endif
 -
- #ifdef AF_PACKET
- # ifdef HAVE_NETPACKET_PACKET_H
- /* Solaris 11 and later, Linux distributions with newer glibc */
-@@ -77,6 +71,12 @@ static const char rcsid[] _U_ =
+ /*
+  * We don't do this on Solaris 11 and later, as it appears there aren't
+  * any AF_PACKET addresses on interfaces, so we don't need this, and
+@@ -78,6 +72,12 @@
  # endif /* HAVE_NETPACKET_PACKET_H */
- #endif /* AF_PACKET */
+ #endif /* (defined(linux) || defined(__Lynx__)) && defined(AF_PACKET) */
  
 +#include "pcap-int.h"
 +
cvs diff -r1.3 -r1.4 pkgsrc/net/libpcap/patches/patch-configure (expand / switch to context diff)
--- pkgsrc/net/libpcap/patches/patch-configure 2013/06/21 13:35:06 1.3
+++ pkgsrc/net/libpcap/patches/patch-configure 2015/03/11 21:05:09 1.4
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2013/06/21 13:35:06 jperkin Exp $
+$NetBSD: patch-configure,v 1.4 2015/03/11 21:05:09 tnn Exp $
 
 Ensure consistent manual page locations.
 
---- configure.orig	2013-03-25 14:51:40.000000000 +0000
+--- configure.orig	2015-03-09 19:22:07.000000000 +0000
 +++ configure
-@@ -9986,8 +9985,6 @@ fi
+@@ -6857,8 +6857,6 @@ fi
  # Individual cases can override this.
  #
  DYEXT="none"
@@ -13,7 +13,7 @@
  case "$host_os" in
  
  aix*)
-@@ -10255,6 +10252,9 @@ fi
+@@ -7133,6 +7131,9 @@ fi
  
  test "x$enable_shared" = "xno" && DYEXT="none"
  
@@ -23,3 +23,12 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+@@ -8125,7 +8126,7 @@ else
+ fi
+ 
+ 
+-		if test "x$ac_lbl_bluetooth_available" == "xno" ; then
++		if test "x$ac_lbl_bluetooth_available" = "xno" ; then
+ 		    if test "x$enable_bluetooth" = "xyes" ; then
+ 			as_fn_error $? "Bluetooth sniffing is not supported; install bluez-lib devel to enable it" "$LINENO" 5
+ 		    else
File Deleted: pkgsrc/net/libpcap/patches/Attic/patch-gencode.c
File Deleted: pkgsrc/net/libpcap/patches/Attic/patch-pcap-libdlpi.c