rpms/cyrus-sasl/devel cyrus-sasl-2.1.22-bad-elif.patch, NONE, 1.1 cyrus-sasl.spec, 1.75, 1.76 cyrus-sasl-1.5.28.tar.gz.sig, 1.1, NONE cyrus-sasl-2.1.17-saslauthd1.patch, 1.2, NONE cyrus-sasl-2.1.19.tar.gz.sig, 1.1, NONE

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10312

Modified Files:
	cyrus-sasl.spec 
Added Files:
	cyrus-sasl-2.1.22-bad-elif.patch 
Removed Files:
	cyrus-sasl-1.5.28.tar.gz.sig 
	cyrus-sasl-2.1.17-saslauthd1.patch 
	cyrus-sasl-2.1.19.tar.gz.sig 
Log Message:
* Fri Feb  6 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.22-21
- fix build with gcc-4.4


cyrus-sasl-2.1.22-bad-elif.patch:

--- NEW FILE cyrus-sasl-2.1.22-bad-elif.patch ---
diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c
--- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif	2009-01-23 09:40:31.000000000 +0100
+++ cyrus-sasl-2.1.22/plugins/digestmd5.c	2009-02-06 15:20:15.000000000 +0100
@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv
 	"DIGEST-MD5",			/* mech_name */
 #ifdef WITH_RC4
 	128,				/* max_ssf */
-#elif WITH_DES
+#elif defined(WITH_DES)
 	112,
 #else 
 	1,
@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie
 	"DIGEST-MD5",
 #ifdef WITH_RC4				/* mech_name */
 	128,				/* max ssf */
-#elif WITH_DES
+#elif defined(WITH_DES)
 	112,
 #else
 	1,


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- cyrus-sasl.spec	23 Jan 2009 16:05:35 -0000	1.75
+++ cyrus-sasl.spec	6 Feb 2009 16:13:44 -0000	1.76
@@ -4,7 +4,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -30,6 +30,7 @@
 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
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -149,6 +150,7 @@
 %patch32 -p1 -b .warnings
 %patch33 -p1 -b .current-db
 %patch34 -p1 -b .ldap-timeout
+%patch35 -p1 -b .elif
 
 # 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.
@@ -383,6 +385,9 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Feb  6 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.22-21
+- fix build with gcc-4.4
+
 * Fri Jan 23 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.22-20
 - set LDAP_OPT_TIMEOUT (#326452)
 - provide LSB compatible init script (#246900)


--- cyrus-sasl-1.5.28.tar.gz.sig DELETED ---


--- cyrus-sasl-2.1.17-saslauthd1.patch DELETED ---


--- cyrus-sasl-2.1.19.tar.gz.sig DELETED ---