From: Wang Mingyu <wan...@cn.fujitsu.com>
bind-ensure-searching-for-json-headers-searches-sysr.patch
conf.patch
refreshed for 9.20.4
Signed-off-by: Wang Mingyu <wan...@cn.fujitsu.com>
---
...ching-for-json-headers-searches-sysr.patch | 7 +-
.../recipes-connectivity/bind/bind/conf.patch | 137 ++++++++++++------
.../bind/{bind_9.20.3.bb => bind_9.20.4.bb} | 2 +-
3 files changed, 98 insertions(+), 48 deletions(-)
rename meta/recipes-connectivity/bind/{bind_9.20.3.bb => bind_9.20.4.bb} (97%)
diff --git
a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
index 38d07cae39..2fa4ba1952 100644
---
a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
+++
b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
@@ -1,4 +1,4 @@
-From 5ae30329f168c1e8d2e0c3831988a4f3e9096e39 Mon Sep 17 00:00:00 2001
+From 0b3f9331639695300a1ec89e3020765ab1ef5e31 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortma...@windriver.com>
Date: Tue, 9 Jun 2015 11:22:00 -0400
Subject: [PATCH] bind: ensure searching for json headers searches sysroot
@@ -27,16 +27,15 @@ to make use of the combination some day.
Upstream-Status: Inappropriate [OE Specific]
Signed-off-by: Paul Gortmaker <paul.gortma...@windriver.com>
-
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 2ab8ddd..92fe983 100644
+index 865b4d0..a80b6ce 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -761,7 +761,7 @@ AS_CASE([$with_lmdb],
+@@ -863,7 +863,7 @@ AS_CASE([$with_lmdb],
[no],[],
[auto|yes], [PKG_CHECK_MODULES([LMDB], [lmdb],
[ac_lib_lmdb_found=yes],
diff --git a/meta/recipes-connectivity/bind/bind/conf.patch
b/meta/recipes-connectivity/bind/bind/conf.patch
index aa3642acec..0667eb91a2 100644
--- a/meta/recipes-connectivity/bind/bind/conf.patch
+++ b/meta/recipes-connectivity/bind/bind/conf.patch
@@ -1,12 +1,43 @@
+From 3233f7c3b0d208890a9869309e692c4b0fe0483b Mon Sep 17 00:00:00 2001
+From: Qing He <qing...@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...@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,43 +70,49 @@ 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
-@@ -0,0 +1,14 @@
-+; BIND reverse data file for empty rfc1918 zone
+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 @@
+;
-+; DO NOT EDIT THIS FILE - it is used for multiple zones.
-+; Instead, copy it, edit named.conf, and use that copy.
++; BIND reserve data file for broadcast zone
+;
-+$TTL 86400
++$TTL 604800
+@ IN SOA localhost. root.localhost. (
+ 1 ; Serial
+ 604800 ; Refresh
+ 86400 ; Retry
+ 2419200 ; Expire
-+ 86400 ) ; Negative Cache TTL
++ 604800 ) ; 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 @@
+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
+;
-+; BIND reserve data file for broadcast zone
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
+;
-+$TTL 604800
++$TTL 86400
+@ IN SOA localhost. root.localhost. (
+ 1 ; Serial
+ 604800 ; Refresh
+ 86400 ; Retry
+ 2419200 ; Expire
-+ 604800 ) ; Negative Cache TTL
++ 86400 ) ; 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
+
diff --git a/meta/recipes-connectivity/bind/bind_9.20.3.bb
b/meta/recipes-connectivity/bind/bind_9.20.4.bb
similarity index 97%
rename from meta/recipes-connectivity/bind/bind_9.20.3.bb
rename to meta/recipes-connectivity/bind/bind_9.20.4.bb
index a77b030427..d9ea440fbd 100644
--- a/meta/recipes-connectivity/bind/bind_9.20.3.bb
+++ b/meta/recipes-connectivity/bind/bind_9.20.4.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] =
"f90c2da1621299f56a2e6585a6fe459ec3efd6f2fdf84a8fbf31b40be7698a73"
+SRC_URI[sha256sum] =
"3a8e1a05e00e3e9bc02bdffded7862faf7726ba76ba997f42ab487777bd8210b"
UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/";
# follow the ESV versions divisible by 2
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#208807):
https://lists.openembedded.org/g/openembedded-core/message/208807
Mute This Topic: https://lists.openembedded.org/mt/110160076/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
