* [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/files/
@ 2018-04-13 23:22 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2018-04-13 23:22 UTC (permalink / raw
To: gentoo-commits
commit: f3e249ee73f2ef6a0ad994ccc5f00fde05161661
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Apr 9 08:19:46 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 23:21:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e249ee
net-dns/bind-tools: remove unused patch
.../files/bind-tools-9.11.0_p5-dyndb-dlopen.patch | 97 ----------------------
1 file changed, 97 deletions(-)
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 5fc8f3c1889..00000000000
--- 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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/files/
@ 2019-04-23 9:55 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2019-04-23 9:55 UTC (permalink / raw
To: gentoo-commits
commit: eb9538ad53013b6d66c70c686806acdbbe9f4629
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Apr 22 07:56:30 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 09:52:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9538ad
net-dns/bind-tools: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/11781
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/bind-tools-9.5.0_p1-lwconfig.patch | 63 ----------------------
1 file changed, 63 deletions(-)
diff --git a/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch b/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch
deleted file mode 100644
index ba615d5ac6e..00000000000
--- a/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/lib/lwres/lwconfig.c
-+++ b/lib/lwres/lwconfig.c
-@@ -175,13 +175,8 @@
- REQUIRE(buffer != NULL);
- REQUIRE(size > 0U);
-
-- *p = '\0';
--
- ch = eatwhite(fp);
-
-- if (ch == EOF)
-- return (EOF);
--
- do {
- *p = '\0';
-
-@@ -592,23 +587,37 @@
- if (strlen(word) == 0U)
- rval = LWRES_R_SUCCESS;
- else if (strcmp(word, "nameserver") == 0)
-- rval = lwres_conf_parsenameserver(ctx, fp);
-+ rval = (stopchar != '\n')? /* fail instantly if EOL is reached */
-+ lwres_conf_parsenameserver(ctx, fp)
-+ : LWRES_R_FAILURE;
- else if (strcmp(word, "lwserver") == 0)
-- rval = lwres_conf_parselwserver(ctx, fp);
-+ rval = (stopchar != '\n')?
-+ lwres_conf_parselwserver(ctx, fp)
-+ : LWRES_R_FAILURE;
- else if (strcmp(word, "domain") == 0)
-- rval = lwres_conf_parsedomain(ctx, fp);
-+ rval = (stopchar != '\n')?
-+ lwres_conf_parsedomain(ctx, fp)
-+ : LWRES_R_FAILURE;
- else if (strcmp(word, "search") == 0)
-- rval = lwres_conf_parsesearch(ctx, fp);
-+ rval = (stopchar != '\n')?
-+ lwres_conf_parsesearch(ctx, fp)
-+ : LWRES_R_FAILURE;
- else if (strcmp(word, "sortlist") == 0)
-- rval = lwres_conf_parsesortlist(ctx, fp);
-+ rval = (stopchar != '\n')?
-+ lwres_conf_parsesortlist(ctx, fp)
-+ : LWRES_R_FAILURE;
- else if (strcmp(word, "options") == 0)
-- rval = lwres_conf_parseoption(ctx, fp);
-+ rval = (stopchar != '\n')?
-+ lwres_conf_parseoption(ctx, fp)
-+ : LWRES_R_FAILURE;
- else {
- /* unrecognised word. Ignore entire line */
- rval = LWRES_R_SUCCESS;
-- stopchar = eatline(fp);
-- if (stopchar == EOF) {
-- break;
-+ if (stopchar != '\n') { /* do not eat the next line */
-+ stopchar = eatline(fp);
-+ if (stopchar == EOF) {
-+ break;
-+ }
- }
- }
- if (ret == LWRES_R_SUCCESS && rval != LWRES_R_SUCCESS)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/files/
@ 2019-12-04 15:39 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-12-04 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 9c03479b8ba3926298b4b131a67f026fa0bb44d7
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Dec 4 07:03:58 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Dec 4 15:38:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c03479b
net-dns/bind-tools: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13863
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../bind-tools/files/sparc-pause-instruction.patch | 135 ---------------------
1 file changed, 135 deletions(-)
diff --git a/net-dns/bind-tools/files/sparc-pause-instruction.patch b/net-dns/bind-tools/files/sparc-pause-instruction.patch
deleted file mode 100644
index 35ddb24da0b..00000000000
--- a/net-dns/bind-tools/files/sparc-pause-instruction.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From a5ad6b16c5c0bfd333758d707a6397be79a92914 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 8 Aug 2019 08:33:10 +0100
-Subject: [PATCH] configure.ac: autodetect 'pause' instruction presence on
- sparc
-
-The change fixes the following build failure on sparc T3 and older CPUs:
-
-```
-sparc-unknown-linux-gnu-gcc ... -O2 -mcpu=niagara2 ... -c rwlock.c
-{standard input}: Assembler messages:
-{standard input}:398: Error: Architecture mismatch on "pause ".
-{standard input}:398: (Requires v9e|v9v|v9m|m8; requested architecture is v9b.)
-make[1]: *** [Makefile:280: rwlock.o] Error 1
-```
-
-`pause` insutruction exists only on `-mcpu=niagara4` (`T4`) and upper.
-
-The change adds `pause` configure-time autodetection and uses it if available.
-config.h.in got new `HAVE_SPARC_PAUSE` knob. Fallback is a fall-through no-op.
-
-Build-tested on:
-
-- sparc-unknown-linux-gnu-gcc (no `pause`, build succeeds)
-- sparc-unknown-linux-gnu-gcc -mcpu=niagara4 (`pause`, build succeeds)
-
-Reported-by: Rolf Eike Beer
-Bug: https://bugs.gentoo.org/691708
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- config.h.in | 3 +++
- configure | 33 +++++++++++++++++++++++++++++++++
- configure.ac | 14 ++++++++++++++
- lib/isc/rwlock.c | 2 +-
- 4 files changed, 51 insertions(+), 1 deletion(-)
-
-diff --git a/config.h.in b/config.h.in
-index 91508e5d91..eeba105ec6 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -357,6 +357,9 @@
- /* Define to 1 if you have the `setresuid' function. */
- #undef HAVE_SETRESUID
-
-+/* define if the SPARC pause instruction is available */
-+#undef HAVE_SPARC_PAUSE
-+
- /* define if struct stat has st_mtim.tv_nsec field */
- #undef HAVE_STAT_NSEC
-
-diff --git a/configure b/configure
-index d336f6aa24..757dacb06e 100755
---- a/configure
-+++ b/configure
-@@ -13872,6 +13872,39 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
- ;;
- esac
-
-+#
-+# Check for pause support on SPARC processors
-+#
-+case $host in #(
-+ sparc*) :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pause instruction support" >&5
-+$as_echo_n "checking for pause instruction support... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+__asm__ __volatile__ ("pause")
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define HAVE_SPARC_PAUSE 1" >>confdefs.h
-+
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
-+ *) :
-+ ;;
-+esac
-+
- for ac_func in sysctlbyname
- do :
- ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
-diff --git a/configure.ac b/configure.ac
-index 90aafae8d0..b04c651966 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -415,6 +415,20 @@ AS_CASE([$host],
- [define if the ARM yield instruction is available])],
- [AC_MSG_RESULT([no])])])
-
-+#
-+# Check for pause support on SPARC processors
-+#
-+AS_CASE([$host],
-+ [sparc*],
-+ [AC_MSG_CHECKING([for pause instruction support])
-+ AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM([[]],
-+ [[__asm__ __volatile__ ("pause")]])],
-+ [AC_MSG_RESULT([yes])
-+ AC_DEFINE([HAVE_SPARC_PAUSE], [1],
-+ [define if the SPARC pause instruction is available])],
-+ [AC_MSG_RESULT([no])])])
-+
- AC_CHECK_FUNCS([sysctlbyname])
-
- #
-diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
-index a6ea35feed..e313a912e0 100644
---- a/lib/isc/rwlock.c
-+++ b/lib/isc/rwlock.c
-@@ -152,7 +152,7 @@ isc_rwlock_destroy(isc_rwlock_t *rwl) {
- # define isc_rwlock_pause() __asm__ __volatile__ ("yield")
- #elif defined(sun) && (defined(__sparc) || defined(__sparc__))
- # define isc_rwlock_pause() smt_pause()
--#elif defined(__sparc) || defined(__sparc__)
-+#elif (defined(__sparc) || defined(__sparc__)) && HAVE_SPARC_PAUSE
- # define isc_rwlock_pause() __asm__ __volatile__ ("pause")
- #elif defined(__ppc__) || defined(_ARCH_PPC) || \
- defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
---
-2.21.0
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-04 15:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-23 9:55 [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2019-12-04 15:39 Aaron Bauman
2018-04-13 23:22 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox