diff options
| author | jperkin <jperkin> | 2013-06-21 13:35:06 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2013-06-21 13:35:06 +0000 |
| commit | 9659c3524f024ecb2aece1de396e2c34e3c7b201 (patch) | |
| tree | df46ef9e51134794dfd80d8b86b3cae9eb724a41 /net/libpcap | |
| parent | 9d42675a1d10360795692a2f838d6b947251dff0 (diff) | |
| download | pkgsrc-9659c3524f024ecb2aece1de396e2c34e3c7b201.tar.gz | |
PR#47943: recent update to libpcap breaks tcpdump, nmap and wireshark on Solaris
Remove bogus removal of dlpisubs.c, and force the configure script to
avoid any getifaddrs implementation on SunOS which would result in it
not being included.
Fixes build on SunOS. Thanks to Jörn Clausen for testing on Solaris 10.
Bump PKGREVISION. Approved during freeze by wiz.
Diffstat (limited to 'net/libpcap')
| -rw-r--r-- | net/libpcap/Makefile | 6 | ||||
| -rw-r--r-- | net/libpcap/distinfo | 4 | ||||
| -rw-r--r-- | net/libpcap/patches/patch-configure | 12 |
3 files changed, 10 insertions, 12 deletions
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile index 09a74316c0c..3c936da373d 100644 --- a/net/libpcap/Makefile +++ b/net/libpcap/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.54 2013/06/15 21:01:22 adam Exp $ +# $NetBSD: Makefile,v 1.55 2013/06/21 13:35:06 jperkin Exp $ DISTNAME= libpcap-1.4.0 +PKGVERSION= 1 SVR4_PKGNAME= lpcap CATEGORIES= net MASTER_SITES= http://www.tcpdump.org/release/ @@ -22,6 +23,9 @@ GNU_CONFIGURE= yes .if ${OPSYS} == "SunOS" CONFIGURE_ARGS+= --with-pcap=dlpi +# Versions of SunOS which include getifaddrs confuse the configure script, +# and result in dlpi stubs not being enabled. +CONFIGURE_ENV+= ac_cv_func_getifaddrs=no .endif post-install: diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo index dbbe8ee73ab..1a126db7fbb 100644 --- a/net/libpcap/distinfo +++ b/net/libpcap/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.28 2013/06/15 21:01:22 adam Exp $ +$NetBSD: distinfo,v 1.29 2013/06/21 13:35:06 jperkin Exp $ 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) = 441afc32ef24d01359d1e0aa568d5895ddc26236 +SHA1 (patch-configure) = a883a0028075cddadf198c50bef0a052e796804e 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 ea19c4ed452..3d187d2a175 100644 --- a/net/libpcap/patches/patch-configure +++ b/net/libpcap/patches/patch-configure @@ -1,15 +1,9 @@ -$NetBSD: patch-configure,v 1.2 2013/06/15 21:01:22 adam Exp $ +$NetBSD: patch-configure,v 1.3 2013/06/21 13:35:06 jperkin Exp $ + +Ensure consistent manual page locations. --- configure.orig 2013-03-25 14:51:40.000000000 +0000 +++ configure -@@ -8835,7 +8835,6 @@ echo "${ECHO_T}$ac_cv_lbl_have_siocglifc - # - # Needed for common functions used by pcap-[dlpi,libdlpi].c - # -- SSRC="dlpisubs.c" - ;; - - *) @@ -9986,8 +9985,6 @@ fi # Individual cases can override this. # |