Version bump, bug #331285 by Eray Aslan. Service name changed to sieve for pam. Reorder linking for --as-needed flag.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

8 files changed, 52 insertions, 142 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 72fdf4d3709e..4565feb53d36 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.250 2010/07/26 23:21:59 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.251 2010/08/05 13:20:44 darkside Exp $
+
+*dovecot-2.0_rc4 (05 Aug 2010)
+
+  05 Aug 2010; Jeremy Olexa <darkside@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-2.0_rc3.ebuild,
+  +dovecot-2.0_rc4.ebuild, +files/dovecot-2.0_rc4-asneeded.patch:
+  Version bump, bug #331285 by Eray Aslan. Service name changed to sieve for
+  pam. Reorder linking for --as-needed flag.
 
 *dovecot-1.2.13 (26 Jul 2010)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 2dfc49049712..08185e8dfcd9 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,11 +1,8 @@
-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-1.2.init 1720 RMD160 0f641929fd2c58878f6d69e6ba454b9110603031 SHA1 c498c5208f0504f2eadc460d515f563f907d05ef SHA256 9c7ef516324cd5a17c5f28f6af272d8d06106420c747ff5c4da6fa14a3ac316c
+AUX dovecot-2.0_rc4-asneeded.patch 630 RMD160 b4a3c4e36e74b120f6deb8e3990de0751ea5e654 SHA1 ef8c294dd08597872a2d983c1ba9ad5dc59ea97c SHA256 1f6ca549223518f99be887e7261c31a57522ce66347109ead333a71cd75d3061
 AUX dovecot.init 874 RMD160 aa899b69d42946dcf2262c38731319474e759041 SHA1 4f0a95cf6ba9e86bd9008694ea927dc97703b24d SHA256 145d68382d757110aa86f58b2567fb25648fa0ca62788e3461f2b45fc5999c80
 AUX dovecot.init-r2 1618 RMD160 5b5c88847c096282f5ab94b82db7fab5c9e42aa3 SHA1 d9f61ac897a6e377dc8cf2c6da4952a4ff7918e9 SHA256 6ad0d1fc09c41ba390e717667e4dad3838f669ef7b227e3cbdb60c499758a901
-DIST 01ee63b788c9.tar.gz 668333 RMD160 f6b39fd8becfaf63e0cd07e8be1a1db7611092bc SHA1 a84d69c03a4ba71b9c196ce29b5446c1d6b50265 SHA256 6e9305e59654fe1a236f1f78f7323dc6a82b5fb07d8aeb5f7782db621e0e2274
+DIST cac6acdc4d0e.tar.gz 674306 RMD160 61f760858e8fff8b2f9fc89eb43597c5fd31dfba SHA1 847e61e55476e8e0730ddfa1f3a21d4422dc7611 SHA256 35558aa410e53b00298770f3c633e8fde36008d493f129a78b12a08043061499
 DIST dovecot-1.1-managesieve-0.10.7.tar.gz 358166 RMD160 a8ca467e4a61b916a68a8252e6c3e8adc211472c SHA1 88d7b88dfc1cb4cc4dfac4de6aa3601a5272d345 SHA256 122deb67237714601223112846604942fe70c4d52edc8142851de0be502d8c23
 DIST dovecot-1.1.19-managesieve-0.10.7.diff.gz 6317 RMD160 b739bf737c38cda7744f8de609550f6c94a8e021 SHA1 f0e8726e8b1bc57362089fa07e5bb1c44961f5ac SHA256 63d9c896a5d6e2c52a41fd533e50ef24847392fc37fc47c0bc4322eefa2e47bb
 DIST dovecot-1.1.19.tar.gz 2389194 RMD160 8fe25b5a5347792e7aa919cc285c1b8c99bab36e SHA1 ce8f8a135a2c8ef1bd0cd1ceff04018402f3cb58 SHA256 33df1d97b9241b25dfcbc78c86ba6114f16ddf14763879432a6afe4acd1bc95a
@@ -19,13 +16,13 @@ DIST dovecot-1.2.12-managesieve-0.11.11.diff.gz 6455 RMD160 8f55a97e9a68e53faafa
 DIST dovecot-1.2.12.tar.gz 2882517 RMD160 9a2ecf836607905acebee57d082b0b4c36108260 SHA1 72fedd20c00eb3763012555c3622f84286cb8e65 SHA256 1ef0c40822cf64f20af1e65b4402da75296489aba25df8b13e2386df6952c281
 DIST dovecot-1.2.13-managesieve-0.11.11.diff.gz 6463 RMD160 d26fa4db66c74d46fc562703f4493ee4d5a1b2a7 SHA1 636b1bb4dbcfd9e82c93faf4e4fdf83e2dcee755 SHA256 8646fcdf8c0fda69f8b0df88d9356861e124d7f70c75df1afb714769cd84e9ed
 DIST dovecot-1.2.13.tar.gz 2946123 RMD160 083dd4504dbf0e86187019853514811155c9087f SHA1 8a6e12cc40df02083480f9e9eef57939a81fd7af SHA256 22fa612b4c3250d33bc6e5010efd81d082b10dbce73da732fea644e085701869
