Wed Feb 6 18:07:04 2013 UTC ()
Update libpcap to 1.3.0.  Main pkgsrc change is support for Solaris 11/illumos.

Summary for 1.3.0 libpcap release
        Handle DLT_PFSYNC in {FreeBSD, other *BSD+Mac OS X, other}.
        Linux: Don't fail if netfilter isn't enabled in the kernel.
        Add new link-layer type for NFC Forum LLCP.
        Put the CANUSB stuff into EXTRA_DIST, so it shows up in the release tarball.
        Add LINKTYPE_NG40/DLT_NG40.
        Add DLT_MPEG_2_TS/LINKTYPE_MPEG_2_TS for MPEG-2 transport streams.
        [PATCH] Fix AIX-3.5 crash with read failure during stress
        AIX fixes.
        Introduce --disable-shared configure option.
        Added initial support for canusb devices.
        Include the pcap(3PCAP) additions as 1.2.1 changes.
        many updates to documentation: pcap.3pcap.in
        Improve 'inbound'/'outbound' capture filters under Linux.
        Note the cleanup of handling of new DLT_/LINKTYPE_ values.
        On Lion, don't build for PPC.
        For mac80211 devices we need to clean up monitor mode on exit.

Summary for 1.2.1 libpcap release
        Update README file.
        Fix typoes in README.linux file.
        Clean up some compiler warnings.
        Fix Linux compile problems and tests for ethtool.h.
        Treat Debian/kFreeBSD and GNU/Hurd as systems with GNU
         toolchains.
        Support 802.1 QinQ as a form of VLAN in filters.
        Treat "carp" as equivalent to "vrrp" in filters.
        Fix code generated for "ip6 protochain".
        Add some new link-layer header types.
        Support capturing NetFilter log messages on Linux.
        Clean up some error messages.
        Turn off monitor mode on exit for mac80211 interfaces on Linux.
        Fix problems turning monitor mode on for non-mac80211 interfaces
         on Linux.
        Properly fail if /sys/class/net or /proc/net/dev exist but can't
         be opened.
        Fail if pcap_activate() is called on an already-activated
         pcap_t, and add a test program for that.
        Fix filtering in pcap-ng files.
        Don't build for PowerPC on Mac OS X Lion.
        Simplify handling of new DLT_/LINKTYPE_ values.
        Expand pcap(3PCAP) man page.

Summary for 1.2 libpcap release
        All of the changes listed below for 1.1.1 and 1.1.2.
        Changes to error handling for pcap_findalldevs().
        Fix the calculation of the frame size in memory-mapped captures.
        Add a link-layer header type for STANAG 5066 D_PDUs.
        Add a link-layer type for a variant of 3GPP TS 27.010.
        Noted real nature of LINKTYPE_ARCNET.
        Add a link-layer type for DVB-CI.
        Fix configure-script discovery of VLAN acceleration support.
         see http://netoptimizer.blogspot.com/2010/09/tcpdump-vs-vlan-tags.html
        Linux, HP-UX, AIX, NetBSD and OpenBSD compilation/conflict fixes.
        Protect against including AIX 5.x's <net/bpf.h> having been included.
        Add DLT_DBUS, for raw D-Bus messages.
        Treat either EPERM or EACCES as "no soup for you".
        Changes to permissions on DLPI systems.
        Add DLT_IEEE802_15_4_NOFCS for 802.15.4 interfaces.


(jperkin)
diff -r1.50 -r1.51 pkgsrc/net/libpcap/Makefile
diff -r1.9 -r1.10 pkgsrc/net/libpcap/PLIST
diff -r1.26 -r1.27 pkgsrc/net/libpcap/distinfo
diff -r1.7 -r0 pkgsrc/net/libpcap/patches/patch-aa
diff -r1.7 -r1.8 pkgsrc/net/libpcap/patches/patch-ac
diff -r1.5 -r1.6 pkgsrc/net/libpcap/patches/patch-ad
diff -r0 -r1.1 pkgsrc/net/libpcap/patches/patch-configure
diff -r0 -r1.1 pkgsrc/net/libpcap/patches/patch-gencode.c
diff -r0 -r1.1 pkgsrc/net/libpcap/patches/patch-pcap-libdlpi.c

