From 84505d55124a88aca120539338760eaacf2bbcb7 Mon Sep 17 00:00:00 2001 From: jmmv Date: Thu, 1 May 2003 21:32:45 +0000 Subject: Honour PKG_SYSCONFDIR. Bump PKGREVISION to 2. --- security/portsentry/Makefile | 12 ++++++++++-- security/portsentry/PLIST | 7 ++++--- security/portsentry/distinfo | 8 ++++---- security/portsentry/patches/patch-aa | 6 +++--- security/portsentry/patches/patch-ab | 8 ++++---- security/portsentry/patches/patch-ac | 4 ++-- 6 files changed, 27 insertions(+), 18 deletions(-) (limited to 'security') diff --git a/security/portsentry/Makefile b/security/portsentry/Makefile index 68f71ec46e0..06e1229b540 100644 --- a/security/portsentry/Makefile +++ b/security/portsentry/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2002/06/01 12:33:20 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2003/05/01 21:32:45 jmmv Exp $ # DISTNAME= portsentry-1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.psionic.com/tools/ @@ -12,8 +12,15 @@ COMMENT= detects and respond to port scans against a target host in real-time LICENSE= portsentry-license +USE_BUILDLINK2= YES +USE_PKGINSTALL= YES + ALL_TARGET= ${LOWER_OPSYS} +EGDIR= ${PREFIX}/share/examples/portsentry +CONF_FILES= ${EGDIR}/portsentry.conf ${PKG_SYSCONFDIR}/portsentry.conf +CONF_FILES+= ${EGDIR}/portsentry.ignore ${PKG_SYSCONFDIR}/portsentry.ignore + post-patch: @cd ${WRKSRC}; \ case ${OPSYS} in \ @@ -23,6 +30,7 @@ post-patch: for f in portsentry.conf portsentry_config.h; do \ ${MV} $$f $$f.prefix; \ ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ + -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' \ -e 's|@netbsd@|'$$netbsd'|g' \ -e 's|@solaris@|'$$solaris'|g' \ $$f.prefix > $$f; \ diff --git a/security/portsentry/PLIST b/security/portsentry/PLIST index c1a695741c2..5fbbdd90828 100644 --- a/security/portsentry/PLIST +++ b/security/portsentry/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/01 12:33:20 wiz Exp $ -etc/portsentry.ignore -etc/portsentry.conf +@comment $NetBSD: PLIST,v 1.3 2003/05/01 21:32:46 jmmv Exp $ sbin/portsentry share/doc/portsentry/README.install share/doc/portsentry/README.methods +share/examples/portsentry/portsentry.conf +share/examples/portsentry/portsentry.ignore +@dirrm share/examples/portsentry @dirrm share/doc/portsentry diff --git a/security/portsentry/distinfo b/security/portsentry/distinfo index 54e55b119a0..07811c5fb4a 100644 --- a/security/portsentry/distinfo +++ b/security/portsentry/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 15:40:37 agc Exp $ +$NetBSD: distinfo,v 1.3 2003/05/01 21:32:46 jmmv Exp $ SHA1 (portsentry-1.0.tar.gz) = b28f84bb483701380a7f004c4b13a8f52eda89ab Size (portsentry-1.0.tar.gz) = 43034 bytes -SHA1 (patch-aa) = 937529f256bac8d9493782bf6fb3c940f378d713 -SHA1 (patch-ab) = a178643a98eb6967188893c95b81ae5df4fc6c68 -SHA1 (patch-ac) = 401f06b15c3e7b36419b9124ff7de92cb637316a +SHA1 (patch-aa) = eea7602eaed3d065b4ec6002dff524bdcd846e9f +SHA1 (patch-ab) = e76c1a4c1d7f4766b3e72f58f008e0530f85dab0 +SHA1 (patch-ac) = 7f6af88199ec110fe46a0d8de62927b19adf7305 diff --git a/security/portsentry/patches/patch-aa b/security/portsentry/patches/patch-aa index a8c12d38334..0b3d4a2d4d6 100644 --- a/security/portsentry/patches/patch-aa +++ b/security/portsentry/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/02/07 16:20:19 agc Exp $ +$NetBSD: patch-aa,v 1.2 2003/05/01 21:32:46 jmmv Exp $ --- portsentry_config.h 1999/10/26 14:59:29 1.3 +++ portsentry_config.h 2000/02/07 15:08:57 @@ -7,11 +7,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/02/07 16:20:19 agc Exp $ /* These are probably ok. Be sure you change the Makefile if you */ /* change the path */ -#define CONFIG_FILE "/usr/local/psionic/portsentry/portsentry.conf" -+#define CONFIG_FILE "@PREFIX@/etc/portsentry.conf" ++#define CONFIG_FILE "@PKG_SYSCONFDIR@/portsentry.conf" /* The location of Wietse Venema's TCP Wrapper hosts.deny file */ +#if defined(__svr4__) && defined(__sun__) -+#define WRAPPER_HOSTS_DENY "@PREFIX@/etc/hosts.deny" ++#define WRAPPER_HOSTS_DENY "@PKG_SYSCONFDIR@/hosts.deny" +#else #define WRAPPER_HOSTS_DENY "/etc/hosts.deny" +#endif diff --git a/security/portsentry/patches/patch-ab b/security/portsentry/patches/patch-ab index 143c1cd63e6..fb5ca1b5a8a 100644 --- a/security/portsentry/patches/patch-ab +++ b/security/portsentry/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/02/07 16:20:19 agc Exp $ +$NetBSD: patch-ab,v 1.2 2003/05/01 21:32:46 jmmv Exp $ --- portsentry.conf 1999/11/09 02:45:42 1.13 +++ portsentry.conf 2000/02/07 15:11:33 @@ -7,13 +7,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/02/07 16:20:19 agc Exp $ # # Hosts to ignore -IGNORE_FILE="/usr/local/psionic/portsentry/portsentry.ignore" -+IGNORE_FILE="@PREFIX@/etc/portsentry.ignore" ++IGNORE_FILE="@PKG_SYSCONFDIR@/portsentry.ignore" # Hosts that have been denied (running history) -HISTORY_FILE="/usr/local/psionic/portsentry/portsentry.history" -+HISTORY_FILE="@PREFIX@/etc/portsentry.history" ++HISTORY_FILE="@PKG_SYSCONFDIR@/portsentry.history" # Hosts that have been denied this session only (temporary until next restart) -BLOCKED_FILE="/usr/local/psionic/portsentry/portsentry.blocked" -+BLOCKED_FILE="@PREFIX@/etc/portsentry.blocked" ++BLOCKED_FILE="@PKG_SYSCONFDIR@/portsentry.blocked" ################### # Response Options# diff --git a/security/portsentry/patches/patch-ac b/security/portsentry/patches/patch-ac index 008708a9d48..cefb06b0bac 100644 --- a/security/portsentry/patches/patch-ac +++ b/security/portsentry/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/02/07 16:20:19 agc Exp $ +$NetBSD: patch-ac,v 1.2 2003/05/01 21:32:46 jmmv Exp $ --- Makefile 2000/02/07 15:16:12 1.1 +++ Makefile 2000/02/07 15:17:47 @@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/02/07 16:20:19 agc Exp $ -INSTALLDIR = /usr/local/psionic -CHILDDIR=/portsentry +INSTALLDIR = ${PREFIX} -+CHILDDIR=/etc ++CHILDDIR=/share/examples/portsentry all: @echo "Usage: make " -- cgit v1.2.3