diff options
| author |   Andrej Kacian <ticho@gentoo.org> | 2007-03-09 15:31:10 +0000 |
|---|---|---|
| committer | Andrej Kacian <ticho@gentoo.org> | 2007-03-09 15:31:10 +0000 |
| commit | 22b0e663d8f44b5502cb0dbe65fd3b30a12d44c6 (patch) | |
| tree | 1e9a5ee99208b65a7486f6ddb9d663093e911cfc /app-antivirus | |
| parent | Mark stable on X86 for bug #169823. (diff) | |
| download | gentoo-2-22b0e663d8f44b5502cb0dbe65fd3b30a12d44c6.tar.gz gentoo-2-22b0e663d8f44b5502cb0dbe65fd3b30a12d44c6.tar.bz2 gentoo-2-22b0e663d8f44b5502cb0dbe65fd3b30a12d44c6.zip | |
Revert initscript to previous version, as it creates problems. Bug #169561.
(Portage version: 2.1.2.1)
Diffstat (limited to 'app-antivirus')
| -rw-r--r-- | app-antivirus/clamav/ChangeLog | 5 | ||||
| -rw-r--r-- | app-antivirus/clamav/files/clamd.rc | 21 |
2 files changed, 5 insertions, 21 deletions
diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog index 7059363b4784..676dde03edd0 100644 --- 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/files/clamd.rc b/app-antivirus/clamav/files/clamd.rc index 098f92f4474b..493f3ea3cbb8 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.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} |