Attachment #105990 for bug #146537

View | Details | Raw Unified | Return to bug 146537
Collapse All | Expand All

Lines 6-13 Link Here

(-)security/logcheck/Makefile (-2 / +1 lines)
6	#	6	#
7	PORTNAME= logcheck	7	PORTNAME= logcheck
8	PORTVERSION= 1.2.69	8	PORTVERSION= 1.3.8
9	PORTREVISION= 2
10	CATEGORIES= security	9	CATEGORIES= security
11	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}	10	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
12	DISTNAME= ${PORTNAME}_${PORTVERSION}	11	DISTNAME= ${PORTNAME}_${PORTVERSION}

Lines 1-3 Link Here

(-)security/logcheck/distinfo (-3 / +3 lines)
1	MD5 (logcheck_1.2.69.tar.gz) = 7d1671e762d3b99fb1832e0c01edf9fe	1	MD5 (logcheck_1.3.8.tar.gz) = 86ea9f35183f28f95deb0aba509efb61
2	SHA256 (logcheck_1.2.69.tar.gz) = c1c8438f098d09554a857c68db09f4076b7a868818fb9e5d158a802127176ecf	2	SHA256 (logcheck_1.3.8.tar.gz) = c263daff2250b7b72cac711ae70a0e7168091967bcde41114a182fcdd88fdce7
3	SIZE (logcheck_1.2.69.tar.gz) = 145023	3	SIZE (logcheck_1.3.8.tar.gz) = 155738

Lines 1-6 Link Here

(-)security/logcheck/files/extra-patch-etc__logcheck.conf.in (-3 / +4 lines)
1	--- ./etc/logcheck.conf.orig 2006-10-29 02:55:02.000000000 -0500	1	--- etc/logcheck.conf.orig 2010-04-15 01:15:34.000000000 +0900
2	+++ ./etc/logcheck.conf 2008-09-06 19:11:28.000000000 -0400	2	+++ etc/logcheck.conf 2010-05-12 14:22:13.000000000 +0900
3	@@ -47,12 +47,7 @@	3	@@ -53,13 +53,7 @@
4	# Controls the base directory for rules file location	4	# Controls the base directory for rules file location
5	# This must be an absolute path	5	# This must be an absolute path
Lines 8-13 Link Here
8	-	8	-
9	-# Controls if syslog-summary is run over each section.	9	-# Controls if syslog-summary is run over each section.
10	-# Alternatively, set to "1" to enable extra summary.	10	-# Alternatively, set to "1" to enable extra summary.
		11	-# HINT: syslog-summary needs to be installed.
11	-	12	-
12	-#SYSLOGSUMMARY=0	13	-#SYSLOGSUMMARY=0
13	+#RULEDIR="%%ETCDIR%%"	14	+#RULEDIR="%%ETCDIR%%"




--- src/logcheck.orig	2010-04-15 01:15:34.000000000 +0900
+++ src/logcheck	2010-05-12 14:52:32.000000000 +0900
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!%%PREFIX%%/bin/bash
 #
 # Copyright (C) 2004-2010 Debian Logcheck Team
 #                         <logcheck-devel@alioth.lists.debian.org>
@@ -24,17 +24,10 @@
 if [ `id -u` = 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 -m logcheck -c \"%%PREFIX%%/bin/bash %%PREFIX%%/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

-     ! -f /usr/bin/lockfile-remove -o \
-     ! -f /usr/bin/lockfile-touch ]; then
-    echo "fatal: lockfile-progs is a prerequisite for logcheck, and was not found."
+    # su -s %%PREFIX%%/bin/bash -c "$0 $*" logcheck
     exit 1
 fi
@@ -69,12 +62,12 @@
 ADDTAG="no"
 # Set the default paths

 CAT="/bin/cat"
 SYSLOG_SUMMARY="/usr/bin/syslog-summary"
@@ -89,20 +82,15 @@
 SORTUNIQ=0
 SUPPORT_CRACKING_IGNORE=0
 SYSLOGSUMMARY=0

-    if [ -n "$LOCK" ]; then
-        debug "cleanup: Killing lockfile-touch - $LOCK"
-	kill "$LOCK" && unset LOCK
-    fi
-
-    if [ -f "$LOCKFILE.lock" ]; then
-        debug "cleanup: Removing lockfile: $LOCKFILE.lock"
-	lockfile-remove "$LOCKFILE"
+    if [ -f "$LOCKFILE" ]; then
+        debug "cleanup: Removing lockfile: $LOCKFILE"
+	rm -f "$LOCKFILE"
     fi
     if [ -d "$TMPDIR" ]; then
@@ -144,14 +132,9 @@
         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"
     else
-        if [ -n "$LOCK" ]; then
-	    debug "error: Killing lockfile-touch - $LOCK"
-	    kill "$LOCK" && unset LOCK
-	fi
-
-       if [ -f "$LOCKFILE.lock" ]; then
-           debug "error: Removing lockfile: $LOCKFILE.lock"
-           lockfile-remove "$LOCKFILE"
+       if [ -f "$LOCKFILE" ]; then
+           debug "error: Removing lockfile: $LOCKFILE"
+           rm -f "$LOCKFILE"
        fi
 	
     fi
@@ -170,7 +153,7 @@
 ${TMPDIR:+Check temporary directory: $TMPDIR
 }
 Also verify that the logcheck user can read all files referenced in

 $(export)
 EOF
@@ -215,8 +198,7 @@
 	    mkdir "$cleaned" \
 # Add an identification line at the beginning of the sent mail
 setintro() {
-    if [ -f /etc/logcheck/header.txt -a -r /etc/logcheck/header.txt ] ; then
-       $CAT /etc/logcheck/header.txt >> $TMPDIR/report \
+    if [ -f %%ETCDIR%%/header.txt -a -r %%ETCDIR%%/header.txt ] ; then
+       $CAT %%ETCDIR%%/header.txt >> $TMPDIR/report \
            || error "Could not append header to $TMPDIR/report."
     fi
 }
@@ -194,8 +177,8 @@

 # Add a footer to the report.
 setfooter() {
-    if [ -f /etc/logcheck/footer.txt -a -r /etc/logcheck/footer.txt ] ; then
-       $CAT /etc/logcheck/footer.txt >> $TMPDIR/report \
+    if [ -f %%ETCDIR%%/footer.txt -a -r %%ETCDIR%%/footer.txt ] ; then
+       $CAT %%ETCDIR%%/footer.txt >> $TMPDIR/report \
            || error "Could not append footer to $TMPDIR/report."
     fi
 }
@@ -212,8 +195,7 @@
 	    mkdir $cleaned \
 	        || error "Could not make dir $cleaned for cleaned rulefiles."
 	fi
-	for rulefile in $(run-parts --list "$dir"); do
-	    rulefile="$(basename "$rulefile")"
+	for rulefile in $(ls -1R $dir); do
 	    if [ -f "${dir}/${rulefile}" ]; then
 		debug "cleanrules: ${dir}/${rulefile}"
 		if [ -r "${dir}/${rulefile}" ]; then
@@ -529,9 +511,9 @@
 # Hostname either fully qualified or not.
 if [ "$FQDN" -eq 1 ]; then
-        HOSTNAME="$(hostname --fqdn 2>/dev/null)"
+        HOSTNAME="$(hostname -f 2>/dev/null)"
 else
-        HOSTNAME="$(hostname --short 2>/dev/null)"
+        HOSTNAME="$(hostname -s 2>/dev/null)"
 fi
 		
 # Now check for the other options
@@ -610,30 +592,30 @@
 trap 'cleanup' 0
-debug "Trying to get lockfile: $LOCKFILE.lock"
+debug "Trying to get lockfile: $LOCKFILE"
 if [ ! -d "$LOCKDIR" ]; then
 	mkdir -m 0755 "$LOCKDIR"
 fi
-lockfile-create --retry 1 "$LOCKFILE" > /dev/null 2>&1
+lockfile -r 1 "$LOCKFILE" > /dev/null 2>&1
 if [ $? -eq 1 ]; then
     trap 0
-    if [ -e "${LOCKFILE}.lock" ]; then
+    if [ -e "${LOCKFILE}" ]; then
         error "Another logcheck process is still running" "noclean"
     else
-    error "Failed to get lockfile: $LOCKFILE.lock" "noclean"
-else
-    debug "Running lockfile-touch $LOCKFILE.lock"
-    lockfile-touch $LOCKFILE &
-    LOCK="$!"
+    error "Failed to get lockfile: $LOCKFILE" "noclean"
 fi
 else
-    debug "Running lockfile-touch $LOCKFILE.lock"
+    debug "Running lockfile-touch $LOCKFILE"
     lockfile-touch "$LOCKFILE" &
     LOCK="$!"
 fi

 # Create the secure temporary directory or exit
-TMPDIR="$(mktemp -d -p "${TMP:-/tmp}" logcheck.XXXXXX)" \
-    || TMPDIR="$(mktemp -d -p /var/tmp logcheck.XXXXXX)" \
+TMPDIR="$(mktemp -d /tmp/logcheck.XXXXXX)" \
+    || TMPDIR="$(mktemp -d /var/tmp/logcheck.XXXXXX)" \
     || error "Could not create temporary directory"
 # Now clean the rulefiles in the directories

Lines 1-11 Link Here

(-)security/logcheck/pkg-plist (-36 / +25 lines)
1	%%ETCDIR%%/cracking.d/logcheck	1	%%ETCDIR%%/cracking.d/kernel
		2	%%ETCDIR%%/cracking.d/rlogind
		3	%%ETCDIR%%/cracking.d/rsh
2	%%ETCDIR%%/cracking.d/smartd	4	%%ETCDIR%%/cracking.d/smartd
		5	%%ETCDIR%%/cracking.d/tftpd
		6	%%ETCDIR%%/cracking.d/uucico
