diff -pruN 1.6.1-5/debian/changelog 1.6.1-5ubuntu1/debian/changelog --- 1.6.1-5/debian/changelog 2020-08-29 09:51:07.000000000 +0000 +++ 1.6.1-5ubuntu1/debian/changelog 2020-11-09 20:30:18.000000000 +0000 @@ -1,3 +1,13 @@ +apr-util (1.6.1-5ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with + MySQL 8. (LP: #1863026) + - d/p/mysql8-my_init.patch: don't call my_init() since it's not + exported anymore since MySQL 8.0.2 (LP: #1859773) + + -- Tiago Stürmer Daitx Mon, 09 Nov 2020 20:30:18 +0000 + apr-util (1.6.1-5) unstable; urgency=medium [ Jelmer Vernooij ] @@ -16,6 +26,27 @@ apr-util (1.6.1-5) unstable; urgency=med -- Stefan Fritsch Sat, 29 Aug 2020 11:51:07 +0200 +apr-util (1.6.1-4ubuntu2) focal; urgency=medium + + * d/p/mysql8-my_init.patch: don't call my_init() since it's not + exported anymore since MySQL 8.0.2 (LP: #1859773) + + -- Andreas Hasenack Wed, 04 Mar 2020 16:51:27 -0300 + +apr-util (1.6.1-4ubuntu1) focal; urgency=medium + + * Adjust Build-Depends to unambiguously require Python 2. + * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8. + (LP: #1863026) + + -- Robie Basak Tue, 18 Feb 2020 14:53:49 +0000 + +apr-util (1.6.1-4build1) eoan; urgency=medium + + * No change rebuild for libmysqlclient21. + + -- Robie Basak Mon, 12 Aug 2019 01:59:30 +0000 + apr-util (1.6.1-4) unstable; urgency=medium * Fix libaprutil1-dbd-mysql with mariadb 10.3. Closes: #926400 @@ -548,3 +579,4 @@ apr-util1.0 (1.1.0-1) unstable; urgency= * First Package Release -- Thom May Wed, 17 Nov 2004 11:51:32 -0800 + diff -pruN 1.6.1-5/debian/control 1.6.1-5ubuntu1/debian/control --- 1.6.1-5/debian/control 2020-08-29 09:29:43.000000000 +0000 +++ 1.6.1-5ubuntu1/debian/control 2020-11-09 20:30:18.000000000 +0000 @@ -1,5 +1,6 @@ Source: apr-util -Maintainer: Debian Apache Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Apache Maintainers Uploaders: Stefan Fritsch Section: libs Priority: optional diff -pruN 1.6.1-5/debian/patches/mysql8_my_bool.patch 1.6.1-5ubuntu1/debian/patches/mysql8_my_bool.patch --- 1.6.1-5/debian/patches/mysql8_my_bool.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.6.1-5ubuntu1/debian/patches/mysql8_my_bool.patch 2020-03-04 19:51:27.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Reintroduce my_bool to fix build with MySQL 8 +Author: Robie Basak +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1863026 +Forwarded: no +Last-Update: 2020-02-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/dbd/apr_dbd_mysql.c ++++ b/dbd/apr_dbd_mysql.c +@@ -41,6 +41,7 @@ + #endif + #endif + #include ++typedef bool my_bool; + #include + #endif + diff -pruN 1.6.1-5/debian/patches/mysql8-my_init.patch 1.6.1-5ubuntu1/debian/patches/mysql8-my_init.patch --- 1.6.1-5/debian/patches/mysql8-my_init.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.6.1-5ubuntu1/debian/patches/mysql8-my_init.patch 2020-03-04 19:51:27.000000000 +0000 @@ -0,0 +1,23 @@ +Description: don't call my_init() + Since MySQL 8.0.2, my_init() isn't exported anymore and shouldn't have to be + called by clients directly. See + https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-2.html +Author: Andreas Hasenack +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1859773 +Forwarded: no +X-Forwarded-Reason: Should have an explicit check for MySQL 8.0.2 +Last-Update: 2020-03-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/dbd/apr_dbd_mysql.c ++++ b/dbd/apr_dbd_mysql.c +@@ -1263,9 +1263,6 @@ + + static void dbd_mysql_init(apr_pool_t *pool) + { +-#if MYSQL_VERSION_ID < 100000 +- my_init(); +-#endif + mysql_thread_init(); + + /* FIXME: this is a guess; find out what it really does */ diff -pruN 1.6.1-5/debian/patches/series 1.6.1-5ubuntu1/debian/patches/series --- 1.6.1-5/debian/patches/series 2018-02-25 11:28:50.000000000 +0000 +++ 1.6.1-5ubuntu1/debian/patches/series 2020-08-30 23:20:15.000000000 +0000 @@ -11,3 +11,5 @@ fix_doxygen_inputdir support_mariadb.patch doxygen_no_ful_path_names.patch fix_gdbm_error_handling +mysql8_my_bool.patch +mysql8-my_init.patch