summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Kacian <ticho@gentoo.org>2007-03-09 15:31:10 +0000
committerAndrej Kacian <ticho@gentoo.org>2007-03-09 15:31:10 +0000
commit1ac58fbae1025d2548fc2f273f38ae018494d100 (patch)
treea50aaf1d9b72ec32970926faf771541ec27f62e4 /app-antivirus/clamav/files
parentMark stable on X86 for bug #169823. (diff)
downloadhistorical-1ac58fbae1025d2548fc2f273f38ae018494d100.tar.gz
historical-1ac58fbae1025d2548fc2f273f38ae018494d100.tar.bz2
historical-1ac58fbae1025d2548fc2f273f38ae018494d100.zip
Revert initscript to previous version, as it creates problems. Bug #169561.
Package-Manager: portage-2.1.2.1
Diffstat (limited to 'app-antivirus/clamav/files')
-rw-r--r--app-antivirus/clamav/files/clamd.rc21
1 files changed, 1 insertions, 20 deletions
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}