cvs diff -r1.50 -r1.51 pkgsrc/net/libpcap/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libpcap/Makefile 2012/10/23 17:18:34 1.50
+++ pkgsrc/net/libpcap/Makefile 2013/02/06 18:07:04 1.51
@@ -1,42 +1,30 @@ @@ -1,42 +1,30 @@
1# $NetBSD: Makefile,v 1.50 2012/10/23 17:18:34 asau Exp $ 1# $NetBSD: Makefile,v 1.51 2013/02/06 18:07:04 jperkin Exp $
2 2
3DISTNAME= libpcap-1.1.1 3DISTNAME= libpcap-1.3.0
4PKGREVISION= 1 
5SVR4_PKGNAME= lpcap 4SVR4_PKGNAME= lpcap
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= http://www.tcpdump.org/release/ 6MASTER_SITES= http://www.tcpdump.org/release/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.tcpdump.org/ 9HOMEPAGE= http://www.tcpdump.org/
11COMMENT= System-independent interface for user-level packet capture 10COMMENT= System-independent interface for user-level packet capture
12LICENSE= modified-bsd 11LICENSE= modified-bsd
13 12
14NOT_FOR_PLATFORM+= Interix-*-* # no raw interface access 13NOT_FOR_PLATFORM+= Interix-*-* # no raw interface access
15 14
16PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
17INSTALLATION_DIRS= bin 
18 16
19USE_LIBTOOL= yes 17USE_LIBTOOL= yes
20USE_TOOLS+= bison gm4 lex 18USE_TOOLS+= bison gm4 lex
21GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
22PLIST_VARS+= SunOS std 
23 20
24.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
25 22
26.if exists(/usr/include/netinet/ip6.h) 
27CONFIGURE_ARGS+= --enable-ipv6 
28.endif 
29 
30.if ${OPSYS} == "SunOS" 23.if ${OPSYS} == "SunOS"
31.if ${OS_VERSION} != "5.11" 
32CONFIGURE_ARGS+= --with-pcap=dlpi 24CONFIGURE_ARGS+= --with-pcap=dlpi
33.endif 25.endif
34PLIST.SunOS= yes 
35.else 
36PLIST.std= yes 
37.endif 
38 26
39post-install: 27post-install:
40 ${INSTALL_DATA} ${WRKSRC}/pcap-int.h ${DESTDIR}${PREFIX}/include 28 ${INSTALL_DATA} ${WRKSRC}/pcap-int.h ${DESTDIR}${PREFIX}/include
41 29
42.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"

cvs diff -r1.9 -r1.10 pkgsrc/net/libpcap/PLIST (expand / switch to unified diff)

