gentoo resync : 17.02.2020

5 files changed, 31 insertions, 3 deletions

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 92159cf943ca..29989eda3703 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,4 +1,5 @@
 AUX 10bind.env 27 BLAKE2B e5ddb2daced1b9430cb8e4b691bc0f1164f71a6e2032fa4efd18b629a6aeb971336d5eaa38c6474a3143cb34691c22d4564ebb010d9efd00cf6e2634daa8e68c SHA512 8ae5326b158b8a3eeaab667c84dd712fefd25d10832598783fa497285183cbdee554796c22d32fec54cd00461469f29ed473a730304a00aacdf06c1bb6c33d55
+AUX bind-9.14.8-mysql8-bool.patch 505 BLAKE2B 1892eacc8fac18d3cd048a5f8828ff2602f27ab837d7f7cd70b529ef42a10b8cfb930ccb762d3876e4ae2fbad8c215ae86d4bebba7d370b2ead0a26eb073e5b6 SHA512 e592bd43844a246abb236a3dd1e35b13b9a73b508d1077559ca6c98467e9bdc1f6f90e65c11a27c2b1f0979944c43ac66cbca75093583e2fbd802a38cc28a3d1
 AUX generate-rndc-key.sh 183 BLAKE2B 33f2297745ef8e5aed09107cee6d0017d3870ea9db249a17850ae7a55f613b03a136bc61b8ac4526858178a0f8713eabda6c5f30917415f9a3ad6b34668f45ab SHA512 6c611120185c1a61b2b6da228efc28302ebd36c819b97793920543ce2cfff4da84f43ec53ddd072f008b04c7087cc19108c4279cb962d12a7e073b47235d14ee
 AUX localhost.zone-r3 426 BLAKE2B d34cf12d484c6bb705d3bd8bfbf93514e504497a99da983f6176234239cc664131502744f3cd743d938dec0309f0d8df2c1d0c5325b5cb61023ed192d32bbedd SHA512 979d8693046033c24490dca536f0d649795bbdf57eed32017b32d07d7d3c51b35197e4edd79d8258074a1bf14b71376472ba6ae749f62ceaf74d7a6a0559fa89
 AUX named.cache-r3 3316 BLAKE2B 09a17fbb29f2122a61c7e17a8dfc8eef3b0fdaa94e8dbe17a0b188946fe8017c65599fbb84c0f88123f0e0f17faae2b9a1ffbc0ee17bcf62c1cbf34f064b9c36 SHA512 3608f29d356bf853145e14c1f81fdccf7090f63e95573234221711b7b6084fbc806817c41daa5d6072a4955a714f9e1cbd6cdcabd7cd1833c3e5f8387bc1ba20
