[Devil-linux-commit] build/scripts postfix,1.30,1.31

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

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

Modified Files:
	postfix 
Log Message:
use the postfix master.cf


Index: postfix
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/postfix,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- postfix	9 Jun 2005 22:41:43 -0000	1.30
+++ postfix	9 Jun 2005 23:02:40 -0000	1.31
@@ -32,11 +32,6 @@
 			CCARGS=""
 			AUXLIBS="-lpthread"
 			if [ "$CONFIG_POSTFIX_TLS" = "y" ]; then
-				#if [ ! -f postfix_tls_patch ]; then
-				#	PFIXTLSPATCH=$(ls $WORKDIR/pfixtls*/pfixtls.diff)
-				#	patch -p1 < $PFIXTLSPATCH || exit 1
-				#	touch postfix_tls_patch
-				#fi
 				CCARGS="$CCARGS -DUSE_TLS -I/usr/include/openssl"
 				AUXLIBS="$AUXLIBS -lssl -lcrypto"
 			fi
@@ -91,6 +86,7 @@
 			cp -dp conf/* $ETCDIR/etc/postfix || exit 1
 			rm $ETCDIR/etc/postfix/*.rej 2> /dev/null
 			rm $ETCDIR/etc/postfix/LICENSE
+			rm $ETCDIR/etc/postfix/TLS_LICENSE
 			touch $ETCDIR/etc/aliases
 
 			# set some default parameters
@@ -128,7 +124,6 @@
 			useradd -u 612 -g postfixfilter -c "postfix mail system filter" -s /bin/false -d /tmp postfixfilter || exit 1
 
 			cp $MYDIR/scripts/postfix $ETCDIR/etc/init.d || exit 1
-			cp $MYDIR/scripts/postfix.master.cf $ETCDIR/etc/postfix/master.cf || exit 1
 			echo "# Start Postfix?" >> $CONFIGFILE
 			echo "START_$MYNAME=no" >> $CONFIGFILE
 			echo >> $CONFIGFILE