From 4711c1f4fc003da594b2a230997012ad5dcc202f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 19 Mar 2021 09:43:49 +0100 Subject: [PATCH] bind: upgrade 9.16.11 -> 9.16.12 Adjust library packaging (see link to commit in the recipe). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-avoid-start-failure-with-bind-user.patch | 0 ...1-named-lwresd-V-and-start-log-hide-build-options.patch | 0 ...d-ensure-searching-for-json-headers-searches-sysr.patch | 0 .../bind/{bind-9.16.11 => bind-9.16.12}/bind9 | 0 .../bind/{bind-9.16.11 => bind-9.16.12}/conf.patch | 0 .../{bind-9.16.11 => bind-9.16.12}/generate-rndc-key.sh | 0 .../init.d-add-support-for-read-only-rootfs.patch | 0 .../make-etc-initd-bind-stop-work.patch | 0 .../bind/{bind-9.16.11 => bind-9.16.12}/named.service | 0 .../bind/{bind_9.16.11.bb => bind_9.16.12.bb} | 7 +++++-- 10 files changed, 5 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/0001-avoid-start-failure-with-bind-user.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/bind9 (100%) rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/conf.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/generate-rndc-key.sh (100%) rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/init.d-add-support-for-read-only-rootfs.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/make-etc-initd-bind-stop-work.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.16.11 => bind-9.16.12}/named.service (100%) rename meta/recipes-connectivity/bind/{bind_9.16.11.bb => bind_9.16.12.bb} (93%) diff --git a/meta/recipes-connectivity/bind/bind-9.16.11/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.16.12/0001-avoid-start-failure-with-bind-user.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.11/0001-avoid-start-failure-with-bind-user.patch rename to meta/recipes-connectivity/bind/bind-9.16.12/0001-avoid-start-failure-with-bind-user.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.16.12/0001-named-lwresd-V-and-start-log-hide-build-options.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch rename to meta/recipes-connectivity/bind/bind-9.16.12/0001-named-lwresd-V-and-start-log-hide-build-options.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.11/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.16.12/bind-ensure-searching-for-json-headers-searches-sysr.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.11/bind-ensure-searching-for-json-headers-searches-sysr.patch rename to meta/recipes-connectivity/bind/bind-9.16.12/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.11/bind9 b/meta/recipes-connectivity/bind/bind-9.16.12/bind9 similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.11/bind9 rename to meta/recipes-connectivity/bind/bind-9.16.12/bind9 diff --git a/meta/recipes-connectivity/bind/bind-9.16.11/conf.patch b/meta/recipes-connectivity/bind/bind-9.16.12/conf.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.11/conf.patch rename to meta/recipes-connectivity/bind/bind-9.16.12/conf.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.11/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.16.12/generate-rndc-key.sh similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.11/generate-rndc-key.sh rename to meta/recipes-connectivity/bind/bind-9.16.12/generate-rndc-key.sh diff --git a/meta/recipes-connectivity/bind/bind-9.16.11/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.16.12/init.d-add-support-for-read-only-rootfs.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.11/init.d-add-support-for-read-only-rootfs.patch rename to meta/recipes-connectivity/bind/bind-9.16.12/init.d-add-support-for-read-only-rootfs.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.11/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.16.12/make-etc-initd-bind-stop-work.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.11/make-etc-initd-bind-stop-work.patch rename to meta/recipes-connectivity/bind/bind-9.16.12/make-etc-initd-bind-stop-work.patch diff --git a/meta/recipes-connectivity/bind/bind-9.16.11/named.service b/meta/recipes-connectivity/bind/bind-9.16.12/named.service similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.16.11/named.service rename to meta/recipes-connectivity/bind/bind-9.16.12/named.service diff --git a/meta/recipes-connectivity/bind/bind_9.16.11.bb b/meta/recipes-connectivity/bind/bind_9.16.12.bb similarity index 93% rename from meta/recipes-connectivity/bind/bind_9.16.11.bb rename to meta/recipes-connectivity/bind/bind_9.16.12.bb index f48cc74c2e..09f77038fa 100644 --- a/meta/recipes-connectivity/bind/bind_9.16.11.bb +++ b/meta/recipes-connectivity/bind/bind_9.16.12.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] = "0111f64dd7d8f515cfa129e181cce96ff82070d1b27f11a21f6856110d0699c1" +SRC_URI[sha256sum] = "9914af9311fd349cab441097898d94fb28d0bfd9bf6ed04fe1f97f042644da7f" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.16 follow the ESV versions divisible by 4 @@ -113,7 +113,10 @@ FILES_${PN}-dev += "${bindir}/isc-config.h" FILES_${PN} += "${sbindir}/generate-rndc-key.sh" PACKAGE_BEFORE_PN += "${PN}-libs" -FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.so*" +# special arrangement below due to +# https://github.com/isc-projects/bind9/commit/0e25af628cd776f98c04fc4cc59048f5448f6c88 +FILES_SOLIBSDEV = "${libdir}/*[!0-9].so ${libdir}/libbind9.so" +FILES_${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so" FILES_${PN}-staticdev += "${libdir}/*.la" PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}" -- 2.40.1