[Lunar-commits] CVS: moonbase/crypto/cyrus-sasl BUILD, 1.8, 1.9 DEPENDS, 1.6, 1.7

[Auke Kok]

Update of /var/cvs/lunar/moonbase/crypto/cyrus-sasl
In directory espresso.foo-projects.org:/home/sofar/active/moonbase/crypto/cyrus-sasl

Modified Files:
	BUILD DEPENDS 
Log Message:
Hopefully fix two bugs: 1) allow disabling of PAM and 2) allow kmail to work.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/crypto/cyrus-sasl/BUILD,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- BUILD	17 Mar 2005 23:03:59 -0000	1.8
+++ BUILD	25 Apr 2005 08:05:04 -0000	1.9
@@ -1,17 +1,14 @@
 (
 
   patch_it $SOURCE_CACHE/$SOURCE3 1                               &&
-  cp configure configure.old                                      &&
-  sedit "s/@LIBS@/@LIBS@ -lpam -lcrypt/"  utils/Makefile.in        \
-                         sample/Makefile.in saslauthd/Makefile.in  \
-                         lib/Makefile.in          &&
+  # the patch REQUIRES -lcrypt but we might want to disable PAM:
+  if echo $OPTS | grep -q with-pam ; then
+    sedit "s/@LIBS@/@LIBS@ -lpam -lcrypt/" */Makefile.in
+  else
+    sedit "s/@LIBS@/@LIBS@ -lcrypt/" */Makefile.in
+  fi
 
-  OPTS=$OPTS" --with-pam                           \
-              --enable-login                       \
-              --disable-krb4                       \
-              --disable-gssapi                     \
-              --disable-anon                       \
-              --disable-plain                      \
+  OPTS=$OPTS" --enable-login                       \
               --with-pwcheck=/var/lib/sasl         \
               --with-dbpath=/var/lib/sasl/sasl.db  \
               --with-plugindir=/usr/lib/sasl2      \
@@ -27,4 +24,4 @@
     gunzip /usr/lib/sasl2/smtpd.conf.gz
   fi
 
-) > $C_FIFO 2>&1 
+) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/crypto/cyrus-sasl/DEPENDS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DEPENDS	24 Jan 2005 19:57:59 -0000	1.6
+++ DEPENDS	25 Apr 2005 08:05:04 -0000	1.7
@@ -1,4 +1,4 @@
 depends openssl    &&
-depends Linux-PAM  &&
 depends db         &&
+optional_depends "Linux-PAM" "--with-pam" "--without-pam" "for PAM authentication" &&
 optional_depends "mysql" "--with-mysql" "--without-mysql" "for mysql support"