From 4b931b2c0d7673fb58432e3c0c675f483ee7e286 Mon Sep 17 00:00:00 2001 From: obache Date: Thu, 14 May 2009 23:00:46 +0000 Subject: 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) --- security/cyrus-sasl/Makefile.common | 4 ++-- security/cyrus-sasl/distinfo | 14 +++++++------- security/cyrus-sasl/patches/patch-ai | 16 ++++++++-------- security/cyrus-sasl/patches/patch-al | 6 +++--- security/cyrus-sasl/patches/patch-aq | 15 ++++++++------- 5 files changed, 28 insertions(+), 27 deletions(-) (limited to 'security/cyrus-sasl') diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common index b92dfd326ec..38e5334e133 100644 --- a/security/cyrus-sasl/Makefile.common +++ b/security/cyrus-sasl/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2008/01/23 08:53:06 obache Exp $ +# $NetBSD: Makefile.common,v 1.14 2009/05/14 23:00:46 obache Exp $ # # This file is currently included by: # @@ -17,7 +17,7 @@ # This Makefile fragment should be included _below_ any SASL_PLUGIN # definition and _above_ any CONFIGURE_ARGS definitions. -DISTNAME= cyrus-sasl-2.1.22 +DISTNAME= cyrus-sasl-2.1.23 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-sasl/distinfo b/security/cyrus-sasl/distinfo index deae129ace8..7947bf48192 100644 --- a/security/cyrus-sasl/distinfo +++ b/security/cyrus-sasl/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.17 2006/11/02 13:02:39 obache Exp $ +$NetBSD: distinfo,v 1.18 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) = a20fca0058a04d00debb78d8cc051ec8d8f57af2 SHA1 (patch-ab) = f5cf383ec9e417101bcf133b819f7c28aa1b4588 SHA1 (patch-ac) = 1b653bee1a1b98e8e197911cc193c2c9b6d9f736 @@ -10,8 +10,8 @@ SHA1 (patch-ad) = 462eb7c9ff1c7138897d3778b3a50f2c4dbca51b SHA1 (patch-ae) = ac9403e8cdbebb8be04947c9ff8a7505002b3a36 SHA1 (patch-ag) = 6a2713504078dad681dcc6f7ba296972d03d5b15 SHA1 (patch-ah) = 595e58bd756e75bda5f25a19119f2fc7c27bc7d9 -SHA1 (patch-ai) = 04ff2f7f2d8a69db3d8e6451b50021f0c5516a97 +SHA1 (patch-ai) = b3154f4dbebe2ee803cfd6535072ca9bb28c9c18 SHA1 (patch-ak) = e76a0ac7559845ed374c63f0261df9817e383ac1 -SHA1 (patch-al) = d1bfddb749b2f234d3750e3a83bf800bdba4cec4 +SHA1 (patch-al) = 27eae3d4cc4f5413176344bf496e70c6da24a840 SHA1 (patch-ap) = eb87cd283f99da69916a7eb251000f2d9254f17d -SHA1 (patch-aq) = e7ed617db1935ed8f8c23d934da70582468c7dea +SHA1 (patch-aq) = 0e9acd362df09c3bc673b4729cc438e19cfd9f40 diff --git a/security/cyrus-sasl/patches/patch-ai b/security/cyrus-sasl/patches/patch-ai index 2dea2ffbd3b..1c04d45b735 100644 --- a/security/cyrus-sasl/patches/patch-ai +++ b/security/cyrus-sasl/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.7 2006/11/02 13:02:39 obache Exp $ +$NetBSD: patch-ai,v 1.8 2009/05/14 23:00:46 obache Exp $ ---- configure.orig 2006-05-18 15:30:13.000000000 -0400 +--- configure.orig 2009-05-07 14:24:25.000000000 +0000 +++ configure @@ -1334,8 +1334,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.7 2006/11/02 13:02:39 obache Exp $ ac_aux_dir= for ac_dir in config $srcdir/config; do if test -f $ac_dir/install-sh; then -@@ -5125,7 +5121,7 @@ if test $ac_cv_header_db_h = yes; then +@@ -5147,7 +5143,7 @@ if test $ac_cv_header_db_h = yes; then fi saved_LIBS=$LIBS @@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.7 2006/11/02 13:02:39 obache Exp $ do LIBS="$saved_LIBS -l$dbname" cat >conftest.$ac_ext <<_ACEOF -@@ -5156,7 +5152,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -5178,7 +5174,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -38,7 +38,7 @@ $NetBSD: patch-ai,v 1.7 2006/11/02 13:02:39 obache Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -5882,7 +5878,7 @@ if test $ac_cv_header_db_h = yes; then +@@ -5904,7 +5900,7 @@ if test $ac_cv_header_db_h = yes; then fi saved_LIBS=$LIBS @@ -47,7 +47,7 @@ $NetBSD: patch-ai,v 1.7 2006/11/02 13:02:39 obache Exp $ do LIBS="$saved_LIBS -l$dbname" cat >conftest.$ac_ext <<_ACEOF -@@ -5913,7 +5909,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -5935,7 +5931,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -56,7 +56,7 @@ $NetBSD: patch-ai,v 1.7 2006/11/02 13:02:39 obache Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -11304,8 +11300,15 @@ if test $ac_cv_lib_resolv_res_search = y +@@ -11326,8 +11322,15 @@ if test $ac_cv_lib_resolv_res_search = y fi SASL_MECHS="$SASL_MECHS libgssapiv2.la" @@ -74,7 +74,7 @@ $NetBSD: patch-ai,v 1.7 2006/11/02 13:02:39 obache Exp $ cmu_save_LIBS="$LIBS" LIBS="$LIBS $GSSAPIBASE_LIBS" -@@ -11403,11 +11406,6 @@ fi +@@ -11425,11 +11428,6 @@ fi if test "$gssapi" != "no"; then diff --git a/security/cyrus-sasl/patches/patch-al b/security/cyrus-sasl/patches/patch-al index 41d50a4256e..1c289d1d1d8 100644 --- a/security/cyrus-sasl/patches/patch-al +++ b/security/cyrus-sasl/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.5 2006/10/04 12:07:53 obache Exp $ +$NetBSD: patch-al,v 1.6 2009/05/14 23:00:46 obache Exp $ ---- Makefile.in.orig 2006-05-19 10:30:34.000000000 -0400 +--- Makefile.in.orig 2009-05-07 14:24:44.000000000 +0000 +++ Makefile.in -@@ -242,7 +242,7 @@ AUTOMAKE_OPTIONS = 1.7 +@@ -243,7 +243,7 @@ AUTOMAKE_OPTIONS = 1.7 @MACOSX_FALSE@INSTALLOSX = @MACOSX_TRUE@INSTALLOSX = install-exec-local-osx diff --git a/security/cyrus-sasl/patches/patch-aq b/security/cyrus-sasl/patches/patch-aq index b5f01cc4018..463f90824f6 100644 --- a/security/cyrus-sasl/patches/patch-aq +++ b/security/cyrus-sasl/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.5 2006/10/04 12:07:53 obache Exp $ +$NetBSD: patch-aq,v 1.6 2009/05/14 23:00:46 obache Exp $ ---- sasldb/Makefile.in.orig 2006-05-18 15:30:16.000000000 -0400 +--- sasldb/Makefile.in.orig 2009-05-07 14:24:59.000000000 +0000 +++ sasldb/Makefile.in -@@ -240,26 +240,18 @@ extra_common_sources = db_none.c db_ndbm +@@ -241,16 +241,12 @@ extra_common_sources = db_none.c db_ndbm EXTRA_DIST = NTMakefile noinst_LTLIBRARIES = libsasldb.la @@ -17,8 +17,9 @@ $NetBSD: patch-aq,v 1.5 2006/10/04 12:07:53 obache Exp $ -libsasldb_a_SOURCES = -EXTRA_libsasldb_a_SOURCES = subdir = sasldb + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h +@@ -258,10 +254,6 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) @@ -29,21 +30,21 @@ $NetBSD: patch-aq,v 1.5 2006/10/04 12:07:53 obache Exp $ LTLIBRARIES = $(noinst_LTLIBRARIES) libsasldb_la_LDFLAGS = -@@ -279,10 +271,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( +@@ -281,10 +273,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libsasldb_a_SOURCES) $(EXTRA_libsasldb_a_SOURCES) \ - $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES) +DIST_SOURCES = $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES) - DIST_COMMON = Makefile.am Makefile.in + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -SOURCES = $(libsasldb_a_SOURCES) $(EXTRA_libsasldb_a_SOURCES) $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES) +SOURCES = $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES) all: all-am @@ -543,8 +534,6 @@ uninstall-am: uninstall-info-am - tags uninstall uninstall-am uninstall-info-am + uninstall-am uninstall-info-am -libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) -- cgit v1.2.3