3	%%ETCDIR%%/ignore.d.paranoid/bind	7	%%ETCDIR%%/ignore.d.paranoid/bind
4	%%ETCDIR%%/ignore.d.paranoid/cron	8	%%ETCDIR%%/ignore.d.paranoid/cron
5	%%ETCDIR%%/ignore.d.paranoid/incron	9	%%ETCDIR%%/ignore.d.paranoid/incron
6	%%ETCDIR%%/ignore.d.paranoid/logcheck	10	%%ETCDIR%%/ignore.d.paranoid/logcheck
7	%%ETCDIR%%/ignore.d.paranoid/postfix	11	%%ETCDIR%%/ignore.d.paranoid/postfix
8	%%ETCDIR%%/ignore.d.paranoid/ppp	12	%%ETCDIR%%/ignore.d.paranoid/ppp
		13	%%ETCDIR%%/ignore.d.paranoid/pureftp
9	%%ETCDIR%%/ignore.d.paranoid/qpopper	14	%%ETCDIR%%/ignore.d.paranoid/qpopper
10	%%ETCDIR%%/ignore.d.paranoid/squid	15	%%ETCDIR%%/ignore.d.paranoid/squid
11	%%ETCDIR%%/ignore.d.paranoid/ssh	16	%%ETCDIR%%/ignore.d.paranoid/ssh
Lines 13-23 Link Here
13	%%ETCDIR%%/ignore.d.paranoid/sysklogd	18	%%ETCDIR%%/ignore.d.paranoid/sysklogd
14	%%ETCDIR%%/ignore.d.paranoid/telnetd	19	%%ETCDIR%%/ignore.d.paranoid/telnetd
15	%%ETCDIR%%/ignore.d.paranoid/tripwire	20	%%ETCDIR%%/ignore.d.paranoid/tripwire
		21	%%ETCDIR%%/ignore.d.paranoid/usb
16	%%ETCDIR%%/ignore.d.server/acpid	22	%%ETCDIR%%/ignore.d.server/acpid
17	%%ETCDIR%%/ignore.d.server/amandad	23	%%ETCDIR%%/ignore.d.server/amandad
18	%%ETCDIR%%/ignore.d.server/anacron	24	%%ETCDIR%%/ignore.d.server/anacron
19	%%ETCDIR%%/ignore.d.server/anon-proxy	25	%%ETCDIR%%/ignore.d.server/anon-proxy
20	%%ETCDIR%%/ignore.d.server/apache	26	%%ETCDIR%%/ignore.d.server/apache
		27	%%ETCDIR%%/ignore.d.server/apcupsd
21	%%ETCDIR%%/ignore.d.server/arpwatch	28	%%ETCDIR%%/ignore.d.server/arpwatch
22	%%ETCDIR%%/ignore.d.server/automount	29	%%ETCDIR%%/ignore.d.server/automount
23	%%ETCDIR%%/ignore.d.server/bind	30	%%ETCDIR%%/ignore.d.server/bind
Lines 44-49 Link Here
44	%%ETCDIR%%/ignore.d.server/dspam	51	%%ETCDIR%%/ignore.d.server/dspam
45	%%ETCDIR%%/ignore.d.server/epmd	52	%%ETCDIR%%/ignore.d.server/epmd
46	%%ETCDIR%%/ignore.d.server/exim4	53	%%ETCDIR%%/ignore.d.server/exim4
		54	%%ETCDIR%%/ignore.d.server/fcron
47	%%ETCDIR%%/ignore.d.server/ftpd	55	%%ETCDIR%%/ignore.d.server/ftpd
48	%%ETCDIR%%/ignore.d.server/gnu-imap4d	56	%%ETCDIR%%/ignore.d.server/gnu-imap4d
49	%%ETCDIR%%/ignore.d.server/gps	57	%%ETCDIR%%/ignore.d.server/gps
Lines 62-83 Link Here
62	%%ETCDIR%%/ignore.d.server/isdnutils	70	%%ETCDIR%%/ignore.d.server/isdnutils
63	%%ETCDIR%%/ignore.d.server/jabberd	71	%%ETCDIR%%/ignore.d.server/jabberd
64	%%ETCDIR%%/ignore.d.server/kernel	72	%%ETCDIR%%/ignore.d.server/kernel
		73	%%ETCDIR%%/ignore.d.server/klogind
65	%%ETCDIR%%/ignore.d.server/krb5-kdc	74	%%ETCDIR%%/ignore.d.server/krb5-kdc
66	%%ETCDIR%%/ignore.d.server/libpam-mount	75	%%ETCDIR%%/ignore.d.server/libpam-mount
67	%%ETCDIR%%/ignore.d.server/logcheck	76	%%ETCDIR%%/ignore.d.server/logcheck
68	%%ETCDIR%%/ignore.d.server/lpr	77	%%ETCDIR%%/ignore.d.server/login
69	%%ETCDIR%%/ignore.d.server/maradns	78	%%ETCDIR%%/ignore.d.server/maradns
70	%%ETCDIR%%/ignore.d.server/mldonkey-server	79	%%ETCDIR%%/ignore.d.server/mldonkey-server
71	%%ETCDIR%%/ignore.d.server/mon	80	%%ETCDIR%%/ignore.d.server/mon
		81	%%ETCDIR%%/ignore.d.server/mountd
