Hi. This diff updates cyrus-sasl2 to the latest release. Tests and comments appreciated.
Thanks. Index: Makefile =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/Makefile,v retrieving revision 1.66 diff -u -r1.66 Makefile --- Makefile 23 Apr 2012 17:15:18 -0000 1.66 +++ Makefile 20 Nov 2012 07:47:59 -0000 @@ -2,22 +2,9 @@ COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) -DISTNAME= cyrus-sasl-2.1.25 -REVISION= 3 +DISTNAME= cyrus-sasl-2.1.26 -SHARED_LIBS += anonymous 2.22 # 2.25 -SHARED_LIBS += crammd5 2.22 # 2.25 -SHARED_LIBS += digestmd5 2.22 # 2.25 -SHARED_LIBS += gssapiv2 2.22 # 2.25 -SHARED_LIBS += ldapdb 2.22 # 2.25 -SHARED_LIBS += login 2.22 # 2.25 -SHARED_LIBS += ntlm 2.22 # 2.25 -SHARED_LIBS += otp 2.22 # 2.25 -SHARED_LIBS += plain 2.22 # 2.25 -SHARED_LIBS += sasl2 2.23 # 2.25 -SHARED_LIBS += sasldb 2.22 # 2.25 -SHARED_LIBS += scram 0.0 # 2.25 -SHARED_LIBS += sql 2.22 # 2.25 +SHARED_LIBS += sasl2 3.0 # 3.0 CATEGORIES= security @@ -121,9 +108,6 @@ --with-sqlite3 .endif -post-extract: - rm ${WRKSRC}/cmulocal/sasl2.m4.orig - pre-configure: perl -pi -e "s,/usr/local/etc,${SYSCONFDIR},g" \ ${WRKSRC}/saslauthd/saslauthd.mdoc \ @@ -131,18 +115,19 @@ perl -pi -e 's,-lresolv,,g' ${WRKSRC}/{,saslauthd}/configure post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sasl2 - ${INSTALL_DATA} ${WRKSRC}/doc/{*.html,*.txt} ${PREFIX}/share/doc/sasl2 - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sasl2 + rm ${PREFIX}/lib/sasl2/*.a + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cyrus-sasl + ${INSTALL_DATA} ${WRKSRC}/doc/{*.html,*.txt} ${PREFIX}/share/doc/cyrus-sasl + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cyrus-sasl .if ${FLAVOR:L:Mmysql} || ${FLAVOR:L:Mpgsql} || ${FLAVOR:L:Msqlite3} ${INSTALL_DATA} ${FILESDIR}/Sendmail.conf-sql \ - ${PREFIX}/share/examples/sasl2 + ${PREFIX}/share/examples/cyrus-sasl .endif .if ${FLAVOR:L:Mldap} ${INSTALL_DATA} ${WRKSRC}/saslauthd/LDAP_SASLAUTHD \ - ${PREFIX}/share/doc/sasl2 - sed -e 's,!!PREFIX!!,${TRUEPREFIX},g' ${FILESDIR}/saslauthd.conf > \ - ${PREFIX}/share/examples/sasl2/saslauthd.conf + ${PREFIX}/share/doc/cyrus-sasl + ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/saslauthd.conf \ + ${PREFIX}/share/examples/cyrus-sasl/saslauthd.conf .endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/distinfo,v retrieving revision 1.14 diff -u -r1.14 distinfo --- distinfo 20 Sep 2011 23:01:29 -0000 1.14 +++ distinfo 20 Nov 2012 07:47:59 -0000 @@ -1,5 +1,2 @@ -MD5 (cyrus-sasl-2.1.25.tar.gz) = NBz/6Cmk1x8qZQPWadWpRg== -RMD160 (cyrus-sasl-2.1.25.tar.gz) = ye2Qk4KPf3uxs1yKaQytvNRPOGI= -SHA1 (cyrus-sasl-2.1.25.tar.gz) = tsNEJgEtm11EjVZGy+zYGKXurL8= -SHA256 (cyrus-sasl-2.1.25.tar.gz) = QYwW5iQKT5tjfL49YpN7lnVie60nxiIZHUfehob+JP4= -SIZE (cyrus-sasl-2.1.25.tar.gz) = 5209240 +SHA256 (cyrus-sasl-2.1.26.tar.gz) = j7xRNlErWbt5Nlfzb63aY1nK47CPAf0Ws9QG8TRbe8M= +SIZE (cyrus-sasl-2.1.26.tar.gz) = 5220231 Index: files/saslauthd.conf =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/files/saslauthd.conf,v retrieving revision 1.1 diff -u -r1.1 saslauthd.conf --- files/saslauthd.conf 15 Mar 2008 12:50:46 -0000 1.1 +++ files/saslauthd.conf 20 Nov 2012 07:47:59 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: saslauthd.conf,v 1.1 2008/03/15 12:50:46 ajacoutot Exp $ # auth_ldap authentication/authorization module for saslauthd -# see !!PREFIX!!/share/doc/sasl2/LDAP_SASLAUTHD for details +# see ${TRUEPREFIX}/share/doc/sasl2/LDAP_SASLAUTHD for details # ldap_bind_dn: # ldap_bind_pw: Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/patches/patch-configure,v retrieving revision 1.12 diff -u -r1.12 patch-configure --- patches/patch-configure 20 Sep 2011 23:01:29 -0000 1.12 +++ patches/patch-configure 20 Nov 2012 07:47:59 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.12 2011/09/20 23:01:29 ajacoutot Exp $ ---- configure.orig Mon Sep 19 10:26:33 2011 -+++ configure Mon Sep 19 10:29:11 2011 -@@ -11974,6 +11974,9 @@ if test "$gssapi" != no; then +--- configure.orig Tue Nov 6 20:21:37 2012 ++++ configure Tue Nov 20 07:59:02 2012 +@@ -12008,6 +12008,9 @@ if test "$gssapi" != no; then ###_AIX platform=__aix ;; @@ -11,7 +11,7 @@ *) { $as_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 $as_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;} -@@ -11988,7 +11991,7 @@ $as_echo "$as_me: error: CyberSafe was forced, cannot +@@ -12022,7 +12025,7 @@ $as_echo "$as_me: error: CyberSafe was forced, cannot cmu_saved_CPPFLAGS=$CPPFLAGS if test -d ${gssapi}; then @@ -20,7 +20,7 @@ # We want to keep -I in our CPPFLAGS, but only if we succeed cmu_saved_CPPFLAGS=$CPPFLAGS ### I am not sure how useful is this (and whether this is required at all -@@ -12537,7 +12540,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th +@@ -12571,7 +12574,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29,7 +29,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -13013,8 +13016,8 @@ fi +@@ -13047,8 +13050,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 ${K5SUPSTATIC}" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" Index: patches/patch-plugins_Makefile_in =================================================================== RCS file: patches/patch-plugins_Makefile_in diff -N patches/patch-plugins_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-plugins_Makefile_in 20 Nov 2012 07:47:59 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- plugins/Makefile.in.orig Tue Nov 20 08:27:40 2012 ++++ plugins/Makefile.in Tue Nov 20 08:27:51 2012 +@@ -364,7 +364,7 @@ top_srcdir = @top_srcdir@ + # CURRENT:REVISION:AGE + plugin_version = 3:0:0 + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include +-AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version) ++AM_LDFLAGS = -module -avoid-version -export-dynamic -rpath $(plugindir) -version-info $(plugin_version) + COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ + EXTRA_DIST = makeinit.sh NTMakefile + noinst_SCRIPTS = makeinit.sh Index: patches/patch-plugins_gssapi_c =================================================================== RCS file: patches/patch-plugins_gssapi_c diff -N patches/patch-plugins_gssapi_c --- patches/patch-plugins_gssapi_c 7 Feb 2012 06:36:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-plugins_gssapi_c,v 1.1 2012/02/07 06:36:39 ajacoutot Exp $ - -From fa289f15ceb2b9c64bdcf057a75469808454190d Mon Sep 17 00:00:00 2001 -From: Alexey Melnikov <alexey.melni...@isode.com> -Date: Fri, 07 Oct 2011 11:22:47 +0000 -Subject: Fixed a segfault in gssapi.c (Patch by Phil Pennock) - ---- plugins/gssapi.c.orig Wed May 11 21:25:55 2011 -+++ plugins/gssapi.c Mon Feb 6 11:48:42 2012 -@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const struct iovec *inv - } - - if (output_token->value && output) { -- unsigned char * p = (unsigned char *) text->encode_buf; -+ unsigned char * p; - - ret = _plug_buf_alloc(text->utils, - &(text->encode_buf), -@@ -383,6 +383,8 @@ sasl_gss_encode(void *context, const struct iovec *inv - GSS_UNLOCK_MUTEX(text->utils); - return ret; - } -+ -+ p = (unsigned char *) text->encode_buf; - - p[0] = (output_token->length>>24) & 0xFF; - p[1] = (output_token->length>>16) & 0xFF; Index: patches/patch-saslauthd_configure =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/patches/patch-saslauthd_configure,v retrieving revision 1.15 diff -u -r1.15 patch-saslauthd_configure --- patches/patch-saslauthd_configure 20 Sep 2011 23:01:29 -0000 1.15 +++ patches/patch-saslauthd_configure 20 Nov 2012 07:47:59 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-saslauthd_configure,v 1.15 2011/09/20 23:01:29 ajacoutot Exp $ ---- saslauthd/configure.orig Fri Sep 2 17:40:17 2011 -+++ saslauthd/configure Mon Sep 19 15:34:17 2011 +--- saslauthd/configure.orig Tue Nov 6 20:21:44 2012 ++++ saslauthd/configure Tue Nov 20 07:59:02 2012 @@ -7757,6 +7757,9 @@ if test "$gssapi" != no; then ###_AIX platform=__aix @@ -40,7 +40,7 @@ elif test "$gss_impl" = "cybersafe03"; then # Version of CyberSafe with two libraries CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include" -@@ -11596,7 +11599,7 @@ fi +@@ -11717,7 +11720,7 @@ fi Index: pkg/PFRAG.ldap =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/pkg/PFRAG.ldap,v retrieving revision 1.4 diff -u -r1.4 PFRAG.ldap --- pkg/PFRAG.ldap 22 Dec 2011 10:00:35 -0000 1.4 +++ pkg/PFRAG.ldap 20 Nov 2012 07:47:59 -0000 @@ -1,9 +1,6 @@ @comment $OpenBSD: PFRAG.ldap,v 1.4 2011/12/22 10:00:35 ajacoutot Exp $ %%SHARED%% -@comment lib/sasl2/libldapdb.a -@comment lib/sasl2/libldapdb.la -share/doc/sasl2/LDAP_SASLAUTHD -share/examples/sasl2/saslauthd.conf +share/doc/cyrus-sasl/LDAP_SASLAUTHD +share/examples/cyrus-sasl/saslauthd.conf @mode 640 @sample ${SYSCONFDIR}/saslauthd.conf -@mode Index: pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/pkg/PFRAG.shared,v retrieving revision 1.15 diff -u -r1.15 PFRAG.shared --- pkg/PFRAG.shared 20 Sep 2011 23:01:29 -0000 1.15 +++ pkg/PFRAG.shared 20 Nov 2012 07:47:59 -0000 @@ -1,12 +1,23 @@ @comment $OpenBSD: PFRAG.shared,v 1.15 2011/09/20 23:01:29 ajacoutot Exp $ @lib lib/libsasl2.so.${LIBsasl2_VERSION} -@lib lib/sasl2/libanonymous.so.${LIBanonymous_VERSION} -@lib lib/sasl2/libcrammd5.so.${LIBcrammd5_VERSION} -@lib lib/sasl2/libdigestmd5.so.${LIBdigestmd5_VERSION} -@lib lib/sasl2/libgssapiv2.so.${LIBgssapiv2_VERSION} -@lib lib/sasl2/liblogin.so.${LIBlogin_VERSION} -@lib lib/sasl2/libntlm.so.${LIBntlm_VERSION} -@lib lib/sasl2/libotp.so.${LIBotp_VERSION} -@lib lib/sasl2/libplain.so.${LIBplain_VERSION} -@lib lib/sasl2/libsasldb.so.${LIBsasldb_VERSION} -@lib lib/sasl2/libscram.so.${LIBscram_VERSION} +lib/sasl2/ +lib/sasl2/libanonymous.la +lib/sasl2/libanonymous.so +lib/sasl2/libcrammd5.la +lib/sasl2/libcrammd5.so +lib/sasl2/libdigestmd5.la +lib/sasl2/libdigestmd5.so +lib/sasl2/libgssapiv2.la +lib/sasl2/libgssapiv2.so +lib/sasl2/liblogin.la +lib/sasl2/liblogin.so +lib/sasl2/libntlm.la +lib/sasl2/libntlm.so +lib/sasl2/libotp.la +lib/sasl2/libotp.so +lib/sasl2/libplain.la +lib/sasl2/libplain.so +lib/sasl2/libsasldb.la +lib/sasl2/libsasldb.so +lib/sasl2/libscram.la +lib/sasl2/libscram.so Index: pkg/PFRAG.shared-ldap =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/pkg/PFRAG.shared-ldap,v retrieving revision 1.1 diff -u -r1.1 PFRAG.shared-ldap --- pkg/PFRAG.shared-ldap 14 May 2008 07:38:42 -0000 1.1 +++ pkg/PFRAG.shared-ldap 20 Nov 2012 07:47:59 -0000 @@ -1,2 +1,3 @@ @comment $OpenBSD: PFRAG.shared-ldap,v 1.1 2008/05/14 07:38:42 ajacoutot Exp $ -@lib lib/sasl2/libldapdb.so.${LIBldapdb_VERSION} +lib/sasl2/libldapdb.la +lib/sasl2/libldapdb.so Index: pkg/PFRAG.shared-sql =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/pkg/PFRAG.shared-sql,v retrieving revision 1.4 diff -u -r1.4 PFRAG.shared-sql --- pkg/PFRAG.shared-sql 18 Jun 2007 12:31:20 -0000 1.4 +++ pkg/PFRAG.shared-sql 20 Nov 2012 07:47:59 -0000 @@ -1,2 +1,3 @@ @comment $OpenBSD: PFRAG.shared-sql,v 1.4 2007/06/18 12:31:20 ajacoutot Exp $ -@lib lib/sasl2/libsql.so.${LIBsql_VERSION} +lib/sasl2/libsql.la +lib/sasl2/libsql.so Index: pkg/PFRAG.sql =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/pkg/PFRAG.sql,v retrieving revision 1.8 diff -u -r1.8 PFRAG.sql --- pkg/PFRAG.sql 20 Sep 2011 23:01:29 -0000 1.8 +++ pkg/PFRAG.sql 20 Nov 2012 07:47:59 -0000 @@ -1,5 +1,3 @@ @comment $OpenBSD: PFRAG.sql,v 1.8 2011/09/20 23:01:29 ajacoutot Exp $ %%SHARED%% -@comment lib/sasl2/libsql.a -@comment lib/sasl2/libsql.la -share/examples/sasl2/Sendmail.conf-sql +share/examples/cyrus-sasl/Sendmail.conf-sql Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/security/cyrus-sasl2/pkg/PLIST,v retrieving revision 1.25 diff -u -r1.25 PLIST --- pkg/PLIST 22 Dec 2011 10:00:35 -0000 1.25 +++ pkg/PLIST 20 Nov 2012 07:47:59 -0000 @@ -11,27 +11,8 @@ include/sasl/saslutil.h lib/libsasl2.a lib/libsasl2.la -lib/sasl2/ -@comment lib/sasl2/libanonymous.a -lib/sasl2/libanonymous.la -@comment lib/sasl2/libcrammd5.a -lib/sasl2/libcrammd5.la -@comment lib/sasl2/libdigestmd5.a -lib/sasl2/libdigestmd5.la -@comment lib/sasl2/libgssapiv2.a -lib/sasl2/libgssapiv2.la -@comment lib/sasl2/liblogin.a -lib/sasl2/liblogin.la -@comment lib/sasl2/libntlm.a -lib/sasl2/libntlm.la -@comment lib/sasl2/libotp.a -lib/sasl2/libotp.la -@comment lib/sasl2/libplain.a -lib/sasl2/libplain.la -@comment lib/sasl2/libsasldb.a -lib/sasl2/libsasldb.la -@comment lib/sasl2/libscram.a -lib/sasl2/libscram.la +lib/pkgconfig/ +lib/pkgconfig/libsasl2.pc @man man/man3/sasl.3 @man man/man3/sasl_authorize_t.3 @man man/man3/sasl_auxprop.3 @@ -84,48 +65,48 @@ @bin sbin/sasldblistusers2 @bin sbin/saslpasswd2 @bin sbin/testsaslauthd -share/doc/sasl2/ -share/doc/sasl2/advanced.html -share/doc/sasl2/appconvert.html -share/doc/sasl2/components.html -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/plugprog.html -share/doc/sasl2/programming.html -share/doc/sasl2/readme.html -share/doc/sasl2/rfc1321.txt -share/doc/sasl2/rfc1939.txt -share/doc/sasl2/rfc2104.txt -share/doc/sasl2/rfc2195.txt -share/doc/sasl2/rfc2222.txt -share/doc/sasl2/rfc2243.txt -share/doc/sasl2/rfc2245.txt -share/doc/sasl2/rfc2289.txt -share/doc/sasl2/rfc2444.txt -share/doc/sasl2/rfc2595.txt -share/doc/sasl2/rfc2831.txt -share/doc/sasl2/rfc2945.txt -share/doc/sasl2/rfc3174.txt -share/doc/sasl2/sysadmin.html -share/doc/sasl2/testing.txt -share/doc/sasl2/upgrading.html -share/doc/sasl2/windows.html -share/examples/sasl2/ +share/doc/cyrus-sasl/ +share/doc/cyrus-sasl/advanced.html +share/doc/cyrus-sasl/appconvert.html +share/doc/cyrus-sasl/components.html +share/doc/cyrus-sasl/draft-burdis-cat-srp-sasl-xx.txt +share/doc/cyrus-sasl/draft-ietf-sasl-anon-xx.txt +share/doc/cyrus-sasl/draft-ietf-sasl-crammd5-xx.txt +share/doc/cyrus-sasl/draft-ietf-sasl-gssapi-xx.txt +share/doc/cyrus-sasl/draft-ietf-sasl-plain-xx.txt +share/doc/cyrus-sasl/draft-ietf-sasl-rfc2222bis-xx.txt +share/doc/cyrus-sasl/draft-ietf-sasl-rfc2831bis-xx.txt +share/doc/cyrus-sasl/draft-ietf-sasl-saslprep-xx.txt +share/doc/cyrus-sasl/draft-murchison-sasl-login-xx.txt +share/doc/cyrus-sasl/draft-newman-sasl-c-api-xx.txt +share/doc/cyrus-sasl/draft-newman-sasl-passdss-xx.txt +share/doc/cyrus-sasl/gssapi.html +share/doc/cyrus-sasl/index.html +share/doc/cyrus-sasl/install.html +share/doc/cyrus-sasl/macosx.html +share/doc/cyrus-sasl/mechanisms.html +share/doc/cyrus-sasl/options.html +share/doc/cyrus-sasl/plugprog.html +share/doc/cyrus-sasl/programming.html +share/doc/cyrus-sasl/readme.html +share/doc/cyrus-sasl/rfc1321.txt +share/doc/cyrus-sasl/rfc1939.txt +share/doc/cyrus-sasl/rfc2104.txt +share/doc/cyrus-sasl/rfc2195.txt +share/doc/cyrus-sasl/rfc2222.txt +share/doc/cyrus-sasl/rfc2243.txt +share/doc/cyrus-sasl/rfc2245.txt +share/doc/cyrus-sasl/rfc2289.txt +share/doc/cyrus-sasl/rfc2444.txt +share/doc/cyrus-sasl/rfc2595.txt +share/doc/cyrus-sasl/rfc2831.txt +share/doc/cyrus-sasl/rfc2945.txt +share/doc/cyrus-sasl/rfc3174.txt +share/doc/cyrus-sasl/sysadmin.html +share/doc/cyrus-sasl/testing.txt +share/doc/cyrus-sasl/upgrading.html +share/doc/cyrus-sasl/windows.html +share/examples/cyrus-sasl/ %%ldap%% %%sql%% %%SHARED%%