rpms/dovecot/F-11 dovecot-1.2.6-greetings.patch, NONE, 1.1 .cvsignore, 1.68, 1.69 dovecot.spec, 1.144, 1.145 sources, 1.71, 1.72
Michal Hlavinka
mhlavink at fedoraproject.org
Wed Oct 21 10:42:44 UTC 2009
Author: mhlavink
Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28102
Modified Files:
.cvsignore dovecot.spec sources
Added Files:
dovecot-1.2.6-greetings.patch
Log Message:
- imap-login: If imap_capability is set, show it in the banner
instead of the default (#524485)
- update sieve to 0.1.13
dovecot-1.2.6-greetings.patch:
imap-login/client.c | 7 ++++---
login-common/common.h | 2 +-
login-common/main.c | 7 +++++--
login-common/ssl-proxy-openssl.c | 4 ++++
master/login-process.c | 2 ++
5 files changed, 16 insertions(+), 6 deletions(-)
--- NEW FILE dovecot-1.2.6-greetings.patch ---
diff -up dovecot-1.2.6/src/imap-login/client.c.greetings dovecot-1.2.6/src/imap-login/client.c
--- dovecot-1.2.6/src/imap-login/client.c.greetings 2009-10-05 20:10:44.000000000 +0200
+++ dovecot-1.2.6/src/imap-login/client.c 2009-10-21 12:20:03.995249615 +0200
@@ -93,11 +93,12 @@ bool client_skip_line(struct imap_client
static const char *get_capability(struct imap_client *client, bool full)
{
- const char *auths;
+ const char *auths, *cap_str;
+ cap_str = full || capability_string_overridden ? capability_string :
+ CAPABILITY_BANNER_STRING;
auths = client_authenticate_get_capabilities(client->common.secured);
- return t_strconcat(full ? capability_string : CAPABILITY_BANNER_STRING,
- (ssl_initialized && !client->common.tls) ?
+ return t_strconcat(cap_str, (ssl_initialized && !client->common.tls) ?
" STARTTLS" : "",
disable_plaintext_auth && !client->common.secured ?
" LOGINDISABLED" : "", auths, NULL);
diff -up dovecot-1.2.6/src/login-common/common.h.greetings dovecot-1.2.6/src/login-common/common.h
--- dovecot-1.2.6/src/login-common/common.h.greetings 2009-01-15 21:27:26.000000000 +0100
+++ dovecot-1.2.6/src/login-common/common.h 2009-10-21 12:20:03.996248613 +0200
@@ -23,7 +23,7 @@ extern const char *trusted_networks;
extern unsigned int max_connections;
extern unsigned int login_process_uid;
extern struct auth_client *auth_client;
-extern bool closing_down;
+extern bool closing_down, capability_string_overridden;
void main_ref(void);
void main_unref(void);
diff -up dovecot-1.2.6/src/login-common/main.c.greetings dovecot-1.2.6/src/login-common/main.c
--- dovecot-1.2.6/src/login-common/main.c.greetings 2009-08-12 20:03:16.000000000 +0200
+++ dovecot-1.2.6/src/login-common/main.c 2009-10-21 12:20:03.996248613 +0200
@@ -28,7 +28,7 @@ const char *trusted_networks;
unsigned int max_connections;
unsigned int login_process_uid;
struct auth_client *auth_client;
-bool closing_down;
+bool closing_down, capability_string_overridden;
static const char *process_name;
static struct ioloop *ioloop;
@@ -354,8 +354,11 @@ static void main_init(void)
/* capability default is set in imap/pop3-login */
value = getenv("CAPABILITY_STRING");
- if (value != NULL && *value != '\0')
+ if (value != NULL && *value != '\0') {
capability_string = value;
+ if (getenv("CAPABILITY_STRING_OVERRIDDEN") != NULL)
+ capability_string_overridden = TRUE;
+ }
closing_down = FALSE;
main_refcount = 0;
diff -up dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c.greetings dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c
--- dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c.greetings 2009-09-29 16:14:15.000000000 +0200
+++ dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c 2009-10-21 12:20:04.000248772 +0200
@@ -715,6 +715,7 @@ static DH *ssl_tmp_dh_callback(SSL *ssl
return ssl_params.dh_1024;
}
+#ifdef HAVE_SSL_CTX_SET_INFO_CALLBACK
static void ssl_info_callback(const SSL *ssl, int where, int ret)
{
struct ssl_proxy *proxy;
@@ -732,6 +733,7 @@ static void ssl_info_callback(const SSL
net_ip2addr(&proxy->ip));
}
}
+#endif
static int ssl_verify_client_cert(int preverify_ok, X509_STORE_CTX *ctx)
{
@@ -814,8 +816,10 @@ static void ssl_proxy_ctx_init(SSL_CTX *
cafile, ssl_last_error());
}
}
+#ifdef HAVE_SSL_CTX_SET_INFO_CALLBACK
if (verbose_ssl)
SSL_CTX_set_info_callback(ssl_ctx, ssl_info_callback);
+#endif
if (SSL_CTX_need_tmp_RSA(ssl_ctx))
SSL_CTX_set_tmp_rsa_callback(ssl_ctx, ssl_gen_rsa_key);
SSL_CTX_set_tmp_dh_callback(ssl_ctx, ssl_tmp_dh_callback);
diff -up dovecot-1.2.6/src/master/login-process.c.greetings dovecot-1.2.6/src/master/login-process.c
--- dovecot-1.2.6/src/master/login-process.c.greetings 2009-10-21 12:20:03.965978906 +0200
+++ dovecot-1.2.6/src/master/login-process.c 2009-10-21 12:23:04.696873716 +0200
@@ -635,6 +635,8 @@ static void login_process_init_env(struc
*set->imap_capability != '\0' ?
set->imap_capability :
set->imap_generated_capability, NULL));
+ if (*set->imap_capability != '\0')
+ env_put("CAPABILITY_STRING_OVERRIDDEN=1");
} else if (group->mail_process_type == PROCESS_TYPE_MANAGESIEVE) {
env_put(t_strconcat("CAPABILITY_STRING=",
set->managesieve_generated_capability, NULL));
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore 9 Oct 2009 19:04:46 -0000 1.68
+++ .cvsignore 21 Oct 2009 10:42:44 -0000 1.69
@@ -1,4 +1,4 @@
dovecot-1.2.6.tar.gz
dovecot-1.2-managesieve-0.11.9.tar.gz
dovecot-1.2.6-managesieve-0.11.9.diff.gz
-dovecot-1.2-sieve-0.1.12.tar.gz
+dovecot-1.2-sieve-0.1.13.tar.gz
Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- dovecot.spec 9 Oct 2009 19:04:46 -0000 1.144
+++ dovecot.spec 21 Oct 2009 10:42:44 -0000 1.145
@@ -2,8 +2,9 @@ Summary: Secure imap and pop3 server
Name: dovecot
Epoch: 1
Version: 1.2.6
-Release: 2%{?dist}
-License: MIT and LGPLv2 and BSD with advertising
+Release: 3%{?dist}
+#dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+
+License: MIT and LGPLv2 and GPLv2+
Group: System Environment/Daemons
%define build_postgres 1
@@ -14,7 +15,8 @@ Group: System Environment/Daemons
%define build_sieve 1
%define build_managesieve 1
-%define sieve_version 0.1.12
+%define ver4mansieve %{version}
+%define sieve_version 0.1.13
%define sieve_name dovecot-1.2-sieve
%define managesieve_version 0.11.9
%define managesieve_name dovecot-1.2-managesieve
@@ -31,13 +33,16 @@ Source7: dovecot-REDHAT-FAQ.txt
Source8: http://www.rename-it.nl/dovecot/1.2/%{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-1.2.6-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{ver4mansieve}-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
+# taken from upstream, for dovecot <= 1.2.6 use imap_capability in greeting message, rhbz#524485
+Patch4: dovecot-1.2.6-greetings.patch
+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, pam-devel, zlib-devel
BuildRequires: libtool autoconf automake
@@ -168,6 +173,7 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
%patch1 -p1 -b .default-settings
%patch2 -p1 -b .mkcert-permissions
%patch3 -p1 -b .mkcert-paths
+%patch4 -p1 -b .greetings
%if %{build_sieve}
%setup -q -D -T -a 8
@@ -434,6 +440,27 @@ fi
%changelog
+* Wed Oct 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-3
+- imap-login: If imap_capability is set, show it in the banner
+ instead of the default (#524485)
+- sieve updated to 0.1.13 which brings these changes:
+- Body extension: implemented proper handling of the :raw transform
+ and added various new tests to the test suite. However, :content
+ "multipart" and :content "message/rfc822" are still not working.
+- Fixed race condition occuring when multiple instances are saving the
+ same binary (patch by Timo Sirainen).
+- Body extension: don't give SKIP_BODY_BLOCK flag to message parser,
+ we want the body!
+- Fixed bugs in multiscript support; subsequent keep actions were not
+ always merged correctly and implicit side effects were not always
+ handled correctly.
+- Fixed a segfault bug in the sieve-test tool occuring when compile
+ fails.
+- Fixed segfault bug in action procesing. It was triggered while
+ merging side effects in duplicate actions.
+- Fixed bug in the Sieve plugin that caused it to try to stat() a NULL
+ path, yielding a 'Bad address' error.
+
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
- fix init script for case when no action was specified
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources 9 Oct 2009 19:04:46 -0000 1.71
+++ sources 21 Oct 2009 10:42:44 -0000 1.72
@@ -1,4 +1,4 @@
807666f1a112e7379c4dbb57c9ce4899 dovecot-1.2.6.tar.gz
923d4965e0b357db493f3b2cb106d8d7 dovecot-1.2-managesieve-0.11.9.tar.gz
615d5d1ad843654384ca11cf523c2bbc dovecot-1.2.6-managesieve-0.11.9.diff.gz
-8749f26606c4563f0676bacc44e89ca2 dovecot-1.2-sieve-0.1.12.tar.gz
+6151ab50e24abc0384358b1618c8048f dovecot-1.2-sieve-0.1.13.tar.gz
More information about the fedora-extras-commits
mailing list