diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/dovecot-2.0-defaultconfig.patch b/dovecot-2.0-defaultconfig.patch index 21f00ec..c7e145e 100644 --- a/dovecot-2.0-defaultconfig.patch +++ b/dovecot-2.0-defaultconfig.patch @@ -1,42 +1,97 @@ -diff -up dovecot-2.3.16/doc/example-config/conf.d/10-mail.conf.default-settings dovecot-2.3.16/doc/example-config/conf.d/10-mail.conf ---- dovecot-2.3.16/doc/example-config/conf.d/10-mail.conf.default-settings 2021-08-06 11:25:51.000000000 +0200 -+++ dovecot-2.3.16/doc/example-config/conf.d/10-mail.conf 2021-10-27 11:13:45.666956339 +0200 -@@ -175,7 +175,7 @@ namespace inbox { - # to make sure that users can't log in as daemons or other system users. - # Note that denying root logins is hardcoded to dovecot binary and can't - # be done even if first_valid_uid is set to 0. --#first_valid_uid = 500 +diff -up dovecot-2.4.2-build/dovecot-2.4.2/doc/dovecot.conf.in.default-settings dovecot-2.4.2-build/dovecot-2.4.2/doc/dovecot.conf.in +--- dovecot-2.4.2-build/dovecot-2.4.2/doc/dovecot.conf.in.default-settings 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/doc/dovecot.conf.in 2025-11-30 09:24:17.130246956 +0100 +@@ -16,24 +16,19 @@ dovecot_storage_version = @DOVECOT_CONFI + # The configuration below is a minimal configuration file using system user authentication. + # See https://@DOVECOT_ASSET_URL@/latest/core/config/quick.html + +-!include_try conf.d/*.conf +- + # Enable wanted protocols: + protocols { + imap = yes + lmtp = yes + } + +-mail_home = /srv/mail/%{user} +-mail_driver = sdbox ++mail_home = /home/%{user} ++mail_driver = maildir + mail_path = ~/mail + +-mail_uid = vmail +-mail_gid = vmail +- +-# By default first_valid_uid is 500. If your vmail user's UID is smaller, ++# By default first_valid_uid is 1000. If your vmail user's UID is smaller, + # you need to modify this: +-#first_valid_uid = uid-number-of-vmail-user +first_valid_uid = 1000 - #last_valid_uid = 0 - # Valid GID range for users, defaults to non-root/wheel. Users having -@@ -322,6 +322,7 @@ protocol !indexer-worker { - # them simultaneously. - #mbox_read_locks = fcntl - #mbox_write_locks = dotlock fcntl -+mbox_write_locks = fcntl + namespace inbox { + inbox = yes +@@ -44,7 +39,15 @@ namespace inbox { + passdb pam { + } - # Maximum time to wait for lock (all of them) before aborting. - #mbox_lock_timeout = 5 mins -diff -up dovecot-2.3.16/doc/example-config/conf.d/10-ssl.conf.default-settings dovecot-2.3.16/doc/example-config/conf.d/10-ssl.conf ---- dovecot-2.3.16/doc/example-config/conf.d/10-ssl.conf.default-settings 2021-08-06 11:25:51.000000000 +0200 -+++ dovecot-2.3.16/doc/example-config/conf.d/10-ssl.conf 2021-10-27 11:13:02.834533975 +0200 -@@ -3,7 +3,9 @@ - ## - - # SSL/TLS support: yes, no, required. --#ssl = yes -+# disable plain pop3 and imap, allowed are only pop3+TLS, pop3s, imap+TLS and imaps -+# plain imap and pop3 are still allowed for local connections ++userdb passwd { ++} ++ +ssl = required - - # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before - # dropping root privileges, so keep the key file unreadable by anyone but -@@ -64,6 +66,7 @@ ssl_key = &1;\ +fi' + -diff -up dovecot-2.3.15/dovecot.service.in.initbysystemd dovecot-2.3.15/dovecot.service.in ---- dovecot-2.3.15/dovecot.service.in.initbysystemd 2021-06-21 20:21:49.250680889 +0200 -+++ dovecot-2.3.15/dovecot.service.in 2021-06-21 20:22:46.935981920 +0200 +diff -up dovecot-2.4.1-build/dovecot-2.4.1-4/dovecot.service.in.initbysystemd dovecot-2.4.1-build/dovecot-2.4.1-4/dovecot.service.in +--- dovecot-2.4.1-build/dovecot-2.4.1-4/dovecot.service.in.initbysystemd 2025-06-02 23:32:10.685195261 +0200 ++++ dovecot-2.4.1-build/dovecot-2.4.1-4/dovecot.service.in 2025-06-02 23:34:03.123174934 +0200 @@ -11,7 +11,8 @@ Description=Dovecot IMAP/POP3 email server Documentation=man:dovecot(1) Documentation=https://doc.dovecot.org/ --After=local-fs.target network-online.target -+After=local-fs.target network-online.target dovecot-init.service +-After=local-fs.target network-online.target remote-fs.target time-sync.target ++After=local-fs.target network-online.target remote-fs.target time-sync.target dovecot-init.service +Requires=dovecot-init.service Wants=network-online.target [Service] -diff -up dovecot-2.3.15/Makefile.am.initbysystemd dovecot-2.3.15/Makefile.am ---- dovecot-2.3.15/Makefile.am.initbysystemd 2021-06-21 20:21:49.250680889 +0200 -+++ dovecot-2.3.15/Makefile.am 2021-06-21 20:24:26.676765849 +0200 -@@ -21,6 +21,7 @@ EXTRA_DIST = \ +diff -up dovecot-2.4.1-build/dovecot-2.4.1-4/Makefile.am.initbysystemd dovecot-2.4.1-build/dovecot-2.4.1-4/Makefile.am +--- dovecot-2.4.1-build/dovecot-2.4.1-4/Makefile.am.initbysystemd 2025-03-28 12:32:27.000000000 +0100 ++++ dovecot-2.4.1-build/dovecot-2.4.1-4/Makefile.am 2025-06-02 23:33:22.221675050 +0200 +@@ -19,6 +19,7 @@ EXTRA_DIST = \ + update-version.sh \ run-test-valgrind.supp \ dovecot.service.in \ - dovecot.socket \ + dovecot-init.service \ - $(conf_DATA) - - noinst_DATA = dovecot-config -@@ -69,7 +70,8 @@ dovecot-config: dovecot-config.in Makefi + dovecot.socket \ + version \ + build-aux/git-abi-version-gen \ +@@ -67,7 +68,8 @@ dovecot-config: dovecot-config.in Makefi if WANT_SYSTEMD systemdsystemunit_DATA = \ dovecot.socket \ diff --git a/dovecot-2.3-ph_optglob.patch b/dovecot-2.3-ph_optglob.patch deleted file mode 100644 index d31527c..0000000 --- a/dovecot-2.3-ph_optglob.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/plugins/include/cmd-include.c.ph_optglob dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/plugins/include/cmd-include.c ---- dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/plugins/include/cmd-include.c.ph_optglob 2024-06-04 09:11:28.514189662 +0200 -+++ dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/plugins/include/cmd-include.c 2024-06-04 09:18:23.219809778 +0200 -@@ -368,11 +368,13 @@ static bool opc_include_dump - return FALSE; - - sieve_code_descend(denv); -- sieve_code_dumpf(denv, "script: `%s' from %s %s%s[ID: %d, BLOCK: %d]", -+ sieve_code_dumpf(denv, "script: `%s' from %s %s%s%s[ID: %d, BLOCK: %d]", - sieve_script_name(included->script), sieve_script_location(included->script), - ((flags & EXT_INCLUDE_FLAG_ONCE) != 0 ? "(once) " : ""), - ((flags & EXT_INCLUDE_FLAG_OPTIONAL) != 0 ? "(optional) " : ""), -- include_id, sieve_binary_block_get_id(included->block)); -+ (included->block == NULL ? "(missing) " : ""), -+ include_id, -+ (included->block == NULL ? -1 : sieve_binary_block_get_id(included->block))); - - return TRUE; - } -diff -up dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/plugins/include/ext-include-common.c.ph_optglob dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/plugins/include/ext-include-common.c ---- dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/plugins/include/ext-include-common.c.ph_optglob 2023-09-14 15:18:26.000000000 +0200 -+++ dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/plugins/include/ext-include-common.c 2024-06-04 09:10:45.187823805 +0200 -@@ -693,6 +693,25 @@ int ext_include_execute_include(const st - } - - ctx = ext_include_get_interpreter_context(this_ext, renv->interp); -+ if (included->block == NULL) { -+ if ((flags & EXT_INCLUDE_FLAG_OPTIONAL) != 0) { -+ sieve_runtime_trace( -+ renv, SIEVE_TRLVL_NONE, -+ "include: skipped include for script '%s' " -+ "[inc id: %d, block: NULL]; optional and unavailable", -+ sieve_script_name(included->script), -+ include_id); -+ return result; -+ } else { -+ sieve_runtime_trace( -+ renv, SIEVE_TRLVL_NONE, -+ "include: unavailable script '%s' " -+ "[inc id: %d, block: NULL]", -+ sieve_script_name(included->script), -+ include_id); -+ return SIEVE_EXEC_BIN_CORRUPT; -+ } -+ } - block_id = sieve_binary_block_get_id(included->block); - - /* If :once modifier is specified, check for duplicate include */ diff --git a/dovecot-2.3-ph_scriptcmp.patch b/dovecot-2.3-ph_scriptcmp.patch deleted file mode 100644 index 2bcaade..0000000 --- a/dovecot-2.3-ph_scriptcmp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/storage/file/sieve-file-script.c.testfix4 dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/storage/file/sieve-file-script.c ---- dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/storage/file/sieve-file-script.c.testfix4 2024-06-03 13:35:24.408858593 +0200 -+++ dovecot-2.3.21/dovecot-pigeonhole/src/lib-sieve/storage/file/sieve-file-script.c 2024-06-03 13:35:24.434858849 +0200 -@@ -800,7 +800,7 @@ static bool sieve_file_script_equals - (struct sieve_file_script *)other; - - return ( CMP_DEV_T(fscript->st.st_dev, fother->st.st_dev) && -- fscript->st.st_ino == fother->st.st_ino ); -+ fscript->st.st_ino == fother->st.st_ino && (fscript->st.st_ino != 0 || script->location != NULL && other->location != NULL && strcmp(script->location, other->location) == 0)); - } - - /* diff --git a/dovecot-2.3.0.1-libxcrypt.patch b/dovecot-2.3.0.1-libxcrypt.patch deleted file mode 100644 index a8c33bf..0000000 --- a/dovecot-2.3.0.1-libxcrypt.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up dovecot-2.3.0.1/src/auth/mycrypt.c.libxcrypt dovecot-2.3.0.1/src/auth/mycrypt.c ---- dovecot-2.3.0.1/src/auth/mycrypt.c.libxcrypt 2018-02-28 15:28:58.000000000 +0100 -+++ dovecot-2.3.0.1/src/auth/mycrypt.c 2018-03-27 10:57:38.447769201 +0200 -@@ -14,6 +14,7 @@ - # define _XPG6 /* Some Solaris versions require this, some break with this */ - #endif - #include -+#include - - #include "mycrypt.h" - diff --git a/dovecot-2.3.14-opensslv3.patch b/dovecot-2.3.14-opensslv3.patch deleted file mode 100644 index fa6c44f..0000000 --- a/dovecot-2.3.14-opensslv3.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up dovecot-2.3.14/src/lib-dcrypt/dcrypt-openssl.c.opensslv3 dovecot-2.3.14/src/lib-dcrypt/dcrypt-openssl.c ---- dovecot-2.3.14/src/lib-dcrypt/dcrypt-openssl.c.opensslv3 2021-06-03 18:56:52.573174433 +0200 -+++ dovecot-2.3.14/src/lib-dcrypt/dcrypt-openssl.c 2021-06-03 18:56:52.585174274 +0200 -@@ -73,10 +73,30 @@ - 2key algo oid1symmetric algo namesalthash algoroundsE(RSA = i2d_PrivateKey, EC=Private Point)key id - **/ - -+#if OPENSSL_VERSION_MAJOR == 3 -+static EC_KEY *EVP_PKEY_get0_EC_KEYv3(EVP_PKEY *key) -+{ -+ EC_KEY *eck = EVP_PKEY_get1_EC_KEY(key); -+ EVP_PKEY_set1_EC_KEY(key, eck); -+ EC_KEY_free(eck); -+ return eck; -+} -+ -+static EC_KEY *EVP_PKEY_get1_EC_KEYv3(EVP_PKEY *key) -+{ -+ EC_KEY *eck = EVP_PKEY_get1_EC_KEY(key); -+ EVP_PKEY_set1_EC_KEY(key, eck); -+ return eck; -+} -+ -+#define EVP_PKEY_get0_EC_KEY EVP_PKEY_get0_EC_KEYv3 -+#define EVP_PKEY_get1_EC_KEY EVP_PKEY_get1_EC_KEYv3 -+#else - #ifndef HAVE_EVP_PKEY_get0 - #define EVP_PKEY_get0_EC_KEY(x) x->pkey.ec - #define EVP_PKEY_get0_RSA(x) x->pkey.rsa - #endif -+#endif - - #ifndef HAVE_OBJ_LENGTH - #define OBJ_length(o) ((o)->length) diff --git a/dovecot-2.3.15-fixvalcond.patch b/dovecot-2.3.15-fixvalcond.patch index a064c26..4ef5447 100644 --- a/dovecot-2.3.15-fixvalcond.patch +++ b/dovecot-2.3.15-fixvalcond.patch @@ -1,19 +1,19 @@ -diff -up dovecot-2.3.17/dovecot-pigeonhole/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond dovecot-2.3.17/dovecot-pigeonhole/src/lib-sieve/storage/dict/sieve-dict-script.c ---- dovecot-2.3.17/dovecot-pigeonhole/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond 2021-11-02 21:51:36.109032050 +0100 -+++ dovecot-2.3.17/dovecot-pigeonhole/src/lib-sieve/storage/dict/sieve-dict-script.c 2021-11-02 21:52:28.409344118 +0100 -@@ -114,7 +114,7 @@ static int sieve_dict_script_get_stream - (struct sieve_dict_script *)script; +diff -up dovecot-2.4.1-build/dovecot-2.4.1-4/dovecot-pigeonhole/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond dovecot-2.4.1-build/dovecot-2.4.1-4/dovecot-pigeonhole/src/lib-sieve/storage/dict/sieve-dict-script.c +--- dovecot-2.4.1-build/dovecot-2.4.1-4/dovecot-pigeonhole/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond 2025-06-02 23:36:21.897399891 +0200 ++++ dovecot-2.4.1-build/dovecot-2.4.1-4/dovecot-pigeonhole/src/lib-sieve/storage/dict/sieve-dict-script.c 2025-06-02 23:38:13.748569461 +0200 +@@ -102,7 +102,7 @@ sieve_dict_script_get_stream(struct siev + container_of(script, struct sieve_dict_script, script); struct sieve_dict_storage *dstorage = - (struct sieve_dict_storage *)script->storage; + container_of(storage, struct sieve_dict_storage, storage); - const char *path, *name = script->name, *data, *error; + const char *path, *name = script->name, *data, *error = NULL; int ret; dscript->data_pool = -diff -up dovecot-2.3.17/src/lib-storage/index/index-attribute.c.fixvalcond dovecot-2.3.17/src/lib-storage/index/index-attribute.c ---- dovecot-2.3.17/src/lib-storage/index/index-attribute.c.fixvalcond 2021-10-27 13:09:04.000000000 +0200 -+++ dovecot-2.3.17/src/lib-storage/index/index-attribute.c 2021-11-02 21:51:36.109032050 +0100 -@@ -248,7 +248,7 @@ int index_storage_attribute_get(struct m +diff -up dovecot-2.4.1-build/dovecot-2.4.1-4/src/lib-storage/index/index-attribute.c.fixvalcond dovecot-2.4.1-build/dovecot-2.4.1-4/src/lib-storage/index/index-attribute.c +--- dovecot-2.4.1-build/dovecot-2.4.1-4/src/lib-storage/index/index-attribute.c.fixvalcond 2025-03-28 12:32:27.000000000 +0100 ++++ dovecot-2.4.1-build/dovecot-2.4.1-4/src/lib-storage/index/index-attribute.c 2025-06-02 23:36:21.897571934 +0200 +@@ -250,7 +250,7 @@ int index_storage_attribute_get(struct m struct mail_attribute_value *value_r) { struct dict *dict; diff --git a/dovecot-2.3.19.1-7bad6a24.patch b/dovecot-2.3.19.1-7bad6a24.patch deleted file mode 100644 index c980dde..0000000 --- a/dovecot-2.3.19.1-7bad6a24.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 7bad6a24160e34bce8f10e73dbbf9e5fbbcd1904 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen -Date: Mon, 9 May 2022 15:23:33 +0300 -Subject: [PATCH] auth: Fix handling passdbs with identical driver/args but - different mechanisms/username_filter - -The passdb was wrongly deduplicated in this situation, causing wrong -mechanisms or username_filter setting to be used. This would be a rather -unlikely configuration though. - -Fixed by moving mechanisms and username_filter from struct passdb_module -to struct auth_passdb, which is where they should have been in the first -place. ---- - src/auth/auth-request.c | 6 +++--- - src/auth/auth.c | 18 ++++++++++++++++++ - src/auth/auth.h | 5 +++++ - src/auth/passdb.c | 15 ++------------- - src/auth/passdb.h | 4 ---- - 5 files changed, 28 insertions(+), 20 deletions(-) - -diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c -index cd08b1fa02..0ca29f3674 100644 ---- a/src/auth/auth-request.c -+++ b/src/auth/auth-request.c -@@ -534,8 +534,8 @@ auth_request_want_skip_passdb(struct auth_request *request, - struct auth_passdb *passdb) - { - /* if mechanism is not supported, skip */ -- const char *const *mechs = passdb->passdb->mechanisms; -- const char *const *username_filter = passdb->passdb->username_filter; -+ const char *const *mechs = passdb->mechanisms; -+ const char *const *username_filter = passdb->username_filter; - const char *username; - - username = request->fields.user; -@@ -548,7 +548,7 @@ auth_request_want_skip_passdb(struct auth_request *request, - return TRUE; - } - -- if (passdb->passdb->username_filter != NULL && -+ if (passdb->username_filter != NULL && - !auth_request_username_accepted(username_filter, username)) { - auth_request_log_debug(request, - request->mech != NULL ? AUTH_SUBSYS_MECH -diff --git a/src/auth/auth.c b/src/auth/auth.c -index f2f3fda20c..9f6c4ba60c 100644 ---- a/src/auth/auth.c -+++ b/src/auth/auth.c -@@ -99,6 +99,24 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set, - auth_passdb->override_fields_tmpl = - passdb_template_build(auth->pool, set->override_fields); - -+ if (*set->mechanisms == '\0') { -+ auth_passdb->mechanisms = NULL; -+ } else if (strcasecmp(set->mechanisms, "none") == 0) { -+ auth_passdb->mechanisms = (const char *const[]){ NULL }; -+ } else { -+ auth_passdb->mechanisms = -+ (const char *const *)p_strsplit_spaces(auth->pool, -+ set->mechanisms, " ,"); -+ } -+ -+ if (*set->username_filter == '\0') { -+ auth_passdb->username_filter = NULL; -+ } else { -+ auth_passdb->username_filter = -+ (const char *const *)p_strsplit_spaces(auth->pool, -+ set->username_filter, " ,"); -+ } -+ - /* for backwards compatibility: */ - if (set->pass) - auth_passdb->result_success = AUTH_DB_RULE_CONTINUE; -diff --git a/src/auth/auth.h b/src/auth/auth.h -index f700e29d5c..460a179765 100644 ---- a/src/auth/auth.h -+++ b/src/auth/auth.h -@@ -41,6 +41,11 @@ struct auth_passdb { - struct passdb_template *default_fields_tmpl; - struct passdb_template *override_fields_tmpl; - -+ /* Supported authentication mechanisms, NULL is all, {NULL} is none */ -+ const char *const *mechanisms; -+ /* Username filter, NULL is no filter */ -+ const char *const *username_filter; -+ - enum auth_passdb_skip skip; - enum auth_db_rule result_success; - enum auth_db_rule result_failure; -diff --git a/src/auth/passdb.c b/src/auth/passdb.c -index eb4ac8ae82..f5eed1af4f 100644 ---- a/src/auth/passdb.c -+++ b/src/auth/passdb.c -@@ -224,19 +224,8 @@ passdb_preinit(pool_t pool, const struct auth_passdb_settings *set) - passdb->id = ++auth_passdb_id; - passdb->iface = *iface; - passdb->args = p_strdup(pool, set->args); -- if (*set->mechanisms == '\0') { -- passdb->mechanisms = NULL; -- } else if (strcasecmp(set->mechanisms, "none") == 0) { -- passdb->mechanisms = (const char *const[]){NULL}; -- } else { -- passdb->mechanisms = (const char* const*)p_strsplit_spaces(pool, set->mechanisms, " ,"); -- } -- -- if (*set->username_filter == '\0') { -- passdb->username_filter = NULL; -- } else { -- passdb->username_filter = (const char* const*)p_strsplit_spaces(pool, set->username_filter, " ,"); -- } -+ /* NOTE: if anything else than driver & args are added here, -+ passdb_find() also needs to be updated. */ - array_push_back(&passdb_modules, &passdb); - return passdb; - } -diff --git a/src/auth/passdb.h b/src/auth/passdb.h -index 2e95328e5c..e466a9fdb6 100644 ---- a/src/auth/passdb.h -+++ b/src/auth/passdb.h -@@ -63,10 +63,6 @@ struct passdb_module { - /* Default password scheme for this module. - If default_cache_key is set, must not be NULL. */ - const char *default_pass_scheme; -- /* Supported authentication mechanisms, NULL is all, [NULL] is none*/ -- const char *const *mechanisms; -- /* Username filter, NULL is no filter */ -- const char *const *username_filter; - - /* If blocking is set to TRUE, use child processes to access - this passdb. */ diff --git a/dovecot-2.3.20-nolibotp.patch b/dovecot-2.3.20-nolibotp.patch deleted file mode 100644 index 4ec0b78..0000000 --- a/dovecot-2.3.20-nolibotp.patch +++ /dev/null @@ -1,295 +0,0 @@ -diff -up dovecot-2.3.20/configure.ac.nolibotp dovecot-2.3.20/configure.ac ---- dovecot-2.3.20/configure.ac.nolibotp 2022-12-21 09:49:12.000000000 +0100 -+++ dovecot-2.3.20/configure.ac 2023-02-14 16:54:02.118531016 +0100 -@@ -854,7 +854,6 @@ src/lib-lua/Makefile - src/lib-mail/Makefile - src/lib-master/Makefile - src/lib-program-client/Makefile --src/lib-otp/Makefile - src/lib-dovecot/Makefile - src/lib-sasl/Makefile - src/lib-settings/Makefile -diff -up dovecot-2.3.20/src/auth/main.c.nolibotp dovecot-2.3.20/src/auth/main.c ---- dovecot-2.3.20/src/auth/main.c.nolibotp 2022-12-21 09:49:12.000000000 +0100 -+++ dovecot-2.3.20/src/auth/main.c 2023-02-14 16:54:02.118531016 +0100 -@@ -19,8 +19,6 @@ - #include "password-scheme.h" - #include "passdb-cache.h" - #include "mech.h" --#include "otp.h" --#include "mech-otp-common.h" - #include "auth.h" - #include "auth-penalty.h" - #include "auth-token.h" -@@ -283,7 +281,6 @@ static void main_deinit(void) - - auth_policy_deinit(); - mech_register_deinit(&mech_reg); -- mech_otp_deinit(); - mech_deinit(global_auth_settings); - - /* allow modules to unregister their dbs/drivers/etc. before freeing -diff -up dovecot-2.3.20/src/auth/Makefile.am.nolibotp dovecot-2.3.20/src/auth/Makefile.am ---- dovecot-2.3.20/src/auth/Makefile.am.nolibotp 2022-12-21 09:49:12.000000000 +0100 -+++ dovecot-2.3.20/src/auth/Makefile.am 2023-02-14 16:54:02.118531016 +0100 -@@ -45,7 +45,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src/lib-sql \ - -I$(top_srcdir)/src/lib-settings \ - -I$(top_srcdir)/src/lib-old-stats \ -- -I$(top_srcdir)/src/lib-otp \ - -I$(top_srcdir)/src/lib-master \ - -I$(top_srcdir)/src/lib-oauth2 \ - -I$(top_srcdir)/src/lib-ssl-iostream \ -@@ -67,7 +66,6 @@ libpassword_la_SOURCES = \ - password-scheme-crypt.c \ - password-scheme-md5crypt.c \ - password-scheme-scram.c \ -- password-scheme-otp.c \ - password-scheme-pbkdf2.c \ - password-scheme-sodium.c - libpassword_la_CFLAGS = $(AM_CPPFLAGS) $(LIBSODIUM_CFLAGS) -@@ -76,7 +74,6 @@ auth_libs = \ - libauth.la \ - libstats_auth.la \ - libpassword.la \ -- ../lib-otp/libotp.la \ - $(AUTH_LUA_LIBS) \ - $(LIBDOVECOT_SQL) - -@@ -95,7 +92,6 @@ libauth_la_SOURCES = \ - auth-client-connection.c \ - auth-master-connection.c \ - auth-policy.c \ -- mech-otp-common.c \ - mech-plain-common.c \ - auth-penalty.c \ - auth-request.c \ -@@ -122,7 +118,6 @@ libauth_la_SOURCES = \ - mech-digest-md5.c \ - mech-external.c \ - mech-gssapi.c \ -- mech-otp.c \ - mech-scram.c \ - mech-apop.c \ - mech-winbind.c \ -@@ -161,7 +156,6 @@ headers = \ - auth-client-connection.h \ - auth-common.h \ - auth-master-connection.h \ -- mech-otp-common.h \ - mech-plain-common.h \ - mech-digest-md5-private.h \ - mech-scram.h \ -@@ -260,7 +254,6 @@ test_libs = \ - test_libpassword_SOURCES = test-libpassword.c - test_libpassword_LDADD = \ - libpassword.la \ -- ../lib-otp/libotp.la \ - $(CRYPT_LIBS) \ - $(LIBDOVECOT_SQL) \ - $(LIBSODIUM_LIBS) \ -diff -up dovecot-2.3.20/src/auth/mech.c.nolibotp dovecot-2.3.20/src/auth/mech.c ---- dovecot-2.3.20/src/auth/mech.c.nolibotp 2023-02-14 16:55:38.421231797 +0100 -+++ dovecot-2.3.20/src/auth/mech.c 2023-02-14 16:55:38.434231892 +0100 -@@ -71,7 +71,6 @@ extern const struct mech_module mech_apo - extern const struct mech_module mech_cram_md5; - extern const struct mech_module mech_digest_md5; - extern const struct mech_module mech_external; --extern const struct mech_module mech_otp; - extern const struct mech_module mech_scram_sha1; - extern const struct mech_module mech_scram_sha256; - extern const struct mech_module mech_anonymous; -@@ -206,7 +205,6 @@ void mech_init(const struct auth_setting - mech_register_module(&mech_gssapi_spnego); - #endif - } -- mech_register_module(&mech_otp); - mech_register_module(&mech_scram_sha1); - mech_register_module(&mech_scram_sha256); - mech_register_module(&mech_anonymous); -@@ -233,7 +231,6 @@ void mech_deinit(const struct auth_setti - mech_unregister_module(&mech_gssapi_spnego); - #endif - } -- mech_unregister_module(&mech_otp); - mech_unregister_module(&mech_scram_sha1); - mech_unregister_module(&mech_scram_sha256); - mech_unregister_module(&mech_anonymous); -diff -up dovecot-2.3.20/src/auth/password-scheme.c.nolibotp dovecot-2.3.20/src/auth/password-scheme.c ---- dovecot-2.3.20/src/auth/password-scheme.c.nolibotp 2023-02-14 16:54:02.109530950 +0100 -+++ dovecot-2.3.20/src/auth/password-scheme.c 2023-02-14 16:54:02.119531023 +0100 -@@ -13,7 +13,6 @@ - #include "randgen.h" - #include "sha1.h" - #include "sha2.h" --#include "otp.h" - #include "str.h" - #include "password-scheme.h" - -@@ -709,32 +708,6 @@ plain_md5_generate(const char *plaintext - *size_r = MD5_RESULTLEN; - } - --static int otp_verify(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED, -- const unsigned char *raw_password, size_t size, -- const char **error_r) --{ -- const char *password, *generated; -- -- password = t_strndup(raw_password, size); -- if (password_generate_otp(plaintext, password, UINT_MAX, &generated) < 0) { -- *error_r = "Invalid OTP data in passdb"; -- return -1; -- } -- -- return strcasecmp(password, generated) == 0 ? 1 : 0; --} -- --static void --otp_generate(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED, -- const unsigned char **raw_password_r, size_t *size_r) --{ -- const char *password; -- -- if (password_generate_otp(plaintext, NULL, OTP_HASH_SHA1, &password) < 0) -- i_unreached(); -- *raw_password_r = (const unsigned char *)password; -- *size_r = strlen(password); --} - - static const struct password_scheme builtin_schemes[] = { - { "MD5", PW_ENCODING_NONE, 0, md5_verify, md5_crypt_generate }, -@@ -770,7 +743,6 @@ static const struct password_scheme buil - NULL, plain_md5_generate }, - { "LDAP-MD5", PW_ENCODING_BASE64, MD5_RESULTLEN, - NULL, plain_md5_generate }, -- { "OTP", PW_ENCODING_NONE, 0, otp_verify, otp_generate }, - { "PBKDF2", PW_ENCODING_NONE, 0, pbkdf2_verify, pbkdf2_generate }, - }; - -diff -up dovecot-2.3.20/src/auth/password-scheme.h.nolibotp dovecot-2.3.20/src/auth/password-scheme.h ---- dovecot-2.3.20/src/auth/password-scheme.h.nolibotp 2023-02-14 16:56:50.929759540 +0100 -+++ dovecot-2.3.20/src/auth/password-scheme.h 2023-02-14 16:56:50.947759671 +0100 -@@ -92,9 +92,6 @@ void password_set_encryption_rounds(unsi - /* INTERNAL: */ - const char *password_generate_salt(size_t len); - const char *password_generate_md5_crypt(const char *pw, const char *salt); --int password_generate_otp(const char *pw, const char *state_data, -- unsigned int algo, const char **result_r) -- ATTR_NULL(2); - - int crypt_verify(const char *plaintext, - const struct password_generate_params *params, -diff -up dovecot-2.3.20/src/auth/test-libpassword.c.nolibotp dovecot-2.3.20/src/auth/test-libpassword.c ---- dovecot-2.3.20/src/auth/test-libpassword.c.nolibotp 2023-02-14 16:54:55.880922175 +0100 -+++ dovecot-2.3.20/src/auth/test-libpassword.c 2023-02-14 16:54:55.896922291 +0100 -@@ -106,7 +106,6 @@ static void test_password_schemes(void) - test_password_scheme("SHA512", "{SHA512}7iaw3Ur350mqGo7jwQrpkj9hiYB3Lkc/iBml1JQODbJ6wYX4oOHV+E+IvIh/1nsUNzLDBMxfqa2Ob1f1ACio/w==", "test"); - test_password_scheme("SSHA", "{SSHA}H/zrDv8FXUu1JmwvVYijfrYEF34jVZcO", "test"); - test_password_scheme("MD5-CRYPT", "{MD5-CRYPT}$1$GgvxyNz8$OjZhLh4P.gF1lxYEbLZ3e/", "test"); -- test_password_scheme("OTP", "{OTP}sha1 1024 ae6b49aa481f7233 f69fc7f98b8fbf54", "test"); - test_password_scheme("PBKDF2", "{PBKDF2}$1$bUnT4Pl7yFtYX0KU$5000$50a83cafdc517b9f46519415e53c6a858908680a", "test"); - test_password_scheme("CRAM-MD5", "{CRAM-MD5}e02d374fde0dc75a17a557039a3a5338c7743304777dccd376f332bee68d2cf6", "test"); - test_password_scheme("DIGEST-MD5", "{DIGEST-MD5}77c1a8c437c9b08ba2f460fe5d58db5d", "test"); -diff -up dovecot-2.3.20/src/auth/test-mech.c.nolibotp dovecot-2.3.20/src/auth/test-mech.c ---- dovecot-2.3.20/src/auth/test-mech.c.nolibotp 2022-12-21 09:49:12.000000000 +0100 -+++ dovecot-2.3.20/src/auth/test-mech.c 2023-02-14 16:54:02.119531023 +0100 -@@ -8,8 +8,6 @@ - #include "auth-request-handler-private.h" - #include "auth-settings.h" - #include "mech-digest-md5-private.h" --#include "otp.h" --#include "mech-otp-common.h" - #include "settings-parser.h" - #include "password-scheme.h" - #include "auth-token.h" -@@ -27,7 +25,6 @@ extern const struct mech_module mech_dov - extern const struct mech_module mech_external; - extern const struct mech_module mech_login; - extern const struct mech_module mech_oauthbearer; --extern const struct mech_module mech_otp; - extern const struct mech_module mech_plain; - extern const struct mech_module mech_scram_sha1; - extern const struct mech_module mech_scram_sha256; -@@ -65,10 +62,7 @@ request_handler_reply_mock_callback(stru - - if (request->passdb_result == PASSDB_RESULT_OK) - request->failed = FALSE; -- else if (request->mech == &mech_otp) { -- if (null_strcmp(request->fields.user, "otp_phase_2") == 0) -- request->failed = FALSE; -- } else if (request->mech == &mech_oauthbearer) { -+ else if (request->mech == &mech_oauthbearer) { - } - }; - -@@ -224,10 +218,6 @@ static void test_mechs(void) - {&mech_plain, UCHAR_LEN("\0testuser\0testpass"), "testuser", NULL, TRUE, FALSE, FALSE}, - {&mech_plain, UCHAR_LEN("normaluser\0masteruser\0masterpass"), "masteruser", NULL, TRUE, FALSE, FALSE}, - {&mech_plain, UCHAR_LEN("normaluser\0normaluser\0masterpass"), "normaluser", NULL, TRUE, FALSE, FALSE}, -- {&mech_otp, UCHAR_LEN("hex:5Bf0 75d9 959d 036f"), "otp_phase_2", NULL, TRUE, TRUE, FALSE}, -- {&mech_otp, UCHAR_LEN("word:BOND FOGY DRAB NE RISE MART"), "otp_phase_2", NULL, TRUE, TRUE, FALSE}, -- {&mech_otp, UCHAR_LEN("init-hex:f6bd 6b33 89b8 7203:md5 499 ke6118:23d1 b253 5ae0 2b7e"), "otp_phase_2", NULL, TRUE, TRUE, FALSE}, -- {&mech_otp, UCHAR_LEN("init-word:END KERN BALM NICK EROS WAVY:md5 499 ke1235:BABY FAIN OILY NIL TIDY DADE"), "otp_phase_2", NULL , TRUE, TRUE, FALSE}, - {&mech_oauthbearer, UCHAR_LEN("n,a=testuser,p=cHJvb2Y=,f=nonstandart\x01host=server\x01port=143\x01""auth=Bearer vF9dft4qmTc2Nvb3RlckBhbHRhdmlzdGEuY29tCg==\x01\x01"), "testuser", NULL, FALSE, TRUE, FALSE}, - {&mech_scram_sha1, UCHAR_LEN("n,,n=testuser,r=rOprNGfwEbeRWgbNEkqO"), "testuser", NULL, TRUE, FALSE, FALSE}, - {&mech_scram_sha256, UCHAR_LEN("n,,n=testuser,r=rOprNGfwEbeRWgbNEkqO"), "testuser", NULL, TRUE, FALSE, FALSE}, -@@ -242,8 +232,6 @@ static void test_mechs(void) - {&mech_external, UCHAR_LEN(""), "testuser", NULL, FALSE, TRUE, FALSE}, - {&mech_external, UCHAR_LEN(""), NULL, NULL, FALSE, FALSE, FALSE}, - {&mech_login, UCHAR_LEN(""), NULL, NULL, FALSE, FALSE, FALSE}, -- {&mech_otp, UCHAR_LEN(""), NULL, "invalid input", FALSE, FALSE, FALSE}, -- {&mech_otp, UCHAR_LEN(""), "testuser", "invalid input", FALSE, FALSE, FALSE}, - {&mech_plain, UCHAR_LEN(""), NULL, NULL, FALSE, FALSE, FALSE}, - {&mech_oauthbearer, UCHAR_LEN(""), NULL, NULL, FALSE, FALSE, FALSE}, - {&mech_xoauth2, UCHAR_LEN(""), NULL, NULL, FALSE, FALSE, FALSE}, -@@ -255,7 +243,6 @@ static void test_mechs(void) - {&mech_apop, UCHAR_LEN("1.1.1\0testuser\0tooshort"), NULL, NULL, FALSE, FALSE, FALSE}, - {&mech_apop, UCHAR_LEN("1.1.1\0testuser\0responseoflen16-"), NULL, NULL, FALSE, FALSE, FALSE}, - {&mech_apop, UCHAR_LEN("1.1.1"), NULL, NULL, FALSE, FALSE, FALSE}, -- {&mech_otp, UCHAR_LEN("somebody\0testuser"), "testuser", "otp(testuser): unsupported response type", FALSE, TRUE, FALSE}, - {&mech_cram_md5, UCHAR_LEN("testuser\0response"), "testuser", NULL, FALSE, FALSE, FALSE}, - {&mech_plain, UCHAR_LEN("testuser\0"), "testuser", NULL, FALSE, FALSE, FALSE}, - -@@ -297,9 +284,7 @@ static void test_mechs(void) - {&mech_plain, UCHAR_LEN("\0fa\0il\0ing\0withthis"), NULL, NULL, FALSE, FALSE, FALSE}, - {&mech_plain, UCHAR_LEN("failingwiththis"), NULL, NULL, FALSE, FALSE, FALSE}, - {&mech_plain, UCHAR_LEN("failing\0withthis"), NULL, NULL, FALSE, FALSE, FALSE}, -- {&mech_otp, UCHAR_LEN("someb\0ody\0testuser"), NULL, "invalid input", FALSE, FALSE, FALSE}, - /* phase 2 */ -- {&mech_otp, UCHAR_LEN("someb\0ody\0testuser"), "testuser", "otp(testuser): unsupported response type", FALSE, TRUE, FALSE}, - {&mech_scram_sha1, UCHAR_LEN("c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts="), NULL, NULL, FALSE, FALSE, FALSE}, - {&mech_scram_sha1, UCHAR_LEN("iws0X8v3Bz2T0CJGbJQyF0X+HI4Ts=,,,,"), NULL, NULL, FALSE, FALSE, FALSE}, - {&mech_scram_sha1, UCHAR_LEN("n,a=masteruser,,"), NULL, NULL, FALSE, FALSE, FALSE}, -@@ -387,7 +372,6 @@ static void test_mechs(void) - - test_end(); - } T_END; -- mech_otp_deinit(); - auths_deinit(); - auth_token_deinit(); - password_schemes_deinit(); -diff -up dovecot-2.3.20/src/doveadm/Makefile.am.nolibotp dovecot-2.3.20/src/doveadm/Makefile.am ---- dovecot-2.3.20/src/doveadm/Makefile.am.nolibotp 2022-12-21 09:49:12.000000000 +0100 -+++ dovecot-2.3.20/src/doveadm/Makefile.am 2023-02-14 16:54:02.119531023 +0100 -@@ -36,8 +36,7 @@ AM_CPPFLAGS = \ - $(BINARY_CFLAGS) - - cmd_pw_libs = \ -- ../auth/libpassword.la \ -- ../lib-otp/libotp.la -+ ../auth/libpassword.la - - libs = \ - dsync/libdsync.la \ -diff -up dovecot-2.3.20/src/Makefile.am.nolibotp dovecot-2.3.20/src/Makefile.am ---- dovecot-2.3.20/src/Makefile.am.nolibotp 2022-12-21 09:49:12.000000000 +0100 -+++ dovecot-2.3.20/src/Makefile.am 2023-02-14 16:54:02.119531023 +0100 -@@ -40,7 +40,6 @@ SUBDIRS = \ - lib-index \ - lib-storage \ - lib-sql \ -- lib-otp \ - lib-lda \ - lib-dict-backend \ - anvil \ diff --git a/dovecot-2.3.21-noengine.patch b/dovecot-2.3.21-noengine.patch deleted file mode 100644 index c3bb50e..0000000 --- a/dovecot-2.3.21-noengine.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff -up dovecot-2.3.21/m4/ssl.m4.noengine dovecot-2.3.21/m4/ssl.m4 ---- dovecot-2.3.21/m4/ssl.m4.noengine 2024-05-06 17:39:59.362886891 +0200 -+++ dovecot-2.3.21/m4/ssl.m4 2024-05-06 17:42:17.945312656 +0200 -@@ -233,6 +233,27 @@ AC_DEFUN([DOVECOT_SSL], [ - AC_CHECK_LIB(ssl, ECDSA_SIG_set0, [ - AC_DEFINE(HAVE_ECDSA_SIG_SET0,, [Build with ECDSA_SIG_set0 support]) - ],, $SSL_LIBS) -+ AC_CHECK_LIB(ssl, OSSL_PROVIDER_try_load, [ -+ AC_DEFINE(HAVE_OSSL_PROVIDER_try_load,, [Build with OSSL_PROVIDER_try_load support]) -+ ],, $SSL_LIBS) -+ AC_CHECK_LIB(ssl, OPENSSL_init_ssl, [ -+ AC_DEFINE(HAVE_OPENSSL_init_ssl,, [Build with OPENSSL_init_ssl support]) -+ ],, $SSL_LIBS) -+ AC_CHECK_LIB(ssl, OPENSSL_cleanup, [ -+ AC_DEFINE(HAVE_OPENSSL_cleanup,, [OpenSSL supports OPENSSL_cleanup()]) -+ ],, $SSL_LIBS) -+ AC_CHECK_LIB(ssl, OPENSSL_thread_stop, [ -+ AC_DEFINE(HAVE_OPENSSL_thread_stop,, [OpenSSL supports OPENSSL_thread_stop()]) -+ ],, $SSL_LIBS) -+ AC_CHECK_LIB(ssl, ERR_remove_thread_state, [ -+ AC_DEFINE(HAVE_ERR_remove_thread_state,, [OpenSSL supports ERR_remove_thread_state()]) -+ ],, $SSL_LIBS) -+ AC_CHECK_LIB(ssl, ERR_remove_state, [ -+ AC_DEFINE(HAVE_ERR_remove_state,, [OpenSSL supports ERR_remove_state()]) -+ ],, $SSL_LIBS) -+ AC_CHECK_LIB(ssl, ENGINE_by_id_DISABLED, [ -+ AC_DEFINE(HAVE_ENGINE_by_id,, [OpenSSL supports ENGINE_by_id() - !!!EXPLICITELY DISABLED!!! ]) -+ ],, $SSL_LIBS) - AC_CHECK_LIB(ssl, EC_GROUP_order_bits, [ - AC_DEFINE(HAVE_EC_GROUP_order_bits,, [Build with EC_GROUP_order_bits support]) - ],, $SSL_LIBS) -diff --git dovecot-2.3.21/src/lib-dcrypt/dcrypt-openssl.c.noengine dovecot-2.3.21/src/lib-dcrypt/dcrypt-openssl.c -index 1cbe352541..239a981251 100644 ---- dovecot-2.3.21/src/lib-dcrypt/dcrypt-openssl.c.noengine -+++ dovecot-2.3.21/src/lib-dcrypt/dcrypt-openssl.c -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff -up dovecot-2.3.21/src/lib-ssl-iostream/dovecot-openssl-common.c.noengine dovecot-2.3.21/src/lib-ssl-iostream/dovecot-openssl-common.c ---- dovecot-2.3.21/src/lib-ssl-iostream/dovecot-openssl-common.c.noengine 2023-09-14 15:17:46.000000000 +0200 -+++ dovecot-2.3.21/src/lib-ssl-iostream/dovecot-openssl-common.c 2024-05-06 17:39:59.363886901 +0200 -@@ -3,13 +3,23 @@ - #include "lib.h" - #include "randgen.h" - #include "dovecot-openssl-common.h" -+#include "iostream-openssl.h" - - #include --#include -+#include -+#ifdef HAVE_OSSL_PROVIDER_try_load -+# include -+#else -+# include -+#endif - #include - - static int openssl_init_refcount = 0; --static ENGINE *dovecot_openssl_engine; -+#ifdef HAVE_OSSL_PROVIDER_try_load -+static OSSL_PROVIDER *dovecot_openssl_engine = NULL; -+#else -+static ENGINE *dovecot_openssl_engine = NULL; -+#endif - - #ifdef HAVE_SSL_NEW_MEM_FUNCS - static void *dovecot_openssl_malloc(size_t size, const char *u0 ATTR_UNUSED, int u1 ATTR_UNUSED) -@@ -17,12 +27,14 @@ static void *dovecot_openssl_malloc(size - static void *dovecot_openssl_malloc(size_t size) - #endif - { -+ if (size == 0) -+ return NULL; - /* this may be performance critical, so don't use - i_malloc() or calloc() */ - void *mem = malloc(size); -- if (mem == NULL) { -+ if (unlikely(mem == NULL)) { - i_fatal_status(FATAL_OUTOFMEM, -- "OpenSSL: malloc(%zu): Out of memory", size); -+ "OpenSSL: malloc(%zu): Out of memory", size); - } - return mem; - } -@@ -33,10 +45,14 @@ static void *dovecot_openssl_realloc(voi - static void *dovecot_openssl_realloc(void *ptr, size_t size) - #endif - { -+ if (size == 0) { -+ free(ptr); -+ return NULL; -+ } - void *mem = realloc(ptr, size); -- if (mem == NULL) { -+ if (unlikely(mem == NULL)) { - i_fatal_status(FATAL_OUTOFMEM, -- "OpenSSL: realloc(%zu): Out of memory", size); -+ "OpenSSL: realloc(%zu): Out of memory", size); - } - return mem; - } -@@ -63,9 +79,13 @@ void dovecot_openssl_common_global_ref(v - /*i_warning("CRYPTO_set_mem_functions() was called too late");*/ - } - -+#ifdef HAVE_OPENSSL_init_ssl -+ OPENSSL_init_ssl(0, NULL); -+#else - SSL_library_init(); - SSL_load_error_strings(); - OpenSSL_add_all_algorithms(); -+#endif - } - - bool dovecot_openssl_common_global_unref(void) -@@ -76,30 +96,35 @@ bool dovecot_openssl_common_global_unref - return TRUE; - - if (dovecot_openssl_engine != NULL) { -+#ifdef HAVE_OSSL_PROVIDER_try_load -+ OSSL_PROVIDER_unload(dovecot_openssl_engine); -+#else - ENGINE_finish(dovecot_openssl_engine); -+#endif - dovecot_openssl_engine = NULL; - } -+#ifdef HAVE_OPENSSL_cleanup -+ OPENSSL_cleanup(); -+#else - /* OBJ_cleanup() is called automatically by EVP_cleanup() in - newer versions. Doesn't hurt to call it anyway. */ - OBJ_cleanup(); --#ifdef HAVE_SSL_COMP_FREE_COMPRESSION_METHODS -+# if !defined(OPENSSL_NO_COMP) - SSL_COMP_free_compression_methods(); --#endif -+# endif - ENGINE_cleanup(); - EVP_cleanup(); - CRYPTO_cleanup_all_ex_data(); --#ifdef HAVE_OPENSSL_AUTO_THREAD_DEINIT -+# ifdef HAVE_OPENSSL_thread_stop - /* no cleanup needed */ --#elif defined(HAVE_OPENSSL_ERR_REMOVE_THREAD_STATE) -+# elif defined(HAVE_ERR_remove_thread_state) - /* This was marked as deprecated in v1.1. */ - ERR_remove_thread_state(NULL); --#else -+# elif defined(HAVE_ERR_remove_state) - /* This was deprecated by ERR_remove_thread_state(NULL) in v1.0.0. */ - ERR_remove_state(0); --#endif -+# endif - ERR_free_strings(); --#ifdef HAVE_OPENSSL_CLEANUP -- OPENSSL_cleanup(); - #endif - return FALSE; - } -@@ -110,6 +135,7 @@ int dovecot_openssl_common_global_set_en - if (dovecot_openssl_engine != NULL) - return 1; - -+#ifdef HAVE_ENGINE_by_id - ENGINE_load_builtin_engines(); - dovecot_openssl_engine = ENGINE_by_id(engine); - if (dovecot_openssl_engine == NULL) { -@@ -128,5 +154,15 @@ int dovecot_openssl_common_global_set_en - dovecot_openssl_engine = NULL; - return -1; - } -+#elif defined(HAVE_OSSL_PROVIDER_try_load) -+ if ((dovecot_openssl_engine = OSSL_PROVIDER_try_load(NULL, engine, 1)) == NULL) { -+ *error_r = t_strdup_printf("Cannot load '%s': %s", engine, -+ openssl_iostream_error()); -+ return 0; -+ } -+ return 1; -+#else -+ *error_r = t_strdup_printf("Cannot load '%s': No engine/provider support available", engine); -+#endif - return 1; - } -diff -up dovecot-2.3.21/src/lib-ssl-iostream/Makefile.am.noengine dovecot-2.3.21/src/lib-ssl-iostream/Makefile.am ---- dovecot-2.3.21/src/lib-ssl-iostream/Makefile.am.noengine 2023-09-14 15:17:46.000000000 +0200 -+++ dovecot-2.3.21/src/lib-ssl-iostream/Makefile.am 2024-05-06 17:39:59.363886901 +0200 -@@ -5,7 +5,8 @@ NOPLUGIN_LDFLAGS = - AM_CPPFLAGS = \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib-test \ -- -DMODULE_DIR=\""$(moduledir)"\" -+ -DMODULE_DIR=\""$(moduledir)"\" \ -+ $(SSL_CFLAGS) - - if BUILD_OPENSSL - module_LTLIBRARIES = libssl_iostream_openssl.la diff --git a/dovecot-2.3.21-test-socket-path.patch b/dovecot-2.3.21-test-socket-path.patch deleted file mode 100644 index 8132244..0000000 --- a/dovecot-2.3.21-test-socket-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9a3e0d099044d3a7478c3a24ccb8990181767f7c Mon Sep 17 00:00:00 2001 -From: Duncan Bellamy -Date: Sat, 6 Mar 2021 14:25:29 +0000 -Subject: [PATCH] imap: Shorten test-imap-client-hibernate socket path length - ---- - src/imap/test-imap-client-hibernate.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/imap/test-imap-client-hibernate.c b/src/imap/test-imap-client-hibernate.c -index 9b90e1bd9a..c5392fa3fc 100644 ---- a/src/imap/test-imap-client-hibernate.c -+++ b/src/imap/test-imap-client-hibernate.c -@@ -19,7 +19,7 @@ - - #include - --#define TEMP_DIRNAME ".test-imap-client-hibernate" -+#define TEMP_DIRNAME ".test-ich" - - #define EVILSTR "\t\r\n\001" - diff --git a/dovecot-2.3.21.1-fixicu.patch b/dovecot-2.3.21.1-fixicu.patch new file mode 100644 index 0000000..19f0658 --- /dev/null +++ b/dovecot-2.3.21.1-fixicu.patch @@ -0,0 +1,13 @@ +diff -up dovecot-2.3.20/m4/want_icu.m4.fixicu dovecot-2.3.20/m4/want_icu.m4 +--- dovecot-2.3.20/m4/want_icu.m4.fixicu 2022-12-21 09:49:12.000000000 +0100 ++++ dovecot-2.3.20/m4/want_icu.m4 2025-01-29 10:47:25.765768562 +0100 +@@ -1,7 +1,7 @@ + AC_DEFUN([DOVECOT_WANT_ICU], [ + if test "$want_icu" != "no"; then +- if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists icu-i18n 2>/dev/null; then +- PKG_CHECK_MODULES(LIBICU, icu-i18n) ++ if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists icu-i18n icu-uc 2>/dev/null; then ++ PKG_CHECK_MODULES(LIBICU, icu-i18n icu-uc) + have_icu=yes + AC_DEFINE(HAVE_LIBICU,, [Define if you want ICU normalization support for FTS]) + elif test "$want_icu" = "yes"; then diff --git a/dovecot-2.4.1-nolibotp.patch b/dovecot-2.4.1-nolibotp.patch new file mode 100644 index 0000000..aea6ada --- /dev/null +++ b/dovecot-2.4.1-nolibotp.patch @@ -0,0 +1,285 @@ +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/auth/test-auth.c.nolibotp dovecot-2.4.2-build/dovecot-2.4.2/src/auth/test-auth.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/auth/test-auth.c.nolibotp 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/auth/test-auth.c 2025-11-30 13:38:50.100927373 +0100 +@@ -16,7 +16,7 @@ + static const char *const settings[] = { + "base_dir", ".", + "auth_mechanisms", +- "ANONYMOUS APOP CRAM-MD5 DIGEST-MD5 EXTERNAL LOGIN PLAIN OTP " ++ "ANONYMOUS APOP CRAM-MD5 DIGEST-MD5 EXTERNAL LOGIN PLAIN " + "OAUTHBEARER SCRAM-SHA-1 SCRAM-SHA-256 XOAUTH2", + "auth_username_chars", "", + "auth_username_format", "", +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/auth/test-mech.c.nolibotp dovecot-2.4.2-build/dovecot-2.4.2/src/auth/test-mech.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/auth/test-mech.c.nolibotp 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/auth/test-mech.c 2025-11-30 13:38:50.101130654 +0100 +@@ -46,10 +46,7 @@ request_handler_reply_mock_callback(stru + + if (request->passdb_result == PASSDB_RESULT_OK) + request->failed = FALSE; +- else if (strcmp(request->fields.mech_name, SASL_MECH_NAME_OTP) == 0) { +- if (null_strcmp(request->fields.user, "otp_phase_2") == 0) +- request->failed = FALSE; +- } else if (strcmp(request->fields.mech_name, ++ else if (strcmp(request->fields.mech_name, + SASL_MECH_NAME_OAUTHBEARER) == 0) { + } + }; +@@ -190,10 +187,6 @@ static void test_mechs(void) + {"PLAIN", UCHAR_LEN("\0testuser\0testpass"), "testuser", TRUE, FALSE, FALSE}, + {"PLAIN", UCHAR_LEN("normaluser\0masteruser\0masterpass"), "masteruser", TRUE, FALSE, FALSE}, + {"PLAIN", UCHAR_LEN("normaluser\0normaluser\0masterpass"), "normaluser", TRUE, FALSE, FALSE}, +- {"OTP", UCHAR_LEN("hex:5Bf0 75d9 959d 036f"), "otp_phase_2", TRUE, TRUE, FALSE}, +- {"OTP", UCHAR_LEN("word:BOND FOGY DRAB NE RISE MART"), "otp_phase_2", TRUE, TRUE, FALSE}, +- {"OTP", UCHAR_LEN("init-hex:f6bd 6b33 89b8 7203:md5 499 ke6118:23d1 b253 5ae0 2b7e"), "otp_phase_2", TRUE, TRUE, FALSE}, +- {"OTP", UCHAR_LEN("init-word:END KERN BALM NICK EROS WAVY:md5 499 ke1235:BABY FAIN OILY NIL TIDY DADE"), "otp_phase_2", TRUE, TRUE, FALSE}, + {"OAUTHBEARER", UCHAR_LEN("n,a=testuser,p=cHJvb2Y=,f=nonstandart\x01host=server\x01port=143\x01""auth=Bearer vF9dft4qmTc2Nvb3RlckBhbHRhdmlzdGEuY29tCg==\x01\x01"), "testuser", FALSE, TRUE, FALSE}, + {"SCRAM-SHA-1", UCHAR_LEN("n,,n=testuser,r=rOprNGfwEbeRWgbNEkqO"), "testuser", TRUE, FALSE, FALSE}, + {"SCRAM-SHA-256", UCHAR_LEN("n,,n=testuser,r=rOprNGfwEbeRWgbNEkqO"), "testuser", TRUE, FALSE, FALSE}, +@@ -208,8 +201,6 @@ static void test_mechs(void) + {"EXTERNAL", UCHAR_LEN(""), "testuser", FALSE, TRUE, FALSE}, + {"EXTERNAL", UCHAR_LEN(""), NULL, FALSE, FALSE, FALSE}, + {"LOGIN", UCHAR_LEN(""), NULL, FALSE, FALSE, FALSE}, +- {"OTP", UCHAR_LEN(""), NULL, FALSE, FALSE, FALSE}, +- {"OTP", UCHAR_LEN(""), "testuser", FALSE, FALSE, FALSE}, + {"PLAIN", UCHAR_LEN(""), NULL, FALSE, FALSE, FALSE}, + {"OAUTHBEARER", UCHAR_LEN(""), NULL, FALSE, FALSE, FALSE}, + {"XOAUTH2", UCHAR_LEN(""), NULL, FALSE, FALSE, FALSE}, +@@ -221,7 +212,6 @@ static void test_mechs(void) + {"APOP", UCHAR_LEN("1.1.1\0testuser\0tooshort"), NULL, FALSE, FALSE, FALSE}, + {"APOP", UCHAR_LEN("1.1.1\0testuser\0responseoflen16-"), NULL, FALSE, FALSE, FALSE}, + {"APOP", UCHAR_LEN("1.1.1"), NULL, FALSE, FALSE, FALSE}, +- {"OTP", UCHAR_LEN("somebody\0testuser"), "testuser", FALSE, TRUE, FALSE}, + {"CRAM-MD5", UCHAR_LEN("testuser\0response"), "testuser", FALSE, FALSE, FALSE}, + {"PLAIN", UCHAR_LEN("testuser\0"), "testuser", FALSE, FALSE, FALSE}, + +@@ -264,9 +254,7 @@ static void test_mechs(void) + {"PLAIN", UCHAR_LEN("\0fa\0il\0ing\0withthis"), NULL, FALSE, FALSE, FALSE}, + {"PLAIN", UCHAR_LEN("failingwiththis"), NULL, FALSE, FALSE, FALSE}, + {"PLAIN", UCHAR_LEN("failing\0withthis"), NULL, FALSE, FALSE, FALSE}, +- {"OTP", UCHAR_LEN("someb\0ody\0testuser"), NULL, FALSE, FALSE, FALSE}, + /* phase 2 */ +- {"OTP", UCHAR_LEN("someb\0ody\0testuser"), "testuser", FALSE, TRUE, FALSE}, + {"SCRAM-SHA-1", UCHAR_LEN("c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts="), NULL, FALSE, FALSE, FALSE}, + {"SCRAM-SHA-1", UCHAR_LEN("iws0X8v3Bz2T0CJGbJQyF0X+HI4Ts=,,,,"), NULL, FALSE, FALSE, FALSE}, + {"SCRAM-SHA-1", UCHAR_LEN("n,a=masteruser,,"), NULL, FALSE, FALSE, FALSE}, +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.c.nolibotp dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.c.nolibotp 2025-11-30 13:38:50.093609901 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.c 2025-11-30 13:38:50.101359374 +0100 +@@ -13,7 +13,6 @@ + #include "randgen.h" + #include "sha1.h" + #include "sha2.h" +-#include "otp.h" + #include "str.h" + #include "auth-digest.h" + #include "password-scheme.h" +@@ -704,33 +703,6 @@ plain_md5_generate(const char *plaintext + *size_r = MD5_RESULTLEN; + } + +-static int otp_verify(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED, +- const unsigned char *raw_password, size_t size, +- const char **error_r) +-{ +- const char *password, *generated; +- +- password = t_strndup(raw_password, size); +- if (password_generate_otp(plaintext, password, UINT_MAX, &generated) < 0) { +- *error_r = "Invalid OTP data in passdb"; +- return -1; +- } +- +- return strcasecmp(password, generated) == 0 ? 1 : 0; +-} +- +-static void +-otp_generate(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED, +- const unsigned char **raw_password_r, size_t *size_r) +-{ +- const char *password; +- +- if (password_generate_otp(plaintext, NULL, OTP_HASH_SHA1, &password) < 0) +- i_unreached(); +- *raw_password_r = (const unsigned char *)password; +- *size_r = strlen(password); +-} +- + static const struct password_scheme builtin_schemes[] = { + { + .name = "MD5", +@@ -894,13 +866,6 @@ static const struct password_scheme buil + .password_generate = plain_md5_generate, + }, + { +- .name = "OTP", +- .default_encoding = PW_ENCODING_NONE, +- .raw_password_len = 0, +- .password_verify = otp_verify, +- .password_generate = otp_generate, +- }, +- { + .name = "PBKDF2", + .default_encoding = PW_ENCODING_NONE, + .raw_password_len = 0, +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.h.nolibotp dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.h +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.h.nolibotp 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.h 2025-11-30 13:38:50.101549260 +0100 +@@ -98,9 +98,6 @@ void password_set_encryption_rounds(unsi + /* INTERNAL: */ + const char *password_generate_salt(size_t len); + const char *password_generate_md5_crypt(const char *pw, const char *salt); +-int password_generate_otp(const char *pw, const char *state_data, +- unsigned int algo, const char **result_r) +- ATTR_NULL(2); + + int scram_verify(const struct hash_method *hmethod, const char *scheme_name, + const char *plaintext, const unsigned char *raw_password, +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/test-password-scheme.c.nolibotp dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/test-password-scheme.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/test-password-scheme.c.nolibotp 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/test-password-scheme.c 2025-11-30 13:38:50.101711124 +0100 +@@ -107,7 +107,6 @@ static void test_password_schemes(void) + test_password_scheme("SHA512", "{SHA512}7iaw3Ur350mqGo7jwQrpkj9hiYB3Lkc/iBml1JQODbJ6wYX4oOHV+E+IvIh/1nsUNzLDBMxfqa2Ob1f1ACio/w==", "test"); + test_password_scheme("SSHA", "{SSHA}H/zrDv8FXUu1JmwvVYijfrYEF34jVZcO", "test"); + test_password_scheme("MD5-CRYPT", "{MD5-CRYPT}$1$GgvxyNz8$OjZhLh4P.gF1lxYEbLZ3e/", "test"); +- test_password_scheme("OTP", "{OTP}sha1 1024 ae6b49aa481f7233 f69fc7f98b8fbf54", "test"); + test_password_scheme("PBKDF2", "{PBKDF2}$1$bUnT4Pl7yFtYX0KU$5000$50a83cafdc517b9f46519415e53c6a858908680a", "test"); + test_password_scheme("CRAM-MD5", "{CRAM-MD5}e02d374fde0dc75a17a557039a3a5338c7743304777dccd376f332bee68d2cf6", "test"); + test_password_scheme("DIGEST-MD5", "{DIGEST-MD5}77c1a8c437c9b08ba2f460fe5d58db5d", "test"); +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client.c.nolibotp dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client.c.nolibotp 2025-11-30 13:39:54.210043386 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client.c 2025-11-30 13:39:54.217205256 +0100 +@@ -175,7 +175,6 @@ void dsasl_clients_init(void) + dsasl_client_mech_register(&dsasl_client_mech_digest_md5); + dsasl_client_mech_register(&dsasl_client_mech_cram_md5); + dsasl_client_mech_register(&dsasl_client_mech_oauthbearer); +- dsasl_client_mech_register(&dsasl_client_mech_otp); + dsasl_client_mech_register(&dsasl_client_mech_xoauth2); + dsasl_client_mech_register(&dsasl_client_mech_scram_sha_1); + dsasl_client_mech_register(&dsasl_client_mech_scram_sha_1_plus); +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client-private.h.nolibotp dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client-private.h +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client-private.h.nolibotp 2025-11-30 13:40:22.269119732 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client-private.h 2025-11-30 13:40:22.275363043 +0100 +@@ -50,7 +50,6 @@ extern const struct dsasl_client_mech ds + extern const struct dsasl_client_mech dsasl_client_mech_external; + extern const struct dsasl_client_mech dsasl_client_mech_login; + extern const struct dsasl_client_mech dsasl_client_mech_oauthbearer; +-extern const struct dsasl_client_mech dsasl_client_mech_otp; + extern const struct dsasl_client_mech dsasl_client_mech_xoauth2; + extern const struct dsasl_client_mech dsasl_client_mech_scram_sha_1; + extern const struct dsasl_client_mech dsasl_client_mech_scram_sha_1_plus; +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/fuzz-sasl-authentication.c.nolibotp dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/fuzz-sasl-authentication.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/fuzz-sasl-authentication.c.nolibotp 2025-11-30 13:40:56.823727053 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/fuzz-sasl-authentication.c 2025-11-30 13:40:56.837864792 +0100 +@@ -635,7 +635,6 @@ static void fuzz_sasl_run(struct istream + sasl_server_mech_register_cram_md5(server_inst); + sasl_server_mech_register_digest_md5(server_inst); + sasl_server_mech_register_login(server_inst); +- sasl_server_mech_register_otp(server_inst); + sasl_server_mech_register_plain(server_inst); + sasl_server_mech_register_scram_sha1(server_inst); + sasl_server_mech_register_scram_sha1_plus(server_inst); +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/sasl-server.h.nolibotp dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/sasl-server.h +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/sasl-server.h.nolibotp 2025-11-30 13:41:24.035316421 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/sasl-server.h 2025-11-30 13:41:24.050796571 +0100 +@@ -193,8 +193,6 @@ void sasl_server_mech_register_scram_sha + void sasl_server_mech_register_scram_sha256_plus( + struct sasl_server_instance *sinst); + +-void sasl_server_mech_register_otp(struct sasl_server_instance *sinst); +- + /* Winbind */ + + struct sasl_server_winbind_settings { +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/test-sasl-authentication.c.nolibotp dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/test-sasl-authentication.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/test-sasl-authentication.c.nolibotp 2025-11-30 13:42:08.741524883 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/test-sasl-authentication.c 2025-11-30 13:42:08.757334395 +0100 +@@ -507,7 +507,6 @@ test_sasl_run(const struct test_sasl *te + sasl_server_mech_register_digest_md5(server_inst); + sasl_server_mech_register_external(server_inst); + sasl_server_mech_register_login(server_inst); +- sasl_server_mech_register_otp(server_inst); + sasl_server_mech_register_plain(server_inst); + sasl_server_mech_register_scram_sha1(server_inst); + sasl_server_mech_register_scram_sha1_plus(server_inst); +@@ -722,16 +721,6 @@ static const struct test_sasl success_te + .password = "tokentokentoken", + }, + }, +- /* OTP */ +- { +- .mech = "OTP", +- .authid_type = SASL_SERVER_AUTHID_TYPE_USERNAME, +- .server = { +- .authid = "user", +- .password = "pass", +- }, +- .repeat = 1050, +- }, + /* EXTERNAL */ + { + .mech = "EXTERNAL", +@@ -1457,31 +1446,6 @@ static const struct test_sasl bad_creds_ + }, + .failure = TRUE, + }, +- /* OTP */ +- { +- .mech = "OTP", +- .authid_type = SASL_SERVER_AUTHID_TYPE_USERNAME, +- .server = { +- .authid = "user", +- .password = "pass", +- }, +- .client = { +- .authid = "userb", +- }, +- .failure = TRUE, +- }, +- { +- .mech = "OTP", +- .authid_type = SASL_SERVER_AUTHID_TYPE_USERNAME, +- .server = { +- .authid = "user", +- .password = "pass", +- }, +- .client = { +- .password = "florp", +- }, +- .failure = TRUE, +- }, + /* EXTERNAL */ + { + .mech = "EXTERNAL", +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/auth/auth-sasl.c.nolibotp2 dovecot-2.4.2-build/dovecot-2.4.2/src/auth/auth-sasl.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/auth/auth-sasl.c.nolibotp2 2025-11-30 13:56:23.124460140 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/auth/auth-sasl.c 2025-11-30 13:56:39.521935947 +0100 +@@ -472,7 +472,6 @@ MECH_SIMPLE_REGISTER__TEMPLATE(cram_md5) + MECH_SIMPLE_REGISTER__TEMPLATE(digest_md5) + MECH_SIMPLE_REGISTER__TEMPLATE(external) + MECH_SIMPLE_REGISTER__TEMPLATE(login) +-MECH_SIMPLE_REGISTER__TEMPLATE(otp) + MECH_SIMPLE_REGISTER__TEMPLATE(plain) + MECH_SIMPLE_REGISTER__TEMPLATE(scram_sha1) + MECH_SIMPLE_REGISTER__TEMPLATE(scram_sha1_plus) +@@ -539,12 +538,6 @@ static const struct auth_sasl_mech_modul + .mech_register = mech_login_register, + }; + +-static const struct auth_sasl_mech_module mech_otp = { +- .mech_name = SASL_MECH_NAME_OTP, +- +- .mech_register = mech_otp_register, +-}; +- + static const struct auth_sasl_mech_module mech_plain = { + .mech_name = SASL_MECH_NAME_PLAIN, + +@@ -612,7 +605,6 @@ static void auth_sasl_mechs_init(const s + if (set->use_winbind) + auth_sasl_mech_register_module(&mech_winbind_ntlm); + auth_sasl_mech_oauth2_register(); +- auth_sasl_mech_register_module(&mech_otp); + auth_sasl_mech_register_module(&mech_plain); + auth_sasl_mech_register_module(&mech_scram_sha1); + auth_sasl_mech_register_module(&mech_scram_sha1_plus); diff --git a/dovecot-2.3.6-opensslhmac.patch b/dovecot-2.4.1-opensslhmac3.patch similarity index 57% rename from dovecot-2.3.6-opensslhmac.patch rename to dovecot-2.4.1-opensslhmac3.patch index 53f3321..1947856 100644 --- a/dovecot-2.3.6-opensslhmac.patch +++ b/dovecot-2.4.1-opensslhmac3.patch @@ -1,7 +1,7 @@ -diff -up dovecot-2.3.18/src/auth/auth-token.c.opensslhmac dovecot-2.3.18/src/auth/auth-token.c ---- dovecot-2.3.18/src/auth/auth-token.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/auth/auth-token.c 2022-02-09 09:27:15.887883359 +0100 -@@ -161,17 +161,17 @@ void auth_token_deinit(void) +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/auth/auth-token.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/auth/auth-token.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/auth/auth-token.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/auth/auth-token.c 2025-11-30 09:57:55.178213106 +0100 +@@ -162,17 +162,17 @@ void auth_token_deinit(void) const char *auth_token_get(const char *service, const char *session_pid, const char *username, const char *session_id) { @@ -26,108 +26,130 @@ diff -up dovecot-2.3.18/src/auth/auth-token.c.opensslhmac dovecot-2.3.18/src/aut return binary_to_hex(result, sizeof(result)); } -diff -up dovecot-2.3.18/src/auth/mech-cram-md5.c.opensslhmac dovecot-2.3.18/src/auth/mech-cram-md5.c ---- dovecot-2.3.18/src/auth/mech-cram-md5.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/auth/mech-cram-md5.c 2022-02-09 09:27:15.887883359 +0100 -@@ -51,7 +51,7 @@ static bool verify_credentials(struct cr - { - - unsigned char digest[MD5_RESULTLEN]; -- struct hmac_context ctx; -+ struct orig_hmac_context ctx; - const char *response_hex; +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/auth/Makefile.am.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/auth/Makefile.am +--- dovecot-2.4.2-build/dovecot-2.4.2/src/auth/Makefile.am.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/auth/Makefile.am 2025-11-30 09:57:55.178490134 +0100 +@@ -71,6 +71,7 @@ auth_LDFLAGS = -export-dynamic + auth_libs = \ + ../lib-auth/libauth-crypt.la \ + $(AUTH_LUA_LIBS) \ ++ $(SSL_LIBS) \ + $(LIBDOVECOT_SQL) - if (size != CRAM_MD5_CONTEXTLEN) { -@@ -60,10 +60,10 @@ static bool verify_credentials(struct cr - return FALSE; - } + auth_CPPFLAGS = $(AM_CPPFLAGS) $(BINARY_CFLAGS) +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/imap/Makefile.am.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/imap/Makefile.am +--- dovecot-2.4.2-build/dovecot-2.4.2/src/imap/Makefile.am.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/imap/Makefile.am 2025-11-30 09:57:55.179136544 +0100 +@@ -21,11 +21,13 @@ AM_CPPFLAGS = \ + $(BINARY_CFLAGS) -- hmac_init(&ctx, NULL, 0, &hash_method_md5); -+ orig_hmac_init(&ctx, NULL, 0, &hash_method_md5); - hmac_md5_set_cram_context(&ctx, credentials); -- hmac_update(&ctx, request->challenge, strlen(request->challenge)); -- hmac_final(&ctx, digest); -+ orig_hmac_update(&ctx, request->challenge, strlen(request->challenge)); -+ orig_hmac_final(&ctx, digest); + imap_LDFLAGS = -export-dynamic \ ++ $(SSL_LIBS) \ + $(BINARY_LDFLAGS) - response_hex = binary_to_hex(digest, sizeof(digest)); + imap_LDADD = \ + ../lib-imap-urlauth/libimap-urlauth.la \ + ../lib-compression/libcompression.la \ ++ $(SSL_LIBS) \ + $(LIBDOVECOT_STORAGE) \ + $(LIBDOVECOT) + imap_DEPENDENCIES = \ +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/imap-urlauth/Makefile.am.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/imap-urlauth/Makefile.am +--- dovecot-2.4.2-build/dovecot-2.4.2/src/imap-urlauth/Makefile.am.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/imap-urlauth/Makefile.am 2025-11-30 09:57:55.179268682 +0100 +@@ -23,6 +23,7 @@ imap_urlauth_CPPFLAGS = \ + imap_urlauth_LDFLAGS = -export-dynamic -diff -up dovecot-2.3.18/src/auth/mech-scram.c.opensslhmac dovecot-2.3.18/src/auth/mech-scram.c ---- dovecot-2.3.18/src/auth/mech-scram.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/auth/mech-scram.c 2022-02-09 09:31:50.927146858 +0100 -@@ -93,7 +93,7 @@ get_scram_server_first(struct scram_auth - static const char *get_scram_server_final(struct scram_auth_request *request) - { - const struct hash_method *hmethod = request->hash_method; -- struct hmac_context ctx; -+ struct openssl_hmac_context ctx; - const char *auth_message; - unsigned char server_signature[hmethod->digest_size]; - string_t *str; -@@ -109,9 +109,9 @@ static const char *get_scram_server_fina - request->server_first_message, ",", - request->client_final_message_without_proof, NULL); + imap_urlauth_LDADD = $(LIBDOVECOT) \ ++ $(SSL_LIBS) + $(BINARY_LDFLAGS) -- hmac_init(&ctx, request->server_key, hmethod->digest_size, hmethod); -- hmac_update(&ctx, auth_message, strlen(auth_message)); -- hmac_final(&ctx, server_signature); -+ openssl_hmac_init(&ctx, request->server_key, hmethod->digest_size, hmethod); -+ openssl_hmac_update(&ctx, auth_message, strlen(auth_message)); -+ openssl_hmac_final(&ctx, server_signature); + imap_urlauth_DEPENDENCIES = $(LIBDOVECOT_DEPS) +@@ -53,7 +54,7 @@ imap_urlauth_worker_LDFLAGS = -export-dy + urlauth_libs = \ + $(top_builddir)/src/lib-imap-urlauth/libimap-urlauth.la - /* RFC 5802, Section 7: +-imap_urlauth_worker_LDADD = $(urlauth_libs) $(LIBDOVECOT_STORAGE) $(LIBDOVECOT) ++imap_urlauth_worker_LDADD = $(urlauth_libs) $(SSL_LIBS) $(LIBDOVECOT_STORAGE) $(LIBDOVECOT) + imap_urlauth_worker_DEPENDENCIES = $(urlauth_libs) $(LIBDOVECOT_STORAGE_DEPS) $(LIBDOVECOT_DEPS) -@@ -292,7 +292,7 @@ parse_scram_client_first(struct scram_au - static bool verify_credentials(struct scram_auth_request *request) - { - const struct hash_method *hmethod = request->hash_method; -- struct hmac_context ctx; -+ struct openssl_hmac_context ctx; - const char *auth_message; - unsigned char client_key[hmethod->digest_size]; + imap_urlauth_worker_SOURCES = \ +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram-client.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram-client.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram-client.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram-client.c 2025-11-30 09:57:55.179413002 +0100 +@@ -222,7 +222,7 @@ static string_t *auth_scram_get_client_f unsigned char client_signature[hmethod->digest_size]; -@@ -310,9 +310,9 @@ static bool verify_credentials(struct sc - request->server_first_message, ",", - request->client_final_message_without_proof, NULL); + unsigned char client_proof[hmethod->digest_size]; + unsigned char server_key[hmethod->digest_size]; +- struct hmac_context ctx; ++ struct openssl_hmac_context ctx; + const void *cbind_input; + size_t cbind_input_size; + string_t *auth_message, *str; +@@ -281,9 +281,9 @@ static string_t *auth_scram_get_client_f + client->iter, salted_password); -- hmac_init(&ctx, request->stored_key, hmethod->digest_size, hmethod); -- hmac_update(&ctx, auth_message, strlen(auth_message)); + /* ClientKey := HMAC(SaltedPassword, "Client Key") */ +- hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); +- hmac_update(&ctx, "Client Key", 10); +- hmac_final(&ctx, client_key); ++ openssl_hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); ++ openssl_hmac_update(&ctx, "Client Key", 10); ++ openssl_hmac_final(&ctx, client_key); + + /* StoredKey := H(ClientKey) */ + hash_method_get_digest(hmethod, client_key, sizeof(client_key), +@@ -301,9 +301,9 @@ static string_t *auth_scram_get_client_f + str_append_str(auth_message, str); + + /* ClientSignature := HMAC(StoredKey, AuthMessage) */ +- hmac_init(&ctx, stored_key, sizeof(stored_key), hmethod); +- hmac_update(&ctx, str_data(auth_message), str_len(auth_message)); - hmac_final(&ctx, client_signature); -+ openssl_hmac_init(&ctx, request->stored_key, hmethod->digest_size, hmethod); -+ openssl_hmac_update(&ctx, auth_message, strlen(auth_message)); ++ openssl_hmac_init(&ctx, stored_key, sizeof(stored_key), hmethod); ++ openssl_hmac_update(&ctx, str_data(auth_message), str_len(auth_message)); + openssl_hmac_final(&ctx, client_signature); /* ClientProof := ClientKey XOR ClientSignature */ - const unsigned char *proof_data = request->proof->data; -diff -up dovecot-2.3.18/src/auth/password-scheme.c.opensslhmac dovecot-2.3.18/src/auth/password-scheme.c ---- dovecot-2.3.18/src/auth/password-scheme.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/auth/password-scheme.c 2022-02-09 09:27:15.888883345 +0100 -@@ -639,11 +639,11 @@ static void - cram_md5_generate(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED, - const unsigned char **raw_password_r, size_t *size_r) - { -- struct hmac_context ctx; -+ struct orig_hmac_context ctx; - unsigned char *context_digest; + for (k = 0; k < hmethod->digest_size; k++) +@@ -314,16 +314,16 @@ static string_t *auth_scram_get_client_f + safe_memset(client_signature, 0, sizeof(client_signature)); - context_digest = t_malloc_no0(CRAM_MD5_CONTEXTLEN); -- hmac_init(&ctx, (const unsigned char *)plaintext, -+ orig_hmac_init(&ctx, (const unsigned char *)plaintext, - strlen(plaintext), &hash_method_md5); - hmac_md5_get_cram_context(&ctx, context_digest); + /* ServerKey := HMAC(SaltedPassword, "Server Key") */ +- hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); +- hmac_update(&ctx, "Server Key", 10); +- hmac_final(&ctx, server_key); ++ openssl_hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); ++ openssl_hmac_update(&ctx, "Server Key", 10); ++ openssl_hmac_final(&ctx, server_key); -diff -up dovecot-2.3.18/src/auth/password-scheme-scram.c.opensslhmac dovecot-2.3.18/src/auth/password-scheme-scram.c ---- dovecot-2.3.18/src/auth/password-scheme-scram.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/auth/password-scheme-scram.c 2022-02-09 09:27:15.888883345 +0100 -@@ -30,23 +30,23 @@ Hi(const struct hash_method *hmethod, co - const unsigned char *salt, size_t salt_size, unsigned int i, - unsigned char *result) + /* ServerSignature := HMAC(ServerKey, AuthMessage) */ + client->server_signature = + p_malloc(client->pool, hmethod->digest_size); +- hmac_init(&ctx, server_key, sizeof(server_key), hmethod); +- hmac_update(&ctx, str_data(auth_message), str_len(auth_message)); +- hmac_final(&ctx, client->server_signature); ++ openssl_hmac_init(&ctx, server_key, sizeof(server_key), hmethod); ++ openssl_hmac_update(&ctx, str_data(auth_message), str_len(auth_message)); ++ openssl_hmac_final(&ctx, client->server_signature); + + safe_memset(salted_password, 0, sizeof(salted_password)); + +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram.c 2025-11-30 09:57:55.179729815 +0100 +@@ -31,7 +31,7 @@ void auth_scram_hi(const struct hash_met + const unsigned char *salt, size_t salt_size, unsigned int i, + unsigned char *result) { - struct hmac_context ctx; + struct openssl_hmac_context ctx; unsigned char U[hmethod->digest_size]; unsigned int j, k; +@@ -51,18 +51,18 @@ void auth_scram_hi(const struct hash_met + */ + /* Calculate U1 */ - hmac_init(&ctx, str, str_size, hmethod); - hmac_update(&ctx, salt, salt_size); @@ -151,7 +173,108 @@ diff -up dovecot-2.3.18/src/auth/password-scheme-scram.c.opensslhmac dovecot-2.3 for (k = 0; k < hmethod->digest_size; k++) result[k] ^= U[k]; } -@@ -102,7 +102,7 @@ int scram_verify(const struct hash_metho +@@ -75,7 +75,7 @@ void auth_scram_generate_key_data(const + unsigned char stored_key_r[], + unsigned char server_key_r[]) + { +- struct hmac_context ctx; ++ struct openssl_hmac_context ctx; + unsigned char salt[16]; + unsigned char salted_password[hmethod->digest_size]; + unsigned char client_key[hmethod->digest_size]; +@@ -97,18 +97,18 @@ void auth_scram_generate_key_data(const + salt, sizeof(salt), rounds, salted_password); + + /* Calculate ClientKey */ +- hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); +- hmac_update(&ctx, "Client Key", 10); +- hmac_final(&ctx, client_key); ++ openssl_hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); ++ openssl_hmac_update(&ctx, "Client Key", 10); ++ openssl_hmac_final(&ctx, client_key); + + /* Calculate StoredKey */ + hash_method_get_digest(hmethod, client_key, sizeof(client_key), + stored_key_r); + + /* Calculate ServerKey */ +- hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); +- hmac_update(&ctx, "Server Key", 10); +- hmac_final(&ctx, server_key_r); ++ openssl_hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); ++ openssl_hmac_update(&ctx, "Server Key", 10); ++ openssl_hmac_final(&ctx, server_key_r); + + safe_memset(salted_password, 0, sizeof(salted_password)); + safe_memset(client_key, 0, sizeof(client_key)); +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram-server.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram-server.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram-server.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/auth-scram-server.c 2025-11-30 09:57:55.179862473 +0100 +@@ -288,7 +288,7 @@ auth_scram_server_verify_credentials(str + { + const struct hash_method *hmethod = server->set.hash_method; + struct auth_scram_key_data *kdata = &server->key_data; +- struct hmac_context ctx; ++ struct openssl_hmac_context ctx; + const char *auth_message; + unsigned char client_key[hmethod->digest_size]; + unsigned char client_signature[hmethod->digest_size]; +@@ -309,9 +309,9 @@ auth_scram_server_verify_credentials(str + server->server_first_message, ",", + server->client_final_message_without_proof, NULL); + +- hmac_init(&ctx, kdata->stored_key, hmethod->digest_size, hmethod); +- hmac_update(&ctx, auth_message, strlen(auth_message)); +- hmac_final(&ctx, client_signature); ++ openssl_hmac_init(&ctx, kdata->stored_key, hmethod->digest_size, hmethod); ++ openssl_hmac_update(&ctx, auth_message, strlen(auth_message)); ++ openssl_hmac_final(&ctx, client_signature); + + /* ClientProof := ClientKey XOR ClientSignature */ + const unsigned char *proof_data = server->proof->data; +@@ -440,7 +440,7 @@ auth_scram_get_server_final(struct auth_ + { + const struct hash_method *hmethod = server->set.hash_method; + struct auth_scram_key_data *kdata = &server->key_data; +- struct hmac_context ctx; ++ struct openssl_hmac_context ctx; + const char *auth_message; + unsigned char server_signature[hmethod->digest_size]; + string_t *str; +@@ -456,9 +456,9 @@ auth_scram_get_server_final(struct auth_ + server->server_first_message, ",", + server->client_final_message_without_proof, NULL); + +- hmac_init(&ctx, kdata->server_key, hmethod->digest_size, hmethod); +- hmac_update(&ctx, auth_message, strlen(auth_message)); +- hmac_final(&ctx, server_signature); ++ openssl_hmac_init(&ctx, kdata->server_key, hmethod->digest_size, hmethod); ++ openssl_hmac_update(&ctx, auth_message, strlen(auth_message)); ++ openssl_hmac_final(&ctx, server_signature); + + /* RFC 5802, Section 7: + +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme.c 2025-11-30 09:57:55.180035106 +0100 +@@ -633,11 +633,11 @@ static void + cram_md5_generate(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED, + const unsigned char **raw_password_r, size_t *size_r) + { +- struct hmac_context ctx; ++ struct orig_hmac_context ctx; + unsigned char *context_digest; + + context_digest = t_malloc_no0(CRAM_MD5_CONTEXTLEN); +- hmac_init(&ctx, (const unsigned char *)plaintext, ++ orig_hmac_init(&ctx, (const unsigned char *)plaintext, + strlen(plaintext), &hash_method_md5); + hmac_md5_get_cram_context(&ctx, context_digest); + +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme-scram.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme-scram.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme-scram.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-auth/password-scheme-scram.c 2025-11-30 09:57:55.180182392 +0100 +@@ -23,7 +23,7 @@ int scram_verify(const struct hash_metho const char *plaintext, const unsigned char *raw_password, size_t size, const char **error_r) { @@ -160,8 +283,8 @@ diff -up dovecot-2.3.18/src/auth/password-scheme-scram.c.opensslhmac dovecot-2.3 const char *salt_base64; unsigned int iter_count; const unsigned char *salt; -@@ -126,9 +126,9 @@ int scram_verify(const struct hash_metho - salt, salt_len, iter_count, salted_password); +@@ -49,9 +49,9 @@ int scram_verify(const struct hash_metho + salt, salt_len, iter_count, salted_password); /* Calculate ClientKey */ - hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); @@ -173,44 +296,9 @@ diff -up dovecot-2.3.18/src/auth/password-scheme-scram.c.opensslhmac dovecot-2.3 /* Calculate StoredKey */ hash_method_get_digest(hmethod, client_key, sizeof(client_key), -@@ -147,7 +147,7 @@ void scram_generate(const struct hash_me - const unsigned char **raw_password_r, size_t *size_r) - { - string_t *str; -- struct hmac_context ctx; -+ struct openssl_hmac_context ctx; - unsigned char salt[16]; - unsigned char salted_password[hmethod->digest_size]; - unsigned char client_key[hmethod->digest_size]; -@@ -165,9 +165,9 @@ void scram_generate(const struct hash_me - sizeof(salt), SCRAM_DEFAULT_ITERATE_COUNT, salted_password); - - /* Calculate ClientKey */ -- hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); -- hmac_update(&ctx, "Client Key", 10); -- hmac_final(&ctx, client_key); -+ openssl_hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); -+ openssl_hmac_update(&ctx, "Client Key", 10); -+ openssl_hmac_final(&ctx, client_key); - - /* Calculate StoredKey */ - hash_method_get_digest(hmethod, client_key, sizeof(client_key), -@@ -176,9 +176,9 @@ void scram_generate(const struct hash_me - base64_encode(stored_key, sizeof(stored_key), str); - - /* Calculate ServerKey */ -- hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); -- hmac_update(&ctx, "Server Key", 10); -- hmac_final(&ctx, server_key); -+ openssl_hmac_init(&ctx, salted_password, sizeof(salted_password), hmethod); -+ openssl_hmac_update(&ctx, "Server Key", 10); -+ openssl_hmac_final(&ctx, server_key); - str_append_c(str, ','); - base64_encode(server_key, sizeof(server_key), str); - -diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c ---- dovecot-2.3.18/src/lib/hmac.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/lib/hmac.c 2022-02-09 09:27:15.888883345 +0100 +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac.c 2025-11-30 09:57:55.180318937 +0100 @@ -7,6 +7,10 @@ * This software is released under the MIT license. */ @@ -222,7 +310,7 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c #include "lib.h" #include "hmac.h" #include "safe-memset.h" -@@ -14,10 +18,65 @@ +@@ -14,10 +18,103 @@ #include "hex-binary.h" @@ -239,11 +327,47 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c +#endif + + -+void openssl_hmac_init(struct openssl_hmac_context *_ctx, const unsigned char *key, - size_t key_len, const struct hash_method *meth) - { -- struct hmac_context_priv *ctx = &_ctx->u.priv; -+ struct openssl_hmac_context_priv *ctx = &_ctx->u.priv; ++void openssl_hmac_init(struct openssl_hmac_context *_ctx, const unsigned char *key, //DONE ++ size_t key_len, const struct hash_method *meth) ++{ ++#ifdef USE_OPENSSL3_METHODS ++ struct openssl_hmac_context_priv *ctx = &_ctx->u.priv; ++ ++ ++ const EVP_MD *md; ++ const char *ebuf = NULL; ++ const char **error_r = &ebuf; ++ OSSL_PARAM params[2]; ++ ++ md = EVP_get_digestbyname(meth->name); ++ if(md == NULL) { ++ if (error_r != NULL) { ++ *error_r = t_strdup_printf("Invalid digest %s", ++ meth->name); ++ } ++ //return FALSE; ++ } ++ ++ ctx->mac = EVP_MAC_fetch(NULL, "HMAC", NULL); ++ ++ ctx->ctx = EVP_MAC_CTX_new(ctx->mac); ++ if (ctx->ctx == NULL) { ++ EVP_MAC_free(ctx->mac); ++ } ++ ++ params[0] = OSSL_PARAM_construct_utf8_string("digest", (char *)meth->name, 0); ++ params[1] = OSSL_PARAM_construct_end(); ++ ++ if (EVP_MAC_init(ctx->ctx, key, key_len, ++ params) == 0) { ++ if (error_r != NULL) { ++ *error_r = t_strdup_printf("Invalid digest %s", ++ meth->name); ++ } ++ } ++ ++#else ++ struct openssl_hmac_context_priv *ctx = &_ctx->u.priv; + + const EVP_MD *md; + const char *ebuf = NULL; @@ -267,11 +391,13 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c + dcrypt_openssl_error(error_r);*/ +#endif + /*ec = */HMAC_Init_ex(ctx->ctx, key, key_len, md, NULL); ++#endif +} + -+void orig_hmac_init(struct orig_hmac_context *_ctx, const unsigned char *key, -+ size_t key_len, const struct hash_method *meth) -+{ ++void orig_hmac_init(struct orig_hmac_context *_ctx, const unsigned char *key, //DONE + size_t key_len, const struct hash_method *meth) + { +- struct hmac_context_priv *ctx = &_ctx->u.priv; + static int no_fips = -1; + if (no_fips == -1) { + int fd = open("/proc/sys/crypto/fips_enabled", O_RDONLY); @@ -290,22 +416,29 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c unsigned int i; unsigned char k_ipad[meth->block_size]; unsigned char k_opad[meth->block_size]; -@@ -53,9 +112,27 @@ void hmac_init(struct hmac_context *_ctx +@@ -54,9 +151,33 @@ void hmac_init(struct hmac_context *_ctx safe_memset(k_opad, 0, meth->block_size); } -void hmac_final(struct hmac_context *_ctx, unsigned char *digest) -+void openssl_hmac_final(struct openssl_hmac_context *_ctx, unsigned char *digest) -+{ ++void openssl_hmac_final(struct openssl_hmac_context *_ctx, unsigned char *digest) //FIXME + { +- struct hmac_context_priv *ctx = &_ctx->u.priv; + int ec; -+ unsigned char buf[HMAC_MAX_MD_CBLOCK]; -+ unsigned int outl; ++ unsigned char buf[EVP_MAX_MD_SIZE]; ++ size_t outl; +// const char *ebuf = NULL; +// const char **error_r = &ebuf; + + struct openssl_hmac_context_priv *ctx = &_ctx->u.priv; ++#ifdef USE_OPENSSL3_METHODS ++ ec = EVP_MAC_final(ctx->ctx, buf, &outl, sizeof buf); ++ EVP_MAC_CTX_free(ctx->ctx); ++ EVP_MAC_free(ctx->mac); ++#else + ec = HMAC_Final(ctx->ctx, buf, &outl); + HMAC_CTX_free(ctx->ctx); ++#endif + if (ec == 1) + memcpy(digest, buf, outl); +// else @@ -313,19 +446,18 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c + +} + -+void orig_hmac_final(struct orig_hmac_context *_ctx, unsigned char *digest) - { -- struct hmac_context_priv *ctx = &_ctx->u.priv; ++void orig_hmac_final(struct orig_hmac_context *_ctx, unsigned char *digest) //DONE ++{ + struct orig_hmac_context_priv *ctx = &_ctx->u.priv; ctx->hash->result(ctx->ctx, digest); -@@ -63,53 +140,50 @@ void hmac_final(struct hmac_context *_ct +@@ -64,53 +185,50 @@ void hmac_final(struct hmac_context *_ct ctx->hash->result(ctx->ctxo, digest); } -buffer_t *t_hmac_data(const struct hash_method *meth, -+buffer_t *openssl_t_hmac_data(const struct hash_method *meth, ++buffer_t *openssl_t_hmac_data(const struct hash_method *meth, //FIXME const unsigned char *key, size_t key_len, const void *data, size_t data_len) { @@ -348,7 +480,7 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c } -buffer_t *t_hmac_buffer(const struct hash_method *meth, -+buffer_t *openssl_t_hmac_buffer(const struct hash_method *meth, ++buffer_t *openssl_t_hmac_buffer(const struct hash_method *meth, //DONE const unsigned char *key, size_t key_len, const buffer_t *data) { @@ -357,7 +489,7 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c } -buffer_t *t_hmac_str(const struct hash_method *meth, -+buffer_t *openssl_t_hmac_str(const struct hash_method *meth, ++buffer_t *openssl_t_hmac_str(const struct hash_method *meth, //DONE const unsigned char *key, size_t key_len, const char *data) { @@ -366,7 +498,7 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c } -void hmac_hkdf(const struct hash_method *method, -+void openssl_hmac_hkdf(const struct hash_method *method, ++void openssl_hmac_hkdf(const struct hash_method *method, //FIXME const unsigned char *salt, size_t salt_len, const unsigned char *ikm, size_t ikm_len, const unsigned char *info, size_t info_len, @@ -388,17 +520,10 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c /* salt and info can be NULL */ i_assert(salt != NULL || salt_len == 0); -@@ -118,35 +192,30 @@ void hmac_hkdf(const struct hash_method - i_assert(ikm != NULL && ikm_len > 0); - i_assert(okm_r != NULL && okm_len > 0); +@@ -126,28 +244,29 @@ void hmac_hkdf(const struct hash_method + if (info == NULL) + info = &uchar_nul; -- /* but they still need valid pointer, reduces -- complains from static analysers */ -- if (salt == NULL) -- salt = &uchar_nul; -- if (info == NULL) -- info = &uchar_nul; -- - /* extract */ - hmac_init(&key_mac, salt, salt_len, method); - hmac_update(&key_mac, ikm, ikm_len); @@ -419,7 +544,6 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c - hmac_final(&info_mac, okm); - buffer_append(okm_r, okm, amt); - remain -= amt; -+ + md = EVP_get_digestbyname(method->name); + pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL); + unsigned char *okm_buf = buffer_get_space_unsafe(okm_r, 0, okm_len); @@ -448,9 +572,9 @@ diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c - safe_memset(prk, 0, sizeof(prk)); - safe_memset(okm, 0, sizeof(okm)); } -diff -up dovecot-2.3.18/src/lib/hmac-cram-md5.c.opensslhmac dovecot-2.3.18/src/lib/hmac-cram-md5.c ---- dovecot-2.3.18/src/lib/hmac-cram-md5.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/lib/hmac-cram-md5.c 2022-02-09 09:27:15.888883345 +0100 +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac-cram-md5.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac-cram-md5.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac-cram-md5.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac-cram-md5.c 2025-11-30 09:57:55.180461985 +0100 @@ -9,10 +9,10 @@ #include "md5.h" #include "hmac-cram-md5.h" @@ -477,9 +601,9 @@ diff -up dovecot-2.3.18/src/lib/hmac-cram-md5.c.opensslhmac dovecot-2.3.18/src/l const unsigned char *cdp; struct md5_context *ctx = (void*)hmac_ctx->ctx; -diff -up dovecot-2.3.18/src/lib/hmac-cram-md5.h.opensslhmac dovecot-2.3.18/src/lib/hmac-cram-md5.h ---- dovecot-2.3.18/src/lib/hmac-cram-md5.h.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/lib/hmac-cram-md5.h 2022-02-09 09:27:15.888883345 +0100 +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac-cram-md5.h.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac-cram-md5.h +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac-cram-md5.h.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac-cram-md5.h 2025-11-30 09:57:55.180563796 +0100 @@ -5,9 +5,9 @@ #define CRAM_MD5_CONTEXTLEN 32 @@ -492,10 +616,10 @@ diff -up dovecot-2.3.18/src/lib/hmac-cram-md5.h.opensslhmac dovecot-2.3.18/src/l const unsigned char context_digest[CRAM_MD5_CONTEXTLEN]); -diff -up dovecot-2.3.18/src/lib/hmac.h.opensslhmac dovecot-2.3.18/src/lib/hmac.h ---- dovecot-2.3.18/src/lib/hmac.h.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/lib/hmac.h 2022-02-09 09:27:15.888883345 +0100 -@@ -4,60 +4,97 @@ +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac.h.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac.h +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac.h.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib/hmac.h 2025-11-30 09:57:55.180723505 +0100 +@@ -4,60 +4,108 @@ #include "hash-method.h" #include "sha1.h" #include "sha2.h" @@ -504,18 +628,25 @@ diff -up dovecot-2.3.18/src/lib/hmac.h.opensslhmac dovecot-2.3.18/src/lib/hmac.h +#include +#include - #define HMAC_MAX_CONTEXT_SIZE sizeof(struct sha512_ctx) + #define HMAC_MAX_CONTEXT_SIZE HASH_METHOD_MAX_CONTEXT_SIZE -struct hmac_context_priv { ++ ++#define USE_OPENSSL3_METHODS 1 ++ +struct openssl_hmac_context_priv { ++#ifdef USE_OPENSSL3_METHODS ++ EVP_MAC *mac; ++ EVP_MAC_CTX *ctx; ++#else +#ifdef HAVE_HMAC_CTX_NEW + HMAC_CTX *ctx; +#else + HMAC_CTX ctx; +#endif ++#endif + const struct hash_method *hash; +}; -+ +struct orig_hmac_context_priv { char ctx[HMAC_MAX_CONTEXT_SIZE]; char ctxo[HMAC_MAX_CONTEXT_SIZE]; @@ -524,21 +655,21 @@ diff -up dovecot-2.3.18/src/lib/hmac.h.opensslhmac dovecot-2.3.18/src/lib/hmac.h -struct hmac_context { +struct openssl_hmac_context { -+ union { -+ struct openssl_hmac_context_priv priv; -+ uint64_t padding_requirement; -+ } u; -+}; -+ -+struct orig_hmac_context { union { - struct hmac_context_priv priv; -+ struct orig_hmac_context_priv priv; ++ struct openssl_hmac_context_priv priv; uint64_t padding_requirement; } u; }; -void hmac_init(struct hmac_context *ctx, const unsigned char *key, ++struct orig_hmac_context { ++ union { ++ struct orig_hmac_context_priv priv; ++ uint64_t padding_requirement; ++ } u; ++}; ++ +void openssl_hmac_init(struct openssl_hmac_context *ctx, const unsigned char *key, + size_t key_len, const struct hash_method *meth); +void openssl_hmac_final(struct openssl_hmac_context *ctx, unsigned char *digest); @@ -547,7 +678,11 @@ diff -up dovecot-2.3.18/src/lib/hmac.h.opensslhmac dovecot-2.3.18/src/lib/hmac.h +openssl_hmac_update(struct openssl_hmac_context *_ctx, const void *data, size_t size) +{ + struct openssl_hmac_context_priv *ctx = &_ctx->u.priv; ++#ifdef USE_OPENSSL3_METHODS ++ EVP_MAC_update(ctx->ctx, data, size); ++#else + HMAC_Update(ctx->ctx, data, size); ++#endif +/* if (ec != 1) + { + const char *ebuf = NULL; @@ -606,12 +741,12 @@ diff -up dovecot-2.3.18/src/lib/hmac.h.opensslhmac dovecot-2.3.18/src/lib/hmac.h okm_buffer, okm_len); return okm_buffer; } -diff -up dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c ---- dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c 2022-02-09 09:27:15.888883345 +0100 -@@ -85,15 +85,15 @@ imap_urlauth_internal_generate(const cha - const unsigned char mailbox_key[IMAP_URLAUTH_KEY_LEN], - size_t *token_len_r) +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-imap-urlauth/imap-urlauth.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-imap-urlauth/imap-urlauth.c 2025-11-30 09:57:55.180863807 +0100 +@@ -87,15 +87,15 @@ imap_urlauth_internal_generate( + const unsigned char mailbox_key[IMAP_URLAUTH_KEY_LEN], + size_t *token_len_r) { - struct hmac_context hmac; + struct openssl_hmac_context hmac; @@ -629,10 +764,10 @@ diff -up dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac dovecot- *token_len_r = SHA1_RESULTLEN + 1; return token; -diff -up dovecot-2.3.18/src/lib/Makefile.am.opensslhmac dovecot-2.3.18/src/lib/Makefile.am ---- dovecot-2.3.18/src/lib/Makefile.am.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/lib/Makefile.am 2022-02-09 09:27:15.889883331 +0100 -@@ -354,6 +354,9 @@ headers = \ +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib/Makefile.am.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib/Makefile.am +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib/Makefile.am.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib/Makefile.am 2025-11-30 09:57:55.180990124 +0100 +@@ -414,6 +414,9 @@ headers = \ wildcard-match.h \ write-full.h @@ -642,34 +777,34 @@ diff -up dovecot-2.3.18/src/lib/Makefile.am.opensslhmac dovecot-2.3.18/src/lib/M test_programs = test-lib noinst_PROGRAMS = $(test_programs) -diff -up dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c.opensslhmac dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c ---- dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c 2022-02-09 09:27:15.889883331 +0100 -@@ -144,14 +144,14 @@ oauth2_validate_hmac(const struct oauth2 +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-oauth2/oauth2-jwt.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-oauth2/oauth2-jwt.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-oauth2/oauth2-jwt.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-oauth2/oauth2-jwt.c 2025-11-30 09:57:55.181135306 +0100 +@@ -210,14 +210,14 @@ oauth2_validate_hmac(const struct oauth2 if (oauth2_lookup_hmac_key(set, azp, alg, key_id, &key, error_r) < 0) return -1; - struct hmac_context ctx; ++ struct openssl_hmac_context ctx; + unsigned char digest[method->digest_size]; + - hmac_init(&ctx, key->data, key->used, method); - hmac_update(&ctx, blobs[0], strlen(blobs[0])); - hmac_update(&ctx, ".", 1); - hmac_update(&ctx, blobs[1], strlen(blobs[1])); -+ struct openssl_hmac_context ctx; +- hmac_final(&ctx, digest); + openssl_hmac_init(&ctx, key->data, key->used, method); + openssl_hmac_update(&ctx, blobs[0], strlen(blobs[0])); + openssl_hmac_update(&ctx, ".", 1); + openssl_hmac_update(&ctx, blobs[1], strlen(blobs[1])); - unsigned char digest[method->digest_size]; - -- hmac_final(&ctx, digest); + openssl_hmac_final(&ctx, digest); buffer_t *their_digest = t_base64url_decode_str(BASE64_DECODE_FLAG_NO_PADDING, blobs[2]); -diff -up dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c ---- dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c 2022-02-09 09:27:15.889883331 +0100 -@@ -248,7 +248,7 @@ static void save_key_azp_to(const char * +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-oauth2/test-oauth2-jwt.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-oauth2/test-oauth2-jwt.c 2025-11-30 09:57:55.181290025 +0100 +@@ -250,7 +250,7 @@ static void save_key_azp_to(const char * static void sign_jwt_token_hs256(buffer_t *tokenbuf, buffer_t *key) { i_assert(key != NULL); @@ -678,7 +813,7 @@ diff -up dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3 tokenbuf); buffer_append(tokenbuf, ".", 1); base64url_encode(BASE64_ENCODE_FLAG_NO_PADDING, SIZE_MAX, -@@ -258,7 +258,7 @@ static void sign_jwt_token_hs256(buffer_ +@@ -260,7 +260,7 @@ static void sign_jwt_token_hs256(buffer_ static void sign_jwt_token_hs384(buffer_t *tokenbuf, buffer_t *key) { i_assert(key != NULL); @@ -687,7 +822,7 @@ diff -up dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3 tokenbuf); buffer_append(tokenbuf, ".", 1); base64url_encode(BASE64_ENCODE_FLAG_NO_PADDING, SIZE_MAX, -@@ -268,7 +268,7 @@ static void sign_jwt_token_hs384(buffer_ +@@ -270,7 +270,7 @@ static void sign_jwt_token_hs384(buffer_ static void sign_jwt_token_hs512(buffer_t *tokenbuf, buffer_t *key) { i_assert(key != NULL); @@ -696,9 +831,9 @@ diff -up dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3 tokenbuf); buffer_append(tokenbuf, ".", 1); base64url_encode(BASE64_ENCODE_FLAG_NO_PADDING, SIZE_MAX, -diff -up dovecot-2.3.18/src/lib/pkcs5.c.opensslhmac dovecot-2.3.18/src/lib/pkcs5.c ---- dovecot-2.3.18/src/lib/pkcs5.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/lib/pkcs5.c 2022-02-09 09:27:15.889883331 +0100 +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib/pkcs5.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib/pkcs5.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib/pkcs5.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib/pkcs5.c 2025-11-30 09:57:55.181492013 +0100 @@ -52,7 +52,7 @@ int pkcs5_pbkdf2(const struct hash_metho size_t l = (length + hash->digest_size - 1)/hash->digest_size; /* same as ceil(length/hash->digest_size) */ unsigned char dk[l * hash->digest_size]; @@ -733,9 +868,35 @@ diff -up dovecot-2.3.18/src/lib/pkcs5.c.opensslhmac dovecot-2.3.18/src/lib/pkcs5 for(i = 0; i < hash->digest_size; i++) block[i] ^= U_c[i]; } -diff -up dovecot-2.3.18/src/lib/test-hmac.c.opensslhmac dovecot-2.3.18/src/lib/test-hmac.c ---- dovecot-2.3.18/src/lib/test-hmac.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100 -+++ dovecot-2.3.18/src/lib/test-hmac.c 2022-02-09 09:27:15.889883331 +0100 +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/sasl-server-mech-cram-md5.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/sasl-server-mech-cram-md5.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/sasl-server-mech-cram-md5.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/sasl-server-mech-cram-md5.c 2025-11-30 10:00:28.967795725 +0100 +@@ -53,7 +53,7 @@ verify_credentials(struct sasl_server_me + container_of(auth_request, struct cram_auth_request, + auth_request); + unsigned char digest[MD5_RESULTLEN]; +- struct hmac_context ctx; ++ struct orig_hmac_context ctx; + const char *response_hex; + + if (size != CRAM_MD5_CONTEXTLEN) { +@@ -62,10 +62,10 @@ verify_credentials(struct sasl_server_me + return; + } + +- hmac_init(&ctx, NULL, 0, &hash_method_md5); ++ orig_hmac_init(&ctx, NULL, 0, &hash_method_md5); + hmac_md5_set_cram_context(&ctx, credentials); +- hmac_update(&ctx, request->challenge, strlen(request->challenge)); +- hmac_final(&ctx, digest); ++ orig_hmac_update(&ctx, request->challenge, strlen(request->challenge)); ++ orig_hmac_final(&ctx, digest); + + response_hex = binary_to_hex(digest, sizeof(digest)); + +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib/test-hmac.c.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib/test-hmac.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib/test-hmac.c.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib/test-hmac.c 2025-11-30 09:57:55.181656401 +0100 @@ -206,11 +206,11 @@ static void test_hmac_rfc(void) test_begin("hmac sha256 rfc4231 vectors"); for(size_t i = 0; i < N_ELEMENTS(test_vectors); i++) { @@ -811,3 +972,54 @@ diff -up dovecot-2.3.18/src/lib/test-hmac.c.opensslhmac dovecot-2.3.18/src/lib/t vec->ikm_len, vec->info, vec->info_len, vec->okm_len); test_assert(tmp->used == vec->okm_len && +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-var-expand-crypt/Makefile.am.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-var-expand-crypt/Makefile.am +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-var-expand-crypt/Makefile.am.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-var-expand-crypt/Makefile.am 2025-11-30 09:58:11.669117030 +0100 +@@ -34,13 +34,13 @@ test_libs = \ + $(DLLIB) + + test_var_expand_crypt_SOURCES = test-var-expand-crypt.c +-test_var_expand_crypt_LDADD = $(test_libs) ++test_var_expand_crypt_LDADD = $(test_libs) $(SSL_LIBS) + test_var_expand_crypt_DEPENDENCIES = $(module_LTLIBRARIES) + if HAVE_WHOLE_ARCHIVE + test_var_expand_crypt_LDFLAGS = -export-dynamic -Wl,$(LD_WHOLE_ARCHIVE),../lib/.libs/liblib.a,../lib-json/.libs/libjson.a,../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE) + endif + +-test_var_expand_crypt_CFLAGS = $(AM_CFLAGS) \ ++test_var_expand_crypt_CFLAGS = $(AM_CFLAGS) $(SSL_CFLAGS) \ + -DDCRYPT_BUILD_DIR=\"$(top_builddir)/src/lib-dcrypt\" + + check-local: +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/submission/Makefile.am.opensslhmac3 dovecot-2.4.2-build/dovecot-2.4.2/src/submission/Makefile.am +--- dovecot-2.4.2-build/dovecot-2.4.2/src/submission/Makefile.am.opensslhmac3 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/submission/Makefile.am 2025-11-30 09:57:55.182137562 +0100 +@@ -29,6 +29,7 @@ submission_LDADD = \ + $(urlauth_libs) \ + $(LIBDOVECOT_STORAGE) \ + $(LIBDOVECOT) \ ++ $(SSL_LIBS) \ + $(MODULE_LIBS) + submission_DEPENDENCIES = \ + $(urlauth_libs) \ +diff -up dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client-mech-cram-md5.c.fixbuild2 dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client-mech-cram-md5.c +--- dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client-mech-cram-md5.c.fixbuild2 2025-11-30 13:11:06.583413762 +0100 ++++ dovecot-2.4.2-build/dovecot-2.4.2/src/lib-sasl/dsasl-client-mech-cram-md5.c 2025-11-30 13:22:04.883307427 +0100 +@@ -81,13 +81,13 @@ mech_cram_md5_output(struct dsasl_client + return DSASL_CLIENT_RESULT_OK; + } + +- struct hmac_context ctx; ++ struct openssl_hmac_context ctx; + unsigned char digest[MD5_RESULTLEN]; + +- hmac_init(&ctx, (const unsigned char *)client->password, ++ openssl_hmac_init(&ctx, (const unsigned char *)client->password, + strlen(client->password), &hash_method_md5); +- hmac_update(&ctx, cclient->challenge, strlen(cclient->challenge)); +- hmac_final(&ctx, digest); ++ openssl_hmac_update(&ctx, cclient->challenge, strlen(cclient->challenge)); ++ openssl_hmac_final(&ctx, digest); + + str = str_new(client->pool, 256); + str_append(str, client->set.authid); diff --git a/dovecot-2.4.2-fixbuild.patch b/dovecot-2.4.2-fixbuild.patch new file mode 100644 index 0000000..ad5530b --- /dev/null +++ b/dovecot-2.4.2-fixbuild.patch @@ -0,0 +1,135 @@ +diff -up dovecot-2.4.2/src/lib/istream.c.fixbuild dovecot-2.4.2/src/lib/istream.c +--- dovecot-2.4.2/src/lib/istream.c.fixbuild 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2/src/lib/istream.c 2025-11-30 11:40:37.739536137 +0100 +@@ -85,7 +85,7 @@ void i_stream_add_destroy_callback(struc + } + + void i_stream_remove_destroy_callback(struct istream *stream, +- void (*callback)()) ++ istream_callback_t *callback) + { + io_stream_remove_destroy_callback(&stream->real_stream->iostream, + callback); +diff -up dovecot-2.4.2/src/lib/istream.h.fixbuild dovecot-2.4.2/src/lib/istream.h +--- dovecot-2.4.2/src/lib/istream.h.fixbuild 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2/src/lib/istream.h 2025-11-30 11:40:37.739798710 +0100 +@@ -100,7 +100,7 @@ void i_stream_add_destroy_callback(struc + (istream_callback_t *)callback, context) + /* Remove the destroy callback. */ + void i_stream_remove_destroy_callback(struct istream *stream, +- void (*callback)()); ++ istream_callback_t *callback); + + /* Return file descriptor for stream, or -1 if none is available. */ + int i_stream_get_fd(struct istream *stream); +diff -up dovecot-2.4.2/src/lib/ostream.c.fixbuild dovecot-2.4.2/src/lib/ostream.c +--- dovecot-2.4.2/src/lib/ostream.c.fixbuild 2025-11-30 11:42:21.434063550 +0100 ++++ dovecot-2.4.2/src/lib/ostream.c 2025-11-30 11:42:55.814100259 +0100 +@@ -127,7 +127,7 @@ void o_stream_add_destroy_callback(struc + } + + void o_stream_remove_destroy_callback(struct ostream *stream, +- void (*callback)()) ++ ostream_callback_t *callback) + { + io_stream_remove_destroy_callback(&stream->real_stream->iostream, + callback); +diff -up dovecot-2.4.2/src/lib/ostream.h.fixbuild dovecot-2.4.2/src/lib/ostream.h +--- dovecot-2.4.2/src/lib/ostream.h.fixbuild 2025-11-30 11:42:29.639009602 +0100 ++++ dovecot-2.4.2/src/lib/ostream.h 2025-11-30 11:43:20.101652841 +0100 +@@ -127,7 +127,7 @@ void o_stream_add_destroy_callback(struc + (ostream_callback_t *)callback, context) + /* Remove the destroy callback. */ + void o_stream_remove_destroy_callback(struct ostream *stream, +- void (*callback)()); ++ ostream_callback_t *callback); + + /* Mark the stream and all of its parent streams closed. Nothing will be + sent after this call. When using ostreams that require writing a trailer, +diff -up dovecot-2.4.2/src/lib-json/json-istream.c.fixbuild dovecot-2.4.2/src/lib-json/json-istream.c +--- dovecot-2.4.2/src/lib-json/json-istream.c.fixbuild 2025-10-29 07:58:41.000000000 +0100 ++++ dovecot-2.4.2/src/lib-json/json-istream.c 2025-11-30 12:52:15.970430672 +0100 +@@ -706,7 +706,7 @@ static void json_istream_drop_value_stre + if (stream->seekable_stream != NULL) { + i_stream_remove_destroy_callback( + stream->seekable_stream, +- json_istream_drop_seekable_stream); ++ (istream_callback_t *)json_istream_drop_seekable_stream); + i_stream_unref(&stream->seekable_stream); + } + } +@@ -720,12 +720,12 @@ static void json_istream_consumed_value_ + if (stream->seekable_stream != NULL) { + i_stream_remove_destroy_callback( + stream->seekable_stream, +- json_istream_drop_seekable_stream); ++ (istream_callback_t *)json_istream_drop_seekable_stream); + } + if (stream->value_stream != NULL) { + i_stream_remove_destroy_callback( + stream->value_stream, +- json_istream_drop_value_stream); ++ (istream_callback_t *)json_istream_drop_value_stream); + } + stream->value_stream = NULL; + stream->seekable_stream = NULL; + i_stream_remove_destroy_callback(conn->incoming_payload, +- http_client_payload_destroyed); ++ (istream_callback_t *)http_client_payload_destroyed); + conn->incoming_payload = NULL; + } + +diff -up dovecot-2.4.2/src/lib-http/http-server-connection.c.fixbuild dovecot-2.4.2/src/lib-http/http-server-connection.c +--- dovecot-2.4.2/src/lib-http/http-server-connection.c.fixbuild 2025-11-30 13:02:24.337384848 +0100 ++++ dovecot-2.4.2/src/lib-http/http-server-connection.c 2025-11-30 13:03:14.477064608 +0100 +@@ -1066,7 +1066,7 @@ http_server_connection_disconnect(struct + if (conn->incoming_payload != NULL) { + /* The stream is still accessed by lib-http caller. */ + i_stream_remove_destroy_callback(conn->incoming_payload, +- http_server_payload_destroyed); ++ (istream_callback_t *)http_server_payload_destroyed); + conn->incoming_payload = NULL; + } + if (conn->payload_handler != NULL) +diff -up dovecot-2.4.2/src/lib-http/http-client-connection.c.fixbuild dovecot-2.4.2/src/lib-http/http-client-connection.c +--- dovecot-2.4.2/src/lib-http/http-client-connection.c.fixbuild 2025-11-30 12:57:42.670247695 +0100 ++++ dovecot-2.4.2/src/lib-http/http-client-connection.c 2025-11-30 13:00:54.862436490 +0100 +@@ -832,7 +832,7 @@ void http_client_connection_request_dest + is closed and we don't care about it anymore, so act as though it is + destroyed. */ + i_stream_remove_destroy_callback(payload, +- http_client_payload_destroyed); ++ (istream_callback_t *)http_client_payload_destroyed); + http_client_payload_destroyed(req); + } + +@@ -888,7 +888,7 @@ http_client_connection_return_response(s + if (response->payload != NULL) { + i_stream_remove_destroy_callback( + conn->incoming_payload, +- http_client_payload_destroyed); ++ (istream_callback_t *)http_client_payload_destroyed); + i_stream_unref(&conn->incoming_payload); + connection_input_resume(&conn->conn); + } +@@ -1731,7 +1731,7 @@ http_client_connection_disconnect(struct + if (conn->incoming_payload != NULL) { + /* The stream is still accessed by lib-http caller. */ + i_stream_remove_destroy_callback(conn->incoming_payload, +- http_client_payload_destroyed); ++ (istream_callback_t *)http_client_payload_destroyed); + conn->incoming_payload = NULL; + } + +diff -up dovecot-2.4.2/src/lib-storage/index/index-mail.c.fixbuild2 dovecot-2.4.2/src/lib-storage/index/index-mail.c +--- dovecot-2.4.2/src/lib-storage/index/index-mail.c.fixbuild2 2025-11-30 13:48:46.658539149 +0100 ++++ dovecot-2.4.2/src/lib-storage/index/index-mail.c 2025-11-30 13:49:47.178158024 +0100 +@@ -1840,7 +1840,7 @@ static void index_mail_close_streams_ful + allowed to have references until the mail is closed + (but we can't really check that) */ + i_stream_remove_destroy_callback(data->stream, +- index_mail_stream_destroy_callback); ++ (istream_callback_t *)index_mail_stream_destroy_callback); + } + i_stream_unref(&data->stream); + /* there must be no references to the mail when the diff --git a/dovecot-configure-c99.patch b/dovecot-configure-c99.patch deleted file mode 100644 index 17a49fe..0000000 --- a/dovecot-configure-c99.patch +++ /dev/null @@ -1,25 +0,0 @@ -m4: crypt_xxpg6.m4: Define _DEFAULT_SOURCE for current glibc - -Current glibc no longer implements the CRYPT extension, so it does not -declare crypt in in strict standard modes. The check -defines _XOPEN_SOURCE, which enables one of these modes. Defining -_DEFAULT_SOURCE as well again makes available the crypt function -prototype. - -This avoids a configure check result change with compilers which do -not support implicit function declarations. - -Submitted upstream: - -diff --git a/m4/crypt_xpg6.m4 b/m4/crypt_xpg6.m4 -index 0085b2ac76..3a288a3713 100644 ---- a/m4/crypt_xpg6.m4 -+++ b/m4/crypt_xpg6.m4 -@@ -6,6 +6,7 @@ AC_DEFUN([DOVECOT_CRYPT_XPG6], [ - #define _XOPEN_SOURCE 4 - #define _XOPEN_SOURCE_EXTENDED 1 - #define _XOPEN_VERSION 4 -+ #define _DEFAULT_SOURCE - #define _XPG4_2 - #define _XPG6 - #include diff --git a/dovecot.spec b/dovecot.spec index 89f7fc5..11efa4b 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -4,18 +4,18 @@ Summary: Secure imap and pop3 server Name: dovecot Epoch: 1 -Version: 2.3.21.1 +Version: 2.4.2 %global prever %{nil} Release: 1%{?dist} #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 License: MIT AND LGPL-2.1-only URL: https://www.dovecot.org/ -Source: https://www.dovecot.org/releases/2.3/%{name}-%{version}%{?prever}.tar.gz +Source: https://www.dovecot.org/releases/2.4/%{name}-%{version}%{?prever}.tar.gz Source1: dovecot.init Source2: dovecot.pam -%global pigeonholever 0.5.21 -Source8: https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pigeonholever}.tar.gz +%global pigeonholever %{version}%{?prever} +Source8: https://pigeonhole.dovecot.org/releases/2.4/dovecot-pigeonhole-%{pigeonholever}.tar.gz Source9: dovecot.sysconfig Source10: dovecot.tmpfilesd @@ -34,31 +34,20 @@ Patch6: dovecot-2.1.10-waitonline.patch Patch8: dovecot-2.2.20-initbysystemd.patch Patch9: dovecot-2.2.22-systemd_w_protectsystem.patch -Patch10: dovecot-2.3.0.1-libxcrypt.patch Patch15: dovecot-2.3.11-bigkey.patch # do not use own implementation of HMAC, use OpenSSL for certification purposes # not sent upstream as proper fix would use dovecot's lib-dcrypt but it introduces # hard to break circular dependency between lib and lib-dcrypt -Patch16: dovecot-2.3.6-opensslhmac.patch +Patch16: dovecot-2.4.1-opensslhmac3.patch # FTBFS Patch17: dovecot-2.3.15-fixvalcond.patch Patch18: dovecot-2.3.15-valbasherr.patch -Patch20: dovecot-2.3.14-opensslv3.patch -Patch21: dovecot-2.3.19.1-7bad6a24.patch -Patch22: dovecot-configure-c99.patch # Fedora/RHEL specific, drop OTP which uses SHA1 so we dont use SHA1 for crypto purposes -Patch23: dovecot-2.3.20-nolibotp.patch -Patch24: dovecot-2.3-ph_optglob.patch -Patch25: dovecot-2.3-ph_scriptcmp.patch - -# imap: Shorten test-imap-client-hibernate socket path length -Patch26: dovecot-2.3.21-test-socket-path.patch - -# Compile without OpenSSL ENGINE, adapted from 2.4 dovecot, issue #RHEL-33733 -Patch27: dovecot-2.3.21-noengine.patch +Patch23: dovecot-2.4.1-nolibotp.patch +Patch24: dovecot-2.4.2-fixbuild.patch BuildRequires: gcc, gcc-c++, openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel BuildRequires: libtool, autoconf, automake, pkgconfig @@ -75,17 +64,16 @@ BuildRequires: libzstd-devel %if %{?rhel}0 == 0 BuildRequires: libsodium-devel BuildRequires: lua-devel +BuildRequires: lua-json %endif BuildRequires: libicu-devel -%if 0%{?rhel} == 0 && 0%{?fedora}0 < 38 -BuildRequires: libexttextcat-devel -BuildRequires: clucene-core-devel -%endif %if %{?rhel}0 == 0 BuildRequires: libstemmer-devel +BuildRequires: xapian-core-devel %endif BuildRequires: multilib-rpm-config BuildRequires: flex, bison +BuildRequires: perl-version BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros @@ -152,39 +140,38 @@ This package provides the development files for dovecot. %setup -q -n %{name}-%{version}%{?prever} -a 8 # standardize name, so we don't have to update patches and scripts -mv dovecot-2.3-pigeonhole-%{pigeonholever} dovecot-pigeonhole +mv dovecot-pigeonhole-%{pigeonholever} dovecot-pigeonhole -%patch -P 1 -p1 -b .default-settings +%patch -P 1 -p2 -b .default-settings %patch -P 2 -p1 -b .mkcert-permissions %patch -P 3 -p1 -b .mkcert-paths -%patch -P 6 -p1 -b .waitonline -%patch -P 8 -p1 -b .initbysystemd +%patch -P 6 -p2 -b .waitonline +%patch -P 8 -p2 -b .initbysystemd %patch -P 9 -p1 -b .systemd_w_protectsystem %patch -P 15 -p1 -b .bigkey -%patch -P 16 -p1 -b .opensslhmac -%patch -P 17 -p1 -b .fixvalcond +%patch -P 16 -p2 -b .opensslhmac3 +%patch -P 17 -p2 -b .fixvalcond %patch -P 18 -p1 -b .valbasherr -%patch -P 20 -p1 -b .opensslv3 -%patch -P 21 -p1 -b .7bad6a24 -%patch -P 22 -p1 -b .c99 -%patch -P 23 -p1 -b .nolibotp -%patch -P 24 -p1 -b .ph_optglob -%patch -P 25 -p1 -b .ph_scriptcmp -%patch -P 26 -p1 -b .test-socket-path -%patch -P 27 -p1 -b .noengine +%patch -P 23 -p2 -b .nolibotp +%patch -P 24 -p1 -b .fixbuild cp run-test-valgrind.supp dovecot-pigeonhole/ # valgrind would fail with shell wrapper echo "testsuite" >dovecot-pigeonhole/run-test-valgrind.exclude -#pushd dovecot-pigeonhole -#popd -%if 0%{?rhel} == 0 && 0%{?fedora}0 < 38 -sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in -%endif - - # drop OTP which uses SHA1 so we dont use SHA1 for crypto purposes -rm -rf src/lib-otp +#rm -rf src/lib-otp +echo >src/auth/mech-otp-common.c +echo >src/auth/mech-otp-common.h +echo >src/auth/mech-otp.c +echo >src/lib-auth/password-scheme-otp.c +echo >src/lib-sasl/sasl-server-mech-otp.c +echo >src/lib-sasl/dsasl-client-mech-otp.c +pushd src/lib-otp +for f in *.c *.h +do + echo >$f +done +popd %build #required for fdpass.c line 125,190: dereferencing type-punned pointer will break strict-aliasing rules @@ -192,7 +179,15 @@ rm -rf src/lib-otp export CFLAGS="%{__global_cflags} -fno-strict-aliasing -fstack-reuse=none" export LDFLAGS="-Wl,-z,now -Wl,-z,relro %{?__global_ldflags}" mkdir -p m4 -autoreconf -I . -fiv #required for aarch64 support +if [ -d /usr/share/gettext/m4 ] +then + #required for aarch64 support + # point to gettext explicitely, autoreconf cant find iconv.m4 otherwise + autoreconf -I . -I /usr/share/gettext/m4 +else + autoreconf -I . -fiv #required for aarch64 support +fi + %configure \ INSTALL_DATA="install -c -p -m644" \ --with-rundir=%{_rundir}/%{name} \ @@ -215,25 +210,21 @@ autoreconf -I . -fiv #required for aarch64 support --with-icu \ %if %{?rhel}0 == 0 --with-libstemmer \ + --with-flatcurve \ --with-lua=plugin \ %else --without-libstemmer \ --without-lua \ %endif -%if 0%{?rhel} == 0 && 0%{?fedora}0 < 38 - --with-lucene \ - --with-exttextcat \ -%else --without-lucene \ --without-exttextcat \ -%endif --with-ssl=openssl \ --with-ssldir=%{ssldir} \ --with-solr \ --with-docs \ systemdsystemunitdir=%{_unitdir} -sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh doc/example-config/conf.d/10-ssl.conf +sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh # doc/example-config/conf.d/10-ssl.conf %make_build @@ -280,7 +271,7 @@ install -p -D -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_mandir}/man5/dovecot.conf.5 #install waitonline script install -p -D -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_libexecdir}/dovecot/prestartscript -install -p -D -m 0644 %{SOURCE16} $RPM_BUILD_ROOT%{_sysusersdir}/dovecot.sysusers +install -p -D -m 0644 %{SOURCE16} $RPM_BUILD_ROOT%{_sysusersdir}/dovecot.conf # generate ghost .pem files mkdir -p $RPM_BUILD_ROOT%{ssldir}/certs @@ -296,10 +287,7 @@ mkdir -p $RPM_BUILD_ROOT/run/dovecot/{login,empty,token-login} # Install dovecot configuration and dovecot-openssl.cnf mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d -install -p -m 644 docinstall/example-config/dovecot.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot -install -p -m 644 docinstall/example-config/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d install -p -m 644 $RPM_BUILD_ROOT/%{_docdir}/%{name}-pigeonhole/example-config/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d -install -p -m 644 docinstall/example-config/conf.d/*.conf.ext $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d install -p -m 644 $RPM_BUILD_ROOT/%{_docdir}/%{name}-pigeonhole/example-config/conf.d/*.conf.ext $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d ||: install -p -m 644 doc/dovecot-openssl.cnf $RPM_BUILD_ROOT%{ssldir}/dovecot-openssl.cnf @@ -318,8 +306,10 @@ popd %pre +%if 0%{?fedora} < 42 #dovecot uid and gid are reserved, see /usr/share/doc/setup-*/uidgid %sysusers_create_compat %{SOURCE16} +%endif # do not let dovecot run during upgrade rhbz#134325 if [ "$1" = "2" ]; then @@ -368,21 +358,20 @@ fi # some aarch64 tests timeout, skip for now make check cd dovecot-pigeonhole -make check +# FIXME: make check will fail as it requires doveconf to be already installed at /usr/bin/doveconf +make check ||: %endif %files -%doc docinstall/* AUTHORS ChangeLog COPYING COPYING.LGPL COPYING.MIT NEWS README +%doc docinstall/* AUTHORS ChangeLog COPYING COPYING.LGPL COPYING.MIT INSTALL.md NEWS README.md SECURITY.md %{_sbindir}/dovecot %{_bindir}/doveadm %{_bindir}/doveconf -%{_bindir}/dsync %{_bindir}/dovecot-sysreport - %_tmpfilesdir/dovecot.conf -%{_sysusersdir}/dovecot.sysusers +%{_sysusersdir}/dovecot.conf %{_unitdir}/dovecot.service %{_unitdir}/dovecot-init.service %{_unitdir}/dovecot.socket @@ -390,32 +379,6 @@ make check %dir %{_sysconfdir}/dovecot %dir %{_sysconfdir}/dovecot/conf.d %config(noreplace) %{_sysconfdir}/dovecot/dovecot.conf -#list all so we'll be noticed if upstream changes anything -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/10-auth.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/10-director.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/10-logging.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/10-mail.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/10-master.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/10-metrics.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/10-ssl.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/15-lda.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/15-mailboxes.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/20-imap.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/20-lmtp.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/20-pop3.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/20-submission.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/90-acl.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/90-quota.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/90-plugin.conf -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-checkpassword.conf.ext -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-deny.conf.ext -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-dict.conf.ext -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-ldap.conf.ext -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-master.conf.ext -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-passwdfile.conf.ext -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-sql.conf.ext -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-static.conf.ext -%config(noreplace) %{_sysconfdir}/dovecot/conf.d/auth-system.conf.ext %config(noreplace) %{_sysconfdir}/pam.d/dovecot %config(noreplace) %{ssldir}/dovecot-openssl.cnf @@ -434,13 +397,13 @@ make check #these (*.so files) are plugins, not devel files %{_libdir}/dovecot/*_plugin.so %exclude %{_libdir}/dovecot/*_sieve_plugin.so -%{_libdir}/dovecot/auth/lib20_auth_var_expand_crypt.so %{_libdir}/dovecot/auth/libauthdb_imap.so %{_libdir}/dovecot/auth/libauthdb_ldap.so %if %{?rhel}0 == 0 %{_libdir}/dovecot/auth/libauthdb_lua.so %endif %{_libdir}/dovecot/auth/libmech_gssapi.so +%{_libdir}/dovecot/auth/libmech_gss_spnego.so %{_libdir}/dovecot/auth/libdriver_sqlite.so %{_libdir}/dovecot/dict/libdriver_sqlite.so %{_libdir}/dovecot/dict/libdict_ldap.so @@ -448,11 +411,8 @@ make check %{_libdir}/dovecot/libssl_iostream_openssl.so %{_libdir}/dovecot/libfs_compress.so %{_libdir}/dovecot/libfs_crypt.so -%{_libdir}/dovecot/libfs_mail_crypt.so %{_libdir}/dovecot/libdcrypt_openssl.so -%{_libdir}/dovecot/lib20_var_expand_crypt.so -%{_libdir}/dovecot/old-stats/libold_stats_mail.so -%{_libdir}/dovecot/old-stats/libstats_auth.so +%{_libdir}/dovecot//var_expand_crypt.so %dir %{_libdir}/dovecot/settings @@ -472,7 +432,6 @@ make check %{_mandir}/man1/doveadm*.1* %{_mandir}/man1/doveconf.1* %{_mandir}/man1/dovecot*.1* -%{_mandir}/man1/dsync.1* %{_mandir}/man5/dovecot.conf.5* %{_mandir}/man7/doveadm-search-query.7* @@ -520,6 +479,51 @@ make check %{_libdir}/%{name}/dict/libdriver_pgsql.so %changelog +* Sun Nov 30 2025 Michal Hlavinka - 1:2.4.2-1 +- updated to 2.4.2 (#2411846) + +* Wed Nov 05 2025 Michal Hlavinka - 1:2.4.1-8 +- update patch for CVE-2025-30189 + +* Wed Oct 15 2025 Michal Hlavinka - 1:2.4.1-7 +- enable fts flatcurve + +* Thu Oct 09 2025 Michal Hlavinka - 1:2.4.1-6 +- fix CVE-2025-30189: users would end up overwriting each other in cache (rhbz#2402122) + +* Wed Aug 06 2025 František Zatloukal - 1:2.4.1-5 +- Rebuilt for icu 77.1 + +* Wed Jul 30 2025 Michal Hlavinka - 1:2.4.1-4 +- fix compatibility with latest openssl (#2383209) + +* Wed Jul 23 2025 Fedora Release Engineering - 1:2.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jun 24 2025 Michal Hlavinka - 1:2.4.1-2 +- fix dovecot 2.4 gssapi regression (rhbz#2374419) + +* Tue Jun 03 2025 Michal Hlavinka - 1:2.4.1-1 +- updated to 2.4.1 release +- note: configuration is incompatible with 2.3.x version +- trim changelog +- revert previous change, only if-guard it + +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1:2.3.21.1-6 +- Drop call to %%sysusers_create_compat + +* Wed Feb 05 2025 Michal Hlavinka - 1:2.3.21.1-5 +- fix sysusers config file name + +* Wed Jan 29 2025 Michal Hlavinka - 1:2.3.21.1-4 +- fix ftbfs + +* Thu Jan 16 2025 Fedora Release Engineering - 1:2.3.21.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Oct 02 2024 Michal Hlavinka - 1:2.3.21.1-2 +- pigeonhole updated to 0.5.21.1 + * Mon Aug 19 2024 Michal Hlavinka - 1:2.3.21.1-1 - updated to 2.3.21.1(2304907) @@ -684,2056 +688,9 @@ make check information. - Metric filter and global event filter variable syntax changed to a SQL-like format. -- auth: Added new aliases for %{variables}. Usage of the old ones is +- auth: Added new aliases for %%{variables}. Usage of the old ones is possible, but discouraged. - auth: Removed RPA auth mechanism, SKEY auth mechanism, NTLM auth mechanism and related password schemes. - auth: Removed passdb-sia, passdb-vpopmail and userdb-vpopmail. - auth: Removed postfix postmap socket - -* Wed Oct 21 2020 Michal Hlavinka - 1:2.3.11.3-7 -- change run directory from /var/run to /run (#1777922) - -* Wed Oct 21 2020 Michal Hlavinka - 1:2.3.11.3-6 -- use bigger default key size (#1882939) - -* Wed Sep 02 2020 Michal Hlavinka - 1:2.3.11.3-5 -- fix gssapi issue - -* Wed Aug 26 2020 Michal Hlavinka - 1:2.3.11.3-4 -- fix FTBFS on 32bit systems - -* Mon Aug 17 2020 Jeff Law - 1:2.3.11.3-2 -- Disable LTO - -* Sat Aug 15 2020 Michal Hlavinka - 1:2.3.11.3-1 -- CVE-2020-12100: Parsing mails with a large number of MIME parts could - have resulted in excessive CPU usage or a crash due to running out of - stack memory. -- CVE-2020-12673: Dovecot's NTLM implementation does not correctly check - message buffer size, which leads to reading past allocation which can - lead to crash. -- CVE-2020-10967: lmtp/submission: Issuing the RCPT command with an - address that has the empty quoted string as local-part causes the lmtp - service to crash. -- CVE-2020-12674: Dovecot's RPA mechanism implementation accepts - zero-length message, which leads to assert-crash later on. - -* Sat Aug 01 2020 Fedora Release Engineering - 1:2.3.10.1-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1:2.3.10.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon May 18 2020 Michal Hlavinka - 1:2.3.10.1-1 -- dovecot updated to 2.3.10.1 -- fixes CVE-2020-10967, CVE-2020-10958, CVE-2020-10957 - -* Tue Apr 21 2020 Michal Hlavinka - 1:2.3.10-1 -- dovecot updated to 2.3.10, pigeonhole updated to 0.5.10 - -* Wed Feb 12 2020 Michal Hlavinka - 1:2.3.9.3-1 -- dovecot updated to 2.3.9.3 -- fixes CVE-2020-7046: Truncated UTF-8 can be used to DoS - submission-login and lmtp processes. -- fixes CVE-2020-7957: Specially crafted mail can crash snippet generation. - - -* Tue Jan 28 2020 Fedora Release Engineering - 1:2.3.9.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Dec 19 2019 Michal Hlavinka - 1:2.3.9.2-1 -- CVE-2019-19722: Mails with group addresses in From or To fields - caused crash in push notification drivers. - -* Wed Dec 04 2019 Michal Hlavinka - 1:2.3.9-1 -- dovecot updated to 2.3.9, pigeonhole updated to 0.5.9 - -* Thu Oct 10 2019 Michal Hlavinka - 1:2.3.8-1 -- dovecot updated to 2.3.8, pigeonhole 0.5.8 - -* Thu Aug 29 2019 Michal Hlavinka - 1:2.3.7.2-1 -- dovecot updated to 2.3.7.2, pigeonhole 0.5.7.2 -- fixes CVE-2019-11500: IMAP protocol parser does not properly handle NUL byte - when scanning data in quoted strings, leading to out of bounds heap - memory writes - -* Mon Aug 19 2019 Michal Hlavinka - 1:1-2.3.7.1 -- dovecot updated to 2.3.7.1, pigeonhole updated to 0.5.7.1 - -* Wed Jul 24 2019 Fedora Release Engineering - 1:2.3.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 31 2019 Michal Hlavinka - 1:2.3.6-3 -- disable gcc 9 stack reuse temporarily - -* Mon May 13 2019 Michal Hlavinka - 1:2.3.6-2 -- use /run instead of /var/run (#1706372) - -* Thu May 02 2019 Michal Hlavinka - 1:2.3.6-1 -- dovecot updated to 2.3.6, pigeonhole updated to 0.5.6 - -* Thu Apr 18 2019 Michal Hlavinka - 1:2.3.5.2-1 -- dovecot updated to 2.3.5.2 -- fixes CVE-2019-10691: Trying to login with 8bit username containing - invalid UTF8 input causes auth process to crash if auth policy is enabled. - -* Thu Mar 28 2019 Michal Hlavinka - 1:2.3.5.1-1 -- dovecot updated to 2.3.5.1 -- CVE-2019-7524: Missing input buffer size validation leads into - arbitrary buffer overflow when reading fts or pop3 uidl header - from Dovecot index. - -* Wed Mar 06 2019 Michal Hlavinka - 1:2.3.5-1 -- dovecot updated to 2.3.5, pigeonhole updated to 0.5.5 - -* Thu Jan 31 2019 Fedora Release Engineering - 1:2.3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Björn Esser - 1:2.3.4-2 -- Rebuilt for libcrypt.so.2 (#1666033) - -* Wed Jan 09 2019 Michal Hlavinka - 1:2.3.4-1 -- dovecot updated to 2.3.4, pigeonhole updated to 0.5.4 - -* Tue Oct 02 2018 Michal Hlavinka - 1:2.3.3-1 -- dovecot updated to 2.3.3, pigeonhole pdated to 0.5.3 -- doveconf hides more secrets now in the default output -- NUL bytes in mail headers can cause truncated replies when fetched. -- virtual plugin: Some searches used 100% CPU for many seconds -- dsync assert-crashed with acl plugin in some situations. -- imapc: Fixed various assert-crashes when reconnecting to server. - - -* Tue Oct 02 2018 Michal Hlavinka - 1:2.3.2.1-4 -- fix dovecot-init service syntax error (#1635017) - -* Mon Aug 13 2018 Michal Hlavinka - 1:2.3.2.1-3 -- do not try to generate ssl-params as its obsolete (#1614640) - -* Thu Jul 12 2018 Fedora Release Engineering - 1:2.3.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jul 10 2018 Michal Hlavinka - 1:2.3.2.1-1 -- SSL/TLS servers may have crashed during client disconnection - -* Mon Jul 09 2018 Michal Hlavinka - 1:2.3.2-1 -- dovecot updated to 2.3.2, pigeonhole to 0.5.2 - -* Wed Mar 28 2018 Michal Hlavinka - 1:2.3.1-2 -- fix ftbfs - murmurhash3 check fail - -* Wed Mar 28 2018 Michal Hlavinka - 1:2.3.1-1 -- dovecot updated to 2.3.1, pigeonhole updated to 0.5.1 - -* Tue Mar 27 2018 Michal Hlavinka - 1:2.3.0.1-3 -- use libxcrypt for Fedora >= 28, part of ftbfs fix (#1548520) - -* Wed Mar 07 2018 Michal Hlavinka - 1:2.3.0.1-2 -- add gcc buildrequire - -* Thu Mar 01 2018 Michal Hlavinka - 1:2.3.0.1-1 -- dovecot updated to 2.3.0.1, pigeonhole updated to 0.5.0.1 - -* Fri Feb 09 2018 Igor Gnatenko - 1:2.2.33.2-5 -- Escape macros in %%changelog - -* Wed Feb 07 2018 Fedora Release Engineering - 1:2.2.33.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Björn Esser - 1:2.2.33.2-3 -- Rebuilt for switch to libxcrypt - -* Mon Jan 08 2018 Michal Hlavinka - 1:2.2.33.2-2 -- remove tcp_wrappers on Fedora 28 and later (#1518761) -- use use mariadb-connector-c-devel instead of mysql-devel on Fedora 28 and later (#1493624) - -* Tue Oct 24 2017 Michal Hlavinka - 1:2.2.33.2-1 -- dovecot updated to 2.2.33.2 -- doveadm: Fix crash in proxying (or dsync replication) if remote is - running older than v2.2.33 -- auth: Fix memory leak in %%{ldap_dn} -- dict-sql: Fix data types to work correctly with Cassandra - -* Wed Oct 18 2017 Michal Hlavinka - 1:2.2.33.1-1 -- dovecot updated to 2.2.33.1, pigeonhole updated to -- Added %%{if}, see https://wiki2.dovecot.org/Variables#Conditionals -- sdbox: Mails were always opened when expunging, unless - mail_attachment_fs was explicitly set to empty. -- lmtp/doveadm proxy: hostip passdb field was ignored, which caused - unnecessary DNS lookups if host field wasn't an IP -- lmtp proxy: Fix crash when receiving unexpected reply in RCPT TO -- quota_clone: Update also when quota is unlimited (broken in v2.2.31) -- mbox, zlib: Fix assert-crash when accessing compressed mbox -- doveadm director kick -f parameter didn't work -- doveadm director flush resulted flushing all hosts, if - wasn't an IP address. -- director: Various fixes to handling backend/director changes at - abnormal times, especially while ring was unsynced. -- director: Use less CPU in imap-login processes when moving/kicking - many users. -- lmtp: Session IDs were duplicated/confusing with multiple RCPT TOs - when lmtp_rcpt_check_quota=yes -- LDA Sieve plugin: Fixed sequential execution of LDAP-based scripts. A - missing LDAP-based script could cause the script sequence to exit earlier. -- sieve-filter: Removed the (now) duplicate utf8 to mutf7 mailbox name - conversion. This caused problems with mailbox names containing UTF-8 - characters. - -* Mon Aug 28 2017 Michal Hlavinka - 1:2.2.32-2 -- pigeonhole updated to 0.4.20 -- Made the retention period for redirect duplicate identifiers - configurable. Changed the default retention period from 24 to 12 hours. -- sieve-filter: Fixed memory leak: forgot to clean up script binary at - end of execution -- managesieve-login: Fixed handling of AUTHENTICATE command. A second - authenticate command would be parsed wrong. - -* Fri Aug 25 2017 Michal Hlavinka - 1:2.2.32-1 -- dovecot updated to 2.2.32 -- Modseq tracking didn't always work correctly. This could have caused - imap unhibernation to fail or IMAP QRESYNC/CONDSTORE extensions to - not work perfectly. -- mdbox: "Inconsistency in map index" wasn't fixed automatically -- dict-ldap: %%variable values used in the LDAP filter weren't escaped. -- quota=count: quota_warning = -storage=.. was never executed (try #2). -- imapc: >= 32 kB mail bodies were supposed to be cached for subsequent - FETCHes, but weren't. -- quota-status service didn't support recipient_delimiter -- acl: Don't access dovecot-acl-list files with acl_globals_only=yes -- mail_location: If INDEX dir is set, mailbox deletion deletes its - childrens' indexes. -- director: v2.2.31 caused rapid reconnection loops to directors - that were down. - -* Wed Aug 02 2017 Fedora Release Engineering - 1:2.2.31-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1:2.2.31-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jul 11 2017 Michal Hlavinka - 1:2.2.31-3 -- enable tcpwrap support (#1450587) - -* Tue Jul 04 2017 Michal Hlavinka - 1:2.2.31-2 -- revert commit breaking NOTIFY support - -* Tue Jun 27 2017 Michal Hlavinka - 1:2.2.31-1 -- dovecot updated to 2.2.31 -- Various fixes to handling mailbox listing. Especially related to - handling nonexistent autocreated/autosubscribed mailboxes and ACLs. -- Global ACL file was parsed as if it was local ACL file. This caused - some of the ACL rule interactions to not work exactly as intended. -- Using mail_sort_max_read_count may have caused very high CPU usage. -- Message address parsing could have crashed on invalid input. -- imapc_features=fetch-headers wasn't always working correctly and - caused the full header to be fetched. -- imapc: Various bugfixes related to connection failure handling. -- quota=count: quota_warning = -storage=.. was never executed -- quota=count: Add support for "ns" parameter -- dsync: Fix incremental syncing for mails that don't have Date or - Message-ID headers. -- imap: Fix hang when client sends pipelined SEARCH + - EXPUNGE/CLOSE/LOGOUT. -- oauth2: Token validation didn't accept empty server responses. -- imap: NOTIFY command has been almost completely broken since the - beginning. -- pigeonhole updated to 0.4.19 -- Fixed bug in handling of implicit keep in some cases. -- include extension: Fixed segfault that (sometimes) occurred when the - global script location was left unconfigured. - -* Wed Jun 07 2017 Michal Hlavinka - 1:2.2.30.2-1 -- dovecot updated to 2.2.30.2 -- auth: Multiple failed authentications within short time caused crashes -- push-notification: OX driver crashed at deinit - -* Thu Jun 01 2017 Michal Hlavinka - 1:2.2.30.1-1 -- dovecot updated to 2.2.30.1 -- More fixes to automatically fix corruption in dovecot.list.index -- dsync-server: Fix support for dsync_features=empty-header-workaround -- imapc: Various bugfixes, including infinite loops on some errors -- IMAP NOTIFY wasn't working for non-INBOX if IMAP client hadn't - enabled modseq tracking via CONDSTORE/QRESYNC. -- fts-lucene: Fix it to work again with mbox format -- Some internal error messages may have contained garbage in v2.2.29 -- mail-crypt: Re-encrypt when copying/moving mails and per-mailbox keys - are used. Otherwise the copied mails can't be opened. - -* Wed Apr 12 2017 Michal Hlavinka - 1:2.2.29.1-1 -- dovecot updated to 2.2.29.1 -- dict-sql: Merging multiple UPDATEs to a single statement wasn't - actually working. -- pigeonhole updated to 0.4.18 -- imapsieve plugin: Implemented the copy_source_after rule action. When this - is enabled for a mailbox rule, the specified Sieve script is executed for - the message in the source mailbox during a "COPY" event. This happens only - after the Sieve script that is executed for the corresponding message in the - destination mailbox finishes running successfully. -- imapsieve plugin: Added non-standard Sieve environment items for the source - and destination mailbox. -- multiscript: The execution of the discard script had an implicit "keep", - rather than an implicit "discard". - -* Tue Apr 11 2017 Michal Hlavinka - 1:2.2.29-1 -- dovecot updated to 2.2.29 -- fts-tika: Fixed crash when parsing attachment without - Content-Disposition header. Broken by 2.2.28. -- trash plugin was broken in 2.2.28 -- auth: When passdb/userdb lookups were done via auth-workers, too much - data was added to auth cache. This could have resulted in wrong - replies when using multiple passdbs/userdbs. -- auth: passdb { skip & mechanisms } were ignored for the first passdb -- oauth2: Various fixes, including fixes to crashes -- dsync: Large Sieve scripts (or other large metadata) weren't always - synced. -- Index rebuild (e.g. doveadm force-resync) set all mails as \Recent -- imap-hibernate: %%{userdb:*} wasn't expanded in mail_log_prefix -- doveadm: Exit codes weren't preserved when proxying commands via - doveadm-server. Almost all errors used exit code 75 (tempfail). -- ACLs weren't applied to not-yet-existing autocreated mailboxes. -- Fixed a potential crash when parsing a broken message header. -- cassandra: Fallback consistency settings weren't working correctly. -- doveadm director status : "Initial config" was always empty -- imapc: Various reconnection fixes. - -* Mon Feb 27 2017 Michal Hlavinka - 1:2.2.28-1 -- dovecot updated to 2.2.28, pigeonhole to 0.4.17 -- auth: Support OAUTHBEARER and XOAUTH2 mechanisms. Also support them - in lib-dsasl for client side. -- imap: SEARCH/SORT may have assert-crashed in - client_check_command_hangs -- imap: FETCH X-MAILBOX may have assert-crashed in virtual mailboxes. -- search: Using NOT n:* or NOT UID n:* wasn't handled correctly -- fts: fts_autoindex_exclude = \Special-use caused crashes -- doveadm-server: Fix leaks and other problems when process is reused - for multiple requests (service_count != 1) -- sdbox: Fix assert-crash on mailbox create race -- lda/lmtp: deliver_log_format values weren't entirely correct if Sieve - was used. especially %%{storage_id} was broken. -- imapsieve plugin: Fixed assert failure occurring when used with virtual - mailboxes. -- doveadm sieve plugin: Fixed crash when setting Sieve script via attribute's - string value. - -* Fri Feb 10 2017 Fedora Release Engineering - 1:2.2.27-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Dec 14 2016 Than Ngo - 1:2.2.27-2 -- fixed bz#1403760, big endian issue - -* Mon Dec 05 2016 Michal Hlavinka - 1:2.2.27-1 -- Fixed crash in auth process when auth-policy was configured and - authentication was aborted/failed without a username set. -- director: If two users had different tags but the same hash, - the users may have been redirected to the wrong tag's hosts. -- Index files may have been thought incorrectly lost, causing - "Missing middle file seq=.." to be logged and index rebuild. - This happened more easily with IMAP hibernation enabled. -- Various fixes to restoring state correctly in un-hibernation. -- dovecot.index files were commonly 4 bytes per email too large. This - is because 3 bytes per email were being wasted that could have been - used for IMAP keywords. -- Various fixes to handle dovecot.list.index corruption better. -- lib-fts: Fixed assert-crash in address tokenizer with specific input. -- Fixed assert-crash in HTML to text parsing with specific input - (e.g. for FTS indexing or snippet generation) -- doveadm sync -1: Fixed handling mailbox GUID conflicts. -- sdbox, mdbox: Perform full index rebuild if corruption is detected - inside lib-index, which runs index fsck. -- quota: Don't skip quota checks when moving mails between different - quota roots. -- search: Multiple sequence sets or UID sets in search parameters - weren't handled correctly. They were incorrectly merged together. - -* Fri Dec 02 2016 Michal Hlavinka - 1:2.2.26.0-2 -- fix remote crash when auth-policy component is activated (CVE-2016-8652,#1401025) - -* Mon Oct 31 2016 Michal Hlavinka - 1:2.2.26.0-1 -- dovecot updated to 2.2.26.0, pigeonhole updated to 0.4.16 -- master process's listener socket was leaked to all child processes. - This might have allowed untrusted processes to capture and prevent - "doveadm service stop" comands from working. -- login proxy: Fixed crash when outgoing SSL connections were hanging. -- auth: userdb fields weren't passed to auth-workers, so %%{userdb:*} - from previous userdbs didn't work there. -- auth: Fixed auth_bind=yes + sasl_bind=yes to work together -- lmtp: %%{userdb:*} variables didn't work in mail_log_prefix -- Fixed writing >2GB to iostream-temp files (used by fs-compress, - fs-metawrap, doveadm-http) -- fts-solr: Fixed searching multiple mailboxes -- and more... - -* Mon Jul 04 2016 Michal Hlavinka - 1:2.2.25-1 -- dovecot updated to 2.2.25 -- doveadm backup was sometimes deleting entire mailboxes unnecessarily. -- doveadm: Command -parameters weren't being sent to doveadm-server. -- if dovecot.index read failed e.g. because mmap() reached VSZ limit, - an empty index could have been opened instead, corrupting the - mailbox state. -- lazy-expunge: Fixed a crash when copying failed. Various other fixes. -- fts-lucene: Fixed crash on index rescan. -- dict-ldap: Various fixes -- dict-sql: NULL values crashed. Now they're treated as "not found". - - -* Wed Apr 27 2016 Michal Hlavinka - 1:2.2.24-1 -- dovecot updated to 2.2.24 -- Huge header lines could have caused Dovecot to use too much memory -- dsync: Detect and handle invalid/stale -s state string better. -- dsync: Fixed crash caused by specific mailbox renames -- auth: Auth cache is now disabled passwd-file. -- fts-tika: Don't crash if it returns 500 error -- dict-redis: Fixed timeout handling -- SEARCH INTHREAD was crashing -- stats: Only a single fifo_listeners was supported, making it impossible to - use both auth_stats=yes and mail stats plugin. -- SSL errors were logged in separate "Stacked error" log lines instead of as - part of the disconnection reason. -- MIME body parser didn't handle properly when a child MIME part's --boundary - had the same prefix as the parent. -- pigeonhole updated to 0.4.14 -- extprograms plugin: Fixed epoll() panic caused by closing the output - FD before the output stream. -- Made sure that the local part of a mail address is encoded properly - using quoted string syntax when it is not a dot-atom. - -* Thu Mar 31 2016 Michal Hlavinka - 1:2.2.23-1 -- dovecot updated to 2.2.23, pigeonhole updated to 0.4.13 -- Various fixes to doveadm. Especially running commands via - doveadm-server was broken. -- director: Fixed user weakness getting stuck in some situations -- director: Fixed a situation where directors keep re-sending - different states to each others and never becoming synced. -- director: Fixed assert-crash related to a slow "user killed" reply -- Fixed assert-crash related to istream-concat, which could have - been triggered at least by a Sieve script. - -* Wed Mar 16 2016 Michal Hlavinka - 1:2.2.22-1 -- dovecot updated to 2.2.22 -- auth: Auth caching was done too aggressively when %%variables were - used in default_fields, override_fields or LDAP pass/user_attrs. - userdb result_* were also ignored when user was found from cache. -- imap: Fixed various assert-crashes caused v2.2.20+. Some of them - caught actual hangs or otherwise unwanted behavior towards IMAP - clients. -- Expunges were forgotten in some situations, for example when - pipelining multiple IMAP MOVE commands. -- quota: Per-namespaces quota were broken for dict and count backends - in v2.2.20+ -- fts-solr: Search queries were using OR instead of AND as the - separator for multi-token search queries in v2.2.20+. -- Single instance storage support wasn't really working in v2.2.16+ -- dbox: POP3 message ordering wasn't working correctly. -- virtual plugin: Fixed crashes related to backend mailbox deletions. - -* Mon Feb 08 2016 Michal Hlavinka - 1:2.2.21-4 -- pigeonhole updated to 0.4.12 -- multiscript: Fixed bug in handling of (implicit) keep; final keep action was - always executed as though there was a failure. -- managesieve-login: Fixed proxy to allow SASL mechanisms other than PLAIN. -- ldap storage: Prevent segfault occurring when assigning certain (global) - configuration options. - -* Wed Feb 03 2016 Fedora Release Engineering - 1:2.2.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jan 28 2016 Michal Hlavinka - 1:2.2.21-2 -- pigeonhole updated to 0.4.11 -- Sieve mime extension: Fixed the header :mime :anychild test to work properly - outside a foreverypart loop. -- Fixed assert failure occurring when text extraction is attempted on a - empty or broken text part. -- Fixed assert failure in handling of body parts that are converted to text. -- Fixed header unfolding for (mime) headers parsed from any mime part. -- Fixed trimming for (mime) headers parsed from any mime part. -- Fixed erroneous changes to the message part tree structure performed when - re-parsing the message. -- LDA Sieve plugin: Fixed bug in error handling of script storage initialization -- Fixed duplication of discard actions in the script result. -- Made sure that quota errors never get logged as errors in syslog. - -* Wed Dec 16 2015 Michal Hlavinka - 1:2.2.21-1 -- dovecot updated to 2.2.21 -- doveadm mailbox list (and some others) were broken in v2.2.20 -- director: Fixed making backend changes when running with only a - single director server. -- virtual plugin: Fixed crash when trying to open nonexistent - autocreated backend mailbox. -- pigeonhole updated to 0.4.10 -- implemented the Sieve mime and foreverypart extensions (RFC 5703). -+ sieve body extension: Properly implemented the `:text' body - transform. It now extracts text for HTML message parts. -- variables extension: Fixed handling of empty string by the `:length' - set modifier. An empty string yielded an empty string rather than "0". -- Fixed memory leak in the Sieve script byte code dumping facility. - Extension contexts were never actually freed. -- doveadm sieve plugin: Fixed crashes caused by incorrect context - allocation in the sieve command implementations. - -* Tue Dec 08 2015 Michal Hlavinka - 1:2.2.20-2 -- move ssl initialization from %%post to dovecot-init.service - -* Tue Dec 08 2015 Michal Hlavinka - 1:2.2.20-1 -- dovecot updated to 2.2.20 -- director: Backend tags weren't working correctly. -- ldap: tls_* settings weren't used for ldaps URIs. -- ldap, mysql: Fixed setting connect timeout. -- auth: userdb lookups via auth-worker couldn't change username -- dsync: Fixed handling deleted directories. Make sure we don't go to - infinite mailbox renaming loop. -- imap: Fixed crash in NOTIFY when there were watched namespaces that - didn't support NOTIFY. -- imap: After SETMETADATA was used, various commands (especially FETCH) - could have started hanging when their output was large. -- stats: Idle sessions weren't refreshed often enough, causing stats - process to forget them and log errors about unknown sessions when - they were updated later. -- stats: Fixed "Duplicate session ID" errors when LMTP delivered to - multiple recipients and fts_autoindex=yes. -- zlib plugin: Fixed copying causing cache corruption when zlib_save - wasn't set, but the source message was compressed. -- fts-solr: Fixed escaping Solr query parameters. -- lmtp: quota_full_tempfail=yes was ignored with - lmtp_rcpt_check_quota=yes - -* Mon Oct 05 2015 Michal Hlavinka - 1:2.2.19-1 -- dovecot updated to 2.2.19 -- mdbox: Rebuilding could have caused message's reference count to - overflow the 16bit number in some situations, causing problems when - trying to expunge the duplicates. -- Various search fixes (fts, solr, tika, lib-charset, indexer) -- Various virtual plugin fixes -- Various fixes and optimizations to dsync, imapc and pop3-migration -- imap: Various RFC compliancy and crash fixes to NOTIFY -- pigeonhole updated to 0.4.9 -- ManageSieve: Fixed an assert failure occurring when a client - disconnects during the GETSCRIPT command. -- doveadm sieve plugin: Fixed incorrect initialization (mem leaks) of mail user. -- sieve-filter command line tool: Fixed handling of failure-related - implicit keep when there is an explicit default destination folder. -- lib-sieve: Fixed bug in RFC5322 header folding. - -* Mon Aug 24 2015 Michal Hlavinka - 1:2.2.18-5 -- use the system crypto policy (#1109114) - -* Fri Jun 19 2015 Michal Hlavinka - 1:2.2.18-4 -- fix build for s390x and ppc64 (#1232650) - -* Wed Jun 17 2015 Fedora Release Engineering - 1:2.2.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon May 18 2015 Michal Hlavinka - 1:2.2.18-2 -- update pigeonhole to 0.4.8 -- Fixed problem in address test: erroneously decoded mime-encoded words in - address headers. -- extprograms plugin: Fixed failure occurring when connecting to script - service without the need to read back the output from the external program. -- Fixed bug in script storage path normalization occurring with relative - symbolic links below root. - -* Fri May 15 2015 Michal Hlavinka - 1:2.2.18-1 -- director: Login UNIX sockets were normally detected as doveadm or - director ring sockets, causing it to break in existing installations. -- sdbox: When copying a mail in alt storage, place the destination to - alt storage as well. - -* Thu May 14 2015 Michal Hlavinka - 1:2.2.17-1 -- dovecot updated to 2.2.17 -- pigeonhole updated to 0.4.7 -- auth: If auth_master_user_separator was set, auth process could be - crashed by trying to log in with empty master username. -- imap-login, pop3-login: Fixed crash on handshake failures with new - OpenSSL versions (v1.0.2) when SSLv3 was disabled. -- auth: If one passdb fails allow_nets check, it shouldn't have failed - all the other passdb checks later on. -- imap: Server METADATA couldn't be accessed -- imapc: Fixed \Muted label handling in gmail-migration. -- imapc: Various bugfixes and improvements. -- Trash plugin fixes by Alexei Gradinari -- mbox: Fixed crash/corruption in some situations - -* Tue Apr 28 2015 Michal Hlavinka - 1:2.2.16-2 -- fix CVE-2015-3420: SSL/TLS handshake failures leading to a crash of the login process - -* Mon Mar 16 2015 Michal Hlavinka - 1:2.2.16-1 -- dovecot updated to 2.2.16 -- auth: Don't crash if master user login is attempted without - any configured master=yes passdbs -- Parsing UTF-8 text for mails could have caused broken results - sometimes if buffering was split in the middle of a UTF-8 character. - This affected at least searching messages. -- String sanitization for some logged output wasn't done properly: - UTF-8 text could have been truncated wrongly or the truncation may - not have happened at all. -- fts-lucene: Lookups from virtual mailbox consisting of over 32 - physical mailboxes could have caused crashes. - -* Thu Feb 05 2015 Michal Hlavinka - 1:2.2.15-3 -- fix mbox istream crashes (#1189198, #1186504) - -* Mon Jan 05 2015 Michal Hlavinka - 1:2.2.15-2 -- fix crash related to logging BYE notifications (#1176282) -- update pigeonhole to 0.4.6 - -* Thu Oct 30 2014 Michal Hlavinka - 1:2.2.15-1 -- dovecot updated to 2.2.15 -- various race condition fixes to LAYOUT=index -- v2.2.14 virtual plugin crashed in some situations - -* Fri Oct 17 2014 Michal Hlavinka - 1:2.2.14-1 -- dovecot updated to 2.2.14, pigeonhole updated to 0.4.3 -- fixed several race conditions with dovecot.index.cache handling that - may have caused unnecessary "cache is corrupted" errors. -- auth: If auth client listed userdb and disconnected before finishing, - the auth worker process got stuck -- imap-login, pop3-login: Fixed potential crashes when client - disconnected unexpectedly. -- imap proxy: The connection was hanging in some usage patterns. - -* Thu Aug 21 2014 Michal Hlavinka - 1:2.2.13-4 -- use network-online target instead of just network (#1119814) - -* Sat Aug 16 2014 Fedora Release Engineering - 1:2.2.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1:2.2.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 12 2014 Michal Hlavinka - 1:2.2.13-1 -- dovecot updated to 2.2.13 -- fixes CVE-2014-3430: denial of service through maxxing out SSL connections -- pop3 server was still crashing in v2.2.12 -- maildir: Various fixes and improvements to handling compressed mails -- fts-lucene, fts-solr: Fixed crash on search when the index contained - duplicate entries. -- mail_attachment_dir: Attachments with the last base64-encoded line - longer than the rest wasn't handled correctly. -- IMAP: SEARCH/SORT PARTIAL was handled completely wrong in v2.2.11+ -- acl: Global ACL file handling was broken when multiple entries - matched the mailbox name - -* Sun Mar 30 2014 John Morris - 1:2.2.12-2 -- el6 build fixes (#1082384): -- el6 autoconf too old to regen; use packaged files -- fix compile error when __global_ldflags macro undefined - -* Fri Feb 14 2014 Michal Hlavinka - 1:2.2.12-1 -- dovecot updated to 2.2.12 -- fixes pop3 crash - -* Thu Feb 13 2014 Michal Hlavinka - 1:2.2.11-1 -- dovecot updated to 2.2.11 -- imap: SEARCH/SORT PARTIAL reponses may have been too large. -- doveadm backup: Fixed assert-crash when syncing mailbox deletion. - -* Thu Jan 02 2014 Michal Hlavinka - 1:2.2.10-1 -- dovecot updated to 2.2.10 -- quota-status: quota_grace was ignored -- ldap: Fixed memory leak with auth_bind=yes and without - auth_bind_userdn. -- imap: Don't send HIGHESTMODSEQ anymore on SELECT/EXAMINE when - CONDSTORE/QRESYNC has never before been enabled for the mailbox. -- imap: Fixes to handling mailboxes without permanent modseqs. - (When [NOMODSEQ] is returned by SELECT, mainly with in-memory - indexes.) -- imap: Various fixes to METADATA support. -- stats plugin: Processes that only temporarily dropped privileges - (e.g. indexer-worker) may have been logging errors about not being - able to open /proc/self/io. - -* Mon Nov 25 2013 Michal Hlavinka - 1:2.2.9-1 -- improved cache file handling exposed several old bugs related to fetching - mail headers. -- iostream handling changes were causing some connections to be disconnected - before flushing their output - -* Wed Nov 20 2013 Michal Hlavinka - 1:2.2.8-1 -- Fixed infinite loop in message parsing if message ends with - "--boundary" and CR (without LF). Messages saved via SMTP/LMTP can't - trigger this, because messages must end with an "LF.". A user could - trigger this for him/herself though. -- lmtp: Client was sometimes disconnected before all the output was - sent to it. -- replicator: Database wasn't being exported to disk every 15 minutes - as it should have. Instead it was being imported, causing "doveadm - replicator remove" commands to not work very well. - -* Thu Nov 14 2013 Michal Hlavinka - 1:2.2.7-2 -- fix ostream infinite loop (#1029906) - -* Mon Nov 04 2013 Michal Hlavinka - 1:2.2.7-1 -- dovecot updated to 2.2.7 -- master process was doing a hostname.domain lookup for each created - process, which may have caused a lot of unnecessary DNS lookups. -- dsync: Syncing over 100 messages at once caused problems in some - situations, causing messages to get new UIDs. -- fts-solr: Different Solr hosts for different users didn't work. - -* Tue Oct 01 2013 Michal Hlavinka - 1:2.2.6-1 -- dovecot updated to 2.2.6, pigeonhole updated to 0.4.2 -- director: v2.2.5 changes caused "SYNC lost" errors -- dsync: Many fixes and error handling improvements -- doveadm -A: Don't waste CPU by doing a separate config lookup - for each user -- Long-running ssl-params process no longer prevents Dovecot restart -- mbox: Fixed mailbox_list_index=yes to work correctly - -* Thu Aug 08 2013 Michal Hlavinka - 1:2.2.5-2 -- use unversioned doc dir (#993731) - -* Wed Aug 07 2013 Michal Hlavinka - 1:2.2.5-1 -- dovecot updated to 2.2.5 -- added some missing man pages (by Pascal Volk) -- director: Users near expiration could have been redirected to - different servers at the same time. -- pop3: Avoid assert-crash if client disconnects during LIST. -- mdbox: Corrupted index header still wasn't automatically fixed. -- dsync: Various fixes to work better with imapc and pop3c storages. -- ldap: sasl_bind=yes caused crashes, because Dovecot's lib-sasl - symbols conflicted with Cyrus SASL library. - -* Tue Jul 30 2013 Michal Hlavinka - 1:2.2.4-3 -- dovecot pigeonhole updated to 0.4.1 - -* Wed Jul 10 2013 Michal Hlavinka - 1:2.2.4-2 -- fix name conflict with cyrus-sasl (#975869) - -* Tue Jun 25 2013 Michal Hlavinka - 1:2.2.4-1 -- dovecot updated to 2.2.4 -- imap/pop3 proxy: Master user logins were broken in v2.2.3 -- sdbox/mdbox: A corrupted index header with wrong size was never - automatically fixed in v2.2.3. -- mbox: Fixed assert-crashes related to locking. - -* Mon Jun 17 2013 Michal Hlavinka - 1:2.2.3-1 -- dovecot updated to 2.2.3 -- IMAP: If subject contained only whitespace, Dovecot returned an - ENVELOPE reply with a huge literal value, effectively causing the - IMAP client to wait for more data forever. -- IMAP: Various URLAUTH fixes. -- imapc: Various bugfixes and improvements -- pop3c: Various fixes to make it work in dsync (without imapc) -- dsync: Fixes to syncing subscriptions. Fixes to syncing mailbox - renames. - -* Tue May 21 2013 Michal Hlavinka - 1:2.2.2-2 -- fix location of tmpfiles configuration (#964448) - -* Mon May 20 2013 Michal Hlavinka - 1:2.2.2-1 -- dovecot updated to 2.2.2 -- IMAP: Various URLAUTH fixes. -- IMAP: Fixed a hang with invalid APPEND parameters. -- IMAP LIST-EXTENDED: INBOX was never listed with \Subscribed flag. -- mailbox_list_index=yes still caused crashes. -- maildir: Fixed a crash after dovecot-keywords file was re-read. -- maildir: If files had reappeared unexpectedly to a Maildir, they - were ignored until index files were deleted. -- Maildir: Fixed handling over 26 keywords in a mailbox. -- imap/pop3-login proxying: Fixed a crash if TCP connection succeeded, - but the remote login timed out. - -* Thu May 16 2013 Michal Hlavinka - 1:2.2.1-4 -- update pigeonhole to 0.4.0 - -* Mon Apr 29 2013 Michal Hlavinka - 1:2.2.1-3 -- revert last change and use different fix - -* Wed Apr 24 2013 Kalev Lember - 1:2.2.1-2 -- Filter out autogenerated perl deps (#956194) - -* Fri Apr 19 2013 Michal Hlavinka - 1:2.2.1-1 -- dovecot updated to 2.2.1 -- mailbox_list_index=yes was broken. -- LAYOUT=index didn't list subscriptions. -- auth: Multiple master passdbs didn't work. -- Message parsing (e.g. during search) crashed when multipart message - didn't actually contain any parts. -- dovecot updated to 2.2.1 - -* Mon Apr 15 2013 Michal Hlavinka - 1:2.2.0-1 -- dovecot updated to 2.2.0 -- Mailbox list indexes weren't using proper file permissions based - on the root directory. -- replicator: doveadm commands and user list export may have skipped - some users. -- Various fixes to mailbox_list_index=yes - -* Fri Apr 05 2013 Michal Hlavinka - 1:2.2-0.4 -- dovecot updated to 2.2 RC4 -- various bugfixes to LDAP changes in rc3 - -* Wed Mar 27 2013 Michal Hlavinka - 1:2.2-0.3 -- dovecot updated to 2.2 RC3 -- Fixed a crash when decoding quoted-printable content. -- dsync: Various bugfixes - -* Thu Feb 28 2013 Michal Hlavinka - 1:2.2-0.2 -- do not print error when NetworkManager is not installed (#916456) - -* Wed Feb 27 2013 Michal Hlavinka - 1:2.2-0.1 -- major update to dovecot 2.2 RC2 - -* Mon Feb 11 2013 Michal Hlavinka - 1:2.1.15-1 -- dovecot updated to 2.1.15 -- v2.1.14's dovecot.index.cache fixes caused Dovecot to use more disk I/O - and memory than was necessary. - -* Tue Feb 05 2013 Michal Hlavinka - 1:2.1.14-2 -- spec clean up - -* Thu Jan 31 2013 Michal Hlavinka - 1:2.1.14-1 -- dovecot updated to 2.1.14 -- v2.1.11+ had a race condition where it sometimes overwrote data in - dovecot.index.cache file. This could have caused Dovecot to return - the same cached data to two different messages. -- mdbox: Fixes to handling duplicate GUIDs during index rebuild - -* Tue Jan 15 2013 Michal Hlavinka - 1:2.1.13-1 -- dovecot updated to 2.1.13 -- Some fixes to cache file changes in v2.1.11. -- virtual storage: Sorting mailbox by from/to/cc/bcc didn't work. - -* Mon Dec 03 2012 Michal Hlavinka - 1:2.1.12-1 -- dovecot updated to 2.1.12 -- lmtp proxy: Fixed hanging if remote server was down. -- doveadm: Various fixes to handling doveadm-server connections. -- auth: passdb imap was broken in v2.1.10. - -* Thu Nov 08 2012 Michal Hlavinka - 1:2.1.10-3 -- fix network still not ready race condition (#871623) - -* Fri Nov 02 2012 Michal Hlavinka - 1:2.1.10-2 -- add reload command to service file - -* Wed Sep 19 2012 Michal Hlavinka - 1:2.1.10-1 -- dovecot updated to 2.1.10, pigeonhole updated to 0.3.3 -- director: In some conditions director may have disconnected from - another director (without logging about it), thinking it was sending - invalid data. -- imap: Various fixes to listing mailboxes. -- login processes crashed if there were a lot of local {} or remote {} - settings blocks. - -* Fri Aug 24 2012 Michal Hlavinka - 1:2.1.9-2 -- use new systemd rpm macros (#851238) - -* Thu Aug 02 2012 Michal Hlavinka - 1:2.1.9-1 -- dovecot updated to 2.1.9 -- Full text search indexing might have failed for some messages, - always causing indexer-worker process to run out of memory. -- fts-lucene: Fixed handling SEARCH HEADER FROM/TO/SUBJECT/CC/BCC when - the header wasn't lowercased. -- fts-squat: Fixed crash when searching a virtual mailbox. -- pop3: Fixed assert crash when doing UIDL on empty mailbox on some - setups. -- auth: GSSAPI RFC compliancy and error handling fixes. -- Various fixes related to handling shared namespaces - -* Wed Jul 18 2012 Fedora Release Engineering - 1:2.1.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 03 2012 Michal Hlavinka - 1:2.1.8-2 -- pigeonhole updated to 0.3.1 -- Fixed several small issues, including a few potential segfault bugs, based - on static source code analysis. - -* Tue Jul 03 2012 Michal Hlavinka - 1:2.1.8-1 -- dovecot updated to 2.1.8 -- imap: Mailbox names were accidentally sent as UTF-8 instead of mUTF-7 - in previous v2.1.x releases for STATUS, MYRIGHTS and GETQUOTAROOT commands. -- lmtp proxy: Don't timeout connections too early when mail has a lot of RCPT TOs. -- director: Don't crash if the director is working alone. -- shared mailboxes: Avoid doing "@domain" userdb lookups. -- doveadm: Fixed crash with proxying some commands. -- fts-squat: Fixed handling multiple SEARCH parameters. -- imapc: Fixed a crash when message had more than 8 keywords. -- imapc: Don't crash on APPEND/COPY if server doesn't support UIDPLUS. - - -* Mon Jul 02 2012 Michal Hlavinka - 1:2.1.7-5 -- make quota work with NFS mounted mailboxes - -* Fri Jun 22 2012 Michal Hlavinka - 1:2.1.7-4 -- posttrans argument is always zero - -* Fri Jun 15 2012 Michal Hlavinka - 1:2.1.7-3 -- do not let dovecot run during upgrade (#134325) - -* Wed May 30 2012 Michal Hlavinka - 1:2.1.7-2 -- fix changelog, 2.1.7-1 had copy-pasted upstream changelog, which was wrong -- director: Don't crash with quickly disconnecting incoming director - connections. -- mdbox: If mail was originally saved to non-INBOX, and namespace - prefix is non-empty, don't assert-crash when rebuilding indexes. -- sdbox: Don't use more fds than necessary when copying mails. -- auth: Fixed crash with DIGEST-MD5 when attempting to do master user - login without master passdbs. -- Several fixes to mail_shared_explicit_inbox=no -- imapc: Use imapc_list_prefix also for listing subscriptions. - -* Wed May 30 2012 Michal Hlavinka - 1:2.1.7-1 -- updated to 2.1.7 -- v2.1.5: Using "~/" as mail_location or elsewhere failed to actually - expand it to home directory. -- dbox: Fixed potential assert-crash when reading dbox files. -- trash plugin: Fixed behavior when quota is already over limit. -- mail_log plugin: Logging "copy" event didn't work. -- Proxying to backend server with SSL: Verifying server certificate - name always failed, because it was compared to an IP address. - -* Wed May 09 2012 Michal Hlavinka - 1:2.1.6-2 -- fix socket activation again, fix in 2.1.6 is incomplete - -* Wed May 09 2012 Michal Hlavinka - 1:2.1.6-1 -- v2.1.5: Using "~/" as mail_location or elsewhere failed to actually - expand it to home directory. -- dbox: Fixed potential assert-crash when reading dbox files. -- trash plugin: Fixed behavior when quota is already over limit. -- Proxying to backend server with SSL: Verifying server certificate - name always failed, because it was compared to an IP address. - -* Tue Apr 24 2012 Michal Hlavinka - 1:2.1.5-1 -- IMAP: Several fixes related to mailbox listing in some configs -- director: A lot of fixes and performance improvements -- mbox: Deleting a mailbox didn't delete its index files. -- pop3c: TOP command was sent incorrectly -- trash plugin didn't work properly -- LMTP: Don't add a duplicate Return-Path: header when proxying. -- listescape: Don't unescape namespace prefixes. - -* Tue Apr 24 2012 Michal Hlavinka - 1:2.1.4-2 -- close systemd extra sockets that are not configured - -* Tue Apr 10 2012 Michal Hlavinka - 1:2.1.4-1 -- dovecot updated to 2.1.4 -- Proxying SSL connections crashed in v2.1.[23] -- fts-solr: Indexing mail bodies was broken. -- director: Several changes to significantly improve error handling -- doveadm import didn't import messages' flags -- mail_full_filesystem_access=yes was broken -- Make sure IMAP clients can't create directories when accessing - nonexistent users' mailboxes via shared namespace. -- Dovecot auth clients authenticating via TCP socket could have failed - with bogus "PID already in use" errors. - -* Mon Mar 19 2012 Michal Hlavinka - 1:2.1.3-1 -- dovecot updated to 2.1.3 -- multi-dbox format in dovecot 2.1.2 was broken -- temporarily disable check phase until bug #798968 is fixed - -* Fri Mar 16 2012 Michal Hlavinka - 1:2.1.2-1 -- dovecot updated to 2.1.2 -- doveadm sync: If mailbox was expunged empty, messages may have - become back instead of also being expunged in the other side. -- imap_id_* settings were ignored before login. -- Several fixes to mailbox_list_index=yes -- Previous v2.1.x didn't log all messages at shutdown. - -* Thu Mar 01 2012 Michal Hlavinka - 1:2.1.1-2 -- enable fts_lucene plugin (#798661) - -* Fri Feb 24 2012 Michal Hlavinka - 1:2.1.1-1 -- dovecot updated to 2.1.1 -- acl plugin + autocreated mailboxes crashed when listing mailboxes -- doveadm force-resync: Don't skip autocreated mailboxes (especially - INBOX). -- If process runs out of fds, stop listening for new connections only - temporarily, not permanently (avoids hangs with process_limit=1 - services) -- auth: passdb imap crashed for non-login authentication (e.g. smtp). - - -* Mon Feb 20 2012 Michal Hlavinka - 1:2.1.0-1 -- updated to 2.1.0 (no major changes since .rc6) -- include pigeonhole doc files (NEWS, README, ...) - -* Tue Feb 14 2012 Michal Hlavinka - 1:2.1-0.7.rc6 -- updated to 2.1.rc6 -- dbox: Fixed error handling when saving failed or was aborted -- IMAP: Using COMPRESS extension may have caused assert-crashes -- IMAP: THREAD REFS sometimes returned invalid (0) nodes. -- dsync: Fixed handling non-ASCII characters in mailbox names. - -* Tue Feb 07 2012 Michal Hlavinka - 1:2.1-0.6.rc5 -- use PrivateTmp in systemd unit file - -* Tue Feb 07 2012 Michal Hlavinka - 1:2.1-0.5.rc5 -- updated to 2.1.rc5 -- director: With >2 directors ring syncing might have stalled during - director connect/disconnect, causing logins to fail. -- LMTP client/proxy: Fixed potential hanging when sending (big) mails -- Compressed mails with external attachments (dbox + SIS + zlib) failed - sometimes with bogus "cached message size wrong" errors. - -* Mon Jan 09 2012 Michal Hlavinka - 1:2.1-0.4.rc3 -- updated to 2.1.rc3 -- dsync was merged into doveadm -- added pop3c (= POP3 client) storage backend - -* Wed Dec 14 2011 Michal Hlavinka - 1:2.1-0.3.rc1 -- allow imap+TLS and pop3+TLS by default - -* Fri Dec 02 2011 Michal Hlavinka - 1:2.1-0.2.rc1 -- call systemd reload in postun - -* Wed Nov 30 2011 Michal Hlavinka - 1:2.1-0.1.rc1 -- updated to 2.1.rc1 -- major changes since 2.0.x: -- plugins now use UTF-8 mailbox names rather than mUTF-7 -- auth_username_format default changed to %%Lu -- solr full text search backend changed to use mailbox GUIDs instead of - mailbox names, requiring reindexing everything - -* Mon Nov 21 2011 Michal Hlavinka - 1:2.0.16-1 -- dovecot updated to 2.0.16 - -* Mon Oct 24 2011 Michal Hlavinka - 1:2.0.15-2 -- do not use obsolete settings in default configuration (#743444) - -* Mon Sep 19 2011 Michal Hlavinka - 1:2.0.15-1 -- dovecot updated to 2.0.15 -- v2.0.14: Index reading could have eaten a lot of memory in some - situations -- mbox: Fixed crash during mail delivery when mailbox didn't yet have - GUID assigned to it. -- zlib+mbox: Fetching last message from compressed mailboxes crashed. - -* Tue Sep 13 2011 Michal Hlavinka - 1:2.0.14-2 -- do not enable insecure connections by default - -* Mon Aug 29 2011 Michal Hlavinka - 1:2.0.14-1 -- dovecot updated to 2.0.14 -- userdb extra fields can now return name+=value to append to an - existing name -- script-login attempted an unnecessary config lookup, which usually - failed with "Permission denied". -- lmtp: Fixed parsing quoted strings with spaces as local-part for - MAIL FROM and RCPT TO. -- imap: FETCH BODY[HEADER.FIELDS (..)] may have crashed or not - returned all data sometimes. -- ldap: Fixed random assert-crashing with with sasl_bind=yes. -- Fixes to handling mail chroots -- Fixed renaming mailboxes under different parent with FS layout when - using separate ALT, INDEX or CONTROL paths. -- zlib: Fixed reading concatenated .gz files. - -* Fri Jul 15 2011 Michal Hlavinka - 1:2.0.13-2 -- do not include sysv init script - -* Thu May 12 2011 Michal Hlavinka - 1:2.0.13-1 -- dovecot updated to 2.0.13 -- mdbox purge: Fixed wrong warning about corrupted extrefs. -- script-login binary wasn't actually dropping privileges to the - user/group/chroot specified by its service settings. -- Fixed potential crashes and other problems when parsing header names - that contained NUL characters. - -* Fri Apr 15 2011 Michal Hlavinka - 1:2.0.12-2 -- pigeonhole updated to 0.2.3, which includes: -- managesieve: fixed bug in UTF-8 checking of string values -- sieve command line tools now avoid initializing the mail store unless necessary -- removed header MIME-decoding to fix erroneous address parsing -- fixed segfault bug in extension configuration, triggered when unknown - extension is mentioned in sieve_extensions setting. - -* Wed Apr 13 2011 Michal Hlavinka - 1:2.0.12-1 -- dbox: Fixes to handling external attachments -- dsync: More fixes to avoid hanging with remote syncs -- dsync: Many other syncing/correctness fixes -- doveconf: v2.0.10 and v2.0.11 didn't output plugin {} section right - -* Mon Mar 28 2011 Michal Hlavinka - 1:2.0.11-5 -- rebuild with new patch - -* Mon Mar 28 2011 Michal Hlavinka - 1:2.0.11-4 -- fix regression in config file parsing (#690401) - -* Wed Mar 23 2011 Dan Horák - 1:2.0.11-3 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Wed Mar 23 2011 Michal Hlavinka - 1:2.0.11-2 -- rebuild because of updated dependencies - -* Mon Mar 07 2011 Michal Hlavinka - 1:2.0.11-1 -- IMAP: Fixed hangs with COMPRESS extension -- IMAP: Fixed a hang when trying to COPY to a nonexistent mailbox. -- IMAP: Fixed hang/crash with SEARCHRES + pipelining $. -- IMAP: Fixed assert-crash if IDLE+DONE is sent in same TCP packet. - -* Thu Feb 17 2011 Michal Hlavinka - 1:2.0.9-3 -- add missing section to dovecot's systemd service file - -* Tue Feb 08 2011 Fedora Release Engineering - 1:2.0.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jan 13 2011 Michal Hlavinka - 1:2.0.9-1 -- dovecot updated to 2.0.9 -- fixed a high system CPU usage / high context switch count performance problem -- lda: Fixed a crash when trying to send "out of quota" reply - -* Mon Dec 20 2010 Michal Hlavinka - 1:2.0.8-3 -- add full path and check to restorecon in post - -* Tue Dec 07 2010 Michal Hlavinka - 1:2.0.8-2 -- fix s/foobar/dovecot/ typo in post script - -* Tue Dec 07 2010 Michal Hlavinka - 1:2.0.8-1 -- dovecot updated to 2.0.8, pigeonhole updated to 0.2.2 -- services' default vsz_limits weren't being enforced correctly -- added systemd support -- dbox: Fixes to handling external mail attachments -- imap, pop3: When service { client_count } was larger than 1, the - log messages didn't use the correct prefix -- MySQL: Only the first specified host was ever used - -* Mon Nov 29 2010 Michal Hlavinka - 1:2.0.7-3 -- make it work with /var/run on tmpfs (#656577) - -* Tue Nov 23 2010 Michal Hlavinka - 1:2.0.7-2 -- fix regression with valid_chroot_dirs being ignored (#654083) - -* Tue Nov 09 2010 Michal Hlavinka - 1:2.0.7-1 -- dovecot updated to 2.0.7 -- IMAP: Fixed LIST-STATUS when listing subscriptions with subscriptions=no namespaces. -- IMAP: Fixed SELECT QRESYNC not to crash on mailbox close if a lot of changes were being sent. -- quota: Don't count virtual mailboxes in quota -- doveadm expunge didn't always actually do the physical expunging -- Fixed some index reading optimizations introduced by v2.0.5. -- LMTP proxying fixes - -* Fri Oct 22 2010 Michal Hlavinka - 1:2.0.6-1 -- dovecot updated to 2.0.6 -- Pre-login CAPABILITY includes IDLE again. Mainly to make Blackberry - servers happy. -- auth: auth_cache_negative_ttl default was 0 in earlier v2.0.x, but it - was supposed to be 1 hour as in v1.x. Changed it back to 1h. -- doveadm: Added import command for importing mails from other storages. -- Reduced NFS I/O operations for index file accesses -- dbox, Maildir: When copying messages, copy also already cached fields - from dovecot.index.cache -- Maildir: LDA/LMTP assert-crashed sometimes when saving a mail. -- Fixed leaking fds when writing to dovecot.mailbox.log. -- Fixed rare dovecot.index.cache corruption -- IMAP: SEARCH YOUNGER/OLDER wasn't working correctly - -* Mon Oct 04 2010 Michal Hlavinka - 1:2.0.5-1 -- dovecot updated to 2.0.5 -- acl: Fixed the logic of merging multiple ACL entries -- sdbox: Fixed memory leak when copying messages with hard links. -- zlib: Fixed several crashes, which mainly showed up with mbox. -- quota: Don't crash if user has quota disabled, but plugin loaded. -- acl: Fixed crashing when sometimes listing shared mailboxes via dict proxy. - -* Tue Sep 28 2010 Michal Hlavinka - 1:2.0.4-1 -- dovecot updated to 2.0.4 -- multi-dbox: If :INDEX=path is specified, keep storage/dovecot.map.index* - files also in the index path rather than in the main storage directory. -- dsync: POP3 UIDLs weren't copied with Maildir -- dict file: Fixed fd leak (showed up easily with LMTP + quota) - -* Mon Sep 20 2010 Michal Hlavinka - 1:2.0.3-1 -- dovecot updated to 2.0.3 -- dovecot-lda: Removed use of non-standard Envelope-To: header as - a default for -a -- dsync: Fixed handling \Noselect mailboxes -- Fixed an infinite loop introduced by v2.0.2's message parser changes. -- Fixed a crash introduced by v2.0.2's istream-crlf changes. - -* Thu Sep 16 2010 Michal Hlavinka - 1:2.0.2-1 -- dovecot updated -- vpopmail support is disabled for now, since it's broken. You can use - it via checkpassword support or its sql/ldap database directly. -- maildir: Fixed "duplicate uidlist entry" errors that happened at - least with LMTP when mail was delivered to multiple recipients -- Deleting ACLs didn't cause entries to be removed from acl_shared_dict -- mail_max_lock_timeout setting wasn't working with all locks - -* Wed Aug 25 2010 Michal Hlavinka - 1:2.0.1-1 -- dovecot and pigeonhole updated -- sieve: sieved renamed to sieve-dump -- when dsync is started as root, remote dsync command is now also executed - as root instead of with dropped privileges. -- IMAP: QRESYNC parameters for SELECT weren't handled correctly. -- UTF-8 string validity checking wasn't done correctly -- dsync: Fixed a random assert-crash with remote dsyncing - -* Tue Aug 17 2010 Michal Hlavinka - 1:2.0-1 -- dovecot and pigeonhole updated -- dict quota didn't always decrease quota when messages were expunged -- Shared INBOX wasn't always listed with FS layout - -* Wed Aug 11 2010 Michal Hlavinka - 1:2.0-0.21.rc5 -- dovecot and pigeonhole updated -- Using more than 2 plugins could have caused broken behavior -- Listescape plugin fixes -- mbox: Fixed a couple of assert-crashes -- mdbox: Fixed potential assert-crash when saving multiple messages - in one transaction - -* Thu Aug 05 2010 Michal Hlavinka - 1:2.0-0.20.rc4 -- dovecot and pigeonhole updated -- doveadm mailbox status: Fixed listing non-ASCII mailbox names. -- doveadm fetch: Fixed output when fetching message header or body -- doveadm director map/add/remove: Fixed handling IP address as parameter. -- dsync: A few more fixes - -* Wed Jul 21 2010 Michal Hlavinka - 1:2.0-0.19.rc3 -- dovecot and pigeonhole updated -- fixed lda + sieve crash -- added mail_temp_dir setting, used by deliver and lmtp for creating - temporary mail files. Default is /tmp. -- imap: Fixed checking if list=children namespace has children. -- mdbox: Race condition fixes related to copying and purging - -* Fri Jul 16 2010 Michal Hlavinka - 1:2.0-0.18.rc2.20100716 -- dovecot and pigeonhole updated -- enabled pigeonhole's build time test suite -- acl: Fixed crashon FS layout with non-default hierarchy separator -- dbox renamed to sdbox -- dsync fixes and improvements - -* Mon Jul 12 2010 Michal Hlavinka - 1:2.0-0.17.rc2.20100712 -- dovecot and pigeonhole updated -- fixed a crash with empty mail_plugins -- fixed sharing INBOX to other users -- director+LMTP proxy wasn't working correctly -- v1.x config parser failed with some settings if pigeonhole wasn't installed. -- virtual: If non-matching messages weren't expunged within same session, - they never got expunged. - -* Wed Jul 07 2010 Michal Hlavinka - 1:2.0-0.16.rc1.20100707 -- updated dovecot and pigeonhole -- a lot of dsync fixes -- improved (m)dbox recovery - -* Mon Jun 28 2010 Michal Hlavinka - 1:2.0-0.15.beta6.20100626 -- updated dovecot, pigeonhole and man pages -- moved disable_plaintext_auth to 10-auth.conf -- mdbox: Fixed assert-crash on storage rebuild if file got lost -- lib-charset: Don't assert-crash when iconv() skips lots of invalid input -- master: Fixed crash on deinit (maybe also on reload) - -* Thu Jun 10 2010 Michal Hlavinka - 1:2.0-0.14.beta5.20100610 -- dovecot updated -- lib-storage: Fixed accessing uncommitted saved mails with dsync -- example-config: Moved ACL and quota settings to a separate .conf files -- dbox, mdbox: Fixed race conditions when creating mailboxes - -* Mon May 31 2010 Michal Hlavinka - 1:2.0-0.13.beta5.20100529 -- dovecot and pigeonhole updated -- enable solr fulltext search -- master: Fixed crash on config reload -- lib-storage: Don't assert-crash when copying a mail fails - -* Tue May 18 2010 Michal Hlavinka - 1:2.0-0.12.beta5.20100515 -- dovenull is unauthorized user, needs own dovenull group - -* Tue May 18 2010 Michal Hlavinka - 1:2.0-0.11.beta5.20100515 -- fix typo in dovenull username - -* Mon May 17 2010 Michal Hlavinka - 1:2.0-0.9.beta5.20100515 -- pigeonhole and dovecot updated to snapshot 20100515 -- fix crash for THREAD command - -* Wed May 05 2010 Michal Hlavinka - 1:2.0-0.8.beta4.20100505 -- pigeonhole and dovecot updated to snapshot 20100505 -- mdbox: Avoid rebuilding storage if another process already did it -- lib-storage: Fixed () sublists in IMAP SEARCH parser -- example-config: auth-checkpassword include wasn't listed in 10-auth.conf -- doveadm: Added search command -- lib-master: Don't crash after timeouting an auth-master request -- master: If inet listener uses DNS name, which returns multiple IPs, - listen in all of them - -* Wed Apr 28 2010 Michal Hlavinka - 1:2.0-0.7.beta4.20100427 -- updated to snapshot 20100427 -- doveconf now prints only the one setting's value -- mdbox: Automatically delete old temp.* files from storage/ directory -- mdbox: use flock locking by default - -* Wed Apr 21 2010 Michal Hlavinka - 1:2.0-0.6.beta4.20100421 -- updated to snapshot 20100421 -- mdbox: Purge crashed if it purged all messages from a file -- lib-storage: Shared namespace's prefix_len wasn't updated after prefix was truncated -- imap-quota: Iterate quota roots only once when replying to GETQUOTAROOT -- idle: Do cork/uncork when sending "OK Still here" notification -- login: If proxy returns ssl=yes and no port, switch port to imaps/pop3s - -* Wed Apr 14 2010 Michal Hlavinka - 1:2.0-0.5.beta4.20100414 -- add make check -- updated to snapshot 20100414 -- config: Added nn- prefix to *.conf files so the sort ordering makes more sense -- lib-master: Log an error if login client disconnects too early -- mdbox: If purging found corrupted files, it didn't auto-rebuild storage -- lib-storage: Added support for searching save date -- and more... -- pigeonhole updated: -- Mailbox extension: fixed memory leak in the mailboxexists test -- added login failure handler - -* Tue Apr 06 2010 Michal Hlavinka - 1:2.0-0.4.beta4.20100406 -- updated to snapshot 20100406 -- auth: If userdb lookup fails internally, don't cache the result. -- Added support for userdb lookup to fail with a reason -- sdbox: mailbox_update() could have changed UIDVALIDITY incorrectly -- layout=maildir++: Fixed deleting mailboxes with mailbox=file storages -- Fixed potential problems with parsing invalid address groups. -- dsync: Don't repeatedly try to keep opening the same failing mailbox -- lib-storage: Don't crash if root mail directory isn't given. - -* Tue Mar 30 2010 Michal Hlavinka - 1:2.0-0.3.beta4.20100330 -- fix certs location in ssl.conf - -* Mon Mar 29 2010 Michal Hlavinka - 1:2.0-0.2.beta4.aefa279e2c70 -- update to snapshot aefa279e2c70 from 2010-03-27 -- fixes complains about missing tcpwrap (#577426) - -* Thu Mar 25 2010 Michal Hlavinka - 1:2.0-0.1.beta4 -- dovecot updated to 2.0 beta 4 - -* Fri Mar 12 2010 Michal Hlavinka - 1:1.2.11-2 -- fix missing bzip2 support in zlib plugin (#572797) - -* Tue Mar 09 2010 Michal Hlavinka - 1:1.2.11-1 -- updated to 1.2.11 -- mbox: Message header reading was unnecessarily slow. Fetching a - huge header could have resulted in Dovecot eating a lot of CPU. - Also searching messages was much slower than necessary. -- maildir: Reading uidlist could have ended up in an infinite loop. -- IMAP IDLE: v1.2.7+ caused extra load by checking changes every - 0.5 seconds after a change had occurred in mailbox - -* Tue Feb 23 2010 Michal Hlavinka - 1:1.2.10-4 -- move libs to correct package - -* Fri Feb 19 2010 Michal Hlavinka - 1:1.2.10-3 -- merged dovecot-sieve and dovecot-managesieve into dovecot-pigeonhole -- merged dovecot-sqlite, dovecot-gssapi and dovecot-ldap into dovecot - -* Mon Jan 25 2010 Michal Hlavinka - 1:1.2.10-2 -- updated sive and managesieve -- Added preliminary support for Sieve plugins and added support for - installing Sieve development headers -- Variables extension: added support for variable namespaces. -- Added configurable script size limit. Compiler will refuse to - compile files larger than sieve_max_script_size. -- Fixed a bug in the i;ascii-numeric comparator. If one of the - strings started with a non-digit character, the comparator would - always yield less-than. -- Imap4flags extension: fixed bug in removeflag: removing a single - flag failed due to off-by-one error (bug report by Julian Cowley). -- Fixed parser recovery. In particular cases it would trigger spurious - errors after an initial valid error and sometimes additional errors - were inappropriately ignored. -- Implemented ManageSieve QUOTA enforcement. -- Added MAXREDIRECTS capability after login. -- Implemented new script name rules specified in most recent - ManageSieve draft. -- Fixed assertion failure occuring with challenge-response SASL - mechanisms. - -* Mon Jan 25 2010 Michal Hlavinka - 1:1.2.10-1 -- updated to 1.2.10 -- %%variables now support %%{host}, %%{pid} and %%{env:ENVIRONMENT_NAME} - everywhere. -- LIST-STATUS capability is now advertised -- maildir: Fixed several assert-crashes. -- imap: LIST "" inbox shouldn't crash when using namespace with - "INBOX." prefix. -- lazy_expunge now ignores non-private namespaces. - -* Tue Dec 22 2009 Michal Hlavinka - 1:1.2.9-2 -- sieve updated to 0.1.14 -- managesieve updated to 0.11.10 - -* Fri Dec 18 2009 Michal Hlavinka - 1:1.2.9-1 -- updated to 1.2.9 -- maildir: When saving, filenames now always contain ,S=. - Previously this was done only when quota plugin was loaded. It's - required for zlib plugin and may be useful for other things too. -- maildir: v1.2.7 and v1.2.8 caused assert-crashes in - maildir_uidlist_records_drop_expunges() -- maildir_copy_preserve_filename=yes could have caused crashes. -- Maildir++ quota: % limits weren't updated when limits were read - from maildirsize. -- virtual: v1.2.8 didn't fully fix the "lots of mailboxes" bug -- virtual: Fixed updating virtual mailbox based on flag changes. -- fts-squat: Fixed searching multi-byte characters. - -* Wed Nov 25 2009 Michal Hlavinka - 1:1.2.8-4 -- spec cleanup - -* Tue Nov 24 2009 Michal Hlavinka - 1:1.2.8-3 -- fix dovecot's restart after update (#518753) - -* Tue Nov 24 2009 Michal Hlavinka - 1:1.2.8-2 -- fix initdddir typo (for rhel rebuilds) - -* Fri Nov 20 2009 Michal Hlavinka - 1:1.2.8-1 -- update to dovecot 1.2.8 - -* Mon Nov 16 2009 Michal Hlavinka - 1:1.2.7-2 -- use originall managesieve to dovecot diff -- EPEL-ize spec for rhel5 rebuilds (#537666) - -* Fri Nov 13 2009 Michal Hlavinka - 1:1.2.7-1 -- updated to dovecot 1.2.7 -- add man pages -- IMAP: IDLE now sends "Still here" notifications to same user's - connections at the same time. This hopefully reduces power usage - of some mobile clients that use multiple IDLEing connections. -- IMAP: If imap_capability is set, show it in the login banner. -- IMAP: Implemented SORT=DISPLAY extension. -- Login process creation could have sometimes failed with epoll_ctl() - errors or without epoll probably some other strange things could - have happened. -- Maildir: Fixed some performance issues -- Maildir: Fixed crash when using a lot of keywords. -- Several fixes to QRESYNC extension and modseq handling -- mbox: Make sure failed saves get rolled back with NFS. -- dbox: Several fixes. - -* Mon Nov 02 2009 Michal Hlavinka - 1:1.2.6-5 -- spec cleanup - -* Wed Oct 21 2009 Michal Hlavinka - 1:1.2.6-4 -- imap-login: If imap_capability is set, show it in the banner - instead of the default (#524485) - -* Mon Oct 19 2009 Michal Hlavinka - 1:1.2.6-3 -- 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 - 1:1.2.6-2 -- fix init script for case when no action was specified - -* Tue Oct 06 2009 Michal Hlavinka - 1:1.2.6-1 -- dovecot updated to 1.2.6 -- Added authtest utility for doing passdb and userdb lookups. -- login: ssl_security string now also shows the used compression. -- quota: Don't crash with non-Maildir++ quota backend. -- imap proxy: Fixed crashing with some specific password characters. -- fixed broken dovecot --exec-mail. -- Avoid assert-crashing when two processes try to create index at the - same time. - -* Tue Sep 29 2009 Michal Hlavinka - 1:1.2.5-2 -- build with libcap enabled - -* Thu Sep 17 2009 Michal Hlavinka - 1:1.2.5-1 -- updated to dovecot 1.2.5 -- Authentication: DIGEST-MD5 and RPA mechanisms no longer require - user's login realm to be listed in auth_realms. It only made - configuration more difficult without really providing extra security. -- zlib plugin: Don't allow clients to save compressed data directly. - This prevents users from exploiting (most of the) potential security - holes in zlib/bzlib. -- fix index file handling that could have caused an assert-crash -- IMAP: Fixes to QRESYNC extension. -- deliver: Don't send rejects to any messages that have Auto-Submitted - header. This avoids emails loops. - -* Wed Sep 16 2009 Tomas Mraz - 1:1.2.4-3 -- use password-auth common PAM configuration instead of system-auth - -* Fri Aug 21 2009 Tomas Mraz - 1:1.2.4-2 -- rebuilt with new openssl - -* Fri Aug 21 2009 Michal Hlavinka - 1:1.2.4-1 -- updated: dovecot 1.2.4, managesieve 0.11.9, sieve 0.1.12 -- fixed a crash in index file handling -- fixed a crash in saving messages where message contained a CR - character that wasn't followed by LF -- fixed a crash when listing shared namespace prefix -- sieve: implemented the new date extension. This allows matching - against date values in header fields and the current date at - the time of script evaluation -- managesieve: reintroduced ability to abort SASL with "*" response - -* Mon Aug 10 2009 Michal Hlavinka - 1:1.2.3-1 -- updated: dovecot 1.2.3, managesieve 0.11.8, sieve 0.1.11 -- Mailbox names with control characters can't be created anymore. - Existing mailboxes can still be accessed though. -- Allow namespace prefix to be opened as mailbox, if a mailbox - already exists in the root dir. -- Maildir: dovecot-uidlist was being recreated every time a mailbox - was accessed, even if nothing changed. -- listescape plugin was somewhat broken -- ldap: Fixed hang when >128 requests were sent at once. -- fts_squat: Fixed crashing when searching virtual mailbox. -- imap: Fixed THREAD .. INTHREAD crashing. - -* Tue Jul 28 2009 Michal Hlavinka - 1:1.2.2-1.20090728snap -- updated to post 1.2.2 snapshot (including post release GSSAPI fix) -- Fixed "corrupted index cache file" errors -- IMAP: FETCH X-* parameters weren't working. -- Maildir++ quota: Quota was sometimes updated wrong -- Dovecot master process could hang if it received signals too rapidly - -* Fri Jul 24 2009 Fedora Release Engineering - 1:1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 23 2009 Michal Hlavinka - 1:1.2.1-2 -- updated sieve plugin to 0.1.9 - -* Mon Jul 13 2009 Michal Hlavinka - 1:1.2.1-1 -- updated to 1.2.1 -- GSSAPI authentication is fixed (#506782) -- logins now fail if home directory path is relative, because it was - not working correctly and never was expected to work -- sieve and managesieve update - -* Mon Apr 20 2009 Michal Hlavinka - 1:1.2-0.rc3.1 -- updated to 1.2.rc3 - -* Mon Apr 06 2009 Michal Hlavinka - 1:1.2-0.rc2.1 -- updated to 1.2.rc2 - -* Mon Mar 30 2009 Michal Hlavinka - 1:1.2-0.beta4.2 -- fix typo and rebuild - -* Mon Mar 30 2009 Michal Hlavinka - 1:1.2-0.beta4.1 -- spec clean-up -- updated to 1.2.beta4 - -* Tue Feb 24 2009 Fedora Release Engineering - 1:1.1.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 11 2009 Michal Hlavinka - 1:1.1.11-1 -- updated to 1.1.11 -- IMAP: PERMANENTFLAGS list didn't contain \*, causing some clients - not to save keywords. -- auth: Using "username" or "domain" passdb fields caused problems - with cache and blocking passdbs in v1.1.8 .. v1.1.10. -- userdb prefetch + blocking passdbs was broken with non-plaintext - auth in v1.1.8 .. v1.1.10. - -* Tue Jan 27 2009 Michal Hlavinka - 1:1.1.10-1 -- updated to 1.1.10 - -* Sat Jan 24 2009 Dan Horak - 1:1.1.8-3 -- rebuild with new mysql - -* Tue Jan 13 2009 Michal Hlavinka - 1:1.1.8-2 -- added managesieve support (thanks Helmut K. C. Tessarek) - -* Thu Jan 8 2009 Michal Hlavinka - 1:1.1.8-1 -- dovecot updated to 1.1.8 -- sieve-plugin updated to 1.1.6 - -* Tue Dec 2 2008 Michal Hlavinka - 1:1.1.7-2 -- revert changes from 1:1.1.6-2 and 1:1.1.6-1 -- password can be stored in different file readable only for root - via !include_try directive - -* Tue Dec 2 2008 Michal Hlavinka - 1:1.1.7-1 -- update to upstream version 1.1.7 - -* Mon Nov 3 2008 Michal Hlavinka - 1:1.1.6-2 -- changed comment in sysconfig to match actual state - -* Mon Nov 3 2008 Michal Hlavinka - 1:1.1.6-1 -- update to upstream version 1.1.6 -- change permissions of deliver and dovecot.conf to prevent possible password exposure - -* Wed Oct 29 2008 Michal Hlavinka - 1:1.1.5-1 -- update to upstream version 1.1.5 (Resolves: CVE-2008-4577, CVE-2008-4578) - -* Tue Sep 2 2008 Dan Horak - 1:1.1.3-1 -- update to upstream version 1.1.3 - -* Tue Jul 29 2008 Dan Horak - 1:1.1.2-2 -- really ask for the password during start-up - -* Tue Jul 29 2008 Dan Horak - 1:1.1.2-1 -- update to upstream version 1.1.2 -- final solution for #445200 (add /etc/sysconfig/dovecot for start-up options) - -* Fri Jun 27 2008 Dan Horak - 1:1.1.1-2 -- update default settings to listen on both IPv4 and IPv6 instead of IPv6 only - -* Sun Jun 22 2008 Dan Horak - 1:1.1.1-1 -- update to upstream version 1.1.1 - -* Sat Jun 21 2008 Dan Horak - 1:1.1.0-1 -- update to upstream version 1.1.0 -- update sieve plugin to 1.1.5 -- remove unnecessary patches -- enable ldap and gssapi plugins -- change ownership of dovecot.conf (Resolves: #452088) - -* Wed Jun 18 2008 Dan Horak - 1:1.0.14-4 -- update init script (Resolves: #451838) - -* Fri Jun 6 2008 Dan Horak - 1:1.0.14-3 -- build devel subpackage (Resolves: #306881) - -* Thu Jun 5 2008 Dan Horak - 1:1.0.14-2 -- install convert-tool (Resolves: #450010) - -* Tue Jun 3 2008 Dan Horak - 1:1.0.14-1 -- update to upstream version 1.0.14 -- remove setcred patch (use of setcred must be explictly enabled in config) - -* Thu May 29 2008 Dan Horak - 1:1.0.13-8 -- update scriptlets to follow UsersAndGroups guideline -- remove support for upgrading from version < 1.0 from scriptlets -- Resolves: #448095 - -* Tue May 20 2008 Dan Horak - 1:1.0.13-7 -- spec file cleanup -- update sieve plugin to 1.0.3 -- Resolves: #445200, #238018 - -* Sun Mar 09 2008 Tomas Janousek - 1:1.0.13-6 -- update to latest upstream stable (1.0.13) - -* Wed Feb 20 2008 Fedora Release Engineering - 1:1.0.10-5 -- Autorebuild for GCC 4.3 - -* Mon Jan 07 2008 Tomas Janousek - 1:1.0.10-4 -- update to latest upstream stable (1.0.10) - -* Wed Dec 05 2007 Jesse Keating - 1:1.0.7-3 -- Bump for deps - -* Mon Nov 05 2007 Tomas Janousek - 1:1.0.7-2 -- update to latest upstream stable (1.0.7) -- added the winbind patch (#286351) - -* Tue Sep 25 2007 Tomas Janousek - 1:1.0.5-1 -- downgraded to lastest upstream stable (1.0.5) - -* Wed Aug 22 2007 Tomas Janousek - 1.1-16.1.alpha3 -- updated license tags - -* Mon Aug 13 2007 Tomas Janousek - 1.1-16.alpha3 -- updated to latest upstream alpha -- update dovecot-sieve to 0367450c9382 from hg - -* Fri Aug 10 2007 Tomas Janousek - 1.1-15.alpha2 -- updated to latest upstream alpha -- split ldap and gssapi plugins to subpackages - -* Wed Jul 25 2007 Tomas Janousek - 1.1-14.6.hg.a744ae38a9e1 -- update to a744ae38a9e1 from hg -- update dovecot-sieve to 131e25f6862b from hg and enable it again - -* Thu Jul 19 2007 Tomas Janousek - 1.1-14.5.alpha1 -- update to latest upstream alpha -- don't build dovecot-sieve, it's only for 1.0 - -* Sun Jul 15 2007 Tomas Janousek - 1.0.2-13.5 -- update to latest upstream - -* Mon Jun 18 2007 Tomas Janousek - 1.0.1-12.5 -- update to latest upstream - -* Fri Jun 08 2007 Tomas Janousek - 1.0.0-11.7 -- specfile merge from 145241 branch - - new sql split patch - - support for not building all sql modules - - split sql libraries to separate packages - -* Sat Apr 14 2007 Tomas Janousek - 1.0.0-11.1 -- dovecot-1.0.beta2-pam-tty.patch is no longer needed - -* Fri Apr 13 2007 Tomas Janousek - 1.0.0-11 -- update to latest upstream - -* Tue Apr 10 2007 Tomas Janousek - 1.0-10.rc31 -- update to latest upstream - -* Fri Apr 06 2007 Tomas Janousek - 1.0-9.rc30 -- update to latest upstream - -* Fri Mar 30 2007 Tomas Janousek - 1.0-8.1.rc28 -- spec file cleanup (fixes docs path) - -* Fri Mar 23 2007 Tomas Janousek - 1.0-8.rc28 -- update to latest upstream - -* Mon Mar 19 2007 Tomas Janousek - 1.0-7.rc27 -- use dovecot-sieve's version for the package - -* Mon Mar 19 2007 Tomas Janousek - 1.0-6.rc27 -- update to latest upstream -- added dovecot-sieve - -* Fri Mar 02 2007 Tomas Janousek - 1.0-5.rc25 -- update to latest upstream - -* Sun Feb 25 2007 Jef Spaleta - 1.0-4.rc22 -- Merge review changes - -* Thu Feb 08 2007 Tomas Janousek - 1.0-3.rc22 -- update to latest upstream, fixes a few bugs - -* Mon Jan 08 2007 Tomas Janousek - 1.0-2.rc17 -- update to latest upstream, fixes a few bugs - -* Thu Dec 21 2006 Tomas Janousek - 1.0-1.1.rc15 -- reenabled GSSAPI (#220377) - -* Tue Dec 05 2006 Tomas Janousek - 1.0-1.rc15 -- update to latest upstream, fixes a few bugs, plus a security - vulnerability (#216508, CVE-2006-5973) - -* Tue Oct 10 2006 Petr Rockai - 1.0-0.3.rc7 -- fix few inconsistencies in specfile, fixes #198940 - -* Wed Oct 04 2006 Petr Rockai - 1.0-0.2.rc7 -- fix default paths in the example mkcert.sh to match configuration - defaults (fixes #183151) - -* Sun Oct 01 2006 Jesse Keating - 1.0-0.1.rc7 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Fri Sep 22 2006 Petr Rockai - 1.0-0.rc7 -- update to latest upstream release candidate, should fix occasional - hangs and mbox issues... INBOX. namespace is still broken though -- do not run over symlinked certificates in new locations on upgrade - -* Tue Aug 15 2006 Petr Rockai - 1.0-0.rc2.2 -- include /var/lib/dovecot in the package, prevents startup failure - on new installs - -* Mon Jul 17 2006 Petr Rockai - 1.0-0.rc2.1 -- reenable inotify and see what happens - -* Thu Jul 13 2006 Petr Rockai - 1.0-0.rc2 -- update to latest upstream release candidate -- disable inotify for now, doesn't build -- this needs fixing though - -* Wed Jul 12 2006 Jesse Keating - 1.0-0.beta8.2.1 -- rebuild - -* 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 - -* Thu May 04 2006 Petr Rockai - 1.0-0.beta7.1 -- upgrade to latest upstream beta release -- fixed BR 173048 - -* Fri Mar 17 2006 Petr Rockai - 1.0-0.beta2.8 -- fix sqlite detection in upstream configure checks, second part - of #182240 - -* Wed Mar 8 2006 Bill Nottingham - 1.0-0.beta2.7 -- fix scriplet noise some more - -* Mon Mar 6 2006 Jeremy Katz - 1.0-0.beta2.6 -- fix scriptlet error (mitr, #184151) - -* Mon Feb 27 2006 Petr Rockai - 1.0-0.beta2.5 -- fix #182240 by looking in lib64 for libs first and then lib -- fix comment #1 in #182240 by copying over the example config files - to documentation directory - -* Fri Feb 10 2006 Jesse Keating - 1.0-0.beta2.4.1 -- bump again for double-long bug on ppc(64) - -* Thu Feb 09 2006 Petr Rockai - 1.0-0.beta2.4 -- enable inotify as it should work now (#179431) - -* Tue Feb 07 2006 Jesse Keating - 1.0-0.beta2.3.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Thu Feb 02 2006 Petr Rockai - 1.0-0.beta2.3 -- change the compiled-in defaults and adjust the default's configfile - commented-out example settings to match compiled-in defaults, - instead of changing the defaults only in the configfile, as per #179432 -- fix #179574 by providing a default uidl_format for pop3 -- half-fix #179620 by having plaintext auth enabled by default... this - needs more thinking (which one we really want) and documentation - either way - -* Tue Jan 31 2006 Petr Rockai - 1.0-0.beta2.2 -- update URL in description -- call dovecot --build-ssl-parameters in postinst as per #179430 - -* Mon Jan 30 2006 Petr Rockai - 1.0-0.beta2.1 -- fix spec to work with BUILD_DIR != SOURCE_DIR -- forward-port and split pam-nocred patch - -* Mon Jan 23 2006 Petr Rockai - 1.0-0.beta2 -- new upstream version, hopefully fixes #173928, #163550 -- fix #168866, use install -p to install documentation - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Sat Nov 12 2005 Tom Lane - 0.99.14-10.fc5 -- Rebuild due to mysql update. - -* Wed Nov 9 2005 Tomas Mraz - 0.99.14-9.fc5 -- rebuilt with new openssl - -* Fri Sep 30 2005 Tomas Mraz - 0.99.14-8.fc5 -- use include instead of pam_stack in pam config - -* Wed Jul 27 2005 John Dennis - 0.99.14-7.fc5 -- fix bug #150888, log authenication failures with ip address - -* Fri Jul 22 2005 John Dennis - 0.99.14-6.fc5 -- fix bug #149673, add dummy PAM_TTY - -* Thu Apr 28 2005 John Dennis - 0.99.14-5.fc4 -- fix bug #156159 insecure location of restart flag file - -* Fri Apr 22 2005 John Dennis - 0.99.14-4.fc4 -- openssl moved its certs, CA, etc. from /usr/share/ssl to /etc/pki - -* Tue Apr 12 2005 Tom Lane 0.99.14-3.fc4 -- Rebuild for Postgres 8.0.2 (new libpq major version). - -* Mon Mar 7 2005 John Dennis 0.99.14-2.fc4 -- bump rev for gcc4 build - -* Mon Feb 14 2005 John Dennis - 0.99.14-1.fc4 -- fix bug #147874, update to 0.99.14 release - v0.99.14 2005-02-11 Timo Sirainen - - Message address fields are now parsed differently, fixing some - issues with spaces. Affects only clients which use FETCH ENVELOPE - command. - - Message MIME parser was somewhat broken with missing MIME boundaries - - mbox: Don't allow X-UID headers in mails to override the UIDs we - would otherwise set. Too large values can break some clients and - cause other trouble. - - passwd-file userdb wasn't working - - PAM crashed with 64bit systems - - non-SSL inetd startup wasn't working - - If UID FETCH notices and skips an expunged message, don't return - a NO reply. It's not needed and only makes clients give error - messages. - -* Wed Feb 2 2005 John Dennis - 0.99.13-4.devel -- fix bug #146198, clean up temp kerberos tickets - -* Mon Jan 17 2005 John Dennis 0.99.13-3.devel -- fix bug #145214, force mbox_locks to fcntl only -- fix bug #145241, remove prereq on postgres and mysql, allow rpm auto - dependency generator to pick up client lib dependency if needed. - -* Thu Jan 13 2005 John Dennis 0.99.13-2.devel -- make postgres & mysql conditional build -- remove execute bit on migration example scripts so rpm does not pull - in additional dependences on perl and perl modules that are not present - in dovecot proper. -- add REDHAT-FAQ.txt to doc directory - -* Thu Jan 6 2005 John Dennis 0.99.13-1.devel -- bring up to date with latest upstream, 0.99.13, bug #143707 - also fix bug #14462, bad dovecot-uid macro name - -* Thu Jan 6 2005 John Dennis 0.99.11-10.devel -- fix bug #133618, removed LITERAL+ capability from capability string - -* Wed Jan 5 2005 John Dennis 0.99.11-9.devel -- fix bug #134325, stop dovecot during installation - -* Wed Jan 5 2005 John Dennis 0.99.11-8.devel -- fix bug #129539, dovecot starts too early, - set chkconfig to 65 35 to match cyrus-imapd -- also delete some old commented out code from SSL certificate creation - -* Thu Dec 23 2004 John Dennis 0.99.11-7.devel -- add UW to Dovecot migration documentation and scripts, bug #139954 - fix SSL documentation and scripts, add missing documentation, bug #139276 - -* Mon Nov 15 2004 Warren Togami 0.99.11-2.FC4.1 -- rebuild against MySQL4 - -* Thu Oct 21 2004 John Dennis -- fix bug #136623 - Change License field from GPL to LGPL to reflect actual license - -* Thu Sep 30 2004 John Dennis 0.99.11-1.FC3.3 -- fix bug #124786, listen to ipv6 as well as ipv4 - -* Wed Sep 8 2004 John Dennis 0.99.11-1.FC3.1 -- bring up to latest upstream, - comments from Timo Sirainen on release v0.99.11 2004-09-04 - + 127.* and ::1 IP addresses are treated as secured with - disable_plaintext_auth = yes - + auth_debug setting for extra authentication debugging - + Some documentation and error message updates - + Create PID file in /var/run/dovecot/master.pid - + home setting is now optional in static userdb - + Added mail setting to static userdb - - After APPENDing to selected mailbox Dovecot didn't always notice the - new mail immediately which broke some clients - - THREAD and SORT commands crashed with some mails - - If APPENDed mail ended with CR character, Dovecot aborted the saving - - Output streams sometimes sent data duplicated and lost part of it. - This could have caused various strange problems, but looks like in - practise it rarely caused real problems. - -* Wed Aug 4 2004 John Dennis -- change release field separator from comma to dot, bump build number - -* Mon Aug 2 2004 John Dennis 0.99.10.9-1,FC3,1 -- bring up to date with latest upstream, fixes include: -- LDAP support compiles now with Solaris LDAP library -- IMAP BODY and BODYSTRUCTURE replies were wrong for MIME parts which - didn't contain Content-Type header. -- MySQL and PostgreSQL auth didn't reconnect if connection was lost - to SQL server -- Linking fixes for dovecot-auth with some systems -- Last fix for disconnecting client when downloading mail longer than - 30 seconds actually made it never disconnect client. Now it works - properly: disconnect when client hasn't read _any_ data for 30 - seconds. -- MySQL compiling got broken in last release -- More PostgreSQL reconnection fixing - - -* Mon Jul 26 2004 John Dennis 0.99.10.7-1,FC3,1 -- enable postgres and mySQL in build -- fix configure to look for mysql in alternate locations -- nuke configure script in tar file, recreate from configure.in using autoconf - -- bring up to latest upstream, which included: -- Added outlook-pop3-no-nuls workaround to fix Outlook hang in mails with NULs. -- Config file lines can now contain quoted strings ("value ") -- If client didn't finish downloading a single mail in 30 seconds, - Dovecot closed the connection. This was supposed to work so that - if client hasn't read data at all in 30 seconds, it's disconnected. -- Maildir: LIST now doesn't skip symlinks - - -* Wed Jun 30 2004 John Dennis -- bump rev for build -- change rev for FC3 build - -* Fri Jun 25 2004 John Dennis - 0.99.10.6-1 -- bring up to date with upstream, - recent change log comments from Timo Sirainen were: - SHA1 password support using OpenSSL crypto library - mail_extra_groups setting - maildir_stat_dirs setting - Added NAMESPACE capability and command - Autocreate missing maildirs (instead of crashing) - Fixed occational crash in maildir synchronization - Fixed occational assertion crash in ioloop.c - Fixed FreeBSD compiling issue - Fixed issues with 64bit Solaris binary - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Thu May 27 2004 David Woodhouse 0.99.10.5-1 -- Update to 0.99.10.5 to fix maildir segfaults (#123022) - -* Fri May 07 2004 Warren Togami 0.99.10.4-4 -- default auth config that is actually usable -- Timo Sirainen (author) suggested functionality fixes - maildir, imap-fetch-body-section, customflags-fix - -* Mon Feb 23 2004 Tim Waugh -- Use ':' instead of '.' as separator for chown. - -* Tue Feb 17 2004 Jeremy Katz - 0.99.10.4-3 -- restart properly if it dies (#115594) - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Mon Nov 24 2003 Jeremy Katz 0.99.10.4-1 -- update to 0.99.10.4 - -* Mon Oct 6 2003 Jeremy Katz 0.99.10-7 -- another patch from upstream to fix returning invalid data on partial - BODY[part] fetches -- patch to avoid confusion of draft/deleted in indexes - -* Tue Sep 23 2003 Jeremy Katz 0.99.10-6 -- add some patches from upstream (#104288) - -* Thu Sep 4 2003 Jeremy Katz 0.99.10-5 -- fix startup with 2.6 with patch from upstream (#103801) - -* Tue Sep 2 2003 Jeremy Katz 0.99.10-4 -- fix assert in search code (#103383) - -* Tue Jul 22 2003 Nalin Dahyabhai 0.99.10-3 -- rebuild - -* Thu Jul 17 2003 Bill Nottingham 0.99.10-2 -- don't run by default - -* Thu Jun 26 2003 Jeremy Katz 0.99.10-1 -- 0.99.10 - -* Mon Jun 23 2003 Jeremy Katz 0.99.10-0.2 -- 0.99.10-rc2 (includes ssl detection fix) -- a few tweaks from fedora - - noreplace the config file - - configure --with-ldap to get LDAP enabled - -* Mon Jun 23 2003 Jeremy Katz 0.99.10-0.1 -- 0.99.10-rc1 -- add fix for ssl detection -- add zlib-devel to BuildRequires -- change pam service name to dovecot -- include pam config - -* Thu May 8 2003 Jeremy Katz 0.99.9.1-1 -- update to 0.99.9.1 -- add patch from upstream to fix potential bug when fetching with - CR+LF linefeeds -- tweak some things in the initscript and config file noticed by the - fedora folks - -* Sun Mar 16 2003 Jeremy Katz 0.99.8.1-2 -- fix ssl dir -- own /var/run/dovecot/login with the correct perms -- fix chmod/chown in post - -* Fri Mar 14 2003 Jeremy Katz 0.99.8.1-1 -- update to 0.99.8.1 - -* Tue Mar 11 2003 Jeremy Katz 0.99.8-2 -- add a patch to fix quoting problem from CVS - -* Mon Mar 10 2003 Jeremy Katz 0.99.8-1 -- 0.99.8 -- add some buildrequires -- fixup to build with openssl 0.9.7 -- now includes a pop3 daemon (off by default) -- clean up description and %%preun -- add dovecot user (uid/gid of 97) -- add some buildrequires -- move the ssl cert to %%{_datadir}/ssl/certs -- create a dummy ssl cert in %%post -- own /var/run/dovecot -- make the config file a source so we get default mbox locks of fcntl - -* Sun Dec 1 2002 Seth Vidal -- 0.99.4 and fix startup so it starts imap-master not vsftpd :) - -* Tue Nov 26 2002 Seth Vidal -- first build diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..ae0c305 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,6 @@ +summary: Run all tests +execute: + how: tmt +discover: + how: fmf + diff --git a/sources b/sources index 794598b..54fc50d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dovecot-2.3.21.1.tar.gz) = 9de6ce3a579ef2040248b692874a6d64a732bb735a9cee3144604927cad49690c4b0e29f7ecf3af23190d56f30956d955d13acd5d352534df62fbdfde4b60f9f -SHA512 (dovecot-2.3-pigeonhole-0.5.21.tar.gz) = 5537444025a474ee1b79919a424e24530695aec639361c531257f25fac286673719d476906d99d47e348deb57baa75419bff7dd284c82d2b751334dedec96314 +SHA512 (dovecot-2.4.2.tar.gz) = 0524695341abe711d3a811c56156889d6fef7a09becc684c6f1dc1e5add605969ca8794eb7d44bfbc49f70515f22e8640b5828443addecfe4798fb8b174670ae +SHA512 (dovecot-pigeonhole-2.4.2.tar.gz) = 82c46c7ac2792aa5c211c8b66309f9f21c05ecd2fa8ab3abf98fb4e05831fd37aaa3edffcfbe1b3defbb9ac8ef9df1c33ece83cf7524e8b226c4deab8c250134 diff --git a/tests/got-audit/got-audit.gdb b/tests/got-audit/got-audit.gdb new file mode 100644 index 0000000..6661297 --- /dev/null +++ b/tests/got-audit/got-audit.gdb @@ -0,0 +1,2 @@ +gef config gef.disable_color True +got-audit --all diff --git a/tests/got-audit/main.fmf b/tests/got-audit/main.fmf new file mode 100644 index 0000000..a90b249 --- /dev/null +++ b/tests/got-audit/main.fmf @@ -0,0 +1,10 @@ +summary: Audit the GOT for signs of tampering +description: | + Pointers in the server process GOT will be checked to ensure that + each function pointer's value is within a shared object file + that exports a symbol of that name, and that no shared object + files export conflicting symbols. +contact: Gordon Messmer +require+: + - gdb-gef # needed to test got-audit + diff --git a/tests/got-audit/runtest.sh b/tests/got-audit/runtest.sh new file mode 100755 index 0000000..0c98471 --- /dev/null +++ b/tests/got-audit/runtest.sh @@ -0,0 +1,41 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/dovecot/Sanity/got-audit +# Description: Check pointers in the server process GOT for signs of tampering +# Author: Gordon Messmer +# + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlServiceStart dovecot + rlRun "TestDir=\$(pwd)" + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlRun "auditfile=\$(mktemp --tmpdir=${TmpDir})" + rlPhaseEnd + + rlPhaseStartTest "Run GEF got-audit" + rlRun "SERVICE_PID=\$( systemctl show --property=MainPID dovecot.service | cut -f2 -d= )" + rlRun "echo SERVICE_PID is '$SERVICE_PID'" + [ -n "$SERVICE_PID" ] || rlFail "No service pid was found" + rlRun "gdb-gef --pid '$SERVICE_PID' --command='$TestDir'/got-audit.gdb --batch > '$auditfile'" + # Basic test: ensure that at least one symbol is found in libc.so, + # to verify that the report looks plausible. + rlAssertGrep " : /.*/libc.so" "$auditfile" + # Ensure the got-audit did not report any errors + rlAssertNotGrep " :: ERROR" "$auditfile" + rlRun "cp '$auditfile' '$TMT_TEST_DATA'/got-audit.txt" + rlPhaseEnd + + rlPhaseStartCleanup + rlServiceRestore dovecot + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..f225a72 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,2 @@ +test: ./runtest.sh +framework: beakerlib