[Devil-linux-commit] build/scripts Mail-SpamAssassin, 1.20, 1.21 Python, 1.26, 1.27

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20634/scripts

Modified Files:
	Mail-SpamAssassin Python 
Log Message:
- updated Mail-SpamAssassin-3.3.0
- added Mail-SpamAssassin-rules-3.3.0.r901671
- updated Python-2.6.4
- updated awstats-6.95
- updated cdrtools-2.01.01a73
- updated coreutils-8.4
- updated dnsmasq-2.52
- updated dovecot-1.2.10
- updated dspam-3.9.0
- updated file-5.04
- updated glib-2.22.4
- updated grsecurity-2.1.14-2.4.37.7-200911101931
- updated lftp-4.0.5
- updated mysql-5.1.42
- updated kernel 2.6.32.7
- updated pax-linux-2.6.32.7-test11
- updated pciutils-3.1.6
- updated pcre-8.01
- updated radvd-1.5
- updated sagator-1.2.0
- updated samba-3.4.5
- updated setuptools-0.6c11-py2.6
- updated shorewall-4.4.6
- updated snort-2.8.5.2
- updated stunnel-4.30
- added webmin module certmgr.wbm.gz
- updated webmin module vsftpd.tar.gz


Index: Python
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Python,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Python	6 Jan 2010 14:53:27 -0000	1.26
+++ Python	31 Jan 2010 15:38:07 -0000	1.27
@@ -27,16 +27,14 @@
 	    strip_debug
 	    # we need to install it, because Python-LDAP needs it
 	    make install || exit 1
-	    #ln -sf python2.5 $WORKDIR/Python-install/usr/bin/python || exit 1
-	    #ln -sf python2.5 $WORKDIR/Python-install/usr/bin/python2 || exit 1
-	    ln -sf python2.4 $WORKDIR/Python-install/usr/bin/python || exit 1
-	    ln -sf python2.4 $WORKDIR/Python-install/usr/bin/python2 || exit 1
+	    ln -sf python2.6 $WORKDIR/Python-install/usr/bin/python || exit 1
+	    ln -sf python2.6 $WORKDIR/Python-install/usr/bin/python2 || exit 1
 	    mkdir -p $WORKDIR/Python-install/usr/share
 	    mv $WORKDIR/Python-install/usr/man $WORKDIR/Python-install/usr/share
 	    cp -dpR $WORKDIR/Python-install/* / || exit 1
 	    
 	    # install the easyinstall stuff
-	    sh $DL_DIR/src/setuptools-0.6c8-py2.4.egg || exit 1
+	    sh $DL_DIR/src/setuptools-0.6c11-py2.6.egg || exit 1
 	fi
         ;;
 

Index: Mail-SpamAssassin
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Mail-SpamAssassin	6 Jan 2010 14:53:27 -0000	1.20
+++ Mail-SpamAssassin	31 Jan 2010 15:38:07 -0000	1.21
@@ -35,13 +35,12 @@
 			rm -rf /etc/mail/spamassassin /usr/share/spamassassin
 			
 			make DESTDIR=$TMPDIR install || exit 1
+			
+			tar -C $TMPDIR/usr/share/spamassassin -xzf $DL_DIR/src/special/Mail-SpamAssassin-rules-*.tgz
 
 			install -m 0755 spamd/libspamc.so $TMPDIR/usr/lib || exit 1
 
-			mkdir -p $ETCDIR/etc/mail/ || exit 1
-			cp -dvpR /etc/mail/spamassassin $ETCDIR/etc/mail/ || exit 1
-			cp -dvpR /usr/share/spamassassin $CDDIR/usr/share/ || exit 1
-			#cp -dvpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
+			cp -dvpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
 
 			copy_docs $TMPDIR
 
@@ -55,7 +54,7 @@
 			echo >> $CONFIGFILE
 
 			echo "# Additional parameters for spamd" >> $CONFIGFILE
-			echo "CONFIG_SPAMD=\"-c -a\"" >> $CONFIGFILE
+			echo "CONFIG_SPAMD=\"-c\"" >> $CONFIGFILE
 			echo >> $CONFIGFILE
 			echo "HELP_SPAMD=\"SPAMD is the SpamAssassin mail filter to identify spam\"" >> $SOFTWAREHELP