72	%%ETCDIR%%/ignore.d.server/nagios	82	%%ETCDIR%%/ignore.d.server/nagios
73	%%ETCDIR%%/ignore.d.server/netconsole	83	%%ETCDIR%%/ignore.d.server/netconsole
74	%%ETCDIR%%/ignore.d.server/nfs	84	%%ETCDIR%%/ignore.d.server/nfs
75	%%ETCDIR%%/ignore.d.server/nntpcache	85	%%ETCDIR%%/ignore.d.server/nntpcache
76	%%ETCDIR%%/ignore.d.server/nscd	86	%%ETCDIR%%/ignore.d.server/nscd
77	%%ETCDIR%%/ignore.d.server/ntp	87	%%ETCDIR%%/ignore.d.server/nslcd
78	%%ETCDIR%%/ignore.d.server/oidentd
79	%%ETCDIR%%/ignore.d.server/openvpn	88	%%ETCDIR%%/ignore.d.server/openvpn
80	%%ETCDIR%%/ignore.d.server/otrs	89	%%ETCDIR%%/ignore.d.server/otrs
		90	%%ETCDIR%%/ignore.d.server/passwd
81	%%ETCDIR%%/ignore.d.server/pdns	91	%%ETCDIR%%/ignore.d.server/pdns
82	%%ETCDIR%%/ignore.d.server/perdition	92	%%ETCDIR%%/ignore.d.server/perdition
83	%%ETCDIR%%/ignore.d.server/policyd	93	%%ETCDIR%%/ignore.d.server/policyd
Lines 90-95 Link Here
90	%%ETCDIR%%/ignore.d.server/proftpd	100	%%ETCDIR%%/ignore.d.server/proftpd
91	%%ETCDIR%%/ignore.d.server/puppetd	101	%%ETCDIR%%/ignore.d.server/puppetd
92	%%ETCDIR%%/ignore.d.server/pure-ftpd	102	%%ETCDIR%%/ignore.d.server/pure-ftpd
		103	%%ETCDIR%%/ignore.d.server/pureftp
93	%%ETCDIR%%/ignore.d.server/qpopper	104	%%ETCDIR%%/ignore.d.server/qpopper
94	%%ETCDIR%%/ignore.d.server/rbldnsd	105	%%ETCDIR%%/ignore.d.server/rbldnsd
95	%%ETCDIR%%/ignore.d.server/rpc_statd	106	%%ETCDIR%%/ignore.d.server/rpc_statd
Lines 113-118 Link Here
113	%%ETCDIR%%/ignore.d.server/squid	124	%%ETCDIR%%/ignore.d.server/squid
114	%%ETCDIR%%/ignore.d.server/ssh	125	%%ETCDIR%%/ignore.d.server/ssh
115	%%ETCDIR%%/ignore.d.server/stunnel	126	%%ETCDIR%%/ignore.d.server/stunnel
		127	%%ETCDIR%%/ignore.d.server/su
		128	%%ETCDIR%%/ignore.d.server/sudo
116	%%ETCDIR%%/ignore.d.server/sympa	129	%%ETCDIR%%/ignore.d.server/sympa
117	%%ETCDIR%%/ignore.d.server/syslogd	130	%%ETCDIR%%/ignore.d.server/syslogd
118	%%ETCDIR%%/ignore.d.server/teapop	131	%%ETCDIR%%/ignore.d.server/teapop
Lines 130-138 Link Here
130	%%ETCDIR%%/ignore.d.server/xinetd	143	%%ETCDIR%%/ignore.d.server/xinetd
131	%%ETCDIR%%/ignore.d.workstation/automount	144	%%ETCDIR%%/ignore.d.workstation/automount
132	%%ETCDIR%%/ignore.d.workstation/bind	145	%%ETCDIR%%/ignore.d.workstation/bind
133	%%ETCDIR%%/ignore.d.workstation/bluez-utils
134	%%ETCDIR%%/ignore.d.workstation/bluetooth-alsa	146	%%ETCDIR%%/ignore.d.workstation/bluetooth-alsa
		147	%%ETCDIR%%/ignore.d.workstation/bluez-utils
135	%%ETCDIR%%/ignore.d.workstation/bonobo	148	%%ETCDIR%%/ignore.d.workstation/bonobo
		149	%%ETCDIR%%/ignore.d.workstation/dhcpcd
