added upstream patches

Package-Manager: portage-2.2_rc23/cvs/Linux i686

7 files changed, 148 insertions, 4 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 17c0b7a9d3af..eafb71802d62 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.199 2009/02/07 15:35:47 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.200 2009/02/13 14:10:35 wschlich Exp $
+
+*dovecot-1.1.11-r1 (13 Feb 2009)
+
+  13 Feb 2009; Wolfram Schlich <wschlich@gentoo.org>
+  +files/dovecot-1.1.11-11112baa8592.patch,
+  +files/dovecot-1.1.11-4736327a8740.patch,
+  +files/dovecot-1.1.11-bdc5391e52df.patch,
+  +files/dovecot-1.1.11-c08c602ca0dc.patch, -dovecot-1.1.11.ebuild,
+  +dovecot-1.1.11-r1.ebuild:
+  added upstream patches
 
 *dovecot-1.1.11 (05 Feb 2009)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index ebcd1bd20600..f2f148ffc375 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,3 +1,7 @@
+AUX dovecot-1.1.11-11112baa8592.patch 1094 RMD160 8732151dcbbc2dccce5184d53f89132e3c532f5a SHA1 3f0465ca1010c15b14f3bfc9638586bd61639843 SHA256 1f4f78815575fea4227f3f31db798247d274682a32ea82d384cbc7ba75aa58f8
+AUX dovecot-1.1.11-4736327a8740.patch 861 RMD160 801e2df279a74a57ff5b697520a382663df486d3 SHA1 6da20773ac964e9f76b551cd3c0f20d30038b515 SHA256 39823922738cf6b37238472da5068b1e02d73cefe224b15ef9abcff457eb2291
+AUX dovecot-1.1.11-bdc5391e52df.patch 1610 RMD160 eaf49900f1473781618e5401f36d0390be3035e5 SHA1 c7becfb34fc497cec2c6c3d8a4cdc98a1203a231 SHA256 75f583dc2d90cd2256da978f8a620b6af9c07a220faf7575430ed648a45dd2ad
+AUX dovecot-1.1.11-c08c602ca0dc.patch 1110 RMD160 dbb1908ce6959c6efe1bb43e3155736448f0b754 SHA1 f35724cc45159cc8b7faa5f850f06cd1b3100407 SHA256 07b5b10e8a105e2ca962f37fa425699a42b9fa6d565167191f3b55f1703eb912
 AUX dovecot.init 874 RMD160 aa899b69d42946dcf2262c38731319474e759041 SHA1 4f0a95cf6ba9e86bd9008694ea927dc97703b24d SHA256 145d68382d757110aa86f58b2567fb25648fa0ca62788e3461f2b45fc5999c80
 AUX dovecot.init-r2 1695 RMD160 5d4fa8f8929462f526a9bfdd1138249a8df62cff SHA1 5d519afd9891e624fb33d15508f3c55c02b9a9ba SHA256 75a103bdb45cd315073c2a653c1b520cc69d6a71d04493009d5815d0dce5c3f0
 DIST dovecot-1.1-managesieve-0.10.4.tar.gz 397332 RMD160 4da8129ead0de9d807e7311849a1b660c7f0509a SHA1 70a84beb5477738ff03024c4ce18a678b90fa1df SHA256 3a66a9dcad5b3a291cd87364fbb961725aa1473cf9c7ce7fa675ba71fe9313ae
@@ -8,7 +12,7 @@ DIST dovecot-1.1.7-managesieve-0.10.4.diff.gz 5912 RMD160 7d22cd364cb1e95eaf6525
 DIST dovecot-1.1.7.tar.gz 2325617 RMD160 e2a53de356910094f2516b33f4155ded4cf5a6dc SHA1 d8554a1e1f04a84ddf009d1599526c016b36582b SHA256 915cae7684438c6335d0472ff20ec2fe44d620aa61f404ce91fd02a27434cf9f
 DIST dovecot-sieve-1.1.5.tar.gz 468913 RMD160 825a8ec07d49527d8551cb5f3f86b638fddbafbd SHA1 672adf0a2f1627d96f97fc63fecaf024dd9f7a42 SHA256 ec1ea94311d5fb6cb5dd7e451728784afb39521a6a580f640b4d2115505a5ddf
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
-EBUILD dovecot-1.1.11.ebuild 8588 RMD160 46e89a559c8892f48f808d6d5b082afc9718bbae SHA1 7c801d1daa74a295ba9722ad07aea85f28f55390 SHA256 a2a676fa579c0147950474c0d5b97b893bbd9177bc377eb463b4f9712fe53c98
+EBUILD dovecot-1.1.11-r1.ebuild 8775 RMD160 5105024cd60bf033ae9be2ca9813d20edbc1d847 SHA1 a843379eb9f4362b76b0f336f40a11c9cc012a0d SHA256 45704474fc2df8b72d6d9dbfd4a461894d6b44b2b2911e60bc0d7495cdb8d223
 EBUILD dovecot-1.1.7-r1.ebuild 8584 RMD160 9e0bf8fdbf8ed699fd131273241bdf3d4d3cb6bc SHA1 565e5a6bee35ccd3540682ac5f37a47d988700c0 SHA256 1a39caa28662acb24ee1413de6ef2efbc2dd093c2cfe717008fc3dc08f938a37
