[Devil-linux-commit] build/scripts cyrus-sasl, 1.18, 1.19 postfix, 1.31, 1.32 vmware, 1.1, 1.2

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

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv18334/scripts

Modified Files:
	cyrus-sasl postfix vmware 
Log Message:
- updated Linux-PAM to 0.99.6.1
- updated Mail-SpamAssassin to 3.1.4
- updated clamav to 0.88.4
- updated cyrus-imapd to 2.3.7
- updated cyrus-sasl to 2.1.22
- updated dnsmasq  to 2.33
- updated dovecot to 1.0.rc6
- updated gradm-2.1.9 to 200607142202
- updated grsecurity-2.1.9-2.4.33 to 200608131429
- updated httpd to 2.2.3
- updated joe to 3.5
- updated l7-protocols to 2006-06-03
- updated lftp to 3.5.4
- updated linux to 2.4.33
- updated mdadm to 2.5.3
- updated mrtg to 2.14.5
- updated nfs-utils to 1.0.9
- updated nut to 2.0.4
- updated openldap to 2.3.25
- updated openswan to 2.4.6
- updated php to 4.4.3
- updated postfix to 2.3.1
- updated vmware tools and modules
- pam file for vsftpd doesn't check for the shell anymore


Index: postfix
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/postfix,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- postfix	9 Jun 2005 23:02:40 -0000	1.31
+++ postfix	17 Aug 2006 22:29:12 -0000	1.32
@@ -36,7 +36,7 @@
 				AUXLIBS="$AUXLIBS -lssl -lcrypto"
 			fi
 			if [ "$CONFIG_CYRUS_SASL" = "y" ]; then
-				CCARGS="$CCARGS -DUSE_SASL_AUTH -I/usr/include/sasl"
+				CCARGS="$CCARGS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
 				AUXLIBS="$AUXLIBS -lsasl2"
 			fi
 			if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
@@ -51,6 +51,11 @@
 				CCARGS="$CCARGS -DHAS_PGSQL -I/usr/include/pgsql"
 				AUXLIBS="$AUXLIBS -lpq"
 			fi
+			if [ "$CONFIG_DOVECOT" = "y" ]; then
+			    if [ -z "$(echo $CCARGS | grep USE_SASL_AUTH)" ]; then
+				CCARGS="$CCARGS -DUSE_SASL_AUTH"
+			    fi
+			fi
 			make makefiles CCARGS="$CCARGS" AUXLIBS="$AUXLIBS" || exit 1
 			make $PMAKE || exit 1
 			strip_debug

Index: cyrus-sasl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cyrus-sasl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cyrus-sasl	24 Oct 2005 22:45:51 -0000	1.18
+++ cyrus-sasl	17 Aug 2006 22:29:12 -0000	1.19
@@ -35,7 +35,7 @@
 				touch cyrus-sasl-patches.done
 			fi
 	    		./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-krb4  --enable-shared \
-			    --disable-static --with-saslauthd --with-pwcheck --with-configdir=/etc/sasl2 || exit 1
+			    --enable-login --disable-static --with-saslauthd --with-pwcheck --with-configdir=/etc/sasl2 || exit 1
 			# parallel builds cause problems
 			make all || exit 1
 			strip_debug

Index: vmware
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/vmware,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vmware	8 Jun 2006 15:37:36 -0000	1.1
+++ vmware	17 Aug 2006 22:29:12 -0000	1.2
@@ -41,12 +41,12 @@
 		    cp $MYDIR/scripts/vmware $ETCDIR/etc/init.d || exit 1
                         
 		    echo "# Load VMWare drivers?" >> $CONFIGFILE
-		    echo "# the driver will autodetect if we're running within a VM" >> $CONFIGFILE
-		    echo "# so you can safely leave this on" >> $CONFIGFILE
-                    echo "START_VMWARE=yes" >> $CONFIGFILE
+		    #echo "# the driver will autodetect if we're running within a VM" >> $CONFIGFILE
+		    #echo "# so you can safely leave this on" >> $CONFIGFILE
+                    echo "START_VMWARE=no" >> $CONFIGFILE
                     echo >> $CONFIGFILE
 		    echo "HELP_VMWARE=\"Load the vmware modules for better performance\"" >> $SOFTWAREHELP
-														fi
+		fi
 		;;
 
 	* )