136	%%ETCDIR%%/ignore.d.workstation/francine	150	%%ETCDIR%%/ignore.d.workstation/francine
137	%%ETCDIR%%/ignore.d.workstation/gconf	151	%%ETCDIR%%/ignore.d.workstation/gconf
138	%%ETCDIR%%/ignore.d.workstation/gdm	152	%%ETCDIR%%/ignore.d.workstation/gdm
Lines 142-148 Link Here
142	%%ETCDIR%%/ignore.d.workstation/ippl	156	%%ETCDIR%%/ignore.d.workstation/ippl
143	%%ETCDIR%%/ignore.d.workstation/kdm	157	%%ETCDIR%%/ignore.d.workstation/kdm
144	%%ETCDIR%%/ignore.d.workstation/kernel	158	%%ETCDIR%%/ignore.d.workstation/kernel
		159	%%ETCDIR%%/ignore.d.workstation/libpam-gnome-keyring
145	%%ETCDIR%%/ignore.d.workstation/logcheck	160	%%ETCDIR%%/ignore.d.workstation/logcheck
		161	%%ETCDIR%%/ignore.d.workstation/login
146	%%ETCDIR%%/ignore.d.workstation/net-acct	162	%%ETCDIR%%/ignore.d.workstation/net-acct
147	%%ETCDIR%%/ignore.d.workstation/nntpcache	163	%%ETCDIR%%/ignore.d.workstation/nntpcache
148	%%ETCDIR%%/ignore.d.workstation/polypaudio	164	%%ETCDIR%%/ignore.d.workstation/polypaudio
Lines 155-200 Link Here
155	%%ETCDIR%%/ignore.d.workstation/udev	171	%%ETCDIR%%/ignore.d.workstation/udev
156	%%ETCDIR%%/ignore.d.workstation/wdm	172	%%ETCDIR%%/ignore.d.workstation/wdm
157	%%ETCDIR%%/ignore.d.workstation/winbind	173	%%ETCDIR%%/ignore.d.workstation/winbind
		174	%%ETCDIR%%/ignore.d.workstation/wpasupplicant
158	%%ETCDIR%%/ignore.d.workstation/xdm	175	%%ETCDIR%%/ignore.d.workstation/xdm
159	%%ETCDIR%%/ignore.d.workstation/xlockmore	176	%%ETCDIR%%/ignore.d.workstation/xlockmore
160	%%ETCDIR%%/logcheck.conf.sample	177	%%ETCDIR%%/ignore.d.workstation/xscreensaver
161	%%ETCDIR%%/logcheck.logfiles.sample
162	%%ETCDIR%%/violations.d/kernel	178	%%ETCDIR%%/violations.d/kernel
163	%%ETCDIR%%/violations.d/logcheck	179	%%ETCDIR%%/violations.d/logcheck
164	%%ETCDIR%%/violations.d/smartd	180	%%ETCDIR%%/violations.d/smartd
165	%%ETCDIR%%/violations.d/su	181	%%ETCDIR%%/violations.d/su
166	%%ETCDIR%%/violations.d/sudo	182	%%ETCDIR%%/violations.d/sudo
167	%%ETCDIR%%/violations.ignore.d/logcheck-bind
168	%%ETCDIR%%/violations.ignore.d/logcheck-bluez-utils
169	%%ETCDIR%%/violations.ignore.d/logcheck-courier
170	%%ETCDIR%%/violations.ignore.d/logcheck-cron-apt
171	%%ETCDIR%%/violations.ignore.d/logcheck-cyrus
172	%%ETCDIR%%/violations.ignore.d/logcheck-dcc
173	%%ETCDIR%%/violations.ignore.d/logcheck-dovecot
174	%%ETCDIR%%/violations.ignore.d/logcheck-hylafax
175	%%ETCDIR%%/violations.ignore.d/logcheck-innd
176	%%ETCDIR%%/violations.ignore.d/logcheck-kernel
177	%%ETCDIR%%/violations.ignore.d/logcheck-login
178	%%ETCDIR%%/violations.ignore.d/logcheck-mon
179	%%ETCDIR%%/violations.ignore.d/logcheck-nagios
180	%%ETCDIR%%/violations.ignore.d/logcheck-openvpn
181	%%ETCDIR%%/violations.ignore.d/logcheck-passwd
182	%%ETCDIR%%/violations.ignore.d/logcheck-pdns
183	%%ETCDIR%%/violations.ignore.d/logcheck-postfix
184	%%ETCDIR%%/violations.ignore.d/logcheck-proftpd
185	%%ETCDIR%%/violations.ignore.d/logcheck-pureftp
186	%%ETCDIR%%/violations.ignore.d/logcheck-samba
187	%%ETCDIR%%/violations.ignore.d/logcheck-sasl2-bin
188	%%ETCDIR%%/violations.ignore.d/logcheck-saslauthd
189	%%ETCDIR%%/violations.ignore.d/logcheck-sendmail_tmp
190	%%ETCDIR%%/violations.ignore.d/logcheck-smartd
191	%%ETCDIR%%/violations.ignore.d/logcheck-spamd
192	%%ETCDIR%%/violations.ignore.d/logcheck-squid
193	%%ETCDIR%%/violations.ignore.d/logcheck-ssh
194	%%ETCDIR%%/violations.ignore.d/logcheck-su	183	%%ETCDIR%%/violations.ignore.d/logcheck-su
195	%%ETCDIR%%/violations.ignore.d/logcheck-sudo	184	%%ETCDIR%%/violations.ignore.d/logcheck-sudo
196	%%ETCDIR%%/violations.ignore.d/logcheck-usb	185	%%ETCDIR%%/logcheck.conf.sample
197	%%ETCDIR%%/violations.ignore.d/logcheck-winbind	186	%%ETCDIR%%/logcheck.logfiles.sample
198	%%DATADIR%%/detectrotate/10-savelog.dtr	187	%%DATADIR%%/detectrotate/10-savelog.dtr
199	%%DATADIR%%/detectrotate/20-logrotate.dtr	188	%%DATADIR%%/detectrotate/20-logrotate.dtr
200	%%DATADIR%%/detectrotate/30-logrotate-dateext.dtr	189	%%DATADIR%%/detectrotate/30-logrotate-dateext.dtr

