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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

7 files changed, 47 insertions, 134 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/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 = \