-MISC ChangeLog 32459 RMD160 d9bad1ad9579b9fd27252f8ab43fefd1e18934fb SHA1 3f4a67483b552799bc8f3458b3169fb6fa8ec53f SHA256 d9038daeee56028ae658c7a041871b545413080f35734e7a2e2d16c99d5edcd6
+MISC ChangeLog 32801 RMD160 a05657a0b723be88a8750460606a0b56796de2b7 SHA1 69ed15250fca6f84d1e38267ea37cbff5f542d0f SHA256 f988adc3680c42edff25ea5e1a12ce1b50393d398961287c045cf79ff96f5415
 MISC metadata.xml 560 RMD160 1d9909ba298f97ddfedc7c37a9a74a8a00f0fc98 SHA1 062f2369f4349513f9e8167b6c781e50c62b95d0 SHA256 2cce3170119fffd0c9e8403f57cee03c128ca1e1d58950f087ced22b04ba75c8
diff --git a/net-mail/dovecot/dovecot-1.1.11.ebuild b/net-mail/dovecot/dovecot-1.1.11-r1.ebuild
index f1306b735082..3abe996d473d 100644
--- a/net-mail/dovecot/dovecot-1.1.11.ebuild
+++ b/net-mail/dovecot/dovecot-1.1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1.11.ebuild,v 1.1 2009/02/07 15:35:47 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1.11-r1.ebuild,v 1.1 2009/02/13 14:10:35 wschlich Exp $
 
 inherit autotools eutils ssl-cert versionator
 