Return to bug 146537

Lines 1-17 Link Here

(-)security/logcheck/files/extra-patch-src__logcheck.in (-73 / +51 lines)
1	--- src/logcheck.orig 2007-01-16 01:13:27.000000000 -0500	1	--- src/logcheck.orig 2010-04-15 01:15:34.000000000 +0900
2	+++ src/logcheck 2009-12-17 19:33:34.000000000 -0500	2	+++ src/logcheck 2010-05-12 14:52:32.000000000 +0900
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#!/bin/bash	4	-#!/bin/bash
5	+#!/usr/local/bin/bash	5	+#!%%PREFIX%%/bin/bash
6	#	6	#
7	# Copyright (C) 2004-2006 Debian Logcheck Team	7	# Copyright (C) 2004-2010 Debian Logcheck Team
8	# <logcheck-devel@alioth.lists.debian.org>	8	# <logcheck-devel@alioth.lists.debian.org>
9	@@ -26,17 +26,10 @@	9	@@ -24,17 +24,10 @@
10	if [ $UID == 0 ]; then	10	if [ `id -u` = 0 ]; then
11	echo "logcheck should not be run as root. Use su to invoke logcheck:"	11	echo "logcheck should not be run as root. Use su to invoke logcheck:"
12	- echo "su -s /bin/bash -c \"/usr/sbin/logcheck${@:+ $@}\" logcheck"	12	- echo "su -s /bin/bash -c \"/usr/sbin/logcheck${@:+ $@}\" logcheck"
13	+ echo "su -m logcheck -c \"/usr/local/bin/bash %%PREFIX%%/sbin/logcheck${@:+ $@}\""	13	+ echo "su -m logcheck -c \"%%PREFIX%%/bin/bash %%PREFIX%%/sbin/logcheck${@:+ $@}\""
14	echo "Or use sudo: sudo -u logcheck logcheck${@:+ $@}."	14	echo "Or use sudo: sudo -u logcheck logcheck${@:+ $@}."
15	# you may want to uncomment that hack to let logcheck invoke itself.	15	# you may want to uncomment that hack to let logcheck invoke itself.
16	- # su -s /bin/bash -c "$0 $*" logcheck	16	- # su -s /bin/bash -c "$0 $*" logcheck
Lines 22-32 Link Here
22	- ! -f /usr/bin/lockfile-remove -o \	22	- ! -f /usr/bin/lockfile-remove -o \
23	- ! -f /usr/bin/lockfile-touch ]; then	23	- ! -f /usr/bin/lockfile-touch ]; then
24	- echo "fatal: lockfile-progs is a prerequisite for logcheck, and was not found."	24	- echo "fatal: lockfile-progs is a prerequisite for logcheck, and was not found."
25	+ # su -s /usr/local/bin/bash -c "$0 $*" logcheck	25	+ # su -s %%PREFIX%%/bin/bash -c "$0 $*" logcheck
26	exit 1	26	exit 1
27	fi	27	fi
28	@@ -68,12 +61,12 @@	28	@@ -69,12 +62,12 @@
29	ADDTAG="no"	29	ADDTAG="no"
30	# Set the default paths	30	# Set the default paths
Lines 45-51 Link Here
45	CAT="/bin/cat"	45	CAT="/bin/cat"
46	SYSLOG_SUMMARY="/usr/bin/syslog-summary"	46	SYSLOG_SUMMARY="/usr/bin/syslog-summary"
47	@@ -87,26 +80,21 @@	47	@@ -89,20 +82,15 @@
48	SORTUNIQ=0	48	SORTUNIQ=0
49	SUPPORT_CRACKING_IGNORE=0	49	SUPPORT_CRACKING_IGNORE=0
50	SYSLOGSUMMARY=0	50	SYSLOGSUMMARY=0
Lines 58-101 Link Here
58	- if [ -n "$LOCK" ]; then	58	- if [ -n "$LOCK" ]; then
59	- debug "cleanup: Killing lockfile-touch - $LOCK"	59	- debug "cleanup: Killing lockfile-touch - $LOCK"
60	- kill $LOCK && unset LOCK	60	- kill "$LOCK" && unset LOCK
61	- fi	61	- fi
62	-	62	-
63	- if [ -f "$LOCKFILE.lock" ]; then	63	- if [ -f "$LOCKFILE.lock" ]; then
64	- debug "cleanup: Removing lockfile: $LOCKFILE.lock"	64	- debug "cleanup: Removing lockfile: $LOCKFILE.lock"
65	- lockfile-remove $LOCKFILE	65	- lockfile-remove "$LOCKFILE"
66	+ if [ -f "$LOCKFILE" ]; then	66	+ if [ -f "$LOCKFILE" ]; then
67	+ debug "cleanup: Removing lockfile: $LOCKFILE"	67	+ debug "cleanup: Removing lockfile: $LOCKFILE"
68	+ rm -f $LOCKFILE	68	+ rm -f "$LOCKFILE"
69	fi	69	fi
70	if [ -d $TMPDIR ]; then	70	if [ -d "$TMPDIR" ]; then
71	# Remove the tmp directory	71	@@ -144,14 +132,9 @@
72	if [ $NOCLEANUP -eq 0 ];then
73	- cd /var/lib/logcheck
74	+ cd /var/db/logcheck
75	debug "cleanup: Removing - $TMPDIR"
76	rm -r $TMPDIR
77	else
78	@@ -142,14 +130,9 @@
79	if [ "$2" = "noclean" ]; then	72	if [ "$2" = "noclean" ]; then
80	debug "error: Not removing lockfile"	73	debug "error: Not removing lockfile"
81	else	74	else
82	- if [ -n "$LOCK" ]; then	75	- if [ -n "$LOCK" ]; then
83	- debug "error: Killing lockfile-touch - $LOCK"	76	- debug "error: Killing lockfile-touch - $LOCK"
84	- kill $LOCK && unset LOCK	77	- kill "$LOCK" && unset LOCK
85	- fi	78	- fi
86	-	79	-
87	- if [ -f "$LOCKFILE.lock" ]; then	80	- if [ -f "$LOCKFILE.lock" ]; then
88	- debug "error: Removing lockfile: $LOCKFILE.lock"	81	- debug "error: Removing lockfile: $LOCKFILE.lock"
89	- lockfile-remove $LOCKFILE	82	- lockfile-remove "$LOCKFILE"
90	+ if [ -f "$LOCKFILE" ]; then	83	+ if [ -f "$LOCKFILE" ]; then
91	+ debug "error: Removing lockfile: $LOCKFILE"	84	+ debug "error: Removing lockfile: $LOCKFILE"
92	+ rm -f $LOCKFILE	85	+ rm -f "$LOCKFILE"
93	fi	86	fi
94		87
95	fi	88	fi
96	@@ -168,7 +151,7 @@	89	@@ -170,7 +153,7 @@
97	${TMPDIR:+Check temporary directory: $TMPDIR	90	${TMPDIR:+Check temporary directory: $TMPDIR
98	}	91	}
99	Also verify that the logcheck user can read all files referenced in	92	Also verify that the logcheck user can read all files referenced in
Lines 104-181 Link Here
104	$(export)	97	$(export)
105	EOF	98	EOF
106	@@ -185,8 +168,8 @@	99	@@ -215,8 +198,7 @@
107		100	mkdir "$cleaned" \
108	# Add an identification line at the beginning of the sent mail
109	setintro() {
110	- if [ -f /etc/logcheck/header.txt -a -r /etc/logcheck/header.txt ] ; then
111	- $CAT /etc/logcheck/header.txt >> $TMPDIR/report \
112	+ if [ -f %%ETCDIR%%/header.txt -a -r %%ETCDIR%%/header.txt ] ; then
113	+ $CAT %%ETCDIR%%/header.txt >> $TMPDIR/report \
114	\|\| error "Could not append header to $TMPDIR/report."
115	fi
116	}
117	@@ -194,8 +177,8 @@
118
119	# Add a footer to the report.
120	setfooter() {
121	- if [ -f /etc/logcheck/footer.txt -a -r /etc/logcheck/footer.txt ] ; then
122	- $CAT /etc/logcheck/footer.txt >> $TMPDIR/report \
123	+ if [ -f %%ETCDIR%%/footer.txt -a -r %%ETCDIR%%/footer.txt ] ; then
124	+ $CAT %%ETCDIR%%/footer.txt >> $TMPDIR/report \
125	\|\| error "Could not append footer to $TMPDIR/report."
126	fi
127	}
128	@@ -212,8 +195,7 @@
129	mkdir $cleaned \
130	\|\| error "Could not make dir $cleaned for cleaned rulefiles."	101	\|\| error "Could not make dir $cleaned for cleaned rulefiles."
131	fi	102	fi
132	- for rulefile in $(run-parts --list $dir); do	103	- for rulefile in $(run-parts --list "$dir"); do
133	- rulefile=$(basename $rulefile)	104	- rulefile="$(basename "$rulefile")"
134	+ for rulefile in $(ls -1R $dir); do	105	+ for rulefile in $(ls -1R $dir); do
135	if [ -f ${dir}/${rulefile} ]; then	106	if [ -f "${dir}/${rulefile}" ]; then
136	debug "cleanrules: ${dir}/${rulefile}"	107	debug "cleanrules: ${dir}/${rulefile}"
137	if [ -r ${dir}/${rulefile} ]; then	108	if [ -r "${dir}/${rulefile}" ]; then
138	@@ -544,9 +526,9 @@	109	@@ -529,9 +511,9 @@
139	# Hostname either fully qualified or not.	110	# Hostname either fully qualified or not.
140	if [ $FQDN -eq 1 ]; then	111	if [ "$FQDN" -eq 1 ]; then
141	- HOSTNAME="$(hostname --fqdn)" > /dev/null 2>&1	112	- HOSTNAME="$(hostname --fqdn 2>/dev/null)"
142	+ HOSTNAME="$(hostname -f)" > /dev/null 2>&1	113	+ HOSTNAME="$(hostname -f 2>/dev/null)"
143	else	114	else
144	- HOSTNAME="$(hostname --short)" > /dev/null 2>&1	115	- HOSTNAME="$(hostname --short 2>/dev/null)"
145	+ HOSTNAME="$(hostname -s)" > /dev/null 2>&1	116	+ HOSTNAME="$(hostname -s 2>/dev/null)"
146	fi	117	fi
147		118
148	# Now check for the other options	119	# Now check for the other options
149	@@ -625,25 +607,21 @@	120	@@ -610,30 +592,30 @@
150	trap 'cleanup' 0	121	trap 'cleanup' 0
151	-debug "Trying to get lockfile: $LOCKFILE.lock"	122	-debug "Trying to get lockfile: $LOCKFILE.lock"
152	+debug "Trying to get lockfile: $LOCKFILE"	123	+debug "Trying to get lockfile: $LOCKFILE"
153	if [ ! -d $LOCKDIR ]; then	124	if [ ! -d "$LOCKDIR" ]; then
154	mkdir -m 0755 $LOCKDIR	125	mkdir -m 0755 "$LOCKDIR"
155	fi	126	fi
156	-lockfile-create --retry 1 $LOCKFILE > /dev/null 2>&1	127	-lockfile-create --retry 1 "$LOCKFILE" > /dev/null 2>&1
157	+lockfile -r 1 $LOCKFILE > /dev/null 2>&1	128	+lockfile -r 1 "$LOCKFILE" > /dev/null 2>&1
158	if [ $? -eq 1 ]; then	129	if [ $? -eq 1 ]; then
159	trap 0	130	trap 0
		131	- if [ -e "${LOCKFILE}.lock" ]; then
		132	+ if [ -e "${LOCKFILE}" ]; then
		133	error "Another logcheck process is still running" "noclean"
		134	else
