6 files changed, 46 insertions, 74 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 33fa10f9063b..f443a56dbad5 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	2.1.21
-PORTREVISION=	2
+PORTVERSION=	2.1.22
+PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
@@ -30,20 +30,21 @@ MAN3=		sasl.3 sasl_authorize_t.3 sasl_auxprop.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_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=		sasldblistusers2.8 saslpasswd2.8
+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 \
@@ -103,10 +104,6 @@ CONFIGURE_ARGS+=--enable-sql
 SQL=	"@comment "
 .endif
 
-.if defined(WITH_AUTHDAEMON)
-CONFIGURE_ARGS+=--with-authdaemond
-.endif
-
 .if defined(WITH_DEV_URANDOM)
 CONFIGURE_ARGS+=--with-devrandom=/dev/urandom
 .endif
@@ -115,6 +112,14 @@ CONFIGURE_ARGS+=--with-devrandom=/dev/urandom
 CONFIGURE_ARGS+=--enable-alwaystrue
 .endif
 
+.if defined(WITH_KEEP_DB_OPEN)
+CONFIGURE_ARGS+=--enable-keep-db-open
+.endif
+
+.if defined(WITHOUT_AUTHDAEMOND)
+CONFIGURE_ARGS+=--with-authdaemond=no
+.endif
+
 .if defined(WITHOUT_LOGIN)
 LOGIN=	"@comment "
 .else
@@ -191,7 +196,7 @@ SASLAUTHD_RUNPATH?=	/var/run/saslauthd
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
-DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README
+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 \
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index 2efb3c631af8..f35dd722a0e4 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-sasl-2.1.21.tar.gz) = dde02db234dea892bee298390890502e
-SHA256 (cyrus-sasl-2.1.21.tar.gz) = fa37bcc8b855597aa1e6b72915b38985991b4abd4e7bc116c3e88fd4e86fb0fb
-SIZE (cyrus-sasl-2.1.21.tar.gz) = 1584931
+MD5 (cyrus-sasl-2.1.22.tar.gz) = 45dde9d19193ae9dd388eb68b2027bc9
+SHA256 (cyrus-sasl-2.1.22.tar.gz) = c69e3853f35b14ee2c3f6e876e42d880927258ff4678aa052e5f0853db209962
+SIZE (cyrus-sasl-2.1.22.tar.gz) = 1609278
diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure
index 9856120464c4..763edce6abc5 100644
--- a/security/cyrus-sasl2/files/patch-configure
+++ b/security/cyrus-sasl2/files/patch-configure
@@ -1,8 +1,8 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Sun May 15 14:58:28 2005
-+++ configure	Wed Nov  2 19:11:22 2005
-@@ -1583,6 +1583,7 @@
+--- configure.orig	Fri May 19 04:30:13 2006
++++ configure	Sat May 20 04:04:39 2006
+@@ -1586,6 +1586,7 @@
  fi
  echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
@@ -10,7 +10,7 @@ diff -u configure.orig configure
  test "$program_prefix" != NONE &&
    program_transform_name="s,^,$program_prefix,;$program_transform_name"
  # Use a double $ so make ignores it.
-@@ -5124,7 +5125,7 @@
+@@ -5125,7 +5126,7 @@
  	fi
  
  	saved_LIBS=$LIBS
@@ -19,7 +19,7 @@ diff -u configure.orig configure
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    cat >conftest.$ac_ext <<_ACEOF
-@@ -5134,6 +5135,7 @@
+@@ -5135,6 +5136,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -27,7 +27,7 @@ diff -u configure.orig configure
  #include <db.h>
  int
  main ()
-@@ -5881,7 +5883,7 @@
+@@ -5882,7 +5884,7 @@
  	fi
  
  	saved_LIBS=$LIBS
@@ -36,7 +36,7 @@ diff -u configure.orig configure
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    cat >conftest.$ac_ext <<_ACEOF
-@@ -5891,6 +5893,7 @@
+@@ -5892,6 +5894,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -44,34 +44,7 @@ diff -u configure.orig configure
  #include <db.h>
  int
  main ()