@@ -11,7 +12,7 @@ DIST bind-9.14.8.tar.gz 6403140 BLAKE2B 45cb06ce8564880d501c63d25c7af8567184e4e4
 DIST bind-9.14.9.tar.gz 6296339 BLAKE2B 65496ab94a83ddd1c519df4519373aa77858c6d66efed9342e962cd61943b12e9ecb2f74132015b3f835d0368d1cc59be23e0db92d4780f9f367c0d0fe8c3ada SHA512 aa6b1273f06fc16c842b7012a4d09cb65325a44ee88fea8bea8264ffa907ef4a6f8d5e09384599b2d6f5cea66c0dc220765c245814f54b2f09a5b6e65f97964b
 DIST bind-9.15.6.tar.gz 6432248 BLAKE2B c6dbaeeafdad3e2c7dd30ed1e5121c961829af8d82b9b93dd4eca34d96dfc2854e302068987dcd30ab88c768f6328c81bf81b348a698ceb11001d4d700ef374f SHA512 3bf7ebde706a6771606fda675c60daccbb22c2dc9551a8f361fe102b59e342ded99568b27bca7d7fa32d3f2be3811f38ec014f4ad0c281b590b7b69967395cb7
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.14.8.ebuild 11298 BLAKE2B 8c281d3265bb4c0f6ed2dec7601649ba5212e8de7e057be8fc1325aa9c917b2aee323c4af9a8f16e5ef3e308e6975fe2629cf817980fe545f41379051803effd SHA512 019eb71a852936162a3fb839f78eaa790f8b1571e8d6889dac55fe2aaf1238f909bd1cc5355dcbc2052be741ef467fa9f04e25bf37cdf3b13fdc23ae7ed37051
-EBUILD bind-9.14.9.ebuild 11306 BLAKE2B 45d21e6e85da70f1b247b2ccc803d3702e631b629e8d01a16546bc761d035d2f6eff40d900b421cdec5d58934ef137f8978098d028ca5eb8119b5e3503be6d74 SHA512 20c129ae60661d929ec1ef1b892da415a39a9ebc303357c0760459693689e03955f013692d2b158d6775e86214fc6ebad81cf747d59480b7246d3962a20ddb56
-EBUILD bind-9.15.6.ebuild 10902 BLAKE2B 558005f7f351cf7060f2eeabcb2ee3055ce25a732ab2be94226001d3a37c65d3f0538afeed1fa548e03a3cf7a845a53a103e1b4df383736da0461a730f79c44a SHA512 0de8f6a45681494c3d7a9f3b9c3da2b5a2c6c972a991fc44206f85d79bd0dc8632d4cb2e33734edbcb4fc415f8b76c0fbe1199f69945035c8374a8f622e5503a
+EBUILD bind-9.14.8.ebuild 11356 BLAKE2B 52e18616d623f3f68b0162535f623ee0fd1ac59d2d322a3495b041434ca3a4e0d3aaa64f085907b17a274778174a1228329724df44f3a44a57356bde2d2a09fb SHA512 d8d0a17ee96751ff00ac4fcd753643262d53434edbef5d93591098b3d090769be6a92e6995c65e08c257eab2735544e4851ec8bc2666a62061dcf86ae5207647
+EBUILD bind-9.14.9.ebuild 11364 BLAKE2B 270b21cd9c0689c8cb6c1fb8f32ad4cee8ba7e13ff59bee673f7a36e371eee448a21f97fc7569c09e1abb33f60d772b74f84a016482dcbda2e74077afc263dee SHA512 bf3af82ae06e2dab24ea347b1bce6ff8ee7bdfe90f593f70c8673ad44db120b321be98b5205daf9f4aa4b5576eb390c1f12da0692b752233431ecd7dabfa0a08
+EBUILD bind-9.15.6.ebuild 10960 BLAKE2B db03f4b7c14a6ac8046f186ed541b5b6c254a24ee87dd445c788f686fb4b52d000cdf680b68a05066075d8cff2d0ea79d845130b18889622c28080f8d912e3b9 SHA512 58e7bf7eb46f3a32850ba2424a648395a5c4a1550ac75416db360c528a0a7db3c77f94271f2ea123927772a0bf51f2a55f4ac6e2c199dd17cd1c4d8ca23ec6f6
 MISC metadata.xml 1043 BLAKE2B c4b1341082f3bd13a93ea378f61608a65ac7f904273932dcdbcf2a73ea8b4c7610ced855ed4a3fb61c7b02044db23bd0effda02d71b3114c7b4017c06784ac31 SHA512 879eca4059049ced098da9afe6aec250d174fabbc701e55ca6c22cfdf050b7c49289113a7e9ad99fa90685ca62c5f672201e04c7f0c766b55d780e26f8da59a2
diff --git a/net-dns/bind/bind-9.14.8.ebuild b/net-dns/bind/bind-9.14.8.ebuild
index 18d9dbd9cc7b..71849d180edf 100644
--- 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 817b8fb0b91e..1a057167b9ee 100644
--- 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 b23f8ad912af..1bbaa64bb031 100644
--- 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
index 000000000000..8546edc1521d
--- /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);