-DIST dovecot-2.0.rc3.tar.gz 3063406 RMD160 c1d65515c1179981792e1a627548da29b4d7e77b SHA1 354779307fc0d5886e24f306bec0a8b3a82ce8e6 SHA256 7c64021803a0aa0b5f5b5888787fe5a54f379abf058570e50c2a9c720865e760
+DIST dovecot-2.0.rc4.tar.gz 3078330 RMD160 30f5004a75947a7ef07223023163519b0ad257ea SHA1 3c4ffc46992d889a1bd2212c9af5df9f341acd96 SHA256 e7a2121d0aeab6b1e5dc0353b9041fea03f8b669c91b227d179e34b227d67b3b
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
 EBUILD dovecot-1.1.19.ebuild 8581 RMD160 4cfb649e5cd577ab715f831210d6bdf7ddb7ea05 SHA1 3217a1cef3a0cd9192c7093d4cc3403eb1bcc9ea SHA256 b0fb355d36c9fc56016bfa3c6bcca07582dc60900c13c6c8d99848c98d8dada2
 EBUILD dovecot-1.2.11-r1.ebuild 8541 RMD160 f31a3cff9606f0254ba14d5bd5f60962daf99dba SHA1 874ee918a521b1995da49d9e7bb9d7d28d78fd36 SHA256 0e75be8e0338a01c54e72b507d8fe3c17ef1aa31a19ece769a5e3311897ca0ed
 EBUILD dovecot-1.2.11-r2.ebuild 8549 RMD160 d28caf09bbcebbc9e7393ad852a33eb887b3465b SHA1 3f7daf5e0df61733fb598f66826ab7af76d8bce9 SHA256 6897fcd0e88ca7cff75088268e5abe32cb9d15d54fa479e66fd75360d8b3d4b6
 EBUILD dovecot-1.2.12.ebuild 8547 RMD160 c5fc0acae6570bfcf3d57c772c5fb89ecc311b0e SHA1 a7c705774a4f4683b721a5e5e8692e875be8ffda SHA256 1a11428ec920f63a58f4d70847e26cf1aded769d4c7cfb7f2e98c7bbba4de1e8
 EBUILD dovecot-1.2.13.ebuild 8549 RMD160 2dc0ad1f3ae9048b45083a05e597398b1739126a SHA1 7b91eb5cc1f643e6d4163acc3b1ca2d29b95f90c SHA256 b77f8c1c341e59b1a69db280490f534901e3c08927e74c9b360edfc0c6bfdf21
-EBUILD dovecot-2.0_rc3.ebuild 9498 RMD160 2450956e2f6043e4a447d618612847152ca36fd6 SHA1 b7ab41728071db4c48badc2bfbbd78c70283a0bb SHA256 e3426a11fb2f2748f4e2e3604181180a104ebc12181a66b40b310c84cc47473b
-MISC ChangeLog 40682 RMD160 e03dcd8dd310c0cb8d355dd53b17e9e02adfa244 SHA1 1fb70a283daae37e981faecff98d3b7a03dd3b76 SHA256 e56dd7f62ba9a2351910ba6f72dd8315f46546bb27d6bc9f10e11ef50ddd2c1a
+EBUILD dovecot-2.0_rc4.ebuild 9488 RMD160 7c7cc3795496d2c36ae99f1a41096c2d37c49b4f SHA1 606096fd5f27f5b3c01225805317151df6fef57a SHA256 417c85a13950b059031965cafa10517de66f0fa041fb30e90ff031692416e3c8
+MISC ChangeLog 41154 RMD160 e1527eb56690c99814b2935940f36c35b4cd9429 SHA1 c5f9c91c6e84ee401088128145a11fbdfeca585a SHA256 03a2831a56c25d392548a6d82b71bca98cb1d9c2c1c958588008986e1a61ba57
 MISC metadata.xml 919 RMD160 1e3a625fb64bee092b52fe671c7b51cbbc0cea80 SHA1 d4c9aa0299f149d3d552a10971d3efcc84809a1d SHA256 872564b7c2a02f4c2e042ea7b64e5ef14b0e1b63ddf8f04af36db9aa0efab372
