MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bind: upgrade 9.20.4 -> 9.20.5

Browse Source 
(From OE-Core rev: 615807f9a7162847ce0f727b075bc746da241ba5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2025-02-01 06:46:03 +00:00
parent 1fb9f1684f
commit e96c282f47
7 changed files with 119 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta/recipes-connectivity/bind/bind/0001-avoid-start-failure-with-bind-user.patch
View File

@ -1,4 +1,4 @@
From 31dde3562f287429eea94b77250d184818b49063 Mon Sep 17 00:00:00 2001
From 0a45935f9d1207535f83df62ed52f358ed546bbe Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 15 Oct 2018 16:55:09 +0800
Subject: [PATCH] avoid start failure with bind user
@ -11,7 +11,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
1 file changed, 1 insertion(+)
diff --git a/init.d b/init.d
index b2eec60..6e03936 100644
index 95e8909..771d349 100644
--- a/init.d
+++ b/init.d
@@ -57,6 +57,7 @@ case "$1" in
@ -22,6 +22,3 @@ index b2eec60..6e03936 100644
chmod 0640 /etc/bind/rndc.key
fi
if [ -f /var/run/named/named.pid ]; then
--
2.7.4

5
meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch
View File

@ -1,4 +1,4 @@
From 4e83392e840fa7b05e778710b8c202d102477a13 Mon Sep 17 00:00:00 2001
From dd484b0bd58832fc241afdc8ea05693228348353 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 27 Aug 2018 21:24:20 +0800
Subject: [PATCH] `named/lwresd -V' and start log hide build options
@ -15,13 +15,12 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Refreshed for 9.16.0
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index bf20690..c5d330f 100644
index 13f9d7f..6516d0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_DEFINE([PACKAGE_VERSION_EXTRA], ["][bind_VERSION_EXTRA]["], [BIND 9 Extra par

4
meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
View File

@ -1,4 +1,4 @@
From 0b3f9331639695300a1ec89e3020765ab1ef5e31 Mon Sep 17 00:00:00 2001
From 9a06dbf831f012c6019237527d2bf1aa7a3a543a Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Tue, 9 Jun 2015 11:22:00 -0400
Subject: [PATCH] bind: ensure searching for json headers searches sysroot
@ -32,7 +32,7 @@ Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 865b4d0..a80b6ce 100644
index 168a77a..13f9d7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -863,7 +863,7 @@ AS_CASE([$with_lmdb],

143
meta/recipes-connectivity/bind/bind/conf.patch
View File

@ -1,12 +1,43 @@
From 27d1113a4c378583e0fcff91d70256bdcd78de0b Mon Sep 17 00:00:00 2001
From: Qing He <qing.he@intel.com>
Date: Tue, 30 Nov 2010 13:35:42 +0800
Subject: [PATCH] bind: add new recipe
Upstream-Status: Inappropriate [configuration]
the patch is imported from openembedded project
11/30/2010 - Qing He <qing.he@intel.com>
---
conf/db.0 | 12 +++++++
conf/db.127 | 13 ++++++++
conf/db.255 | 12 +++++++
conf/db.empty | 14 +++++++++
conf/db.local | 13 ++++++++
conf/db.root | 45 ++++++++++++++++++++++++++
conf/named.conf | 49 +++++++++++++++++++++++++++++
conf/named.conf.local | 8 +++++
conf/named.conf.options | 24 ++++++++++++++
conf/zones.rfc1918 | 20 ++++++++++++
init.d | 70 +++++++++++++++++++++++++++++++++++++++++
11 files changed, 280 insertions(+)
create mode 100644 conf/db.0
create mode 100644 conf/db.127
create mode 100644 conf/db.255
create mode 100644 conf/db.empty
create mode 100644 conf/db.local
create mode 100644 conf/db.root
create mode 100644 conf/named.conf
create mode 100644 conf/named.conf.local
create mode 100644 conf/named.conf.options
create mode 100644 conf/zones.rfc1918
create mode 100644 init.d
diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
--- bind-9.3.1.orig/conf/db.0 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/conf/db.0 2005-07-10 22:14:00.000000000 +0200
diff --git a/conf/db.0 b/conf/db.0
new file mode 100644
index 0000000..e3aabdb
--- /dev/null
+++ b/conf/db.0
@@ -0,0 +1,12 @@
+;
+; BIND reverse data file for broadcast zone
@ -20,9 +51,11 @@ diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+ 604800 ) ; Negative Cache TTL
+;
+@ IN NS localhost.
diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
--- bind-9.3.1.orig/conf/db.127 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/conf/db.127 2005-07-10 22:14:00.000000000 +0200
diff --git a/conf/db.127 b/conf/db.127
new file mode 100644
index 0000000..cd05bef
--- /dev/null
+++ b/conf/db.127
@@ -0,0 +1,13 @@
+;
+; BIND reverse data file for local loopback interface
@ -37,9 +70,29 @@ diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+;
+@ IN NS localhost.
+1.0.0 IN PTR localhost.
diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
--- bind-9.3.1.orig/conf/db.empty 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/conf/db.empty 2005-07-10 22:14:00.000000000 +0200
diff --git a/conf/db.255 b/conf/db.255
new file mode 100644
index 0000000..16cd819
--- /dev/null
+++ b/conf/db.255
@@ -0,0 +1,12 @@
+;
+; BIND reserve data file for broadcast zone
+;
+$TTL 604800
+@ IN SOA localhost. root.localhost. (
+ 1 ; Serial
+ 604800 ; Refresh
+ 86400 ; Retry
+ 2419200 ; Expire
+ 604800 ) ; Negative Cache TTL
+;
+@ IN NS localhost.
diff --git a/conf/db.empty b/conf/db.empty
new file mode 100644
index 0000000..8a12858
--- /dev/null
+++ b/conf/db.empty
@@ -0,0 +1,14 @@
+; BIND reverse data file for empty rfc1918 zone
+;
@ -55,25 +108,11 @@ diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+ 86400 ) ; Negative Cache TTL
+;
+@ IN NS localhost.
diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255
--- bind-9.3.1.orig/conf/db.255 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/conf/db.255 2005-07-10 22:14:00.000000000 +0200
@@ -0,0 +1,12 @@
+;
+; BIND reserve data file for broadcast zone
+;
+$TTL 604800
+@ IN SOA localhost. root.localhost. (
+ 1 ; Serial
+ 604800 ; Refresh
+ 86400 ; Retry
+ 2419200 ; Expire
+ 604800 ) ; Negative Cache TTL
+;
+@ IN NS localhost.
diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
--- bind-9.3.1.orig/conf/db.local 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/conf/db.local 2005-07-10 22:14:00.000000000 +0200
diff --git a/conf/db.local b/conf/db.local
new file mode 100644
index 0000000..66b4892
--- /dev/null
+++ b/conf/db.local
@@ -0,0 +1,13 @@
+;
+; BIND data file for local loopback interface
@ -88,9 +127,11 @@ diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+;
+@ IN NS localhost.
+@ IN A 127.0.0.1
diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
--- bind-9.3.1.orig/conf/db.root 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/conf/db.root 2005-07-10 22:14:00.000000000 +0200
diff --git a/conf/db.root b/conf/db.root
new file mode 100644
index 0000000..01c20f0
--- /dev/null
+++ b/conf/db.root
@@ -0,0 +1,45 @@
+
+; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
@ -137,9 +178,11 @@ diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+;; WHEN: Sun Feb 1 11:27:14 2004
+;; MSG SIZE rcvd: 436
+
diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
--- bind-9.3.1.orig/conf/named.conf 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200
diff --git a/conf/named.conf b/conf/named.conf
new file mode 100644
index 0000000..95829cf
--- /dev/null
+++ b/conf/named.conf
@@ -0,0 +1,49 @@
+// This is the primary configuration file for the BIND DNS server named.
+//
@ -190,9 +233,11 @@ diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
+// root-delegation-only exclude { "DE"; "MUSEUM"; };
+
+include "/etc/bind/named.conf.local";
diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
--- bind-9.3.1.orig/conf/named.conf.local 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/conf/named.conf.local 2005-07-10 22:14:06.000000000 +0200
diff --git a/conf/named.conf.local b/conf/named.conf.local
new file mode 100644
index 0000000..7a57b10
--- /dev/null
+++ b/conf/named.conf.local
@@ -0,0 +1,8 @@
+//
+// Do any local configuration here
@ -202,9 +247,11 @@ diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
+// organization
+//include "/etc/bind/zones.rfc1918";
+
diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options
--- bind-9.3.1.orig/conf/named.conf.options 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200
diff --git a/conf/named.conf.options b/conf/named.conf.options
new file mode 100644
index 0000000..813193d
--- /dev/null
+++ b/conf/named.conf.options
@@ -0,0 +1,24 @@
+options {
+ directory "/var/cache/bind";
@ -230,9 +277,11 @@ diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.opt
+
+};
+
diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/conf/zones.rfc1918 2005-07-10 22:14:10.000000000 +0200
diff --git a/conf/zones.rfc1918 b/conf/zones.rfc1918
new file mode 100644
index 0000000..03b5546
--- /dev/null
+++ b/conf/zones.rfc1918
@@ -0,0 +1,20 @@
+zone "10.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+
@ -254,9 +303,11 @@ diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
+zone "31.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+
+zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
--- bind-9.3.1.orig/init.d 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.3.1/init.d 2005-07-10 23:09:58.000000000 +0200
diff --git a/init.d b/init.d
new file mode 100644
index 0000000..2ef2277
--- /dev/null
+++ b/init.d
@@ -0,0 +1,70 @@
+#!/bin/sh
+

12
meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch
View File

@ -1,14 +1,17 @@
Subject: init.d: add support for read-only rootfs
From 1fa4d0eb9631771bd751f04ce898433580996e5e Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Thu, 27 Mar 2014 02:34:41 +0000
Subject: [PATCH] init.d: add support for read-only rootfs
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
init.d | 40 ++++++++++++++++++++++++++++++++++++++++
init.d | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/init.d b/init.d
index 0111ed4..24677c8 100644
index 2ef2277..95e8909 100644
--- a/init.d
+++ b/init.d
@@ -6,8 +6,48 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
@ -60,6 +63,3 @@ index 0111ed4..24677c8 100644
test -x /usr/sbin/rndc || exit 0
case "$1" in
--
1.7.9.5

19
meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
View File

@ -1,4 +1,7 @@
bind: make "/etc/init.d/bind stop" work
From 2ea2e4e502e5840d52e76461e071882cc65f1766 Mon Sep 17 00:00:00 2001
From: Roy Li <rongqing.li@windriver.com>
Date: Thu, 15 Nov 2012 02:27:54 +0000
Subject: [PATCH] bind: make "/etc/init.d/bind stop" work
Upstream-Status: Inappropriate [configuration]
@ -7,13 +10,13 @@ the named daemon.
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
conf/named.conf | 5 +++++
conf/rndc.conf | 5 +++++
2 files changed, 10 insertions(+), 0 deletions(-)
conf/named.conf | 5 +++++
conf/rndc.conf | 5 +++++
2 files changed, 10 insertions(+)
create mode 100644 conf/rndc.conf
diff --git a/conf/named.conf b/conf/named.conf
index 95829cf..c8899e7 100644
index 95829cf..021dbca 100644
--- a/conf/named.conf
+++ b/conf/named.conf
@@ -47,3 +47,8 @@ zone "255.in-addr.arpa" {
@ -27,7 +30,7 @@ index 95829cf..c8899e7 100644
+};
diff --git a/conf/rndc.conf b/conf/rndc.conf
new file mode 100644
index 0000000..a0b481d
index 0000000..4b43a3d
--- /dev/null
+++ b/conf/rndc.conf
@@ -0,0 +1,5 @@
@ -36,7 +39,3 @@ index 0000000..a0b481d
+ default-server localhost;
+ default-key rndc-key;
+};
--
1.7.5.4

2
meta/recipes-connectivity/bind/bind_9.20.4.bb → meta/recipes-connectivity/bind/bind_9.20.5.bb
View File

@ -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] = "3a8e1a05e00e3e9bc02bdffded7862faf7726ba76ba997f42ab487777bd8210b"
SRC_URI[sha256sum] = "19274fd739c023772b4212a0b6c201cf4364855fa7e6a7d3db49693f55db1ab8"
UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
# follow the ESV versions divisible by 2