--- pkgsrc/net/libpcap/PLIST 2011/02/11 12:11:26 1.9
+++ pkgsrc/net/libpcap/PLIST 2013/02/06 18:07:04 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2011/02/11 12:11:26 adam Exp $ 1@comment $NetBSD: PLIST,v 1.10 2013/02/06 18:07:04 jperkin Exp $
2bin/pcap-config 2bin/pcap-config
3include/pcap-bpf.h 3include/pcap-bpf.h
4include/pcap-int.h 4include/pcap-int.h
5include/pcap-namedb.h 5include/pcap-namedb.h
6include/pcap.h 6include/pcap.h
7include/pcap/bluetooth.h 7include/pcap/bluetooth.h
8include/pcap/bpf.h 8include/pcap/bpf.h
9include/pcap/ipnet.h 9include/pcap/ipnet.h
10include/pcap/namedb.h 10include/pcap/namedb.h
11include/pcap/pcap.h 11include/pcap/pcap.h
12include/pcap/sll.h 12include/pcap/sll.h
13include/pcap/usb.h 13include/pcap/usb.h
14include/pcap/vlan.h 14include/pcap/vlan.h
@@ -28,54 +28,57 @@ man/man3/pcap_datalink_val_to_name.3 @@ -28,54 +28,57 @@ man/man3/pcap_datalink_val_to_name.3
28man/man3/pcap_dispatch.3 28man/man3/pcap_dispatch.3
29man/man3/pcap_dump.3 29man/man3/pcap_dump.3
30man/man3/pcap_dump_close.3 30man/man3/pcap_dump_close.3
31man/man3/pcap_dump_file.3 31man/man3/pcap_dump_file.3
32man/man3/pcap_dump_flush.3 32man/man3/pcap_dump_flush.3
33man/man3/pcap_dump_fopen.3 33man/man3/pcap_dump_fopen.3
34man/man3/pcap_dump_ftell.3 34man/man3/pcap_dump_ftell.3
35man/man3/pcap_dump_open.3 35man/man3/pcap_dump_open.3
36man/man3/pcap_file.3 36man/man3/pcap_file.3
37man/man3/pcap_fileno.3 37man/man3/pcap_fileno.3
38man/man3/pcap_findalldevs.3 38man/man3/pcap_findalldevs.3
39man/man3/pcap_fopen_offline.3 39man/man3/pcap_fopen_offline.3
40man/man3/pcap_free_datalinks.3 40man/man3/pcap_free_datalinks.3
 41man/man3/pcap_free_tstamp_types.3
41man/man3/pcap_freealldevs.3 42man/man3/pcap_freealldevs.3
42man/man3/pcap_freecode.3 43man/man3/pcap_freecode.3
43man/man3/pcap_get_selectable_fd.3 44man/man3/pcap_get_selectable_fd.3
44man/man3/pcap_geterr.3 45man/man3/pcap_geterr.3
45man/man3/pcap_getnonblock.3 46man/man3/pcap_getnonblock.3
46man/man3/pcap_inject.3 47man/man3/pcap_inject.3
47man/man3/pcap_is_swapped.3 48man/man3/pcap_is_swapped.3
48man/man3/pcap_lib_version.3 49man/man3/pcap_lib_version.3
49man/man3/pcap_list_datalinks.3 50man/man3/pcap_list_datalinks.3
 51man/man3/pcap_list_tstamp_types.3
50man/man3/pcap_lookupdev.3 52man/man3/pcap_lookupdev.3
51man/man3/pcap_lookupnet.3 53man/man3/pcap_lookupnet.3
52man/man3/pcap_loop.3 54man/man3/pcap_loop.3
53man/man3/pcap_major_version.3 55man/man3/pcap_major_version.3
54man/man3/pcap_minor_version.3 56man/man3/pcap_minor_version.3
55man/man3/pcap_next.3 57man/man3/pcap_next.3
56man/man3/pcap_next_ex.3 58man/man3/pcap_next_ex.3
57man/man3/pcap_offline_filter.3 59man/man3/pcap_offline_filter.3
58man/man3/pcap_open_dead.3 60man/man3/pcap_open_dead.3
59man/man3/pcap_open_live.3 61man/man3/pcap_open_live.3
60man/man3/pcap_open_offline.3 62man/man3/pcap_open_offline.3
61man/man3/pcap_perror.3 63man/man3/pcap_perror.3
62man/man3/pcap_sendpacket.3 64man/man3/pcap_sendpacket.3
63man/man3/pcap_set_buffer_size.3 65man/man3/pcap_set_buffer_size.3
64man/man3/pcap_set_datalink.3 66man/man3/pcap_set_datalink.3
65man/man3/pcap_set_promisc.3 67man/man3/pcap_set_promisc.3
66man/man3/pcap_set_rfmon.3 68man/man3/pcap_set_rfmon.3
67man/man3/pcap_set_snaplen.3 69man/man3/pcap_set_snaplen.3
68man/man3/pcap_set_timeout.3 70man/man3/pcap_set_timeout.3
 71man/man3/pcap_set_tstamp_type.3
