From 5bcda47c8d5f41f6a8c0d285a847eb19ec51a17e Mon Sep 17 00:00:00 2001 From: prockai Date: Thu, 8 Jun 2006 10:10:05 +0000 Subject: [PATCH] - put back pop3_uidl_format default that got lost in the beta2->beta7 upgrade (would cause pop3 to not work at all in many situations) --- dovecot-1.0.beta8-default-settings.patch | 109 +++++++++++++++++++++++ dovecot.spec | 9 +- 2 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 dovecot-1.0.beta8-default-settings.patch diff --git a/dovecot-1.0.beta8-default-settings.patch b/dovecot-1.0.beta8-default-settings.patch new file mode 100644 index 0000000..591702c --- /dev/null +++ b/dovecot-1.0.beta8-default-settings.patch @@ -0,0 +1,109 @@ +--- dovecot-1.0.beta8/src/master/master-settings.c.default-settings 2006-04-25 04:00:07.000000000 +0200 ++++ dovecot-1.0.beta8/src/master/master-settings.c 2006-06-08 11:56:28.000000000 +0200 +@@ -266,8 +266,8 @@ + MEMBER(syslog_facility) "mail", + + /* general */ +- MEMBER(protocols) "imap imaps", +- MEMBER(listen) "*", ++ MEMBER(protocols) "imap imaps pop3 pop3s", ++ MEMBER(listen) "[::]", + MEMBER(ssl_listen) NULL, + + MEMBER(ssl_disable) FALSE, +@@ -278,7 +278,7 @@ + MEMBER(ssl_parameters_regenerate) 168, + MEMBER(ssl_cipher_list) NULL, + MEMBER(ssl_verify_client_cert) FALSE, +- MEMBER(disable_plaintext_auth) TRUE, ++ MEMBER(disable_plaintext_auth) FALSE, + MEMBER(verbose_ssl) FALSE, + MEMBER(shutdown_clients) TRUE, + MEMBER(nfs_check) TRUE, +@@ -332,7 +332,7 @@ + MEMBER(maildir_stat_dirs) FALSE, + MEMBER(maildir_copy_with_hardlinks) FALSE, + MEMBER(mbox_read_locks) "fcntl", +- MEMBER(mbox_write_locks) "dotlock fcntl", ++ MEMBER(mbox_write_locks) "fcntl", + MEMBER(mbox_lock_timeout) 300, + MEMBER(mbox_dotlock_change_timeout) 120, + MEMBER(mbox_min_index_size) 0, +@@ -361,7 +361,7 @@ + MEMBER(pop3_enable_last) FALSE, + MEMBER(pop3_reuse_xuidl) FALSE, + MEMBER(pop3_lock_session) FALSE, +- MEMBER(pop3_uidl_format) NULL, ++ MEMBER(pop3_uidl_format) "%08Xu%08Xv", + MEMBER(pop3_client_workarounds) NULL, + MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s", + +--- dovecot-1.0.beta8/dovecot-example.conf.default-settings 2006-04-21 04:01:27.000000000 +0200 ++++ dovecot-1.0.beta8/dovecot-example.conf 2006-06-08 11:54:24.000000000 +0200 +@@ -7,17 +7,14 @@ + # value inside quotes, eg.: key = "# char and trailing whitespace " + + # Default values are shown after each value, it's not required to uncomment +-# any of the lines. Exception to this are paths, they're just examples +-# with 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. + #base_dir = /var/run/dovecot/ + + # Protocols we want to be serving: + # imap imaps pop3 pop3s +-#protocols = imap imaps ++#protocols = imap imaps pop3 pop3s + + # IP or host address where to listen in for connections. It's not currently + # possible to specify multiple addresses. "*" listens in all IPv4 interfaces. +@@ -36,7 +33,7 @@ + # listen = *:10100 + # .. + # } +-#listen = * ++#listen = [::] + + # IP or host address where to listen in for SSL connections. Defaults + # to above if not specified. +@@ -49,8 +46,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 +-#ssl_cert_file = /etc/ssl/certs/dovecot.pem +-#ssl_key_file = /etc/ssl/private/dovecot.pem ++#ssl_cert_file = /etc/pki/dovecot/certs/dovecot.pem ++#ssl_key_file = /etc/pki/dovecot/private/dovecot.pem + + # If key file is password protected, give the password here. Alternatively + # give it when starting dovecot with -p parameter. +@@ -74,7 +71,7 @@ + # SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and + # IPv6 ::1 addresses are considered secure, this setting has no effect if + # you connect from those addresses. +-#disable_plaintext_auth = yes ++#disable_plaintext_auth = no + + # 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 +@@ -371,7 +368,7 @@ + # locking methods as well. Some operating systems don't allow using some of + # them simultaneously. + #mbox_read_locks = fcntl +-#mbox_write_locks = dotlock fcntl ++#mbox_write_locks = fcntl + + # Maximum time in seconds to wait for lock (all of them) before aborting. + #mbox_lock_timeout = 300 +@@ -547,7 +544,7 @@ + # installations. %08Xu%08Xv will be the new default, so use it for new + # installations. + # +- #pop3_uidl_format = ++ #pop3_uidl_format = %08Xu%08Xv + + # POP3 logout format string: + # %t - number of TOP commands diff --git a/dovecot.spec b/dovecot.spec index ceeeb93..e3af7a5 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -1,7 +1,7 @@ Summary: Dovecot Secure imap server Name: dovecot Version: 1.0 -Release: 0.beta8.1 +Release: 0.beta8.2 License: LGPL Group: System Environment/Daemons @@ -17,7 +17,7 @@ Source4: migrate-folders Source5: migrate-users Source6: perfect_maildir.pl Source7: dovecot-REDHAT-FAQ.txt -Patch100: dovecot-1.0.beta7-default-settings.patch +Patch100: dovecot-1.0.beta8-default-settings.patch Patch101: dovecot-1.0.beta2-pam-tty.patch Patch102: dovecot-1.0.beta2-pam-setcred.patch Patch103: dovecot-1.0.beta2-mkcert-permissions.patch @@ -212,6 +212,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 08 2006 Petr Rockai - 1.0-0.beta8.2 +- put back pop3_uidl_format default that got lost + in the beta2->beta7 upgrade (would cause pop3 to not work + at all in many situations) + * Thu May 04 2006 Petr Rockai - 1.0-0.beta8.1 - upgrade to latest upstream beta release (beta8) - contains a security fix in mbox handling