cyrus-sasl: Adding a patch to fix a make failure on some Berkley DB s…

…tuff, see; http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.25-fixes-1.patch Because the current version of heimdal dropps a needed header, say no to heimdal.
lunar-linux · Jul 10, 2012 · c233ee0 · c233ee0
1 parent c0f35ab
commit c233ee0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/crypto/cyrus-sasl/BUILD b/crypto/cyrus-sasl/BUILD
@@ -1,6 +1,7 @@
 (
 
-  patch_it $SOURCE_CACHE/$SOURCE3 1  &&
+  patch_it $SOURCE_CACHE/$SOURCE3 1 &&
+  patch_it $SOURCE_CACHE/$SOURCE4 1 &&
 
   # the patch REQUIRES -lcrypt but we might want to disable PAM:
   if echo $OPTS | grep -q with-pam ; then

diff --git a/crypto/cyrus-sasl/DEPENDS b/crypto/cyrus-sasl/DEPENDS
@@ -1,8 +1,11 @@
 depends openssl
 
-optional_depends db         ""           ""              "for Brekley DB support"
-optional_depends Linux-PAM  "--with-pam" "--without-pam" "for PAM authentication"
+optional_depends Linux-PAM  "--with-pam" "--without-pam"    "for PAM authentication"
+optional_depends db         ""           ""                 "for Brekley DB support"
+optional_depends gdbm       ""           "--without-gdbm"   "for gdbm support"
 optional_depends mysql      "--enable-sql --with-mysql"  "--without-mysql" "for mysql support"
 optional_depends postgresql "--enable-sql --with-pgsql"  "--without-pgsql" "for postgreSQL support"
-optional_depends gdbm       ""           ""              "for gdbm support"
-optional_depends heimdal    "--enable-gssapi=/usr/include --disable-krb4" "--disable-gssapi" "for GSSAPI support"
+
+# The current version of heimdal has dropped gssapi/gssapi_ext.h which is needed by this version of
+# cyrus-sasl. So for now say no to heimdal.
+optional_depends heimdal    "--enable-gssapi=/usr/include/gssapi --disable-krb4" "--disable-gssapi" "for GSSAPI support"
diff --git a/crypto/cyrus-sasl/DETAILS b/crypto/cyrus-sasl/DETAILS
@@ -3,12 +3,15 @@
           SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE2=cyrus-sasl-smtpd.conf.gz
          SOURCE3=cyrus-sasl-encrypt_pwd.patch.bz2
+         SOURCE4=cyrus-sasl-2.1.25-fixes-1.patch
       SOURCE_URL=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail
       SOURCE_VFY=sha1:b6c34426012d9b5d448d5646cbecd818a5eeacbf
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
+     SOURCE4_url=$PATCH_URL
      SOURCE2_VFY=sha1:660dd84785ea6e02ef8a5aa3d02ac5c752867555
      SOURCE3_VFY=sha1:732d0f36597703802118e3d1144aa93b1ecc1340
+     SOURCE4_VFY=sha1:7531c18a168d7665b4533b4c0c00ba7ca17b9943
         WEB_SITE=http://asg.web.cmu.edu/sasl
          ENTERED=20020826
          UPDATED=20111116