gentoo resync : 16.04.2018

2 files changed, 0 insertions, 98 deletions

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 4bfc04fe7de8..6fe3c752bf55 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,5 +1,4 @@
 AUX 10bind.env 27 BLAKE2B e5ddb2daced1b9430cb8e4b691bc0f1164f71a6e2032fa4efd18b629a6aeb971336d5eaa38c6474a3143cb34691c22d4564ebb010d9efd00cf6e2634daa8e68c SHA512 8ae5326b158b8a3eeaab667c84dd712fefd25d10832598783fa497285183cbdee554796c22d32fec54cd00461469f29ed473a730304a00aacdf06c1bb6c33d55
-AUX bind-9.11.0_p5-dyndb-dlopen.patch 2932 BLAKE2B ec9b7d84b5f0ccb29ed8bdf6701adddf10c3d57298955c86f565b4d98f8031074f07e589edb9268c82726ebc7c19330aae8ea1ef7fd6a0272def963a7557cc68 SHA512 4aef9a107e15953ff81b8354e5e68756650e951ce4e12181d8ac200bd006f6d10c75f0af496a0755d883b921af2aa7984fbe15fdbd5ef8ec47ab6e185027f646
 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
diff --git a/net-dns/bind/files/bind-9.11.0_p5-dyndb-dlopen.patch b/net-dns/bind/files/bind-9.11.0_p5-dyndb-dlopen.patch
deleted file mode 100644
index 5fc8f3c18897..000000000000
--- a/net-dns/bind/files/bind-9.11.0_p5-dyndb-dlopen.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From ae903759c205f8a5039458d780c0e0c4442b7291 Mon Sep 17 00:00:00 2001
-From: Mark Andrews <marka@isc.org>
-Date: Tue, 30 May 2017 11:31:34 +1000
-Subject: [PATCH] 4530.   [bug]           "dyndb" is dependent on dlopen
- existing / being                         enabled. [RT #45291]
-
-From aa3a8979bc7eb1596d044eff572b3c35310584fa Mon Sep 17 00:00:00 2001
-From: Mark Andrews <marka@isc.org>
-Date: Tue, 30 May 2017 11:34:37 +1000
-Subject: [PATCH] 4530.   [bug]           "dyndb" is dependent on dlopen
- existing / being                         enabled. [RT #45291]
-
-diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c
-index a477508..dec68a7 100644
---- a/lib/dns/dyndb.c
-+++ b/lib/dns/dyndb.c
-@@ -80,7 +80,7 @@ impfind(const char *name) {
- 	return (NULL);
- }
- 
--#if HAVE_DLFCN_H
-+#if HAVE_DLFCN_H && HAVE_DLOPEN
- static isc_result_t
- load_symbol(void *handle, const char *filename,
- 	    const char *symbol_name, void **symbolp)
---- a/bin/named/server.c
-+++ b/bin/named/server.c
-@@ -1496,6 +1496,7 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
- 	return (result);
- }
- 
-+#ifdef HAVE_DLOPEN
- static isc_result_t
- configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx,
- 		const dns_dyndbctx_t *dctx)
-@@ -1521,6 +1522,7 @@ configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx,
- 			      name, isc_result_totext(result));
- 	return (result);
- }
-+#endif
- 
- 
- static isc_result_t
-@@ -4669,6 +4671,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
- 	else
- 		(void)cfg_map_get(config, "dyndb", &dyndb_list);
- 
-+#ifdef HAVE_DLOPEN
- 	for (element = cfg_list_first(dyndb_list);
- 	     element != NULL;
- 	     element = cfg_list_next(element))
-@@ -4686,6 +4689,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
- 
- 		CHECK(configure_dyndb(dyndb, mctx, dctx));
- 	}
-+#endif
- 
- 	/*
- 	 * Setup automatic empty zones.  If recursion is off then
-diff --git a/lib/bind9/check.c b/lib/bind9/check.c
-index 097dd96..99b995c 100644
---- a/lib/bind9/check.c
-+++ b/lib/bind9/check.c
-@@ -2988,6 +2988,9 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions,
- {
- 	const cfg_obj_t *zones = NULL;
- 	const cfg_obj_t *keys = NULL;
-+#ifndef HAVE_DLOPEN
-+	const cfg_obj_t *dyndb = NULL;
-+#endif
- 	const cfg_listelt_t *element, *element2;
- 	isc_symtab_t *symtab = NULL;
- 	isc_result_t result = ISC_R_SUCCESS;
-@@ -3041,6 +3044,20 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions,
- 			result = ISC_R_FAILURE;
- 	}
- 
-+#ifndef HAVE_DLOPEN
-+	if (voptions != NULL)
-+		(void)cfg_map_get(voptions, "dyndb", &dyndb);
-+	else
-+		(void)cfg_map_get(config, "dyndb", &dyndb);
-+
-+	if (dyndb != NULL) {
-+		cfg_obj_log(dyndb, logctx, ISC_LOG_ERROR,
-+			    "dynamic loading of databases is not supported");
-+		if (tresult != ISC_R_SUCCESS)
-+			result = ISC_R_NOTIMPLEMENTED;
-+	}
-+#endif
-+
- 	/*
- 	 * Check that the response-policy and catalog-zones options
- 	 * refer to zones that exist.
--- 
-2.9.0
-