Chown freshclam.log to correct user. Patch by Jeremy Huddleston <eradicator at gentoo...

Package-Manager: portage-2.1.2.3

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 9b331685164019fa54de820b5c1ad50d91e14b70..4b9b430ec8363c3955471fd503d1a7283f4d8ad9 100644 (file)
--- 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.227 2007/04/13 19:23:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.228 2007/04/13 20:56:34 ticho Exp $
+
+  13 Apr 2007; Andrej Kacian <ticho@gentoo.org> files/clamd.rc:
+  Chown freshclam.log to correct user. Patch by Jeremy Huddleston <eradicator
+  at gentoo.org>.
 
   13 Apr 2007; Jeroen Roovers <jer@gentoo.org> clamav-0.90.2.ebuild:
   Stable for HPPA (bug #174375).

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index df9146e90a377a5f1afecccb5b9754d054539406..b2c85f1224e0f84a052d92d42b724c32202c408d 100644 (file)
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX clamav-0.90-compat.patch 585 RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 SHA1 fedfe373a6a911230c553fd5a095c8acb72b4ce2 SHA256 7a646386f74bc9094bd39d6762b78ef74310678cdef5484650e0aa242cf570e9
 MD5 6c50cdabc6ee6dc40df2b89c075380a5 files/clamav-0.90-compat.patch 585
 RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 files/clamav-0.90-compat.patch 585
@@ -18,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 3476 RMD160 64f487cf526d0472cb4c8bd26ddd1e8efa1c9166 SHA1 cc9e08f58982961d28289a44f09f770cb6b91d95 SHA256 678344f493c7f5c0ab6e5344535baf376c69e84fd8bae693cb2b6dbf5b1ea1b0
-MD5 b24cd44e4171c828631214d3d7e614d2 files/clamd.rc 3476
-RMD160 64f487cf526d0472cb4c8bd26ddd1e8efa1c9166 files/clamd.rc 3476
-SHA256 678344f493c7f5c0ab6e5344535baf376c69e84fd8bae693cb2b6dbf5b1ea1b0 files/clamd.rc 3476
+AUX clamd.rc 3565 RMD160 704da4f51a69f01524ca68ebe379736c9b0597ce SHA1 d087a49aa492e46e059ddde8b70dc7df8e19d020 SHA256 50ca2c25f796bb3554b5aa08f9e1bbe043ced62f58f2295f6cf33403d7c23dd8
+MD5 5f886e0001a0f76405ad7ae2bcad239f files/clamd.rc 3565
+RMD160 704da4f51a69f01524ca68ebe379736c9b0597ce files/clamd.rc 3565
+SHA256 50ca2c25f796bb3554b5aa08f9e1bbe043ced62f58f2295f6cf33403d7c23dd8 files/clamd.rc 3565
 DIST clamav-0.88.7.tar.gz 9510548 RMD160 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 SHA1 7d7833dc454437ed7044b1c734f0a13e4dc1ead2 SHA256 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2
 DIST clamav-0.90.1.tar.gz 11643310 RMD160 1fd343d6510fea337a676e32bb1e4e404da4bd6d SHA1 d51f279fce2d702c3e97b2e08fe3b4b863f0acc6 SHA256 08a0255b4f6bdc4312eea6c118e79ecf684aed10640b45037d9dc5890c7687be
 DIST clamav-0.90.2.tar.gz 12062886 RMD160 22daaecb634ca9914f18e85cf3456b544d6bf399 SHA1 ecc72d212a27eef1aa40e61a0b2705e4e42996ce SHA256 30df6a5d4a591dcd4acd7d4cce54dcfd260280fce6bbc9d19d240967bcdabbfa
@@ -54,10 +57,10 @@ EBUILD clamav-0.90.ebuild 3958 RMD160 acabf30bc728a8edc824d14d7e965b858b324340 S
 MD5 1a6bb4a7e8d417feff74b768aaa216e9 clamav-0.90.ebuild 3958
 RMD160 acabf30bc728a8edc824d14d7e965b858b324340 clamav-0.90.ebuild 3958
 SHA256 ec400f0e7387af9362c5ee2d77cb686a227634f9caf638be381f2094e43b6ace clamav-0.90.ebuild 3958
-MISC ChangeLog 35860 RMD160 a4e06f28814f7cc43bbb0055cea514f659efd13b SHA1 e80518d25da6c31682881621c96ed3ab5f998c41 SHA256 e9c6f0a027edc728385aee720c65debde65dddd1f33b8339b9f53797b364fa89
-MD5 c980ec5f8d7e293e2683653a2f7836f8 ChangeLog 35860
-RMD160 a4e06f28814f7cc43bbb0055cea514f659efd13b ChangeLog 35860
-SHA256 e9c6f0a027edc728385aee720c65debde65dddd1f33b8339b9f53797b364fa89 ChangeLog 35860
+MISC ChangeLog 36023 RMD160 abb479c9dd448362c33c3335f4161c3a231aa696 SHA1 1d5a781e4da480d1f06168acd6551689b1354eff SHA256 4d612f9b89d4ff2b01afc2a28ca6d797699ab537648c9f5deab88c88d58ac1a7
+MD5 55e50658aa4aa1914c25f0de9aa3d8a2 ChangeLog 36023
+RMD160 abb479c9dd448362c33c3335f4161c3a231aa696 ChangeLog 36023
+SHA256 4d612f9b89d4ff2b01afc2a28ca6d797699ab537648c9f5deab88c88d58ac1a7 ChangeLog 36023
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -83,3 +86,10 @@ SHA256 be92b57874b8c81e9831142039d6ee58ab3aaf3feae75d26a4a5d1d821a21757 files/di
 MD5 a51cf8bdb107839a6a251af7ca543e74 files/digest-clamav-0.90.2 247
 RMD160 07dc65c177668ad15f01334d6476c7c8358d60f9 files/digest-clamav-0.90.2 247
 SHA256 e68c7b04a6e584aec2663aec7d1fb258ddf06e21554f0dd71bc9fec76ed12a20 files/digest-clamav-0.90.2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGH+6MQlM6RnzZP+IRAh51AJ0Qc6IMgRXT5kbh+bNWUJrmaYVGSQCfW7hN
+rUS9HzrOQW9EHr4PPFFZ/7A=
+=k+Th
+-----END PGP SIGNATURE-----

diff --git a/app-antivirus/clamav/files/clamd.rc b/app-antivirus/clamav/files/clamd.rc
index 32efa6ae1e9428ae9552a0da90c687386b52182d..265b909d4c8342959aaf83dc4f0f6570ce1f68c2 100644 (file)
--- 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.14 2007/04/10 20:13:39 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.15 2007/04/13 20:56:34 ticho Exp $
 
 opts="logfix"
 
@@ -128,11 +128,12 @@ logfix() {
                # fix freshclam log permissions
                # (might be clobbered by logrotate or something)
                logfile=`awk '$1 == "UpdateLogFile" { print $2 }' /etc/freshclam.conf`
+               local freshclam_user=`awk '$1 == "DatabaseOwner" { print $2 }' /etc/freshclam.conf`
                if [ -n "${logfile}" -a -n "${clamav_user}" ]; then
                        if [ ! -f "${logfile}" ]; then
                                touch ${logfile}
                        fi      
-                       chown ${clamav_user} ${logfile}
+                       chown ${freshclam_user} ${logfile}
                        chmod 640 ${logfile}
                fi
        fi