svn commit: r409651 - in head/security: cyrus-sasl2 cyrus-sasl2-gssapi cyrus-sasl2-ldapdb cyrus-sasl2-saslauthd cyrus-sasl2-srp
Hajimu UMEMOTO
ume at FreeBSD.org
Sat Feb 27 05:15:59 UTC 2016
Author: ume
Date: Sat Feb 27 05:15:57 2016
New Revision: 409651
URL: https://svnweb.freebsd.org/changeset/ports/409651
Log:
Move the common part of the cyrus-sasl2 separated ports into
Makefile.common, to make further maintenance easier.
Added:
head/security/cyrus-sasl2/Makefile.common
- copied, changed from r409647, head/security/cyrus-sasl2/Makefile
Modified:
head/security/cyrus-sasl2-gssapi/Makefile
head/security/cyrus-sasl2-ldapdb/Makefile
head/security/cyrus-sasl2-saslauthd/Makefile
head/security/cyrus-sasl2-srp/Makefile
head/security/cyrus-sasl2/Makefile
Modified: head/security/cyrus-sasl2-gssapi/Makefile
==============================================================================
--- head/security/cyrus-sasl2-gssapi/Makefile Sat Feb 27 05:12:44 2016 (r409650)
+++ head/security/cyrus-sasl2-gssapi/Makefile Sat Feb 27 05:15:57 2016 (r409651)
@@ -1,50 +1,11 @@
# $FreeBSD$
-PORTNAME= gssapi
-PORTVERSION= 2.1.26
+PKGNAMESUFFIX= -gssapi
PORTREVISION= 7
-CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
- http://cyrusimap.org/releases/
-PKGNAMEPREFIX= cyrus-sasl-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
-MAINTAINER= ume at 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}
+CONFIGURE_ARGS+=--enable-gssapi
OPTIONS_SINGLE= GSSAPI
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
@@ -67,23 +28,4 @@ PLIST_FILES= lib/sasl2/libgssapiv2.a \
lib/sasl2/libgssapiv2.so.3 \
lib/sasl2/libgssapiv2.so.3.0.0
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
Modified: head/security/cyrus-sasl2-ldapdb/Makefile
==============================================================================
--- head/security/cyrus-sasl2-ldapdb/Makefile Sat Feb 27 05:12:44 2016 (r409650)
+++ head/security/cyrus-sasl2-ldapdb/Makefile Sat Feb 27 05:15:57 2016 (r409651)
@@ -1,72 +1,20 @@
# $FreeBSD$
-PORTNAME= ldapdb
-PORTVERSION= 2.1.26
+PKGNAMESUFFIX= -ldapdb
PORTREVISION= 5
-CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
- http://cyrusimap.org/releases/
-PKGNAMEPREFIX= cyrus-sasl-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
-MAINTAINER= ume at 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
-
+USE_OPENLDAP= 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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
Modified: head/security/cyrus-sasl2-saslauthd/Makefile
==============================================================================
--- head/security/cyrus-sasl2-saslauthd/Makefile Sat Feb 27 05:12:44 2016 (r409650)
+++ head/security/cyrus-sasl2-saslauthd/Makefile Sat Feb 27 05:15:57 2016 (r409651)
@@ -1,43 +1,19 @@
# $FreeBSD$
-PORTNAME= saslauthd
-PORTVERSION= 2.1.26
+PKGNAMESUFFIX= -saslauthd
PORTREVISION= 3
-CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
- http://cyrusimap.org/releases/
-PKGNAMEPREFIX= cyrus-sasl-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
-MAINTAINER= ume at 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 \
+CONFIGURE_ARGS= --enable-login \
--enable-auth-sasldb \
- --with-rc4=openssl \
- --with-saslauthd=${SASLAUTHD_RUNPATH} \
- --disable-krb4
+ --with-saslauthd=${SASLAUTHD_RUNPATH}
CONFIGURE_ENV+= andrew_cv_runpath_switch=none
OPTIONS_DEFINE= BDB DOCS OPENLDAP HTTPFORM
@@ -54,11 +30,11 @@ HTTPFORM_DESC= Enable HTTP form authent
HTTPFORM_CONFIGURE_ENABLE=httpform
OPTIONS_RADIO= GSSAPI
-OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
.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
@@ -69,70 +45,4 @@ GSSAPI_MIT_USES= gssapi:mit
GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
--with-gss_impl=mit
-.include <bsd.port.pre.mk>
-
-.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+=--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
-
-post-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}/saslauthd
-.for file in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} \
- ${STAGEDIR}${DOCSDIR}/saslauthd
-.endfor
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
Modified: head/security/cyrus-sasl2-srp/Makefile
==============================================================================
--- head/security/cyrus-sasl2-srp/Makefile Sat Feb 27 05:12:44 2016 (r409650)
+++ head/security/cyrus-sasl2-srp/Makefile Sat Feb 27 05:15:57 2016 (r409651)
@@ -1,53 +1,11 @@
# $FreeBSD$
-PORTNAME= srp
-PORTVERSION= 2.1.26
-#PORTREVISION= 0
-CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
- http://cyrusimap.org/releases/
-PKGNAMEPREFIX= cyrus-sasl-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
+PKGNAMESUFFIX= -srp
-MAINTAINER= ume at FreeBSD.org
COMMENT= SASL SRP 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
-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-gssapi \
- --disable-krb4 \
- --disable-ntlm \
- --disable-otp \
- --disable-plain \
- --disable-scram
CONFIGURE_ARGS+=--enable-srp
-MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP}
-
OPTIONS_DEFINE= SRP_SETPASS
OPTIONS_DEFAULT= SRP_SETPASS
SRP_SETPASS_DESC= setting SRP secrets with saslpasswd
@@ -58,16 +16,4 @@ PLIST_FILES= lib/sasl2/libsrp.a \
lib/sasl2/libsrp.so.3 \
lib/sasl2/libsrp.so.3.0.0
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
Modified: head/security/cyrus-sasl2/Makefile
==============================================================================
--- head/security/cyrus-sasl2/Makefile Sat Feb 27 05:12:44 2016 (r409650)
+++ head/security/cyrus-sasl2/Makefile Sat Feb 27 05:15:57 2016 (r409651)
@@ -1,42 +1,14 @@
# $FreeBSD$
-PORTNAME= cyrus-sasl
-PORTVERSION= 2.1.26
PORTREVISION= 12
-CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
- http://cyrusimap.org/releases/
-MAINTAINER= ume at 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
+CONFIGURE_ARGS+=--enable-auth-sasldb \
+ --with-saslauthd=${SASLAUTHD_RUNPATH}
NO_OPTIONS_SORT= yes
OPTIONS_DEFINE= ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \
@@ -48,14 +20,14 @@ OPTIONS_GROUP_PLUGIN= ANONYMOUS CRAM DIG
OPTIONS_DEFAULT= ANONYMOUS AUTHDAEMOND OBSOLETE_CRAM_ATTR CRAM DIGEST \
LOGIN NTLM OTP PLAIN SCRAM
OPTIONS_SUB= yes
-ALWAYSTRUE_DESC= the alwaystrue password verifier
+ALWAYSTRUE_DESC= Alwaystrue password verifier (discouraged)
ALWAYSTRUE_CONFIGURE_ENABLE=alwaystrue
-AUTHDAEMOND_DESC= use of authdaemon
+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_DESC=cmusaslsecretCRAM-MD5 auxprop property
OBSOLETE_CRAM_ATTR_CONFIGURE_OFF=--enable-obsolete_cram_attr=no
BDB_USE= BDB=yes
BDB_CONFIGURE_ON= --with-dblib=berkeley \
@@ -69,7 +41,6 @@ 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
@@ -93,83 +64,4 @@ PLAIN_CONFIGURE_ENABLE= plain
SCRAM_DESC= SCRAM authentication
SCRAM_CONFIGURE_ENABLE= scram
-.include <bsd.port.pre.mk>
-
-.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-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}
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
Copied and modified: head/security/cyrus-sasl2/Makefile.common (from r409647, head/security/cyrus-sasl2/Makefile)
==============================================================================
--- head/security/cyrus-sasl2/Makefile Sat Feb 27 04:22:20 2016 (r409647, copy source)
+++ head/security/cyrus-sasl2/Makefile.common Sat Feb 27 05:15:57 2016 (r409651)
@@ -2,24 +2,20 @@
PORTNAME= cyrus-sasl
PORTVERSION= 2.1.26
-PORTREVISION= 12
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
http://cyrusimap.org/releases/
MAINTAINER= ume at 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 \
+CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc \
--with-configdir=${PREFIX}/lib/sasl2:${PREFIX}/etc/sasl2 \
--with-plugindir=${PREFIX}/lib/sasl2 \
--with-dbpath=${PREFIX}/etc/sasldb2 \
@@ -27,74 +23,56 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/e
--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
--includedir=${PREFIX}/include \
--enable-static \
- --enable-auth-sasldb \
- --with-rc4=openssl \
- --with-saslauthd=${SASLAUTHD_RUNPATH} \
+ --with-rc4=openssl
+CONFIGURE_ARGS+=--disable-anon \
+ --disable-cram \
+ --disable-digest \
--disable-gssapi \
- --disable-krb4
+ --disable-krb4 \
+ --disable-ntlm \
+ --disable-otp \
+ --disable-plain \
+ --disable-scram
MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP}
-DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}2
+DOCSDIR= ${PREFIX}/share/doc/cyrus-sasl2
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= 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_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
-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
+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
+
+.endif
.include <bsd.port.pre.mk>
+.if ${OPENSSLBASE} == /usr
+CONFIGURE_ARGS+=--with-openssl=yes
+.else
+CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
+.endif
+
+.if ${CYRUS_BUILD_TARGET} == "cyrus-sasl"
+
.if ${PORT_OPTIONS:MBDB}
INVALID_BDB_VER=2
SASLDB_NAME= sasldb2
@@ -113,17 +91,6 @@ SQL= "@comment "
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 \
@@ -172,4 +139,76 @@ post-install-DOCS-on:
@${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}
+ 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
+
+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 <bsd.port.post.mk>
More information about the svn-ports-all
mailing list