gentoo resync : 23.09.2020

3 files changed, 17 insertions, 1 deletions

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 87392dfbae4a..d3b21f2054a4 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,6 +1,7 @@
 AUX 10bind.env 27 BLAKE2B e5ddb2daced1b9430cb8e4b691bc0f1164f71a6e2032fa4efd18b629a6aeb971336d5eaa38c6474a3143cb34691c22d4564ebb010d9efd00cf6e2634daa8e68c SHA512 8ae5326b158b8a3eeaab667c84dd712fefd25d10832598783fa497285183cbdee554796c22d32fec54cd00461469f29ed473a730304a00aacdf06c1bb6c33d55
 AUX bind-9.16.6-bug-741162.patch 1137 BLAKE2B 426e3091e0d6c002ce081adc264d9e4ec5e3d803b881d39662fe7d6ea687f2851a65e6b28bf6d1c3ceeac27277aceaae7df800cf8f1c2b621db83351dee59cc1 SHA512 e6c09d10df3fbd1edcab27f9fbeaaca8474b663cef933b537a803417242d4588d71fb960ede96f1c424be472aacaf248fd8c8338a2e5513080e9f53b6777caf4
 AUX generate-rndc-key.sh 183 BLAKE2B 33f2297745ef8e5aed09107cee6d0017d3870ea9db249a17850ae7a55f613b03a136bc61b8ac4526858178a0f8713eabda6c5f30917415f9a3ad6b34668f45ab SHA512 6c611120185c1a61b2b6da228efc28302ebd36c819b97793920543ce2cfff4da84f43ec53ddd072f008b04c7087cc19108c4279cb962d12a7e073b47235d14ee
+AUX ldap-library-path-on-multilib-machines.patch 431 BLAKE2B d067f241334742ec093af75e83e2b0678f04048b73e7f97e637b42fad301f48fa930b10ac4b8c24ea86c7fe011eb598e21ada7514b47b2c05a9c14feb8b1487b SHA512 9c668a117a5ae5fc8414eb545b4a69e40826982092190cdb36e67092c98f4c148ac749988da3ed6f9b32f6559e13046c50a77a7e307cd8bd6256d1f44ba44468
 AUX localhost.zone-r3 426 BLAKE2B d34cf12d484c6bb705d3bd8bfbf93514e504497a99da983f6176234239cc664131502744f3cd743d938dec0309f0d8df2c1d0c5325b5cb61023ed192d32bbedd SHA512 979d8693046033c24490dca536f0d649795bbdf57eed32017b32d07d7d3c51b35197e4edd79d8258074a1bf14b71376472ba6ae749f62ceaf74d7a6a0559fa89
 AUX named.cache-r3 3316 BLAKE2B 09a17fbb29f2122a61c7e17a8dfc8eef3b0fdaa94e8dbe17a0b188946fe8017c65599fbb84c0f88123f0e0f17faae2b9a1ffbc0ee17bcf62c1cbf34f064b9c36 SHA512 3608f29d356bf853145e14c1f81fdccf7090f63e95573234221711b7b6084fbc806817c41daa5d6072a4955a714f9e1cbd6cdcabd7cd1833c3e5f8387bc1ba20
 AUX named.conf 32 BLAKE2B 15548145717b526be3d7898a0c2144a13e29b0595a3c27d220cc45646156cc8ddae954cb3b3907ca845765fc8ce30508d8e570c0a492b965027531a0f6df43ac SHA512 c344fd4949eb80114d0c157517ece3f4b9505b94e3de00489d4b2b23beb74612f38cf3443f2f3b98fe01d98ad1842f45ff1d1826d67937e72e4629bbdf683a59
@@ -10,6 +11,6 @@ AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d950383
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.16.6-r1.ebuild 10954 BLAKE2B 90aa875a56e9332e124fb05c0520879d94e04762b31757b948296960ad3e53fabc2f74eff7cebe43df63f8b5b38db75ccbf779db0711f3ce630a99ddad2dedb6 SHA512 5a4f106469ca8d5745eb5dcfef78ddde666d916e52ebdc8c0b053b22974430bc17d49fb6dd706e247cdccc5bef60e2102df0c993c4abbb6d0ee043a9bf8cf93f
+EBUILD bind-9.16.6-r2.ebuild 11015 BLAKE2B f33043400501d72dc1f85cdf5c45c9a5b27851d112f21e99c2cc59e31b7b699099c82e13ae08d9331c4f6ac9cfc0d599d42f0162df7bfdd580c525b58c49b53c SHA512 d4454404172a98224d2323dc46e590b61f792b9c6341037d5d3ac03731baba6f8d011c2c2e2c66428734ae836285e076b49531fa7d6d32cb92d0321948cad962
 EBUILD bind-9.16.6.ebuild 10766 BLAKE2B 83963e592f2ab27789a0f4642ba5dd9d2cd6dab28e444b502962d140694293c4ef7d7bf60c68e709093fd2e9cf34af3f28b3768683e2bde20aaf208abbedefa2 SHA512 5de5ce0d73fba42a52c9e516682f50878033e4a9cdc6866f9b7d159efb640feb29b2643b43bc4542a5e2b46349ba2e11593dac9d767eb37d4ad5dd9e45ba5f2d
 MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9
diff --git a/net-dns/bind/bind-9.16.6-r1.ebuild b/net-dns/bind/bind-9.16.6-r2.ebuild
index 4cce9cdc72a8..4f12a967f86b 100644
--- a/net-dns/bind/bind-9.16.6-r1.ebuild
+++ b/net-dns/bind/bind-9.16.6-r2.ebuild
@@ -87,6 +87,8 @@ PATCHES=(
 	# should fix https://bugs.gentoo.org/741162 taken from:
 	# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/4073
 	"${FILESDIR}/bind-9.16.6-bug-741162.patch"
+
+	"${FILESDIR}/ldap-library-path-on-multilib-machines.patch"
 )
 
 # bug 479092, requires networking
diff --git a/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch b/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch
new file mode 100644
index 000000000000..5286c72f11be
--- /dev/null
+++ b/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch
@@ -0,0 +1,13 @@
+diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in
+index f769cf1..721d480 100644
+--- a/contrib/dlz/config.dlz.in
++++ b/contrib/dlz/config.dlz.in
+@@ -396,7 +396,7 @@ case "$use_dlz_ldap" in
+ 	*)
+ 		DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver,
+ 				[-I$use_dlz_ldap/include],
+-				[-L$use_dlz_ldap/lib -lldap -llber])
++				[-lldap -llber])
+ 
+ 		AC_MSG_RESULT(
+ [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])