From a55aae303c6baf15737be5ed0f60672e1b25f8cdeab5ff69235e3c240b22278a Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Tue, 15 Sep 2020 12:29:29 +0000 Subject: [PATCH] Accepting request 834577 from home:adkorte - add dovecot-2.3.11.3-gssapi-nul.patch: Fix for bug introduced in v2.3.11.3. It appears GSSAPI can contain NUL. https://github.com/dovecot/core/pull/133 OBS-URL: https://build.opensuse.org/request/show/834577 OBS-URL: https://build.opensuse.org/package/show/server:mail/dovecot23?expand=0&rev=81 --- dovecot-2.3.11.3-gssapi-nul.patch | 22 ++++++++++++++++++++++ dovecot23.changes | 8 ++++++++ dovecot23.spec | 3 +++ 3 files changed, 33 insertions(+) create mode 100644 dovecot-2.3.11.3-gssapi-nul.patch diff --git a/dovecot-2.3.11.3-gssapi-nul.patch b/dovecot-2.3.11.3-gssapi-nul.patch new file mode 100644 index 0000000..2907465 --- /dev/null +++ b/dovecot-2.3.11.3-gssapi-nul.patch @@ -0,0 +1,22 @@ +From aae316881127017af2ba20e478251132a05f7dc0 Mon Sep 17 00:00:00 2001 +From: "Paul G. Banks" +Date: Sun, 16 Aug 2020 10:57:36 +0100 +Subject: [PATCH] Fix: GSSAPI can contain NUL. + +--- + src/auth/mech-gssapi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/auth/mech-gssapi.c b/src/auth/mech-gssapi.c +index f29e48da88..966273d388 100644 +--- a/src/auth/mech-gssapi.c ++++ b/src/auth/mech-gssapi.c +@@ -735,7 +735,7 @@ mech_gssapi_auth_free(struct auth_request *request) + const struct mech_module mech_gssapi = { + "GSSAPI", + +- .flags = 0, ++ .flags = MECH_SEC_ALLOW_NULS, + .passdb_need = MECH_PASSDB_NEED_NOTHING, + + mech_gssapi_auth_new, diff --git a/dovecot23.changes b/dovecot23.changes index 84931da..bcfe65b 100644 --- a/dovecot23.changes +++ b/dovecot23.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Sep 15 10:26:44 UTC 2020 - Arjen de Korte + +- add dovecot-2.3.11.3-gssapi-nul.patch: + Fix for bug introduced in v2.3.11.3. It appears GSSAPI can contain NUL. + + https://github.com/dovecot/core/pull/133 + ------------------------------------------------------------------- Mon Aug 31 15:25:03 UTC 2020 - Marcus Rueckert diff --git a/dovecot23.spec b/dovecot23.spec index c1913cd..c7555d7 100644 --- a/dovecot23.spec +++ b/dovecot23.spec @@ -149,6 +149,8 @@ Patch: dovecot-2.3.0-dont_use_etc_ssl_certs.patch Patch1: dovecot-2.3.0-better_ssl_defaults.patch # https://github.com/dovecot/core/pull/126 Patch2: allow-tls1.3-only.patch +# https://github.com/dovecot/core/pull/133 +Patch3: dovecot-2.3.11.3-gssapi-nul.patch Summary: IMAP and POP3 Server Written Primarily with Security in Mind License: BSD-3-Clause AND LGPL-2.1-or-later AND MIT Group: Productivity/Networking/Email/Servers @@ -329,6 +331,7 @@ dovecot tree. %patch -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 gzip -9v ChangeLog # Fix plugins dir. sed -i 's|#mail_plugin_dir = /usr/lib/dovecot|mail_plugin_dir = %{_libdir}/dovecot/modules|' doc/example-config/conf.d/10-mail.conf