From 71523f105d1bbd4443b6c3fe9ba10e66de6437e1 Mon Sep 17 00:00:00 2001
From: Dan Horák <sharkcz@fedoraproject.org>
Date: Sep 01 2008 09:41:02 +0000
Subject: - refresh patches


---

diff --git a/cyrus-imapd-2.3.1-make_md5_defaults.patch b/cyrus-imapd-2.3.1-make_md5_defaults.patch
index 36cd3bc..5e8892e 100644
--- a/cyrus-imapd-2.3.1-make_md5_defaults.patch
+++ b/cyrus-imapd-2.3.1-make_md5_defaults.patch
@@ -1,19 +1,19 @@
-diff -Naur cyrus-imapd-2.3.1.orig/imap/make_md5.c cyrus-imapd-2.3.1/imap/make_md5.c
---- cyrus-imapd-2.3.1.orig/imap/make_md5.c	2005-12-13 16:31:08.000000000 +0100
-+++ cyrus-imapd-2.3.1/imap/make_md5.c	2006-01-16 11:27:29.000000000 +0100
-@@ -811,7 +811,7 @@
+diff -Nru -x'*.orig' cyrus-imapd-2.3.11.orig/imap/make_md5.c cyrus-imapd-2.3.11/imap/make_md5.c
+--- cyrus-imapd-2.3.11.orig/imap/make_md5.c	2007-10-01 20:35:59.000000000 +0200
++++ cyrus-imapd-2.3.11/imap/make_md5.c	2008-09-01 11:16:50.000000000 +0200
+@@ -814,7 +814,7 @@
      if (!md5_dir) md5_dir = config_getstring(IMAPOPT_MD5_DIR);
  
      if (!md5_dir)
 -        md5_dir = xstrdup("/var/imap/md5");
 +        md5_dir = xstrdup("/var/lib/imap/md5");
  
-     if (((uid_file = config_getstring(IMAPOPT_MD5_USER_MAP)) != NULL) &&
-         ((uid_fd=open(uid_file, O_RDONLY)) < 0)) {
-diff -Naur cyrus-imapd-2.3.1.orig/lib/imapoptions cyrus-imapd-2.3.1/lib/imapoptions
---- cyrus-imapd-2.3.1.orig/lib/imapoptions	2005-12-13 20:36:11.000000000 +0100
-+++ cyrus-imapd-2.3.1/lib/imapoptions	2006-01-16 11:26:54.000000000 +0100
-@@ -527,10 +527,14 @@
+     if (max_children == 0) {
+         /* Simple case */
+diff -Nru -x'*.orig' cyrus-imapd-2.3.11.orig/lib/imapoptions cyrus-imapd-2.3.11/lib/imapoptions
+--- cyrus-imapd-2.3.11.orig/lib/imapoptions	2007-10-18 20:14:48.000000000 +0200
++++ cyrus-imapd-2.3.11/lib/imapoptions	2008-09-01 11:16:50.000000000 +0200
+@@ -557,10 +557,14 @@
     mailspool, but each have their own "replicated" copy of
     mailboxes.db. */
  
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 3bf5b1a..114319c 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.11
 Name: cyrus-imapd
 Version: 2.3.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -807,6 +807,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Sep  1 2008 Dan Horák <dan[at]danny.cz - 2.3.11-3
+- refresh patches
+
 * Sat May 31 2008 Dan Horák <dan[at]danny.cz - 2.3.11-2
 - call automake to update config.* files and be buildable again on rawhide