gentoo resync : 16.04.2018

2 files changed, 0 insertions, 98 deletions

diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 8d78fe5f5be5..21b57aa8b0e0 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,4 +1,3 @@
-AUX bind-tools-9.11.0_p5-dyndb-dlopen.patch 2932 BLAKE2B ec9b7d84b5f0ccb29ed8bdf6701adddf10c3d57298955c86f565b4d98f8031074f07e589edb9268c82726ebc7c19330aae8ea1ef7fd6a0272def963a7557cc68 SHA512 4aef9a107e15953ff81b8354e5e68756650e951ce4e12181d8ac200bd006f6d10c75f0af496a0755d883b921af2aa7984fbe15fdbd5ef8ec47ab6e185027f646
 AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 BLAKE2B 3f65aaf584ced53a098cd9536eb4e8fd243b50ef0845be3008066fa0b45915f4e2db585d3f64896782e7bf94362235fc31c1f869169d92996cdaf081935a4047 SHA512 f46290cddfb39b077269cd2198d04eef6a7e680b5f0f8dcf471e551a61b4b7a56871a56cdd20afdeaa86edb790513d8c522032fb725a266c18e0e59eee803dcc
 DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
 EBUILD bind-tools-9.11.2_p1.ebuild 3152 BLAKE2B 814d08d064071658a17a8e6e3beb069cf8567a11e1ec74bb78f823a3d03feb0429b41feddd97b04d24deb76f92c963d6633f1f84a08a9392eedd5e7b9d745db5 SHA512 40d646ff0b6e45b18de53360b27d3d3d1211606d2f28ef4708bc69a055565962cedb2ac75e24ac9e27b94ce36cb53273e85e4555827ff7a0b7b106aa21ad36f8
diff --git a/net-dns/bind-tools/files/bind-tools-9.11.0_p5-dyndb-dlopen.patch b/net-dns/bind-tools/files/bind-tools-9.11.0_p5-dyndb-dlopen.patch
deleted file mode 100644
index 5fc8f3c18897..000000000000
--- a/net-dns/bind-tools/files/bind-tools-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
-