diff options
author | obache <obache@pkgsrc.org> | 2011-01-07 04:15:37 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2011-01-07 04:15:37 +0000 |
commit | 826f3c88d2745dea7705516f5f034cd23e30b3a1 (patch) | |
tree | d9aa619ec52d6cb6e7766df31cffd21933818c2c /security/p0f | |
parent | 9ffc40cd0f7210d9836df95c0d8dea2f63dff45b (diff) | |
download | pkgsrc-826f3c88d2745dea7705516f5f034cd23e30b3a1.tar.gz |
Let preferred libpcap to be picked up.
PR#44333.
Diffstat (limited to 'security/p0f')
-rw-r--r-- | security/p0f/Makefile | 4 | ||||
-rw-r--r-- | security/p0f/distinfo | 5 | ||||
-rw-r--r-- | security/p0f/patches/patch-aa | 15 | ||||
-rw-r--r-- | security/p0f/patches/patch-ae | 18 |
4 files changed, 36 insertions, 6 deletions
diff --git a/security/p0f/Makefile b/security/p0f/Makefile index eef2601b118..5a734ede8f1 100644 --- a/security/p0f/Makefile +++ b/security/p0f/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2010/01/27 21:35:44 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2011/01/07 04:15:37 obache Exp $ # DISTNAME= p0f-2.0.8 @@ -16,6 +16,8 @@ WRKSRC= ${WRKDIR}/p0f PKG_SYSCONFSUBDIR= p0f +MAKE_ENV+= LIBPCAP_PREFIX=${BUILDLINK_PREFIX.libpcap} + CONF_FILES= ${PREFIX}/share/examples/p0f/p0f.fp ${PKG_SYSCONFDIR}/p0f.fp CONF_FILES+= ${PREFIX}/share/examples/p0f/p0fa.fp ${PKG_SYSCONFDIR}/p0fa.fp CONF_FILES+= ${PREFIX}/share/examples/p0f/p0fr.fp ${PKG_SYSCONFDIR}/p0fr.fp diff --git a/security/p0f/distinfo b/security/p0f/distinfo index e7f96e17410..e68463a3ffc 100644 --- a/security/p0f/distinfo +++ b/security/p0f/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.16 2007/03/05 20:31:53 adrianp Exp $ +$NetBSD: distinfo,v 1.17 2011/01/07 04:15:37 obache Exp $ SHA1 (p0f-2.0.8.tgz) = 7b4d5b2f24af4b5a299979134bc7f6d7b1eaf875 RMD160 (p0f-2.0.8.tgz) = 87d5b30d2d5e156b9fdcb026160155f413ce13d3 Size (p0f-2.0.8.tgz) = 136877 bytes -SHA1 (patch-aa) = f55e4b15edf6c1de1a799d09a2930f1fb3ece56b +SHA1 (patch-aa) = b034506698ea47904243574f373b252e36e4f3cc SHA1 (patch-ad) = 378d9480c88d9a447684323c4a59f3c2f6f10d74 +SHA1 (patch-ae) = 581817151df41d320f7d36efa8a87e4f13c97adc diff --git a/security/p0f/patches/patch-aa b/security/p0f/patches/patch-aa index c416d765d17..74323606214 100644 --- a/security/p0f/patches/patch-aa +++ b/security/p0f/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.8 2007/03/05 20:31:53 adrianp Exp $ +$NetBSD: patch-aa,v 1.9 2011/01/07 04:15:37 obache Exp $ ---- mk/NetBSD.orig 2006-03-16 08:43:17.000000000 +0100 -+++ mk/NetBSD +--- mk/Linux.orig 2006-08-21 12:37:00.000000000 +0000 ++++ mk/Linux @@ -7,12 +7,9 @@ # (C) Copyright 2000-2006 by Michal Zalewski <lcamtuf@coredump.cx> # @@ -16,3 +16,12 @@ $NetBSD: patch-aa,v 1.8 2007/03/05 20:31:53 adrianp Exp $ FILE = p0f TOOLS = test/sendack test/sendack2 test/sendsyn +@@ -23,7 +20,7 @@ all: $(FILE) strip + static: $(FILE)-static + + $(FILE): $(FILE).c +- $(CC) $(CFLAGS) -o $@ $(FILE).c $(FILE)-query.c crc32.c $(LIBS) ++ $(CC) $(CFLAGS) -o $@ $(FILE).c $(FILE)-query.c crc32.c $(LDFLAGS) $(LIBS) + + $(FILE)-static: $(FILE).c + $(CC) -static $(CFLAGS) -o $@ $(FILE).c $(FILE)-query.c crc32.c $(LIBS) diff --git a/security/p0f/patches/patch-ae b/security/p0f/patches/patch-ae new file mode 100644 index 00000000000..5b3a9888eff --- /dev/null +++ b/security/p0f/patches/patch-ae @@ -0,0 +1,18 @@ +$NetBSD: patch-ae,v 1.1 2011/01/07 04:15:37 obache Exp $ + +* use preferred libpcap. + +--- Build.orig 2006-03-16 07:44:34.000000000 +0000 ++++ Build +@@ -34,9 +34,10 @@ fi + + GMAKE_OK=`which gmake 2>/dev/null` + ++test "$LIBPCAP_PREFIX" = "" && LIBPCAP_PREFIX="/usr" + USE_BPF="pcap-bpf.h" + +-if [ ! -f "/usr/include/$USE_BPF" -a ! -f "/usr/local/include/$USE_BPF" ]; then ++if [ ! -f "$LIBPCAP_PREFIX/include/$USE_BPF" ]; then + USE_BPF="net/bpf.h" + fi + |