From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1666102-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 61C91158083
	for <garchives@archives.gentoo.org>; Sat, 31 Aug 2024 07:10:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id AC5CCE29E3;
	Sat, 31 Aug 2024 07:10:45 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 95B75E29E3
	for <gentoo-commits@lists.gentoo.org>; Sat, 31 Aug 2024 07:10:45 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id DFFDA3430D0
	for <gentoo-commits@lists.gentoo.org>; Sat, 31 Aug 2024 07:10:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B73F1F30
	for <gentoo-commits@lists.gentoo.org>; Sat, 31 Aug 2024 07:10:42 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1725088216.e50ac466402806e78c10a98b626bd737e0edbe49.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/bind/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-dns/bind/bind-9.18.29.ebuild
X-VCS-Directories: net-dns/bind/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: e50ac466402806e78c10a98b626bd737e0edbe49
X-VCS-Branch: master
Date: Sat, 31 Aug 2024 07:10:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7256b6b6-f41b-4537-8e8d-280fac97a601
X-Archives-Hash: 54c9398bed7330b7480922fd548086ad

commit:     e50ac466402806e78c10a98b626bd737e0edbe49
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 06:56:09 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 07:10:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50ac466

net-dns/bind: restore some old files to /var/bind

We need to keep named.cache, root.cache, and localhost.zone because
we installed these for years *and* configs referencing them.

Dropping them suddenly means they disappear yet the configs
still refer to them. It's unnecessary disruption which we should
handle at another time. (No CONFIG_PROTECT applies there.)

Bug: https://bugs.gentoo.org/832218
Bug: https://bugs.gentoo.org/930348
Bug: https://bugs.gentoo.org/936568
Bug: https://bugs.gentoo.org/937907
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/bind/bind-9.18.29.ebuild | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/net-dns/bind/bind-9.18.29.ebuild b/net-dns/bind/bind-9.18.29.ebuild
index 18f4f0168c82..f2f369fcaef3 100644
--- a/net-dns/bind/bind-9.18.29.ebuild
+++ b/net-dns/bind/bind-9.18.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -124,6 +124,22 @@ src_install() {
 		find "${ED}"/usr/lib* -name '*.la' -delete || die
 	fi
 
+	#
+	# /var/bind
+	#
+	# These need to remain for now because CONFIG_PROTECT won't
+	# save them and we shipped configs for years containing references
+	# to them.
+	#
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r4 named.cache
+	# bug #450406
+	dosym named.cache /var/bind/root.cache
+	#
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
 	dosym -r /var/bind/pri /etc/bind/pri
 	dosym -r /var/bind/sec /etc/bind/sec
 	dosym -r /var/bind/dyn /etc/bind/dyn