From 0f58d58a02a3da645febb830e1cc26d8005591c5 Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Sat, 24 Sep 2011 09:13:35 +0000 Subject: [PATCH] Update to 2.1.25. --- security/cyrus-sasl2-ldapdb/Makefile | 11 ++-- security/cyrus-sasl2-saslauthd/Makefile | 7 ++- security/cyrus-sasl2/Makefile | 41 +++++++++--- security/cyrus-sasl2/distinfo | 4 +- security/cyrus-sasl2/files/patch-configure | 62 +++++++------------ .../cyrus-sasl2/files/patch-lib::Makefile.in | 24 ------- .../files/patch-plugins-digestmd5.c | 20 ------ .../cyrus-sasl2/files/patch-plugins::gssapi.c | 12 ---- .../cyrus-sasl2/files/patch-plugins::ldapdb.c | 13 ++++ .../files/patch-saslauthd::Makefile.in | 8 +-- .../files/patch-saslauthd::configure | 61 ++++++------------ security/cyrus-sasl2/pkg-plist | 4 ++ 12 files changed, 108 insertions(+), 159 deletions(-) delete mode 100644 security/cyrus-sasl2/files/patch-lib::Makefile.in delete mode 100644 security/cyrus-sasl2/files/patch-plugins-digestmd5.c delete mode 100644 security/cyrus-sasl2/files/patch-plugins::gssapi.c create mode 100644 security/cyrus-sasl2/files/patch-plugins::ldapdb.c diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile index 19ddfbd41ccc..3e5764eb8d1f 100644 --- a/security/cyrus-sasl2-ldapdb/Makefile +++ b/security/cyrus-sasl2-ldapdb/Makefile @@ -6,9 +6,8 @@ # PORTNAME= ldapdb -PORTVERSION= 2.1.23 +PORTVERSION= 2.1.25 #PORTREVISION= 0 -PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \ ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \ @@ -20,12 +19,15 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION} MAINTAINER= ume@FreeBSD.org COMMENT= SASL LDAPDB auxprop plugin +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files -INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/plugins +INSTALL_WRKSRC= ${WRKSRC}/plugins USE_LDCONFIG= yes @@ -53,7 +55,8 @@ CONFIGURE_ARGS+=--with-dblib=none \ --disable-krb4 \ --disable-ntlm \ --disable-otp \ - --disable-plain + --disable-plain \ + --disable-scram CONFIGURE_ARGS+=--enable-ldapdb --with-ldap=${LOCALBASE} diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile index 68bdd70224e1..f55181aed285 100644 --- a/security/cyrus-sasl2-saslauthd/Makefile +++ b/security/cyrus-sasl2-saslauthd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= saslauthd -PORTVERSION= 2.1.23 +PORTVERSION= 2.1.25 #PORTREVISION= 0 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \ @@ -19,12 +19,15 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION} MAINTAINER= ume@FreeBSD.org COMMENT= SASL authentication server for cyrus-sasl2 +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files -INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/saslauthd +INSTALL_WRKSRC= ${WRKSRC}/saslauthd DOCSDIR= ${PREFIX}/share/doc/cyrus-sasl2 MAN8= saslauthd.8 diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index de20d55df18e..25d4c2a28b62 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -6,17 +6,17 @@ # PORTNAME= cyrus-sasl -PORTVERSION= 2.1.23 -PORTREVISION= 3 +PORTVERSION= 2.1.25 +#PORTREVISION= 0 CATEGORIES= security ipv6 -MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \ - ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \ - http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ -MASTER_SITE_SUBDIR= . OLD-VERSIONS/sasl +MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ MAINTAINER= ume@FreeBSD.org COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYING + LATEST_LINK= ${PORTNAME}2 USE_AUTOTOOLS= libtool @@ -59,16 +59,19 @@ OPTIONS= BDB "Use Berkeley DB" off \ MYSQL "Use MySQL" off \ PGSQL "Use PostgreSQL" off \ SQLITE "Use SQLite" off \ + SQLITE3 "Use SQLite3" off \ DEV_URANDOM "Use /dev/urandom" off \ ALWAYSTRUE "Enable the alwaystrue password verifier" off \ KEEP_DB_OPEN "Keep handle to Berkeley DB open" off \ + OBSOLETE_CRAM_ATTR "Enable cmusaslsecretCRAM-MD5 property" on \ AUTHDAEMOND "Enable use of authdaemon" on \ LOGIN "Enable LOGIN authentication" on \ PLAIN "Enable PLAIN authentication" on \ CRAM "Enable CRAM-MD5 authentication" on \ DIGEST "Enable DIGEST-MD5 authentication" on \ + NTLM "Enable NTLM authentication" on \ OTP "Enable OTP authentication" on \ - NTLM "Enable NTLM authentication" on + SCRAM "Enable SCRAM authentication" on .include @@ -99,6 +102,10 @@ CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} CONFIGURE_ARGS+=--without-pgsql .endif +.if defined(WITH_SQLITE) && defined(WITH_SQLITE3) +BROKEN= SQLITE and SQLITE3 are mutually exclusive. +.endif + .if defined(WITH_SQLITE) USE_SQLITE= 2 CONFIGURE_ARGS+=--with-sqlite=${LOCALBASE} @@ -106,7 +113,15 @@ CONFIGURE_ARGS+=--with-sqlite=${LOCALBASE} CONFIGURE_ARGS+=--without-sqlite .endif -.if defined(WITH_MYSQL) || defined(WITH_PGSQL) || defined(WITH_SQLITE) +.if defined(WITH_SQLITE3) +USE_SQLITE= 3 +CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE} +.else +CONFIGURE_ARGS+=--without-sqlite3 +.endif + +.if defined(WITH_MYSQL) || defined(WITH_PGSQL) || defined(WITH_SQLITE) || \ + defined(WITH_SQLITE3) CONFIGURE_ARGS+=--enable-sql .else SQL= "@comment " @@ -124,6 +139,10 @@ CONFIGURE_ARGS+=--enable-alwaystrue CONFIGURE_ARGS+=--enable-keep-db-open .endif +.if defined(WITHOUT_OBSOLETE_CRAM_ATTR) +CONFIGURE_ARGS+=--enable-obsolete_cram_attr=no +.endif + .if defined(WITHOUT_AUTHDAEMOND) CONFIGURE_ARGS+=--with-authdaemond=no .else @@ -163,6 +182,11 @@ NTLM= "@comment " CONFIGURE_ARGS+=--enable-ntlm .endif +.if defined(WITHOUT_SCRAM) +CONFIGURE_ARGS+=--disable-scram +SCRAM= "@comment " +.endif + .if ${ARCH} == "amd64" CPPFLAGS+= -fPIC .endif @@ -213,6 +237,7 @@ PLIST_SUB= PREFIX=${PREFIX} \ NTLM=${NTLM} \ GSSAPI=${GSSAPI} \ EBONES=${EBONES} \ + SCRAM=${SCRAM} \ SQL=${SQL} \ DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo index e0c583985f48..a5e3a13cd747 100644 --- a/security/cyrus-sasl2/distinfo +++ b/security/cyrus-sasl2/distinfo @@ -1,2 +1,2 @@ -SHA256 (cyrus-sasl-2.1.23.tar.gz) = 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136 -SIZE (cyrus-sasl-2.1.23.tar.gz) = 1613642 +SHA256 (cyrus-sasl-2.1.25.tar.gz) = 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe +SIZE (cyrus-sasl-2.1.25.tar.gz) = 5209240 diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure index 763edce6abc5..cd8e33edff72 100644 --- a/security/cyrus-sasl2/files/patch-configure +++ b/security/cyrus-sasl2/files/patch-configure @@ -1,68 +1,50 @@ Index: configure diff -u configure.orig configure ---- configure.orig Fri May 19 04:30:13 2006 -+++ configure Sat May 20 04:04:39 2006 -@@ -1586,6 +1586,7 @@ +--- configure.orig 2011-09-07 22:29:25.000000000 +0900 ++++ configure 2011-09-14 15:48:43.574171984 +0900 +@@ -2365,6 +2365,7 @@ fi - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } +program_prefix=NONE test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. -@@ -5125,7 +5126,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -5135,6 +5136,7 @@ +@@ -6329,6 +6330,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include - int - main () -@@ -5882,7 +5884,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -5892,6 +5894,7 @@ + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" +@@ -7139,6 +7141,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include - int - main () -@@ -7193,6 +7196,8 @@ + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" +@@ -8666,6 +8669,8 @@ SASLAUTHD_TRUE='#' SASLAUTHD_FALSE= fi +SASLAUTHD_TRUE='#' +SASLAUTHD_FALSE= - echo "$as_me:$LINENO: checking if I should include saslauthd" >&5 - echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6 -@@ -10650,7 +10655,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking if I should include saslauthd" >&5 + $as_echo_n "checking if I should include saslauthd... " >&6; } +@@ -12537,7 +12542,7 @@ + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" +LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ -@@ -11060,7 +11065,7 @@ + _ACEOF +@@ -13013,7 +13018,7 @@ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" @@ -71,12 +53,12 @@ diff -u configure.orig configure GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" elif test "$gss_impl" = "cybersafe03"; then # Version of CyberSafe with two libraries -@@ -11898,7 +11903,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14358,7 +14363,7 @@ + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $LIBS" +LIBS="-lpq $GSSAPIBASE_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ + _ACEOF diff --git a/security/cyrus-sasl2/files/patch-lib::Makefile.in b/security/cyrus-sasl2/files/patch-lib::Makefile.in deleted file mode 100644 index b1de51dc4e17..000000000000 --- a/security/cyrus-sasl2/files/patch-lib::Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ -Index: lib/Makefile.in -diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Sun May 15 14:58:38 2005 -+++ lib/Makefile.in Wed May 18 01:12:50 2005 -@@ -12,6 +12,8 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - -+.PATH: ${.CURDIR}/../plugins ${.CURDIR}/../sasldb -+ - @SET_MAKE@ - - # Makefile.am for the SASL library -@@ -645,10 +647,6 @@ - rm -f $@ - ln -s .libs/$@ $@ - --$(SASL_STATIC_OBJS): linksrcs -- --linksrcs: -- -ln -s $(SASL_STATIC_SRCS) . - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/security/cyrus-sasl2/files/patch-plugins-digestmd5.c b/security/cyrus-sasl2/files/patch-plugins-digestmd5.c deleted file mode 100644 index e63375ac490c..000000000000 --- a/security/cyrus-sasl2/files/patch-plugins-digestmd5.c +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/digestmd5.c.orig 2006-05-17 20:46:17.000000000 +0400 -+++ plugins/digestmd5.c -@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/security/cyrus-sasl2/files/patch-plugins::gssapi.c b/security/cyrus-sasl2/files/patch-plugins::gssapi.c deleted file mode 100644 index c221714f5669..000000000000 --- a/security/cyrus-sasl2/files/patch-plugins::gssapi.c +++ /dev/null @@ -1,12 +0,0 @@ ---- plugins/gssapi.c (revision 580) -+++ plugins/gssapi.c (working copy) -@@ -86,7 +86,7 @@ - - static const char * GSSAPI_BLANK_STRING = ""; - --#ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE -+#if !defined(HAVE_GSS_C_NT_HOSTBASED_SERVICE) && !defined(GSS_C_NT_HOSTBASED_SERVICE) - extern gss_OID gss_nt_service_name; - #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name - #endif - diff --git a/security/cyrus-sasl2/files/patch-plugins::ldapdb.c b/security/cyrus-sasl2/files/patch-plugins::ldapdb.c new file mode 100644 index 000000000000..23a7df8b3a57 --- /dev/null +++ b/security/cyrus-sasl2/files/patch-plugins::ldapdb.c @@ -0,0 +1,13 @@ +Index: plugins/ldapdb.c +diff -u -p plugins/ldapdb.c.orig plugins/ldapdb.c +--- plugins/ldapdb.c.orig 2011-05-12 04:25:55.000000000 +0900 ++++ plugins/ldapdb.c 2011-09-24 17:25:23.465329876 +0900 +@@ -251,6 +251,8 @@ static int ldapdb_auxprop_lookup(void *g + + #if defined(LDAP_PROXY_AUTHZ_FAILURE) + case LDAP_PROXY_AUTHZ_FAILURE: ++#else ++ case LDAP_X_PROXY_AUTHZ_FAILURE: + #endif + case LDAP_INAPPROPRIATE_AUTH: + case LDAP_INVALID_CREDENTIALS: diff --git a/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in b/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in index 2195348b60ff..df4ecbb209a2 100644 --- a/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in +++ b/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in @@ -1,13 +1,13 @@ Index: saslauthd/Makefile.in diff -u saslauthd/Makefile.in.orig saslauthd/Makefile.in ---- saslauthd/Makefile.in.orig Fri May 19 04:30:21 2006 -+++ saslauthd/Makefile.in Sat May 20 05:21:31 2006 -@@ -621,7 +621,7 @@ +--- saslauthd/Makefile.in.orig 2011-09-07 22:13:56.000000000 +0900 ++++ saslauthd/Makefile.in 2011-09-14 15:16:53.207259788 +0900 +@@ -722,7 +722,7 @@ install-data-local: saslauthd.8 $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 - $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8 + $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/security/cyrus-sasl2/files/patch-saslauthd::configure b/security/cyrus-sasl2/files/patch-saslauthd::configure index 660bf4d5b006..3b736f6874c1 100644 --- a/security/cyrus-sasl2/files/patch-saslauthd::configure +++ b/security/cyrus-sasl2/files/patch-saslauthd::configure @@ -1,32 +1,25 @@ ---- saslauthd/configure.orig 2006-05-19 03:30:20.000000000 +0800 -+++ saslauthd/configure 2008-05-21 10:00:20.000000000 +0800 -@@ -1234,7 +1234,7 @@ - ac_cache_corrupted=: ;; - ,);; - *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -+ if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -@@ -1526,6 +1526,7 @@ +Index: saslauthd/configure +diff -u saslauthd/configure.orig saslauthd/configure +--- saslauthd/configure.orig 2011-09-03 00:40:17.000000000 +0900 ++++ saslauthd/configure 2011-09-14 15:22:38.269314778 +0900 +@@ -2185,6 +2185,7 @@ fi - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } +program_prefix=NONE test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. -@@ -6843,7 +6844,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8320,7 +8321,7 @@ + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" +LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ -@@ -7253,7 +7254,7 @@ + _ACEOF +@@ -8796,7 +8797,7 @@ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" @@ -35,37 +28,19 @@ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" elif test "$gss_impl" = "cybersafe03"; then # Version of CyberSafe with two libraries -@@ -8010,7 +8011,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -8020,6 +8021,7 @@ +@@ -9978,6 +9979,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include - int - main () -@@ -8767,7 +8769,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -8777,6 +8779,7 @@ + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" +@@ -10788,6 +10790,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include - int - main () + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist index 12a4296f0a80..b4fc2701c9ba 100644 --- a/security/cyrus-sasl2/pkg-plist +++ b/security/cyrus-sasl2/pkg-plist @@ -30,6 +30,10 @@ lib/sasl2/libanonymous.so.2 %%LOGIN%%lib/sasl2/liblogin.la %%LOGIN%%lib/sasl2/liblogin.so %%LOGIN%%lib/sasl2/liblogin.so.2 +%%SCRAM%%lib/sasl2/libscram.a +%%SCRAM%%lib/sasl2/libscram.la +%%SCRAM%%lib/sasl2/libscram.so +%%SCRAM%%lib/sasl2/libscram.so.2 %%SQL%%lib/sasl2/libsql.a %%SQL%%lib/sasl2/libsql.la %%SQL%%lib/sasl2/libsql.so