diff -Nru apr-util-1.6.1/debian/changelog apr-util-1.6.1/debian/changelog --- apr-util-1.6.1/debian/changelog 2023-02-13 14:51:37.000000000 +0000 +++ apr-util-1.6.1/debian/changelog 2023-08-31 17:57:06.000000000 +0000 @@ -1,3 +1,11 @@ +apr-util (1.6.1-4ubuntu2.2) focal-security; urgency=medium + + * Fix compatibility with MySQL 8.0.34 (LP: #2031548) + - debian/patches/fix-mysql-8034-compat.patch: don't set + MYSQL_OPT_RECONNECT as it is deprecated and spews and error message. + + -- Leonidas Da Silva Barbosa Thu, 31 Aug 2023 14:57:06 -0300 + apr-util (1.6.1-4ubuntu2.1) focal-security; urgency=medium * SECURITY UPDATE: integer overflow diff -Nru apr-util-1.6.1/debian/patches/fix-mysql-8024-compat.patch apr-util-1.6.1/debian/patches/fix-mysql-8024-compat.patch --- apr-util-1.6.1/debian/patches/fix-mysql-8024-compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ apr-util-1.6.1/debian/patches/fix-mysql-8024-compat.patch 2023-08-31 17:57:00.000000000 +0000 @@ -0,0 +1,31 @@ +From f7d4c2561debcd92b96491e3adff53ef9a7e7525 Mon Sep 17 00:00:00 2001 +From: jk2 +Date: Wed, 30 Aug 2023 15:02:32 +0300 +Subject: [PATCH] MYSQL_OPT_RECONNECT is deprecated in MySQL 8.0.34. + +--- + dbd/apr_dbd_mysql.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: apr-util-1.6.3/dbd/apr_dbd_mysql.c +=================================================================== +--- apr-util-1.6.3.orig/dbd/apr_dbd_mysql.c ++++ apr-util-1.6.3/dbd/apr_dbd_mysql.c +@@ -1181,7 +1181,7 @@ static apr_dbd_t *dbd_mysql_open(apr_poo + } + #endif + +-#if MYSQL_VERSION_ID >= 50013 ++#if MYSQL_VERSION_ID >= 50013 && MYSQL_VERSION_ID < 80034 + /* the MySQL manual says this should be BEFORE mysql_real_connect */ + mysql_options(sql->conn, MYSQL_OPT_RECONNECT, &do_reconnect); + #endif +@@ -1199,7 +1199,7 @@ static apr_dbd_t *dbd_mysql_open(apr_poo + return NULL; + } + +-#if MYSQL_VERSION_ID >= 50013 ++#if MYSQL_VERSION_ID >= 50013 && MYSQL_VERSION_ID < 80034 + /* Some say this should be AFTER mysql_real_connect */ + mysql_options(sql->conn, MYSQL_OPT_RECONNECT, &do_reconnect); + #endif diff -Nru apr-util-1.6.1/debian/patches/series apr-util-1.6.1/debian/patches/series --- apr-util-1.6.1/debian/patches/series 2023-02-13 14:51:12.000000000 +0000 +++ apr-util-1.6.1/debian/patches/series 2023-08-31 17:57:00.000000000 +0000 @@ -14,3 +14,4 @@ mysql8_my_bool.patch mysql8-my_init.patch CVE-2022-25147.patch +fix-mysql-8024-compat.patch