69man/man3/pcap_setdirection.3 72man/man3/pcap_setdirection.3
70man/man3/pcap_setfilter.3 73man/man3/pcap_setfilter.3
71man/man3/pcap_setnonblock.3 74man/man3/pcap_setnonblock.3
72man/man3/pcap_snapshot.3 75man/man3/pcap_snapshot.3
73man/man3/pcap_stats.3 76man/man3/pcap_stats.3
74man/man3/pcap_statustostr.3 77man/man3/pcap_statustostr.3
75man/man3/pcap_strerror.3 78man/man3/pcap_strerror.3
76${PLIST.std}man/man5/pcap-savefile.5 79man/man3/pcap_tstamp_type_name_to_val.3
77${PLIST.std}man/man7/pcap-filter.7 80man/man3/pcap_tstamp_type_val_to_name.3
78${PLIST.std}man/man7/pcap-linktype.7 81man/man5/pcap-savefile.5
79${PLIST.SunOS}man/man4/pcap-savefile.4 82man/man7/pcap-tstamp.7
80${PLIST.SunOS}man/man5/pcap-filter.5 83man/man7/pcap-filter.7
81${PLIST.SunOS}man/man5/pcap-linktype.5 84man/man7/pcap-linktype.7

cvs diff -r1.26 -r1.27 pkgsrc/net/libpcap/distinfo (expand / switch to unified diff)

--- pkgsrc/net/libpcap/distinfo 2012/06/27 10:53:39 1.26
+++ pkgsrc/net/libpcap/distinfo 2013/02/06 18:07:04 1.27
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1$NetBSD: distinfo,v 1.26 2012/06/27 10:53:39 fhajny Exp $ 1$NetBSD: distinfo,v 1.27 2013/02/06 18:07:04 jperkin Exp $
2 2
3SHA1 (libpcap-1.1.1.tar.gz) = 18581af5e78a40b7b2c9a6cd8ce40e7cb1cd9c63 3SHA1 (libpcap-1.3.0.tar.gz) = 90aa2f0fcfb4bf79fc50ccdaa70f484d96295be3
4RMD160 (libpcap-1.1.1.tar.gz) = 760159c594cc995c9e05c0cd8637a02a3b2725e2 4RMD160 (libpcap-1.3.0.tar.gz) = 3d80cd06c89b32bee1f344bfe720624c2c35763f
5Size (libpcap-1.1.1.tar.gz) = 581984 bytes 5Size (libpcap-1.3.0.tar.gz) = 608967 bytes
6SHA1 (patch-aa) = 2a797ffee404d1cfd38e7d739796e47c514ec5c3 6SHA1 (patch-ac) = 859fc7f91a2831030a3b685ef6448a0c26065b3e
7SHA1 (patch-ac) = 755a3fd5d11a71ed71cebeffb209d4c7f2b91a18 7SHA1 (patch-ad) = 3eb306bbd997f83b55d08cdda1573cf2fdef54f1
8SHA1 (patch-ad) = 7f13de40a6cdaf9db68704979948450265ff961a 8SHA1 (patch-configure) = 25c1bb8f7ec0b493d3a37bb0d9454519312da3e4
 9SHA1 (patch-gencode.c) = d232d89924ae59ac23b224a5d9b40b0677757656
 10SHA1 (patch-pcap-libdlpi.c) = 5626ed40845ca3b96b6a599547f64b11a8f89f81

File Deleted: pkgsrc/net/libpcap/patches/Attic/patch-aa

cvs diff -r1.7 -r1.8 pkgsrc/net/libpcap/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/libpcap/patches/Attic/patch-ac 2012/06/27 10:53:40 1.7
+++ pkgsrc/net/libpcap/patches/Attic/patch-ac 2013/02/06 18:07:04 1.8
@@ -1,194 +1,212 @@ @@ -1,194 +1,212 @@
1$NetBSD: patch-ac,v 1.7 2012/06/27 10:53:40 fhajny Exp $ 1$NetBSD: patch-ac,v 1.8 2013/02/06 18:07:04 jperkin Exp $
2 2
3--- Makefile.in.orig 2010-04-05 17:54:05.000000000 +0000 3--- Makefile.in.orig 2012-03-29 12:57:32.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -45,7 +45,7 @@ VPATH = @srcdir@ 5@@ -45,7 +45,7 @@ VPATH = @srcdir@
6 # 6 #
7  7
8 LD = /usr/bin/ld 8 LD = /usr/bin/ld
9-CC = @CC@ 9-CC = @CC@
10+CC = ${LIBTOOL} --mode=compile @CC@ 10+CC = ${LIBTOOL} --mode=compile @CC@
 11 AR = @AR@
