[arch-commits] Commit in dovecot/trunk (3 files)

[Thore Bödecker]

    Date: Saturday, August 29, 2020 @ 21:09:18
  Author: foxxx0
Revision: 692235

upgpkg: dovecot 2.3.11.3-2

Backport upstream commit fea1bacab954d2f112da8a95756f198530e274af to
fix gssapi auth.

Fixes FS#67757

Added:
  dovecot/trunk/fix-auth-gssapi.patch
Modified:
  dovecot/trunk/PKGBUILD
Deleted:
  dovecot/trunk/fix-mysql-double-free.patch

-----------------------------+
 PKGBUILD                    |   12 +++++-------
 fix-auth-gssapi.patch       |   22 ++++++++++++++++++++++
 fix-mysql-double-free.patch |   36 ------------------------------------
 3 files changed, 27 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-29 20:58:22 UTC (rev 692234)
+++ PKGBUILD	2020-08-29 21:09:18 UTC (rev 692235)
@@ -11,7 +11,7 @@
 
 pkgname=dovecot
 pkgver=2.3.11.3
-pkgrel=1
+pkgrel=2
 
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 url="https://dovecot.org/"
@@ -33,6 +33,7 @@
 options=('!emptydirs')
 
 source=("https://dovecot.org/releases/2.3/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        "fix-auth-gssapi.patch::https://github.com/dovecot/core/commit/fea1bacab954d2f112da8a95756f198530e274af.patch"
         'dovecot.sysusersd'
         'dovecot.tmpfilesd'
         'dovecot.ld.so.conf'
@@ -40,6 +41,7 @@
 
 sha256sums=('d3d9ea9010277f57eb5b9f4166a5d2ba539b172bd6d5a2b2529a6db524baafdc'
             'SKIP'
+            '7f694efa19b2dc3f5aaf5430c8101970bf4c89dcf2d326b82befbe7c051804b4'
             'c5e3a8ffe23e5deb4f7893d9877d972347c2ee45c4ebf713de85c537e47cfcaf'
             '0b0625b1e66ca6a95d506fd00d6a68e70620c8ea28606e2528953ffb1806b08e'
             'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858'
@@ -53,12 +55,8 @@
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local filename
-  for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
-      patch -p1 -N -l -i "$srcdir/${filename##*/}"
-    fi
-  done
+  # backport from git master, fixes FS#67757
+  patch -p1 -N -l -i "${srcdir}/fix-auth-gssapi.patch"
 
   # fix path in helper script
   sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh

Added: fix-auth-gssapi.patch
===================================================================
--- fix-auth-gssapi.patch	                        (rev 0)
+++ fix-auth-gssapi.patch	2020-08-29 21:09:18 UTC (rev 692235)
@@ -0,0 +1,22 @@
+From fea1bacab954d2f112da8a95756f198530e274af Mon Sep 17 00:00:00 2001
+From: "Paul G. Banks" <web at paulbanks.org>
+Date: Sun, 16 Aug 2020 10:57:36 +0100
+Subject: [PATCH] auth: mech-gssapi - 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,

Deleted: fix-mysql-double-free.patch
===================================================================
--- fix-mysql-double-free.patch	2020-08-29 20:58:22 UTC (rev 692234)
+++ fix-mysql-double-free.patch	2020-08-29 21:09:18 UTC (rev 692235)
@@ -1,36 +0,0 @@
-From 3c5101ffdd2a8115e03ed7180d53578765dea4c9 Mon Sep 17 00:00:00 2001
-From: Aki Tuomi <aki.tuomi at dovecot.fi>
-Date: Tue, 4 Dec 2018 14:40:04 +0200
-Subject: [PATCH] driver-mysql: Avoid double-closing MySQL connection
-
-Fixes double-free
----
- src/lib-sql/driver-mysql.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c
-index c87e825e4b..5dd1c3124f 100644
---- a/src/lib-sql/driver-mysql.c
-+++ b/src/lib-sql/driver-mysql.c
-@@ -173,7 +173,9 @@ static int driver_mysql_connect(struct sql_db *_db)
- static void driver_mysql_disconnect(struct sql_db *_db)
- {
- 	struct mysql_db *db = (struct mysql_db *)_db;
--	mysql_close(db->mysql);
-+	if (db->mysql != NULL)
-+		mysql_close(db->mysql);
-+	db->mysql = NULL;
- }
- 
- static int driver_mysql_parse_connect_string(struct mysql_db *db,
-@@ -311,7 +313,9 @@ static void driver_mysql_deinit_v(struct sql_db *_db)
- 	_db->no_reconnect = TRUE;
- 	sql_db_set_state(&db->api, SQL_DB_STATE_DISCONNECTED);
- 
--	mysql_close(db->mysql);
-+	if (db->mysql != NULL)
-+		mysql_close(db->mysql);
-+	db->mysql = NULL;
- 
- 	sql_connection_log_finished(_db);
- 	event_unref(&_db->event);