Index: head/security/cyrus-sasl2/Makefile =================================================================== --- head/security/cyrus-sasl2/Makefile (revision 398427) +++ head/security/cyrus-sasl2/Makefile (revision 398428) @@ -1,174 +1,175 @@ # $FreeBSD$ -PORTNAME= cyrus-sasl2 +PORTNAME= cyrus-sasl PORTVERSION= 2.1.26 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \ http://cyrusimap.org/releases/ -DISTNAME= cyrus-sasl-${PORTVERSION} MAINTAINER= ume@FreeBSD.org COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING USES= cpe libtool:keepla pathfix perl5 USE_PERL5= patch 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 \ --enable-auth-sasldb \ --with-rc4=openssl \ --with-saslauthd=${SASLAUTHD_RUNPATH} \ --disable-gssapi \ --disable-krb4 MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP} + +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}2 CPE_VENDOR= cmu NO_OPTIONS_SORT= yes OPTIONS_DEFINE= ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \ OBSOLETE_CRAM_ATTR BDB MYSQL PGSQL OPTIONS_RADIO= SQLITE OPTIONS_RADIO_SQLITE= SQLITE2 SQLITE3 OPTIONS_GROUP= MECH OPTIONS_GROUP_MECH= CRAM DIGEST LOGIN NTLM OTP PLAIN SCRAM OPTIONS_DEFAULT= AUTHDAEMOND OBSOLETE_CRAM_ATTR CRAM DIGEST \ LOGIN NTLM OTP PLAIN SCRAM OPTIONS_SUB= yes ALWAYSTRUE_DESC= the alwaystrue password verifier 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 property OBSOLETE_CRAM_ATTR_CONFIGURE_OFF=--enable-obsolete_cram_attr=no 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 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_DESC= SQLite 2 database 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 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 .include .if ${PORT_OPTIONS:MBDB} INVALID_BDB_VER=2 SASLDB_NAME= sasldb2 .else SASLDB_NAME= sasldb2.db .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 .if ${OPENSSLBASE} == /usr CONFIGURE_ARGS+=--with-openssl=yes .else CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif SASLAUTHD_RUNPATH?= /var/run/saslauthd CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus 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} PLIST_SUB+= PREFIX=${PREFIX} \ 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: .if ${PORT_OPTIONS:MDOCS} @${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} .endif .include Index: head/security/cyrus-sasl2-gssapi/Makefile =================================================================== --- head/security/cyrus-sasl2-gssapi/Makefile (revision 398427) +++ head/security/cyrus-sasl2-gssapi/Makefile (revision 398428) @@ -1,95 +1,95 @@ # $FreeBSD$ PORTNAME= gssapi PORTVERSION= 2.1.26 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \ http://cyrusimap.org/releases/ -PKGNAMEPREFIX= cyrus-sasl2- -DISTNAME= cyrus-sasl-${PORTVERSION} +PKGNAMEPREFIX= cyrus-sasl- +DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION} MAINTAINER= ume@FreeBSD.org COMMENT= SASL GSSAPI authentication plugin LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files INSTALL_WRKSRC= ${WRKSRC}/plugins USES= libtool:build USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl2 \ --with-dbpath=${PREFIX}/etc/sasldb2 \ --with-lib-subdir=lib \ --includedir=${PREFIX}/include \ --enable-static \ --with-rc4=openssl CONFIGURE_ARGS+=--with-dblib=none \ --disable-anon \ --disable-cram \ --disable-digest \ --disable-krb4 \ --disable-ntlm \ --disable-otp \ --disable-plain \ --disable-scram MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP} OPTIONS_SINGLE= KERBEROS OPTIONS_SINGLE_KERBEROS=BASE HEIMDAL MIT OPTIONS_DEFAULT= BASE BASE_DESC= Use Heimdal in base BASE_USES= gssapi BASE_CONFIGURE_ENABLE= gssapi HEIMDAL_DESC= Use Heimdal from ports HEIMDAL_USES= gssapi:heimdal,flags HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal MIT_DESC= Use MIT Kerberos V5 MIT_USES= gssapi:mit MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=mit PLIST_FILES= lib/sasl2/libgssapiv2.a \ lib/sasl2/libgssapiv2.so \ lib/sasl2/libgssapiv2.so.3 \ lib/sasl2/libgssapiv2.so.3.0.0 .include .if ${PORT_OPTIONS:MHEIMDAL} PLIST_FILES+= lib/sasl2/libgs2.a \ lib/sasl2/libgs2.so \ lib/sasl2/libgs2.so.3 \ lib/sasl2/libgs2.so.3.0.0 .endif .if ${OPENSSLBASE} == /usr CONFIGURE_ARGS+=--with-openssl=yes .else CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif 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} .include Index: head/security/cyrus-sasl2-ldapdb/Makefile =================================================================== --- head/security/cyrus-sasl2-ldapdb/Makefile (revision 398427) +++ head/security/cyrus-sasl2-ldapdb/Makefile (revision 398428) @@ -1,72 +1,72 @@ # $FreeBSD$ PORTNAME= ldapdb PORTVERSION= 2.1.26 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \ http://cyrusimap.org/releases/ -PKGNAMEPREFIX= cyrus-sasl2- -DISTNAME= cyrus-sasl-${PORTVERSION} +PKGNAMEPREFIX= cyrus-sasl- +DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION} MAINTAINER= ume@FreeBSD.org COMMENT= SASL LDAPDB auxprop plugin LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files INSTALL_WRKSRC= ${WRKSRC}/plugins USES= libtool USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes .if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif USE_OPENLDAP= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl2 \ --with-dbpath=${PREFIX}/etc/sasldb2 \ --with-lib-subdir=lib \ --includedir=${PREFIX}/include \ --enable-static \ --with-rc4=openssl CONFIGURE_ARGS+=--with-dblib=none \ --disable-anon \ --disable-cram \ --disable-digest \ --disable-gssapi \ --disable-krb4 \ --disable-ntlm \ --disable-otp \ --disable-plain \ --disable-scram CONFIGURE_ARGS+=--enable-ldapdb --with-ldap=${LOCALBASE} MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP} PLIST_FILES= lib/sasl2/libldapdb.a \ lib/sasl2/libldapdb.so \ lib/sasl2/libldapdb.so.3 \ lib/sasl2/libldapdb.so.3.0.0 .include .if ${OPENSSLBASE} == /usr CONFIGURE_ARGS+=--with-openssl=yes .else CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif do-build: cd ${WRKSRC}/include && ${MAKE} cd ${WRKSRC}/plugins && ${MAKE} .include Index: head/security/cyrus-sasl2-saslauthd/Makefile =================================================================== --- head/security/cyrus-sasl2-saslauthd/Makefile (revision 398427) +++ head/security/cyrus-sasl2-saslauthd/Makefile (revision 398428) @@ -1,129 +1,129 @@ # $FreeBSD$ PORTNAME= saslauthd PORTVERSION= 2.1.26 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \ http://cyrusimap.org/releases/ -PKGNAMEPREFIX= cyrus-sasl2- -DISTNAME= cyrus-sasl-${PORTVERSION} +PKGNAMEPREFIX= cyrus-sasl- +DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION} MAINTAINER= ume@FreeBSD.org COMMENT= SASL authentication server for cyrus-sasl2 LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files INSTALL_WRKSRC= ${WRKSRC}/saslauthd DOCSDIR= ${PREFIX}/share/doc/cyrus-sasl2 USE_RC_SUBR= saslauthd USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl2 \ --with-dbpath=${PREFIX}/etc/sasldb2 \ --with-lib-subdir=lib \ --includedir=${PREFIX}/include \ --enable-static \ --enable-login \ --enable-auth-sasldb \ --with-rc4=openssl \ --with-saslauthd=${SASLAUTHD_RUNPATH} \ --disable-krb4 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 OPENLDAP_DESC= Use OpenLDAP OPENLDAP_USE= OPENLDAP=yes OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} HTTPFORM_DESC= Enable HTTP form authentication HTTPFORM_CONFIGURE_ENABLE=httpform .include .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 !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so) CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit LDFLAGS+= -R${KRB5_HOME}/lib .elif !defined(WITHOUT_GSSAPI) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a) CONFIGURE_ARGS+=--enable-gssapi=${HEIMDAL_HOME} --with-gss_impl=heimdal .elif !defined(WITHOUT_GSSAPI) && exists(/usr/lib/libkrb5.a) CONFIGURE_ARGS+=--enable-gssapi=/usr CFLAGS+= -nostdinc -I/usr/include .else CONFIGURE_ARGS+=--disable-gssapi .endif .if ${OPENSSLBASE} == /usr CONFIGURE_ARGS+=--with-openssl=yes .else CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif SASLAUTHD_RUNPATH?= /var/run/saslauthd .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd RUNPATH= "@comment " .endif CYRUS_USER?= cyrus 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} cd ${WRKSRC}/sasldb && ${MAKE} 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 .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/saslauthd .for file in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} \ ${STAGEDIR}${DOCSDIR}/saslauthd .endfor .endif .include