From cf024ecc5d19876ef6bd9a93606fae64426a0e4c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 24 Nov 2021 09:08:26 +0100 Subject: [PATCH] bind: update 9.16.22 -> 9.16.23 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...d-V-and-start-log-hide-build-options.patch | 35 ------------------ ...1-avoid-start-failure-with-bind-user.patch | 0 ...d-V-and-start-log-hide-build-options.patch | 37 +++++++++++++++++++ ...ching-for-json-headers-searches-sysr.patch | 0 .../bind/{bind-9.16.22 => bind-9.16.23}/bind9 | 0 .../{bind-9.16.22 => bind-9.16.23}/conf.patch | 0 .../generate-rndc-key.sh | 0 ...t.d-add-support-for-read-only-rootfs.patch | 0 .../make-etc-initd-bind-stop-work.patch | 0 .../named.service | 0 .../bind/{bind_9.16.22.bb => bind_9.16.23.bb} | 2 +- 11 files changed, 38 insertions(+), 36 deletions(-) delete mode 100644 meta/recipes-connectivity/bind/bind-9.16.22/0001-named-lwresd-V-and-start-log-hide-build-options.patch rename meta/recipes-connectivity/bind/{bind-9.16.22 => bind-9.16.23}/0001-avoid-start-failure-with-bind-user.patch (100%) create mode 100644 meta/recipes-connectivity/bind/bind-9.16.23/0001-named-lwresd-V-and-start-log-hide-build-options.patch rename meta/recipes-connectivity/bind/{bind-9.16.22 => bind-9.16.23}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.16.22 => bind-9.16.23}/bind9 (100%) rename meta/recipes-connectivity/bind/{bind-9.16.22 => bind-9.16.23}/conf.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.16.22 => bind-9.16.23}/generate-rndc-key.sh (100%) rename meta/recipes-connectivity/bind/{bind-9.16.22 => bind-9.16.23}/init.d-add-support-for-read-only-rootfs.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.16.22 => bind-9.16.23}/make-etc-initd-bind-stop-work.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.16.22 => bind-9.16.23}/named.service (100%) rename meta/recipes-connectivity/bind/{bind_9.16.22.bb => bind_9.16.23.bb} (98%) diff --git a/meta/recipes-connectivity/bind/bind-9.16.22/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.16.22/0001-named-lwresd-V-and-start-log-hide-build-options.patch deleted file mode 100644 index 5bcc16c9b2..0000000000 --- a/meta/recipes-connectivity/bind/bind-9.16.22/0001-named-lwresd-V-and-start-log-hide-build-options.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a3af4a405baf5ff582e82aaba392dd9667d94bdc Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 27 Aug 2018 21:24:20 +0800 -Subject: [PATCH] `named/lwresd -V' and start log hide build options - -The build options expose build path directories, so hide them. -[snip] -$ named -V -|built by make with *** (options are hidden) -[snip] - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Hongxu Jia - -Refreshed for 9.16.0 -Signed-off-by: Armin Kuster - ---- - bin/named/include/named/globals.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: bind-9.16.0/bin/named/include/named/globals.h -=================================================================== ---- bind-9.16.0.orig/bin/named/include/named/globals.h -+++ bind-9.16.0/bin/named/include/named/globals.h -@@ -69,7 +69,7 @@ EXTERN const char *named_g_version I - EXTERN const char *named_g_product INIT(PRODUCT); - EXTERN const char *named_g_description INIT(DESCRIPTION); - EXTERN const char *named_g_srcid INIT(SRCID); --EXTERN const char *named_g_configargs INIT(CONFIGARGS); -+EXTERN const char *named_g_configargs INIT("*** (options are hidden)"); - EXTERN const char *named_g_builder INIT(BUILDER); - EXTERN in_port_t named_g_port INIT(0); - EXTERN isc_dscp_t named_g_dscp INIT(-1); diff --git a/meta/recipes-connectivity/bind/bind-9.16.22/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.16.23/0001-avoid-start-failure-with-bind-user.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.22/0001-avoid-start-failure-with-bind-user.patch rename to meta/recipes-connectivity/bind/bind-9.16.23/0001-avoid-start-failure-with-bind-user.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.23/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.16.23/0001-named-lwresd-V-and-start-log-hide-build-options.patch new file mode 100644 index 0000000000..4dc6a5a2ae --- /dev/null +++ b/meta/recipes-connectivity/bind/bind-9.16.23/0001-named-lwresd-V-and-start-log-hide-build-options.patch @@ -0,0 +1,37 @@ +From f5761bbaf743d291f3e7e859e69ebe61a1718cbf Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 27 Aug 2018 21:24:20 +0800 +Subject: [PATCH] `named/lwresd -V' and start log hide build options + +The build options expose build path directories, so hide them. +[snip] +$ named -V +|built by make with *** (options are hidden) +[snip] + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Hongxu Jia + +Refreshed for 9.16.0 +Signed-off-by: Armin Kuster +--- + bin/named/include/named/globals.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h +index 0572154..3147e04 100644 +--- a/bin/named/include/named/globals.h ++++ b/bin/named/include/named/globals.h +@@ -69,7 +69,7 @@ EXTERN const char *named_g_version INIT(VERSION); + EXTERN const char *named_g_product INIT(PRODUCT); + EXTERN const char *named_g_description INIT(DESCRIPTION); + EXTERN const char *named_g_srcid INIT(SRCID); +-EXTERN const char *named_g_configargs INIT(CONFIGARGS); ++EXTERN const char *named_g_configargs INIT("*** (options are hidden)"); + EXTERN const char *named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); +-- +2.20.1 + diff --git a/meta/recipes-connectivity/bind/bind-9.16.22/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.16.23/bind-ensure-searching-for-json-headers-searches-sysr.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.22/bind-ensure-searching-for-json-headers-searches-sysr.patch rename to meta/recipes-connectivity/bind/bind-9.16.23/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.22/bind9 b/meta/recipes-connectivity/bind/bind-9.16.23/bind9 similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.22/bind9 rename to meta/recipes-connectivity/bind/bind-9.16.23/bind9 diff --git a/meta/recipes-connectivity/bind/bind-9.16.22/conf.patch b/meta/recipes-connectivity/bind/bind-9.16.23/conf.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.22/conf.patch rename to meta/recipes-connectivity/bind/bind-9.16.23/conf.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.22/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.16.23/generate-rndc-key.sh similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.22/generate-rndc-key.sh rename to meta/recipes-connectivity/bind/bind-9.16.23/generate-rndc-key.sh diff --git a/meta/recipes-connectivity/bind/bind-9.16.22/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.16.23/init.d-add-support-for-read-only-rootfs.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.22/init.d-add-support-for-read-only-rootfs.patch rename to meta/recipes-connectivity/bind/bind-9.16.23/init.d-add-support-for-read-only-rootfs.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.22/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.16.23/make-etc-initd-bind-stop-work.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.22/make-etc-initd-bind-stop-work.patch rename to meta/recipes-connectivity/bind/bind-9.16.23/make-etc-initd-bind-stop-work.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.22/named.service b/meta/recipes-connectivity/bind/bind-9.16.23/named.service similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.22/named.service rename to meta/recipes-connectivity/bind/bind-9.16.23/named.service diff --git a/meta/recipes-connectivity/bind/bind_9.16.22.bb b/meta/recipes-connectivity/bind/bind_9.16.23.bb similarity index 98% rename from meta/recipes-connectivity/bind/bind_9.16.22.bb rename to meta/recipes-connectivity/bind/bind_9.16.23.bb index bde9a793b0..c1bf250c26 100644 --- a/meta/recipes-connectivity/bind/bind_9.16.22.bb +++ b/meta/recipes-connectivity/bind/bind_9.16.23.bb @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "65e7b2af6479db346e2fc99bcfb6ec3240066468e09dbec575ebc7c57d994061" +SRC_URI[sha256sum] = "dedb5e27aa9cb6a9ce3e872845887ff837b99e4e9a91a5e2fcd67cf6e1ef173c" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.16 follow the ESV versions divisible by 4 -- 2.40.1