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 (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 90123158042 for ; Thu, 7 Nov 2024 16:37:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A71FE0934; Thu, 7 Nov 2024 16:37:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 7EEEBE0934 for ; Thu, 7 Nov 2024 16:37:14 +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 43766342FAF for ; Thu, 7 Nov 2024 16:37:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ACAA0197F for ; Thu, 7 Nov 2024 16:37:11 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1730997396.2559800a0a46c96d9fe61768986de954c2f93e51.floppym@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.31-r1.ebuild net-dns/bind/bind-9.18.31.ebuild X-VCS-Directories: net-dns/bind/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 2559800a0a46c96d9fe61768986de954c2f93e51 X-VCS-Branch: master Date: Thu, 7 Nov 2024 16:37:11 +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: a17a49bd-0f3b-47a1-b6d8-fc5085d96a52 X-Archives-Hash: f99d7b0f4969a73fe8649a2d5fa3bf17 commit: 2559800a0a46c96d9fe61768986de954c2f93e51 Author: Mike Gilbert gentoo org> AuthorDate: Tue Nov 5 20:20:52 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Nov 7 16:36:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2559800a net-dns/bind: wire up ROOT in pkg_postinst Skip calling rndc-confgen when ROOT is not empty. Add EPREFIX to paths. Add proper quoting in pkg_postinst and pkg_config. Closes: https://bugs.gentoo.org/942892 Signed-off-by: Mike Gilbert gentoo.org> ...{bind-9.18.31.ebuild => bind-9.18.31-r1.ebuild} | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/net-dns/bind/bind-9.18.31.ebuild b/net-dns/bind/bind-9.18.31-r1.ebuild similarity index 85% rename from net-dns/bind/bind-9.18.31.ebuild rename to net-dns/bind/bind-9.18.31-r1.ebuild index b35542e12f4d..f10b1e166977 100644 --- a/net-dns/bind/bind-9.18.31.ebuild +++ b/net-dns/bind/bind-9.18.31-r1.ebuild @@ -173,11 +173,11 @@ src_install() { pkg_postinst() { tmpfiles_process named.conf - if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then + if [[ -z ${ROOT} && ! -f ${EPREFIX}/etc/bind/rndc.key && ! -f ${EPREFIX}/etc/bind/rndc.conf ]]; then einfo "Generating rndc.key" - /usr/sbin/rndc-confgen -a - chown root:named /etc/bind/rndc.key || die - chmod 0640 /etc/bind/rndc.key || die + "${EPREFIX}"/usr/sbin/rndc-confgen -a || die + chown root:named "${EPREFIX}"/etc/bind/rndc.key || die + chmod 0640 "${EPREFIX}"/etc/bind/rndc.key || die fi einfo @@ -190,7 +190,7 @@ pkg_postinst() { einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" einfo - CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) + CHROOT=$(source "${EROOT}"/etc/conf.d/named 2>/dev/null; echo ${CHROOT}) if [[ -n ${CHROOT} ]]; then elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" elog "To enable the old behaviour (without using mount) uncomment the" @@ -216,9 +216,9 @@ pkg_postinst() { } pkg_config() { - CHROOT=$(source /etc/conf.d/named; echo ${CHROOT}) - CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT}) - CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP}) + CHROOT=$(source "${EROOT}"/etc/conf.d/named; echo ${CHROOT}) + CHROOT_NOMOUNT=$(source "${EROOT}"/etc/conf.d/named; echo ${CHROOT_NOMOUNT}) + CHROOT_GEOIP=$(source "${EROOT}"/etc/conf.d/named; echo ${CHROOT_GEOIP}) if [[ -z "${CHROOT}" ]]; then eerror "This config script is designed to automate setting up" @@ -239,34 +239,34 @@ pkg_config() { echo; einfo "Setting up the chroot directory..." - mkdir -m 0750 -p ${CHROOT} || die - mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die - mkdir -m 0750 -p ${CHROOT}/etc/bind || die - mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die + mkdir -m 0750 -p "${CHROOT}" || die + mkdir -m 0755 -p "${CHROOT}"/{dev,etc,var/log,run} || die + mkdir -m 0750 -p "${CHROOT}"/etc/bind || die + mkdir -m 0770 -p "${CHROOT}"/var/{bind,log/named} "${CHROOT}"/run/named/ || die chown root:named \ - ${CHROOT} \ - ${CHROOT}/var/{bind,log/named} \ - ${CHROOT}/run/named/ \ - ${CHROOT}/etc/bind \ + "${CHROOT}" \ + "${CHROOT}"/var/{bind,log/named} \ + "${CHROOT}"/run/named/ \ + "${CHROOT}"/etc/bind \ || die - mknod ${CHROOT}/dev/null c 1 3 || die - chmod 0666 ${CHROOT}/dev/null || die + mknod "${CHROOT}"/dev/null c 1 3 || die + chmod 0666 "${CHROOT}"/dev/null || die - mknod ${CHROOT}/dev/zero c 1 5 || die - chmod 0666 ${CHROOT}/dev/zero || die + mknod "${CHROOT}"/dev/zero c 1 5 || die + chmod 0666 "${CHROOT}"/dev/zero || die if [[ "${CHROOT_NOMOUNT:-0}" -ne 0 ]]; then - cp -a /etc/bind ${CHROOT}/etc/ || die - cp -a /var/bind ${CHROOT}/var/ || die + cp -a /etc/bind "${CHROOT}"/etc/ || die + cp -a /var/bind "${CHROOT}"/var/ || die fi if [[ "${CHROOT_GEOIP:-0}" -eq 1 ]]; then if use geoip; then - mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die + mkdir -m 0755 -p "${CHROOT}"/usr/share/GeoIP || die elif use geoip2; then - mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die + mkdir -m 0755 -p "${CHROOT}"/usr/share/GeoIP2 || die fi fi