rpms/dovecot/F-11 dovecot-managesieve-trim-rc3-to-rc5.patch, NONE, 1.1 .cvsignore, 1.53, 1.54 dovecot-1.1-default-settings.patch, 1.6, 1.7 dovecot.spec, 1.126, 1.127 sources, 1.56, 1.57

Michal Hlavinka mhlavink at fedoraproject.org
Thu Jun 18 07:46:28 UTC 2009 

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4471

Modified Files:
	.cvsignore dovecot-1.1-default-settings.patch dovecot.spec 
	sources 
Added Files:
	dovecot-managesieve-trim-rc3-to-rc5.patch 
Log Message:
update to 1.2.rc5


dovecot-managesieve-trim-rc3-to-rc5.patch:

--- NEW FILE dovecot-managesieve-trim-rc3-to-rc5.patch ---
diff -up dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/client-authenticate.c.trimrc5 dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/client-authenticate.c
--- dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/client-authenticate.c.trimrc5	2009-01-30 18:06:34.000000000 +0100
+++ dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/client-authenticate.c	2009-06-18 08:39:56.053374090 +0200
@@ -133,9 +133,19 @@ static bool client_handle_args(struct ma
 	const char *reason = NULL, *host = NULL, *destuser = NULL, *pass = NULL;
 	string_t *resp_code;
 	unsigned int port = 2000;
+	enum login_proxy_ssl_flags ssl_flags = 0;
+	const char *key, *value, *p;
 	bool proxy = FALSE, temp = FALSE, nologin = !success, proxy_self;
 
 	for (; *args != NULL; args++) {
+		p = strchr(*args, '=');
+		if (p == NULL) {
+			key = *args;
+			value = "";
+		} else {
+			key = t_strdup_until(*args, p);
+			value = p + 1;
+		}
 		if (strcmp(*args, "nologin") == 0)
 			nologin = TRUE;
 		else if (strcmp(*args, "proxy") == 0)
@@ -152,6 +162,16 @@ static bool client_handle_args(struct ma
 			destuser = *args + 9;
 		else if (strncmp(*args, "pass=", 5) == 0)
 			pass = *args + 5;
+		else if (strcmp(key, "ssl") == 0) {
+			if (strcmp(value, "yes") == 0)
+				ssl_flags |= PROXY_SSL_FLAG_YES;
+			else if (strcmp(value, "any-cert") == 0) {
+				ssl_flags |= PROXY_SSL_FLAG_YES |
+					PROXY_SSL_FLAG_ANY_CERT;
+			}
+		} else if (strcmp(key, "starttls") == 0) {
+			ssl_flags |= PROXY_SSL_FLAG_STARTTLS;
+		}
 	}
 
 	if (destuser == NULL)
@@ -168,7 +188,7 @@ static bool client_handle_args(struct ma
 
 		if (!success)
 			return FALSE;
-		if (managesieve_proxy_new(client, host, port, destuser, pass) < 0)
+		if (managesieve_proxy_new(client, host, port, destuser, pass, ssl_flags) < 0)
 			client_destroy_internal_failure(client);
 		return TRUE;
 	}
diff -up dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/managesieve-proxy.c.trimrc5 dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/managesieve-proxy.c
--- dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/managesieve-proxy.c.trimrc5	2009-04-18 18:54:47.000000000 +0200
+++ dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/managesieve-proxy.c	2009-06-18 09:38:07.530374053 +0200
@@ -238,12 +238,14 @@ static int proxy_input_line(struct manag
 	return -1;
 }
 
-static void proxy_input(struct istream *input, struct ostream *output,
-			void *context)
+static void proxy_input(void *context)
 {
 	struct managesieve_client *client = context;
+	struct istream *input;
+	struct ostream *output;
 	const char *line;
 
+	input = login_proxy_get_istream(client->proxy);
 	if (input == NULL) {
 		if (client->io != NULL) {
 			/* remote authentication failed, we're just
@@ -276,6 +278,7 @@ static void proxy_input(struct istream *
 		return;
 	}
 
+	output = login_proxy_get_ostream(client->proxy);
 	while ((line = i_stream_next_line(input)) != NULL) {
 		if (proxy_input_line(client, output, line) < 0)
 			break;
@@ -283,7 +286,7 @@ static void proxy_input(struct istream *
 }
 
 int managesieve_proxy_new(struct managesieve_client *client, const char *host,
-		   unsigned int port, const char *user, const char *password)
+		   unsigned int port, const char *user, const char *password, enum login_proxy_ssl_flags ssl_flags)
 {
 	i_assert(user != NULL);
 	i_assert(!client->destroyed);
@@ -303,7 +306,7 @@ int managesieve_proxy_new(struct manages
 	}
 
 	client->proxy = login_proxy_new(&client->common, host, port,
-					proxy_input, client);
+					ssl_flags, proxy_input, client);
 	if (client->proxy == NULL)
 		return -1;
 
diff -up dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/managesieve-proxy.h.trimrc5 dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/managesieve-proxy.h
--- dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/managesieve-proxy.h.trimrc5	2009-01-15 20:53:27.000000000 +0100
+++ dovecot-1.2.rc5/dovecot-1.2-managesieve-0.11.4/src/managesieve-login/managesieve-proxy.h	2009-06-18 08:29:16.298374310 +0200
@@ -7,6 +7,6 @@
 #include "login-proxy.h"
 
 int managesieve_proxy_new(struct managesieve_client *client, const char *host,
-		   unsigned int port, const char *user, const char *password);
+		   unsigned int port, const char *user, const char *password, enum login_proxy_ssl_flags ssl_flags);
 
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	20 Apr 2009 07:48:01 -0000	1.53
+++ .cvsignore	18 Jun 2009 07:45:57 -0000	1.54
@@ -1,4 +1,4 @@
+dovecot-1.2.rc5.tar.gz
 dovecot-1.2-managesieve-0.11.4.tar.gz
-dovecot-1.2.rc3.tar.gz
-dovecot-1.2.rc3-managesieve-0.11.4.diff.gz
+dovecot-1.2.rc3.trim-managesieve-0.11.4.diff.gz
 dovecot-sieve-1.1.6.tar.gz

dovecot-1.1-default-settings.patch:

Index: dovecot-1.1-default-settings.patch
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot-1.1-default-settings.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dovecot-1.1-default-settings.patch	6 Apr 2009 08:55:28 -0000	1.6
+++ dovecot-1.1-default-settings.patch	18 Jun 2009 07:45:57 -0000	1.7
@@ -1,14 +1,15 @@
-diff -up dovecot-1.2.rc2/dovecot-example.conf.default-settings dovecot-1.2.rc2/dovecot-example.conf
---- dovecot-1.2.rc2/dovecot-example.conf.default-settings	2009-04-06 10:45:53.519651253 +0200
-+++ dovecot-1.2.rc2/dovecot-example.conf	2009-04-06 10:45:53.525647967 +0200
-@@ -10,17 +10,14 @@
+diff -up dovecot-1.2.rc5/dovecot-example.conf.default-settings dovecot-1.2.rc5/dovecot-example.conf
+--- dovecot-1.2.rc5/dovecot-example.conf.default-settings	2009-06-18 07:57:44.749562312 +0200
++++ dovecot-1.2.rc5/dovecot-example.conf	2009-06-18 07:59:15.923499117 +0200
+@@ -10,18 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
  # Default values are shown for each setting, it's not required to uncomment
--# any of the lines. Exception to this are paths, they're just examples with
--# the real defaults being based on configure options. The paths listed here
--# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
--# --with-ssldir=/etc/ssl
+-# those. These are exceptions to this though: No sections (e.g. namespace {})
+-# or plugin settings are added by default, they're listed only as examples.
+-# Paths are also just examples with the real defaults being based on configure
+-# options. The paths listed here are for configure --prefix=/usr
+-# --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl
 +# any of the lines.
  
  # Base directory where to store runtime data.
@@ -21,7 +22,7 @@ diff -up dovecot-1.2.rc2/dovecot-example
  
  # A space separated list of IP or host addresses where to listen in for
  # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-@@ -42,13 +39,13 @@
+@@ -43,13 +39,13 @@
  #     listen = *:12000
  #     ..
  #   }
@@ -37,7 +38,7 @@ diff -up dovecot-1.2.rc2/dovecot-example
  
  # Should all IMAP and POP3 processes be killed when Dovecot master process
  # shuts down. Setting this to "no" means that Dovecot can be upgraded without
-@@ -95,8 +92,8 @@
+@@ -96,8 +92,8 @@
  # dropping root privileges, so keep the key file unreadable by anyone but
  # root. Included doc/mkcert.sh can be used to easily generate self-signed
  # certificate, just make sure to update the domains in dovecot-openssl.cnf
@@ -48,7 +49,7 @@ diff -up dovecot-1.2.rc2/dovecot-example
  
  # If key file is password protected, give the password here. Alternatively
  # give it when starting dovecot with -p parameter. Since this file is often
-@@ -485,7 +482,7 @@
+@@ -486,7 +482,7 @@
  # locking methods as well. Some operating systems don't allow using some of
  # them simultaneously.
  #mbox_read_locks = fcntl
@@ -57,9 +58,9 @@ diff -up dovecot-1.2.rc2/dovecot-example
  
  # Maximum time in seconds to wait for lock (all of them) before aborting.
  #mbox_lock_timeout = 300
-diff -up dovecot-1.2.rc2/src/master/master-settings.c.default-settings dovecot-1.2.rc2/src/master/master-settings.c
---- dovecot-1.2.rc2/src/master/master-settings.c.default-settings	2009-04-06 10:45:53.523648309 +0200
-+++ dovecot-1.2.rc2/src/master/master-settings.c	2009-04-06 10:48:05.630586332 +0200
+diff -up dovecot-1.2.rc5/src/master/master-settings.c.default-settings dovecot-1.2.rc5/src/master/master-settings.c
+--- dovecot-1.2.rc5/src/master/master-settings.c.default-settings	2009-06-18 07:57:44.764499091 +0200
++++ dovecot-1.2.rc5/src/master/master-settings.c	2009-06-18 07:57:44.774499405 +0200
 @@ -178,8 +178,8 @@ struct settings default_settings = {
  	MEMBER(syslog_facility) "mail",
  


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- dovecot.spec	20 Apr 2009 07:48:01 -0000	1.126
+++ dovecot.spec	18 Jun 2009 07:45:58 -0000	1.127
@@ -2,7 +2,7 @@ Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
 Version: 1.2
-%define betaver rc3
+%define betaver rc5
 Release: 0.%{betaver}.1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
@@ -32,12 +32,13 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{version}.%{betaver}-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{version}.rc3.trim-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
+Patch4: dovecot-managesieve-trim-rc3-to-rc5.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel
@@ -180,6 +181,8 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 %setup -q -n %{name}-%{version}.%{betaver} -D -T -a 10
 %endif
 
+%patch4 -p1 -b .trimrc5
+
 %build
 rm -f ./"configure"
 autoreconf -i -f
@@ -429,6 +432,9 @@ fi
 
 
 %changelog
+* Mon Jun 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc5.1
+- updated to 1.2.rc5
+
 * Mon Apr 20 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc3.1
 - updated to 1.2.rc3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	20 Apr 2009 07:48:01 -0000	1.56
+++ sources	18 Jun 2009 07:45:58 -0000	1.57
@@ -1,4 +1,4 @@
+13bbc5579e81070e9713c154bebc05f9  dovecot-1.2.rc5.tar.gz
 66ce5ff7faff318a943a1b62b765c127  dovecot-1.2-managesieve-0.11.4.tar.gz
-5ef845d0c137a6fd4cca8453073cd6b4  dovecot-1.2.rc3.tar.gz
-50e849383089b4abb2718e8aa004f3be  dovecot-1.2.rc3-managesieve-0.11.4.diff.gz
+9f5e68c9f3c4b9b5a0949ebd41215eaf  dovecot-1.2.rc3.trim-managesieve-0.11.4.diff.gz
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz

More information about the fedora-extras-commits mailing list