From 66faec925560389861b5dd7f597c368648a20bf3 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Thu, 31 Mar 2011 08:44:23 +0200
Subject: [PATCH] updated to 2.4.7

---
 .gitignore                                |  1 +
 cyrus-imapd-2.3.1-make_md5_defaults.patch | 32 -----------------------
 cyrus-imapd.spec                          |  9 +++----
 sources                                   |  2 +-
 4 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 cyrus-imapd-2.3.1-make_md5_defaults.patch

diff --git a/.gitignore b/.gitignore
index afc03fa..cfeb695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 cyrus-imapd-2.3.16.tar.gz
 cyrus_sharedbackup-0.1.tar.gz
 /cyrus-imapd-2.4.6.tar.gz
+/cyrus-imapd-2.4.7.tar.gz
diff --git a/cyrus-imapd-2.3.1-make_md5_defaults.patch b/cyrus-imapd-2.3.1-make_md5_defaults.patch
deleted file mode 100644
index 38b8e70..0000000
--- a/cyrus-imapd-2.3.1-make_md5_defaults.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up cyrus-imapd-2.4.6/lib/imapoptions.make_md5_defaults cyrus-imapd-2.4.6/lib/imapoptions
---- cyrus-imapd-2.4.6/lib/imapoptions.make_md5_defaults	2011-02-10 13:15:02.620914246 +0100
-+++ cyrus-imapd-2.4.6/lib/imapoptions	2011-02-10 13:20:09.717498074 +0100
-@@ -671,10 +671,14 @@ Blank lines and lines beginning with ``#
-    mailspool, but each have their own "replicated" copy of
-    mailboxes.db. */
- 
--{ "md5_dir", NULL, STRING }
-+{ "md5_dir", "/var/lib/imap/md5", STRING }
- /* Top level directory for MD5 store manipulated by make_md5. File
-    structure within this directory is one file for each user on the system,
--   hashed on the first letter of the userid (e.g., /var/imap/md5/d/dpc22). */
-+   hashed on the first letter of the
-+   userid (e.g., /var/imap/md5/d/dpc22).
-+.PP   
-+   Note: This RPM build uses \fI/var/lib/imap/md5\fR by default 
-+   instead of \fI/var/imap/md5\fR for \fBmd5_dir\fR. */
- 
- { "md5_user_map", NULL, STRING }
- /* Map file (cdb) to allow partial make_md5 runs. Maps username to UID */
-diff -up cyrus-imapd-2.4.6/lib/imapopts.c.make_md5_defaults cyrus-imapd-2.4.6/lib/imapopts.c
---- cyrus-imapd-2.4.6/lib/imapopts.c.make_md5_defaults	2010-12-20 14:20:42.000000000 +0100
-+++ cyrus-imapd-2.4.6/lib/imapopts.c	2011-02-10 13:19:14.961641299 +0100
-@@ -402,7 +402,7 @@ struct imapopt_s imapopts[] =
-       { "replicated" , IMAP_ENUM_MUPDATE_CONFIG_REPLICATED },
-       { NULL, IMAP_ENUM_ZERO } } },
-   { IMAPOPT_MD5_DIR, "md5_dir", 0, OPT_STRING,
--    {(void *)(NULL)},
-+    {(void *)("/var/lib/imap/md5")},
-     { { NULL, IMAP_ENUM_ZERO } } },
-   { IMAPOPT_MD5_USER_MAP, "md5_user_map", 0, OPT_STRING,
-     {(void *)(NULL)},
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 6b0c220..ea092e9 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,5 +1,5 @@
 Name: cyrus-imapd
-Version: 2.4.6
+Version: 2.4.7
 Release: 1%{?dist}
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
@@ -42,9 +42,6 @@ Patch3: http://www.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-f
 
 Patch4: cyrus-imapd-2.3.1-authid_normalize.patch
 
-# fedora/rhel specific, we use different directory
-Patch5: cyrus-imapd-2.3.1-make_md5_defaults.patch
-
 # fedora/rhel specific, find current db lib, rhbz#461875
 Patch6: cyrus-imapd-2.3.12p2-current-db.patch
 
@@ -126,7 +123,6 @@ one running the server.
 #%patch2 -p1 -b .autosieve
 %patch3 -p1 -b .flock
 %patch4 -p1 -b .authid_normalize
-%patch5 -p1 -b .make_md5_defaults
 %patch6 -p1 -b .db4.7
 
 install -m 644 %{SOURCE4} %{SOURCE5} %{SOURCE11} doc/
@@ -478,6 +474,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu Mar 31 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.7-1
+- updated to 2.4.7
+
 * Fri Feb 10 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.6-1
 - updated to 2.4.6
 - "autocreate" and "autosieve" features were removed
diff --git a/sources b/sources
index a72c1fe..25369ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c37b06ce2419734d8edf3d67004e5b0c  cyrus-imapd-2.4.6.tar.gz
+7ef3a02c3e92a44a2adf25f81db4ca3c  cyrus-imapd-2.4.7.tar.gz