160	- error "Failed to get lockfile: $LOCKFILE.lock" "noclean"	135	- error "Failed to get lockfile: $LOCKFILE.lock" "noclean"
161	-else
162	- debug "Running lockfile-touch $LOCKFILE.lock"
163	- lockfile-touch $LOCKFILE &
164	- LOCK="$!"
165	+ error "Failed to get lockfile: $LOCKFILE" "noclean"	136	+ error "Failed to get lockfile: $LOCKFILE" "noclean"
166	fi	137	fi
		138	else
		139	- debug "Running lockfile-touch $LOCKFILE.lock"
		140	+ debug "Running lockfile-touch $LOCKFILE"
		141	lockfile-touch "$LOCKFILE" &
		142	LOCK="$!"
		143	fi
		144
167	# Create the secure temporary directory or exit	145	# Create the secure temporary directory or exit
168	-TMPDIR=$(mktemp -d -p ${TMP:-/tmp} logcheck.XXXXXX) \	146	-TMPDIR="$(mktemp -d -p "${TMP:-/tmp}" logcheck.XXXXXX)" \
169	- \|\| TMPDIR=$(mktemp -d -p /var/tmp logcheck.XXXXXX) \	147	- \|\| TMPDIR="$(mktemp -d -p /var/tmp logcheck.XXXXXX)" \
170	+TMPDIR=$(mktemp -d /tmp/logcheck.XXXXXX) \	148	+TMPDIR="$(mktemp -d /tmp/logcheck.XXXXXX)" \
171	+ \|\| TMPDIR=$(mktemp -d /var/tmp/logcheck.XXXXXX) \	149	+ \|\| TMPDIR="$(mktemp -d /var/tmp/logcheck.XXXXXX)" \
172	\|\| error "Could not create temporary directory"	150	\|\| error "Could not create temporary directory"
173	# Now clean the rulefiles in the directories	151	# Now clean the rulefiles in the directories