gentoo auto-resync : 08:11:2024 - 03:03:27

2 files changed, 25 insertions, 25 deletions

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index e093a559cea5..d31fed1b8d97 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -22,5 +22,5 @@ DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2
 EBUILD bind-9.16.48.ebuild 11761 BLAKE2B 18aa8cc8e62794c72bd1ecb6cfc189b2b840b13e49077c6289fc991ebf7802dbb50573e06277b66fd818df6e293d21d8336b0a9fd002375964244b00e4f0f9a3 SHA512 b6b4887ca05afda804c0c3ebc6f06464a0865d86e2d8992c646a119f60c6c88df73ad4af833d88a7f5fc688ddd4cf1d507e38f30f27e6d686025fbf9adb0c7e9
 EBUILD bind-9.16.50.ebuild 11765 BLAKE2B d6a951f9a3c9df2429fd5be6b7bbe2a0d7a3023d1309848c6b6f27ecd624a836c1ccfe87b3671bf1273adc9d599a29611ef1838bf1edc726161b09301d41f5fe SHA512 d63ee808be0167bfafa3ff882435889bb826bc17c82af77e76550049942fc0423ba8cb3cf25de62453d8f2a4bf33f5f2513700a77fabfd6f244f5496da771db5
 EBUILD bind-9.18.29-r2.ebuild 8062 BLAKE2B b2389632cc7fe225b879890c5567f723b01b13fae6e4f4120d3d59f77264f2f7840a90826486a2235e8f9fff6511003c7f7ef3494ff6c1140e4da3f2e2fe6546 SHA512 5b831fac716e38750a30bb17a5ad52bc1e5e6de5e9c5c5229c3ea7f87fb0cf8dfbb97b7c8f1c962f2f312d9e281a13f07a5d096242b26bad7c2f85736fd0a7f0
-EBUILD bind-9.18.31.ebuild 8055 BLAKE2B 83d715165616cf30c7e644b76c19ae8fd12d26f7f38a0b0926e95bc45285feba5424e534f909fa47a303366f22b51e9b5ecedcb9d4b284517f9dc60b4f31f815 SHA512 680880792cf5ad11b874e6a53b6591646eead2f30fad6f9bdae97c0afb7211a1f9170cf2088c7c65c4a42f02dcc9c40572cdb8fa6fd370594fda3fa89e4fcb35
+EBUILD bind-9.18.31-r1.ebuild 8202 BLAKE2B b8071cc9c022907b7f67bd51c3e4df7763cc9e2abb00a274b89a72cb781eda837bf9fc637b29709c835d99d0da349133559b3d78fad355d4c76f6696b7953c7a SHA512 90fb944356c8620e4534209362b4d0876a95e0132727e6ef07ef9e7ceaf619aa8c62ed8bb786823389736d4ee72115b4154f0a62d7c3676f4839b356c941022d
 MISC metadata.xml 915 BLAKE2B e415b3c30f15ba3e3d367dd28ed8dac1e6791fbec6b90ebd5881e217db11987365a8eb574b5e6f008e1228fb38aa461a85e7c45c3521e0a48fb6a4808b3b82ce SHA512 575d7c9992c1b3fd82a28cd5bbb585f568240f90dff5e00384c8ff4f937f582d37d2121fa35664b812192b20a16f2a44c196fb841e4fa3d4fd2c725900ac7d51
diff --git a/net-dns/bind/bind-9.18.31.ebuild b/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