Date: Sat, 17 Nov 2018 18:47:45 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485191 - in head/security: cyrus-sasl2 cyrus-sasl2-gssapi cyrus-sasl2-ldapdb cyrus-sasl2-saslauthd cyrus-sasl2-sql cyrus-sasl2-srp cyrus-sasl2/files Message-ID: <201811171847.wAHIljH8010625@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Sat Nov 17 18:47:45 2018 New Revision: 485191 URL: https://svnweb.freebsd.org/changeset/ports/485191 Log: Update to 2.1.27. Deleted: head/security/cyrus-sasl2/files/patch-Makefile.am head/security/cyrus-sasl2/files/patch-crypto-compat.c head/security/cyrus-sasl2/files/patch-crypto-compat.h head/security/cyrus-sasl2/files/patch-include__sasl.h head/security/cyrus-sasl2/files/patch-lib_Makefile.am head/security/cyrus-sasl2/files/patch-libsasl2.pc.in head/security/cyrus-sasl2/files/patch-plugins_Makefile.am head/security/cyrus-sasl2/files/patch-plugins__ldapdb.c head/security/cyrus-sasl2/files/patch-plugins_ntlm.c head/security/cyrus-sasl2/files/patch-plugins_otp.c head/security/cyrus-sasl2/files/patch-plugins_passdss.c head/security/cyrus-sasl2/files/patch-plugins_srp.c head/security/cyrus-sasl2/files/patch-saslauthd_Makefile.am head/security/cyrus-sasl2/files/patch-saslauthd__configure head/security/cyrus-sasl2/files/patch-saslauthd__saslcache.c head/security/cyrus-sasl2/files/patch-saslauthd_lak.c head/security/cyrus-sasl2/files/patch-sasldb_db__ndbm.c Modified: head/security/cyrus-sasl2-gssapi/Makefile head/security/cyrus-sasl2-gssapi/pkg-descr head/security/cyrus-sasl2-ldapdb/Makefile head/security/cyrus-sasl2-ldapdb/pkg-descr head/security/cyrus-sasl2-saslauthd/Makefile head/security/cyrus-sasl2-saslauthd/pkg-descr head/security/cyrus-sasl2-saslauthd/pkg-plist head/security/cyrus-sasl2-sql/pkg-descr head/security/cyrus-sasl2-srp/pkg-descr head/security/cyrus-sasl2/Makefile head/security/cyrus-sasl2/Makefile.common head/security/cyrus-sasl2/distinfo head/security/cyrus-sasl2/files/patch-configure head/security/cyrus-sasl2/files/patch-plugins_gssapi.c head/security/cyrus-sasl2/files/pkg-deinstall.in head/security/cyrus-sasl2/files/pkg-install.in head/security/cyrus-sasl2/pkg-plist Modified: head/security/cyrus-sasl2-gssapi/Makefile ============================================================================== --- head/security/cyrus-sasl2-gssapi/Makefile Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2-gssapi/Makefile Sat Nov 17 18:47:45 2018 (r485191) @@ -1,7 +1,6 @@ # $FreeBSD$ PKGNAMESUFFIX= -gssapi -PORTREVISION= 7 COMMENT= SASL GSSAPI authentication plugin Modified: head/security/cyrus-sasl2-gssapi/pkg-descr ============================================================================== --- head/security/cyrus-sasl2-gssapi/pkg-descr Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2-gssapi/pkg-descr Sat Nov 17 18:47:45 2018 (r485191) @@ -1,3 +1,3 @@ SASL GSSAPI authentication plugin -WWW: http://cyrusimap.web.cmu.edu/ +WWW: https://www.cyrusimap.org/sasl/ Modified: head/security/cyrus-sasl2-ldapdb/Makefile ============================================================================== --- head/security/cyrus-sasl2-ldapdb/Makefile Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2-ldapdb/Makefile Sat Nov 17 18:47:45 2018 (r485191) @@ -1,15 +1,14 @@ # $FreeBSD$ PKGNAMESUFFIX= -ldapdb -PORTREVISION= 5 COMMENT= SASL LDAPDB auxprop plugin +CYRUS_CONFIGURE_ARGS= --enable-ldapdb --with-ldap=${LOCALBASE} + OPTIONS_DEFINE= OPENLDAP_SASL OPENLDAP_SASL_DESC= OpenLDAP client with SASL2 support OPENLDAP_SASL_VARS= WANT_OPENLDAP_SASL=yes - -CYRUS_CONFIGURE_ARGS= --enable-ldapdb --with-ldap=${LOCALBASE} USE_OPENLDAP= yes .if defined(WITH_OPENLDAP_VER) Modified: head/security/cyrus-sasl2-ldapdb/pkg-descr ============================================================================== --- head/security/cyrus-sasl2-ldapdb/pkg-descr Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2-ldapdb/pkg-descr Sat Nov 17 18:47:45 2018 (r485191) @@ -1,3 +1,3 @@ SASL LDAPDB auxprop plugin -WWW: http://cyrusimap.web.cmu.edu/ +WWW: https://www.cyrusimap.org/sasl/ Modified: head/security/cyrus-sasl2-saslauthd/Makefile ============================================================================== --- head/security/cyrus-sasl2-saslauthd/Makefile Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2-saslauthd/Makefile Sat Nov 17 18:47:45 2018 (r485191) @@ -1,7 +1,6 @@ # $FreeBSD$ PKGNAMESUFFIX= -saslauthd -PORTREVISION= 4 COMMENT= SASL authentication server for cyrus-sasl2 @@ -12,7 +11,7 @@ INSTALL_WRKSRC= ${WRKSRC}/saslauthd USE_RC_SUBR= saslauthd CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUNPATH} -CONFIGURE_ENV+= andrew_cv_runpath_switch=none +CONFIGURE_ENV+= andrew_cv_runpath_switch=none OPTIONS_DEFINE= DOCS HTTPFORM OPENLDAP OPENLDAP_SASL OPTIONS_RADIO= GSSAPI SASLDB @@ -56,6 +55,6 @@ GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=mit -DOCS= AUTHORS COPYING ChangeLog INSTALL LDAP_SASLAUTHD NEWS README +DOCS= COPYING ChangeLog LDAP_SASLAUTHD .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common" Modified: head/security/cyrus-sasl2-saslauthd/pkg-descr ============================================================================== --- head/security/cyrus-sasl2-saslauthd/pkg-descr Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2-saslauthd/pkg-descr Sat Nov 17 18:47:45 2018 (r485191) @@ -7,4 +7,4 @@ provide proxy authentication services to clients that understand SASL based authentication. -WWW: http://cyrusimap.web.cmu.edu/ +WWW: https://www.cyrusimap.org/sasl/ Modified: head/security/cyrus-sasl2-saslauthd/pkg-plist ============================================================================== --- head/security/cyrus-sasl2-saslauthd/pkg-plist Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2-saslauthd/pkg-plist Sat Nov 17 18:47:45 2018 (r485191) @@ -2,11 +2,4 @@ man/man8/saslauthd.8.gz sbin/saslauthd sbin/saslcache sbin/testsaslauthd -%%PORTDOCS%%%%DOCSDIR%%/saslauthd/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/saslauthd/COPYING -%%PORTDOCS%%%%DOCSDIR%%/saslauthd/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/saslauthd/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/saslauthd/LDAP_SASLAUTHD -%%PORTDOCS%%%%DOCSDIR%%/saslauthd/NEWS -%%PORTDOCS%%%%DOCSDIR%%/saslauthd/README %%RUNPATH%%@dir(cyrus,mail,750) /var/run/saslauthd Modified: head/security/cyrus-sasl2-sql/pkg-descr ============================================================================== --- head/security/cyrus-sasl2-sql/pkg-descr Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2-sql/pkg-descr Sat Nov 17 18:47:45 2018 (r485191) @@ -1,3 +1,3 @@ SASL SQL database plugin support -WWW: http://cyrusimap.web.cmu.edu/ +WWW: https://www.cyrusimap.org/sasl/ Modified: head/security/cyrus-sasl2-srp/pkg-descr ============================================================================== --- head/security/cyrus-sasl2-srp/pkg-descr Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2-srp/pkg-descr Sat Nov 17 18:47:45 2018 (r485191) @@ -1,3 +1,3 @@ SASL SRP authentication plugin -WWW: http://cyrusimap.web.cmu.edu/ +WWW: https://www.cyrusimap.org/sasl/ Modified: head/security/cyrus-sasl2/Makefile ============================================================================== --- head/security/cyrus-sasl2/Makefile Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2/Makefile Sat Nov 17 18:47:45 2018 (r485191) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 14 +#PORTREVISION= 0 COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) @@ -11,13 +11,13 @@ CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUN NO_OPTIONS_SORT= yes OPTIONS_DEFINE= ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \ - OBSOLETE_CRAM_ATTR + OBSOLETE_CRAM_ATTR OBSOLETE_DIGEST_ATTR OPTIONS_RADIO= SASLDB -OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM +OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM LMDB OPTIONS_GROUP= PLUGIN OPTIONS_GROUP_PLUGIN= ANONYMOUS CRAM DIGEST LOGIN NTLM OTP PLAIN SCRAM OPTIONS_DEFAULT= ANONYMOUS AUTHDAEMOND BDB1 OBSOLETE_CRAM_ATTR CRAM \ - DIGEST LOGIN NTLM OTP PLAIN SCRAM + OBSOLETE_DIGEST_ATTR DIGEST LOGIN NTLM OTP PLAIN SCRAM OPTIONS_SUB= yes ALWAYSTRUE_DESC= Alwaystrue password verifier (discouraged) ALWAYSTRUE_CONFIGURE_ENABLE=alwaystrue @@ -28,6 +28,8 @@ KEEP_DB_OPEN_DESC= Keep handle to Berkeley DB open KEEP_DB_OPEN_CONFIGURE_ENABLE=keep-db-open OBSOLETE_CRAM_ATTR_DESC=cmusaslsecretCRAM-MD5 auxprop property OBSOLETE_CRAM_ATTR_CONFIGURE_OFF=--enable-obsolete_cram_attr=no +OBSOLETE_DIGEST_ATTR_DESC=cmusaslsecretDIGEST-MD5 auxprop property +OBSOLETE_DIGEST_ATTR_CONFIGURE_OFF=--enable-obsolete_digest_attr=no SASLDB_DESC= SASLdb auxprop plugin BDB_USES= bdb BDB_CONFIGURE_ON= --with-dblib=berkeley \ @@ -38,6 +40,11 @@ BDB1_CONFIGURE_ON= --with-dblib=ndbm GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_ON= --with-dblib=gdbm \ --with-gdbm=${LOCALBASE} +LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support +LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb +LMDB_CONFIGURE_ON= --with-dblib=lmdb +LMDB_CFLAGS= -I${LOCALBASE}/include +LMDB_LDFLAGS= -L${LOCALBASE}/lib ANONYMOUS_DESC= ANONYMOUS authentication ANONYMOUS_CONFIGURE_ENABLE= anon CRAM_DESC= CRAM-MD5 authentication @@ -55,20 +62,6 @@ PLAIN_CONFIGURE_ENABLE= plain SCRAM_DESC= SCRAM authentication SCRAM_CONFIGURE_ENABLE= scram -DOCS= AUTHORS COPYING ChangeLog INSTALL INSTALL.TXT NEWS README - -DOC2= ONEWS TODO draft-burdis-cat-srp-sasl-xx.txt \ - draft-ietf-sasl-anon-xx.txt draft-ietf-sasl-crammd5-xx.txt \ - draft-ietf-sasl-gssapi-xx.txt draft-ietf-sasl-plain-xx.txt \ - draft-ietf-sasl-rfc2222bis-xx.txt draft-ietf-sasl-rfc2831bis-xx.txt \ - draft-ietf-sasl-saslprep-xx.txt draft-murchison-sasl-login-xx.txt \ - draft-newman-sasl-c-api-xx.txt rfc1321.txt rfc1939.txt rfc2104.txt \ - rfc2195.txt rfc2222.txt rfc2243.txt rfc2245.txt rfc2289.txt \ - rfc2444.txt rfc2595.txt rfc2831.txt rfc2945.txt rfc3174.txt \ - server-plugin-flow.fig testing.txt - -HTDOCS= advanced appconvert components gssapi index install macosx \ - mechanisms options plugprog programming readme sysadmin upgrading \ - windows +DOCS= AUTHORS COPYING ChangeLog INSTALL INSTALL.TXT README .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common" Modified: head/security/cyrus-sasl2/Makefile.common ============================================================================== --- head/security/cyrus-sasl2/Makefile.common Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2/Makefile.common Sat Nov 17 18:47:45 2018 (r485191) @@ -1,16 +1,17 @@ # $FreeBSD$ PORTNAME= cyrus-sasl -PORTVERSION= 2.1.26 +PORTVERSION= 2.1.27 CATEGORIES= security ipv6 -MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \ - http://cyrusimap.org/releases/ +MASTER_SITES= https://www.cyrusimap.org/releases/ \ + ftp://ftp.cyrusimap.org/cyrus-sasl/ MAINTAINER= ume@FreeBSD.org LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING +USES+= gmake USE_LDCONFIG= yes USES+= ssl GNU_CONFIGURE= yes @@ -83,6 +84,8 @@ CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} CPPFLAGS+= -fPIC .endif +PORTDOCS= * + .if ${CYRUS_BUILD_TARGET} == "cyrus-sasl" .if ${PORT_OPTIONS:MBDB1} @@ -90,7 +93,7 @@ SASLDB_NAME= sasldb2.db .elif ${PORT_OPTIONS:MBDB} INVALID_BDB_VER=2 SASLDB_NAME= sasldb2 -.elif ${PORT_OPTIONS:MGDBM} +.elif ${PORT_OPTIONS:MGDBM} || ${PORT_OPTIONS:MLMDB} SASLDB_NAME= sasldb2 .else SASLDB= "@comment " @@ -101,32 +104,19 @@ SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS SASLDB_NAME=${SASLDB_NAME} PLIST_SUB+= PREFIX=${PREFIX} \ - SASLDB=${SASLDB} \ - DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} + SASLDB=${SASLDB} -post-patch: -# Try to unbreak parallel (-jX) builds, part 1: make build commands atomic - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${PERL} -w0pi.bak \ - -e 's/(^\@am__fastdepCC_TRUE\@.*?) \ - \n\@am__fastdepCC_TRUE\@\s+(.*?)$$/$$1 && $$2/mgx' -# Part 2: prevent intermediate *.Tpo output files clash (use unique names) - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${PERL} -wpi.bak \ - -e 's/\$$\*\.Tpo/$$&.$$./g' - post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR}/html + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ + "! ( -path */html/_sources* -o -name .buildinfo \ + -o -name Makefile -o -name Makefile.in \ + -o -name Makefile.in.bak -o -name Makefile.am \ + -o -name NTMakefile -o -name .cvsignore )" .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.for f in ${DOC2} - @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} -.endfor -.for f in ${HTDOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html \ - ${STAGEDIR}${DOCSDIR}/html -.endfor - @${INSTALL_DATA} ${FILESDIR}/Sendmail.README \ - ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${STAGEDIR}${DOCSDIR} .elif ${CYRUS_BUILD_TARGET} == "saslauthd" @@ -145,19 +135,19 @@ RUNPATH= "@comment " .endif PLIST_SUB+= PREFIX=${PREFIX} \ - DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \ RUNPATH=${RUNPATH} SUB_LIST+= SASLAUTHD_RUNPATH=${SASLAUTHD_RUNPATH} do-build: - cd ${WRKSRC}/include && ${MAKE} -.if ${PORT_OPTIONS:MBDB1} || ${PORT_OPTIONS:MBDB} || ${PORT_OPTIONS:MGDBM} - cd ${WRKSRC}/sasldb && ${MAKE} -.endif - cd ${WRKSRC}/saslauthd && ${MAKE} - cd ${WRKSRC}/saslauthd && ${MAKE} saslcache - cd ${WRKSRC}/saslauthd && ${MAKE} testsaslauthd + cd ${WRKSRC}/include && gmake + cd ${WRKSRC}/common && gmake +#.if ${PORT_OPTIONS:MBDB1} || ${PORT_OPTIONS:MBDB} || ${PORT_OPTIONS:MGDBM} + cd ${WRKSRC}/sasldb && gmake +#.endif + cd ${WRKSRC}/saslauthd && gmake + cd ${WRKSRC}/saslauthd && gmake saslcache + cd ${WRKSRC}/saslauthd && gmake testsaslauthd post-install: @${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/saslcache \ @@ -190,8 +180,10 @@ post-patch: ${WRKSRC}/configure do-build: - cd ${WRKSRC}/include && ${MAKE} - cd ${WRKSRC}/plugins && ${MAKE} + cd ${WRKSRC}/include && gmake + cd ${WRKSRC}/common && gmake + cd ${WRKSRC}/lib && gmake libobj.la + cd ${WRKSRC}/plugins && gmake .endif Modified: head/security/cyrus-sasl2/distinfo ============================================================================== --- head/security/cyrus-sasl2/distinfo Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2/distinfo Sat Nov 17 18:47:45 2018 (r485191) @@ -1,2 +1,3 @@ -SHA256 (cyrus-sasl-2.1.26.tar.gz) = 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 -SIZE (cyrus-sasl-2.1.26.tar.gz) = 5220231 +TIMESTAMP = 1542468728 +SHA256 (cyrus-sasl-2.1.27.tar.gz) = 26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5 +SIZE (cyrus-sasl-2.1.27.tar.gz) = 4111249 Modified: head/security/cyrus-sasl2/files/patch-configure ============================================================================== --- head/security/cyrus-sasl2/files/patch-configure Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2/files/patch-configure Sat Nov 17 18:47:45 2018 (r485191) @@ -1,41 +1,15 @@ -Index: configure -diff -u configure.orig configure ---- configure.orig 2012-11-07 04:21:37.000000000 +0900 -+++ configure 2014-03-25 18:24:59.021374856 +0900 -@@ -2365,6 +2365,7 @@ - fi - { $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" - # Use a double $ so make ignores it. -@@ -6329,6 +6330,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <stdio.h> - #include <db.h> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" -@@ -7156,6 +7158,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <stdio.h> - #include <db.h> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" -@@ -8700,6 +8703,8 @@ +--- configure.orig 2017-11-30 21:15:59 UTC ++++ configure +@@ -15415,6 +15415,8 @@ else SASLAUTHD_TRUE='#' SASLAUTHD_FALSE= fi +SASLAUTHD_TRUE='#' +SASLAUTHD_FALSE= - { $as_echo "$as_me:$LINENO: checking if I should include saslauthd" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if I should include saslauthd" >&5 $as_echo_n "checking if I should include saslauthd... " >&6; } -@@ -12552,6 +12557,7 @@ +@@ -17029,6 +17031,7 @@ fi gssapi_dir="${gssapi}/lib" GSSAPIBASE_LIBS="-L$gssapi_dir" GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir" @@ -43,54 +17,21 @@ diff -u configure.orig configure else # FIXME: This is only used for building cyrus, and then only as # a real hack. it needs to be fixed. -@@ -12571,7 +12577,7 @@ +@@ -17048,7 +17051,7 @@ if ${ac_cv_lib_gssapi_gss_unwrap+:} fals $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} `${gssapi_bindir}krb5-config --libs gssapi` $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -13047,7 +13053,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}" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -17308,7 +17311,7 @@ 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" + CPPFLAGS="$CPPFLAGS" - GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" + GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `${gssapi_bindir}krb5-config --libs gssapi`" 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 -@@ -14479,7 +14485,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 - /* confdefs.h. */ - _ACEOF -@@ -14591,9 +14597,9 @@ - $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;; - *) - if test -d ${with_sqlite}/lib; then -- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib" -+ LIB_SQLITE="-L${with_sqlite}/lib $andrew_cv_runpath_switch${with_sqlite}/lib" - else -- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}" -+ LIB_SQLITE="-L${with_sqlite} $andrew_cv_runpath_switch${with_sqlite}" - fi - - LIB_SQLITE_DIR=$LIB_SQLITE -@@ -14721,9 +14727,9 @@ - $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;; - *) - if test -d ${with_sqlite3}/lib; then -- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib" -+ LIB_SQLITE3="-L${with_sqlite3}/lib $andrew_cv_runpath_switch${with_sqlite3}/lib" - else -- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}" -+ LIB_SQLITE3="-L${with_sqlite3} $andrew_cv_runpath_switch${with_sqlite3}" - fi - - LIB_SQLITE3_DIR=$LIB_SQLITE3 Modified: head/security/cyrus-sasl2/files/patch-plugins_gssapi.c ============================================================================== --- head/security/cyrus-sasl2/files/patch-plugins_gssapi.c Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2/files/patch-plugins_gssapi.c Sat Nov 17 18:47:45 2018 (r485191) @@ -1,11 +1,11 @@ ---- plugins/gssapi.c.orig +--- plugins/gssapi.c.orig 2016-01-30 14:06:08 UTC +++ plugins/gssapi.c -@@ -1490,8 +1490,10 @@ +@@ -1531,8 +1531,10 @@ static int gssapi_client_mech_step(void *clientout = NULL; *clientoutlen = 0; +#if 0 - params->utils->log(NULL, SASL_LOG_DEBUG, + params->utils->log(params->utils->conn, SASL_LOG_DEBUG, "GSSAPI client step %d", text->state); +#endif Modified: head/security/cyrus-sasl2/files/pkg-deinstall.in ============================================================================== --- head/security/cyrus-sasl2/files/pkg-deinstall.in Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2/files/pkg-deinstall.in Sat Nov 17 18:47:45 2018 (r485191) @@ -18,6 +18,9 @@ delete_sasldb() { if [ -f ${SASLDB_NAME} ] ; then if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ]; then rm ${SASLDB_NAME} + if [ -f ${SASLDB_NAME}-lock ] ; then + rm ${SASLDB_NAME}-lock + fi else echo "WARNING: Users SASL passwords are in ${SASLDB_NAME}, keeping this file" fi Modified: head/security/cyrus-sasl2/files/pkg-install.in ============================================================================== --- head/security/cyrus-sasl2/files/pkg-install.in Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2/files/pkg-install.in Sat Nov 17 18:47:45 2018 (r485191) @@ -78,6 +78,10 @@ create_sasldb() { ${PKG_PREFIX}/sbin/saslpasswd2 -d ${CYRUS_USER} chown ${CYRUS_USER}:mail ${SASLDB_NAME} chmod 640 ${SASLDB_NAME} + if [ -f ${SASLDB_NAME}-lock ]; then + chown ${CYRUS_USER}:mail ${SASLDB_NAME}-lock + chmod 640 ${SASLDB_NAME}-lock + fi fi fi } Modified: head/security/cyrus-sasl2/pkg-plist ============================================================================== --- head/security/cyrus-sasl2/pkg-plist Sat Nov 17 18:43:53 2018 (r485190) +++ head/security/cyrus-sasl2/pkg-plist Sat Nov 17 18:47:45 2018 (r485191) @@ -105,53 +105,3 @@ man/man8/pluginviewer.8.gz sbin/pluginviewer %%SASLDB%%sbin/sasldblistusers2 %%SASLDB%%sbin/saslpasswd2 -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.TXT -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/ONEWS -%%PORTDOCS%%%%DOCSDIR%%/Sendmail.README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-xx.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-anon-xx.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-crammd5-xx.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-gssapi-xx.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-xx.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2222bis-xx.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-xx.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-saslprep-xx.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-murchison-sasl-login-xx.txt -%%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-xx.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc1939.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2195.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2222.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2243.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2245.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2289.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2444.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2595.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2831.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2945.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc3174.txt -%%PORTDOCS%%%%DOCSDIR%%/server-plugin-flow.fig -%%PORTDOCS%%%%DOCSDIR%%/testing.txt -%%PORTDOCS%%%%DOCSDIR%%/html/advanced.html -%%PORTDOCS%%%%DOCSDIR%%/html/appconvert.html -%%PORTDOCS%%%%DOCSDIR%%/html/components.html -%%PORTDOCS%%%%DOCSDIR%%/html/gssapi.html -%%PORTDOCS%%%%DOCSDIR%%/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/install.html -%%PORTDOCS%%%%DOCSDIR%%/html/macosx.html -%%PORTDOCS%%%%DOCSDIR%%/html/mechanisms.html -%%PORTDOCS%%%%DOCSDIR%%/html/options.html -%%PORTDOCS%%%%DOCSDIR%%/html/plugprog.html -%%PORTDOCS%%%%DOCSDIR%%/html/programming.html -%%PORTDOCS%%%%DOCSDIR%%/html/readme.html -%%PORTDOCS%%%%DOCSDIR%%/html/sysadmin.html -%%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html -%%PORTDOCS%%%%DOCSDIR%%/html/windows.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811171847.wAHIljH8010625>