Update to 2.1.21. Tested on i386. Regards,
Ben. http://users.networkinsanity.com/ben/cyrus-sasl/cyrus-sasl-2.1.21.diff diff -ru /usr/ports/security/cyrus-sasl2/Makefile ./Makefile --- /usr/ports/security/cyrus-sasl2/Makefile Tue May 10 00:28:22 2005 +++ ./Makefile Tue Jun 21 03:46:06 2005 @@ -2,8 +2,7 @@ COMMENT= "RFC 2222 SASL (Simple Authentication and Security Layer)" -DISTNAME= cyrus-sasl-2.1.20 -PKGNAME= ${DISTNAME}p4 +DISTNAME= cyrus-sasl-2.1.21 CATEGORIES= security MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ @@ -25,7 +24,6 @@ CONFIGURE_ARGS+= --with-saslauthd="/var/sasl2" \ --enable-gssapi="/usr" \ - --with-gss_impl="heimdal" \ --with-plugindir=${PREFIX}/lib/sasl2 \ --enable-login \ --enable-static \ diff -ru /usr/ports/security/cyrus-sasl2/distinfo ./distinfo --- /usr/ports/security/cyrus-sasl2/distinfo Thu Jan 6 04:26:36 2005 +++ ./distinfo Tue Jun 21 03:46:06 2005 @@ -1,4 +1,4 @@ -MD5 (cyrus-sasl-2.1.20.tar.gz) = 268ead27f4ac39bcfe17d9e38e0f2977 -RMD160 (cyrus-sasl-2.1.20.tar.gz) = 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c -SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6 -SIZE (cyrus-sasl-2.1.20.tar.gz) = 1775163 +MD5 (cyrus-sasl-2.1.21.tar.gz) = dde02db234dea892bee298390890502e +RMD160 (cyrus-sasl-2.1.21.tar.gz) = 93e0e1868453c5781602b5cce23e746b8823a26b +SHA1 (cyrus-sasl-2.1.21.tar.gz) = 6449f730c963d29d43600a95373a6e2db52d6d66 +SIZE (cyrus-sasl-2.1.21.tar.gz) = 1584931 diff -ru /usr/ports/security/cyrus-sasl2/patches/patch-configure ./patches/patch-configure --- /usr/ports/security/cyrus-sasl2/patches/patch-configure Wed Nov 3 21:33:31 2004 +++ ./patches/patch-configure Tue Jun 21 03:46:06 2005 @@ -1,25 +1,7 @@ $OpenBSD: patch-configure,v 1.7 2004/11/03 10:33:31 jakob Exp $ ---- configure.orig Mon Oct 25 06:21:08 2004 -+++ configure Sun Oct 31 22:50:04 2004 -@@ -4526,7 +4526,7 @@ if test "${ac_cv_lib_resolv_res_search+s - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lresolv $LIBS" -+ #LIBS="-lresolv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -8920,7 +8920,7 @@ if test "${ac_cv_lib_resolv_res_search+s - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lresolv $LIBS" -+ #LIBS="-lresolv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -8973,7 +8973,7 @@ if test $ac_cv_lib_resolv_res_search = y +--- configure.orig Sun May 15 15:58:28 2005 ++++ configure Thu Jun 9 07:12:35 2005 +@@ -9447,7 +9447,7 @@ if test $ac_cv_lib_resolv_res_search = y #define HAVE_LIBRESOLV 1 _ACEOF @@ -28,35 +10,26 @@ fi -@@ -9687,6 +9687,9 @@ fi; - *-*-aix*) - platform=__aix - ;; -+ *-*-openbsd*) -+ platform=__openbsd -+ ;; - *) - { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5 +@@ -10159,6 +10159,9 @@ if test "$gssapi" != no; then + *-*-aix*) + platform=__aix + ;; ++ *-*-openbsd*) ++ platform=__openbsd ++ ;; + *) + { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5 echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;} -@@ -9701,7 +9704,7 @@ echo "$as_me: error: CyberSafe was force - cmu_saved_CPPFLAGS=$CPPFLAGS +@@ -10173,7 +10176,7 @@ echo "$as_me: error: CyberSafe was force + cmu_saved_CPPFLAGS=$CPPFLAGS - if test -d ${gssapi}; then -- CPPFLAGS="$CPPFLAGS -I$gssapi/include" -+ CPPFLAGS="$CPPFLAGS -I$gssapi/include/kerberosV" + if test -d ${gssapi}; then +- CPPFLAGS="$CPPFLAGS -I$gssapi/include" ++ CPPFLAGS="$CPPFLAGS -I$gssapi/include/kerberosV" # We want to keep -I in our CPPFLAGS, but only if we succeed - cmu_saved_CPPFLAGS=$CPPFLAGS - LDFLAGS="$LDFLAGS -L$gssapi/lib" -@@ -10006,7 +10009,7 @@ if test "${ac_cv_lib_resolv_res_search+s - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lresolv $LIBS" -+ #LIBS="-lresolv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -10059,7 +10062,7 @@ if test $ac_cv_lib_resolv_res_search = y + cmu_saved_CPPFLAGS=$CPPFLAGS + LDFLAGS="$LDFLAGS -L$gssapi/lib" +@@ -10537,7 +10540,7 @@ if test $ac_cv_lib_resolv_res_search = y #define HAVE_LIBRESOLV 1 _ACEOF @@ -65,16 +38,16 @@ fi -@@ -10084,7 +10087,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s +@@ -10564,7 +10567,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s echo $ECHO_N "(cached) $ECHO_C" >&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="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" +-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" ++LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ -@@ -10434,8 +10437,8 @@ fi +@@ -10914,8 +10917,8 @@ fi GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" @@ -85,39 +58,30 @@ elif test "$gss_impl" = "cybersafe03"; then # Version of CyberSafe with two libraries CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include" -@@ -10627,7 +10630,7 @@ if test "${ac_cv_lib_resolv_res_search+s - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lresolv $LIBS" -+ #LIBS="-lresolv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -10676,7 +10679,7 @@ fi +@@ -11154,7 +11157,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6 if test $ac_cv_lib_resolv_res_search = yes; then - GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv" -+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS" ++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS" fi SASL_MECHS="$SASL_MECHS libgssapiv2.la" -@@ -11881,7 +11884,7 @@ if test "${ac_cv_lib_resolv_inet_aton+se +@@ -12760,7 +12763,7 @@ if test "${ac_cv_lib_resolv_inet_aton+se echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $LIBS" -+ #LIBS="-lresolv $LIBS" ++#LIBS="-lresolv $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ -@@ -11934,7 +11937,7 @@ if test $ac_cv_lib_resolv_inet_aton = ye +@@ -12813,7 +12816,7 @@ if test $ac_cv_lib_resolv_inet_aton = ye #define HAVE_LIBRESOLV 1 _ACEOF - LIBS="-lresolv $LIBS" -+ #LIBS="-lresolv $LIBS" ++ #IBS="-lresolv $LIBS" fi diff -ru /usr/ports/security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in ./patches/patch-saslauthd_Makefile_in --- /usr/ports/security/cyrus-sasl2/patches/patch-saslauthd_Makefile_in Wed Nov 3 21:33:32 2004 +++ ./patches/patch-saslauthd_Makefile_in Tue Jun 21 03:46:06 2005 @@ -1,7 +1,7 @@ $OpenBSD: patch-saslauthd_Makefile_in,v 1.6 2004/11/03 10:33:32 jakob Exp $ ---- saslauthd/Makefile.in.orig Mon Oct 25 06:21:14 2004 -+++ saslauthd/Makefile.in Sun Oct 31 22:44:54 2004 -@@ -613,7 +613,7 @@ saslauthd.8: saslauthd.mdoc +--- saslauthd/Makefile.in.orig Sun May 15 15:59:08 2005 ++++ saslauthd/Makefile.in Thu Jun 9 06:56:12 2005 +@@ -618,7 +618,7 @@ saslauthd.8: saslauthd.mdoc install-data-local: saslauthd.8 $(mkinstalldirs) $(DESTDIR)$(mandir)/cat8 Only in /usr/ports/security/cyrus-sasl2/patches: patch-saslauthd_auth_krb5_c diff -ru /usr/ports/security/cyrus-sasl2/patches/patch-saslauthd_configure ./patches/patch-saslauthd_configure --- /usr/ports/security/cyrus-sasl2/patches/patch-saslauthd_configure Wed Nov 3 21:33:32 2004 +++ ./patches/patch-saslauthd_configure Tue Jun 21 03:46:06 2005 @@ -1,6 +1,6 @@ $OpenBSD: patch-saslauthd_configure,v 1.8 2004/11/03 10:33:32 jakob Exp $ ---- saslauthd/configure.orig Mon Oct 25 06:21:13 2004 -+++ saslauthd/configure Sun Oct 31 23:09:13 2004 +--- saslauthd/configure.orig Sun May 15 15:59:04 2005 ++++ saslauthd/configure Thu Jun 9 07:18:10 2005 @@ -753,10 +753,10 @@ ac_env_CC_set=${CC+set} ac_env_CC_value=$CC ac_cv_env_CC_set=${CC+set} @@ -16,35 +16,17 @@ ac_env_LDFLAGS_set=${LDFLAGS+set} ac_env_LDFLAGS_value=$LDFLAGS ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -@@ -5995,6 +5995,9 @@ fi; - *-*-aix*) - platform=__aix - ;; -+ *-*-openbsd*) -+ platform=__openbsd -+ ;; - *) - { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5 +@@ -6377,6 +6377,9 @@ if test "$gssapi" != no; then + *-*-aix*) + platform=__aix + ;; ++ *-*-openbsd*) ++ platform=__openbsd ++ ;; + *) + { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5 echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;} -@@ -6009,7 +6012,7 @@ echo "$as_me: error: CyberSafe was force - cmu_saved_CPPFLAGS=$CPPFLAGS - - if test -d ${gssapi}; then -- CPPFLAGS="$CPPFLAGS -I$gssapi/include" -+ CPPFLAGS="$CPPFLAGS -I$gssapi/include/kerberosV" - # We want to keep -I in our CPPFLAGS, but only if we succeed - cmu_saved_CPPFLAGS=$CPPFLAGS - LDFLAGS="$LDFLAGS -L$gssapi/lib" -@@ -6392,7 +6395,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s - echo $ECHO_N "(cached) $ECHO_C" >&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="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -6738,12 +6741,12 @@ fi +@@ -7128,12 +7131,12 @@ fi fi if test "$gss_impl" = "mit"; then diff -ru /usr/ports/security/cyrus-sasl2/pkg/PFRAG.shared ./pkg/PFRAG.shared --- /usr/ports/security/cyrus-sasl2/pkg/PFRAG.shared Wed Nov 3 21:33:32 2004 +++ ./pkg/PFRAG.shared Tue Jun 21 03:46:06 2005 @@ -1,10 +1,10 @@ @comment $OpenBSD: PFRAG.shared,v 1.11 2004/11/03 10:33:32 jakob Exp $ [EMAIL PROTECTED] lib/libsasl2.so.2.20 [EMAIL PROTECTED] lib/sasl2/libanonymous.so.2.20 [EMAIL PROTECTED] lib/sasl2/libcrammd5.so.2.20 [EMAIL PROTECTED] lib/sasl2/libdigestmd5.so.2.20 [EMAIL PROTECTED] lib/sasl2/libgssapiv2.so.2.20 [EMAIL PROTECTED] lib/sasl2/liblogin.so.2.20 [EMAIL PROTECTED] lib/sasl2/libotp.so.2.20 [EMAIL PROTECTED] lib/sasl2/libplain.so.2.20 [EMAIL PROTECTED] lib/sasl2/libsasldb.so.2.20 [EMAIL PROTECTED] lib/libsasl2.so.2.21 [EMAIL PROTECTED] lib/sasl2/libanonymous.so.2.21 [EMAIL PROTECTED] lib/sasl2/libcrammd5.so.2.21 [EMAIL PROTECTED] lib/sasl2/libdigestmd5.so.2.21 [EMAIL PROTECTED] lib/sasl2/libgssapiv2.so.2.21 [EMAIL PROTECTED] lib/sasl2/liblogin.so.2.21 [EMAIL PROTECTED] lib/sasl2/libotp.so.2.21 [EMAIL PROTECTED] lib/sasl2/libplain.so.2.21 [EMAIL PROTECTED] lib/sasl2/libsasldb.so.2.21 diff -ru /usr/ports/security/cyrus-sasl2/pkg/PFRAG.shared-mysql ./pkg/PFRAG.shared-mysql --- /usr/ports/security/cyrus-sasl2/pkg/PFRAG.shared-mysql Wed Jan 5 21:03:14 2005 +++ ./pkg/PFRAG.shared-mysql Tue Jun 21 03:46:06 2005 @@ -1,2 +1,2 @@ @comment $OpenBSD: PFRAG.shared-mysql,v 1.1 2005/01/05 10:03:14 jakob Exp $ [EMAIL PROTECTED] lib/sasl2/libsql.so.2.20 [EMAIL PROTECTED] lib/sasl2/libsql.so.2.21 diff -ru /usr/ports/security/cyrus-sasl2/pkg/PFRAG.shared-pgsql ./pkg/PFRAG.shared-pgsql --- /usr/ports/security/cyrus-sasl2/pkg/PFRAG.shared-pgsql Wed Jan 5 21:03:14 2005 +++ ./pkg/PFRAG.shared-pgsql Tue Jun 21 03:46:06 2005 @@ -1,2 +1,2 @@ @comment $OpenBSD: PFRAG.shared-pgsql,v 1.1 2005/01/05 10:03:14 jakob Exp $ [EMAIL PROTECTED] lib/sasl2/libsql.so.2.20 [EMAIL PROTECTED] lib/sasl2/libsql.so.2.21 diff -ru /usr/ports/security/cyrus-sasl2/pkg/PFRAG.shared-sqlite ./pkg/PFRAG.shared-sqlite --- /usr/ports/security/cyrus-sasl2/pkg/PFRAG.shared-sqlite Wed Jan 5 21:03:14 2005 +++ ./pkg/PFRAG.shared-sqlite Tue Jun 21 03:46:06 2005 @@ -1,2 +1,2 @@ @comment $OpenBSD: PFRAG.shared-sqlite,v 1.1 2005/01/05 10:03:14 jakob Exp $ [EMAIL PROTECTED] lib/sasl2/libsql.so.2.20 [EMAIL PROTECTED] lib/sasl2/libsql.so.2.21 diff -ru /usr/ports/security/cyrus-sasl2/pkg/PLIST ./pkg/PLIST --- /usr/ports/security/cyrus-sasl2/pkg/PLIST Wed Jan 5 21:03:14 2005 +++ ./pkg/PLIST Tue Jun 21 03:46:06 2005 @@ -80,23 +80,23 @@ share/doc/sasl2/advanced.html share/doc/sasl2/appconvert.html share/doc/sasl2/components.html -share/doc/sasl2/draft-burdis-cat-srp-sasl-08.txt -share/doc/sasl2/draft-ietf-sasl-anon-02.txt -share/doc/sasl2/draft-ietf-sasl-crammd5-01.txt -share/doc/sasl2/draft-ietf-sasl-gssapi-00.txt -share/doc/sasl2/draft-ietf-sasl-plain-03.txt -share/doc/sasl2/draft-ietf-sasl-rfc2222bis-03.txt -share/doc/sasl2/draft-ietf-sasl-rfc2831bis-02.txt -share/doc/sasl2/draft-ietf-sasl-saslprep-04.txt -share/doc/sasl2/draft-murchison-sasl-login-00.txt -share/doc/sasl2/draft-newman-sasl-c-api-01.txt +share/doc/sasl2/draft-burdis-cat-srp-sasl-xx.txt +share/doc/sasl2/draft-ietf-sasl-anon-xx.txt +share/doc/sasl2/draft-ietf-sasl-crammd5-xx.txt +share/doc/sasl2/draft-ietf-sasl-gssapi-xx.txt +share/doc/sasl2/draft-ietf-sasl-plain-xx.txt +share/doc/sasl2/draft-ietf-sasl-rfc2222bis-xx.txt +share/doc/sasl2/draft-ietf-sasl-rfc2831bis-xx.txt +share/doc/sasl2/draft-ietf-sasl-saslprep-xx.txt +share/doc/sasl2/draft-murchison-sasl-login-xx.txt +share/doc/sasl2/draft-newman-sasl-c-api-xx.txt +share/doc/sasl2/draft-newman-sasl-passdss-xx.txt share/doc/sasl2/gssapi.html share/doc/sasl2/index.html share/doc/sasl2/install.html share/doc/sasl2/macosx.html share/doc/sasl2/mechanisms.html share/doc/sasl2/options.html -share/doc/sasl2/os390.html share/doc/sasl2/plugprog.html share/doc/sasl2/programming.html share/doc/sasl2/readme.html
