[Devil-linux-commit] build/scripts clamav, 1.19, 1.20 dkim-milter, 1.1, 1.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20875/scripts

Modified Files:
	clamav dkim-milter 
Log Message:
milter support for clamav


Index: dkim-milter
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dkim-milter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dkim-milter	12 May 2009 15:57:42 -0000	1.1
+++ dkim-milter	15 May 2009 19:27:14 -0000	1.2
@@ -42,8 +42,8 @@
 			copy_docs $TMPDIR
 			rm -rf $TMPDIR/usr/include 
 			copy_files $TMPDIR/usr $CDDIR/ || exit 1
-			mkdir -p $ETCDIR/etc/mail || exit 1
-			cp dkim-filter/dkim-filter.conf.sample $ETCDIR/etc/mail || exit 1
+			mkdir -p $ETCDIR/etc/mail/dkim || exit 1
+			cp dkim-filter/dkim-filter.conf.sample $ETCDIR/etc/mail/dkim/ || exit 1
 			rm -rf $TMPDIR || exit 1
 		fi
 		;;

Index: clamav
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/clamav,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- clamav	28 Dec 2006 15:37:45 -0000	1.19
+++ clamav	15 May 2009 19:27:14 -0000	1.20
@@ -33,7 +33,11 @@
 			automake
 		fi
 
-		./configure --prefix=/usr --sysconfdir=/etc --disable-clamav --with-dbdir=/var/lib/clamav || exit 1
+		CONFIG_EXTRA=""
+		if [ "$CONFIG_SENDMAIL_LIBMILTER" = "y" ]; then
+		    CONFIG_EXTRA="$CONFIG_EXTRA --enable-milter"
+		fi
+		./configure --prefix=/usr --sysconfdir=/etc --disable-clamav --with-dbdir=/var/lib/clamav $CONFIG_EXTRA || exit 1
 		make $PMAKE all || exit 1
 		strip_debug