[Devil-linux-commit] build/scripts Mail-SpamAssassin, 1.14, 1.15 cyrus-imapd, 1.31, 1.32 dcc, 1.1, 1.2 perl, 1.54, 1.55 shorewall-common, 1.1, NONE shorewall-perl, 1.1, NONE shorewall-shell, 1.1, NONE

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

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

Modified Files:
	Mail-SpamAssassin cyrus-imapd dcc perl 
Removed Files:
	shorewall-common shorewall-perl shorewall-shell 
Log Message:
- updated many perl modules
- updated distcc-3.1
- updated dnsmasq-2.51
- updated dovecot-1.2.6
- updated fetchmail-6.3.12
- updated iptables-1.4.5
- updated iptstate-2.2.2
- updated krb5-1.7
- updated libpng-1.2.40
- updated mod_perl-2.0.4
- updated open-vm-tools-2009.10.15-201664
- updated openldap-2.4.19
- updated samba-3.4.2
- updated sg3_utils-1.28
- updated shorewall-4.4.2.2
- updated snort-2.8.5
- updated squid-3.0.STABLE19
- updated syslinux-3.83
- updated sysstat-9.0.5
- updated webmin-1.490
- updated wget-1.12
- updated libosip2 to 3.3.0
- removed Mail::SPF::Query, since it causes conflicts with Spamassassin


--- shorewall-shell DELETED ---

Index: Mail-SpamAssassin
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Mail-SpamAssassin	22 Feb 2008 14:27:27 -0000	1.14
+++ Mail-SpamAssassin	18 Oct 2009 13:40:49 -0000	1.15
@@ -30,8 +30,8 @@
 			perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc ENABLE_SSL=yes < /dev/null || exit 1
 			# now override the PREFIX setting to not use $TMPDIR%. MakeMaker
 			# does not have a better way to do this, it seems...
-			make $PMAKE PREFIX=/usr || exit 1
-			make $PMAKE spamd/libspamc.so || exit 1
+			make $PMAKE PREFIX=/usr DESTDIR=$TMPDIR || exit 1
+			make $PMAKE spamd/libspamc.so DESTDIR=$TMPDIR || exit 1
 
 			strip_debug
 		fi
@@ -41,16 +41,16 @@
 		if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR/usr/lib || exit 1
-
+			rm -rf /etc/mail/spamassassin
+			
 			make DESTDIR=$TMPDIR install || exit 1
 
 			install -m 0755 spamd/libspamc.so $TMPDIR/usr/lib || exit 1
 
-			cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
+			mkdir -p $ETCDIR/etc/mail/ || exit 1
+			cp -dvpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
 
 			copy_docs $TMPDIR
-			cp -dpR $TMPDIR/usr/share/spamassassin $CDDIR/usr/share/ || exit 1
-			rm -rf $TMPDIR/usr/share/ || exit 1
 
 			copy_files $TMPDIR/usr $CDDIR/ || exit 1
 			rm -rf $TMPDIR || exit 1

Index: dcc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dcc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dcc	27 Mar 2008 14:27:03 -0000	1.1
+++ dcc	18 Oct 2009 13:40:49 -0000	1.2
@@ -48,7 +48,7 @@
 		make install  || exit 1
 
 		copy_docs $TMPDIR
-		cp -dvpR $TMPDIR/* $CDDIR/ || exit 1		
+		cp -dvpR $TMPDIR/* $CDDIR/ || exit 1
 
 		rm -rf $TMPDIR || exit 1
 	fi

--- shorewall-perl DELETED ---

Index: perl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/perl,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- perl	17 May 2009 22:06:53 -0000	1.54
+++ perl	18 Oct 2009 13:40:49 -0000	1.55
@@ -71,7 +71,7 @@
 				bzcat $PATCH | patch -p0 || exit 1
 			done
 		
-            		# update the patch-o-matic.exclude file to make sure we have everything listed in there
+            		# update the perl-ext file to make sure we have everything listed in there
             		for PDIR in $(ls -d -1 *); do
                     	    if [ -d "$PDIR" ]; then
 				SUITE=
@@ -79,7 +79,7 @@
                             	    SUITE=$(grep "^name:" $PDIR/META.yml 2> /dev/null )
 				    SUITE=$(echo ${SUITE##*:} | tr -d "\n\r\t ")
 				fi
-                                if [ -z "$SUITE" ]; then
+                                if [ -z "$SUI	TE" ]; then
 				    SUITE=${PDIR%*-[0-9]*}
 				fi
                             	SUITE=$(echo ${SUITE} | tr -d "\n\r\t ")

Index: cyrus-imapd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cyrus-imapd,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- cyrus-imapd	10 Jan 2009 17:28:02 -0000	1.31
+++ cyrus-imapd	18 Oct 2009 13:40:49 -0000	1.32
@@ -39,7 +39,7 @@
 			export CFLAGS="$CFLAGS -pthread"
 			export LDFLAGS=-pthread 
 			./configure --prefix=/usr --with-cyrus-prefix=/usr/lib/cyrus --with-cyrus-user=cyrus --with-cyrus-group=mail \
-				--enable-shared --enable-netscapehack \
+				--enable-shared --enable-netscapehack --with-com_err \
 				--with-auth=unix --enable-listext --enable-annotatemore --enable-fulldirhash --enable-sieve || exit 1
 			make depend
 			# parallel build fails, do not use $PMAKE

--- shorewall-common DELETED ---