Thu Oct 30 08:12:34 2008 UTC ()
Changes 1.0.0:
* Compile with IPv6 support by default
* Compile with large file support on by default
* Add pcap-config script, which deals with -I/-L flags for compiling
* DLT: Add IPMB
* DLT: Add LAPD
* DLT: Add AX25 (AX.25 w/KISS header)
* DLT: Add JUNIPER_ST
* 802.15.4 support
* Variable length 802.11 header support
* X2E data type support
* SITA ACN Interface support - see README.sita
* Support for zerocopy BPF on platforms that support it
* Better support for dealing with VLAN tagging/stripping on Linux
* Fix dynamic library support on OSX


(adam)
diff -r1.42 -r1.43 pkgsrc/net/libpcap/Makefile
diff -r1.5 -r1.6 pkgsrc/net/libpcap/PLIST
diff -r1.20 -r1.21 pkgsrc/net/libpcap/distinfo
diff -r1.3 -r1.4 pkgsrc/net/libpcap/patches/patch-ac
cvs diff -r1.42 -r1.43 pkgsrc/net/libpcap/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libpcap/Makefile 2008/02/29 00:38:12 1.42
+++ pkgsrc/net/libpcap/Makefile 2008/10/30 08:12:34 1.43
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.42 2008/02/29 00:38:12 heinz Exp $ 1# $NetBSD: Makefile,v 1.43 2008/10/30 08:12:34 adam Exp $
2 2
3DISTNAME= libpcap-0.9.8 3DISTNAME= libpcap-1.0.0
4SVR4_PKGNAME= lpcap 4SVR4_PKGNAME= lpcap
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://www.tcpdump.org/release/ 6MASTER_SITES= http://www.tcpdump.org/release/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.tcpdump.org/ 9HOMEPAGE= http://www.tcpdump.org/
10COMMENT= System-independent interface for user-level packet capture 10COMMENT= System-independent interface for user-level packet capture
11 11
12NOT_FOR_PLATFORM+= Interix-*-* # no raw interface access 12NOT_FOR_PLATFORM+= Interix-*-* # no raw interface access
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16 16
cvs diff -r1.5 -r1.6 pkgsrc/net/libpcap/PLIST (expand / switch to unified diff)

--- pkgsrc/net/libpcap/PLIST 2005/08/13 07:04:59 1.5
+++ pkgsrc/net/libpcap/PLIST 2008/10/30 08:12:34 1.6
@@ -1,7 +1,76 @@ @@ -1,7 +1,76 @@
1@comment $NetBSD: PLIST,v 1.5 2005/08/13 07:04:59 adrianp Exp $ 1@comment $NetBSD: PLIST,v 1.6 2008/10/30 08:12:34 adam Exp $
 2bin/pcap-config
2include/pcap-bpf.h 3include/pcap-bpf.h
3include/pcap-int.h 4include/pcap-int.h
4include/pcap-namedb.h 5include/pcap-namedb.h
5include/pcap.h 6include/pcap.h
 7include/pcap/bpf.h
 8include/pcap/namedb.h
 9include/pcap/pcap.h
 10include/pcap/sll.h
 11include/pcap/usb.h
6lib/libpcap.la 12lib/libpcap.la
 13man/man1/pcap-config.1