11 CCOPT = @V_CCOPT@ 12 CCOPT = @V_CCOPT@
12 INCLS = -I. @V_INCLS@ 13 INCLS = -I. @V_INCLS@
13 DEFS = @DEFS@ @V_DEFS@ 14@@ -78,7 +78,8 @@ YACC = @V_YACC@
14@@ -76,7 +76,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) $(FULL_CFLAGS) -c $(srcdir)/$*.c
23  23
24@@ -87,13 +88,13 @@ CSRC = pcap.c inet.c gencode.c optimize. 24@@ -89,13 +90,13 @@ CSRC = pcap.c inet.c gencode.c optimize.
25 savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \ 25 savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
26 bpf_image.c bpf_dump.c 26 bpf_image.c bpf_dump.c
27 GENSRC = scanner.c grammar.c bpf_filter.c version.c 27 GENSRC = scanner.c grammar.c bpf_filter.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 PUBHDR = \ 37 PUBHDR = \
38 pcap.h \ 38 pcap.h \
39 pcap-bpf.h \ 39 pcap-bpf.h \
40@@ -324,12 +325,10 @@ EXTRA_DIST = \ 40@@ -345,12 +346,10 @@ EXTRA_DIST = \
41 Win32/Src/inet_net.c \ 41 Win32/Src/inet_net.c \
42 Win32/Src/inet_pton.c 42 Win32/Src/inet_pton.c
43  43
44-all: libpcap.a shared pcap-config 44-all: libpcap.a shared pcap-config
45+all: libpcap.la pcap-config 45+all: libpcap.la pcap-config
46  46
47-libpcap.a: $(OBJ) 47-libpcap.a: $(OBJ)
48- @rm -f $@ 48- @rm -f $@
49- ar rc $@ $(OBJ) $(ADDLARCHIVEOBJS) 49- $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
50- $(RANLIB) $@ 50- $(RANLIB) $@
51+libpcap.la: $(OBJ) 51+libpcap.la: $(OBJ)
52+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) $(LIBS) -o libpcap.la 52+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) $(LIBS) -o libpcap.la
53  53
54 shared: libpcap.$(DYEXT) 54 shared: libpcap.$(DYEXT)
55  55
56@@ -413,10 +412,10 @@ scanner.c: $(srcdir)/scanner.l 56@@ -434,10 +433,10 @@ scanner.c: $(srcdir)/scanner.l
57 @rm -f $@ 57 @rm -f $@
58 $(srcdir)/runlex.sh $(LEX) -o$@ $< 58 $(srcdir)/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) $(FULL_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@@ -425,17 +424,17 @@ grammar.c: $(srcdir)/grammar.y 69@@ -446,17 +445,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) $(FULL_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) $(FULL_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) $(FULL_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 if grep GIT ${srcdir}/VERSION >/dev/null; then \ 89 if grep GIT ${srcdir}/VERSION >/dev/null; then \
90 read ver <${srcdir}/VERSION; \ 90 read ver <${srcdir}/VERSION; \
91@@ -452,7 +451,7 @@ version.c: $(srcdir)/VERSION 91@@ -473,7 +472,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 if grep GIT ${srcdir}/VERSION >/dev/null; then \ 98 if grep GIT ${srcdir}/VERSION >/dev/null; then \
99 read ver <${srcdir}/VERSION; \ 99 read ver <${srcdir}/VERSION; \
100@@ -466,7 +465,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt 100@@ -487,7 +486,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) $(FULL_CFLAGS) -c bpf_filter.c
107  107
108 # 108 #
109@@ -497,7 +496,7 @@ selpolltest: selpolltest.c libpcap.a 109@@ -530,7 +529,7 @@ opentest: tests/opentest.c libpcap.a
110 opentest: opentest.c libpcap.a 110 selpolltest: tests/selpolltest.c libpcap.a
111 $(CC) $(CFLAGS) -I. -L. -o opentest $(srcdir)/opentest.c libpcap.a $(LIBS) 111 $(CC) $(FULL_CFLAGS) -I. -L. -o selpolltest $(srcdir)/tests/selpolltest.c libpcap.a $(LIBS)
112  112
113-install: install-shared install-archive pcap-config 113-install: install-shared install-archive pcap-config
114+install: libpcap.la pcap-config 114+install: libpcap.la pcap-config
115 [ -d $(DESTDIR)$(libdir) ] || \ 115 [ -d $(DESTDIR)$(libdir) ] || \
116 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) 116 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
117 [ -d $(DESTDIR)$(includedir) ] || \ 117 [ -d $(DESTDIR)$(includedir) ] || \
118@@ -512,48 +511,49 @@ install: install-shared install-archive  118@@ -545,57 +544,58 @@ install: install-shared install-archive
119 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@) 119 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
120 [ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \ 120 [ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
121 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@) 121 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
122+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir) 122+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir)
123 for i in $(PUBHDR); do \ 123 for i in $(PUBHDR); do \
124 $(INSTALL_DATA) $(srcdir)/$$i \ 124 $(INSTALL_DATA) $(srcdir)/$$i \
125 $(DESTDIR)$(includedir)/$$i; done 125 $(DESTDIR)$(includedir)/$$i; done
126 [ -d $(DESTDIR)$(bindir) ] || \ 126 [ -d $(DESTDIR)$(bindir) ] || \
127 (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) 127 (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
128- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config 128- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
129+ ${BSD_INSTALL_SCRIPT} pcap-config $(DESTDIR)$(bindir)/pcap-config 129+ $(BSD_INSTALL_SCRIPT) pcap-config $(DESTDIR)$(bindir)/pcap-config
130 for i in $(MAN1); do \ 130 for i in $(MAN1); do \
131 $(INSTALL_DATA) $(srcdir)/$$i \ 131 $(INSTALL_DATA) $(srcdir)/$$i \
132 $(DESTDIR)$(mandir)/man1/$$i; done 132 $(DESTDIR)$(mandir)/man1/$$i; done
133- for i in $(MAN3PCAP_NOEXPAND); do \ 133- for i in $(MAN3PCAP_NOEXPAND); do \
134- $(INSTALL_DATA) $(srcdir)/$$i \ 134- $(INSTALL_DATA) $(srcdir)/$$i \
135+ for i in $(MAN3PCAP_NOEXPAND:.3pcap=.3); do \ 135+ for i in $(MAN3PCAP_NOEXPAND:.3pcap=.3); do \
136+ $(INSTALL_DATA) $(srcdir)/$${i}pcap \ 136+ $(INSTALL_DATA) $(srcdir)/$${i}pcap \
137 $(DESTDIR)$(mandir)/man3/$$i; done 137 $(DESTDIR)$(mandir)/man3/$$i; done
138- for i in $(MAN3PCAP_EXPAND:.in=); do \ 138- for i in $(MAN3PCAP_EXPAND:.in=); do \
139- $(INSTALL_DATA) $$i \ 139- $(INSTALL_DATA) $$i \
140+ for i in $(MAN3PCAP_EXPAND:.3pcap.in=.3); do \ 140+ for i in $(MAN3PCAP_EXPAND:.3pcap.in=.3); do \
141+ $(INSTALL_DATA) $${i}pcap \ 141+ $(INSTALL_DATA) $${i}pcap \
142 $(DESTDIR)$(mandir)/man3/$$i; done 142 $(DESTDIR)$(mandir)/man3/$$i; done
143- rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap 143- rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
144- ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \ 144- ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
145- $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap 145- $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
146- rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap 146- rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
147- ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \ 147- ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
148- $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap 148- $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
 149- rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap
 150- ln $(DESTDIR)$(mandir)/man3/pcap_findalldevs.3pcap \
 151- $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap
149- rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap 152- rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
150- ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \ 153- ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
151- $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap 154- $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
152- rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap 155- rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
153- ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \ 156- ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
154- $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap 157- $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
 158- rm -f $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap
 159- ln $(DESTDIR)$(mandir)/man3/pcap_list_datalinks.3pcap \
 160- $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap
 161- rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap
 162- ln $(DESTDIR)$(mandir)/man3/pcap_list_tstamp_types.3pcap \
 163- $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap
155- rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap 164- rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
156- ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \ 165- ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
157- $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap 166- $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
158- rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap 167- rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
159- ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \ 168- ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
160- $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap 169- $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
161- rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3pcap 170- rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
162- ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \ 171- ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
163- $(DESTDIR)$(mandir)/man3/pcap_next.3pcap 172- $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
164- rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap 173- rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
165- ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \ 174- ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
166- $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap 175- $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
167- rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap 176- rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
168- ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \ 177- ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
169- $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap 178- $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
170+ rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3 179+ rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
171+ ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3 \ 180+ ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3 \
172+ $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3 181+ $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
173+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3 182+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
174+ ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3 \ 183+ ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3 \
175+ $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3 184+ $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
 185+ rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3
 186+ ln $(DESTDIR)$(mandir)/man3/pcap_findalldevs.3 \
 187+ $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3
176+ rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3 188+ rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3
177+ ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3 \ 189+ ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3 \
178+ $(DESTDIR)$(mandir)/man3/pcap_perror.3 190+ $(DESTDIR)$(mandir)/man3/pcap_perror.3
179+ rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3 191+ rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
180+ ln $(DESTDIR)$(mandir)/man3/pcap_inject.3 \ 192+ ln $(DESTDIR)$(mandir)/man3/pcap_inject.3 \
181+ $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3 193+ $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
 194+ rm -f $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3
 195+ ln $(DESTDIR)$(mandir)/man3/pcap_list_datalinks.3 \
 196+ $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3
 197+ rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3
 198+ ln $(DESTDIR)$(mandir)/man3/pcap_list_tstamp_types.3 \
 199+ $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3
182+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3 200+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
183+ ln $(DESTDIR)$(mandir)/man3/pcap_loop.3 \ 201+ ln $(DESTDIR)$(mandir)/man3/pcap_loop.3 \
184+ $(DESTDIR)$(mandir)/man3/pcap_dispatch.3 202+ $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
185+ rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3 203+ rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
186+ ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3 \ 204+ ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3 \
187+ $(DESTDIR)$(mandir)/man3/pcap_minor_version.3 205+ $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
188+ rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3 206+ rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3
189+ ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3 \ 207+ ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3 \
190+ $(DESTDIR)$(mandir)/man3/pcap_next.3 208+ $(DESTDIR)$(mandir)/man3/pcap_next.3
191+ rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3 209+ rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
192+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \ 210+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
193+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3 211+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
194+ rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3 212+ rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3

cvs diff -r1.5 -r1.6 pkgsrc/net/libpcap/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/libpcap/patches/Attic/patch-ad 2011/09/14 17:30:04 1.5
+++ pkgsrc/net/libpcap/patches/Attic/patch-ad 2013/02/06 18:07:04 1.6
@@ -1,13 +1,32 @@ @@ -1,13 +1,32 @@
1$NetBSD: patch-ad,v 1.5 2011/09/14 17:30:04 hans Exp $ 1$NetBSD: patch-ad,v 1.6 2013/02/06 18:07:04 jperkin Exp $
2 2
3--- fad-getad.c.orig 2010-04-05 19:54:05.000000000 +0200 3* Re-order includes to avoid bpf_program re-definition.
4+++ fad-getad.c 2011-07-28 20:28:17.246289360 +0200 4
5@@ -60,7 +60,7 @@ static const char rcsid[] _U_ = 5--- fad-getad.c.orig 2012-03-29 12:57:32.000000000 +0000
6 #include "os-proto.h" 6+++ fad-getad.c
7 #endif 7@@ -54,12 +54,6 @@ static const char rcsid[] _U_ =
 8 #include <string.h>
 9 #include <ifaddrs.h>
 10
 11-#include "pcap-int.h"
 12-
 13-#ifdef HAVE_OS_PROTO_H
 14-#include "os-proto.h"
 15-#endif
 16-
 17 #ifdef AF_PACKET
 18 # ifdef HAVE_NETPACKET_PACKET_H
 19 /* Solaris 11 and later, Linux distributions with newer glibc */
 20@@ -77,6 +71,12 @@ static const char rcsid[] _U_ =
 21 # endif /* HAVE_NETPACKET_PACKET_H */
 22 #endif /* AF_PACKET */
8  23
9-#ifdef AF_PACKET 24+#include "pcap-int.h"
10+#if defined(AF_PACKET) && !defined(__sun) 25+
11 # ifdef __Lynx__ 26+#ifdef HAVE_OS_PROTO_H
12 /* LynxOS */ 27+#include "os-proto.h"
13 # include <netpacket/if_packet.h> 28+#endif
 29+
 30 /*
 31 * This is fun.
 32 *

File Added: pkgsrc/net/libpcap/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2013/02/06 18:07:04 jperkin 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
@@ -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"
 			#
 			# Needed for common functions used by pcap-[dlpi,libdlpi].c
 			#
-		 	SSRC="dlpisubs.c"
 			;;
 
 		*)
@@ -6688,8 +6688,6 @@ fi
 # Individual cases can override this.
 #
 DYEXT="none"
-MAN_FILE_FORMATS=5
-MAN_MISC_INFO=7
 case "$host_os" in
 
 aix*)
@@ -6916,6 +6914,9 @@ $as_echo "#define HAVE_SOLARIS 1" >>conf
 	;;
 esac
 
+MAN_FILE_FORMATS=5
+MAN_MISC_INFO=7
+
 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

File Added: pkgsrc/net/libpcap/patches/Attic/patch-gencode.c
$NetBSD: patch-gencode.c,v 1.1 2013/02/06 18:07:04 jperkin Exp $

* Correctly limit Linux interfaces to Linux-only.

--- gencode.c.orig	2012-06-12 16:55:36.000000000 +0000
+++ gencode.c
@@ -84,7 +84,7 @@ static const char rcsid[] _U_ =
 #include "pcap/sll.h"
 #include "pcap/ipnet.h"
 #include "arcnet.h"
-#if defined(PF_PACKET) && defined(SO_ATTACH_FILTER)
+#if defined(linux) && defined(PF_PACKET) && defined(SO_ATTACH_FILTER)
 #include <linux/types.h>
 #include <linux/if_packet.h>
 #include <linux/filter.h>
@@ -7583,7 +7583,7 @@ gen_inbound(dir)
 		 * check it, otherwise give up as this link-layer type
 		 * has nothing in the packet data.
 		 */
-#if defined(PF_PACKET) && defined(SO_ATTACH_FILTER)
+#if defined(linux) && defined(PF_PACKET) && defined(SO_ATTACH_FILTER)
 		/*
 		 * We infer that this is Linux with PF_PACKET support.
 		 * If this is a *live* capture, we can look at

File Added: pkgsrc/net/libpcap/patches/Attic/patch-pcap-libdlpi.c
$NetBSD: patch-pcap-libdlpi.c,v 1.1 2013/02/06 18:07:04 jperkin Exp $

* Fix compile on Solaris.

--- pcap-libdlpi.c.orig	2012-03-29 12:57:32.000000000 +0000
+++ pcap-libdlpi.c
@@ -235,9 +235,9 @@ 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);
 	if (retv != DLPI_SUCCESS) {
 		if (retv == DL_SYSERR &&
 		    (errno == EPERM || errno == EACCES))