Revert initscript to previous version, as it creates problems. Bug #169561.

Package-Manager: portage-2.1.2.1

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 7059363b47845c9067c7f6f17b72643b9e9abdf8..676dde03edd0ec65876bb6f32c980cbc4ffbf1af 100644 (file)
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,9 @@
 # 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.210 2007/03/08 23:49:03 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.211 2007/03/09 15:31:10 ticho Exp $
+
+  09 Mar 2007; Andrej Kacian <ticho@gentoo.org> files/clamd.rc:
+  Revert initscript to previous version, as it creates problems. Bug #169561.
 
   08 Mar 2007; Stephen Bennett <spb@gentoo.org> clamav-0.90.1-r1.ebuild:
   Run eautoreconf in src_unpack, by request of ticho

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 7ef79b36ec6bfb232ebaf142240473ed3eaf6a0d..941901c02038a7178e1b3913a1ad0a687d164a6c 100644 (file)
--- 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 2570 RMD160 9b9faaa639f9618dc7b8dad6dd13b28e32adf21a SHA1 2a447bb8181ae4eade1a8f332af3a4ebcd40ec95 SHA256 57a587a7bf68f85843d84da0aab295f041333a39d7a2089cacd7a3470eb5271a
-MD5 38228c159ccedca19e3a9bc2cb87421b files/clamd.rc 2570
-RMD160 9b9faaa639f9618dc7b8dad6dd13b28e32adf21a files/clamd.rc 2570
-SHA256 57a587a7bf68f85843d84da0aab295f041333a39d7a2089cacd7a3470eb5271a files/clamd.rc 2570
+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
 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 3921 RMD160 633d0a020576b51857e586d54ada4914273a7fa4 S
 MD5 7d9228731f4340580dd1bb09b760be82 clamav-0.90.ebuild 3921
 RMD160 633d0a020576b51857e586d54ada4914273a7fa4 clamav-0.90.ebuild 3921
 SHA256 380d2e3d88ccb398966ce3f4eb2bda300ad0ad875da477efbe8f90e052ca6269 clamav-0.90.ebuild 3921
-MISC ChangeLog 33211 RMD160 38b31724fafd5b71d6121037508b57020aa8198c SHA1 ad6f1ad7d20e52bd10662ebc724b34b82155f771 SHA256 3adb8c1af2396ce76f1cb2a235a8c5949a07649a980ad00b6335eadedca73e94
-MD5 e0762246d1750ba19ada139d0cecc5fe ChangeLog 33211
-RMD160 38b31724fafd5b71d6121037508b57020aa8198c ChangeLog 33211
-SHA256 3adb8c1af2396ce76f1cb2a235a8c5949a07649a980ad00b6335eadedca73e94 ChangeLog 33211
+MISC ChangeLog 33356 RMD160 717550483f607a0f3365c44a633089e271d9a3e2 SHA1 3e19dce7e1d47498d03ac9a1948cb03cbf1ea724 SHA256 0d772bdfc0598cadc55d46baa4bc2b752d79b40d49d4b762b3bf19c4c1ceff9f
+MD5 01f2e3b57f838e60fe76b4a530a42ca8 ChangeLog 33356
+RMD160 717550483f607a0f3365c44a633089e271d9a3e2 ChangeLog 33356
+SHA256 0d772bdfc0598cadc55d46baa4bc2b752d79b40d49d4b762b3bf19c4c1ceff9f ChangeLog 33356
 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)
 
-iD8DBQFF8KM2QlM6RnzZP+IRApmsAKCwf1PuRp1g4s2Wbg8jeKXY+U8rSQCcCgr3
-TEYGqM525ECKkhMGpBaI3Sc=
-=siM5
+iD8DBQFF8X3LQlM6RnzZP+IRArk7AKCbbIDe9Iq3xEM+VyxL1dE1gtnFYgCgoRpw
+XQ6HMg33Siu1uFfh1n4q5jk=
+=UA5n
 -----END PGP SIGNATURE-----

diff --git a/app-antivirus/clamav/files/clamd.rc b/app-antivirus/clamav/files/clamd.rc
index 098f92f4474b9801ed1b9d64519836821ede2ded..493f3ea3cbb8d50889aeadd367f9ce67411aeb13 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.9 2007/03/08 16:59:35 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.10 2007/03/09 15:31:10 ticho Exp $
 
 depend() {
        use net
@@ -45,25 +45,6 @@ start() {
                chown ${clamav_user} ${logfile}
                fi      
 
-               if [[ ${MILTER_OPTS} == *--external* ]]; then
-                       local clamd_socket_wait_count=0
-                       local clamd_socket_wait_max=10
-                       local clamd_socket_wait_result=-1
-                       ebegin "Waiting for clamd to create ${clamd_socket}"
-                       while [[ clamd_socket_wait < clamd_socket_wait_max ]]; do
-                               if [ -S "${clamd_socket:-/tmp/clamd}" ]; then
-                                       clamd_socket_wait_result=0
-                                       break
-                               else
-                                       echo -n " ."
-                                       let clamd_socket_wait++
-                                       sleep 1
-                               fi
-                       done
-                       echo
-                       eend $clamd_socket_wait_result "Timeout waiting for ${clamd_socket}"
-               fi
-                       
                ebegin "Starting clamav-milter"
                start-stop-daemon --start --quiet \
                        --exec /usr/sbin/clamav-milter -- ${MILTER_OPTS} ${MILTER_SOCKET}