Always fix permissions for clamd and freshclam logs. Bug #170739, by Sergey Borodich <bor at univ.kiev.ua>.

Package-Manager: portage-2.1.2.2

3 files changed, 39 insertions, 22 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 3096922c6e4f..8d1030dca417 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.212 2007/03/11 05:57:37 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.213 2007/03/15 13:25:25 ticho Exp $
+
+  15 Mar 2007; Andrej Kacian <ticho@gentoo.org> files/clamd.rc:
+  Always fix permissions for clamd and freshclam logs. Bug #170739, by Sergey
+  Borodich <bor at univ.kiev.ua>.
 
   11 Mar 2007; Andrej Kacian <ticho@gentoo.org> clamav-0.90.ebuild,
   clamav-0.90.1.ebuild, clamav-0.90.1-r1.ebuild:
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 57cb6ebc17aa..4adc3d76af2f 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -21,10 +21,10 @@ AUX clamd.conf 193 RMD160 abebb5e1607e6819859b51e1a41b583c8266c6df SHA1 5b27737a
 MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
 RMD160 abebb5e1607e6819859b51e1a41b583c8266c6df files/clamd.conf 193
 SHA256 cd867dc66af694282584fa2cfd40a662ac2a7c25d6f2288b9afdc657a07226e3 files/clamd.conf 193
-AUX clamd.rc 2034 RMD160 3fde2e6692d8241e32bbc618ebfdddf1409e69de SHA1 fe7569444d25cfe7ea6591b682de78bec68532cc SHA256 813663d6f4feb5dbcc4dd70e6621bbc5879d53b7c1fecebe5651e9f9ce549f63
-MD5 6ebcd3e06c828a7f84460f0f18bbb519 files/clamd.rc 2034
-RMD160 3fde2e6692d8241e32bbc618ebfdddf1409e69de files/clamd.rc 2034
-SHA256 813663d6f4feb5dbcc4dd70e6621bbc5879d53b7c1fecebe5651e9f9ce549f63 files/clamd.rc 2034
+AUX clamd.rc 2433 RMD160 9fffcaae70e043d8557a7350f3857c2493720768 SHA1 e80fcd77e118ec1241657f3c608edf917b8d3fd8 SHA256 4f5eb3c9b464bb9334148d0d1c4aae13248b977f00fa45399d6bd0aebbd3ebdc
+MD5 b4cbd6b5f9b01402429dd916a71cb848 files/clamd.rc 2433
+RMD160 9fffcaae70e043d8557a7350f3857c2493720768 files/clamd.rc 2433
+SHA256 4f5eb3c9b464bb9334148d0d1c4aae13248b977f00fa45399d6bd0aebbd3ebdc files/clamd.rc 2433
 DIST clamav-0.88.5.tar.gz 8663193 RMD160 b0e24b90f2a085ded89fcd90f3434d6bc1981caf SHA1 eb4c671d14d43b7079f19da9d9ef37357fa24c83 SHA256 8b807fcb64e2c523d7da8002ca1174c4173526ae48a7deecca41db30f51cee8f
 DIST clamav-0.88.6.tar.gz 8929534 RMD160 efa53c600a70a8f808fbf9cde92ebf193b76e574 SHA1 5fe6efa7c7dc9eb157a78e7851392c737d586bb7 SHA256 cc7f90983aa61b3d893c3311e3f832c5faa204467143cff597ad80bf8ad24daa
 DIST clamav-0.88.7.tar.gz 9510548 RMD160 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 SHA1 7d7833dc454437ed7044b1c734f0a13e4dc1ead2 SHA256 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2
@@ -62,10 +62,10 @@ EBUILD clamav-0.90.ebuild 3965 RMD160 f1bde783d0c0acd5a009bb8e8029574236ac8e4d S
 MD5 026099ca2d07424d8d4dd1cea45f613a clamav-0.90.ebuild 3965
 RMD160 f1bde783d0c0acd5a009bb8e8029574236ac8e4d clamav-0.90.ebuild 3965
 SHA256 97a7f2bcef75bfce920a437c48a11a3b5aa970d47f875b84c2ee29cb3767af05 clamav-0.90.ebuild 3965