@@ -52,6 +52,10 @@ src_unpack() {
 		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE_PATCH}.diff
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${P}-4736327a8740.patch
+	epatch "${FILESDIR}"/${P}-11112baa8592.patch
+	epatch "${FILESDIR}"/${P}-bdc5391e52df.patch
+	epatch "${FILESDIR}"/${P}-c08c602ca0dc.patch
 }
 
 pkg_setup() {
diff --git a/net-mail/dovecot/files/dovecot-1.1.11-11112baa8592.patch b/net-mail/dovecot/files/dovecot-1.1.11-11112baa8592.patch
new file mode 100644
index 000000000000..cd7c72a32c98
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-1.1.11-11112baa8592.patch
@@ -0,0 +1,31 @@
+
+# HG changeset patch
+# User Timo Sirainen <tss@iki.fi>
+# Date 1233768235 18000
+# Node ID 11112baa8592f5be016ea748ff4601c7b3c1e3b9
+# Parent eb9c1c78e91950557d4c9fd525b5dcc7a56cb23c
+auth_debug_passwords=yes: Log password for PAM lookups.
+
+--- a/src/auth/passdb-pam.c	Tue Feb 03 18:44:31 2009 -0500
++++ b/src/auth/passdb-pam.c	Wed Feb 04 12:23:55 2009 -0500
+@@ -175,11 +175,15 @@ static int try_pam_auth(struct auth_requ
+ 			/* log this as error, since it probably is */
+ 			str = t_strdup_printf("%s (%s missing?)", str, path);
+ 			auth_request_log_error(request, "pam", "%s", str);
++		} else if (status == PAM_AUTH_ERR) {
++			str = t_strconcat(str, " (password mismatch?)", NULL);
++			if (request->auth->verbose_debug_passwords) {
++				str = t_strconcat(str, " (given password: ",
++						  request->mech_password,
++						  ")", NULL);
++			}
++			auth_request_log_info(request, "pam", "%s", str);
+ 		} else {
+-			if (status == PAM_AUTH_ERR) {
+-				str = t_strconcat(str, " (password mismatch?)",
+-						  NULL);
+-			}
+ 			auth_request_log_info(request, "pam", "%s", str);
+ 		}
+ 		return status;
+
diff --git a/net-mail/dovecot/files/dovecot-1.1.11-4736327a8740.patch b/net-mail/dovecot/files/dovecot-1.1.11-4736327a8740.patch
new file mode 100644
index 000000000000..7f0418e682e1
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-1.1.11-4736327a8740.patch
@@ -0,0 +1,20 @@
+
+# HG changeset patch
+# User Timo Sirainen <tss@iki.fi>
+# Date 1233868321 18000
+# Node ID 4736327a8740579e7c89a8b386de9af0266b07fa
+# Parent 7d175e4ea57d21162abbf43a61c5305cfe1995b3
+Maildir: Fix to earlier >26 keywords handling change.
+
+--- a/src/lib-storage/index/maildir/maildir-sync-index.c	Wed Feb 04 17:44:01 2009 -0500
++++ b/src/lib-storage/index/maildir/maildir-sync-index.c	Thu Feb 05 16:12:01 2009 -0500
+@@ -336,7 +336,7 @@ maildir_sync_mail_keywords(struct maildi
+ 	   ones. we can get these lists easily by removing common elements
+ 	   from old and new keywords. */
+ 	new_indexes = array_get_modifiable(&ctx->keywords, &new_count);
+-	for (i = 0; i < old_count && j < new_count; ) {
++	for (i = j = 0; i < old_count && j < new_count; ) {
+ 		diff = (int)old_indexes[i] - (int)new_indexes[j];
+ 		if (diff == 0) {
+ 			array_delete(&ctx->keywords, j, 1);
+
diff --git a/net-mail/dovecot/files/dovecot-1.1.11-bdc5391e52df.patch b/net-mail/dovecot/files/dovecot-1.1.11-bdc5391e52df.patch
new file mode 100644
index 000000000000..ac1dc25989c1
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-1.1.11-bdc5391e52df.patch
@@ -0,0 +1,49 @@
+
+# HG changeset patch
+# User Timo Sirainen <tss@iki.fi>
+# Date 1234226629 18000
+# Node ID bdc5391e52dfe4590e9e291eba2603ed87caef57
+# Parent 4ddf36b9ee8182f10d8d69af6577b677cda282a0
+master: Don't crash if auth process dies too early.
+
+--- a/src/master/auth-process.c	Thu Feb 05 18:29:06 2009 -0500
++++ b/src/master/auth-process.c	Mon Feb 09 19:43:49 2009 -0500
+@@ -353,7 +353,7 @@ static void auth_process_destroy(struct 
+ 
+ 	if (!p->initialized && io_loop_is_running(ioloop) && !p->external) {
+ 		/* log the process exit and kill ourself */
+-		child_processes_deinit();
++		child_processes_flush();
+ 		log_deinit();
+ 		i_fatal("Auth process died too early - shutting down");
+ 	}
+--- a/src/master/child-process.c	Thu Feb 05 18:29:06 2009 -0500
++++ b/src/master/child-process.c	Mon Feb 09 19:43:49 2009 -0500
+@@ -219,10 +219,15 @@ void child_processes_init(void)
+ 	lib_signals_set_handler(SIGCHLD, TRUE, sigchld_handler, NULL);
+ }
+ 
+-void child_processes_deinit(void)
++void child_processes_flush(void)
+ {
+ 	/* make sure we log if child processes died unexpectedly */
+ 	sigchld_handler(SIGCHLD, NULL);
++}
++
++void child_processes_deinit(void)
++{
++	child_processes_flush();
+ 	lib_signals_unset_handler(SIGCHLD, sigchld_handler, NULL);
+ 	hash_destroy(&processes);
+ }
+--- a/src/master/child-process.h	Thu Feb 05 18:29:06 2009 -0500
++++ b/src/master/child-process.h	Mon Feb 09 19:43:49 2009 -0500
+@@ -40,6 +40,7 @@ void child_process_set_destroy_callback(
+ 					child_process_destroy_callback_t *cb);
+ 
+ void child_processes_init(void);
++void child_processes_flush(void);
+ void child_processes_deinit(void);
+ 
+ #endif
+
diff --git a/net-mail/dovecot/files/dovecot-1.1.11-c08c602ca0dc.patch b/net-mail/dovecot/files/dovecot-1.1.11-c08c602ca0dc.patch
new file mode 100644
index 000000000000..17ce27051548
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-1.1.11-c08c602ca0dc.patch
@@ -0,0 +1,26 @@
+
+# HG changeset patch
+# User Timo Sirainen <tss@iki.fi>
+# Date 1234481874 18000
+# Node ID c08c602ca0dcbc137a4ca965b3722953cabfa4fc
+# Parent 4044df5a4d12fef4086d7e604444467eb105f348
+"Maildir filename has wrong W value" error was missing new/cur directory in the middle.
+
+--- a/src/lib-storage/index/maildir/maildir-mail.c	Tue Feb 10 12:19:05 2009 -0500
++++ b/src/lib-storage/index/maildir/maildir-mail.c	Thu Feb 12 18:37:54 2009 -0500
+@@ -485,8 +485,12 @@ static void maildir_mail_set_cache_corru
+ 					       _mail->uid, &flags);
+ 		if (maildir_filename_get_size(fname, MAILDIR_EXTRA_VIRTUAL_SIZE,
+ 					      &size)) {
+-			i_error("Maildir filename has wrong W value: %s/%s",
+-				mbox->path, fname);
++			const char *subdir =
++				(flags & MAILDIR_UIDLIST_REC_FLAG_NEW_DIR) != 0 ?
++				"new" : "cur";
++			mail_storage_set_critical(_mail->box->storage,
++				"Maildir filename has wrong W value: %s/%s/%s",
++				mbox->path, subdir, fname);
+ 		} else if (maildir_uidlist_lookup_ext(mbox->uidlist, _mail->uid,
+ 				MAILDIR_UIDLIST_REC_EXT_VSIZE) != NULL) {
+ 			maildir_uidlist_set_ext(mbox->uidlist, _mail->uid,
+