From patchwork Tue Dec 17 08:57:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mingyu Wang (Fujitsu)" X-Patchwork-Id: 54199 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 9BE2EE77184 for ; Tue, 17 Dec 2024 08:58:25 +0000 (UTC) Received: from esa10.hc1455-7.c3s2.iphmx.com (esa10.hc1455-7.c3s2.iphmx.com [139.138.36.225]) by mx.groups.io with SMTP id smtpd.web10.77341.1734425903378007472 for ; Tue, 17 Dec 2024 00:58:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=fj2 header.b=Y+6u+3Qm; spf=pass (domain: fujitsu.com, ip: 139.138.36.225, mailfrom: wangmy@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=fujitsu.com; i=@fujitsu.com; q=dns/txt; s=fj2; t=1734425903; x=1765961903; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=T/AN1R5vmFSE6gZyajp03zukG5aDjRzIUG9cRBDavic=; b=Y+6u+3Qml8hEDpU37bt+Y6yt3PJ2wgEB7TXzvtrQA5HhGdx7GiKUgwf7 n+Z7VElJXm3MWbUDrocTrw9hQxnQxLFBbyFqBrBHp3TzUWTjLG2PJFrh+ MDb0K8l4GLfi1OQ+gvyu/jG143z0zFRwo4s+KBwnWgZ67Q2SF5WKgrgQg wrWjzNZ3Y8HPCDLh31+BxpSdiEo4Fq/vDcelV3SOF94jL6SC7fV2JWVj0 yNbn4qQAQt3tPqGTRqE2pqrwMq8pQMg1yWu6n1KFsVhj6kNiyDpRJJnzD aShajxIX1qQQXHxfBhyrN8koca2UxNVE97YN63OGbQCutxwN5XzVaf2u7 g==; X-CSE-ConnectionGUID: xeo7oEWkRxCLeA51dvpy+w== X-CSE-MsgGUID: nmWvmHr+TtmuBo07+faInQ== X-IronPort-AV: E=McAfee;i="6700,10204,11288"; a="171353565" X-IronPort-AV: E=Sophos;i="6.12,241,1728918000"; d="scan'208";a="171353565" Received: from unknown (HELO yto-r1.gw.nic.fujitsu.com) ([218.44.52.217]) by esa10.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Dec 2024 17:58:20 +0900 Received: from yto-m2.gw.nic.fujitsu.com (yto-nat-yto-m2.gw.nic.fujitsu.com [192.168.83.65]) by yto-r1.gw.nic.fujitsu.com (Postfix) with ESMTP id F0569D6EA1 for ; Tue, 17 Dec 2024 17:58:17 +0900 (JST) Received: from kws-ab3.gw.nic.fujitsu.com (kws-ab3.gw.nic.fujitsu.com [192.51.206.21]) by yto-m2.gw.nic.fujitsu.com (Postfix) with ESMTP id B6217D5098 for ; Tue, 17 Dec 2024 17:58:17 +0900 (JST) Received: from edo.cn.fujitsu.com (edo.cn.fujitsu.com [10.167.33.5]) by kws-ab3.gw.nic.fujitsu.com (Postfix) with ESMTP id 468772007CDE4 for ; Tue, 17 Dec 2024 17:58:17 +0900 (JST) Received: from localhost.localdomain.localdomain (unknown [10.193.128.200]) by edo.cn.fujitsu.com (Postfix) with ESMTP id DDDB81A000B; Tue, 17 Dec 2024 16:58:16 +0800 (CST) From: wangmy@fujitsu.com To: openembedded-core@lists.openembedded.org Cc: Wang Mingyu Subject: [OE-core] [PATCH 02/21] bind: upgrade 9.20.3 -> 9.20.4 Date: Tue, 17 Dec 2024 16:57:48 +0800 Message-Id: <1734425887-18069-2-git-send-email-wangmy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1734425887-18069-1-git-send-email-wangmy@fujitsu.com> References: <1734425887-18069-1-git-send-email-wangmy@fujitsu.com> X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-28864.006 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-28864.006 X-TMASE-Result: 10--8.793300-10.000000 X-TMASE-MatchedRID: kfHlHSjlGDOjz0nOeth/yTo39wOA02LhTJDl9FKHbrkg9R3V8qg5xNb2 e7N2CFQy+7QcRaVoa8n/tdOuViNvuC/7QU2czuUNlVHM/F6YkvRNLPQl0QAltGh76/bDpGErCKS ilWnI9vpuf5ur5byPpda8/GIKSZmoDDw2a573DPfTfU1/F+PbMz/FEHo4advauBsk5njfgGylNp x3XgfaSAyEsMD4tfD0mIU7wrG+6iT6OKR1JZVm88ewSWOq7H2dg8C02zkI7w56km1x+yMYzWtCS H0t7mTX0+0G7io/4HUReO4lhv/JlGHjhWUsEu50TkYEhgRGTqP4qCLIu0mtII5V1ACIyZtn2RgA +RsFvIZmaRDLvWZjp4Ay6p60ZV62fJ5/bZ6npdjiRhduhvElsqX8y2tPBLhQEBOqGXbCHJzgkPI rVi1+cBzHsI0zDBWTJxePWTGAbWgcTJVBnmAC1w== X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-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 ; Tue, 17 Dec 2024 08:58:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208807 From: Wang Mingyu bind-ensure-searching-for-json-headers-searches-sysr.patch conf.patch refreshed for 9.20.4 Signed-off-by: Wang Mingyu --- ...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 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 - --- 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 +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_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