Index: head/security/cyrus-sasl2/scripts/configure.sasl =================================================================== --- head/security/cyrus-sasl2/scripts/configure.sasl (revision 81849) +++ head/security/cyrus-sasl2/scripts/configure.sasl (nonexistent) @@ -1,245 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`mktemp -t checklist` - -if [ "${BATCH}" ]; then - if [ "${WITH_DB41}" ]; then - OPTIONS="\"DB41\"" - elif [ "${WITH_DB4}" ]; then - OPTIONS="\"DB4\"" - elif [ "${WITH_DB3}" ]; then - OPTIONS="\"DB3\"" - else - OPTIONS="\"NDBM\"" - fi - if [ "${WITH_MYSQL41}" ]; then - OPTIONS="${OPTIONS} \"MySQL41\"" - elif [ "${WITH_MYSQL40}" ]; then - OPTIONS="${OPTIONS} \"MySQL40\"" - elif [ "${WITH_MYSQL}" ]; then - OPTIONS="${OPTIONS} \"MySQL\"" - fi - if [ "${WITH_LDAP21}" ]; then - OPTIONS="${OPTIONS} \"OpenLDAP21\"" - elif [ "${WITH_LDAP}" ]; then - OPTIONS="${OPTIONS} \"OpenLDAP\"" - fi - if [ "${OPTIONS}" != "x" ]; then - OPTIONS="${OPTIONS} \"SASLAUTHD\"" - set ${OPTIONS} - fi -else - SET_DB41="OFF" - SET_DB4="OFF" - SET_DB3="OFF" - SET_NDBM="OFF" - if [ "${WITH_DB41}" -o -f ${PREFIX}/lib/libdb41.so ] ; then - SET_DB41="ON" - elif [ "${WITH_DB4}" -o -f ${PREFIX}/lib/libdb4.so ] ; then - SET_DB4="ON" - elif [ "${WITH_DB3}" -o -f ${PREFIX}/lib/libdb3.so ] ; then - SET_DB3="ON" - else - SET_NDBM="ON" - fi - SET_MYSQL41="OFF" - SET_MYSQL40="OFF" - SET_MYSQL="OFF" - if [ "${WITH_MYSQL41}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so.14 ] ; then - SET_MYSQL41="ON" - elif [ "${WITH_MYSQL40}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so.12 ] ; then - SET_MYSQL40="ON" - elif [ "${WITH_MYSQL}" -o -f ${PREFIX}/lib/mysql/libmysqlclient.so ] ; then - SET_MYSQL="ON" - fi - SET_LDAP21="OFF" - SET_LDAP="OFF" - if [ "${WITH_LDAP21}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 \ - -a -f ${PREFIX}/bin/ldapwhoami ] ; then - SET_LDAP21="ON" - elif [ "${WITH_LDAP}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 ] ; then - SET_LDAP="ON" - fi - - /usr/bin/dialog --title "Additional SASL2 options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 16 \ -NDBM "ndbm DB" ${SET_NDBM} \ -DB3 "Berkeley DB, revision 3" ${SET_DB3} \ -DB4 "Berkeley DB, revision 4" ${SET_DB4} \ -DB41 "Berkeley DB, revision 4.1" ${SET_DB41} \ -MySQL "MySQL 3.23 password Authentication" ${SET_MYSQL} \ -MySQL40 "MySQL 4.0 password Authentication" ${SET_MYSQL40} \ -MySQL41 "MySQL 4.1 password Authentication" ${SET_MYSQL41} \ -OpenLDAP "OpenLDAP 2.0 password Authentication w/TLS" ${SET_LDAP} \ -OpenLDAP21 "OpenLDAP 2.1 password Authentication w/TLS" ${SET_LDAP21} \ -SASLAUTHD "Use saslauthd for password Authentication" ON \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `cat $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - echo "Nothing selected" - OPTIONS="\"NDBM\"" - set ${OPTIONS} - fi - ;; - 1) echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${REALCURDIR} -exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - -echo "PREFIX= ${PREFIX}" - -while [ "$1" ]; do - case $1 in - \"NDBM\") - if [ "${DBLIB}" ]; then - echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - fi - echo "CONFIGURE_ARGS+= --with-dblib=ndbm" - echo "SASLDB_NAME= sasldb2.db" - DBLIB=1 - ;; - \"DB41\") - if [ "${DBLIB}" ]; then - echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - fi - echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" - echo "CONFIGURE_ARGS+= --with-dblib=berkeley --with-bdb=db41 --with-bdb-incdir=${PREFIX}/include/db41 --with-bdb-libdir=${PREFIX}/lib" - echo "SASLDB_NAME= sasldb2" - DBLIB=1 - ;; - \"DB4\") - if [ "${DBLIB}" ]; then - echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - fi - echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" - echo "CONFIGURE_ARGS+= --with-dblib=berkeley --with-bdb=db4 --with-bdb-incdir=${PREFIX}/include/db4 --with-bdb-libdir=${PREFIX}/lib" - echo "SASLDB_NAME= sasldb2" - DBLIB=1 - ;; - \"DB3\") - if [ "${DBLIB}" ]; then - echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - fi - echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" - echo "CONFIGURE_ARGS+= --with-dblib=berkeley --with-bdb=db3 --with-bdb-incdir=${PREFIX}/include/db3 --with-bdb-libdir=${PREFIX}/lib" - echo "SASLDB_NAME= sasldb2" - DBLIB=1 - ;; - \"MySQL41\") - if [ "${DEFMYSQL}" ]; then - echo "MySQL 3.23, 4.0 and 4.1 are mutually exclusive." > /dev/stderr - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - fi - echo "LIB_DEPENDS+= mysqlclient.14:\${PORTSDIR}/databases/mysql41-client" - DEFMYSQL=1 - ;; - \"MySQL40\") - if [ "${DEFMYSQL}" ]; then - echo "MySQL 3.23, 4.0 and 4.1 are mutually exclusive." > /dev/stderr - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - fi - echo "LIB_DEPENDS+= mysqlclient.12:\${PORTSDIR}/databases/mysql40-client" - DEFMYSQL=1 - ;; - \"MySQL\") - if [ "${DEFMYSQL}" ]; then - echo "MySQL 3.23, 4.0 and 4.1 are mutually exclusive." > /dev/stderr - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - fi - echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client" - DEFMYSQL=1 - ;; - \"OpenLDAP21\") - if [ -n "${WITHOUT_SASLAUTHD}" ]; then - shift - continue - fi - if [ "${OPENLDAP}" ]; then - echo "OpenLDAP 2.0 and 2.1 are mutually exclusive." > /dev/stderr - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - fi - echo "LIB_DEPENDS+= ldap.2:\${PORTSDIR}/net/openldap21" - echo "LIB_DEPENDS+= lber.2:\${PORTSDIR}/net/openldap21" - echo "CONFIGURE_ARGS+= --with-ldap=\${PREFIX}" - OPENLDAP=1 - ;; - \"OpenLDAP\") - if [ -n "${WITHOUT_SASLAUTHD}" ]; then - shift - continue - fi - if [ "${OPENLDAP}" ]; then - echo "OpenLDAP 2.0 and 2.1 are mutually exclusive." > /dev/stderr - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - fi - echo "LIB_DEPENDS+= ldap.2:\${PORTSDIR}/net/openldap20" - echo "LIB_DEPENDS+= lber.2:\${PORTSDIR}/net/openldap20" - echo "CONFIGURE_ARGS+= --with-ldap=\${PREFIX}" - OPENLDAP=1 - ;; - \"SASLAUTHD\") - if [ -n "${WITHOUT_SASLAUTHD}" ]; then - shift - continue - fi - echo "PWCHECK_SUB+= -e \"s;%%PWCHECK%%;saslauthd;g\"" - PWCHECK=1 - ;; - *) - echo "Invalid option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done - -if [ "$PWCHECK" ]; then - echo "PWCHECK_SUB+= -e \"s;%%ENABLEPWCHECK%%;yes;g\"" - echo "PWCHECK_METHOD= saslauthd" -else - echo "PWCHECK_SUB+= -e \"s;%%PWCHECK%%;saslauthd;g\" \\" - echo " -e \"s;%%ENABLEPWCHECK%%;no;g\"" - echo "PWCHECK_METHOD= auxprop" -fi -if [ ! "${DBLIB}" ]; then - echo "CONFIGURE_ARGS+= --with-dblib=ndbm" - echo "SASLDB_NAME= sasldb2.db" -fi -if [ "${DEFMYSQL}" ]; then - echo "CONFIGURE_ARGS+= --with-mysql=\${PREFIX}" - echo "PLIST_SUB+= MYSQL=\"\"" -else - echo "PLIST_SUB+= MYSQL=\"@comment \"" -fi Property changes on: head/security/cyrus-sasl2/scripts/configure.sasl ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.23 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/security/cyrus-sasl2/Makefile =================================================================== --- head/security/cyrus-sasl2/Makefile (revision 81849) +++ head/security/cyrus-sasl2/Makefile (revision 81850) @@ -1,240 +1,223 @@ # New ports collection makefile for: cyrus-sasl2 # Date created: Nov 1 1999 # Whom: hetzels@westbend.net # # $FreeBSD$ # PORTNAME= cyrus-sasl PORTVERSION= 2.1.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.westbend.net/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ MAINTAINER= ume@FreeBSD.org COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) -USE_SUBMAKE= yes - INSTALLS_SHLIB= yes DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}2 MAN3= sasl.3 sasl_authorize_t.3 sasl_auxprop.3 \ sasl_auxprop_getctx.3 sasl_auxprop_request.3 \ sasl_callbacks.3 sasl_canon_user_t.3 \ sasl_chalprompt_t.3 sasl_checkapop.3 sasl_checkpass.3 \ sasl_client_init.3 sasl_client_new.3 sasl_client_start.3 \ sasl_client_step.3 sasl_decode.3 sasl_dispose.3 sasl_done.3 \ sasl_encode.3 sasl_encodev.3 sasl_errdetail.3 sasl_errors.3 \ sasl_errstring.3 sasl_getopt_t.3 sasl_getpath_t.3 \ sasl_getprop.3 sasl_getrealm_t.3 sasl_getsecret_t.3 \ sasl_getsimple_t.3 sasl_global_listmech.3 \ sasl_idle.3 sasl_listmech.3 sasl_log_t.3 \ sasl_server_init.3 sasl_server_new.3 sasl_server_start.3 \ sasl_server_step.3 sasl_server_userdb_checkpass_t.3 \ sasl_server_userdb_setpass_t.3 sasl_setpass.3 sasl_setprop.3 \ sasl_user_exists.3 sasl_verifyfile_t.3 MAN8= sasldblistusers2.8 saslpasswd2.8 GNU_CONFIGURE= YES CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl2 \ --with-dbpath=${PREFIX}/etc/sasldb2 \ --includedir=${PREFIX}/include \ --mandir=${MANPREFIX}/man \ --enable-static \ --enable-login \ --enable-auth-sasldb \ - --with-rc4=openssl + --with-rc4=openssl \ + --with-saslauthd -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - PREFIX="${PREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - REALCURDIR="${.CURDIR}" \ - WITHOUT_SASLAUTHD="${WITHOUT_SASLAUTHD}" \ - WITH_DB3="${WITH_DB3}" \ - WITH_DB4="${WITH_DB4}" \ - WITH_DB41="${WITH_DB41}" \ - WITH_MYSQL="${WITH_MYSQL}" \ - WITH_MYSQL40="${WITH_MYSQL40}" \ - WITH_MYSQL41="${WITH_MYSQL41}" \ - WITH_LDAP="${WITH_LDAP}" \ - WITH_LDAP21="${WITH_LDAP21}" +.if defined(WITH_BDB_VER) +.if ${WITH_BDB_VER} == 41 +LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 +CONFIGURE_ARGS+=--with-bdb=db41 --with-bdb-incdir=${PREFIX}/include/db41 +.elif ${WITH_BDB_VER} == 4 +LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 +CONFIGURE_ARGS+=--with-bdb=db4 --with-bdb-incdir=${PREFIX}/include/db4 +.elif ${WITH_BDB_VER} == 3 +LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 +CONFIGURE_ARGS+=--with-bdb=db3 --with-bdb-incdir=${PREFIX}/include/db3 +.else +BROKEN= "WITH_BDB_VER must be 3, 4 or 41" +.endif +CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${PREFIX}/lib +SASLDB_NAME= sasldb2 +.else +CONFIGURE_ARGS+=--with-dblib=ndbm +SASLDB_NAME= sasldb2.db +.endif +.if defined(WITH_MYSQL_VER) +.if ${WITH_MYSQL_VER} == 41 +LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client +.elif ${WITH_MYSQL_VER} == 40 +LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client +.elif ${WITH_MYSQL_VER} == 3 +LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client +.else +BROKEN= "WITH_MYSQL_VER must be 3, 40 or 41" +.endif +CONFIGURE_ARGS+=--with-mysql=${PREFIX} +PLIST_SUB+= MYSQL="" +.else +PLIST_SUB+= MYSQL="@comment " +.endif + .if defined(WITHOUT_OTP) -CONFIGURE_ARGS+= --disable-otp +CONFIGURE_ARGS+=--disable-otp OTP= "@comment " .endif .if defined(WITHOUT_CRAM) -CONFIGURE_ARGS+= --disable-cram +CONFIGURE_ARGS+=--disable-cram CRAM= "@comment " .endif .if defined(WITHOUT_DIGEST) -CONFIGURE_ARGS+= --disable-digest +CONFIGURE_ARGS+=--disable-digest DIGEST= "@comment " .endif .if defined(WITHOUT_NTLM) -CONFIGURE_ARGS+= --disable-ntlm +CONFIGURE_ARGS+=--disable-ntlm NTLM= "@comment " .else -CONFIGURE_ARGS+= --enable-ntlm +CONFIGURE_ARGS+=--enable-ntlm .endif -.if defined(WITHOUT_SASLAUTHD) -CONFIGURE_ARGS+= --without-saslauthd -SASLAUTHD= "@comment " -.else -CONFIGURE_ARGS+= --with-saslauthd -.endif - .if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) -CONFIGURE_ARGS+= --enable-gssapi=${KRB5_HOME} +CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} .elif !defined(WITHOUT_GSSAPI) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a) -CONFIGURE_ARGS+= --enable-gssapi=${HEIMDAL_HOME} +CONFIGURE_ARGS+=--enable-gssapi=${HEIMDAL_HOME} .elif !defined(WITHOUT_GSSAPI) && defined(MAKE_KERBEROS5) && exists(/usr/lib/libkrb5.a) -CONFIGURE_ARGS+= --enable-gssapi +CONFIGURE_ARGS+=--enable-gssapi .else -CONFIGURE_ARGS+= --disable-gssapi +CONFIGURE_ARGS+=--disable-gssapi GSSAPI= "@comment " .endif .include # KERBEROS 4 was removed in FreeBSD 5.0-CURRENT .if ${OSVERSION} > 500105 .if defined(WITH_KERBEROS4) LIB_DEPENDS+= krb.2:${PORTSDIR}/security/krb4 -CONFIGURE_ARGS+= --enable-krb4=${LOCALBASE}/krb4 +CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4 .else -CONFIGURE_ARGS+= --disable-krb4 +CONFIGURE_ARGS+=--disable-krb4 EBONES= "@comment " .endif .elif exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(WITHOUT_KERBEROS4) -CONFIGURE_ARGS+= --enable-krb4 +CONFIGURE_ARGS+=--enable-krb4 .elif !exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4) LIB_DEPENDS+= krb.2:${PORTSDIR}/security/krb4 -CONFIGURE_ARGS+= --enable-krb4=${LOCALBASE}/krb4 +CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4 .else -CONFIGURE_ARGS+= --disable-krb4 +CONFIGURE_ARGS+=--disable-krb4 EBONES= "@comment " .endif .include "${PORTSDIR}/security/openssl/bsd.openssl.mk" .if !defined(WITH_OPENSSL_BASE) -CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ OPENSSLINC=${OPENSSLINC} \ OPENSSLLIB=${OPENSSLLIB} \ LDFLAGS=${LDFLAGS} CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README DOC2= ONEWS TODO draft-burdis-cat-srp-sasl-06.txt \ draft-ietf-cat-sasl-gssapi-05.txt draft-ietf-sasl-anon-00.txt \ draft-ietf-sasl-plain-00.txt draft-ietf-sasl-rfc2831bis-00.txt \ draft-myers-saslrev-02.txt draft-nerenberg-sasl-crammd5-03.txt \ draft-newman-sasl-c-api-01.txt draft-sasl-login.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 -SASLAUTHD_DOCS= AUTHORS COPYING ChangeLog INSTALL LDAP_SASLAUTHD NEWS README - HTDOCS= advanced appconvert gssapi index install macosx mechanisms \ options plugprog programming readme sysadmin upgrading PLIST_SUB= PREFIX=${PREFIX} \ - SASLAUTHD=${SASLAUTHD} \ OTP=${OTP} \ CRAM=${CRAM} \ DIGEST=${DIGEST} \ NTLM=${NTLM} \ GSSAPI=${GSSAPI} \ EBONES=${EBONES} \ DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif - # Fix sasldb name in pkg-install/deinstall scripts post-patch: @${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \ - -e "s;%%PWCHECK_METHOD%%;${PWCHECK_METHOD};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;%%PWCHECK_METHOD%%;${PWCHECK_METHOD};g" \ -e "s;%%CYRUS_USER%%;${CYRUS_USER};g" \ -e "s;%%CYRUS_GROUP%%;${CYRUS_GROUP};g" \ ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL} - @${SED} -e "s;%%PWCHECK_METHOD%%;${PWCHECK_METHOD};g" \ - -e "s;%%PREFIX%%;${PREFIX};g" \ + @${SED} -e "s;%%PREFIX%%;${PREFIX};g" \ ${.CURDIR}/pkg-message > ${PKGMESSAGE} # Create Cyrus user and group pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: ${INSTALL_MAN} ${WRKSRC}/utils/saslpasswd2.8 \ ${MAN8PREFIX}/man/man8/saslpasswd2.8 ${INSTALL_MAN} ${WRKSRC}/utils/sasldblistusers2.8 \ ${MAN8PREFIX}/man/man8/sasldblistusers2.8 -.if !defined(WITHOUT_SASLAUTHD) - ${GZIP_CMD} ${MAN8PREFIX}/man/cat8/saslauthd.8 - @${SED} -e "s;%%PREFIX%%;${PREFIX};g" ${PWCHECK_SUB} \ - ${FILESDIR}/saslauthd.sh > ${PREFIX}/etc/rc.d/saslauthd.sh - @${CHMOD} 755 ${PREFIX}/etc/rc.d/saslauthd.sh - ${MKDIR} -m 770 /var/state/saslauthd - ${CHOWN} ${CYRUS_USER}:mail /var/state/saslauthd -.endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}/html .for file in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .for file in ${DOC2} @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} .endfor .for file in ${HTDOCS} @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}/html .endfor -.if !defined(WITHOUT_SASLAUTHD) - @${MKDIR} ${DOCSDIR}/saslauthd -.for file in ${SASLAUTHD_DOCS} - @${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} ${DOCSDIR}/saslauthd -.endfor -.endif @${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR} .endif @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} - -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/security/cyrus-sasl2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.76 \ No newline at end of property +1.77 \ No newline at end of property Index: head/security/cyrus-sasl2/files/saslauthd.sh =================================================================== --- head/security/cyrus-sasl2/files/saslauthd.sh (revision 81849) +++ head/security/cyrus-sasl2/files/saslauthd.sh (nonexistent) @@ -1,74 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -action=$1 - -PREFIX=%%PREFIX%% - -# Suck in the configuration variables. -if [ -z "${source_rc_confs_defined}" ]; then - if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs - elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf - fi -fi - -# The following sasl_saslauthd_* variables may be defined in rc.conf -# -# sasl_saslauthd_enable - Set to YES to enable saslauthd -# Default: %%ENABLEPWCHECK%% -# -# sasl_saslauthd_program - Path to saslauthd program -# Default: ${PREFIX}/sbin/%%PWCHECK%% -# -# sasl_saslauthd_flags - Flags to saslauthd program -# Default: -a pam - -if [ -z "${sasl_saslauthd_enable}" ]; then - sasl_saslauthd_enable=%%ENABLEPWCHECK%% -fi - -if [ -z "${sasl_saslauthd_program}" ]; then - sasl_saslauthd_program=${PREFIX}/sbin/%%PWCHECK%% -fi - -if [ -z "${sasl_saslauthd_flags}" ]; then - sasl_saslauthd_flags="-a pam" -fi - -rc=0 - -case "${sasl_saslauthd_enable}" in - [Yy][Ee][Ss]) - case "${action}" in - - start) - if [ -x ${sasl_saslauthd_program} ] ; then - ${sasl_saslauthd_program} ${sasl_saslauthd_flags} \ - && echo -n " saslauthd" - fi - ;; - - stop) - if [ -r /var/state/saslauthd/saslauthd.pid ]; then - kill `cat /var/state/saslauthd/saslauthd.pid` && \ - echo -n " saslauthd" - fi - ;; - - *) - echo "usage: $0 {start|stop}" 1>&2 - rc=64 - ;; - esac - ;; - *) - rc=0 - ;; -esac - -exit $rc Property changes on: head/security/cyrus-sasl2/files/saslauthd.sh ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/security/cyrus-sasl2/files/patch-configure =================================================================== --- head/security/cyrus-sasl2/files/patch-configure (revision 81849) +++ head/security/cyrus-sasl2/files/patch-configure (revision 81850) @@ -1,38 +1,49 @@ ---- configure.orig Mon Apr 14 20:07:48 2003 -+++ configure Tue Apr 15 01:39:33 2003 +Index: configure +diff -u configure.orig configure +--- configure.orig Tue Apr 15 03:07:48 2003 ++++ configure Tue May 27 17:29:16 2003 @@ -2652,7 +2652,7 @@ BDB_LIBADD="" fi - for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db + for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db do echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 echo "configure:2659: checking for db_create in -l$dbname" >&5 @@ -3043,7 +3043,7 @@ BDB_LIBADD="" fi - for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db + for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db do echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 echo "configure:3050: checking for db_create in -l$dbname" >&5 -@@ -5456,7 +5456,7 @@ +@@ -3761,6 +3761,8 @@ + SASLAUTHD_TRUE='#' + SASLAUTHD_FALSE= + fi ++SASLAUTHD_TRUE='#' ++SASLAUTHD_FALSE= + echo $ac_n "checking if I should include saslauthd""... $ac_c" 1>&6 + echo "configure:3766: checking if I should include saslauthd" >&5 + echo "$ac_t""$with_saslauthd" 1>&6 +@@ -5456,7 +5458,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS" +LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS" cat > conftest.$ac_ext </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 } # This should really be uninstalled by Sendmail sendmail_conf() { if [ -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf ]; then - echo "pwcheck_method: %%PWCHECK_METHOD%%" > ${PKG_PREFIX}/lib/sasl2/Sendmail.conf.tmp + echo "pwcheck_method: auxprop" > ${PKG_PREFIX}/lib/sasl2/Sendmail.conf.tmp if cmp -s ${PKG_PREFIX}/lib/sasl2/Sendmail.conf ${PKG_PREFIX}/lib/sasl2/Sendmail.conf.tmp; then rm -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf fi rm -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf.tmp fi } case $2 in DEINSTALL) delete_sasldb sendmail_conf ;; POST-DEINSTALL) delete_user ;; esac Property changes on: head/security/cyrus-sasl2/pkg-deinstall ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/security/cyrus-sasl2/pkg-install =================================================================== --- head/security/cyrus-sasl2/pkg-install (revision 81849) +++ head/security/cyrus-sasl2/pkg-install (revision 81850) @@ -1,113 +1,113 @@ #!/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%% 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 /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} -d "${uhome}" \ -c "the cyrus mail server" -s "${shell}" -p "*" \ ; then e=$? echo "*** Failed to update user \`${USER}'." exit ${e} fi echo "*** Updated user \`${USER}'." fi # Don't know why we need the daemon user in the cyrus group # hopefully this doesn't affect anyone. It's a leftover from # the pre-SASL cyrus-imapd server. # if ! ${PW} group mod ${GROUP} -m daemon; then # echo "*** can't add user \`daemon' to group \`${GROUP}'" # 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 ${PKG_PREFIX}/etc/$SASLDB_NAME}" else ${PKG_PREFIX}/sbin/saslpasswd2 -d ${CYRUS_USER} chown ${CYRUS_USER}:mail ${SASLDB_NAME} chmod 640 ${SASLDB_NAME} fi fi } # This should really be installed by Sendmail sendmail_conf() { if [ ! -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf ]; then - echo "pwcheck_method: %%PWCHECK_METHOD%%" > ${PKG_PREFIX}/lib/sasl2/Sendmail.conf + echo "pwcheck_method: auxprop" > ${PKG_PREFIX}/lib/sasl2/Sendmail.conf fi } case $2 in PRE-INSTALL) create_user ;; POST-INSTALL) if [ "${PKG_BATCH}" = "NO" ]; then create_sasldb sendmail_conf fi ;; esac Property changes on: head/security/cyrus-sasl2/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/security/cyrus-sasl2/pkg-message =================================================================== --- head/security/cyrus-sasl2/pkg-message (revision 81849) +++ head/security/cyrus-sasl2/pkg-message (revision 81850) @@ -1,17 +1,21 @@ You may need to start the saslauthd daemon for authentication with the system password files: %%PREFIX%%/etc/rc.d/saslauthd.sh start or 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 +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 - %%PWCHECK_METHOD%%. Set sasl_pwcheck_method to %%PWCHECK_METHOD%%, - after installing the Cyrus-IMAPd 2.1.7 port. You should also check - the %%PREFIX%%/lib/sasl2/*.conf files for the correct pwcheck_method. + 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. Property changes on: head/security/cyrus-sasl2/pkg-message ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/security/cyrus-sasl2/pkg-plist =================================================================== --- head/security/cyrus-sasl2/pkg-plist (revision 81849) +++ head/security/cyrus-sasl2/pkg-plist (revision 81850) @@ -1,114 +1,96 @@ -%%SASLAUTHD%%etc/rc.d/saslauthd.sh 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 @dirrm include/sasl lib/libsasl2.a lib/libsasl2.so lib/libsasl2.so.2 lib/sasl2/libanonymous.a lib/sasl2/libanonymous.so lib/sasl2/libanonymous.so.2 %%CRAM%%lib/sasl2/libcrammd5.a %%CRAM%%lib/sasl2/libcrammd5.so %%CRAM%%lib/sasl2/libcrammd5.so.2 %%DIGEST%%lib/sasl2/libdigestmd5.a %%DIGEST%%lib/sasl2/libdigestmd5.so %%DIGEST%%lib/sasl2/libdigestmd5.so.2 %%GSSAPI%%lib/sasl2/libgssapiv2.a %%GSSAPI%%lib/sasl2/libgssapiv2.so %%GSSAPI%%lib/sasl2/libgssapiv2.so.2 %%EBONES%%lib/sasl2/libkerberos4.a %%EBONES%%lib/sasl2/libkerberos4.so %%EBONES%%lib/sasl2/libkerberos4.so.2 lib/sasl2/liblogin.a lib/sasl2/liblogin.so lib/sasl2/liblogin.so.2 %%MYSQL%%lib/sasl2/libmysql.a %%MYSQL%%lib/sasl2/libmysql.so %%MYSQL%%lib/sasl2/libmysql.so.2 %%NTLM%%lib/sasl2/libntlm.a %%NTLM%%lib/sasl2/libntlm.so %%NTLM%%lib/sasl2/libntlm.so.2 %%OTP%%lib/sasl2/libotp.a %%OTP%%lib/sasl2/libotp.so %%OTP%%lib/sasl2/libotp.so.2 lib/sasl2/libplain.a lib/sasl2/libplain.so lib/sasl2/libplain.so.2 lib/sasl2/libsasldb.a lib/sasl2/libsasldb.so lib/sasl2/libsasldb.so.2 -%%SASLAUTHD%%man/cat8/saslauthd.8.gz -%%SASLAUTHD%%sbin/saslauthd sbin/sasldblistusers2 sbin/saslpasswd2 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/ONEWS %%PORTDOCS%%%%DOCSDIR%%/Sendmail.README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-06.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-cat-sasl-gssapi-05.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-anon-00.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-00.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-00.txt %%PORTDOCS%%%%DOCSDIR%%/draft-myers-saslrev-02.txt %%PORTDOCS%%%%DOCSDIR%%/draft-nerenberg-sasl-crammd5-03.txt %%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-01.txt %%PORTDOCS%%%%DOCSDIR%%/draft-sasl-login.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/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 -%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/AUTHORS -%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/COPYING -%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/ChangeLog -%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/INSTALL -%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/LDAP_SASLAUTHD -%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/NEWS -%%SASLAUTHD%%%%PORTDOCS%%%%DOCSDIR%%/saslauthd/README %%PORTDOCS%%@dirrm %%DOCSDIR%%/html -%%SASLAUTHD%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/saslauthd %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/sasl2 -%%SASLAUTHD%%@mode ug=rwx,o= -%%SASLAUTHD%%@exec mkdir -p /var/state/saslauthd -%%SASLAUTHD%%@exec chown -R cyrus:cyrus /var/state -%%SASLAUTHD%%@exec chmod -R o= /var/state -%%SASLAUTHD%%@comment This file gets created by the state/saslauthd program -%%SASLAUTHD%%@unexec rm -fr /var/state/saslauthd -%%SASLAUTHD%%@unexec rmdir /var/state @cwd %%PREFIX%% Property changes on: head/security/cyrus-sasl2/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.28 \ No newline at end of property +1.29 \ No newline at end of property