[Devil-linux-commit] build/scripts cyrus-sasl,1.14.2.3,1.14.2.4

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

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

Modified Files:
      Tag: rel-1-2-patches
	cyrus-sasl 
Log Message:
- added cyrus-sasl configdir patch (Heiko + Martin Glazer)
  (smtpd.conf is now in /etc/sasl2)


Index: cyrus-sasl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cyrus-sasl,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -d -r1.14.2.3 -r1.14.2.4
--- cyrus-sasl	3 Oct 2005 02:11:25 -0000	1.14.2.3
+++ cyrus-sasl	24 Oct 2005 22:41:39 -0000	1.14.2.4
@@ -28,8 +28,14 @@
 case $1 in
 	build )
 		if [ "$CONFIG_CYRUS_SASL" = "y" ]; then
-			./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-krb4  --enable-shared \
-			    --disable-static --with-saslauthd --with-pwcheck || exit 1
+			if [ ! -f cyrus-sasl-patches.done ]; then
+				#Add configdir support
+				echo "Adding configdir support"
+				patch -p1 < $DL_DIR/src/cyrus-sasl-2.1.20-configdir.patch || exit 1
+				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
 			# parallel builds cause problems
 			make all || exit 1
 			strip_debug
@@ -48,6 +54,10 @@
 			rm -rf $TMPDIR/usr/lib/sasl2/*a || exit 1
 			copy_docs $TMPDIR
 
+			#Copy sample smtpd.conf file
+			mkdir -p $ETCDIR/etc/sasl2 || exit 1
+			cp $MYDIR/scripts/smtpd.conf $ETCDIR/etc/sasl2 || exit 1
+
 			copy_files $TMPDIR/usr $CDDIR || exit 1
 			rm -rf $TMPDIR || exit 1