Index: head/security/cyrus-sasl2/Makefile =================================================================== --- head/security/cyrus-sasl2/Makefile (revision 409942) +++ head/security/cyrus-sasl2/Makefile (revision 409943) @@ -1,67 +1,86 @@ # $FreeBSD$ PORTREVISION= 12 COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) USES= cpe libtool:keepla pathfix perl5 USE_PERL5= patch -CONFIGURE_ARGS+=--enable-auth-sasldb \ - --with-saslauthd=${SASLAUTHD_RUNPATH} +CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUNPATH} NO_OPTIONS_SORT= yes OPTIONS_DEFINE= ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \ - OBSOLETE_CRAM_ATTR BDB MYSQL PGSQL -OPTIONS_RADIO= SQLITE + OBSOLETE_CRAM_ATTR MYSQL PGSQL +OPTIONS_RADIO= SASLDB SQLITE +OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM OPTIONS_RADIO_SQLITE= SQLITE2 SQLITE3 OPTIONS_GROUP= PLUGIN OPTIONS_GROUP_PLUGIN= ANONYMOUS CRAM DIGEST LOGIN NTLM OTP PLAIN SCRAM -OPTIONS_DEFAULT= ANONYMOUS AUTHDAEMOND OBSOLETE_CRAM_ATTR CRAM DIGEST \ - LOGIN NTLM OTP PLAIN SCRAM +OPTIONS_DEFAULT= ANONYMOUS AUTHDAEMOND BDB1 OBSOLETE_CRAM_ATTR CRAM \ + DIGEST LOGIN NTLM OTP PLAIN SCRAM OPTIONS_SUB= yes ALWAYSTRUE_DESC= Alwaystrue password verifier (discouraged) ALWAYSTRUE_CONFIGURE_ENABLE=alwaystrue AUTHDAEMOND_DESC= Use of authdaemon AUTHDAEMOND_CONFIGURE_ON=--with-authdaemond=/var/run/authdaemond/socket AUTHDAEMOND_CONFIGURE_OFF=--with-authdaemond=no 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 +SASLDB_DESC= SASLdb auxprop plugin BDB_USE= BDB=yes BDB_CONFIGURE_ON= --with-dblib=berkeley \ --with-bdb-libdir=${BDB_LIB_DIR} \ --with-bdb-incdir=${BDB_INCLUDE_DIR} \ --with-bdb=${BDB_LIB_NAME} -BDB_CONFIGURE_OFF= --with-dblib=ndbm +BDB1_CONFIGURE_ON= --with-dblib=ndbm +GDBM_CONFIGURE_ON= --with-dblib=gdbm \ + --with-gdbm=${LOCALBASE} MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_CONFIGURE_OFF= --without-mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-pgsql SQLITE2_USE= SQLITE=2 SQLITE2_CONFIGURE_ON= --with-sqlite=${LOCALBASE} SQLITE2_CONFIGURE_OFF= --without-sqlite SQLITE3_USE= SQLITE=3 SQLITE3_CONFIGURE_ON= --with-sqlite3=${LOCALBASE} SQLITE3_CONFIGURE_OFF= --without-sqlite3 ANONYMOUS_DESC= ANONYMOUS authentication ANONYMOUS_CONFIGURE_ENABLE= anon CRAM_DESC= CRAM-MD5 authentication CRAM_CONFIGURE_ENABLE= cram DIGEST_DESC= DIGEST-MD5 authentication DIGEST_CONFIGURE_ENABLE=digest LOGIN_DESC= LOGIN authentication LOGIN_CONFIGURE_ENABLE= login NTLM_DESC= NTLM authentication NTLM_CONFIGURE_ENABLE= ntlm OTP_DESC= OTP authentication OTP_CONFIGURE_ENABLE= otp PLAIN_DESC= PLAIN authentication 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 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common" Index: head/security/cyrus-sasl2/Makefile.common =================================================================== --- head/security/cyrus-sasl2/Makefile.common (revision 409942) +++ head/security/cyrus-sasl2/Makefile.common (revision 409943) @@ -1,219 +1,206 @@ # $FreeBSD$ PORTNAME= cyrus-sasl PORTVERSION= 2.1.26 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \ http://cyrusimap.org/releases/ MAINTAINER= ume@FreeBSD.org LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc \ --with-configdir=${PREFIX}/lib/sasl2:${PREFIX}/etc/sasl2 \ --with-plugindir=${PREFIX}/lib/sasl2 \ --with-dbpath=${PREFIX}/etc/sasldb2 \ --with-lib-subdir=lib \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --includedir=${PREFIX}/include \ --enable-static \ --with-rc4=openssl CONFIGURE_ARGS+=--disable-anon \ --disable-cram \ --disable-digest \ --disable-gssapi \ --disable-krb4 \ + --disable-login \ --disable-ntlm \ --disable-otp \ --disable-plain \ - --disable-scram + --disable-scram \ + --disable-srp \ + --with-dblib=none +CONFIGURE_ARGS+=${CYRUS_CONFIGURE_ARGS} MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP} DOCSDIR= ${PREFIX}/share/doc/cyrus-sasl2 CPE_VENDOR= cmu SASLAUTHD_RUNPATH?= /var/run/saslauthd CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus CYRUS_SASL2_DIR=${MASTERDIR}/../../security/cyrus-sasl2 DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files .if defined(PKGNAMESUFFIX) CYRUS_BUILD_TARGET?= ${PKGNAMESUFFIX:S/^-//} .else CYRUS_BUILD_TARGET?= ${PORTNAME} .endif .if ${CYRUS_BUILD_TARGET} != "cyrus-sasl" && ${CYRUS_BUILD_TARGET} != "saslauthd" INSTALL_WRKSRC= ${WRKSRC}/plugins LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 USES= libtool:build -CONFIGURE_ARGS+=--with-dblib=none PLIST_FILES+= lib/sasl2/lib${CYRUS_BUILD_TARGET}.a \ lib/sasl2/lib${CYRUS_BUILD_TARGET}.so \ lib/sasl2/lib${CYRUS_BUILD_TARGET}.so.3 \ lib/sasl2/lib${CYRUS_BUILD_TARGET}.so.3.0.0 .endif .include .if ${OPENSSLBASE} == /usr CONFIGURE_ARGS+=--with-openssl=yes .else CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif +.if ${ARCH} == "amd64" +CPPFLAGS+= -fPIC +.endif + .if ${CYRUS_BUILD_TARGET} == "cyrus-sasl" -.if ${PORT_OPTIONS:MBDB} +.if ${PORT_OPTIONS:MBDB1} +SASLDB_NAME= sasldb2.db +.elif ${PORT_OPTIONS:MBDB} INVALID_BDB_VER=2 SASLDB_NAME= sasldb2 +.elif ${PORT_OPTIONS:MGDBM} +SASLDB_NAME= sasldb2 .else -SASLDB_NAME= sasldb2.db +SASLDB= "@comment " .endif .if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL} || \ ${PORT_OPTIONS:MSQLITE2} || ${PORT_OPTIONS:MSQLITE3} CONFIGURE_ARGS+=--enable-sql .else SQL= "@comment " .endif -.if ${ARCH} == "amd64" -CPPFLAGS+= -fPIC -.endif - -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 - SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} \ - SASLDB=${SASLDB_NAME} + SASLDB_NAME=${SASLDB_NAME} PLIST_SUB+= PREFIX=${PREFIX} \ + SASLDB=${SASLDB} \ SQL=${SQL} \ DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} 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 .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} .elif ${CYRUS_BUILD_TARGET} == "saslauthd" .if ${PORT_OPTIONS:MBDB} INVALID_BDB_VER=2 .endif .if ${PORT_OPTIONS:MOPENLDAP} .if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif .endif -.if ${PORT_OPTIONS:MGSSAPI_BASE} || ${PORT_OPTIONS:MGSSAPI_HEIMDAL} || \ - ${PORT_OPTIONS:MGSSAPI_MIT} -CONFIGURE_ARGS+=--enable-gssapi -.endif - .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd RUNPATH= "@comment " .endif -DOCS= AUTHORS COPYING ChangeLog INSTALL LDAP_SASLAUTHD NEWS README - 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 post-install: @${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/saslcache \ ${STAGEDIR}${PREFIX}/sbin/saslcache @${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/testsaslauthd \ ${STAGEDIR}${PREFIX}/sbin/testsaslauthd .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd @${ECHO_MSG} "" @${ECHO_MSG} "SASLAUTHD_RUNPATH was specified." @${ECHO_MSG} "Make sure you create ${SASLAUTHD_RUNPATH}." @${ECHO_MSG} "" .else @${MKDIR} ${STAGEDIR}/var/run/saslauthd .endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/saslauthd .for file in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} \ ${STAGEDIR}${DOCSDIR}/saslauthd .endfor .else # plugin LIBTOOL= ${LOCALBASE}/bin/libtool post-patch: @${REINPLACE_CMD} \ -e "/^LIBTOOL=/s|\$$(top_builddir)/libtool|${LIBTOOL}|g" \ ${WRKSRC}/configure do-build: cd ${WRKSRC}/include && ${MAKE} cd ${WRKSRC}/plugins && ${MAKE} .endif .include Index: head/security/cyrus-sasl2/files/pkg-deinstall.in =================================================================== --- head/security/cyrus-sasl2/files/pkg-deinstall.in (revision 409942) +++ head/security/cyrus-sasl2/files/pkg-deinstall.in (revision 409943) @@ -1,48 +1,46 @@ #!/bin/sh # # $FreeBSD$ # # Created by: hetzels@westbend.net #set -vx PKG_BATCH=${BATCH:=NO} - PKG_PREFIX=${PKG_PREFIX:=/usr/local} - -SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%% - +SASLDB_NAME=%%SASLDB_NAME%% +SASLDB_NAME=${SASLDB_NAME:+${PKG_PREFIX}/etc/%%SASLDB_NAME%%} CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%} # delete sasldb database - delete_sasldb() { if [ -f ${SASLDB_NAME} ] ; then if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ]; then rm ${SASLDB_NAME} else echo "WARNING: Users SASL passwords are in ${SASLDB_NAME}, keeping this file" fi fi } delete_user() { if pw usershow ${CYRUS_USER} 2>/dev/null 1>&2; then echo "To delete Cyrus user permanently, use 'pw userdel ${CYRUS_USER}'" fi if pw groupshow ${CYRUS_GROUP} 2>/dev/null 1>&2; then echo "To delete Cyrus group permanently, use 'pw groupdel ${CYRUS_GROUP}'" fi } case $2 in DEINSTALL) - delete_sasldb + if [ -n "${SASLDB_NAME}" ]; then + delete_sasldb + fi ;; POST-DEINSTALL) delete_user ;; - esac Index: head/security/cyrus-sasl2/files/pkg-install.in =================================================================== --- head/security/cyrus-sasl2/files/pkg-install.in (revision 409942) +++ head/security/cyrus-sasl2/files/pkg-install.in (revision 409943) @@ -1,102 +1,100 @@ #!/bin/sh # # $FreeBSD$ # # Created by: stb@FreeBSD.org for the cyrus imap server # Added to the cyrus-sasl port by hetzels@westbend.net #set -vx PKG_BATCH=${BATCH:=NO} - PKG_PREFIX=${PKG_PREFIX:=/usr/local} - -SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%% - +SASLDB_NAME=%%SASLDB_NAME%% +SASLDB_NAME=${SASLDB_NAME:+${PKG_PREFIX}/etc/%%SASLDB_NAME%%} CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%} # # create 'cyrus' user and group before installing # - create_user() { USER=${CYRUS_USER} GROUP=${CYRUS_GROUP} PW=/usr/sbin/pw if [ -x /usr/sbin/nologin ]; then shell=/usr/sbin/nologin elif [ -x /sbin/nologin ]; then shell=/sbin/nologin else shell=/nonexistent fi uhome="/nonexistent" if ! ${PW} show group ${GROUP} -q >/dev/null; then gid=60 while ${PW} show group -g ${gid} -q >/dev/null; do gid=`expr ${gid} + 1` done if ! ${PW} add group ${GROUP} -g ${gid}; then e=$? echo "*** Failed to add group \`${GROUP}'. Please add it manually." exit ${e} fi echo "*** Added group \`${GROUP}' (id ${gid})" else gid=`${PW} show group ${GROUP} 2>/dev/null | cut -d: -f3` fi if ! ${PW} show user ${USER} -q >/dev/null; then uid=60 while ${PW} show user -u ${uid} -q >/dev/null; do uid=`expr ${uid} + 1` done if ! ${PW} add user ${USER} -u ${uid} -g ${gid} -d "${uhome}" \ -c "the cyrus mail server" -s "${shell}" -w no \ ; then e=$? echo "*** Failed to add user \`${USER}'. Please add it manually." exit ${e} fi echo "*** Added user \`${USER}' (id ${uid})" else if ! ${PW} mod user ${USER} -g ${gid}; then e=$? echo "*** Failed to update user \`${USER}'." exit ${e} fi echo "*** Updated user \`${USER}'." fi } create_sasldb() { if [ ! -f ${SASLDB_NAME} ]; then echo "test" | ${PKG_PREFIX}/sbin/saslpasswd2 -p -c ${CYRUS_USER} if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ] ; then echo "WARNING: Failed to create ${SASLDB_NAME}" else ${PKG_PREFIX}/sbin/saslpasswd2 -d ${CYRUS_USER} chown ${CYRUS_USER}:mail ${SASLDB_NAME} chmod 640 ${SASLDB_NAME} fi fi } case $2 in PRE-INSTALL) create_user ;; POST-INSTALL) if [ "${PKG_BATCH}" = "NO" ]; then - create_sasldb - elif [ ! -f ${SASLDB_NAME} ]; then + if [ -n "${SASLDB_NAME}" ]; then + create_sasldb + fi + elif [ -n "${SASLDB_NAME}" -a ! -f ${SASLDB_NAME} ]; then echo "*** We do not create ${SASLDB_NAME} automatically in" echo "*** BATCH mode. Please create it by yourself. It should be" echo "*** owner: ${CYRUS_USER}, group: mail, mode: 0640." fi ;; - esac Index: head/security/cyrus-sasl2/pkg-plist =================================================================== --- head/security/cyrus-sasl2/pkg-plist (revision 409942) +++ head/security/cyrus-sasl2/pkg-plist (revision 409943) @@ -1,162 +1,162 @@ include/sasl/hmac-md5.h include/sasl/md5.h include/sasl/md5global.h include/sasl/prop.h include/sasl/sasl.h include/sasl/saslplug.h include/sasl/saslutil.h lib/libsasl2.a lib/libsasl2.la lib/libsasl2.so lib/libsasl2.so.3 lib/libsasl2.so.3.0.0 %%ANONYMOUS%%lib/sasl2/libanonymous.a %%ANONYMOUS%%lib/sasl2/libanonymous.la %%ANONYMOUS%%lib/sasl2/libanonymous.so %%ANONYMOUS%%lib/sasl2/libanonymous.so.3 %%ANONYMOUS%%lib/sasl2/libanonymous.so.3.0.0 %%CRAM%%lib/sasl2/libcrammd5.a %%CRAM%%lib/sasl2/libcrammd5.la %%CRAM%%lib/sasl2/libcrammd5.so %%CRAM%%lib/sasl2/libcrammd5.so.3 %%CRAM%%lib/sasl2/libcrammd5.so.3.0.0 %%DIGEST%%lib/sasl2/libdigestmd5.a %%DIGEST%%lib/sasl2/libdigestmd5.la %%DIGEST%%lib/sasl2/libdigestmd5.so %%DIGEST%%lib/sasl2/libdigestmd5.so.3 %%DIGEST%%lib/sasl2/libdigestmd5.so.3.0.0 %%LOGIN%%lib/sasl2/liblogin.a %%LOGIN%%lib/sasl2/liblogin.la %%LOGIN%%lib/sasl2/liblogin.so %%LOGIN%%lib/sasl2/liblogin.so.3 %%LOGIN%%lib/sasl2/liblogin.so.3.0.0 %%SCRAM%%lib/sasl2/libscram.a %%SCRAM%%lib/sasl2/libscram.la %%SCRAM%%lib/sasl2/libscram.so %%SCRAM%%lib/sasl2/libscram.so.3 %%SCRAM%%lib/sasl2/libscram.so.3.0.0 %%SQL%%lib/sasl2/libsql.a %%SQL%%lib/sasl2/libsql.la %%SQL%%lib/sasl2/libsql.so %%SQL%%lib/sasl2/libsql.so.3 %%SQL%%lib/sasl2/libsql.so.3.0.0 %%NTLM%%lib/sasl2/libntlm.a %%NTLM%%lib/sasl2/libntlm.la %%NTLM%%lib/sasl2/libntlm.so %%NTLM%%lib/sasl2/libntlm.so.3 %%NTLM%%lib/sasl2/libntlm.so.3.0.0 %%OTP%%lib/sasl2/libotp.a %%OTP%%lib/sasl2/libotp.la %%OTP%%lib/sasl2/libotp.so %%OTP%%lib/sasl2/libotp.so.3 %%OTP%%lib/sasl2/libotp.so.3.0.0 %%PLAIN%%lib/sasl2/libplain.a %%PLAIN%%lib/sasl2/libplain.la %%PLAIN%%lib/sasl2/libplain.so %%PLAIN%%lib/sasl2/libplain.so.3 %%PLAIN%%lib/sasl2/libplain.so.3.0.0 -lib/sasl2/libsasldb.a -lib/sasl2/libsasldb.la -lib/sasl2/libsasldb.so -lib/sasl2/libsasldb.so.3 -lib/sasl2/libsasldb.so.3.0.0 +%%SASLDB%%lib/sasl2/libsasldb.a +%%SASLDB%%lib/sasl2/libsasldb.la +%%SASLDB%%lib/sasl2/libsasldb.so +%%SASLDB%%lib/sasl2/libsasldb.so.3 +%%SASLDB%%lib/sasl2/libsasldb.so.3.0.0 libdata/pkgconfig/libsasl2.pc man/man3/sasl.3.gz man/man3/sasl_authorize_t.3.gz man/man3/sasl_auxprop.3.gz man/man3/sasl_auxprop_getctx.3.gz man/man3/sasl_auxprop_request.3.gz man/man3/sasl_callbacks.3.gz man/man3/sasl_canon_user_t.3.gz man/man3/sasl_chalprompt_t.3.gz man/man3/sasl_checkapop.3.gz man/man3/sasl_checkpass.3.gz man/man3/sasl_client_init.3.gz man/man3/sasl_client_new.3.gz man/man3/sasl_client_start.3.gz man/man3/sasl_client_step.3.gz man/man3/sasl_decode.3.gz man/man3/sasl_dispose.3.gz man/man3/sasl_done.3.gz man/man3/sasl_encode.3.gz man/man3/sasl_encodev.3.gz man/man3/sasl_errdetail.3.gz man/man3/sasl_errors.3.gz man/man3/sasl_errstring.3.gz man/man3/sasl_getconfpath_t.3.gz man/man3/sasl_getopt_t.3.gz man/man3/sasl_getpath_t.3.gz man/man3/sasl_getprop.3.gz man/man3/sasl_getrealm_t.3.gz man/man3/sasl_getsecret_t.3.gz man/man3/sasl_getsimple_t.3.gz man/man3/sasl_global_listmech.3.gz man/man3/sasl_idle.3.gz man/man3/sasl_listmech.3.gz man/man3/sasl_log_t.3.gz man/man3/sasl_server_init.3.gz man/man3/sasl_server_new.3.gz man/man3/sasl_server_start.3.gz man/man3/sasl_server_step.3.gz man/man3/sasl_server_userdb_checkpass_t.3.gz man/man3/sasl_server_userdb_setpass_t.3.gz man/man3/sasl_setpass.3.gz man/man3/sasl_setprop.3.gz man/man3/sasl_user_exists.3.gz man/man3/sasl_verifyfile_t.3.gz man/man8/pluginviewer.8.gz -man/man8/sasldblistusers2.8.gz -man/man8/saslpasswd2.8.gz +%%SASLDB%%man/man8/sasldblistusers2.8.gz +%%SASLDB%%man/man8/saslpasswd2.8.gz sbin/pluginviewer -sbin/sasldblistusers2 -sbin/saslpasswd2 +%%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 Index: head/security/cyrus-sasl2-gssapi/Makefile =================================================================== --- head/security/cyrus-sasl2-gssapi/Makefile (revision 409942) +++ head/security/cyrus-sasl2-gssapi/Makefile (revision 409943) @@ -1,28 +1,27 @@ # $FreeBSD$ PKGNAMESUFFIX= -gssapi PORTREVISION= 7 COMMENT= SASL GSSAPI authentication plugin -CONFIGURE_ARGS+=--enable-gssapi - OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_DEFAULT= GSSAPI_BASE -GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ENABLE= gssapi +GSSAPI_BASE_USES= gssapi:base +GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ + --with-gss_impl=heimdal GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal GSSAPI_HEIMDAL_PLIST_FILES= lib/sasl2/libgs2.a \ lib/sasl2/libgs2.so \ lib/sasl2/libgs2.so.3 \ lib/sasl2/libgs2.so.3.0.0 GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=mit CYRUS_BUILD_TARGET= gssapiv2 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common" Index: head/security/cyrus-sasl2-ldapdb/Makefile =================================================================== --- head/security/cyrus-sasl2-ldapdb/Makefile (revision 409942) +++ head/security/cyrus-sasl2-ldapdb/Makefile (revision 409943) @@ -1,15 +1,15 @@ # $FreeBSD$ PKGNAMESUFFIX= -ldapdb PORTREVISION= 5 COMMENT= SASL LDAPDB auxprop plugin +CYRUS_CONFIGURE_ARGS= --enable-ldapdb --with-ldap=${LOCALBASE} + USE_OPENLDAP= yes .if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif - -CONFIGURE_ARGS+=--enable-ldapdb --with-ldap=${LOCALBASE} .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common" Index: head/security/cyrus-sasl2-saslauthd/Makefile =================================================================== --- head/security/cyrus-sasl2-saslauthd/Makefile (revision 409942) +++ head/security/cyrus-sasl2-saslauthd/Makefile (revision 409943) @@ -1,48 +1,58 @@ # $FreeBSD$ PKGNAMESUFFIX= -saslauthd PORTREVISION= 3 COMMENT= SASL authentication server for cyrus-sasl2 LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 INSTALL_WRKSRC= ${WRKSRC}/saslauthd USE_RC_SUBR= saslauthd -CONFIGURE_ARGS= --enable-login \ - --enable-auth-sasldb \ - --with-saslauthd=${SASLAUTHD_RUNPATH} +CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUNPATH} CONFIGURE_ENV+= andrew_cv_runpath_switch=none -OPTIONS_DEFINE= BDB DOCS OPENLDAP HTTPFORM -BDB_CONFIGURE_ON= --with-dblib=berkeley \ - --with-bdb-libdir=${BDB_LIB_DIR} \ - --with-bdb-incdir=${BDB_INCLUDE_DIR} \ - --with-bdb=${BDB_LIB_NAME} -BDB_USE= BDB=yes -BDB_CONFIGURE_OFF= --with-dblib=ndbm +OPTIONS_DEFINE= DOCS HTTPFORM OPENLDAP +OPTIONS_RADIO= GSSAPI SASLDB +OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM +OPTIONS_DEFAULT= BDB1 + +HTTPFORM_DESC= Enable HTTP form authentication +HTTPFORM_CONFIGURE_ENABLE=httpform OPENLDAP_DESC= Use OpenLDAP OPENLDAP_USE= OPENLDAP=yes OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} -HTTPFORM_DESC= Enable HTTP form authentication -HTTPFORM_CONFIGURE_ENABLE=httpform -OPTIONS_RADIO= GSSAPI +SASLDB_DESC= Experimental SASLdb authentication module +BDB_USE= BDB=yes +BDB_CONFIGURE_ON= --enable-auth-sasldb \ + --with-dblib=berkeley \ + --with-bdb-libdir=${BDB_LIB_DIR} \ + --with-bdb-incdir=${BDB_INCLUDE_DIR} \ + --with-bdb=${BDB_LIB_NAME} +BDB1_CONFIGURE_ON= --enable-auth-sasldb \ + --with-dblib=ndbm +GDBM_CONFIGURE_ON= --enable-auth-sasldb \ + --with-dblib=gdbm \ + --with-gdbm=${LOCALBASE} + .if exists(/usr/lib/libkrb5.a) OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE OPTIONS_DEFAULT+= GSSAPI_BASE .endif OPTIONS_RADIO_GSSAPI+= GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_BASE_USES= gssapi:base GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal 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 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common" Index: head/security/cyrus-sasl2-srp/Makefile =================================================================== --- head/security/cyrus-sasl2-srp/Makefile (revision 409942) +++ head/security/cyrus-sasl2-srp/Makefile (revision 409943) @@ -1,14 +1,14 @@ # $FreeBSD$ PKGNAMESUFFIX= -srp COMMENT= SASL SRP authentication plugin -CONFIGURE_ARGS+=--enable-srp +CYRUS_CONFIGURE_ARGS= --enable-srp OPTIONS_DEFINE= SRP_SETPASS OPTIONS_DEFAULT= SRP_SETPASS SRP_SETPASS_DESC= setting SRP secrets with saslpasswd SRP_SETPASS_CONFIGURE_ENABLE= srp-setpass .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"