7man/man3/pcap.3 14man/man3/pcap.3
 15man/man3/pcap_activate.3
 16man/man3/pcap_breakloop.3
 17man/man3/pcap_can_set_rfmon.3
 18man/man3/pcap_close.3
 19man/man3/pcap_compile.3
 20man/man3/pcap_create.3
 21man/man3/pcap_datalink.3
 22man/man3/pcap_datalink_name_to_val.3
 23man/man3/pcap_datalink_val_to_description.3
 24man/man3/pcap_datalink_val_to_name.3
 25man/man3/pcap_dispatch.3
 26man/man3/pcap_dump.3
 27man/man3/pcap_dump_close.3
 28man/man3/pcap_dump_file.3
 29man/man3/pcap_dump_flush.3
 30man/man3/pcap_dump_fopen.3
 31man/man3/pcap_dump_ftell.3
 32man/man3/pcap_dump_open.3
 33man/man3/pcap_file.3
 34man/man3/pcap_fileno.3
 35man/man3/pcap_findalldevs.3
 36man/man3/pcap_fopen_offline.3
 37man/man3/pcap_free_datalinks.3
 38man/man3/pcap_freealldevs.3
 39man/man3/pcap_freecode.3
 40man/man3/pcap_get_selectable_fd.3
 41man/man3/pcap_geterr.3
 42man/man3/pcap_getnonblock.3
 43man/man3/pcap_inject.3
 44man/man3/pcap_is_swapped.3
 45man/man3/pcap_lib_version.3
 46man/man3/pcap_list_datalinks.3
 47man/man3/pcap_lookupdev.3
 48man/man3/pcap_lookupnet.3
 49man/man3/pcap_loop.3
 50man/man3/pcap_major_version.3
 51man/man3/pcap_minor_version.3
 52man/man3/pcap_next.3
 53man/man3/pcap_next_ex.3
 54man/man3/pcap_offline_filter.3
 55man/man3/pcap_open_dead.3
 56man/man3/pcap_open_live.3
 57man/man3/pcap_open_offline.3
 58man/man3/pcap_perror.3
 59man/man3/pcap_sendpacket.3
 60man/man3/pcap_set_buffer_size.3
 61man/man3/pcap_set_datalink.3
 62man/man3/pcap_set_promisc.3
 63man/man3/pcap_set_rfmon.3
 64man/man3/pcap_set_snaplen.3
 65man/man3/pcap_set_timeout.3
 66man/man3/pcap_setdirection.3
 67man/man3/pcap_setfilter.3
 68man/man3/pcap_setnonblock.3
 69man/man3/pcap_snapshot.3
 70man/man3/pcap_stats.3
 71man/man3/pcap_statustostr.3
 72man/man3/pcap_strerror.3
 73man/man5/pcap-savefile.5
 74man/man7/pcap-filter.7
 75man/man7/pcap-linktype.7
 76@dirrm include/pcap
cvs diff -r1.20 -r1.21 pkgsrc/net/libpcap/distinfo (expand / switch to unified diff)

--- pkgsrc/net/libpcap/distinfo 2007/10/11 21:37:57 1.20
+++ pkgsrc/net/libpcap/distinfo 2008/10/30 08:12:34 1.21
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.20 2007/10/11 21:37:57 adam Exp $ 1$NetBSD: distinfo,v 1.21 2008/10/30 08:12:34 adam Exp $
2 2
3SHA1 (libpcap-0.9.8.tar.gz) = 11dfe67cfc1c279c7346d626a99ad4ba90621028 3SHA1 (libpcap-1.0.0.tar.gz) = 9893654027ae11033d785045ff35583da43fe8fa
4RMD160 (libpcap-0.9.8.tar.gz) = 2f5ecbc9840d8bd646798c977b7a02abe191311e 4RMD160 (libpcap-1.0.0.tar.gz) = 20857fe6af5dc70fffb19da46e0fee908f55b3ea
5Size (libpcap-0.9.8.tar.gz) = 520526 bytes 5Size (libpcap-1.0.0.tar.gz) = 524273 bytes
6SHA1 (patch-ac) = f1d911e4c4136ae332d3e756fe92dbf8f0ea8c9d 6SHA1 (patch-aa) = 2bf7bef9e114db7ee9e7d6e5facc8f314969f703
 7SHA1 (patch-ac) = 436b9401274bab4ee295ea2d185d57605d9ce8ca
