rpms/cyrus-imapd/devel cyrus-imapd-2.3.1-make_md5_defaults.patch, 1.1, 1.2 cyrus-imapd.spec, 1.40, 1.41

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3565

Modified Files:
	cyrus-imapd-2.3.1-make_md5_defaults.patch cyrus-imapd.spec 
Log Message:
* Mon Sep  1 2008 Dan Horák <dan[at]danny.cz - 2.3.11-3
- refresh patches


cyrus-imapd-2.3.1-make_md5_defaults.patch:

Index: cyrus-imapd-2.3.1-make_md5_defaults.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.1-make_md5_defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus-imapd-2.3.1-make_md5_defaults.patch	28 Feb 2006 20:04:01 -0000	1.1
+++ cyrus-imapd-2.3.1-make_md5_defaults.patch	1 Sep 2008 09:41:02 -0000	1.2
@@ -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. */
  


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cyrus-imapd.spec	31 May 2008 15:23:53 -0000	1.40
+++ cyrus-imapd.spec	1 Sep 2008 09:41:02 -0000	1.41
@@ -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 @@
 %{_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