rpms/cyrus-imapd/F-10 cyrus-imapd-2.3.1-authid_normalize.patch, 1.2, 1.3 cyrus-imapd.spec, 1.45, 1.46

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28765

Modified Files:
	cyrus-imapd-2.3.1-authid_normalize.patch cyrus-imapd.spec 
Log Message:
fix: #480138 - assertion failed: libcyr_cfg.c: cyrus_options[opt].opt == opt


cyrus-imapd-2.3.1-authid_normalize.patch:

Index: cyrus-imapd-2.3.1-authid_normalize.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.1-authid_normalize.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cyrus-imapd-2.3.1-authid_normalize.patch	13 Jan 2009 19:32:30 -0000	1.2
+++ cyrus-imapd-2.3.1-authid_normalize.patch	21 Jan 2009 14:47:22 -0000	1.3
@@ -1,14 +1,14 @@
 --- cyrus-imapd-2.3.13/lib/libcyr_cfg.h.authid_normalize	2008-07-30 18:03:39.000000000 +0200
 +++ cyrus-imapd-2.3.13/lib/libcyr_cfg.h	2009-01-13 11:41:59.000000000 +0100
-@@ -100,6 +100,8 @@
-     CYRUSOPT_BERKELEY_TXNS_MAX,
-     /* RFC 2086 right which allows DELETE ("c") */
-     CYRUSOPT_DELETERIGHT,
+@@ -112,6 +112,8 @@ enum cyrus_opt {
+     CYRUSOPT_SQL_PASSWD,
+     /* Secure SQL connection (OFF) */
+     CYRUSOPT_SQL_USESSL,
 +    /* Lowercase uid and strip leading and trailing blanks (OFF) */
 +    CYRUSOPT_NORMALIZEUID,
-     /* SQL database */
-     CYRUSOPT_SQL_DATABASE,
-     /* SQL engine ("mysql") */
+ 
+     CYRUSOPT_LAST
+     
 --- cyrus-imapd-2.3.13/lib/auth_unix.c.authid_normalize	2009-01-13 11:38:08.000000000 +0100
 +++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:38:08.000000000 +0100
 @@ -155,10 +155,12 @@


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cyrus-imapd.spec	13 Jan 2009 19:32:30 -0000	1.45
+++ cyrus-imapd.spec	21 Jan 2009 14:47:22 -0000	1.46
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.13
 Name: cyrus-imapd
 Version: 2.3.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -786,6 +786,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.13-2
+- fix: #480138 - assertion failed: libcyr_cfg.c: cyrus_options[opt].opt == opt
+
 * Tue Jan 13 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.13-1
 - updated to 2.3.13