diff options
author | adrianp <adrianp@pkgsrc.org> | 2007-02-18 18:54:23 +0000 |
---|---|---|
committer | adrianp <adrianp@pkgsrc.org> | 2007-02-18 18:54:23 +0000 |
commit | 92914abb868ba087491a8d917f949924a958fc50 (patch) | |
tree | a288cb4f084a313d25d2e9502b986a29962bedb8 /security | |
parent | 548216dd138dd6e39cac4cc09497a0a8d3f24c1d (diff) | |
download | pkgsrc-92914abb868ba087491a8d917f949924a958fc50.tar.gz |
buildlink updates and patches to handle the new libnet package structure
bump PKGREVISION
Diffstat (limited to 'security')
-rw-r--r-- | security/dsniff/Makefile.common | 15 | ||||
-rw-r--r-- | security/dsniff/distinfo | 3 | ||||
-rw-r--r-- | security/dsniff/patches/patch-ad | 18 | ||||
-rw-r--r-- | security/pakemon/Makefile | 14 | ||||
-rw-r--r-- | security/pakemon/distinfo | 4 | ||||
-rw-r--r-- | security/pakemon/patches/patch-ac | 20 |
6 files changed, 61 insertions, 13 deletions
diff --git a/security/dsniff/Makefile.common b/security/dsniff/Makefile.common index 8bc7953e9cd..db78675c9ce 100644 --- a/security/dsniff/Makefile.common +++ b/security/dsniff/Makefile.common @@ -1,6 +1,7 @@ -# $NetBSD: Makefile.common,v 1.5 2006/05/11 15:39:20 joerg Exp $ +# $NetBSD: Makefile.common,v 1.6 2007/02/18 18:56:13 adrianp Exp $ DISTNAME= dsniff-${VERS} +PKGREVISION= 1 VERS= 2.3 CATEGORIES= security MASTER_SITES+= http://monkey.org/~dugsong/dsniff/ @@ -10,11 +11,17 @@ HOMEPAGE= http://monkey.org/~dugsong/dsniff/ GNU_CONFIGURE= yes -BUILDLINK_API_DEPENDS.libnet+= libnet-1.0.* - PATCHDIR= ${.CURDIR}/../../security/dsniff/patches DISTINFO_FILE= ${.CURDIR}/../../security/dsniff/distinfo +SUBST_CLASSES+= conf +SUBST_STAGE.conf= pre-configure +SUBST_FILES.conf= configure +SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" +SUBST_SED.conf+= -e "s|@@LN_INC@@|${BUILDLINK_PREFIX.libnet10}/include/libnet10|g" +SUBST_SED.conf+= -e "s|@@LN_LIB@@|${BUILDLINK_PREFIX.libnet10}/lib/libnet10|g" +SUBST_MESSAGE.conf= Fixing configuration script. + .include "../../net/libpcap/buildlink3.mk" -.include "../../devel/libnet/buildlink3.mk" +.include "../../devel/libnet10/buildlink3.mk" .include "../../net/libnids/buildlink3.mk" diff --git a/security/dsniff/distinfo b/security/dsniff/distinfo index 04f6e36dd3d..e6c33341a77 100644 --- a/security/dsniff/distinfo +++ b/security/dsniff/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/05/11 15:39:20 joerg Exp $ +$NetBSD: distinfo,v 1.7 2007/02/18 18:56:13 adrianp Exp $ SHA1 (dsniff-2.3.tar.gz) = 671a1df823ab0657fc95e79112924a57281e9c3b RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147 @@ -6,3 +6,4 @@ Size (dsniff-2.3.tar.gz) = 126797 bytes SHA1 (patch-aa) = b50347c772c13abd6b62a80315c7bfecc139ba60 SHA1 (patch-ab) = 6385da7139dcb11ea29ffba468e7fac260b61b44 SHA1 (patch-ac) = 55ad4f73e53578857bc5ad7a445c8e6125c39215 +SHA1 (patch-ad) = cab09e1b1a61fd6a3fa96c24fff3cd1519146a3e diff --git a/security/dsniff/patches/patch-ad b/security/dsniff/patches/patch-ad new file mode 100644 index 00000000000..6224a1f5868 --- /dev/null +++ b/security/dsniff/patches/patch-ad @@ -0,0 +1,18 @@ +$NetBSD: patch-ad,v 1.1 2007/02/18 18:56:13 adrianp Exp $ + +--- configure.orig 2000-12-03 04:35:46.000000000 +0000 ++++ configure +@@ -3083,10 +3083,10 @@ if test "${with_libnet+set}" = set; then + ;; + esac + else +- if test -f ${prefix}/include/libnet.h; then ++ if test -f @@LN_INC@@/libnet.h; then + CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`" +- LNETINC="-I${prefix}/include" +- LNETLIB="-L${prefix}/lib -lnet" ++ LNETINC="-I@@LN_INC@@" ++ LNETLIB="-L@@LN_LIB@@ -lnet" + elif test -f /usr/include/libnet.h; then + CFLAGS="$CFLAGS `libnet-config --defines`" + LNETLIB="-lnet" diff --git a/security/pakemon/Makefile b/security/pakemon/Makefile index a72e66b0a2f..b0625509ffd 100644 --- a/security/pakemon/Makefile +++ b/security/pakemon/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2006/10/04 21:58:14 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2007/02/18 18:56:46 adrianp Exp $ DISTNAME= pakemon-0.3.1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= security MASTER_SITES= http://www.binarii.com/files/security/ \ http://www.mirrors.wiretapped.net/security/network-intrusion-detection/pakemon/ @@ -12,12 +12,18 @@ COMMENT= Packet monster, an Open Source Intrusion Detection System GNU_CONFIGURE= yes -BUILDLINK_API_DEPENDS.libnet+= libnet-1.0.* +SUBST_CLASSES+= conf +SUBST_STAGE.conf= pre-configure +SUBST_FILES.conf= configure +SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" +SUBST_SED.conf+= -e "s|@@LN_INC@@|${BUILDLINK_PREFIX.libnet10}/include/libnet10|g" +SUBST_SED.conf+= -e "s|@@LN_LIB@@|${BUILDLINK_PREFIX.libnet10}/lib/libnet10|g" +SUBST_MESSAGE.conf= Fixing configuration script. post-extract: ${CP} ${WRKSRC}/pakemon.h ${WRKSRC}/pakemon.h.in .include "../../net/libpcap/buildlink3.mk" -.include "../../devel/libnet/buildlink3.mk" +.include "../../devel/libnet10/buildlink3.mk" .include "../../net/libnids/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/pakemon/distinfo b/security/pakemon/distinfo index 3da0b970efd..b66771841db 100644 --- a/security/pakemon/distinfo +++ b/security/pakemon/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 13:10:11 agc Exp $ +$NetBSD: distinfo,v 1.5 2007/02/18 18:56:47 adrianp Exp $ SHA1 (pakemon-0.3.1.tar.gz) = 27708ac303a58432222b53b71b6ca13e71502f7e RMD160 (pakemon-0.3.1.tar.gz) = 156c1829630e2e59a5797882d6309cc423217fee Size (pakemon-0.3.1.tar.gz) = 110065 bytes SHA1 (patch-aa) = 22155e703130a28ba4bf34922b3926411cb917b8 SHA1 (patch-ab) = d35a76ae3ef96d51526f20d9973d1743c038cf81 -SHA1 (patch-ac) = 2f259e12f54742789e8ac36f8a1eead4afcfac14 +SHA1 (patch-ac) = 98766fc5c20fba4c7750b9744bfa59fbf9ad22d2 diff --git a/security/pakemon/patches/patch-ac b/security/pakemon/patches/patch-ac index efa6213ffd1..08273b0e199 100644 --- a/security/pakemon/patches/patch-ac +++ b/security/pakemon/patches/patch-ac @@ -1,7 +1,23 @@ -$NetBSD: patch-ac,v 1.1 2002/10/02 19:12:00 dillo Exp $ +$NetBSD: patch-ac,v 1.2 2007/02/18 18:56:47 adrianp Exp $ ---- configure.orig Sun Jan 7 07:06:39 2001 +--- configure.orig 2001-01-07 06:06:39.000000000 +0000 +++ configure +@@ -1651,11 +1651,11 @@ if test "${with_libnet+set}" = set; then + ;; + esac + else +- if test -f ${prefix}/include/libnet.h; then ++ if test -f @@LN_INC@@/libnet.h; then + CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`" +- LNETINC="-I${prefix}/include" +- LNETLIB="-L${prefix}/lib -lnet" +- LDFLAGS="$LDFLAGS -L${prefix}/lib" ++ LNETINC="-I@@LN_INC@@" ++ LNETLIB="-L@@LN_LIB@@ -lnet" ++ LDFLAGS="$LDFLAGS -L@@LN_LIB@@" + elif test -f /usr/include/libnet.h; then + CFLAGS="$CFLAGS `libnet-config --defines`" + LNETLIB="-lnet" @@ -1908,7 +1908,7 @@ EOF cat >> $CONFIG_STATUS <<EOF |