net-dns/bind: fix building against >=dev-db/mysql-connector-c-8.x

Closes: https://bugs.gentoo.org/692834
Signed-off-by: Jouni Kosonen <jouni.kosonen@tukesoft.com>
Closes: https://github.com/gentoo/gentoo/pull/14529
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/net-dns/bind/bind-9.14.8.ebuild b/net-dns/bind/bind-9.14.8.ebuild
index 18d9dbd9cc7b523253cf67d126a120be04746cf7..71849d180edf57f0bd6ddd951a4dda5e76e2627a 100644 (file)
--- a/net-dns/bind/bind-9.14.8.ebuild
+++ b/net-dns/bind/bind-9.14.8.ebuild
@@ -85,6 +85,10 @@ S="${WORKDIR}/${MY_P}"
 # bug 479092, requires networking
 RESTRICT="test"
 
+PATCHES=(
+       "${FILESDIR}"/bind-9.14.8-mysql8-bool.patch
+)
+
 pkg_setup() {
        ebegin "Creating named group and user"
        enewgroup named 40

diff --git a/net-dns/bind/bind-9.14.9.ebuild b/net-dns/bind/bind-9.14.9.ebuild
index 817b8fb0b91e4995edd06723c4b48796e0d0d76a..1a057167b9ee411dc1ebaf8e595d145bc0fbb183 100644 (file)
--- a/net-dns/bind/bind-9.14.9.ebuild
+++ b/net-dns/bind/bind-9.14.9.ebuild
@@ -85,6 +85,10 @@ S="${WORKDIR}/${MY_P}"
 # bug 479092, requires networking
 RESTRICT="test"
 
+PATCHES=(
+       "${FILESDIR}"/bind-9.14.8-mysql8-bool.patch
+)
+
 pkg_setup() {
        ebegin "Creating named group and user"
        enewgroup named 40

diff --git a/net-dns/bind/bind-9.15.6.ebuild b/net-dns/bind/bind-9.15.6.ebuild
index b23f8ad912af59d049e1f61dac613d838b1581e8..1bbaa64bb031ffcb5eeda9716981d1483137be18 100644 (file)
--- a/net-dns/bind/bind-9.15.6.ebuild
+++ b/net-dns/bind/bind-9.15.6.ebuild
@@ -83,6 +83,10 @@ S="${WORKDIR}/${MY_P}"
 # bug 479092, requires networking
 RESTRICT="test"
 
+PATCHES=(
+       "${FILESDIR}"/bind-9.14.8-mysql8-bool.patch
+)
+
 pkg_setup() {
        ebegin "Creating named group and user"
        enewgroup named 40

diff --git a/net-dns/bind/files/bind-9.14.8-mysql8-bool.patch b/net-dns/bind/files/bind-9.14.8-mysql8-bool.patch
new file mode 100644 (file)
index 0000000..8546edc
--- /dev/null
+++ b/net-dns/bind/files/bind-9.14.8-mysql8-bool.patch
@@ -0,0 +1,15 @@
+--- a/contrib/dlz/drivers/dlz_mysql_driver.c
++++ b/contrib/dlz/drivers/dlz_mysql_driver.c
+@@ -789,8 +789,11 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[],
+       char *endp;
+       int j;
+       unsigned int flags = 0;
++#if MYSQL_VERSION_ID >= 80000
++      typedef bool my_bool;  // Workaround to make library work with MySQL client 8.0 as well as earlier versions
++#endif
+ #if MYSQL_VERSION_ID >= 50000
+-        my_bool auto_reconnect = 1;
++      my_bool auto_reconnect = 1;
+ #endif
+ 
+       UNUSED(driverarg);