summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-03-19 08:15:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-20 00:02:22 +0000
commit497f76d782eef3843b99fce3c9fb55e1b7415d27 (patch)
tree7122b492ecad9f02e002bdd1a2dfefb61054eedb /meta/recipes-connectivity
parent30431bed25930504814063089c94ebe94428e6b7 (diff)
downloadpoky-497f76d782eef3843b99fce3c9fb55e1b7415d27.tar.gz
bind: update 9.16.26 -> 9.18.1
Drop removed python/libtool options. isc/platform.h is no longer installed. Rewrite reproducibility patch to fix the problem at the source. License-Update: copyright years (From OE-Core rev: 8a9a5885995c77774cdafeb09f7522c50750a1e9) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bind/bind-9.16.26/0001-named-lwresd-V-and-start-log-hide-build-options.patch37
-rw-r--r--meta/recipes-connectivity/bind/bind-9.18.1/0001-avoid-start-failure-with-bind-user.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.26/0001-avoid-start-failure-with-bind-user.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.18.1/0001-named-lwresd-V-and-start-log-hide-build-options.patch35
-rw-r--r--meta/recipes-connectivity/bind/bind-9.18.1/bind-ensure-searching-for-json-headers-searches-sysr.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.26/bind-ensure-searching-for-json-headers-searches-sysr.patch)28
-rw-r--r--meta/recipes-connectivity/bind/bind-9.18.1/bind9 (renamed from meta/recipes-connectivity/bind/bind-9.16.26/bind9)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.18.1/conf.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.26/conf.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.18.1/generate-rndc-key.sh (renamed from meta/recipes-connectivity/bind/bind-9.16.26/generate-rndc-key.sh)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.18.1/init.d-add-support-for-read-only-rootfs.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.26/init.d-add-support-for-read-only-rootfs.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.18.1/make-etc-initd-bind-stop-work.patch (renamed from meta/recipes-connectivity/bind/bind-9.16.26/make-etc-initd-bind-stop-work.patch)0
-rw-r--r--meta/recipes-connectivity/bind/bind-9.18.1/named.service (renamed from meta/recipes-connectivity/bind/bind-9.16.26/named.service)0
-rw-r--r--meta/recipes-connectivity/bind/bind_9.18.1.bb (renamed from meta/recipes-connectivity/bind/bind_9.16.26.bb)14
11 files changed, 55 insertions, 59 deletions
diff --git a/meta/recipes-connectivity/bind/bind-9.16.26/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.16.26/0001-named-lwresd-V-and-start-log-hide-build-options.patch
deleted file mode 100644
index 4dc6a5a2ae..0000000000
--- a/meta/recipes-connectivity/bind/bind-9.16.26/0001-named-lwresd-V-and-start-log-hide-build-options.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From f5761bbaf743d291f3e7e859e69ebe61a1718cbf Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 27 Aug 2018 21:24:20 +0800
4Subject: [PATCH] `named/lwresd -V' and start log hide build options
5
6The build options expose build path directories, so hide them.
7[snip]
8$ named -V
9|built by make with *** (options are hidden)
10[snip]
11
12Upstream-Status: Inappropriate [oe-core specific]
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15
16Refreshed for 9.16.0
17Signed-off-by: Armin Kuster <akuster@mvista.com>
18---
19 bin/named/include/named/globals.h | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
23index 0572154..3147e04 100644
24--- a/bin/named/include/named/globals.h
25+++ b/bin/named/include/named/globals.h
26@@ -69,7 +69,7 @@ EXTERN const char *named_g_version INIT(VERSION);
27 EXTERN const char *named_g_product INIT(PRODUCT);
28 EXTERN const char *named_g_description INIT(DESCRIPTION);
29 EXTERN const char *named_g_srcid INIT(SRCID);
30-EXTERN const char *named_g_configargs INIT(CONFIGARGS);
31+EXTERN const char *named_g_configargs INIT("*** (options are hidden)");
32 EXTERN const char *named_g_builder INIT(BUILDER);
33 EXTERN in_port_t named_g_port INIT(0);
34 EXTERN isc_dscp_t named_g_dscp INIT(-1);
35--
362.20.1
37
diff --git a/meta/recipes-connectivity/bind/bind-9.16.26/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.18.1/0001-avoid-start-failure-with-bind-user.patch
index ec1bc7b567..ec1bc7b567 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.26/0001-avoid-start-failure-with-bind-user.patch
+++ b/meta/recipes-connectivity/bind/bind-9.18.1/0001-avoid-start-failure-with-bind-user.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.1/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.18.1/0001-named-lwresd-V-and-start-log-hide-build-options.patch
new file mode 100644
index 0000000000..4c10f33f04
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind-9.18.1/0001-named-lwresd-V-and-start-log-hide-build-options.patch
@@ -0,0 +1,35 @@
1From 4e83392e840fa7b05e778710b8c202d102477a13 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 27 Aug 2018 21:24:20 +0800
4Subject: [PATCH] `named/lwresd -V' and start log hide build options
5
6The build options expose build path directories, so hide them.
7[snip]
8$ named -V
9|built by make with *** (options are hidden)
10[snip]
11
12Upstream-Status: Inappropriate [oe-core specific]
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15
16Refreshed for 9.16.0
17Signed-off-by: Armin Kuster <akuster@mvista.com>
18
19---
20 configure.ac | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/configure.ac b/configure.ac
24index bf20690..c5d330f 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -35,7 +35,7 @@ AC_DEFINE([PACKAGE_VERSION_EXTRA], ["][bind_VERSION_EXTRA]["], [BIND 9 Extra par
28 AC_DEFINE([PACKAGE_DESCRIPTION], [m4_ifnblank(bind_DESCRIPTION, [" ]bind_DESCRIPTION["], [])], [An extra string to print after PACKAGE_STRING])
29 AC_DEFINE([PACKAGE_SRCID], ["][bind_SRCID]["], [A short hash from git])
30
31-bind_CONFIGARGS="${ac_configure_args:-default}"
32+bind_CONFIGARGS="(removed for reproducibility)"
33 AC_DEFINE_UNQUOTED([PACKAGE_CONFIGARGS], ["$bind_CONFIGARGS"], [Either 'defaults' or used ./configure options])
34
35 AC_DEFINE([PACKAGE_BUILDER], ["make"], [make or Visual Studio])
diff --git a/meta/recipes-connectivity/bind/bind-9.16.26/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.18.1/bind-ensure-searching-for-json-headers-searches-sysr.patch
index f9cdc7ca4d..f1abd179e8 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.26/bind-ensure-searching-for-json-headers-searches-sysr.patch
+++ b/meta/recipes-connectivity/bind/bind-9.18.1/bind-ensure-searching-for-json-headers-searches-sysr.patch
@@ -1,4 +1,4 @@
1From edda20fb5a6e88548f85e39d34d6c074306e15bc Mon Sep 17 00:00:00 2001 1From 246087f89e9434b726c7884e4c0964f71084f091 Mon Sep 17 00:00:00 2001
2From: Paul Gortmaker <paul.gortmaker@windriver.com> 2From: Paul Gortmaker <paul.gortmaker@windriver.com>
3Date: Tue, 9 Jun 2015 11:22:00 -0400 3Date: Tue, 9 Jun 2015 11:22:00 -0400
4Subject: [PATCH] bind: ensure searching for json headers searches sysroot 4Subject: [PATCH] bind: ensure searching for json headers searches sysroot
@@ -32,16 +32,16 @@ Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
32 configure.ac | 2 +- 32 configure.ac | 2 +-
33 1 file changed, 1 insertion(+), 1 deletion(-) 33 1 file changed, 1 insertion(+), 1 deletion(-)
34 34
35Index: bind-9.16.4/configure.ac 35diff --git a/configure.ac b/configure.ac
36=================================================================== 36index 10e8bf6..bf20690 100644
37--- bind-9.16.4.orig/configure.ac 37--- a/configure.ac
38+++ bind-9.16.4/configure.ac 38+++ b/configure.ac
39@@ -1232,7 +1232,7 @@ case "$use_lmdb" in 39@@ -814,7 +814,7 @@ AS_CASE([$with_lmdb],
40 LMDB_LIBS="" 40 [no],[],
41 ;; 41 [auto|yes], [PKG_CHECK_MODULES([LMDB], [lmdb],
42 auto|yes) 42 [ac_lib_lmdb_found=yes],
43- for d in /usr /usr/local /opt/local 43- [for ac_lib_lmdb_path in /usr /usr/local /opt /opt/local; do
44+ for d in "${STAGING_INCDIR}" 44+ [for ac_lib_lmdb_path in "${STAGING_INCDIR}"; do
45 do 45 AX_LIB_LMDB([$ac_lib_lmdb_path],
46 if test -f "${d}/include/lmdb.h" 46 [ac_lib_lmdb_found=yes
47 then 47 break])
diff --git a/meta/recipes-connectivity/bind/bind-9.16.26/bind9 b/meta/recipes-connectivity/bind/bind-9.18.1/bind9
index 968679ff7f..968679ff7f 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.26/bind9
+++ b/meta/recipes-connectivity/bind/bind-9.18.1/bind9
diff --git a/meta/recipes-connectivity/bind/bind-9.16.26/conf.patch b/meta/recipes-connectivity/bind/bind-9.18.1/conf.patch
index aa3642acec..aa3642acec 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.26/conf.patch
+++ b/meta/recipes-connectivity/bind/bind-9.18.1/conf.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.26/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.18.1/generate-rndc-key.sh
index 633e29c0e6..633e29c0e6 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.26/generate-rndc-key.sh
+++ b/meta/recipes-connectivity/bind/bind-9.18.1/generate-rndc-key.sh
diff --git a/meta/recipes-connectivity/bind/bind-9.16.26/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.18.1/init.d-add-support-for-read-only-rootfs.patch
index 11db95ede1..11db95ede1 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.26/init.d-add-support-for-read-only-rootfs.patch
+++ b/meta/recipes-connectivity/bind/bind-9.18.1/init.d-add-support-for-read-only-rootfs.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.26/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.18.1/make-etc-initd-bind-stop-work.patch
index 146f3e35db..146f3e35db 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.26/make-etc-initd-bind-stop-work.patch
+++ b/meta/recipes-connectivity/bind/bind-9.18.1/make-etc-initd-bind-stop-work.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.16.26/named.service b/meta/recipes-connectivity/bind/bind-9.18.1/named.service
index cda56ef015..cda56ef015 100644
--- a/meta/recipes-connectivity/bind/bind-9.16.26/named.service
+++ b/meta/recipes-connectivity/bind/bind-9.18.1/named.service
diff --git a/meta/recipes-connectivity/bind/bind_9.16.26.bb b/meta/recipes-connectivity/bind/bind_9.18.1.bb
index aa64a11b9c..6aa832f8f5 100644
--- a/meta/recipes-connectivity/bind/bind_9.16.26.bb
+++ b/meta/recipes-connectivity/bind/bind_9.18.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "BIND 9 provides a full-featured Domain Name Server system"
4SECTION = "console/network" 4SECTION = "console/network"
5 5
6LICENSE = "MPL-2.0" 6LICENSE = "MPL-2.0"
7LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e7b3c52170a348459a4ff3f5ce95e37" 7LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9a4a897f202c0710e07f2f2836bc2b62"
8 8
9DEPENDS = "openssl libcap zlib libuv" 9DEPENDS = "openssl libcap zlib libuv"
10 10
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
20 file://0001-avoid-start-failure-with-bind-user.patch \ 20 file://0001-avoid-start-failure-with-bind-user.patch \
21 " 21 "
22 22
23SRC_URI[sha256sum] = "70b39a5eb71650358ec9ba41da3050d32aeac0aeb4a466684b23f35affa7fb45" 23SRC_URI[sha256sum] = "57c7afd871694d615cb4defb1c1bd6ed023350943d7458414db8d493ef560427"
24 24
25UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" 25UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
26# follow the ESV versions divisible by 2 26# follow the ESV versions divisible by 2
@@ -35,11 +35,11 @@ inherit autotools update-rc.d systemd useradd pkgconfig multilib_header update-a
35# PACKAGECONFIGs readline and libedit should NOT be set at same time 35# PACKAGECONFIGs readline and libedit should NOT be set at same time
36PACKAGECONFIG ?= "readline" 36PACKAGECONFIG ?= "readline"
37PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2" 37PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2"
38PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline" 38PACKAGECONFIG[readline] = "--with-readline=readline,,readline"
39PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit" 39PACKAGECONFIG[libedit] = "--with-readline=libedit,,libedit"
40PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native," 40PACKAGECONFIG[dns-over-http] = "--enable-doh,--disable-doh,nghttp2"
41 41
42EXTRA_OECONF = " --with-libtool --disable-devpoll --disable-auto-validation --enable-epoll \ 42EXTRA_OECONF = " --disable-devpoll --disable-auto-validation --enable-epoll \
43 --with-gssapi=no --with-lmdb=no --with-zlib \ 43 --with-gssapi=no --with-lmdb=no --with-zlib \
44 --sysconfdir=${sysconfdir}/bind \ 44 --sysconfdir=${sysconfdir}/bind \
45 --with-openssl=${STAGING_DIR_HOST}${prefix} \ 45 --with-openssl=${STAGING_DIR_HOST}${prefix} \
@@ -90,8 +90,6 @@ do_install:append() {
90 install -d ${D}${sysconfdir}/tmpfiles.d 90 install -d ${D}${sysconfdir}/tmpfiles.d
91 echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf 91 echo "d /run/named 0755 bind bind - -" > ${D}${sysconfdir}/tmpfiles.d/bind.conf
92 fi 92 fi
93
94 oe_multilib_header isc/platform.h
95} 93}
96 94
97CONFFILES:${PN} = " \ 95CONFFILES:${PN} = " \