version bump, removed old version

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 9 insertions, 41 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 69b40ee1a7a9..17c0b7a9d3af 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # 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.198 2009/02/03 08:32:08 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.199 2009/02/07 15:35:47 wschlich Exp $
+
+*dovecot-1.1.11 (05 Feb 2009)
+
+  05 Feb 2009; Wolfram Schlich <wschlich@gentoo.org>
+  -files/dovecot-1.1.10-498022697a33.patch, -dovecot-1.1.10-r1.ebuild,
+  +dovecot-1.1.11.ebuild:
+  version bump, removed old version
 
   02 Feb 2009; Wolfram Schlich <wschlich@gentoo.org>
   -files/dovecot-1.1.4-expire.patch,
diff --git a/net-mail/dovecot/dovecot-1.1.10-r1.ebuild b/net-mail/dovecot/dovecot-1.1.11.ebuild
index 00911b64641d..f1306b735082 100644
--- a/net-mail/dovecot/dovecot-1.1.10-r1.ebuild
+++ b/net-mail/dovecot/dovecot-1.1.11.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.10-r1.ebuild,v 1.1 2009/02/02 11:18:37 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1.11.ebuild,v 1.1 2009/02/07 15:35:47 wschlich Exp $
 
 inherit autotools eutils ssl-cert versionator
 
@@ -52,7 +52,6 @@ src_unpack() {
 		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE_PATCH}.diff
 		eautoreconf
 	fi
-	epatch "${FILESDIR}/${P}-498022697a33.patch"
 }
 
 pkg_setup() {
diff --git a/net-mail/dovecot/files/dovecot-1.1.10-498022697a33.patch b/net-mail/dovecot/files/dovecot-1.1.10-498022697a33.patch
deleted file mode 100644
index f09f47f8428f..000000000000
--- a/net-mail/dovecot/files/dovecot-1.1.10-498022697a33.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# HG changeset patch
-# User Timo Sirainen <tss@iki.fi>
-# Date 1233425646 -7200
-# Node ID 498022697a33e7c6a4db2e9e7db763ffc5552872
-# Parent f97cd7e3acda5a4b707cde9837c55a8cd48d2d8d
-auth: Using "username" or "domain" passdb fields caused problems with cache and blocking passdbs.
-
---- a/src/auth/auth-request.c	Thu Jan 29 19:25:02 2009 -0500
-+++ b/src/auth/auth-request.c	Sat Jan 31 20:14:06 2009 +0200
-@@ -1006,7 +1006,7 @@ void auth_request_set_field(struct auth_
- 			    const char *name, const char *value,
- 			    const char *default_scheme)
- {
--	const char *p;
-+	const char *p, *orig_value;
- 
- 	i_assert(*name != '\0');
- 	i_assert(value != NULL);
-@@ -1024,6 +1024,7 @@ void auth_request_set_field(struct auth_
- 	if (strcmp(name, "user") == 0 ||
- 	    strcmp(name, "username") == 0 || strcmp(name, "domain") == 0) {
- 		/* update username */
-+		orig_value = value;
- 		if (strcmp(name, "username") == 0 &&
- 		    strchr(value, '@') == NULL &&
- 		    (p = strchr(request->user, '@')) != NULL) {
-@@ -1054,6 +1055,9 @@ void auth_request_set_field(struct auth_
- 				request->user, value);
- 			request->user = p_strdup(request->pool, value);
- 		}
-+		/* restore the original value so it gets saved correctly to
-+		   cache. */
-+		value = orig_value;
- 	} else if (strcmp(name, "nodelay") == 0) {
- 		/* don't delay replying to client of the failure */
- 		request->no_failure_delay = TRUE;
-