[cyrus-imapd/f15] updated to 2.4.14

[Michal Hlavinka]

commit 0ef20aaba8d6d4794b0641fc13c2a93dc49a5d29
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Mar 15 15:46:10 2012 +0100

    updated to 2.4.14

 cyrus-imapd-2.3.1-authid_normalize.patch |   40 +++++++++++++++---------------
 cyrus-imapd.spec                         |    7 +++-
 sources                                  |    2 +-
 3 files changed, 26 insertions(+), 23 deletions(-)
---
diff --git a/cyrus-imapd-2.3.1-authid_normalize.patch b/cyrus-imapd-2.3.1-authid_normalize.patch
index c96e7dc..de62ae9 100644
--- a/cyrus-imapd-2.3.1-authid_normalize.patch
+++ b/cyrus-imapd-2.3.1-authid_normalize.patch
@@ -1,6 +1,6 @@
-diff -up cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize cyrus-imapd-2.3.15/lib/auth_unix.c
---- cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize	2009-09-18 11:53:47.183115911 +0200
-+++ cyrus-imapd-2.3.15/lib/auth_unix.c	2009-09-18 11:53:47.252115833 +0200
+diff -up cyrus-imapd-2.4.14/lib/auth_unix.c.authid_normalize cyrus-imapd-2.4.14/lib/auth_unix.c
+--- cyrus-imapd-2.4.14/lib/auth_unix.c.authid_normalize	2012-03-12 12:47:51.000000000 +0100
++++ cyrus-imapd-2.4.14/lib/auth_unix.c	2012-03-14 10:49:50.679822894 +0100
 @@ -156,10 +156,12 @@ const char *identifier;
  size_t len;
  {
@@ -37,25 +37,25 @@ diff -up cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize cyrus-imapd-2.3.15/
      return retbuf;
  }
  
-diff -up cyrus-imapd-2.3.15/lib/imapoptions.authid_normalize cyrus-imapd-2.3.15/lib/imapoptions
---- cyrus-imapd-2.3.15/lib/imapoptions.authid_normalize	2009-09-18 11:53:47.244115877 +0200
-+++ cyrus-imapd-2.3.15/lib/imapoptions	2009-09-18 11:53:47.260115873 +0200
-@@ -1217,6 +1217,11 @@ product version in the capabilities */
-    interface, otherwise the user is assumed to be in the default
-    domain (if set). */
+diff -up cyrus-imapd-2.4.14/lib/imapoptions.authid_normalize cyrus-imapd-2.4.14/lib/imapoptions
+--- cyrus-imapd-2.4.14/lib/imapoptions.authid_normalize	2012-03-12 12:47:51.000000000 +0100
++++ cyrus-imapd-2.4.14/lib/imapoptions	2012-03-14 11:01:11.020256349 +0100
+@@ -844,6 +844,11 @@ Blank lines and lines beginning with ``#
+ /* Set the length of the NNTP server's inactivity autologout timer,    
+    in minutes.  The minimum value is 3, the default. */
  
 +{ "normalizeuid", 0, SWITCH }
 +/* Lowercase uid and strip leading and trailing blanks. It is recommended
 +   to set this to yes, especially if OpenLDAP is used as authentication
 +   source. */
 +
- /*
- .SH SEE ALSO
- .PP
-diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize cyrus-imapd-2.3.15/lib/libcyr_cfg.c
---- cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize	2009-03-31 06:43:20.000000000 +0200
-+++ cyrus-imapd-2.3.15/lib/libcyr_cfg.c	2009-09-18 11:55:03.436822867 +0200
-@@ -154,6 +154,10 @@ struct cyrusopt_s cyrus_options[] = {
+ { "notifysocket", "{configdirectory}/socket/notify", STRING }
+ /* Unix domain socket that the mail notification daemon listens on. */
+ 
+diff -up cyrus-imapd-2.4.14/lib/libcyr_cfg.c.authid_normalize cyrus-imapd-2.4.14/lib/libcyr_cfg.c
+--- cyrus-imapd-2.4.14/lib/libcyr_cfg.c.authid_normalize	2012-03-12 12:47:51.000000000 +0100
++++ cyrus-imapd-2.4.14/lib/libcyr_cfg.c	2012-03-14 10:49:50.681822910 +0100
+@@ -158,6 +158,10 @@ struct cyrusopt_s cyrus_options[] = {
        CFGVAL(long, 1),
        CYRUS_OPT_SWITCH },
  
@@ -66,10 +66,10 @@ diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize cyrus-imapd-2.3.15
      { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
  };
  
-diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.h.authid_normalize cyrus-imapd-2.3.15/lib/libcyr_cfg.h
---- cyrus-imapd-2.3.15/lib/libcyr_cfg.h.authid_normalize	2009-03-31 06:43:20.000000000 +0200
-+++ cyrus-imapd-2.3.15/lib/libcyr_cfg.h	2009-09-18 11:55:33.267115989 +0200
-@@ -114,6 +114,8 @@ enum cyrus_opt {
+diff -up cyrus-imapd-2.4.14/lib/libcyr_cfg.h.authid_normalize cyrus-imapd-2.4.14/lib/libcyr_cfg.h
+--- cyrus-imapd-2.4.14/lib/libcyr_cfg.h.authid_normalize	2012-03-12 12:47:51.000000000 +0100
++++ cyrus-imapd-2.4.14/lib/libcyr_cfg.h	2012-03-14 10:49:50.681822910 +0100
+@@ -116,6 +116,8 @@ enum cyrus_opt {
      CYRUSOPT_SQL_USESSL,
      /* Checkpoint after every recovery (OFF) */
      CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index d21e78f..d81acc2 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
-Version: 2.4.12
-Release: 2%{?dist}
+Version: 2.4.14
+Release: 1%{?dist}
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
 
@@ -509,6 +509,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu Mar 15 2012 Michal Hlavinka <mhlavink at redhat.com> - 2.4.14-1
+- updated to 2.4.14
+
 * Wed Nov 23 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.12-2
 - reduce noisy logging, add option to turn on LOG_DEBUG syslog 
   messages again (thanks Philip Prindeville) (#754940)
diff --git a/sources b/sources
index 63e2323..1118205 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-80f27401490a3dc9e422884ceee6ecf6  cyrus-imapd-2.4.12.tar.gz
+763c63b2e910db2c6a06e5d82a294419  cyrus-imapd-2.4.14.tar.gz
 b67fdc8d0a18b7f03b047a64dd53b546  libdb-utils.x86_64.cpio
 ab944a121ac8beffa1eaee5539082e02  libdb-utils.i386.cpio