rpms/cyrus-sasl/F-9 cyrus-sasl-2.1.22-kerberos4.patch, NONE, 1.1 cyrus-sasl-2.1.22-rimap.patch, NONE, 1.1 cyrus-sasl.spec, 1.68, 1.69 saslauthd.init, 1.3, 1.4

[Tomáš Mráz (tmraz)]

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-sasl/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19176

Modified Files:
	cyrus-sasl.spec saslauthd.init 
Added Files:
	cyrus-sasl-2.1.22-kerberos4.patch 
	cyrus-sasl-2.1.22-rimap.patch 
Log Message:
* Tue Jul  1 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-15
- drop reload from initscript help (#448154)
- fix hang in rimap auth method (#438533)
- build the krb4 plugin (#154675)


cyrus-sasl-2.1.22-kerberos4.patch:

--- NEW FILE cyrus-sasl-2.1.22-kerberos4.patch ---
--- 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

cyrus-sasl-2.1.22-rimap.patch:

--- NEW FILE cyrus-sasl-2.1.22-rimap.patch ---
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 */


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-9/cyrus-sasl.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- cyrus-sasl.spec	23 May 2008 18:41:35 -0000	1.68
+++ cyrus-sasl.spec	2 Jul 2008 07:11:07 -0000	1.69
@@ -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 @@
 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 @@
 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 @@
 %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 @@
         --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 @@
 %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 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Tue Jul  1 2008 Tomas Mraz <tmraz at 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 at ausil.us> - 2.1.22-14
 - make it so that bootstrap actually works
 


Index: saslauthd.init
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-9/saslauthd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- saslauthd.init	9 Sep 2004 04:06:54 -0000	1.3
+++ saslauthd.init	2 Jul 2008 07:11:07 -0000	1.4
@@ -72,7 +72,7 @@
   	[ -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