From efba92060d257ce3989bf24320010e2f5e088ae6 Mon Sep 17 00:00:00 2001
From: Tomáš Mráz <tmraz@fedoraproject.org>
Date: Jul 01 2008 21:35:14 +0000
Subject: - drop reload from initscript help (#448154)

- fix hang in rimap auth method (#438533)
- build the krb4 plugin (#154675)

---

diff --git a/cyrus-sasl-2.1.22-kerberos4.patch b/cyrus-sasl-2.1.22-kerberos4.patch
new file mode 100644
index 0000000..dcfe414
--- /dev/null
+++ b/cyrus-sasl-2.1.22-kerberos4.patch
@@ -0,0 +1,14 @@
+--- cyrus-sasl-2.1.22/plugins/kerberos4.c~	2005-01-10 02:08:53.000000000 -0500
++++ cyrus-sasl-2.1.22/plugins/kerberos4.c	2007-05-14 13:02:16.000000000 -0400
+@@ -49,11 +49,7 @@
+ #include <krb.h>
+ 
+ #ifdef WITH_DES
+-# ifdef WITH_SSL_DES
+-#  include <openssl/des.h>
+-# else
+ #  include <des.h>
+-# endif /* WITH_SSL_DES */
+ #endif /* WITH_DES */
+ 
+ #ifdef WIN32
diff --git a/cyrus-sasl-2.1.22-rimap.patch b/cyrus-sasl-2.1.22-rimap.patch
new file mode 100644
index 0000000..a619963
--- /dev/null
+++ b/cyrus-sasl-2.1.22-rimap.patch
@@ -0,0 +1,38 @@
+diff -up cyrus-sasl-2.1.22/saslauthd/auth_rimap.c.rimap cyrus-sasl-2.1.22/saslauthd/auth_rimap.c
+--- cyrus-sasl-2.1.22/saslauthd/auth_rimap.c.rimap	2006-04-06 22:19:54.000000000 +0200
++++ cyrus-sasl-2.1.22/saslauthd/auth_rimap.c	2008-07-01 22:48:09.000000000 +0200
+@@ -163,6 +163,7 @@ qstring (
+     p1 = s;
+     while ((p1 = strchr(p1, '"')) != NULL) {
+ 	num_quotes++;
++	++p1;
+     }
+     
+     if (!num_quotes) {
+@@ -198,7 +199,7 @@ qstring (
+ 	}
+ 	*p2++ = *p1++;
+     }
+-    strcat(p2, "\"");
++    strcpy(p2, "\"");
+     return c;
+ }
+ 
+@@ -438,7 +439,7 @@ auth_rimap (
+ 	syslog(LOG_WARNING, "auth_rimap: writev: %m");
+ 	memset(qlogin, 0, strlen(qlogin));
+ 	free(qlogin);
+-	memset(qpass, 0, strlen(qlogin));
++	memset(qpass, 0, strlen(qpass));
+ 	free(qpass);
+ 	(void)close(s);
+ 	return strdup(RESP_IERROR);
+@@ -447,7 +448,7 @@ auth_rimap (
+     /* don't need these any longer */
+     memset(qlogin, 0, strlen(qlogin));
+     free(qlogin);
+-    memset(qpass, 0, strlen(qlogin));
++    memset(qpass, 0, strlen(qpass));
+     free(qpass);
+ 
+     /* read and parse the LOGIN response */
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 781e8e4..9c4ed84 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -5,7 +5,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -29,6 +29,8 @@ Patch26: cyrus-sasl-2.1.22-digest-commas.patch
 Patch27: cyrus-sasl-2.1.22-automake-1.10.patch
 Patch28: cyrus-sasl-2.1.21-keytab.patch
 Patch29: cyrus-sasl-db-4.6.18-glibc.patch
+Patch30: cyrus-sasl-2.1.22-rimap.patch
+Patch31: cyrus-sasl-2.1.22-kerberos4.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
 BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
@@ -120,6 +122,15 @@ The %{name}-ldap package contains the Cyrus SASL plugin which supports using
 a directory server, accessed using LDAP, for storing shared secrets.
 %endif
 
+%package krb4
+Requires: %{name}-lib = %{version}-%{release}
+Group: System Environment/Libraries
+Summary: Kerberos 4 authentication support for Cyrus SASL
+
+%description krb4
+The %{name}-krb4 package contains the Cyrus SASL plugins which
+support Kerberos 4 authentication.
+
 %prep
 %setup -q -a 6
 chmod -x doc/*.html
@@ -132,6 +143,8 @@ chmod -x include/*.h
 %patch26 -p2 -b .digest-commas
 %patch27 -p1 -b .automake-1.10
 %patch28 -p1 -b .keytab
+%patch30 -p1 -b .rimap
+%patch31 -p1 -b .krb4
 
 pushd db-%{db_version}
 %patch29 -p1 -b .glibc27
@@ -221,7 +234,7 @@ LDFLAGS=`echo $LDFLAGS $SQL_LDFLAGS | cleanup_flags`; export LDFLAGS
         --disable-java \
         --with-plugindir=%{_plugindir2} \
         --with-configdir=%{_plugindir2}:%{_sysconfdir}/sasl2 \
-        --disable-krb4 \
+        --enable-krb4=/usr \
         --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
         --with-gss_impl=mit \
         --with-rc4 \
@@ -370,6 +383,10 @@ fi
 %defattr(-,root,root)
 %{_plugindir2}/*gssapi*.so*
 
+%files krb4
+%defattr(-,root,root)
+%{_plugindir2}/*kerberos4*.so*
+
 %files devel
 %defattr(-,root,root)
 %doc doc/*.txt
@@ -381,6 +398,11 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Tue Jul  1 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-15
+- drop reload from initscript help (#448154)
+- fix hang in rimap auth method (#438533)
+- build the krb4 plugin (#154675)
+
 * Fri May 23 2008 Dennis Gilmore <dennis@ausil.us> - 2.1.22-14
 - make it so that bootstrap actually works
 
diff --git a/saslauthd.init b/saslauthd.init
index e016dbd..9e16684 100755
--- a/saslauthd.init
+++ b/saslauthd.init
@@ -72,7 +72,7 @@ case "$1" in
   	[ -f /var/lock/subsys/$prog ] && restart || :
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}"
+	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
 	exit 1
 esac