Index: head/security/cyrus-sasl2/Makefile =================================================================== --- head/security/cyrus-sasl2/Makefile (revision 282294) +++ head/security/cyrus-sasl2/Makefile (revision 282295) @@ -1,258 +1,283 @@ # New ports collection makefile for: cyrus-sasl2 # Date created: Nov 1 1999 # Whom: hetzels@westbend.net # # $FreeBSD$ # PORTNAME= cyrus-sasl -PORTVERSION= 2.1.23 -PORTREVISION= 3 +PORTVERSION= 2.1.25 +#PORTREVISION= 0 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 +MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ MAINTAINER= ume@FreeBSD.org COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYING + LATEST_LINK= ${PORTNAME}2 USE_AUTOTOOLS= libtool USE_LDCONFIG= 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_getconfpath_t.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= pluginviewer.8 sasldblistusers2.8 saslpasswd2.8 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 \ --includedir=${PREFIX}/include \ --enable-static \ --enable-auth-sasldb \ --with-rc4=openssl \ --with-saslauthd=${SASLAUTHD_RUNPATH} \ --disable-krb4 OPTIONS= BDB "Use Berkeley DB" off \ MYSQL "Use MySQL" off \ PGSQL "Use PostgreSQL" off \ SQLITE "Use SQLite" off \ + SQLITE3 "Use SQLite3" off \ DEV_URANDOM "Use /dev/urandom" off \ ALWAYSTRUE "Enable the alwaystrue password verifier" off \ KEEP_DB_OPEN "Keep handle to Berkeley DB open" off \ + OBSOLETE_CRAM_ATTR "Enable cmusaslsecretCRAM-MD5 property" on \ AUTHDAEMOND "Enable use of authdaemon" on \ LOGIN "Enable LOGIN authentication" on \ PLAIN "Enable PLAIN authentication" on \ CRAM "Enable CRAM-MD5 authentication" on \ DIGEST "Enable DIGEST-MD5 authentication" on \ + NTLM "Enable NTLM authentication" on \ OTP "Enable OTP authentication" on \ - NTLM "Enable NTLM authentication" on + SCRAM "Enable SCRAM authentication" on .include .if defined(WITH_BDB) USE_BDB= yes INVALID_BDB_VER=2 CONFIGURE_ARGS+=--with-dblib=berkeley \ --with-bdb-libdir=${BDB_LIB_DIR} \ --with-bdb-incdir=${BDB_INCLUDE_DIR} \ --with-bdb=${BDB_LIB_NAME} SASLDB_NAME= sasldb2 .else CONFIGURE_ARGS+=--with-dblib=ndbm SASLDB_NAME= sasldb2.db .endif .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} .else CONFIGURE_ARGS+=--without-mysql .endif .if defined(WITH_PGSQL) USE_PGSQL= yes CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} .else CONFIGURE_ARGS+=--without-pgsql .endif +.if defined(WITH_SQLITE) && defined(WITH_SQLITE3) +BROKEN= SQLITE and SQLITE3 are mutually exclusive. +.endif + .if defined(WITH_SQLITE) USE_SQLITE= 2 CONFIGURE_ARGS+=--with-sqlite=${LOCALBASE} .else CONFIGURE_ARGS+=--without-sqlite .endif -.if defined(WITH_MYSQL) || defined(WITH_PGSQL) || defined(WITH_SQLITE) +.if defined(WITH_SQLITE3) +USE_SQLITE= 3 +CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE} +.else +CONFIGURE_ARGS+=--without-sqlite3 +.endif + +.if defined(WITH_MYSQL) || defined(WITH_PGSQL) || defined(WITH_SQLITE) || \ + defined(WITH_SQLITE3) CONFIGURE_ARGS+=--enable-sql .else SQL= "@comment " .endif .if defined(WITH_DEV_URANDOM) CONFIGURE_ARGS+=--with-devrandom=/dev/urandom .endif .if defined(WITH_ALWAYSTRUE) CONFIGURE_ARGS+=--enable-alwaystrue .endif .if defined(WITH_KEEP_DB_OPEN) CONFIGURE_ARGS+=--enable-keep-db-open .endif +.if defined(WITHOUT_OBSOLETE_CRAM_ATTR) +CONFIGURE_ARGS+=--enable-obsolete_cram_attr=no +.endif + .if defined(WITHOUT_AUTHDAEMOND) CONFIGURE_ARGS+=--with-authdaemond=no .else CONFIGURE_ARGS+=--with-authdaemond=/var/run/authdaemond/socket .endif .if defined(WITHOUT_LOGIN) LOGIN= "@comment " .else CONFIGURE_ARGS+=--enable-login .endif .if defined(WITHOUT_PLAIN) CONFIGURE_ARGS+=--disable-plain PLAIN= "@comment " .endif .if defined(WITHOUT_OTP) CONFIGURE_ARGS+=--disable-otp OTP= "@comment " .endif .if defined(WITHOUT_CRAM) CONFIGURE_ARGS+=--disable-cram CRAM= "@comment " .endif .if defined(WITHOUT_DIGEST) CONFIGURE_ARGS+=--disable-digest DIGEST= "@comment " .endif .if defined(WITHOUT_NTLM) CONFIGURE_ARGS+=--disable-ntlm NTLM= "@comment " .else CONFIGURE_ARGS+=--enable-ntlm .endif +.if defined(WITHOUT_SCRAM) +CONFIGURE_ARGS+=--disable-scram +SCRAM= "@comment " +.endif + .if ${ARCH} == "amd64" CPPFLAGS+= -fPIC .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 .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 .else CONFIGURE_ARGS+=--disable-gssapi GSSAPI= "@comment " .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 PLIST_SUB= PREFIX=${PREFIX} \ LOGIN=${LOGIN} \ PLAIN=${PLAIN} \ OTP=${OTP} \ CRAM=${CRAM} \ DIGEST=${DIGEST} \ NTLM=${NTLM} \ GSSAPI=${GSSAPI} \ EBONES=${EBONES} \ + SCRAM=${SCRAM} \ SQL=${SQL} \ DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message # Fix sasldb name in pkg-install/deinstall scripts post-patch: @${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} # Create Cyrus user and group pre-su-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${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 @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} .include Property changes on: head/security/cyrus-sasl2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.146 \ No newline at end of property +1.147 \ No newline at end of property Index: head/security/cyrus-sasl2/distinfo =================================================================== --- head/security/cyrus-sasl2/distinfo (revision 282294) +++ head/security/cyrus-sasl2/distinfo (revision 282295) @@ -1,2 +1,2 @@ -SHA256 (cyrus-sasl-2.1.23.tar.gz) = 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136 -SIZE (cyrus-sasl-2.1.23.tar.gz) = 1613642 +SHA256 (cyrus-sasl-2.1.25.tar.gz) = 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe +SIZE (cyrus-sasl-2.1.25.tar.gz) = 5209240 Property changes on: head/security/cyrus-sasl2/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.30 \ No newline at end of property +1.31 \ No newline at end of property Index: head/security/cyrus-sasl2/files/patch-plugins::gssapi.c =================================================================== --- head/security/cyrus-sasl2/files/patch-plugins::gssapi.c (revision 282294) +++ head/security/cyrus-sasl2/files/patch-plugins::gssapi.c (nonexistent) @@ -1,12 +0,0 @@ ---- plugins/gssapi.c (revision 580) -+++ plugins/gssapi.c (working copy) -@@ -86,7 +86,7 @@ - - static const char * GSSAPI_BLANK_STRING = ""; - --#ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE -+#if !defined(HAVE_GSS_C_NT_HOSTBASED_SERVICE) && !defined(GSS_C_NT_HOSTBASED_SERVICE) - extern gss_OID gss_nt_service_name; - #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name - #endif - Property changes on: head/security/cyrus-sasl2/files/patch-plugins::gssapi.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/security/cyrus-sasl2/files/patch-plugins-digestmd5.c =================================================================== --- head/security/cyrus-sasl2/files/patch-plugins-digestmd5.c (revision 282294) +++ head/security/cyrus-sasl2/files/patch-plugins-digestmd5.c (nonexistent) @@ -1,20 +0,0 @@ ---- plugins/digestmd5.c.orig 2006-05-17 20:46:17.000000000 +0400 -+++ plugins/digestmd5.c -@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, Property changes on: head/security/cyrus-sasl2/files/patch-plugins-digestmd5.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/security/cyrus-sasl2/files/patch-lib::Makefile.in =================================================================== --- head/security/cyrus-sasl2/files/patch-lib::Makefile.in (revision 282294) +++ head/security/cyrus-sasl2/files/patch-lib::Makefile.in (nonexistent) @@ -1,24 +0,0 @@ -Index: lib/Makefile.in -diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Sun May 15 14:58:38 2005 -+++ lib/Makefile.in Wed May 18 01:12:50 2005 -@@ -12,6 +12,8 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - -+.PATH: ${.CURDIR}/../plugins ${.CURDIR}/../sasldb -+ - @SET_MAKE@ - - # Makefile.am for the SASL library -@@ -645,10 +647,6 @@ - rm -f $@ - ln -s .libs/$@ $@ - --$(SASL_STATIC_OBJS): linksrcs -- --linksrcs: -- -ln -s $(SASL_STATIC_SRCS) . - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: Property changes on: head/security/cyrus-sasl2/files/patch-lib::Makefile.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.3 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/security/cyrus-sasl2/files/patch-configure =================================================================== --- head/security/cyrus-sasl2/files/patch-configure (revision 282294) +++ head/security/cyrus-sasl2/files/patch-configure (revision 282295) @@ -1,82 +1,64 @@ Index: configure diff -u configure.orig configure ---- configure.orig Fri May 19 04:30:13 2006 -+++ configure Sat May 20 04:04:39 2006 -@@ -1586,6 +1586,7 @@ +--- configure.orig 2011-09-07 22:29:25.000000000 +0900 ++++ configure 2011-09-14 15:48:43.574171984 +0900 +@@ -2365,6 +2365,7 @@ fi - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } +program_prefix=NONE test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. -@@ -5125,7 +5126,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -5135,6 +5136,7 @@ +@@ -6329,6 +6330,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include - int - main () -@@ -5882,7 +5884,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -5892,6 +5894,7 @@ + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" +@@ -7139,6 +7141,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include - int - main () -@@ -7193,6 +7196,8 @@ + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" +@@ -8666,6 +8669,8 @@ SASLAUTHD_TRUE='#' SASLAUTHD_FALSE= fi +SASLAUTHD_TRUE='#' +SASLAUTHD_FALSE= - echo "$as_me:$LINENO: checking if I should include saslauthd" >&5 - echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6 -@@ -10650,7 +10655,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking if I should include saslauthd" >&5 + $as_echo_n "checking if I should include saslauthd... " >&6; } +@@ -12537,7 +12542,7 @@ + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" +LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ -@@ -11060,7 +11065,7 @@ + _ACEOF +@@ -13013,7 +13018,7 @@ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" - GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" + GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`" GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" elif test "$gss_impl" = "cybersafe03"; then # Version of CyberSafe with two libraries -@@ -11898,7 +11903,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14358,7 +14363,7 @@ + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $LIBS" +LIBS="-lpq $GSSAPIBASE_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ + _ACEOF Property changes on: head/security/cyrus-sasl2/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.17 \ No newline at end of property +1.18 \ No newline at end of property Index: head/security/cyrus-sasl2/files/patch-plugins::ldapdb.c =================================================================== --- head/security/cyrus-sasl2/files/patch-plugins::ldapdb.c (nonexistent) +++ head/security/cyrus-sasl2/files/patch-plugins::ldapdb.c (revision 282295) @@ -0,0 +1,13 @@ +Index: plugins/ldapdb.c +diff -u -p plugins/ldapdb.c.orig plugins/ldapdb.c +--- plugins/ldapdb.c.orig 2011-05-12 04:25:55.000000000 +0900 ++++ plugins/ldapdb.c 2011-09-24 17:25:23.465329876 +0900 +@@ -251,6 +251,8 @@ static int ldapdb_auxprop_lookup(void *g + + #if defined(LDAP_PROXY_AUTHZ_FAILURE) + case LDAP_PROXY_AUTHZ_FAILURE: ++#else ++ case LDAP_X_PROXY_AUTHZ_FAILURE: + #endif + case LDAP_INAPPROPRIATE_AUTH: + case LDAP_INVALID_CREDENTIALS: Property changes on: head/security/cyrus-sasl2/files/patch-plugins::ldapdb.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in =================================================================== --- head/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in (revision 282294) +++ head/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in (revision 282295) @@ -1,13 +1,13 @@ Index: saslauthd/Makefile.in diff -u saslauthd/Makefile.in.orig saslauthd/Makefile.in ---- saslauthd/Makefile.in.orig Fri May 19 04:30:21 2006 -+++ saslauthd/Makefile.in Sat May 20 05:21:31 2006 -@@ -621,7 +621,7 @@ +--- saslauthd/Makefile.in.orig 2011-09-07 22:13:56.000000000 +0900 ++++ saslauthd/Makefile.in 2011-09-14 15:16:53.207259788 +0900 +@@ -722,7 +722,7 @@ install-data-local: saslauthd.8 $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 - $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8 + $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: Property changes on: head/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/security/cyrus-sasl2/files/patch-saslauthd::configure =================================================================== --- head/security/cyrus-sasl2/files/patch-saslauthd::configure (revision 282294) +++ head/security/cyrus-sasl2/files/patch-saslauthd::configure (revision 282295) @@ -1,71 +1,46 @@ ---- saslauthd/configure.orig 2006-05-19 03:30:20.000000000 +0800 -+++ saslauthd/configure 2008-05-21 10:00:20.000000000 +0800 -@@ -1234,7 +1234,7 @@ - ac_cache_corrupted=: ;; - ,);; - *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -+ if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -@@ -1526,6 +1526,7 @@ +Index: saslauthd/configure +diff -u saslauthd/configure.orig saslauthd/configure +--- saslauthd/configure.orig 2011-09-03 00:40:17.000000000 +0900 ++++ saslauthd/configure 2011-09-14 15:22:38.269314778 +0900 +@@ -2185,6 +2185,7 @@ fi - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } +program_prefix=NONE test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. -@@ -6843,7 +6844,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8320,7 +8321,7 @@ + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" +LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ -@@ -7253,7 +7254,7 @@ + _ACEOF +@@ -8796,7 +8797,7 @@ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" - GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" + GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`" GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" elif test "$gss_impl" = "cybersafe03"; then # Version of CyberSafe with two libraries -@@ -8010,7 +8011,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -8020,6 +8021,7 @@ +@@ -9978,6 +9979,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include - int - main () -@@ -8767,7 +8769,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -8777,6 +8779,7 @@ + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" +@@ -10788,6 +10790,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include - int - main () + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" Property changes on: head/security/cyrus-sasl2/files/patch-saslauthd::configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property Index: head/security/cyrus-sasl2/pkg-plist =================================================================== --- head/security/cyrus-sasl2/pkg-plist (revision 282294) +++ head/security/cyrus-sasl2/pkg-plist (revision 282295) @@ -1,109 +1,113 @@ 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.la lib/libsasl2.so lib/libsasl2.so.2 lib/sasl2/libanonymous.a lib/sasl2/libanonymous.la lib/sasl2/libanonymous.so lib/sasl2/libanonymous.so.2 %%CRAM%%lib/sasl2/libcrammd5.a %%CRAM%%lib/sasl2/libcrammd5.la %%CRAM%%lib/sasl2/libcrammd5.so %%CRAM%%lib/sasl2/libcrammd5.so.2 %%DIGEST%%lib/sasl2/libdigestmd5.a %%DIGEST%%lib/sasl2/libdigestmd5.la %%DIGEST%%lib/sasl2/libdigestmd5.so %%DIGEST%%lib/sasl2/libdigestmd5.so.2 %%GSSAPI%%lib/sasl2/libgssapiv2.a %%GSSAPI%%lib/sasl2/libgssapiv2.la %%GSSAPI%%lib/sasl2/libgssapiv2.so %%GSSAPI%%lib/sasl2/libgssapiv2.so.2 %%LOGIN%%lib/sasl2/liblogin.a %%LOGIN%%lib/sasl2/liblogin.la %%LOGIN%%lib/sasl2/liblogin.so %%LOGIN%%lib/sasl2/liblogin.so.2 +%%SCRAM%%lib/sasl2/libscram.a +%%SCRAM%%lib/sasl2/libscram.la +%%SCRAM%%lib/sasl2/libscram.so +%%SCRAM%%lib/sasl2/libscram.so.2 %%SQL%%lib/sasl2/libsql.a %%SQL%%lib/sasl2/libsql.la %%SQL%%lib/sasl2/libsql.so %%SQL%%lib/sasl2/libsql.so.2 %%NTLM%%lib/sasl2/libntlm.a %%NTLM%%lib/sasl2/libntlm.la %%NTLM%%lib/sasl2/libntlm.so %%NTLM%%lib/sasl2/libntlm.so.2 %%OTP%%lib/sasl2/libotp.a %%OTP%%lib/sasl2/libotp.la %%OTP%%lib/sasl2/libotp.so %%OTP%%lib/sasl2/libotp.so.2 %%PLAIN%%lib/sasl2/libplain.a %%PLAIN%%lib/sasl2/libplain.la %%PLAIN%%lib/sasl2/libplain.so %%PLAIN%%lib/sasl2/libplain.so.2 lib/sasl2/libsasldb.a lib/sasl2/libsasldb.la lib/sasl2/libsasldb.so lib/sasl2/libsasldb.so.2 sbin/pluginviewer sbin/sasldblistusers2 sbin/saslpasswd2 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/INSTALL.TXT %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/ONEWS %%PORTDOCS%%%%DOCSDIR%%/Sendmail.README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-xx.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-anon-xx.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-crammd5-xx.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-gssapi-xx.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-xx.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2222bis-xx.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-xx.txt %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-saslprep-xx.txt %%PORTDOCS%%%%DOCSDIR%%/draft-murchison-sasl-login-xx.txt %%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-xx.txt %%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt %%PORTDOCS%%%%DOCSDIR%%/rfc1939.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2195.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2222.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2243.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2245.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2289.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2444.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2595.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2831.txt %%PORTDOCS%%%%DOCSDIR%%/rfc2945.txt %%PORTDOCS%%%%DOCSDIR%%/rfc3174.txt %%PORTDOCS%%%%DOCSDIR%%/server-plugin-flow.fig %%PORTDOCS%%%%DOCSDIR%%/testing.txt %%PORTDOCS%%%%DOCSDIR%%/html/advanced.html %%PORTDOCS%%%%DOCSDIR%%/html/appconvert.html %%PORTDOCS%%%%DOCSDIR%%/html/components.html %%PORTDOCS%%%%DOCSDIR%%/html/gssapi.html %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/install.html %%PORTDOCS%%%%DOCSDIR%%/html/macosx.html %%PORTDOCS%%%%DOCSDIR%%/html/mechanisms.html %%PORTDOCS%%%%DOCSDIR%%/html/options.html %%PORTDOCS%%%%DOCSDIR%%/html/plugprog.html %%PORTDOCS%%%%DOCSDIR%%/html/programming.html %%PORTDOCS%%%%DOCSDIR%%/html/readme.html %%PORTDOCS%%%%DOCSDIR%%/html/sysadmin.html %%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html %%PORTDOCS%%%%DOCSDIR%%/html/windows.html %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry lib/sasl2 @cwd %%PREFIX%% Property changes on: head/security/cyrus-sasl2/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/security/cyrus-sasl2-ldapdb/Makefile =================================================================== --- head/security/cyrus-sasl2-ldapdb/Makefile (revision 282294) +++ head/security/cyrus-sasl2-ldapdb/Makefile (revision 282295) @@ -1,77 +1,80 @@ # New ports collection makefile for: cyrus-sasl2-ldapdb # Date created: May 18 2005 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= ldapdb -PORTVERSION= 2.1.23 +PORTVERSION= 2.1.25 #PORTREVISION= 0 -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} MAINTAINER= ume@FreeBSD.org COMMENT= SASL LDAPDB auxprop plugin +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files -INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/plugins +INSTALL_WRKSRC= ${WRKSRC}/plugins USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_OPENSSL= yes GNU_CONFIGURE= yes .if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif USE_OPENLDAP= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl2 \ --with-dbpath=${PREFIX}/etc/sasldb2 \ --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-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 .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 Property changes on: head/security/cyrus-sasl2-ldapdb/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/security/cyrus-sasl2-saslauthd/Makefile =================================================================== --- head/security/cyrus-sasl2-saslauthd/Makefile (revision 282294) +++ head/security/cyrus-sasl2-saslauthd/Makefile (revision 282295) @@ -1,139 +1,142 @@ # New ports collection makefile for: cyrus-sasl2-saslauthd # Date created: May 27 2003 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= saslauthd -PORTVERSION= 2.1.23 +PORTVERSION= 2.1.25 #PORTREVISION= 0 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} MAINTAINER= ume@FreeBSD.org COMMENT= SASL authentication server for cyrus-sasl2 +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files -INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/saslauthd +INSTALL_WRKSRC= ${WRKSRC}/saslauthd DOCSDIR= ${PREFIX}/share/doc/cyrus-sasl2 MAN8= saslauthd.8 USE_RC_SUBR= saslauthd.sh USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl2 \ --with-dbpath=${PREFIX}/etc/sasldb2 \ --includedir=${PREFIX}/include \ --enable-static \ --enable-login \ --enable-auth-sasldb \ --with-rc4=openssl \ --with-saslauthd=${SASLAUTHD_RUNPATH} \ --disable-krb4 OPTIONS= BDB "Use Berkeley DB" off \ OPENLDAP "Use OpenLDAP" off \ HTTPFORM "Enable HTTP form authentication" off .include .if defined(WITH_BDB) USE_BDB= yes INVALID_BDB_VER=2 CONFIGURE_ARGS+=--with-dblib=berkeley \ --with-bdb-libdir=${BDB_LIB_DIR} \ --with-bdb-incdir=${BDB_INCLUDE_DIR} \ --with-bdb=${BDB_LIB_NAME} .else CONFIGURE_ARGS+=--with-dblib=ndbm .endif .if defined(WITH_OPENLDAP) .if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} .endif .if defined(WITH_HTTPFORM) CONFIGURE_ARGS+=--enable-httpform .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 .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 .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 !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/saslauthd .for file in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} ${DOCSDIR}/saslauthd .endfor .endif @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} \ POST-INSTALL @${CAT} ${PKGMESSAGE} .include Property changes on: head/security/cyrus-sasl2-saslauthd/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.56 \ No newline at end of property +1.57 \ No newline at end of property