From patchwork Mon Feb 3 16:40:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 56524 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99F4AC02192 for ; Mon, 3 Feb 2025 16:41:20 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web11.92267.1738600870506145590 for ; Mon, 03 Feb 2025 08:41:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=QyMmMl+6; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.52, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-38789e5b6a7so2421181f8f.1 for ; Mon, 03 Feb 2025 08:41:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1738600868; x=1739205668; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HDaEbYEIV4ys2n5sVasoVlWeRHLqy8RvHvAyDwerkjk=; b=QyMmMl+60B1Xb5HIJmN+UTBePQ8eUHp4B7omLZ0c2oPlcSFVbh3yhBnbYRccj7LwJ9 0eR7zoP7xLh47UrQnAVG1h++0mt00W4LAIFs2NrFhs+BKShtUoKZYjA/tzUkKNIXyV1a 2XyMa/V1GSXLXGAMmfaD9Fu1632oQAKpGyX04= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738600868; x=1739205668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HDaEbYEIV4ys2n5sVasoVlWeRHLqy8RvHvAyDwerkjk=; b=o7yR9e53A9mrNwM45KytIdUiGXmRSTVT5JFq6MUKQZx4UuWDWvEXy4xaggyffgPHGV FQCZaMVbkSb2rRzx7lvIifzlbgPHBvwr1Bo+h94fmZXTztbJPS4UewQsNLC9e5PsS14S 4neGwU2DZT5s1cDfsk60F9CZl5OhO8I8EJABUWsyVtjwATkgbjCUBOlJXFfBLBLNg4ZH JG4k2U1u1VyardOCcz2ELEsFmqgGEk4N2GOOgZK3B4wK2Q8sTOH5nWuz6CoN2Uhn46BS Fh9W6lxBTLRnBFJ7vRsZkt/Xp4XL66sE9Ocn3vzBhsza4S3wTZkvaoIBV5tO36JB9scy hwXQ== X-Gm-Message-State: AOJu0YwifISmcoKzeIFJe5j6wEHslvA5ZqhIM8HVVoDYZq5UZ4s5XtGN vtPxxg+/Vuq+1izSeUhuh2LHJWVU4qi+pjKF3BNgKgGa+r1joyRJMT9YLPkPPCAAtyWHU8Lt0Yp m X-Gm-Gg: ASbGncusuEyFWFHQpJoBwASG2OXBobHMpf3MxMni4DTj8iDdZ42As4dnHZd81GSpt1p Q2J5J32iroV528NJvk9bG1MW18uI2QtnzKG6ucw/vscHXM6v4YW2GInaP/PKeKH2LObkomPxZ/c NyMkgQ3kjWDnzmB7SmckQsBfHGqhOnj4jYxbNyKYZUNBKWj+nCkSS9X3eJ6smePUMNuS5dFKKLE qRyrXL/fUNJTJ5sTiVn954mh+bNCBvTF5+oVAJN80pfCHGQoh8Fig+77hwneJh7PhxrGBcchNow QWDIqWAk7Hnk75VQMNKaPKThOW2NpwJYZ++Ru3ofGOto X-Google-Smtp-Source: AGHT+IErAKB+gHeQAhAeqH6SGxRz5d/pJL0++2Y3/5KZGzK6uai564aN1WPkzrzHUI/mqUEjl61RRg== X-Received: by 2002:adf:fa8a:0:b0:385:f249:c336 with SMTP id ffacd0b85a97d-38c520964c8mr13430891f8f.45.1738600868230; Mon, 03 Feb 2025 08:41:08 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:41c1:3919:865f:692c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c5c1d0bbfsm13479806f8f.98.2025.02.03.08.41.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 08:41:07 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 03/47] bind: upgrade 9.20.4 -> 9.20.5 Date: Mon, 3 Feb 2025 16:40:20 +0000 Message-ID: <20250203164104.3403226-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250203164104.3403226-1-richard.purdie@linuxfoundation.org> References: <20250203164104.3403226-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 03 Feb 2025 16:41:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210669 Signed-off-by: Richard Purdie --- ...1-avoid-start-failure-with-bind-user.patch | 7 +- ...d-V-and-start-log-hide-build-options.patch | 5 +- ...ching-for-json-headers-searches-sysr.patch | 4 +- .../recipes-connectivity/bind/bind/conf.patch | 137 ++++++++++++------ ...t.d-add-support-for-read-only-rootfs.patch | 12 +- .../bind/make-etc-initd-bind-stop-work.patch | 19 ++- .../bind/{bind_9.20.4.bb => bind_9.20.5.bb} | 2 +- 7 files changed, 116 insertions(+), 70 deletions(-) rename meta/recipes-connectivity/bind/{bind_9.20.4.bb => bind_9.20.5.bb} (97%) diff --git a/meta/recipes-connectivity/bind/bind/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind/0001-avoid-start-failure-with-bind-user.patch index ec1bc7b5672..0d670edda60 100644 --- a/meta/recipes-connectivity/bind/bind/0001-avoid-start-failure-with-bind-user.patch +++ b/meta/recipes-connectivity/bind/bind/0001-avoid-start-failure-with-bind-user.patch @@ -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 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 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 - diff --git a/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch index 4c10f33f048..10b8caafbba 100644 --- a/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch +++ b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch @@ -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 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 Refreshed for 9.16.0 Signed-off-by: Armin Kuster - --- 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 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 2fa4ba19529..49b0a5eea1e 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 0b3f9331639695300a1ec89e3020765ab1ef5e31 Mon Sep 17 00:00:00 2001 +From 9a06dbf831f012c6019237527d2bf1aa7a3a543a Mon Sep 17 00:00:00 2001 From: Paul Gortmaker 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 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], diff --git a/meta/recipes-connectivity/bind/bind/conf.patch b/meta/recipes-connectivity/bind/bind/conf.patch index aa3642acec3..16ac510cfab 100644 --- a/meta/recipes-connectivity/bind/bind/conf.patch +++ b/meta/recipes-connectivity/bind/bind/conf.patch @@ -1,12 +1,43 @@ +From 27d1113a4c378583e0fcff91d70256bdcd78de0b Mon Sep 17 00:00:00 2001 +From: Qing He +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 +--- + 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/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch index 11db95ede12..baeeafe33e3 100644 --- a/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch +++ b/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch @@ -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 +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 --- - 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 - diff --git a/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch index 146f3e35db6..93aa3041264 100644 --- a/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch +++ b/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch @@ -1,4 +1,7 @@ -bind: make "/etc/init.d/bind stop" work +From 2ea2e4e502e5840d52e76461e071882cc65f1766 Mon Sep 17 00:00:00 2001 +From: Roy Li +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 --- - 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 - diff --git a/meta/recipes-connectivity/bind/bind_9.20.4.bb b/meta/recipes-connectivity/bind/bind_9.20.5.bb similarity index 97% rename from meta/recipes-connectivity/bind/bind_9.20.4.bb rename to meta/recipes-connectivity/bind/bind_9.20.5.bb index d9ea440fbd0..abd2da52496 100644 --- a/meta/recipes-connectivity/bind/bind_9.20.4.bb +++ b/meta/recipes-connectivity/bind/bind_9.20.5.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] = "3a8e1a05e00e3e9bc02bdffded7862faf7726ba76ba997f42ab487777bd8210b" +SRC_URI[sha256sum] = "19274fd739c023772b4212a0b6c201cf4364855fa7e6a7d3db49693f55db1ab8" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # follow the ESV versions divisible by 2