diff --git a/net-mail/dovecot/dovecot-2.0_rc3.ebuild b/net-mail/dovecot/dovecot-2.0_rc4.ebuild
index a3b5b88dd4e2..233c43ea3aa3 100644
--- a/net-mail/dovecot/dovecot-2.0_rc3.ebuild
+++ b/net-mail/dovecot/dovecot-2.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_rc3.ebuild,v 1.2 2010/07/24 15:34:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_rc4.ebuild,v 1.1 2010/08/05 13:20:44 darkside Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils versionator ssl-cert
 
 MY_P="${P/_/.}"
 major_minor="$( get_version_component_range 1-2 )"
-sieve_snapshot="01ee63b788c9"
+sieve_snapshot="cac6acdc4d0e"
 SRC_URI="http://dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz
 	sieve? (
 	http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.tar.gz
@@ -46,8 +46,6 @@ pkg_setup() {
 	if use managesieve && ! use sieve; then
 		ewarn "managesieve USE flag selected but sieve USE flag unselected"
 		ewarn "sieve USE flag will be turned on"
-		ewarn "Hit Control-C now if you want to abort"
-		epause 10
 	fi
 
 	# Add user and group for login process (same as for fedora/redhat)
@@ -62,6 +60,10 @@ pkg_setup() {
 	enewuser dovenull -1 -1 /dev/null
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/dovecot-2.0_rc4-asneeded.patch"
+}
+
 src_configure() {
 	local conf=""
 
@@ -123,10 +125,10 @@ src_compile() {
 
 src_test() {
 	default_src_test
-	# not yet.  WIP upstream
+	# not yet
 	#if use sieve || use managesieve ; then
 		#einfo "Beginning sieve tests..."
-		## snapshot. should not be necessary for 2.0 release
+		# snapshot. should not be necessary for 2.0 release
 		#cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
 		#default_src_test
 	#fi
@@ -197,7 +199,7 @@ src_install () {
 			"${confd}/auth-system.conf.ext" \
 			|| die "failed to update PAM settings in auth-system.conf.ext"
 		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
+		use managesieve && dosym imap /etc/pam.d/sieve
 		sed -i -e \
 			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
 			"${confd}/10-auth.conf" \
diff --git a/net-mail/dovecot/files/dovecot-1.1.11-11112baa8592.patch b/net-mail/dovecot/files/dovecot-1.1.11-11112baa8592.patch
deleted file mode 100644
index cd7c72a32c98..000000000000
--- a/net-mail/dovecot/files/dovecot-1.1.11-11112baa8592.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# 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
deleted file mode 100644
index 7f0418e682e1..000000000000
--- a/net-mail/dovecot/files/dovecot-1.1.11-4736327a8740.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# 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
deleted file mode 100644
index ac1dc25989c1..000000000000
--- a/net-mail/dovecot/files/dovecot-1.1.11-bdc5391e52df.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-
-# 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
deleted file mode 100644
index 17ce27051548..000000000000
--- a/net-mail/dovecot/files/dovecot-1.1.11-c08c602ca0dc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# 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,
-
diff --git a/net-mail/dovecot/files/dovecot-2.0_rc4-asneeded.patch b/net-mail/dovecot/files/dovecot-2.0_rc4-asneeded.patch
new file mode 100644
index 000000000000..cef5812f9b08
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-2.0_rc4-asneeded.patch
@@ -0,0 +1,26 @@
+--- src/doveadm/Makefile.in.orig	2010-08-04 17:34:24.000000000 +0000
++++ src/doveadm/Makefile.in	2010-08-05 07:38:30.000000000 +0000
+@@ -293,8 +293,9 @@
+ 	$(unused_objects)
+ 
+ doveadm_LDADD = \
+-	$(libs) $(AUTH_LIBS) \
++	$(libs) \
+ 	$(cmd_pw_libs) \
++	$(AUTH_LIBS) \
+ 	$(LIBDOVECOT) \
+ 	$(MODULE_LIBS)
+ 
+--- src/doveadm/Makefile.am.orig	2010-07-30 14:04:48.000000000 +0000
++++ src/doveadm/Makefile.am	2010-08-05 07:38:30.000000000 +0000
+@@ -38,8 +38,9 @@
+ 	$(unused_objects)
+ 
+ doveadm_LDADD = \
+-	$(libs) $(AUTH_LIBS) \
++	$(libs) \
+ 	$(cmd_pw_libs) \
++	$(AUTH_LIBS) \
+ 	$(LIBDOVECOT) \
+ 	$(MODULE_LIBS)
+ doveadm_DEPENDENCIES = \