diff options
Diffstat (limited to 'security/cyrus-sasl/files/patch-ab')
| -rw-r--r-- | security/cyrus-sasl/files/patch-ab | 120 |
1 files changed, 67 insertions, 53 deletions
diff --git a/security/cyrus-sasl/files/patch-ab b/security/cyrus-sasl/files/patch-ab index 4b1a2c357e00..d87eafb4ba8b 100644 --- a/security/cyrus-sasl/files/patch-ab +++ b/security/cyrus-sasl/files/patch-ab @@ -1,5 +1,5 @@ ---- configure.in.orig Wed May 22 20:49:46 2002 -+++ configure.in Thu May 23 16:52:07 2002 +--- configure.in.orig Tue Feb 18 13:18:11 2003 ++++ configure.in Tue Feb 18 14:34:11 2003 @@ -66,8 +66,12 @@ dnl check for -R, etc. switch CMU_GUESS_RUNPATH_SWITCH @@ -24,37 +24,7 @@ fi AM_CONDITIONAL(SAMPLE, test "$enable_sample" = yes) -@@ -149,11 +151,13 @@ - AC_CHECK_HEADER(db.h, - AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3"; - dblib="berkeley", -+ AC_CHECK_LIB(db3, db_create, SASL_DB_LIB="-ldb3"; -+ dblib="berkeley", - AC_CHECK_LIB(db, db_create, SASL_DB_LIB="-ldb"; - dblib="berkeley", - AC_CHECK_LIB(db, db_open, SASL_DB_LIB="-ldb"; - dblib="berkeley", -- dblib="no"))), -+ dblib="no")))), - dblib="no") - ;; - gdbm) -@@ -175,11 +179,13 @@ - AC_CHECK_HEADER(db.h, - AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3"; - dblib="berkeley", -+ AC_CHECK_LIB(db3, db_create, SASL_DB_LIB="-ldb3"; -+ dblib="berkeley", - AC_CHECK_LIB(db, db_create, SASL_DB_LIB="-ldb"; - dblib="berkeley", - AC_CHECK_LIB(db, db_open, SASL_DB_LIB="-ldb"; - dblib="berkeley", -- dblib="no"))), -+ dblib="no")))), - dblib="no") - if test "$dblib" = no; then - dnl How about ndbm? -@@ -229,6 +235,13 @@ +@@ -239,6 +241,13 @@ berkeley) SASL_DB_BACKEND="db_${dblib}.lo" AC_DEFINE(SASL_BERKELEYDB) @@ -68,25 +38,69 @@ ;; *) AC_MSG_WARN([Disabling SASL authentication database support]) -@@ -534,12 +547,16 @@ +@@ -473,16 +482,40 @@ + CPPFLAGS="$CPPFLAGS -I${with_des}/include" + LDFLAGS="$LDFLAGS -L${with_des}/lib" fi +- AC_CHECK_LIB(des, des_pcbc_encrypt, [LIB_DES="-ldes"; +- with_des=yes], with_des=no) ++ ++ dnl check for openssl installing -lcrypto, then make vanilla check ++ AC_CHECK_LIB(crypto, des_cbc_encrypt, [ ++ AC_CHECK_HEADER(openssl/des.h, [AC_DEFINE(WITH_SSL_DES) ++ LIB_DES="-lcrypto"; ++ with_des=yes], ++ with_des=no)], ++ with_des=no, $LIB_RSAREF) ++ ++ dnl same test again, different symbol name ++ if test "$with_des" = no; then ++ AC_CHECK_LIB(crypto, DES_cbc_encrypt, [ ++ AC_CHECK_HEADER(openssl/des.h, [AC_DEFINE(WITH_SSL_DES) ++ LIB_DES="-lcrypto"; ++ with_des=yes], ++ with_des=no)], ++ with_des=no, $LIB_RSAREF) ++ fi ++ ++ if test "$with_des" = no; then ++ AC_CHECK_LIB(des, des_pcbc_encrypt, [LIB_DES="-ldes"; ++ with_des=yes], with_des=no) ++ fi ++ + if test "$with_des" = no; then + AC_CHECK_LIB(des524, des_pcbc_encrypt, [LIB_DES="-ldes524"; + with_des=yes], with_des=no) + fi ++ + if test "$with_des" = no; then + AC_CHECK_LIB(des425, des_pcbc_encrypt, [LIB_DES="-ldes425"; + with_des=yes], with_des=no) + fi ++ + if test "$with_des" = no; then + dnl if openssl is around, we might be able to use that for des + +@@ -493,7 +526,7 @@ + LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes, + cmu_have_rsaref=no) + +- AC_CHECK_LIB(crypto, des_pcbc_encrypt, ++ AC_CHECK_LIB(crypto, des_cbc_encrypt, + AC_CHECK_HEADER(openssl/des.h, [AC_DEFINE(WITH_SSL_DES) + LIB_DES="-lcrypto"; + with_des=yes], +@@ -502,10 +535,9 @@ + fi + fi + +-dnl if test "$with_des" != no; then +-dnl AC_DEFINE(WITH_DES) +-dnl LIB_DES="-ldes" +-dnl fi ++if test "$with_des" != no; then ++ AC_DEFINE(WITH_DES) ++fi + + AC_SUBST(LIB_DES) - if test "$with_des" != no; then -+ case "$host_os" in -+ freebsd*) -+ COM_ERR="-lcom_err" -+ ;; -+ esac - AC_CHECK_HEADER(krb.h, -- AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="", -- AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="-lcom_err", -- AC_WARN(No Kerberos V4 found); krb4=no, -ldes -lcom_err), -- -ldes), -- AC_WARN(No Kerberos V4 found); krb4=no) -+ AC_CHECK_LIB(krb, krb_mk_priv,:, -+ AC_WARN(No Kerberos V4 found); krb4=no, -+ -ldes ${COM_ERR}), -+ AC_WARN(No Kerberos V4 headers found); krb4=no) - else - AC_WARN(No DES library found for Kerberos V4 support) - krb4=no |