-@@ -6512,7 +6515,7 @@
- echo "$as_me: WARNING: Disabling SASL authentication database support" >&2;}
-             SASL_DB_BACKEND="db_none.lo"
-     SASL_DB_BACKEND_STATIC="db_none.o"
--    SASL_DB_BACKEND_STATIC_SRC="../sasldb/db_none.c"
-+    SASL_DB_BACKEND_STATIC_SRCS="../sasldb/db_none.c"
-     SASL_DB_UTILS=""
-     SASL_DB_MANS=""
-     SASL_DB_LIB=""
-@@ -6521,7 +6524,7 @@
- 
- if test "$enable_static" = yes; then
-     if test "$dblib" != "none"; then
--      SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRC"
-+      SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRCS"
-       SASL_STATIC_OBJS="$SASL_STATIC_OBJS sasldb.o $SASL_DB_BACKEND_STATIC"
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -6530,7 +6533,7 @@
- 
-     else
-       SASL_STATIC_OBJS="$SASL_STATIC_OBJS $SASL_DB_BACKEND_STATIC"
--      SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRC"
-+      SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRCS"
-     fi
- fi
- 
-@@ -7167,6 +7170,8 @@
+@@ -7193,6 +7196,8 @@
    SASLAUTHD_TRUE='#'
    SASLAUTHD_FALSE=
  fi
@@ -80,7 +53,7 @@ diff -u configure.orig configure
  
  echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
  echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6
-@@ -10564,7 +10569,7 @@
+@@ -10650,7 +10655,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -89,8 +62,8 @@ diff -u configure.orig configure
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -10914,7 +10919,7 @@
-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
+@@ -11060,7 +11065,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"
@@ -98,7 +71,7 @@ diff -u configure.orig configure
      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
-@@ -11752,7 +11757,7 @@
+@@ -11898,7 +11903,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -107,12 +80,3 @@ diff -u configure.orig configure
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -12253,6 +12258,8 @@
- char *__openldap_compat = "2.1.27 or better okay";
- #elif LDAP_VENDOR_VERSION_MAJOR == 2  && LDAP_VENDOR_VERSION_MINOR == 2 && LDAP_VENDOR_VERSION_PATCH > 5
- char *__openldap_compat = "2.2.6 or better okay";
-+#elif LDAP_VENDOR_VERSION_MAJOR == 2  && LDAP_VENDOR_VERSION_MINOR > 2
-+char *__openldap_compat = "2.3.0 or better okay";
- #endif
- 
- _ACEOF
diff --git a/security/cyrus-sasl2/files/patch-plugins::ntlm.c b/security/cyrus-sasl2/files/patch-plugins::ntlm.c
deleted file mode 100644
index 6ea22f9ec5b8..000000000000
--- a/security/cyrus-sasl2/files/patch-plugins::ntlm.c
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: plugins/ntlm.c
-diff -u -p plugins/ntlm.c.orig plugins/ntlm.c
---- plugins/ntlm.c.orig	Sat Dec 25 01:06:14 2004
-+++ plugins/ntlm.c	Wed Sep 28 05:07:18 2005
-@@ -74,6 +74,7 @@
- #endif /* WIN32 */
- 
- #include <openssl/md4.h>
-+#include <openssl/md5.h>
- #include <openssl/hmac.h>
- #include <openssl/des.h>
- #include <openssl/opensslv.h>
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in b/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in
new file mode 100644
index 000000000000..9ae3cebc9b68
--- /dev/null
+++ b/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in
@@ -0,0 +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 @@
+ 
+ install-data-local: saslauthd.8
+ 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
+-	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
++	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/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:
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index a06ffc3df8dc..5213d1efc70a 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -42,12 +42,14 @@ lib/sasl2/libanonymous.so.2
 lib/sasl2/libsasldb.a
 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