diff options
| author | Greg Larkin <glarkin@FreeBSD.org> | 2008-09-11 00:30:09 +0000 |
|---|---|---|
| committer | Greg Larkin <glarkin@FreeBSD.org> | 2008-09-11 00:30:09 +0000 |
| commit | 6e60a5693150f9fd17116dbb9c522234577c2c2a (patch) | |
| tree | 5e57af0c81e4a5c472e37b68f3af2e527df207c0 /security/logcheck/files/patch-src__logcheck | |
| parent | 2f6da9c8fa1100c3589265b896993b9e0535ba70 (diff) | |
| download | ports-6e60a5693150f9fd17116dbb9c522234577c2c2a.tar.gz ports-6e60a5693150f9fd17116dbb9c522234577c2c2a.zip | |
Notes
Diffstat (limited to 'security/logcheck/files/patch-src__logcheck')
| -rw-r--r-- | security/logcheck/files/patch-src__logcheck | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/security/logcheck/files/patch-src__logcheck b/security/logcheck/files/patch-src__logcheck index faf0954ce518..8e06c99a8a6f 100644 --- a/security/logcheck/files/patch-src__logcheck +++ b/security/logcheck/files/patch-src__logcheck @@ -1,5 +1,5 @@ --- ./src/logcheck.orig 2007-01-16 01:13:27.000000000 -0500 -+++ ./src/logcheck 2008-09-06 19:11:28.000000000 -0400 ++++ ./src/logcheck 2008-09-09 18:10:02.000000000 -0400 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash @@ -11,7 +11,7 @@ if [ $UID == 0 ]; then echo "logcheck should not be run as root. Use su to invoke logcheck:" - echo "su -s /bin/bash -c \"/usr/sbin/logcheck${@:+ $@}\" logcheck" -+ echo "su logcheck -c \"/usr/local/bin/bash /usr/local/sbin/logcheck${@:+ $@}\"" ++ echo "su -m logcheck -c \"/usr/local/bin/bash /usr/local/sbin/logcheck${@:+ $@}\"" echo "Or use sudo: sudo -u logcheck logcheck${@:+ $@}." # you may want to uncomment that hack to let logcheck invoke itself. - # su -s /bin/bash -c "$0 $*" logcheck @@ -32,19 +32,20 @@ # Set the default paths -RULEDIR="/etc/logcheck" -CONFFILE="/etc/logcheck/logcheck.conf" -+RULEDIR="/usr/local/etc/logcheck" -+CONFFILE="/usr/local/etc/logcheck/logcheck.conf" - STATEDIR="/var/lib/logcheck" +-STATEDIR="/var/lib/logcheck" -LOGFILES_LIST="/etc/logcheck/logcheck.logfiles" -LOGFILE_FALLBACK="/var/log/syslog" -LOGTAIL="/usr/sbin/logtail" ++RULEDIR="/usr/local/etc/logcheck" ++CONFFILE="/usr/local/etc/logcheck/logcheck.conf" ++STATEDIR="/var/db/logcheck" +LOGFILES_LIST="/usr/local/etc/logcheck/logcheck.logfiles" +LOGFILE_FALLBACK="/var/log/messages" +LOGTAIL="/usr/local/sbin/logtail" CAT="/bin/cat" SYSLOG_SUMMARY="/usr/bin/syslog-summary" -@@ -87,20 +80,15 @@ +@@ -87,26 +80,21 @@ SORTUNIQ=0 SUPPORT_CRACKING_IGNORE=0 SYSLOGSUMMARY=0 @@ -69,6 +70,13 @@ fi if [ -d $TMPDIR ]; then + # Remove the tmp directory + if [ $NOCLEANUP -eq 0 ];then +- cd /var/lib/logcheck ++ cd /var/db/logcheck + debug "cleanup: Removing - $TMPDIR" + rm -r $TMPDIR + else @@ -142,14 +130,9 @@ if [ "$2" = "noclean" ]; then debug "error: Not removing lockfile" |