cvs diff -r1.3 -r1.4 pkgsrc/net/libpcap/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/libpcap/patches/Attic/patch-ac 2007/10/08 20:38:17 1.3
+++ pkgsrc/net/libpcap/patches/Attic/patch-ac 2008/10/30 08:12:34 1.4
@@ -1,117 +1,166 @@ @@ -1,117 +1,166 @@
1$NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $ 1$NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
2 2
3--- Makefile.in.orig 2007-07-24 04:35:15.000000000 +0200 3--- Makefile.in.orig 2008-10-28 02:26:13.000000000 +0100
4+++ Makefile.in 4+++ Makefile.in
5@@ -41,7 +41,7 @@ VPATH = @srcdir@ 5@@ -44,7 +44,7 @@ VPATH = @srcdir@
6 # You shouldn't need to edit anything below. 6 # You shouldn't need to edit anything below.
7 # 7 #
8  8
9-CC = @CC@ 9-CC = @CC@
10+CC = ${LIBTOOL} --mode=compile @CC@ 10+CC = ${LIBTOOL} --mode=compile @CC@
11 CCOPT = @V_CCOPT@ 11 CCOPT = @V_CCOPT@
12 INCLS = -I. @V_INCLS@ 12 INCLS = -I. @V_INCLS@
13 DEFS = @DEFS@ @V_DEFS@ 13 DEFS = @DEFS@ @V_DEFS@
14@@ -69,7 +69,8 @@ YACC = @V_YACC@ 14@@ -73,7 +73,8 @@ YACC = @V_YACC@
15 # Explicitly define compilation rule since SunOS 4's make doesn't like gcc. 15 # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
16 # Also, gcc does not remove the .o before forking 'as', which can be a 16 # Also, gcc does not remove the .o before forking 'as', which can be a
17 # problem if you don't own the file but can write to the directory. 17 # problem if you don't own the file but can write to the directory.
18-.c.o: 18-.c.o:
19+.SUFFIXES: .lo 19+.SUFFIXES: .lo
20+.c.lo: 20+.c.lo:
21 @rm -f $@ 21 @rm -f $@
22 $(CC) $(CFLAGS) -c $(srcdir)/$*.c 22 $(CC) $(CFLAGS) -c $(srcdir)/$*.c
23  23
24@@ -79,13 +80,13 @@ SSRC = @SSRC@ 24@@ -83,13 +84,13 @@ SSRC = @SSRC@
25 CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c \ 25 CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c \
26 etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c 26 etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c
27 GENSRC = scanner.c grammar.c version.c 27 GENSRC = scanner.c grammar.c version.c
28-LIBOBJS = @LIBOBJS@ 28-LIBOBJS = @LIBOBJS@
29+LIBOBJS = @LTLIBOBJS@ 29+LIBOBJS = @LTLIBOBJS@
30  30
31 SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC) 31 SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
32  32
33 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot 33 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
34 # hack the extra indirection 34 # hack the extra indirection
35-OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) 35-OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
36+OBJ = $(PSRC:.c=.lo) $(FSRC:.c=.lo) $(CSRC:.c=.lo) $(SSRC:.c=.lo) $(GENSRC:.c=.lo) $(LIBOBJS) 36+OBJ = $(PSRC:.c=.lo) $(FSRC:.c=.lo) $(CSRC:.c=.lo) $(SSRC:.c=.lo) $(GENSRC:.c=.lo) $(LIBOBJS)
37 HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ 37 HDR = \
38 ethertype.h gencode.h gnuc.h 38 acconfig.h \
39 GENHDR = \ 39 arcnet.h \
40@@ -99,12 +100,10 @@ TAGFILES = \ 40@@ -311,12 +312,10 @@ EXTRA_DIST = \
 41 Win32/Src/inet_net.c \
 42 Win32/Src/inet_pton.c
