- update to latest upstream beta
- don't build dovecot-sieve, it's only for 1.0 Removed unused patches.
This commit is contained in:
Tomas Janousek
parent
9012a4c479
commit
086ecbdf4a
@ -1,4 +1,4 @@
|
||||
dovecot-1.0.2.tar.gz
|
||||
dovecot-1.0.2.tar.gz.sig
|
||||
dovecot-1.1.alpha1.tar.gz
|
||||
dovecot-1.1.alpha1.tar.gz.sig
|
||||
dovecot-sieve-1.0.1.tar.gz
|
||||
dovecot-sieve-1.0.1.tar.gz.sig
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
This fixes bug #133618, it should be fixed in dovecot 1.0 so don't apply
|
||||
this patch to 1.0 or greater
|
||||
|
||||
diff -u -r dovecot-0.99.11.orig/configure dovecot-0.99.11/configure
|
||||
--- dovecot-0.99.11.orig/configure 2004-09-04 05:20:26.000000000 -0400
|
||||
+++ dovecot-0.99.11/configure 2005-01-06 12:20:30.000000000 -0500
|
||||
@@ -28933,7 +28933,7 @@
|
||||
|
||||
|
||||
|
||||
-capability="IMAP4rev1 SORT THREAD=REFERENCES MULTIAPPEND UNSELECT LITERAL+ IDLE CHILDREN LISTEXT LIST-SUBSCRIBED NAMESPACE"
|
||||
+capability="IMAP4rev1 SORT THREAD=REFERENCES MULTIAPPEND UNSELECT IDLE CHILDREN LISTEXT LIST-SUBSCRIBED NAMESPACE"
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define CAPABILITY_STRING "$capability"
|
||||
diff -u -r dovecot-0.99.11.orig/configure.in dovecot-0.99.11/configure.in
|
||||
--- dovecot-0.99.11.orig/configure.in 2004-09-04 05:20:19.000000000 -0400
|
||||
+++ dovecot-0.99.11/configure.in 2005-01-06 12:20:09.000000000 -0500
|
||||
@@ -1141,7 +1148,7 @@
|
||||
dnl ** capabilities
|
||||
dnl **
|
||||
|
||||
-capability="IMAP4rev1 SORT THREAD=REFERENCES MULTIAPPEND UNSELECT LITERAL+ IDLE CHILDREN LISTEXT LIST-SUBSCRIBED NAMESPACE"
|
||||
+capability="IMAP4rev1 SORT THREAD=REFERENCES MULTIAPPEND UNSELECT IDLE CHILDREN LISTEXT LIST-SUBSCRIBED NAMESPACE"
|
||||
AC_DEFINE_UNQUOTED(CAPABILITY_STRING, "$capability", IMAP capabilities)
|
||||
|
||||
CFLAGS="$CFLAGS $EXTRA_CFLAGS"
|
||||
@ -1,61 +0,0 @@
|
||||
--- dovecot-0.99.11/dovecot-example.conf.orig 2004-08-28 08:26:10.000000000 -0400
|
||||
+++ dovecot-0.99.11/dovecot-example.conf 2004-09-30 16:43:55.000000000 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
# 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
|
||||
+# --with-ssldir=/etc/pki/dovecot
|
||||
|
||||
# Base directory where to store runtime data.
|
||||
#base_dir = /var/run/dovecot/
|
||||
@@ -18,8 +18,8 @@
|
||||
# "[::]" listens in all IPv6 interfaces, but may also listen in all IPv4
|
||||
# interfaces depending on the operating system. You can specify ports with
|
||||
# "host:port".
|
||||
-#imap_listen = *
|
||||
-#pop3_listen = *
|
||||
+imap_listen = [::]
|
||||
+pop3_listen = [::]
|
||||
|
||||
# IP or host address where to listen in for SSL connections. Defaults
|
||||
# to above non-SSL equilevants if not specified.
|
||||
@@ -33,8 +33,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/dovecot.pem
|
||||
+#ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
|
||||
|
||||
# SSL parameter file. Master process generates this file for login processes.
|
||||
# It contains Diffie Hellman and RSA parameters.
|
||||
@@ -70,7 +70,7 @@
|
||||
# which login needs to be able to connect to. The sockets are created when
|
||||
# running as root, so you don't have to worry about permissions. Note that
|
||||
# everything in this directory is deleted when Dovecot is started.
|
||||
-#login_dir = /var/run/dovecot/login
|
||||
+login_dir = /var/run/dovecot-login
|
||||
|
||||
# chroot login process to the login_dir. Only reason not to do this is if you
|
||||
# wish to run the whole Dovecot without roots.
|
||||
@@ -305,7 +305,7 @@
|
||||
# with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl
|
||||
# and flock. Some operating systems don't allow using both of them
|
||||
# simultaneously, eg. BSDs. If dotlock is used, it's always created first.
|
||||
-#mbox_locks = dotlock fcntl
|
||||
+mbox_locks = fcntl
|
||||
|
||||
# Should we create dotlock file even when we want only a read-lock? Setting
|
||||
# this to yes hurts the performance when the mailbox is accessed simultaneously
|
||||
@@ -431,7 +431,8 @@
|
||||
# vpopmail: vpopmail authentication
|
||||
# ldap <config path>: LDAP, see doc/dovecot-ldap.conf
|
||||
# pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
|
||||
-auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
|
||||
+#auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
|
||||
+auth_passdb = pam
|
||||
|
||||
#auth_executable = /usr/libexec/dovecot/dovecot-auth
|
||||
|
||||
@ -1,109 +0,0 @@
|
||||
--- ./dovecot-1.0.beta2/src/master/master-settings.c.default-settings 2006-02-02 12:28:54.000000000 +0100
|
||||
+++ ./dovecot-1.0.beta2/src/master/master-settings.c 2006-02-02 12:33:06.000000000 +0100
|
||||
@@ -254,8 +254,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,
|
||||
@@ -266,7 +266,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,
|
||||
|
||||
/* login */
|
||||
@@ -318,7 +318,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) 30,
|
||||
MEMBER(mbox_min_index_size) 0,
|
||||
@@ -346,7 +346,7 @@
|
||||
MEMBER(pop3_no_flag_updates) FALSE,
|
||||
MEMBER(pop3_enable_last) FALSE,
|
||||
MEMBER(pop3_reuse_xuidl) FALSE,
|
||||
- MEMBER(pop3_uidl_format) NULL,
|
||||
+ MEMBER(pop3_uidl_format) "%08Xu%08Xv",
|
||||
MEMBER(pop3_client_workarounds) NULL,
|
||||
MEMBER(pop3_logout_format) "top=%t/%T, retr=%r/%R, del=%d/%m, size=%s",
|
||||
|
||||
--- ./dovecot-1.0.beta2/dovecot-example.conf.default-settings 2006-02-02 12:31:10.000000000 +0100
|
||||
+++ ./dovecot-1.0.beta2/dovecot-example.conf 2006-02-02 12:32:50.000000000 +0100
|
||||
@@ -5,17 +5,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.
|
||||
@@ -24,7 +21,7 @@
|
||||
# for each service, you will need to configure these settings inside the
|
||||
# protocol imap/pop3 { ... } section, so you can specify different ports
|
||||
# for IMAP/POP3.
|
||||
-#listen = *
|
||||
+#listen = [::]
|
||||
|
||||
# IP or host address where to listen in for SSL connections. Defaults
|
||||
# to above if not specified.
|
||||
@@ -37,8 +34,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.
|
||||
@@ -62,7 +59,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
|
||||
|
||||
# Use this logfile instead of syslog(). /dev/stderr can be used if you want to
|
||||
# use stderr for logging (ONLY /dev/stderr - otherwise it is closed).
|
||||
@@ -352,7 +349,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
|
||||
@@ -521,7 +518,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
|
||||
@ -1,44 +0,0 @@
|
||||
--- dovecot-1.0.beta2/configure.in.lib64 2006-03-01 15:21:21.000000000 +0100
|
||||
+++ dovecot-1.0.beta2/configure.in 2006-03-01 15:23:13.000000000 +0100
|
||||
@@ -1354,11 +1354,11 @@
|
||||
PGSQL_INCLUDE=$i/$j
|
||||
fi
|
||||
done
|
||||
- for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
|
||||
+ for lib in lib64 lib; do for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
|
||||
if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
|
||||
PGSQL_LIBDIR=$i/$j
|
||||
fi
|
||||
- done
|
||||
+ done; done
|
||||
done
|
||||
|
||||
old_LIBS=$LIBS
|
||||
@@ -1397,11 +1397,11 @@
|
||||
MYSQL_INCLUDE=$i/$j
|
||||
fi
|
||||
done
|
||||
- for j in lib lib/mysql ""; do
|
||||
+ for lib in lib64 lib; do for j in $lib $lib/mysql ""; do
|
||||
if test -f "$i/$j/libmysqlclient.so" || test -f "$i/$j/libmysqlclient.a"; then
|
||||
MYSQL_LIBDIR=$i/$j
|
||||
fi
|
||||
- done
|
||||
+ done; done
|
||||
done
|
||||
|
||||
old_LIBS=$LIBS
|
||||
@@ -1465,11 +1465,11 @@
|
||||
MYSQL_INCLUDE=$i/$j
|
||||
fi
|
||||
done
|
||||
- for j in lib lib/sqlite3 ""; do
|
||||
+ for lib in lib64 lib; do for j in $lib $lib/sqlite3 ""; do
|
||||
if test -f "$i/$j/libsqlite3.so" || test -f "$i/$j/libsqlite3.a"; then
|
||||
MYSQL_LIBDIR=$i/$j
|
||||
fi
|
||||
- done
|
||||
+ done; done
|
||||
done
|
||||
|
||||
old_LIBS=$LIBS
|
||||
@ -1,43 +0,0 @@
|
||||
--- ./dovecot-1.0.beta2/src/auth/passdb-pam.c.pam-setcred 2006-01-30 11:04:01.000000000 +0100
|
||||
+++ ./dovecot-1.0.beta2/src/auth/passdb-pam.c 2006-01-30 11:05:39.000000000 +0100
|
||||
@@ -185,14 +185,39 @@
|
||||
pam_strerror(pamh, status));
|
||||
return status;
|
||||
}
|
||||
-
|
||||
#ifdef HAVE_PAM_SETCRED
|
||||
+
|
||||
+#if 0
|
||||
+/*
|
||||
+ * This is to fix a bug where dovecot was leaving a lot of temporary
|
||||
+ * kerberos tickets around and filling up disk space. If
|
||||
+ * pam_setcred(pamh, PAM_ESTABLISH_CRED) is called, which creates the
|
||||
+ * ticket, then a matching pam_setcred(pamh, PAM_DELETE_CRED) also
|
||||
+ * needs to be called to clean the ticket up. But the only reason to
|
||||
+ * have a cached ticket on disk is if the service is going to perform
|
||||
+ * some action during the session that requires access to the ticket
|
||||
+ * for validation. This implies the pam session is being held open,
|
||||
+ * which would be more typical pam usage. But the usage here is to
|
||||
+ * close the pam session immediately after authenticating the user
|
||||
+ * with pam_end, thus there is no benefit to creating the disk copy of
|
||||
+ * the ticket. So rather than finding all the early returns before
|
||||
+ * pam_end is invoked and adding pam_setcred(pamh, PAM_DELETE_CRED) to
|
||||
+ * each it is more sensible to not create the ticket in the first
|
||||
+ * place if we're not going to use it and thus not have to worry about
|
||||
+ * the clean up. Note the way the code is currently structured, with
|
||||
+ * an immediate call to pam_end() after authentication it implies the
|
||||
+ * code probably won't work with a file system like AFS which uses the
|
||||
+ * ticket for file system permissions, but restructuring the code for
|
||||
+ * this case is beyond the needs of fixing the aforementioned bug.
|
||||
+ * John Dennis <jdennis@redhat.com>
|
||||
+ */
|
||||
if ((status = pam_setcred(pamh, PAM_ESTABLISH_CRED)) != PAM_SUCCESS) {
|
||||
*error = t_strdup_printf("pam_setcred() failed: %s",
|
||||
pam_strerror(pamh, status));
|
||||
return status;
|
||||
}
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
if ((status = pam_acct_mgmt(pamh, 0)) != PAM_SUCCESS) {
|
||||
*error = t_strdup_printf("pam_acct_mgmt() failed: %s",
|
||||
@ -1,13 +0,0 @@
|
||||
--- ./dovecot-1.0.beta2/src/auth/passdb-pam.c.pam-tty 2006-01-30 11:02:05.000000000 +0100
|
||||
+++ ./dovecot-1.0.beta2/src/auth/passdb-pam.c 2006-01-30 11:03:08.000000000 +0100
|
||||
@@ -256,6 +256,10 @@
|
||||
if (host != NULL)
|
||||
pam_set_item(pamh, PAM_RHOST, host);
|
||||
|
||||
+ /* fix bug 149673, need dummy TTY for pam_access,
|
||||
+ FIXME: should we check and report an error for PAM_TTY? */
|
||||
+ pam_set_item(pamh, PAM_TTY, "dovecot");
|
||||
+
|
||||
status = pam_auth(request, pamh, &str);
|
||||
if ((status2 = pam_end(pamh, status)) == PAM_SUCCESS) {
|
||||
/* FIXME: check for PASSDB_RESULT_UNKNOWN_USER
|
||||
@ -1,17 +0,0 @@
|
||||
--- dovecot-1.0.beta2/configure.in.sqlite-check 2006-03-06 12:05:24.000000000 +0100
|
||||
+++ dovecot-1.0.beta2/configure.in 2006-03-06 12:04:35.000000000 +0100
|
||||
@@ -1462,12 +1462,12 @@
|
||||
for i in /usr /usr/local /usr/local; do
|
||||
for j in include ""; do
|
||||
if test -r "$i/$j/sqlite3.h"; then
|
||||
- MYSQL_INCLUDE=$i/$j
|
||||
+ SQLITE_INCLUDE=$i/$j
|
||||
fi
|
||||
done
|
||||
for lib in lib64 lib; do for j in $lib $lib/sqlite3 ""; do
|
||||
if test -f "$i/$j/libsqlite3.so" || test -f "$i/$j/libsqlite3.a"; then
|
||||
- MYSQL_LIBDIR=$i/$j
|
||||
+ SQLITE_LIBDIR=$i/$j
|
||||
fi
|
||||
done; done
|
||||
done
|
||||
@ -1,100 +0,0 @@
|
||||
--- dovecot-1.0.beta7/src/master/master-settings.c.default-settings 2006-04-12 13:38:42.000000000 +0200
|
||||
+++ dovecot-1.0.beta7/src/master/master-settings.c 2006-05-04 12:48:08.000000000 +0200
|
||||
@@ -261,8 +261,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,
|
||||
@@ -273,7 +273,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,
|
||||
|
||||
@@ -326,7 +326,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,
|
||||
--- dovecot-1.0.beta7/dovecot-example.conf.default-settings 2006-04-12 13:37:30.000000000 +0200
|
||||
+++ dovecot-1.0.beta7/dovecot-example.conf 2006-05-04 12:50:07.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
|
||||
@ -1,109 +0,0 @@
|
||||
--- 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
|
||||
@ -1,106 +0,0 @@
|
||||
--- dovecot-1.0.rc2/src/master/master-settings.c.default-settings 2006-07-02 21:18:13.000000000 +0200
|
||||
+++ dovecot-1.0.rc2/src/master/master-settings.c 2006-07-13 11:53:24.000000000 +0200
|
||||
@@ -267,8 +267,8 @@
|
||||
MEMBER(syslog_facility) "mail",
|
||||
|
||||
/* general */
|
||||
- MEMBER(protocols) "imap imaps",
|
||||
- MEMBER(listen) "*",
|
||||
+ MEMBER(protocols) "imap imaps pop3 pop3s",
|
||||
+ MEMBER(listen) "[::]",
|
||||
MEMBER(ssl_listen) "",
|
||||
|
||||
MEMBER(ssl_disable) FALSE,
|
||||
@@ -279,7 +279,7 @@
|
||||
MEMBER(ssl_parameters_regenerate) 168,
|
||||
MEMBER(ssl_cipher_list) "",
|
||||
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,
|
||||
@@ -333,7 +333,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,
|
||||
@@ -362,7 +362,7 @@
|
||||
MEMBER(pop3_enable_last) FALSE,
|
||||
MEMBER(pop3_reuse_xuidl) FALSE,
|
||||
MEMBER(pop3_lock_session) FALSE,
|
||||
- MEMBER(pop3_uidl_format) "",
|
||||
+ MEMBER(pop3_uidl_format) "%08Xu%08Xv",
|
||||
MEMBER(pop3_client_workarounds) "",
|
||||
MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
|
||||
|
||||
--- dovecot-1.0.rc2/dovecot-example.conf.default-settings 2006-07-01 22:07:32.000000000 +0200
|
||||
+++ dovecot-1.0.rc2/dovecot-example.conf 2006-07-13 11:55:38.000000000 +0200
|
||||
@@ -7,16 +7,13 @@
|
||||
# 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.
|
||||
@@ -35,13 +32,13 @@
|
||||
# listen = *:10100
|
||||
# ..
|
||||
# }
|
||||
-#listen = *
|
||||
+#listen = [::]
|
||||
|
||||
# Disable LOGIN command and all other plaintext authentications unless
|
||||
# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
|
||||
# matches the local IP (ie. you're connecting from the same computer), the
|
||||
# connection is considered secure and plaintext authentication is allowed.
|
||||
-#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
|
||||
@@ -86,8 +83,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.
|
||||
@@ -412,7 +409,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
|
||||
@@ -576,7 +573,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
|
||||
@ -1,106 +0,0 @@
|
||||
--- dovecot-1.0.rc7/src/master/master-settings.c.default-settings 2006-08-10 21:14:55.000000000 +0200
|
||||
+++ dovecot-1.0.rc7/src/master/master-settings.c 2006-09-22 11:31:47.000000000 +0200
|
||||
@@ -268,8 +268,8 @@
|
||||
MEMBER(syslog_facility) "mail",
|
||||
|
||||
/* general */
|
||||
- MEMBER(protocols) "imap imaps",
|
||||
- MEMBER(listen) "*",
|
||||
+ MEMBER(protocols) "imap imaps pop3 pop3s",
|
||||
+ MEMBER(listen) "[::]",
|
||||
MEMBER(ssl_listen) "",
|
||||
|
||||
MEMBER(ssl_disable) FALSE,
|
||||
@@ -280,7 +280,7 @@
|
||||
MEMBER(ssl_parameters_regenerate) 168,
|
||||
MEMBER(ssl_cipher_list) "",
|
||||
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,
|
||||
@@ -335,7 +335,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,
|
||||
@@ -364,7 +364,7 @@
|
||||
MEMBER(pop3_enable_last) FALSE,
|
||||
MEMBER(pop3_reuse_xuidl) FALSE,
|
||||
MEMBER(pop3_lock_session) FALSE,
|
||||
- MEMBER(pop3_uidl_format) "",
|
||||
+ MEMBER(pop3_uidl_format) "%08Xu%08Xv",
|
||||
MEMBER(pop3_client_workarounds) "",
|
||||
MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
|
||||
|
||||
--- dovecot-1.0.rc7/dovecot-example.conf.default-settings 2006-08-10 23:21:05.000000000 +0200
|
||||
+++ dovecot-1.0.rc7/dovecot-example.conf 2006-09-22 11:32:56.000000000 +0200
|
||||
@@ -7,16 +7,13 @@
|
||||
# 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
|
||||
+# 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.
|
||||
@@ -35,13 +32,13 @@
|
||||
# listen = *:10100
|
||||
# ..
|
||||
# }
|
||||
-#listen = *
|
||||
+#listen = [::]
|
||||
|
||||
# Disable LOGIN command and all other plaintext authentications unless
|
||||
# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
|
||||
# matches the local IP (ie. you're connecting from the same computer), the
|
||||
# connection is considered secure and plaintext authentication is allowed.
|
||||
-#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
|
||||
@@ -86,8 +83,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.
|
||||
@@ -412,7 +409,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
|
||||
@@ -576,7 +573,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
|
||||
@ -1,46 +1,6 @@
|
||||
--- dovecot-1.0.rc15/src/master/master-settings.c.default-settings 2006-11-12 18:56:07.000000000 +0100
|
||||
+++ dovecot-1.0.rc15/src/master/master-settings.c 2006-11-21 09:47:40.000000000 +0100
|
||||
@@ -269,8 +269,8 @@
|
||||
MEMBER(syslog_facility) "mail",
|
||||
|
||||
/* general */
|
||||
- MEMBER(protocols) "imap imaps",
|
||||
- MEMBER(listen) "*",
|
||||
+ MEMBER(protocols) "imap imaps pop3 pop3s",
|
||||
+ MEMBER(listen) "[::]",
|
||||
MEMBER(ssl_listen) "",
|
||||
|
||||
MEMBER(ssl_disable) FALSE,
|
||||
@@ -281,7 +281,7 @@
|
||||
MEMBER(ssl_parameters_regenerate) 168,
|
||||
MEMBER(ssl_cipher_list) "",
|
||||
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,
|
||||
@@ -337,7 +337,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,
|
||||
@@ -366,7 +366,7 @@
|
||||
MEMBER(pop3_enable_last) FALSE,
|
||||
MEMBER(pop3_reuse_xuidl) FALSE,
|
||||
MEMBER(pop3_lock_session) FALSE,
|
||||
- MEMBER(pop3_uidl_format) "",
|
||||
+ MEMBER(pop3_uidl_format) "%08Xu%08Xv",
|
||||
MEMBER(pop3_client_workarounds) "",
|
||||
MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
|
||||
|
||||
--- dovecot-1.0.rc15/dovecot-example.conf.default-settings 2006-11-05 18:14:37.000000000 +0100
|
||||
+++ dovecot-1.0.rc15/dovecot-example.conf 2006-11-21 09:49:06.000000000 +0100
|
||||
@@ -7,17 +7,14 @@
|
||||
--- dovecot-1.1.alpha1/dovecot-example.conf.default-settings 2007-07-19 03:49:18.000000000 +0200
|
||||
+++ dovecot-1.1.alpha1/dovecot-example.conf 2007-07-19 10:56:26.000000000 +0200
|
||||
@@ -10,17 +10,14 @@
|
||||
# value inside quotes, eg.: key = "# char and trailing whitespace "
|
||||
|
||||
# Default values are shown for each setting, it's not required to uncomment
|
||||
@ -58,9 +18,9 @@
|
||||
-#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,13 +33,13 @@
|
||||
# A space separated list of IP or host addresses where to listen in for
|
||||
# connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
|
||||
@@ -39,13 +36,13 @@
|
||||
# listen = *:10100
|
||||
# ..
|
||||
# }
|
||||
@ -76,7 +36,7 @@
|
||||
|
||||
# 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
|
||||
@@ -87,8 +84,8 @@
|
||||
@@ -91,8 +88,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
|
||||
@ -87,7 +47,7 @@
|
||||
|
||||
# If key file is password protected, give the password here. Alternatively
|
||||
# give it when starting dovecot with -p parameter.
|
||||
@@ -425,7 +422,7 @@
|
||||
@@ -462,7 +459,7 @@
|
||||
# locking methods as well. Some operating systems don't allow using some of
|
||||
# them simultaneously.
|
||||
#mbox_read_locks = fcntl
|
||||
@ -96,12 +56,34 @@
|
||||
|
||||
# Maximum time in seconds to wait for lock (all of them) before aborting.
|
||||
#mbox_lock_timeout = 300
|
||||
@@ -593,7 +590,7 @@
|
||||
# installations. %08Xu%08Xv will be the new default, so use it for new
|
||||
# installations.
|
||||
#
|
||||
- #pop3_uidl_format =
|
||||
+ #pop3_uidl_format = %08Xu%08Xv
|
||||
--- dovecot-1.1.alpha1/src/master/master-settings.c.default-settings 2007-07-19 03:49:18.000000000 +0200
|
||||
+++ dovecot-1.1.alpha1/src/master/master-settings.c 2007-07-19 10:56:26.000000000 +0200
|
||||
@@ -168,8 +168,8 @@
|
||||
MEMBER(syslog_facility) "mail",
|
||||
|
||||
# POP3 logout format string:
|
||||
# %t - number of TOP commands
|
||||
/* general */
|
||||
- MEMBER(protocols) "imap imaps",
|
||||
- MEMBER(listen) "*",
|
||||
+ MEMBER(protocols) "imap imaps pop3 pop3s",
|
||||
+ MEMBER(listen) "[::]",
|
||||
MEMBER(ssl_listen) "",
|
||||
|
||||
MEMBER(ssl_disable) FALSE,
|
||||
@@ -180,7 +180,7 @@
|
||||
MEMBER(ssl_parameters_regenerate) 168,
|
||||
MEMBER(ssl_cipher_list) "",
|
||||
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,
|
||||
@@ -243,7 +243,7 @@
|
||||
MEMBER(maildir_copy_with_hardlinks) FALSE,
|
||||
MEMBER(maildir_copy_preserve_filename) 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,
|
||||
@ -1,5 +1,5 @@
|
||||
--- dovecot-1.0.rc32/src/dict/main.c.split 2007-02-22 15:32:11.000000000 +0100
|
||||
+++ dovecot-1.0.rc32/src/dict/main.c 2007-04-13 13:56:55.000000000 +0200
|
||||
--- dovecot-1.1.alpha1/src/dict/main.c.split 2007-07-12 03:42:49.000000000 +0200
|
||||
+++ dovecot-1.1.alpha1/src/dict/main.c 2007-07-19 11:03:11.000000000 +0200
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
static struct io *log_io;
|
||||
@ -17,16 +17,16 @@
|
||||
|
||||
restrict_access_by_env(FALSE);
|
||||
}
|
||||
@@ -100,6 +103,7 @@
|
||||
dict_sql_unregister();
|
||||
dict_client_unregister();
|
||||
@@ -98,6 +101,7 @@
|
||||
|
||||
dict_drivers_unregister_all();
|
||||
|
||||
+ module_dir_unload(&sql_modules);
|
||||
sql_drivers_deinit();
|
||||
random_deinit();
|
||||
lib_signals_deinit();
|
||||
--- dovecot-1.0.rc32/src/lib-sql/Makefile.am.split 2007-02-22 22:09:16.000000000 +0100
|
||||
+++ dovecot-1.0.rc32/src/lib-sql/Makefile.am 2007-04-13 15:11:18.000000000 +0200
|
||||
--- dovecot-1.1.alpha1/src/lib-sql/Makefile.am.split 2007-07-12 03:42:50.000000000 +0200
|
||||
+++ dovecot-1.1.alpha1/src/lib-sql/Makefile.am 2007-07-19 11:03:11.000000000 +0200
|
||||
@@ -1,21 +1,66 @@
|
||||
noinst_LIBRARIES = libsql.a
|
||||
|
||||
@ -118,9 +118,9 @@
|
||||
echo '}' >>$@
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(dist_sources) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
--- dovecot-1.0.rc32/src/lib-sql/sql-api.h.split 2006-07-01 19:23:52.000000000 +0200
|
||||
+++ dovecot-1.0.rc32/src/lib-sql/sql-api.h 2007-04-13 13:56:55.000000000 +0200
|
||||
@@ -20,6 +20,8 @@
|
||||
--- dovecot-1.1.alpha1/src/lib-sql/sql-api.h.split 2007-07-12 03:42:50.000000000 +0200
|
||||
+++ dovecot-1.1.alpha1/src/lib-sql/sql-api.h 2007-07-19 11:03:11.000000000 +0200
|
||||
@@ -47,6 +47,8 @@
|
||||
|
||||
/* register all built-in SQL drivers */
|
||||
void sql_drivers_register_all(void);
|
||||
@ -129,8 +129,8 @@
|
||||
|
||||
void sql_driver_register(const struct sql_db *driver);
|
||||
void sql_driver_unregister(const struct sql_db *driver);
|
||||
--- dovecot-1.0.rc32/src/lib-sql/sql-api.c.split 2006-07-01 19:23:52.000000000 +0200
|
||||
+++ dovecot-1.0.rc32/src/lib-sql/sql-api.c 2007-04-13 13:56:55.000000000 +0200
|
||||
--- dovecot-1.1.alpha1/src/lib-sql/sql-api.c.split 2007-07-12 03:42:50.000000000 +0200
|
||||
+++ dovecot-1.1.alpha1/src/lib-sql/sql-api.c 2007-07-19 11:03:11.000000000 +0200
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include "lib.h"
|
||||
@ -138,8 +138,8 @@
|
||||
+#include "module-dir.h"
|
||||
#include "sql-api-private.h"
|
||||
|
||||
array_t ARRAY_DEFINE(sql_drivers, const struct sql_db *);
|
||||
@@ -16,6 +17,12 @@
|
||||
#include <stdlib.h>
|
||||
@@ -18,6 +19,12 @@
|
||||
array_free(&sql_drivers);
|
||||
}
|
||||
|
||||
@ -152,8 +152,8 @@
|
||||
void sql_driver_register(const struct sql_db *driver)
|
||||
{
|
||||
array_append(&sql_drivers, &driver, 1);
|
||||
--- dovecot-1.0.rc32/src/auth/main.c.split 2007-03-15 16:48:13.000000000 +0100
|
||||
+++ dovecot-1.0.rc32/src/auth/main.c 2007-04-13 13:56:55.000000000 +0200
|
||||
--- dovecot-1.1.alpha1/src/auth/main.c.split 2007-07-12 03:42:49.000000000 +0200
|
||||
+++ dovecot-1.1.alpha1/src/auth/main.c 2007-07-19 11:03:11.000000000 +0200
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "sql-api.h"
|
||||
#include "randgen.h"
|
||||
@ -188,11 +188,11 @@
|
||||
sql_drivers_deinit();
|
||||
random_deinit();
|
||||
|
||||
--- dovecot-1.0.rc32/configure.in.split 2007-04-12 19:16:36.000000000 +0200
|
||||
+++ dovecot-1.0.rc32/configure.in 2007-04-13 13:56:55.000000000 +0200
|
||||
@@ -225,6 +225,15 @@
|
||||
fi,
|
||||
want_sqlite=no)
|
||||
--- dovecot-1.1.alpha1/configure.in.split 2007-07-19 05:08:39.000000000 +0200
|
||||
+++ dovecot-1.1.alpha1/configure.in 2007-07-19 11:05:18.000000000 +0200
|
||||
@@ -254,6 +254,15 @@
|
||||
want_lucene=no)
|
||||
AM_CONDITIONAL(BUILD_LUCENE, test "$want_lucene" = "yes")
|
||||
|
||||
+AC_ARG_WITH(dynamic-sql,
|
||||
+[ --with-dynamic-sql Build SQL modules as shared libs],
|
||||
@ -206,7 +206,7 @@
|
||||
AC_ARG_WITH(ssl,
|
||||
[ --with-ssl=[gnutls|openssl] Build with GNUTLS or OpenSSL (default)],
|
||||
if test x$withval = xno; then
|
||||
@@ -1559,12 +1568,12 @@
|
||||
@@ -1660,12 +1669,12 @@
|
||||
fi
|
||||
AC_CHECK_HEADER(libpq-fe.h, [
|
||||
if test "$PGSQL_INCLUDE" != ""; then
|
||||
@ -222,7 +222,7 @@
|
||||
AC_DEFINE(HAVE_PGSQL,, Build with PostgreSQL support)
|
||||
found_sql_drivers="$found_sql_drivers pgsql"
|
||||
|
||||
@@ -1610,12 +1619,12 @@
|
||||
@@ -1711,12 +1720,12 @@
|
||||
fi
|
||||
AC_CHECK_HEADER(mysql.h, [
|
||||
if test "$MYSQL_INCLUDE" != ""; then
|
||||
@ -238,7 +238,7 @@
|
||||
|
||||
AC_CHECK_LIB(mysqlclient, mysql_ssl_set, [
|
||||
AC_DEFINE(HAVE_MYSQL_SSL,, Define if your MySQL library has SSL functions)
|
||||
@@ -1646,13 +1655,18 @@
|
||||
@@ -1747,13 +1756,18 @@
|
||||
if test $want_sqlite = yes; then
|
||||
AC_CHECK_LIB(sqlite3, sqlite3_open, [
|
||||
AC_CHECK_HEADER(sqlite3.h, [
|
||||
@ -258,7 +258,7 @@
|
||||
|
||||
if test "$found_sql_drivers" != "" -o "$want_sql" = "yes"; then
|
||||
if test "$all_sql_drivers" = "yes"; then
|
||||
@@ -1716,6 +1730,12 @@
|
||||
@@ -1828,6 +1842,12 @@
|
||||
AC_SUBST(AUTH_LIBS)
|
||||
AC_SUBST(SQL_CFLAGS)
|
||||
AC_SUBST(SQL_LIBS)
|
||||
@ -269,9 +269,9 @@
|
||||
+AC_SUBST(SQLITE_CFLAGS)
|
||||
+AC_SUBST(SQLITE_LIBS)
|
||||
|
||||
dnl **
|
||||
dnl ** Index file compatibility flags
|
||||
@@ -1783,17 +1803,27 @@
|
||||
AC_SUBST(DICT_LIBS)
|
||||
AC_SUBST(dict_drivers)
|
||||
@@ -1899,17 +1919,27 @@
|
||||
dnl ** SQL drivers
|
||||
dnl **
|
||||
|
||||
@ -299,7 +299,7 @@
|
||||
|
||||
dnl **
|
||||
dnl ** Plugins
|
||||
@@ -1873,4 +1903,8 @@
|
||||
@@ -1996,7 +2026,11 @@
|
||||
echo "Building with GSSAPI support ........ : $have_gssapi"
|
||||
echo "Building with user database modules . :$userdb"
|
||||
echo "Building with password lookup modules :$passdb"
|
||||
@ -309,3 +309,6 @@
|
||||
+else
|
||||
+ echo "Building with SQL drivers ............:$sql_drivers"
|
||||
+fi
|
||||
|
||||
echo
|
||||
echo "NOTE: This is the UNSTABLE development branch of Dovecot."
|
||||
@ -1,50 +0,0 @@
|
||||
--- passdb-pam.c.pam-setcred 2005-01-30 02:52:53.000000000 -0500
|
||||
+++ dovecot-0.99.14/src/auth/passdb-pam.c 2005-07-22 16:38:16.000000000 -0400
|
||||
@@ -180,12 +180,37 @@
|
||||
}
|
||||
|
||||
#ifdef HAVE_PAM_SETCRED
|
||||
+#if 0
|
||||
+/*
|
||||
+ * This is to fix a bug where dovecot was leaving a lot of temporary
|
||||
+ * kerberos tickets around and filling up disk space. If
|
||||
+ * pam_setcred(pamh, PAM_ESTABLISH_CRED) is called, which creates the
|
||||
+ * ticket, then a matching pam_setcred(pamh, PAM_DELETE_CRED) also
|
||||
+ * needs to be called to clean the ticket up. But the only reason to
|
||||
+ * have a cached ticket on disk is if the service is going to perform
|
||||
+ * some action during the session that requires access to the ticket
|
||||
+ * for validation. This implies the pam session is being held open,
|
||||
+ * which would be more typical pam usage. But the usage here is to
|
||||
+ * close the pam session immediately after authenticating the user
|
||||
+ * with pam_end, thus there is no benefit to creating the disk copy of
|
||||
+ * the ticket. So rather than finding all the early returns before
|
||||
+ * pam_end is invoked and adding pam_setcred(pamh, PAM_DELETE_CRED) to
|
||||
+ * each it is more sensible to not create the ticket in the first
|
||||
+ * place if we're not going to use it and thus not have to worry about
|
||||
+ * the clean up. Note the way the code is currently structured, with
|
||||
+ * an immediate call to pam_end() after authentication it implies the
|
||||
+ * code probably won't work with a file system like AFS which uses the
|
||||
+ * ticket for file system permissions, but restructuring the code for
|
||||
+ * this case is beyond the needs of fixing the aforementioned bug.
|
||||
+ * John Dennis <jdennis@redhat.com>
|
||||
+ */
|
||||
if ((status = pam_setcred(pamh, PAM_ESTABLISH_CRED)) != PAM_SUCCESS) {
|
||||
*error = t_strdup_printf("pam_setcred(%s) failed: %s",
|
||||
user, pam_strerror(pamh, status));
|
||||
return status;
|
||||
}
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
if ((status = pam_acct_mgmt(pamh, 0)) != PAM_SUCCESS) {
|
||||
*error = t_strdup_printf("pam_acct_mgmt(%s) failed: %s",
|
||||
@@ -228,6 +253,9 @@
|
||||
str = t_strdup_printf("pam_start(%s) failed: %s",
|
||||
user, pam_strerror(pamh, status));
|
||||
} else {
|
||||
+ /* fix bug 149673, need dummy TTY for pam_access */
|
||||
+ /* FIXME: should we check and report an error for PAM_TTY? */
|
||||
+ pam_set_item(pamh, PAM_TTY, "dovecot");
|
||||
status = pam_auth(pamh, user, &str);
|
||||
if ((status2 = pam_end(pamh, status)) == PAM_SUCCESS) {
|
||||
/* FIXME: check for PASSDB_RESULT_UNKNOWN_USER
|
||||
24
dovecot.spec
24
dovecot.spec
@ -1,8 +1,8 @@
|
||||
%define upstream 1.0.2
|
||||
%define upstream 1.1.alpha1
|
||||
%define sieve_upstream 1.0.1
|
||||
%define pkg_version 1.0.2
|
||||
%define my_release 13.5
|
||||
%define pkg_release %{my_release}%{?dist}
|
||||
%define pkg_version 1.1
|
||||
%define my_release 14.5
|
||||
%define pkg_release %{my_release}.alpha1%{?dist}
|
||||
%define pkg_sieve_version 1.0.1
|
||||
%define pkg_sieve_release %{my_release}%{?dist}
|
||||
|
||||
@ -17,7 +17,7 @@ Group: System Environment/Daemons
|
||||
%define build_mysql 1
|
||||
%define build_sqlite 1
|
||||
|
||||
%define build_sieve 1
|
||||
%define build_sieve 0
|
||||
%define sieve_name dovecot-sieve
|
||||
|
||||
Source: http://dovecot.org/releases/%{name}-%{upstream}.tar.gz
|
||||
@ -29,15 +29,11 @@ Source5: migrate-users
|
||||
Source6: perfect_maildir.pl
|
||||
Source7: dovecot-REDHAT-FAQ.txt
|
||||
Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_upstream}.tar.gz
|
||||
Patch100: dovecot-1.0.rc15-default-settings.patch
|
||||
#Patch101: dovecot-1.0.beta2-pam-tty.patch
|
||||
Patch100: dovecot-1.1.alpha1-default-settings.patch
|
||||
Patch102: dovecot-1.0.rc2-pam-setcred.patch
|
||||
Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
|
||||
# 104 not applied
|
||||
#Patch104: dovecot-1.0.beta2-lib64.patch
|
||||
Patch105: dovecot-1.0.rc7-mkcert-paths.patch
|
||||
Patch106: dovecot-1.0.rc32-split.patch
|
||||
#Patch105: dovecot-1.0.beta2-sqlite-check.patch
|
||||
Patch106: dovecot-1.1.alpha1-split.patch
|
||||
|
||||
# XXX this patch needs review and forward porting
|
||||
#Patch105: dovecot-auth-log.patch
|
||||
@ -139,10 +135,8 @@ This package provides the SQLite backend for dovecot-auth etc.
|
||||
%setup -q -n %{name}-%{upstream}
|
||||
|
||||
%patch100 -p1 -b .default-settings
|
||||
#%patch101 -p2 -b .pam-tty
|
||||
%patch102 -p1 -b .pam-setcred
|
||||
%patch103 -p1 -b .mkcert-permissions
|
||||
#%patch104 -p1 -b .lib64
|
||||
%patch105 -p1 -b .mkcert-paths
|
||||
|
||||
%patch106 -p1 -b .split
|
||||
@ -353,6 +347,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jul 19 2007 Tomas Janousek <tjanouse@redhat.com> - 1.1-14.5.alpha1
|
||||
- update to latest upstream beta
|
||||
- don't build dovecot-sieve, it's only for 1.0
|
||||
|
||||
* Sun Jul 15 2007 Tomas Janousek <tjanouse@redhat.com> - 1.0.2-13.5
|
||||
- update to latest upstream
|
||||
|
||||
|
||||
4
sources
4
sources
@ -1,4 +1,4 @@
|
||||
769f0dd2750e7de521de3396999a09e5 dovecot-1.0.2.tar.gz
|
||||
9f066b17b877b94a6a051cbe44f8011f dovecot-1.0.2.tar.gz.sig
|
||||
e952297f75ab3d042d896eb1e5c52463 dovecot-1.1.alpha1.tar.gz
|
||||
79a860a7f9aed0812c33708836d548a4 dovecot-1.1.alpha1.tar.gz.sig
|
||||
b070d2177009bb555cd7e25c710047d5 dovecot-sieve-1.0.1.tar.gz
|
||||
c9f5a39ef66e427968141f265c879d60 dovecot-sieve-1.0.1.tar.gz.sig
|
||||
|
||||
Loading…
Reference in New Issue
Block a user