- Update to 1.2.1.

- Remove two patch files which are now in this release.

5 files changed, 23 insertions, 82 deletions

diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index 56543f86564b..a644632e7792 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libpcap
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.tcpdump.org/release/
 
@@ -47,8 +46,6 @@ MAN3=		pcap.3 \
 		pcap_file.3 \
 		pcap_fileno.3 \
 		pcap_findalldevs.3 \
-		pcap_free_datalinks.3 \
-		pcap_freealldevs.3 \
 		pcap_freecode.3 \
 		pcap_get_selectable_fd.3 \
 		pcap_geterr.3 \
@@ -56,6 +53,7 @@ MAN3=		pcap.3 \
 		pcap_is_swapped.3 \
 		pcap_lib_version.3 \
 		pcap_list_datalinks.3 \
+		pcap_list_tstamp_types.3 \
 		pcap_lookupdev.3 \
 		pcap_lookupnet.3 \
 		pcap_loop.3 \
@@ -71,15 +69,20 @@ MAN3=		pcap.3 \
 		pcap_set_rfmon.3 \
 		pcap_set_snaplen.3 \
 		pcap_set_timeout.3 \
+		pcap_set_tstamp_type.3 \
 		pcap_setdirection.3 \
 		pcap_setfilter.3 \
 		pcap_setnonblock.3 \
 		pcap_snapshot.3 \
 		pcap_stats.3 \
 		pcap_statustostr.3 \
-		pcap_strerror.3
+		pcap_strerror.3 \
+		pcap_tstamp_type_name_to_val.3 \
+		pcap_tstamp_type_val_to_name.3
 MAN5=		pcap-savefile.5
-MAN7=		pcap-filter.7 pcap-linktype.7
+MAN7=		pcap-filter.7 \
+		pcap-linktype.7 \
+		pcap-tstamp.7
 
 MLINKS=		pcap_datalink_val_to_name.3 \
 		pcap_datalink_val_to_description.3 \
diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index 32a2e5c5b29e..bb669db90500 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpcap-1.1.1.tar.gz) = 508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85
-SIZE (libpcap-1.1.1.tar.gz) = 581984
+SHA256 (libpcap-1.2.1.tar.gz) = a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd
+SIZE (libpcap-1.2.1.tar.gz) = 603208
diff --git a/net/libpcap/files/patch-Makefile.in b/net/libpcap/files/patch-Makefile.in
index 671ede57e950..49de3089160e 100644
--- a/net/libpcap/files/patch-Makefile.in
+++ b/net/libpcap/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- ./Makefile.in.orig	2010-03-11 20:56:53.000000000 -0500
-+++ ./Makefile.in	2010-03-31 20:47:19.278559746 -0400
-@@ -517,43 +517,19 @@
+--- ./Makefile.in.orig	2012-01-07 23:10:56.713381055 -0500
++++ ./Makefile.in	2012-01-07 23:10:38.819379443 -0500
+@@ -548,52 +548,19 @@
  		    $(DESTDIR)$(includedir)/$$i; done
  	[ -d $(DESTDIR)$(bindir) ] || \
  	    (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
@@ -25,12 +25,21 @@
 -	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
diff --git a/net/libpcap/files/patch-bpf__net__bpf_filter.c b/net/libpcap/files/patch-bpf__net__bpf_filter.c
deleted file mode 100644
index 61a532541846..000000000000
--- a/net/libpcap/files/patch-bpf__net__bpf_filter.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./bpf/net/bpf_filter.c.orig	2010-03-11 20:56:53.000000000 -0500
-+++ ./bpf/net/bpf_filter.c	2011-05-22 12:59:10.148490778 -0400
-@@ -405,7 +405,18 @@
- 			continue;
- 
- 		case BPF_JMP|BPF_JA:
-+#if defined(KERNEL) || defined(_KERNEL)
-+			/*
-+			 * No backward jumps allowed.
-+			 */
- 			pc += pc->k;
-+#else
-+			/*
-+			 * XXX - we currently implement "ip6 protochain"
-+			 * with backward jumps, so sign-extend pc->k.
-+			 */
-+			pc += (bpf_int32)pc->k;
-+#endif
- 			continue;
- 
- 		case BPF_JMP|BPF_JGT|BPF_K:
diff --git a/net/libpcap/files/patch-inet.c b/net/libpcap/files/patch-inet.c
deleted file mode 100644
index a3d93d22922b..000000000000
--- a/net/libpcap/files/patch-inet.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- inet.c.orig	2010-03-11 20:56:54.000000000 -0500
-+++ inet.c	2010-09-26 10:06:27.397182116 -0400
-@@ -431,26 +431,36 @@
- 	strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name);
- 	s = socket(AF_INET, SOCK_DGRAM, 0);
- 	if (s >= 0) {
-+#ifdef __FreeBSD__
-+		/*
-+		 * On FreeBSD, if the buffer isn't big enough for the
-+		 * description, the ioctl succeeds, but the description
-+		 * isn't copied, ifr_buffer.length is set to the description
-+		 * length, and ifr_buffer.buffer is set to NULL.
-+		 */
- 		for (;;) {
- 			free(description);
- 			if ((description = malloc(descrlen)) != NULL) {
--#ifdef __FreeBSD__
- 				ifrdesc.ifr_buffer.buffer = description;
- 				ifrdesc.ifr_buffer.length = descrlen;
--#else /* __FreeBSD__ */
--				ifrdesc.ifr_data = (caddr_t)description;
--#endif /* __FreeBSD__ */
--				if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0)
--					break;
--#ifdef __FreeBSD__
--				else if (errno == ENAMETOOLONG)
--					descrlen = ifrdesc.ifr_buffer.length;
--#endif /* __FreeBSD__ */
--				else
-+				if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0) {
-+					if (ifrdesc.ifr_buffer.buffer ==
-+					    description)
-+						break;
-+					else
-+						descrlen = ifrdesc.ifr_buffer.length;
-+				} else {
-+					/*
-+					 * Failed to get interface description.
-+					 */
-+					free(description);
-+					description = NULL;
- 					break;
-+				}
- 			} else
- 				break;
- 		}
-+#endif /* __FreeBSD__ */
- 		close(s);
- 		if (description != NULL && strlen(description) == 0) {
- 			free(description);