41  43
42 CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c 44-all: libpcap.a pcap-config
43  45+all: libpcap.la pcap-config
44-all: libpcap.a 
45+all: libpcap.la 
46  46
47-libpcap.a: $(OBJ) 47-libpcap.a: $(OBJ)
48- @rm -f $@ 48- @rm -f $@
49- ar rc $@ $(OBJ) $(LIBS) 49- $(AR) rc $@ $(OBJ) $(LIBS)
50- $(RANLIB) $@ 50- $(RANLIB) $@
51+libpcap.la: $(OBJ) 51+libpcap.la: $(OBJ)
52+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) -o libpcap.la 52+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) -o libpcap.la
53  53
54 shared: libpcap.$(DYEXT) 54 shared: libpcap.$(DYEXT)
55  55
56@@ -128,10 +127,10 @@ scanner.c: $(srcdir)/scanner.l 56@@ -348,10 +347,10 @@ scanner.c: $(srcdir)/scanner.l
57 @rm -f $@ 57 @rm -f $@
58 $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@ 58 ./runlex.sh $(LEX) -o$@ $<
59  59
60-scanner.o: scanner.c tokdefs.h 60-scanner.o: scanner.c tokdefs.h
61+scanner.lo: scanner.c tokdefs.h 61+scanner.lo: scanner.c tokdefs.h
62 $(CC) $(CFLAGS) -c scanner.c 62 $(CC) $(CFLAGS) -c scanner.c
63  63
64-pcap.o: version.h 64-pcap.o: version.h
65+pcap.lo: version.h 65+pcap.lo: version.h
66  66
67 tokdefs.h: grammar.c 67 tokdefs.h: grammar.c
68 grammar.c: $(srcdir)/grammar.y 68 grammar.c: $(srcdir)/grammar.y
69@@ -140,17 +139,17 @@ grammar.c: $(srcdir)/grammar.y 69@@ -360,17 +359,17 @@ grammar.c: $(srcdir)/grammar.y
70 mv y.tab.c grammar.c 70 mv y.tab.c grammar.c
71 mv y.tab.h tokdefs.h 71 mv y.tab.h tokdefs.h
72  72
73-grammar.o: grammar.c 73-grammar.o: grammar.c
74+grammar.lo: grammar.c 74+grammar.lo: grammar.c
75 @rm -f $@ 75 @rm -f $@
76 $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c 76 $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
77  77
78-version.o: version.c 78-version.o: version.c
79+version.lo: version.c 79+version.lo: version.c
80 $(CC) $(CFLAGS) -c version.c 80 $(CC) $(CFLAGS) -c version.c
81  81
82-snprintf.o: $(srcdir)/missing/snprintf.c 82-snprintf.o: $(srcdir)/missing/snprintf.c
83+snprintf.lo: $(srcdir)/missing/snprintf.c 83+snprintf.lo: $(srcdir)/missing/snprintf.c
84 $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c 84 $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
85  85
86-version.c: $(srcdir)/VERSION 86-version.c: $(srcdir)/VERSION
87+version.c: #$(srcdir)/VERSION 87+version.c: #$(srcdir)/VERSION
88 @rm -f $@ 88 @rm -f $@
89 sed -e 's/.*/char pcap_version[] = "&";/' $(srcdir)/VERSION > $@ 89 sed -e 's/.*/char pcap_version[] = "&";/' $(srcdir)/VERSION > $@
90  90
91@@ -161,7 +160,7 @@ version.c: $(srcdir)/VERSION 91@@ -381,7 +380,7 @@ version.c: $(srcdir)/VERSION
92 # so we make the version string static and return it from 92 # so we make the version string static and return it from
93 # a function, which does work. 93 # a function, which does work.
94 # 94 #
95-version.h: $(srcdir)/VERSION 95-version.h: $(srcdir)/VERSION
96+version.h: #$(srcdir)/VERSION 96+version.h: #$(srcdir)/VERSION
97 @rm -f $@ 97 @rm -f $@
98 sed -e 's/.*/static const char pcap_version_string[] = "libpcap version &";/' $(srcdir)/VERSION > $@ 98 sed -e 's/.*/static const char pcap_version_string[] = "libpcap version &";/' $(srcdir)/VERSION > $@
99  99
100@@ -169,14 +168,13 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt 100@@ -389,7 +388,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
101 rm -f bpf_filter.c 101 rm -f bpf_filter.c
102 ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c 102 ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
103  103
104-bpf_filter.o: bpf_filter.c 104-bpf_filter.o: bpf_filter.c
105+bpf_filter.lo: bpf_filter.c 105+bpf_filter.lo: bpf_filter.c
106 $(CC) $(CFLAGS) -c bpf_filter.c 106 $(CC) $(CFLAGS) -c bpf_filter.c
107  107
108-install: libpcap.a  108 #
109+install: libpcap.la  109@@ -413,11 +412,10 @@ filtertest: filtertest.c libpcap.a
 110 findalldevstest: findalldevstest.c libpcap.a
 111 $(CC) $(CFLAGS) -I. -L. -o findalldevstest findalldevstest.c libpcap.a
 112
 113-install: libpcap.a pcap-config
 114+install: libpcap.la pcap-config
110 [ -d $(DESTDIR)$(libdir) ] || \ 115 [ -d $(DESTDIR)$(libdir) ] || \
111 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) 116 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
112- $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a 117- $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
113- $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a 118- $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
114+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir) 119+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir)
115 [ -d $(DESTDIR)$(includedir) ] || \ 120 [ -d $(DESTDIR)$(includedir) ] || \
116 (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) 121 (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
117 $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h 122 [ -d $(DESTDIR)$(includedir)/pcap ] || \
 123@@ -445,31 +443,31 @@ install: libpcap.a pcap-config
 124 $(DESTDIR)$(includedir)/pcap-bpf.h
 125 $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \
 126 $(DESTDIR)$(includedir)/pcap-namedb.h
 127- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
 128+ ${BSD_INSTALL_SCRIPT} pcap-config $(DESTDIR)$(bindir)/pcap-config
 129 for i in $(MAN1); do \
 130 $(INSTALL_DATA) $(srcdir)/$$i \
 131 $(DESTDIR)$(mandir)/man1/$$i; done
 132- for i in $(MAN3PCAP); do \
 133- $(INSTALL_DATA) $(srcdir)/$$i \
 134+ for i in $(MAN3PCAP:.3pcap=.3); do \
 135+ $(INSTALL_DATA) $(srcdir)/$${i}pcap \
 136 $(DESTDIR)$(mandir)/man3/$$i; done
 137 ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
 138- $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
 139+ $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
 140 ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
 141- $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
 142+ $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
 143 ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
 144- $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
 145+ $(DESTDIR)$(mandir)/man3/pcap_perror.3
 146 ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
 147- $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
 148+ $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
 149 ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
 150- $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
 151+ $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
 152 ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
 153- $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
 154+ $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
 155 ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
 156- $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
 157+ $(DESTDIR)$(mandir)/man3/pcap_next.3
 158 ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
 159- $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
 160+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
 161 ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
 162- $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
 163+ $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
 164 for i in $(MANFILE); do \
 165 $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \
 166 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done