From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 0D9A2158066 for ; Tue, 3 Sep 2024 06:43:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26581E2A19; Tue, 3 Sep 2024 06:43:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 0DE22E2A19 for ; Tue, 3 Sep 2024 06:43:48 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 549E7343108 for ; Tue, 3 Sep 2024 06:43:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CDF51EC8 for ; Tue, 3 Sep 2024 06:43:45 +0000 (UTC) From: "Sam James" 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" Message-ID: <1725345523.8fd3348bf2b450370cd42764c7d9fab4ef1732a8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/bind/, net-dns/bind/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/bind/bind-9.18.29-r1.ebuild net-dns/bind/bind-9.18.29-r2.ebuild net-dns/bind/files/named.init-r15 net-dns/bind/files/named.service-r2 X-VCS-Directories: net-dns/bind/ net-dns/bind/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8fd3348bf2b450370cd42764c7d9fab4ef1732a8 X-VCS-Branch: master Date: Tue, 3 Sep 2024 06:43:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b48c26a-3872-496d-a513-8ee02799b5c7 X-Archives-Hash: 87412404b1f73a65eea3a0ad96c0c271 commit: 8fd3348bf2b450370cd42764c7d9fab4ef1732a8 Author: Sam James gentoo org> AuthorDate: Tue Sep 3 06:37:21 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 3 06:38:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd3348b net-dns/bind: fix init script for non-merged-usr named-checkconf is in /usr/bin, not /usr/sbin, now. See upstream commit https://gitlab.isc.org/isc-projects/bind9/-/commit/4419606c9d2a52536a6dd0882ac0c7068ac27f30. Reported at https://github.com/gentoo/gentoo/pull/25220#issuecomment-2325665084. Signed-off-by: Sam James gentoo.org> .../bind/{bind-9.18.29-r1.ebuild => bind-9.18.29-r2.ebuild} | 2 +- net-dns/bind/files/named.init-r15 | 6 +++--- net-dns/bind/files/named.service-r2 | 13 +++++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/net-dns/bind/bind-9.18.29-r1.ebuild b/net-dns/bind/bind-9.18.29-r2.ebuild similarity index 99% rename from net-dns/bind/bind-9.18.29-r1.ebuild rename to net-dns/bind/bind-9.18.29-r2.ebuild index 268786e54053..56fb07aa3d91 100644 --- a/net-dns/bind/bind-9.18.29-r1.ebuild +++ b/net-dns/bind/bind-9.18.29-r2.ebuild @@ -149,7 +149,7 @@ src_install() { fperms 0750 /etc/bind /var/bind/pri fperms 0770 /var/log/named /var/bind/{,sec,dyn} - systemd_newunit "${FILESDIR}/named.service-r1" named.service + systemd_newunit "${FILESDIR}/named.service-r2" named.service dotmpfiles "${FILESDIR}"/named.conf exeinto /usr/libexec doexe "${FILESDIR}/generate-rndc-key.sh" diff --git a/net-dns/bind/files/named.init-r15 b/net-dns/bind/files/named.init-r15 index bdee10cc61e8..2bd52a773200 100644 --- a/net-dns/bind/files/named.init-r15 +++ b/net-dns/bind/files/named.init-r15 @@ -65,7 +65,7 @@ _umount() { _get_pidfile() { # as suggested in bug #107724, bug 335398#c17 [ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\ - /usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2) + /usr/bin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2) [ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/run/named/named.pid } @@ -98,7 +98,7 @@ checkconfig() { return 1 fi - /usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || { + /usr/bin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || { eerror "named-checkconf failed! Please fix your config first." return 1 } @@ -109,7 +109,7 @@ checkconfig() { checkzones() { ebegin "Checking named configuration and zones" - /usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} + /usr/bin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} eend $? } diff --git a/net-dns/bind/files/named.service-r2 b/net-dns/bind/files/named.service-r2 new file mode 100644 index 000000000000..4ca34544fe61 --- /dev/null +++ b/net-dns/bind/files/named.service-r2 @@ -0,0 +1,13 @@ +[Unit] +Description=Internet domain name server +After=network.target + +[Service] +ExecStartPre=/usr/libexec/generate-rndc-key.sh +ExecStartPre=/usr/bin/named-checkconf -z /etc/bind/named.conf +ExecStart=/usr/sbin/named -f -u named +ExecReload=/usr/sbin/rndc reload +ExecStop=/usr/sbin/rndc stop + +[Install] +WantedBy=multi-user.target