[Midnightbsd-cvs] mports [21557] trunk/security: update cyrus ports based on freebsd ports tree
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Aug 5 22:13:23 EDT 2016
Revision: 21557
http://svnweb.midnightbsd.org/mports/?rev=21557
Author: laffer1
Date: 2016-08-05 22:13:23 -0400 (Fri, 05 Aug 2016)
Log Message:
-----------
update cyrus ports based on freebsd ports tree
Modified Paths:
--------------
trunk/security/cyrus-sasl2/Makefile
trunk/security/cyrus-sasl2/pkg-plist
trunk/security/cyrus-sasl2-ldapdb/Makefile
trunk/security/cyrus-sasl2-saslauthd/Makefile
trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.in
trunk/security/cyrus-sasl2-saslauthd/pkg-deinstall
trunk/security/cyrus-sasl2-saslauthd/pkg-install
trunk/security/cyrus-sasl2-saslauthd/pkg-message
trunk/security/cyrus-sasl2-saslauthd/pkg-plist
Added Paths:
-----------
trunk/security/cyrus-sasl2/Makefile.common
trunk/security/cyrus-sasl2/files/patch-plugins_gssapi.c
trunk/security/cyrus-sasl2/files/patch-utils__Makefile.in
trunk/security/cyrus-sasl2/files/pkg-deinstall.in
trunk/security/cyrus-sasl2/files/pkg-install.in
trunk/security/cyrus-sasl2/files/pkg-message.in
Removed Paths:
-------------
trunk/security/cyrus-sasl2/pkg-deinstall
trunk/security/cyrus-sasl2/pkg-install
trunk/security/cyrus-sasl2/pkg-message
Modified: trunk/security/cyrus-sasl2/Makefile
===================================================================
--- trunk/security/cyrus-sasl2/Makefile 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2/Makefile 2016-08-06 02:13:23 UTC (rev 21557)
@@ -1,68 +1,43 @@
-# $MidnightBSD$
+# $FreeBSD: head/security/cyrus-sasl2/Makefile 409943 2016-03-02 14:13:45Z ume $
-PORTNAME= cyrus-sasl
-PORTVERSION= 2.1.26
-PORTREVISION= 2
-CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
- http://cyrusimap.org/releases/
-MAINTAINER= ports at MidnightBSD.org
+PORTREVISION= 12
+
COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer)
-LICENSE= bsd4
-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 \
- --mandir=${MANPREFIX}/man \
- --enable-static \
- --enable-auth-sasldb \
- --with-rc4=openssl \
- --with-saslauthd=${SASLAUTHD_RUNPATH} \
- --disable-gssapi \
- --disable-krb4
-MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP}
+CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUNPATH}
-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
+ OBSOLETE_CRAM_ATTR MYSQL PGSQL
+OPTIONS_RADIO= SASLDB SQLITE
+OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM
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_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
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
+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
@@ -69,7 +44,6 @@
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
@@ -76,6 +50,8 @@
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
@@ -91,37 +67,6 @@
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 \
@@ -138,47 +83,4 @@
mechanisms options plugprog programming readme sysadmin upgrading \
windows
-PLIST_SUB+= PREFIX=${PREFIX} \
- SQL=${SQL} \
- DOCSDIR=${DOCSDIR:S/^${PREFIX}\///}
-
-PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-PKGINSTALL= ${WRKDIR}/pkg-install
-PKGMESSAGE= ${WRKDIR}/pkg-message
-
-post-patch:
-# Fix sasldb name in pkg-install/deinstall scripts
- @${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
- -e "s;%%CYRUS_USER%%;${CYRUS_USER};g" \
- -e "s;%%CYRUS_GROUP%%;${CYRUS_GROUP};g" \
- ${.CURDIR}/pkg-install > ${PKGINSTALL}
- @${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
- -e "s;%%CYRUS_USER%%;${CYRUS_USER};g" \
- -e "s;%%CYRUS_GROUP%%;${CYRUS_GROUP};g" \
- ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
- @${SED} -e "s;%%PREFIX%%;${PREFIX};g" \
- ${.CURDIR}/pkg-message > ${PKGMESSAGE}
-# 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} ${DOCSDIR}/html
-.for f in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.for f in ${DOC2}
- @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
-.endfor
-.for f in ${HTDOCS}
- @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}/html
-.endfor
- @${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR}
-.endif
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
Added: trunk/security/cyrus-sasl2/Makefile.common
===================================================================
--- trunk/security/cyrus-sasl2/Makefile.common (rev 0)
+++ trunk/security/cyrus-sasl2/Makefile.common 2016-08-06 02:13:23 UTC (rev 21557)
@@ -0,0 +1,204 @@
+# $FreeBSD: head/security/cyrus-sasl2/Makefile.common 409943 2016-03-02 14:13:45Z ume $
+
+PORTNAME= cyrus-sasl
+PORTVERSION= 2.1.26
+CATEGORIES= security ipv6
+MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
+ http://cyrusimap.org/releases/
+
+MAINTAINER= ports at MidnightBSD.org
+
+LICENSE= bsd4
+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-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
+
+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 <bsd.port.pre.mk>
+
+.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: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= "@comment "
+.endif
+
+.if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL} || \
+ ${PORT_OPTIONS:MSQLITE2} || ${PORT_OPTIONS:MSQLITE3}
+CONFIGURE_ARGS+=--enable-sql
+.else
+SQL= "@comment "
+.endif
+
+SUB_FILES= pkg-deinstall pkg-install pkg-message
+SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} \
+ 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:
+ @${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 ${SASLAUTHD_RUNPATH} != /var/run/saslauthd
+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
+
+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
+ @${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>
Property changes on: trunk/security/cyrus-sasl2/Makefile.common
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/cyrus-sasl2/files/patch-plugins_gssapi.c
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-plugins_gssapi.c (rev 0)
+++ trunk/security/cyrus-sasl2/files/patch-plugins_gssapi.c 2016-08-06 02:13:23 UTC (rev 21557)
@@ -0,0 +1,13 @@
+--- plugins/gssapi.c.orig
++++ plugins/gssapi.c
+@@ -1490,8 +1490,10 @@
+ *clientout = NULL;
+ *clientoutlen = 0;
+
++#if 0
+ params->utils->log(NULL, SASL_LOG_DEBUG,
+ "GSSAPI client step %d", text->state);
++#endif
+
+ switch (text->state) {
+
Property changes on: trunk/security/cyrus-sasl2/files/patch-plugins_gssapi.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/cyrus-sasl2/files/patch-utils__Makefile.in
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-utils__Makefile.in (rev 0)
+++ trunk/security/cyrus-sasl2/files/patch-utils__Makefile.in 2016-08-06 02:13:23 UTC (rev 21557)
@@ -0,0 +1,11 @@
+--- utils/Makefile.in.orig 2016-03-02 06:28:24 UTC
++++ utils/Makefile.in
+@@ -359,7 +359,7 @@
+ all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
+ all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
+ @NO_SASL_DB_MANS_FALSE at man_MANS = saslpasswd2.8 sasldblistusers2.8 pluginviewer.8
+- at NO_SASL_DB_MANS_TRUE@man_MANS =
++ at NO_SASL_DB_MANS_TRUE@man_MANS = pluginviewer.8
+ saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
+ saslpasswd2_SOURCES = saslpasswd.c
+ sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
Property changes on: trunk/security/cyrus-sasl2/files/patch-utils__Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/cyrus-sasl2/files/pkg-deinstall.in
===================================================================
--- trunk/security/cyrus-sasl2/files/pkg-deinstall.in (rev 0)
+++ trunk/security/cyrus-sasl2/files/pkg-deinstall.in 2016-08-06 02:13:23 UTC (rev 21557)
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# $FreeBSD: head/security/cyrus-sasl2/files/pkg-deinstall.in 409943 2016-03-02 14:13:45Z ume $
+#
+# Created by: hetzels at westbend.net
+
+#set -vx
+
+PKG_BATCH=${BATCH:=NO}
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
+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)
+ if [ -n "${SASLDB_NAME}" ]; then
+ delete_sasldb
+ fi
+ ;;
+ POST-DEINSTALL)
+ delete_user
+ ;;
+esac
Property changes on: trunk/security/cyrus-sasl2/files/pkg-deinstall.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/cyrus-sasl2/files/pkg-install.in
===================================================================
--- trunk/security/cyrus-sasl2/files/pkg-install.in (rev 0)
+++ trunk/security/cyrus-sasl2/files/pkg-install.in 2016-08-06 02:13:23 UTC (rev 21557)
@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# $FreeBSD: head/security/cyrus-sasl2/files/pkg-install.in 409943 2016-03-02 14:13:45Z ume $
+#
+# Created by: stb at FreeBSD.org for the cyrus imap server
+# Added to the cyrus-sasl port by hetzels at westbend.net
+
+#set -vx
+
+PKG_BATCH=${BATCH:=NO}
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
+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
+ 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
Property changes on: trunk/security/cyrus-sasl2/files/pkg-install.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/cyrus-sasl2/files/pkg-message.in
===================================================================
--- trunk/security/cyrus-sasl2/files/pkg-message.in (rev 0)
+++ trunk/security/cyrus-sasl2/files/pkg-message.in 2016-08-06 02:13:23 UTC (rev 21557)
@@ -0,0 +1,22 @@
+
+You can use sasldb2 for authentication, to add users use:
+
+ saslpasswd2 -c username
+
+If you want to enable SMTP AUTH with the system Sendmail, read
+Sendmail.README
+
+NOTE: This port has been compiled with a default pwcheck_method of
+ auxprop. If you want to authenticate your user by /etc/passwd,
+ PAM or LDAP, install ports/security/cyrus-sasl2-saslauthd and
+ set sasl_pwcheck_method to saslauthd after installing the
+ Cyrus-IMAPd 2.X port. You should also check the
+ %%PREFIX%%/lib/sasl2/*.conf files for the correct
+ pwcheck_method.
+ If you want to use GSSAPI mechanism, install
+ ports/security/cyrus-sasl2-gssapi.
+ If you want to use SRP mechanism, install
+ ports/security/cyrus-sasl2-srp.
+ If you want to use LDAP auxprop plugin, install
+ ports/security/cyrus-sasl2-ldapdb.
+
Property changes on: trunk/security/cyrus-sasl2/files/pkg-message.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/security/cyrus-sasl2/pkg-deinstall
===================================================================
--- trunk/security/cyrus-sasl2/pkg-deinstall 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2/pkg-deinstall 2016-08-06 02:13:23 UTC (rev 21557)
@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/security/cyrus-sasl2/pkg-deinstall,v 1.12 2004/03/30 15:28:07 ume Exp $
-#
-# Created by: hetzels at westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%%
-
-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
- ;;
- POST-DEINSTALL)
- delete_user
- ;;
-
-esac
Deleted: trunk/security/cyrus-sasl2/pkg-install
===================================================================
--- trunk/security/cyrus-sasl2/pkg-install 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2/pkg-install 2016-08-06 02:13:23 UTC (rev 21557)
@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/security/cyrus-sasl2/pkg-install,v 1.20 2006/05/26 18:49:05 ume Exp $
-#
-# Created by: stb at FreeBSD.org for the cyrus imap server
-# Added to the cyrus-sasl port by hetzels at westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%%
-
-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}" -p "*" \
- ; 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}
- if [ -f ${SASLDB_NAME} ]; then
- chown ${CYRUS_USER}:mail ${SASLDB_NAME}
- chmod 640 ${SASLDB_NAME}
- fi
- fi
- fi
-}
-
-case $2 in
- PRE-INSTALL)
- create_user
- ;;
- POST-INSTALL)
- if [ "${PKG_BATCH}" = "NO" ]; then
- create_sasldb
- elif [ ! -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
Deleted: trunk/security/cyrus-sasl2/pkg-message
===================================================================
--- trunk/security/cyrus-sasl2/pkg-message 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2/pkg-message 2016-08-06 02:13:23 UTC (rev 21557)
@@ -1,20 +0,0 @@
-
-You can use sasldb2 for authentication, to add users use:
-
- saslpasswd2 -c username
-
-If you want to enable SMTP AUTH with the system Sendmail, read
-Sendmail.README
-
-NOTE: This port has been compiled with a default pwcheck_method of
- auxprop. If you want to authenticate your user by /etc/passwd,
- PAM or LDAP, install ports/security/cyrus-sasl2-saslauthd and
- set sasl_pwcheck_method to saslauthd after installing the
- Cyrus-IMAPd 2.X port. You should also check the
- %%PREFIX%%/lib/sasl2/*.conf files for the correct
- pwcheck_method.
- If you want to use GSSAPI mechanism, install
- ports/security/cyrus-sasl2-gssapi.
- If you want to use LDAP auxprop plugin, install
- ports/security/cyrus-sasl2-ldapdb.
-
Modified: trunk/security/cyrus-sasl2/pkg-plist
===================================================================
--- trunk/security/cyrus-sasl2/pkg-plist 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2/pkg-plist 2016-08-06 02:13:23 UTC (rev 21557)
@@ -10,11 +10,11 @@
lib/libsasl2.so
lib/libsasl2.so.3
lib/libsasl2.so.3.0.0
-lib/sasl2/libanonymous.a
-lib/sasl2/libanonymous.la
-lib/sasl2/libanonymous.so
-lib/sasl2/libanonymous.so.3
-lib/sasl2/libanonymous.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
@@ -55,11 +55,11 @@
%%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
@@ -105,11 +105,11 @@
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
Modified: trunk/security/cyrus-sasl2-ldapdb/Makefile
===================================================================
--- trunk/security/cyrus-sasl2-ldapdb/Makefile 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2-ldapdb/Makefile 2016-08-06 02:13:23 UTC (rev 21557)
@@ -1,74 +1,16 @@
# $MidnightBSD$
+# $FreeBSD: head/security/cyrus-sasl2-ldapdb/Makefile 409943 2016-03-02 14:13:45Z ume $
-PORTNAME= ldapdb
-PORTVERSION= 2.1.23
-PORTREVISION= 1
-CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
- ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
- http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/
-MASTER_SITE_SUBDIR= . OLD-VERSIONS/sasl
-PKGNAMEPREFIX= cyrus-sasl-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
+PKGNAMESUFFIX= -ldapdb
+PORTREVISION= 5
-MAINTAINER= ports at MidnightBSD.org
COMMENT= SASL LDAPDB auxprop plugin
-LICENSE= bsd4
-LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+CYRUS_CONFIGURE_ARGS= --enable-ldapdb --with-ldap=${LOCALBASE}
-CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2
-MD5_FILE= ${CYRUS_SASL2_DIR}/distinfo
-PATCHDIR= ${CYRUS_SASL2_DIR}/files
-INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/plugins
-
-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 \
- --mandir=${MANPREFIX}/man \
- --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}
-
-PLIST_FILES= lib/sasl2/libldapdb.a \
- lib/sasl2/libldapdb.la \
- lib/sasl2/libldapdb.so \
- lib/sasl2/libldapdb.so.2
-
-.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: trunk/security/cyrus-sasl2-saslauthd/Makefile
===================================================================
--- trunk/security/cyrus-sasl2-saslauthd/Makefile 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2-saslauthd/Makefile 2016-08-06 02:13:23 UTC (rev 21557)
@@ -1,131 +1,59 @@
# $MidnightBSD$
+# $FreeBSD: head/security/cyrus-sasl2-saslauthd/Makefile 409943 2016-03-02 14:13:45Z ume $
-PORTNAME= saslauthd
-PORTVERSION= 2.1.26
-PORTREVISION= 1
-CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
- http://cyrusimap.org/releases/
-PKGNAMEPREFIX= cyrus-sasl-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
+PKGNAMESUFFIX= -saslauthd
+PORTREVISION= 3
-MAINTAINER= ports at MidnightBSD.org
COMMENT= SASL authentication server for cyrus-sasl2
-LICENSE= bsd4
-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 \
- --mandir=${MANPREFIX}/man \
- --enable-static \
- --enable-login \
- --enable-auth-sasldb \
- --with-rc4=openssl \
- --with-saslauthd=${SASLAUTHD_RUNPATH} \
- --disable-krb4
+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
-.include <bsd.port.pre.mk>
+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 ${PORT_OPTIONS:MBDB}
-INVALID_BDB_VER=2
+.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
-.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 \
- ${PREFIX}/sbin/saslcache
- @${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/testsaslauthd \
- ${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} -m 770 ${SASLAUTHD_RUNPATH}
- ${CHOWN} ${CYRUS_USER}:mail ${SASLAUTHD_RUNPATH}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}/saslauthd
-.for file in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} \
- ${DOCSDIR}/saslauthd
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
Modified: trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.in
===================================================================
--- trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.in 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.in 2016-08-06 02:13:23 UTC (rev 21557)
@@ -1,6 +1,7 @@
#!/bin/sh
#
-# $MidnightBSD$
+# $FreeBSD: head/security/cyrus-sasl2-saslauthd/files/saslauthd.in 340872 2014-01-24 00:14:07Z mat $
+#
# PROVIDE: saslauthd
# REQUIRE: DAEMON
Modified: trunk/security/cyrus-sasl2-saslauthd/pkg-deinstall
===================================================================
--- trunk/security/cyrus-sasl2-saslauthd/pkg-deinstall 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2-saslauthd/pkg-deinstall 2016-08-06 02:13:23 UTC (rev 21557)
@@ -1,6 +1,7 @@
#!/bin/sh
#
-# $MidnightBSD$
+# $FreeBSD: head/security/cyrus-sasl2-saslauthd/pkg-deinstall 340719 2014-01-22 15:52:06Z mat $
+#
PKG_BATCH=${BATCH:=NO}
PKG_PREFIX=${PKG_PREFIX:=/usr/local}
Modified: trunk/security/cyrus-sasl2-saslauthd/pkg-install
===================================================================
--- trunk/security/cyrus-sasl2-saslauthd/pkg-install 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2-saslauthd/pkg-install 2016-08-06 02:13:23 UTC (rev 21557)
@@ -1,6 +1,7 @@
#!/bin/sh
#
-# $MidnightBSD$
+# $FreeBSD: head/security/cyrus-sasl2-saslauthd/pkg-install 340719 2014-01-22 15:52:06Z mat $
+#
PKG_BATCH=${BATCH:=NO}
PKG_PREFIX=${PKG_PREFIX:=/usr/local}
Modified: trunk/security/cyrus-sasl2-saslauthd/pkg-message
===================================================================
--- trunk/security/cyrus-sasl2-saslauthd/pkg-message 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2-saslauthd/pkg-message 2016-08-06 02:13:23 UTC (rev 21557)
@@ -1,2 +1,6 @@
+****************************************************************************
+
To run saslauthd from startup, add saslauthd_enable="YES" in your
/etc/rc.conf.
+
+****************************************************************************
Modified: trunk/security/cyrus-sasl2-saslauthd/pkg-plist
===================================================================
--- trunk/security/cyrus-sasl2-saslauthd/pkg-plist 2016-08-06 02:03:31 UTC (rev 21556)
+++ trunk/security/cyrus-sasl2-saslauthd/pkg-plist 2016-08-06 02:13:23 UTC (rev 21557)
@@ -9,12 +9,4 @@
%%PORTDOCS%%%%DOCSDIR%%/saslauthd/LDAP_SASLAUTHD
%%PORTDOCS%%%%DOCSDIR%%/saslauthd/NEWS
%%PORTDOCS%%%%DOCSDIR%%/saslauthd/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/saslauthd
-%%RUNPATH%%@mode ug=rwx,o=
-%%RUNPATH%%@exec mkdir -p /var/run/saslauthd
-%%RUNPATH%%@exec chown -R cyrus:mail /var/run/saslauthd
-%%RUNPATH%%@exec chmod -R ug=rwx,o= /var/run/saslauthd
-%%RUNPATH%%@comment This file gets created by the run/saslauthd program
-%%RUNPATH%%@unexec rm -fr /var/run/saslauthd
-%%RUNPATH%%@mode
- at cwd %%PREFIX%%
+%%RUNPATH%%@dir(cyrus,mail,750) /var/run/saslauthd
More information about the Midnightbsd-cvs
mailing list