[gentoo-commits] gentoo-x86 commit in app-antivirus/clamav/files: clamd.rc

[gentoo-commits] gentoo-x86 commit in app-antivirus/clamav/files: clamd.rc

[Tobias Scherbaum (dertobi123)]

dertobi123    09/06/21 09:46:12

  Modified:             clamd.rc
  Log:
  Version bump, incorporating patches from #273668 by Bernd Lommerzheim, security bug #274510 and fixing milter support (#272039).
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.17                 app-antivirus/clamav/files/clamd.rc

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/files/clamd.rc?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/files/clamd.rc?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/files/clamd.rc?r1=1.16&r2=1.17

Index: clamd.rc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- clamd.rc	29 Feb 2008 23:46:46 -0000	1.16
+++ clamd.rc	21 Jun 2009 09:46:12 -0000	1.17
@@ -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.16 2008/02/29 23:46:46 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.17 2009/06/21 09:46:12 dertobi123 Exp $
 
 opts="logfix"
 
@@ -39,56 +39,16 @@
 			eend ${retcode} "Failed to start freshclam"
 		fi
 	fi
+
 	if [ "${START_MILTER}" = "yes" ]; then
-		if [ -S "${MILTER_SOCKET}" ]; then
-			rm -f ${MILTER_SOCKET}
+		if [ -z "${MILTER_CONF_FILE}" ]; then
+			MILTER_CONF_FILE="/etc/clamav-milter.conf"
 		fi
 
-
-		local milter_ext=no
-		local milter_svr=no
-		args=`getopt -q --options "es" --longoptions "external,server" --  $MILTER_OPTS`
-		for arg in $args; do
-
-			case "$arg" in
-
-			-e | --external)
-				milter_ext=yes;
-				shift;;
-
-			-s | --server)
-				milter_svr=yes;
-				shift;;
-
-			--)
-				shift;
-				break;;
-			esac
-		done
-
-		if [[ $milter_ext == yes && $milter_svr == no ]]; 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 \
 			--nicelevel ${MILTER_NICELEVEL:-0} \
-			--exec /usr/sbin/clamav-milter -- ${MILTER_OPTS} ${MILTER_SOCKET}
+			--exec /usr/sbin/clamav-milter -- -c ${MILTER_CONF_FILE}
 		eend $? "Failed to start clamav-milter"
 	fi
 }

[gentoo-commits] gentoo-x86 commit in app-antivirus/clamav/files: clamd.rc

[Sven Wegener (swegener)]

swegener    11/12/04 11:51:46

  Modified:             clamd.rc
  Log:
  Replace opts with extra_commands
  
  (Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

Revision  Changes    Path
1.18                 app-antivirus/clamav/files/clamd.rc

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/files/clamd.rc?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/files/clamd.rc?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/files/clamd.rc?r1=1.17&r2=1.18

Index: clamd.rc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- clamd.rc	21 Jun 2009 09:46:12 -0000	1.17
+++ clamd.rc	4 Dec 2011 11:51:46 -0000	1.18
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2011 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.17 2009/06/21 09:46:12 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.18 2011/12/04 11:51:46 swegener Exp $
 
-opts="logfix"
+extra_commands="logfix"
 
 depend() {
 	use net