From 41e32aabce8dd515348ca6d3d983fc2864618f4c Mon Sep 17 00:00:00 2001
From: "Jan F. Chadima" <jfch2222@fedoraproject.org>
Date: Fri, 7 Aug 2009 14:18:59 +0000
Subject: [PATCH] update to 2.1.23

---
 .cvsignore                       |  2 +-
 cyrus-sasl-2.1.22-encode64.patch | 30 ------------------------------
 cyrus-sasl.spec                  | 12 ++++++------
 sources                          |  2 +-
 4 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 cyrus-sasl-2.1.22-encode64.patch

diff --git a/.cvsignore b/.cvsignore
index d4de7a2..2d5e4c6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz
+cyrus-sasl-2.1.23-nodlcompatorsrp.tar.gz
diff --git a/cyrus-sasl-2.1.22-encode64.patch b/cyrus-sasl-2.1.22-encode64.patch
deleted file mode 100644
index 7dd9e21..0000000
--- a/cyrus-sasl-2.1.22-encode64.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- cyrus-sasl-2.1.22/lib/saslutil.c	2009/04/17 06:04:50	1.48
-+++ cyrus-sasl-2.1.22/lib/saslutil.c	2009/04/27 13:26:27	1.49
-@@ -1,7 +1,7 @@
- /* saslutil.c
-  * Rob Siemborski
-  * Tim Martin
-- * $Id: saslutil.c,v 1.44 2006/03/13 18:26:36 mel Exp $
-+ * $Id: saslutil.c,v 1.49 2009/04/27 13:26:27 murch Exp $
-  */
- /* 
-  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
-@@ -127,7 +127,7 @@
-     olen = (inlen + 2) / 3 * 4;
-     if (outlen)
-       *outlen = olen;
--    if (outmax < olen)
-+    if (outmax <= olen)
-       return SASL_BUFOVER;
- 
-     /* Do the work... */
-@@ -151,8 +151,7 @@
-         *out++ = '=';
-     }
- 
--    if (olen < outmax)
--      *out = '\0';
-+    *out = '\0';
-     
-     return SASL_OK;
- }
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 25bf245..e127f6f 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -3,8 +3,8 @@
 
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
-Version: 2.1.22
-Release: 25%{?dist}
+Version: 2.1.23
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -31,7 +31,6 @@ Patch32: cyrus-sasl-2.1.22-warnings.patch
 Patch33: cyrus-sasl-2.1.22-current-db.patch
 Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch
 Patch35: cyrus-sasl-2.1.22-bad-elif.patch
-Patch36: cyrus-sasl-2.1.22-encode64.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -129,7 +128,6 @@ a directory server, accessed using LDAP, for storing shared secrets.
 %setup -q
 chmod -x doc/*.html
 chmod -x include/*.h
-#%patch10 -p1 -b .db_bundle
 %patch11 -p1 -b .no_rpath
 %patch15 -p1 -b .path
 %patch24 -p1 -b .sizes
@@ -143,7 +141,6 @@ chmod -x include/*.h
 %patch33 -p1 -b .current-db
 %patch34 -p1 -b .ldap-timeout
 %patch35 -p1 -b .elif
-%patch36 -p1 -b .encode64
 
 # FIXME - we remove these files directly so that we can avoid using the -f
 # flag, which has a nasty habit of overwriting files like COPYING.
@@ -374,10 +371,13 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Aug  7 2009 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-1
+- update to 2.1.23
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.22-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon May 11 2009 Jan Chadima <jchadima@redhat.com> - 2.1.22-24
+* Mon May 11 2009 Jan F. Chadima <jchadima@redhat.com> - 2.1.22-24
 - repair sasl_encode64 nul termination (#487251)
 
 * Thu Apr 16 2009 Robert Scheck <robert@fedoraproject.org> - 2.1.22-23
diff --git a/sources b/sources
index 537520b..175b722 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4dde83929ded5435e4c72e7cc06b0ebb  cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz
+8a5c63840b894cf7583b8521cf2f5152  cyrus-sasl-2.1.23-nodlcompatorsrp.tar.gz