-MISC ChangeLog 33593 RMD160 1b694a0f1a7f3b7bfe2c439028de2f619c348b72 SHA1 70db8412beafca814a1ef585983dcf37ed363a7d SHA256 78623097406de239f463d0773f2a4e8c6aa15ef9851f60b6734eadf44ee8d18b
-MD5 7ea02054e6a4e94c80080037aa85b000 ChangeLog 33593
-RMD160 1b694a0f1a7f3b7bfe2c439028de2f619c348b72 ChangeLog 33593
-SHA256 78623097406de239f463d0773f2a4e8c6aa15ef9851f60b6734eadf44ee8d18b ChangeLog 33593
+MISC ChangeLog 33770 RMD160 53527dc509ddcdbef4f076b43a3e10fb0c6fc14b SHA1 c5babeffa28aee70dae3c7230db13c52c28ef0ca SHA256 d328908cb32ed06d12c904d13acc77b818dc5e2367533251c45023c265c7542c
+MD5 f8780e36ba483c38f4bf6e794bf453f6 ChangeLog 33770
+RMD160 53527dc509ddcdbef4f076b43a3e10fb0c6fc14b ChangeLog 33770
+SHA256 d328908cb32ed06d12c904d13acc77b818dc5e2367533251c45023c265c7542c ChangeLog 33770
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -97,7 +97,7 @@ SHA256 be92b57874b8c81e9831142039d6ee58ab3aaf3feae75d26a4a5d1d821a21757 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF85pgQlM6RnzZP+IRApRzAKC5Wbk3TV5WtYSeymMTTGUY5zmAoQCfVwKA
-uJxVEuw7ewPW4FLPPgCY4g0=
-=hj3T
+iD8DBQFF+UlTQlM6RnzZP+IRAuwcAKCX7l0pisDKXadoj+2aTlABifaJBQCfZsyd
+wIVGQMVrWcWP1v1VPj/ycZU=
+=aIlv
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/files/clamd.rc b/app-antivirus/clamav/files/clamd.rc
index 493f3ea3cbb8..bed32bc0d49a 100644
--- a/app-antivirus/clamav/files/clamd.rc
+++ b/app-antivirus/clamav/files/clamd.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.10 2007/03/09 15:31:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.11 2007/03/15 13:25:25 ticho Exp $
 
 depend() {
 	use net
@@ -11,6 +11,17 @@ depend() {
 start() {
 	local clamd_socket=`awk '$1 == "LocalSocket" { print $2 }' /etc/clamd.conf`
 	if [ "${START_CLAMD}" = "yes" ]; then
+		# fix clamd log permissions
+		# (might be clobbered by logrotate or something)
+		local logfile=`awk '$1 == "LogFile" { print $2 }' /etc/clamd.conf`
+		local clamav_user=`awk '$1 == "User" { print $2 }' /etc/clamd.conf`
+		if [[ -n "${logfile}" && -n "${clamav_user}" ]]; then
+			if [ ! -f "${logfile}" ]; then
+				touch ${logfile}
+			fi	
+		chown ${clamav_user} ${logfile}
+		fi	
+
 		if [ -S "${clamd_socket:-/tmp/clamd}" ]; then
 			rm -f ${clamd_socket:-/tmp/clamd}
 		fi
@@ -19,8 +30,19 @@ start() {
 			--exec /usr/sbin/clamd
 		eend $? "Failed to start clamd"
 	fi
+
 	if [ "${START_FRESHCLAM}" = "yes" ]; then
 		ebegin "Starting freshclam"
+
+		# fix freshclam log permissions
+		# (might be clobbered by logrotate or something)
+		logfile=`awk '$1 == "UpdateLogFile" { print $2 }' /etc/freshclam.conf`
+		if [[ -n "${logfile}" && -n "${clamav_user}" ]]; then
+			if [ ! -f "${logfile}" ]; then
+				touch ${logfile}
+			fi	
+		chown ${clamav_user} ${logfile}
+		fi	
 		start-stop-daemon --start --quiet \
 			--exec /usr/bin/freshclam -- -d
 		retcode=$?
@@ -36,15 +58,6 @@ start() {
 			rm -f ${MILTER_SOCKET}
 		fi
 
-		local logfile=`awk '$1 == "LogFile" { print $2 }' /etc/clamd.conf`
-		local clamav_user=`awk '$1 == "User" { print $2 }' /etc/clamd.conf`
-		if [[ -n "${logfile}" && -n "${clamav_user}" ]]; then
-			if [ ! -f "${logfile}" ]; then
-				touch ${logfile}
-			fi	
-		chown ${clamav_user} ${logfile}
-		fi	
-
 		ebegin "Starting clamav-milter"
 		start-stop-daemon --start --quiet \
 			--exec /usr/sbin/clamav-milter -- ${MILTER_OPTS} ${MILTER_SOCKET}