diff -Nru jabberd2-2.7.0/debian/changelog jabberd2-2.7.0/debian/changelog --- jabberd2-2.7.0/debian/changelog 2019-08-12 12:01:37.000000000 +0000 +++ jabberd2-2.7.0/debian/changelog 2020-02-13 16:24:51.000000000 +0000 @@ -1,3 +1,10 @@ +jabberd2 (2.7.0-1ubuntu1) focal; urgency=medium + + * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8. + (LP: #1863026) + + -- Andreas Hasenack Thu, 13 Feb 2020 13:24:51 -0300 + jabberd2 (2.7.0-1build2) eoan; urgency=medium * No change rebuild for libmysqlclient21. diff -Nru jabberd2-2.7.0/debian/control jabberd2-2.7.0/debian/control --- jabberd2-2.7.0/debian/control 2019-01-28 21:29:15.000000000 +0000 +++ jabberd2-2.7.0/debian/control 2020-02-13 16:24:51.000000000 +0000 @@ -1,7 +1,8 @@ Source: jabberd2 Section: net Priority: optional -Maintainer: Debian XMPP Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian XMPP Maintainers Uploaders: Simon Josefsson Build-Depends: debhelper (>= 11), libssl-dev, libgsasl7-dev (>= 1.4.0), libdb-dev, diff -Nru jabberd2-2.7.0/debian/patches/mysql8_my_bool.patch jabberd2-2.7.0/debian/patches/mysql8_my_bool.patch --- jabberd2-2.7.0/debian/patches/mysql8_my_bool.patch 1970-01-01 00:00:00.000000000 +0000 +++ jabberd2-2.7.0/debian/patches/mysql8_my_bool.patch 2020-02-13 16:24:17.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Reintroduce my_bool to fix build with MySQL 8 +Author: Andreas Hasenack +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gambas3/+bug/1863026 +Forwarded: no +Last-Update: 2020-02-12 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +diff --git a/storage/authreg_mysql.c b/storage/authreg_mysql.c +index 0b35d6d..4b7f842 100644 +--- a/storage/authreg_mysql.c ++++ b/storage/authreg_mysql.c +@@ -23,6 +23,7 @@ + #define _XOPEN_SOURCE 500 + #include "c2s.h" + #include ++typedef bool my_bool; + #include + #include + +diff --git a/storage/storage_mysql.c b/storage/storage_mysql.c +index eb4f62f..e05682e 100644 +--- a/storage/storage_mysql.c ++++ b/storage/storage_mysql.c +@@ -28,6 +28,7 @@ + #include "storage.h" + #include + #include ++typedef bool my_bool; + + /** internal structure, holds our data */ + typedef struct drvdata_st { diff -Nru jabberd2-2.7.0/debian/patches/series jabberd2-2.7.0/debian/patches/series --- jabberd2-2.7.0/debian/patches/series 2019-01-28 21:29:15.000000000 +0000 +++ jabberd2-2.7.0/debian/patches/series 2020-02-13 16:24:31.000000000 +0000 @@ -6,3 +6,4 @@ pkgname.diff systemd-alias.diff m4-ax_check_compile_flag.diff +mysql8_my_bool.patch