From d0440798017d99f86f2b525c979fb5574e3e0def Mon Sep 17 00:00:00 2001 From: nra Date: Tue, 17 Jul 2001 15:50:31 +0000 Subject: Fix patch-ab to not have hardcoded /usr/pkg. --- security/logcheck/Makefile | 7 ++++- security/logcheck/distinfo | 4 +-- security/logcheck/patches/patch-ab | 59 ++------------------------------------ 3 files changed, 11 insertions(+), 59 deletions(-) (limited to 'security/logcheck') diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile index b74c79c9633..d80ac131bea 100644 --- a/security/logcheck/Makefile +++ b/security/logcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/07/17 15:16:17 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/07/17 15:50:31 nra Exp $ DISTNAME= logcheck-1.1.1 CATEGORIES= security @@ -12,5 +12,10 @@ post-patch: @${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.old @${SED} -e "s+/usr/local+${PREFIX}+g" \ < ${WRKSRC}/Makefile.old > ${WRKSRC}/Makefile + @${MV} ${WRKSRC}/systems/freebsd/logcheck.sh \ + ${WRKSRC}/systems/freebsd/logcheck.sh.old + @${SED} -e "s+/usr/local+${PREFIX}+g" \ + ${WRKSRC}/systems/freebsd/logcheck.sh.old > \ + ${WRKSRC}/systems/freebsd/logcheck.sh .include "../../mk/bsd.pkg.mk" diff --git a/security/logcheck/distinfo b/security/logcheck/distinfo index d5998d9621e..8ca1b23bbb9 100644 --- a/security/logcheck/distinfo +++ b/security/logcheck/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/07/17 15:00:48 nra Exp $ +$NetBSD: distinfo,v 1.2 2001/07/17 15:50:31 nra Exp $ SHA1 (logcheck-1.1.1.tar.gz) = 18f89f0dacfe9ff31076c006d58e1bcfedaa7f22 Size (logcheck-1.1.1.tar.gz) = 30267 bytes SHA1 (patch-aa) = a0d57a4554d670add82c8df7df7ec84515497b3d -SHA1 (patch-ab) = 8dd4c3a6c7bba07792c5fc6ac5caaf5e7cde7242 +SHA1 (patch-ab) = 8a53665ebb13bb451cffcc520b1917bda772fd35 diff --git a/security/logcheck/patches/patch-ab b/security/logcheck/patches/patch-ab index 54cc08844bf..c0048540a05 100644 --- a/security/logcheck/patches/patch-ab +++ b/security/logcheck/patches/patch-ab @@ -1,25 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/07/17 15:00:48 nra Exp $ +$NetBSD: patch-ab,v 1.2 2001/07/17 15:50:32 nra Exp $ ---- systems/freebsd/logcheck.sh.orig Sun Oct 31 16:07:29 1999 -+++ systems/freebsd/logcheck.sh Thu Jun 21 08:42:39 2001 -@@ -31,7 +31,7 @@ - - # CONFIGURATION SECTION - --PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/ucb:/usr/local/bin -+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/pkg/sbin:/usr/pkg/bin - - # Logcheck is pre-configured to work on most BSD like systems, however it - # is a rather dumb program and may need some help to work on other -@@ -44,7 +44,7 @@ - # Full path to logtail program. - # This program is required to run this script and comes with the package. - --LOGTAIL=/usr/local/bin/logtail -+LOGTAIL=/usr/pkg/bin/logtail - - # Full path to SECURED (non public writable) /tmp directory. - # Prevents Race condition and potential symlink problems. I highly +--- systems/freebsd/logcheck.sh.orig Tue Jul 17 10:35:58 2001 ++++ systems/freebsd/logcheck.sh Tue Jul 17 10:35:35 2001 @@ -52,7 +52,7 @@ # You would also be well advised to make sure all your system/cron scripts # use this directory for their "scratch" area. @@ -29,41 +11,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/07/17 15:00:48 nra Exp $ # The 'grep' command. This command MUST support the # '-i' '-v' and '-f' flags!! The GNU grep does this by default (that's -@@ -89,7 +89,7 @@ - # look for generic ISS probes (who the hell else looks for - # "WIZ" besides ISS?), and obvious sendmail attacks/probes. - --HACKING_FILE=/usr/local/etc/logcheck.hacking -+HACKING_FILE=/usr/pkg/etc/logcheck.hacking - - # File of security violation patterns to specifically look for. - # This file should contain keywords of information administrators should -@@ -98,7 +98,7 @@ - # some items, but these will be caught by the next check. Move suspicious - # items into this file to have them reported regularly. - --VIOLATIONS_FILE=/usr/local/etc/logcheck.violations -+VIOLATIONS_FILE=/usr/pkg/etc/logcheck.violations - - # File that contains more complete sentences that have keywords from - # the violations file. These keywords are normal and are not cause for -@@ -115,14 +115,14 @@ - # - # Again, be careful what you put in here and DO NOT LEAVE IT EMPTY! - --VIOLATIONS_IGNORE_FILE=/usr/local/etc/logcheck.violations.ignore -+VIOLATIONS_IGNORE_FILE=/usr/pkg/etc/logcheck.violations.ignore - - # This is the name of a file that contains patterns that we should - # ignore if found in a log file. If you have repeated false alarms - # or want specific errors ignored, you should put them in here. - # Once again, be as specific as possible, and go easy on the wildcards - --IGNORE_FILE=/usr/local/etc/logcheck.ignore -+IGNORE_FILE=/usr/pkg/etc/logcheck.ignore - - # The files are reported in the order of hacking, security - # violations, and unusual system events. Notice that this @@ -170,9 +170,10 @@ #$LOGTAIL /var/log/secure >> $TMPDIR/check.$$ #$LOGTAIL /var/log/maillog >> $TMPDIR/check.$$ -- cgit v1.2.3