Update cyrus-sasl to 2.1.23.

New in 2.1.23
-------------
* Fixed CERT VU#238019 (make sure sasl_encode64() always NUL
  terminates output or returns SASL_BUFOVER)

4 files changed, 20 insertions, 22 deletions

diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index 55f8544a0d3..2b220b61684 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2008/08/12 10:16:54 obache Exp $
+# $NetBSD: Makefile,v 1.38 2009/05/14 23:00:46 obache Exp $
 
-DISTNAME=	cyrus-sasl-2.1.22
+DISTNAME=	cyrus-sasl-2.1.23
 PKGNAME=	${DISTNAME:S/sasl/saslauthd/}
-PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
diff --git a/security/cyrus-saslauthd/distinfo b/security/cyrus-saslauthd/distinfo
index 9894800908d..c75792f6f6f 100644
--- a/security/cyrus-saslauthd/distinfo
+++ b/security/cyrus-saslauthd/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.9 2006/10/04 12:07:53 obache Exp $
+$NetBSD: distinfo,v 1.10 2009/05/14 23:00:46 obache Exp $
 
-SHA1 (cyrus-sasl-2.1.22.tar.gz) = d23454ab12054714ab97d229c86cb934ce63fbb1
-RMD160 (cyrus-sasl-2.1.22.tar.gz) = 086e20d01588cb86decad001244b72a37223354c
-Size (cyrus-sasl-2.1.22.tar.gz) = 1609278 bytes
+SHA1 (cyrus-sasl-2.1.23.tar.gz) = 5df33a6788d6cd8329b109eff777c6cfae1a21bd
+RMD160 (cyrus-sasl-2.1.23.tar.gz) = b2cd9734fa8b4bad82663517f019f9b92d9d3519
+Size (cyrus-sasl-2.1.23.tar.gz) = 1613642 bytes
 SHA1 (patch-aa) = f90f8f3a08108b32dfc21a2f959f8907619a245f
-SHA1 (patch-ab) = 7457d4721a83dd61c9f3979267dce9ed1a6a8a44
+SHA1 (patch-ab) = 78f0b080c7b10b671e34869ebe33c8ee137b21c5
 SHA1 (patch-ac) = 79267ad3e175632728e43fb2ba159ab411e7ff3c
-SHA1 (patch-ad) = c14defd79e6e0cec153be004fff3016ad6f0e731
 SHA1 (patch-ae) = 2651dc035edebfb9ddc5bfc5bbb01b8e6b3dc588
-SHA1 (patch-af) = d55c3b3c6583f6dafb9fd758fc7b5aed1fdda7bb
+SHA1 (patch-af) = 972342d5b6efd645af9257933abd7302b25c0d1c
 SHA1 (patch-ag) = 6560d09edcbe8762d235bcf09ce24a49a6de8e26
 SHA1 (patch-ah) = d4dc5858ef1b36d10fae729469262450ff2e3fef
diff --git a/security/cyrus-saslauthd/patches/patch-ab b/security/cyrus-saslauthd/patches/patch-ab
index 2a2f06a4101..e0be39d7ae2 100644
--- a/security/cyrus-saslauthd/patches/patch-ab
+++ b/security/cyrus-saslauthd/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2006/10/04 12:07:53 obache Exp $
+$NetBSD: patch-ab,v 1.7 2009/05/14 23:00:46 obache Exp $
 
---- Makefile.in.orig	2006-05-19 04:30:21.000000000 +0900
+--- Makefile.in.orig	2009-05-07 14:25:39.000000000 +0000
 +++ Makefile.in
-@@ -614,14 +614,11 @@ uninstall-am: uninstall-info-am uninstal
+@@ -615,14 +615,11 @@ uninstall-am: uninstall-info-am uninstal
  	uninstall-sbinPROGRAMS
  
  
diff --git a/security/cyrus-saslauthd/patches/patch-af b/security/cyrus-saslauthd/patches/patch-af
index 0898bc89ae2..26bafcb687f 100644
--- a/security/cyrus-saslauthd/patches/patch-af
+++ b/security/cyrus-saslauthd/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2006/10/04 12:07:53 obache Exp $
+$NetBSD: patch-af,v 1.3 2009/05/14 23:00:46 obache Exp $
 
---- configure.orig	2006-05-19 04:30:20.000000000 +0900
+--- configure.orig	2009-05-07 14:25:24.000000000 +0000
 +++ configure
-@@ -9458,75 +9458,23 @@ if test "$with_pam" != no; then
+@@ -9480,75 +9480,23 @@ if test "$with_pam" != no; then
      CPPFLAGS="$CPPFLAGS -I${with_pam}/include"
      LDFLAGS="$LDFLAGS -L${with_pam}/lib"
    fi
@@ -89,7 +89,7 @@ $NetBSD: patch-af,v 1.2 2006/10/04 12:07:53 obache Exp $
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -9535,7 +9483,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -9557,7 +9505,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -98,7 +98,7 @@ $NetBSD: patch-af,v 1.2 2006/10/04 12:07:53 obache Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -9561,8 +9509,8 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -9583,8 +9531,8 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -109,7 +109,7 @@ $NetBSD: patch-af,v 1.2 2006/10/04 12:07:53 obache Exp $
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -9570,7 +9518,7 @@ _ACEOF
+@@ -9592,7 +9540,7 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -118,7 +118,7 @@ $NetBSD: patch-af,v 1.2 2006/10/04 12:07:53 obache Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -9603,10 +9551,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -9625,10 +9573,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc in
    yes:no )
@@ -133,7 +133,7 @@ $NetBSD: patch-af,v 1.2 2006/10/04 12:07:53 obache Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------ ##
-@@ -9617,12 +9565,12 @@ _ASBOX
+@@ -9639,12 +9587,12 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
    no:yes )
@@ -152,7 +152,7 @@ $NetBSD: patch-af,v 1.2 2006/10/04 12:07:53 obache Exp $
      (
        cat <<\_ASBOX
  ## ------------------------------------ ##
-@@ -9633,29 +9581,157 @@ _ASBOX
+@@ -9655,29 +9603,157 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac