update to 2.1.23

This commit is contained in:
Jan F. Chadima 2009-08-07 14:18:59 +00:00
parent 7c673d9b5e
commit 41e32aabce
4 changed files with 8 additions and 38 deletions

View File

@ -1 +1 @@
cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz cyrus-sasl-2.1.23-nodlcompatorsrp.tar.gz

View File

@ -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;
}

View File

@ -3,8 +3,8 @@
Summary: The Cyrus SASL library Summary: The Cyrus SASL library
Name: cyrus-sasl Name: cyrus-sasl
Version: 2.1.22 Version: 2.1.23
Release: 25%{?dist} Release: 1%{?dist}
License: BSD License: BSD
Group: System Environment/Libraries Group: System Environment/Libraries
# Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/; # 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 Patch33: cyrus-sasl-2.1.22-current-db.patch
Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch
Patch35: cyrus-sasl-2.1.22-bad-elif.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) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, automake, libtool, gdbm-devel, groff BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@ -129,7 +128,6 @@ a directory server, accessed using LDAP, for storing shared secrets.
%setup -q %setup -q
chmod -x doc/*.html chmod -x doc/*.html
chmod -x include/*.h chmod -x include/*.h
#%patch10 -p1 -b .db_bundle
%patch11 -p1 -b .no_rpath %patch11 -p1 -b .no_rpath
%patch15 -p1 -b .path %patch15 -p1 -b .path
%patch24 -p1 -b .sizes %patch24 -p1 -b .sizes
@ -143,7 +141,6 @@ chmod -x include/*.h
%patch33 -p1 -b .current-db %patch33 -p1 -b .current-db
%patch34 -p1 -b .ldap-timeout %patch34 -p1 -b .ldap-timeout
%patch35 -p1 -b .elif %patch35 -p1 -b .elif
%patch36 -p1 -b .encode64
# FIXME - we remove these files directly so that we can avoid using the -f # 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. # flag, which has a nasty habit of overwriting files like COPYING.
@ -374,10 +371,13 @@ fi
%{_sbindir}/sasl2-shared-mechlist %{_sbindir}/sasl2-shared-mechlist
%changelog %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 * 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 - 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) - repair sasl_encode64 nul termination (#487251)
* Thu Apr 16 2009 Robert Scheck <robert@fedoraproject.org> - 2.1.22-23 * Thu Apr 16 2009 Robert Scheck <robert@fedoraproject.org> - 2.1.22-23

View File

@ -1 +1 @@
4dde83929ded5435e4c72e7cc06b0ebb cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz 8a5c63840b894cf7583b8521cf2f5152 cyrus-sasl-2.1.23-nodlcompatorsrp.tar.gz