gentoo auto-resync : 03:09:2024 - 12:28:20

8 files changed, 25 insertions, 11 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 21c0e80f3d6c..409f629e4122 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index f1187eb033f9..09e4841af72e 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -3,6 +3,6 @@ DIST bind-9.16.48.tar.xz.asc 833 BLAKE2B 740ed58863ed3a7dee6ada4edd03cad5378ea0a
 DIST bind-9.16.50.tar.xz 5134620 BLAKE2B 0464d1e246d0a5c39e20faf733b7f4ee21d192cc0ccce5bba2a22ae4303c82005ccfb319fe2da51872c7258852a747984d7327c70dec08414ab2d194c412199b SHA512 7627e0606ac389343046fa9d1ca789ed732b3c8d99e83ba6f59593f816cebc0b2ebd319c2812ac1f604c68f5115bbc281d432036c0d31bbe489ee2d678374213
 DIST bind-9.16.50.tar.xz.asc 833 BLAKE2B 7eabf67b96d1fc94ec096adf1b4d075c370b603b7225522fe5b97d04c519f68f017fe0ccaf7ddeff029d17c0b4c3932a09f009376553f987671ba21f6b9cdb7d SHA512 0650ad5d55da2d9fe848d68aa59b16998b781152209ebcaabaea68144dab75ff9f4cfcceaa87a6b6da4f2f98fcf6f9eddd16d19ddf958fef242d93da03516dbc
 EBUILD bind-tools-9.16.48.ebuild 4443 BLAKE2B d723f86158544786f6012874705bdf5a8305c1d155a738630aa0979f96a6ff629f9f3229334be1a466b5065aa52bb6bbbb0121c5e86f0f3353558138ce9205e7 SHA512 158e1f82b37d374ef2db01b12346a4489ac2b2c9cfa0b8e6867cc3c7a869eb731947811fd4a6bb2c75a02090da36aaf4d2f67b2f868a515f0f557a2e24a66ef5
-EBUILD bind-tools-9.16.50.ebuild 4450 BLAKE2B 7e8b64cf2372a890917dc72f36e2738d6ad2a4ae733988467be5a35eb59966d41688fbc8e8ff40bf307a60d68d876db987a5ecf92e0c9d2523f5046bcd91945e SHA512 b819f38c97322cdcd0b9f52153697e8b43b135fa8ad51f51933826b926a2e83cd8b8032b522d34dd6b3366a4f204c9244b991d1cee0ec2b9bdf6d9a5ddf2c62a
+EBUILD bind-tools-9.16.50.ebuild 4449 BLAKE2B 05fdd190ae7048fc7f0aa3f3e7186540b8400f5dd347983c27af5ec26584322e6a4c91fbe6ef20914e0cb1a4ee1817ca672633273d462ec4d5cdc32cd38bd584 SHA512 e9a6f173d500717c0ca581887fb0b5ef417cc764ddf1375bdd570a1016cb35fe45062e985de2bb28b550024013097e856b5c5f76fad51dc2bf10f774b6fdd58b
 EBUILD bind-tools-9.18.0.ebuild 611 BLAKE2B b27763831496c2697b624a486e2df76f941f5472fba107d906b02cde25c7f8250b4e53fb35cb57667655f52e77b4a33fe36c7107e00a8c63fe3789def0c0fb5c SHA512 0ad6f3d10807f198df52957db43be5c90ec6d5baabd309b6e80a109347cfb2bd6e723dafb51a817e1a7638811217b48626009ad75bc872124a30ace0ab07d584
 MISC metadata.xml 393 BLAKE2B 90453ff0da1ce62c68dbe5c2f8ad99747388e8476afb02fc3794705d9acebbde1fb1d0c1f282a5e3fec62211b02af74c05783ebc2353dbdee3f2f0ba51541430 SHA512 d4e6b6f90058fedc771b2ecde5fb8cb8b3aa4069bded3a7a1ffe01766ca05b08a25b2a7f6d3f9cfa796868b9b290b20d2531ad25b7548427807125a2b8ea5bad
diff --git a/net-dns/bind-tools/bind-tools-9.16.50.ebuild b/net-dns/bind-tools/bind-tools-9.16.50.ebuild
index 53c0494bb5a5..adf64d176ab1 100644
--- a/net-dns/bind-tools/bind-tools-9.16.50.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.50.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+caps doc gssapi idn libedit readline test xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
 RESTRICT="!test? ( test )"
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index b45a49d7f4ab..e554dc5b2ef9 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -9,8 +9,9 @@ AUX named.conf.auth 625 BLAKE2B 492bc2381d0740d454f9aed0d37eb5c5ddd610fac09d0eae
 AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f5bae6c2313485808b99a1a46fc10431913d187ed67cc1e6bad019a9192638bc7fdf97c951e2326ce SHA512 68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a
 AUX named.confd-r8 1075 BLAKE2B 8a8080cfff035cfc04cd2c8e18a689c50b95637102ee640f7cdb4bb9213908642ce31e2354ef9252e91b1e3e81fe19c6278b2ca97cfc13764043ba1a4569ea66 SHA512 29f90cb3f8c53a0376f113cf3eccac667791613cbb56db5dd0fa56b4d193d8da77494b4bdd095d89348b62941d65894c5ee906860266999830d77002403cd063
 AUX named.init-r14 6167 BLAKE2B 7c3deb3492a50d2655814f9fb492706b671e08ccdc406be0fe9ef5e55de19f2e1ee3abe2c0f9fbff0a958ce751361c5faa690970d31a935aa2854a765a224c03 SHA512 65c65f261b950559487a6ac1d589cc51e6a4800aa9801c84aeb18083b7f587ff0ca6ce9e2994b1c58586d96a9181c05ca47ffef93fa210ffc53f4e9af21f4d1b
-AUX named.init-r15 6132 BLAKE2B e6d4feb8281b7fc44de32a4084008daeabb7dd9877deb83f383ad79e928d9f533e97cf5be8d107a532be2fa22bde2ab69f7ad0f0d81ba02bd59e7de80baf9502 SHA512 d32c44e007f06aa8af497fe0044ce2999c049ebf657a5a855d22b83420d9c08064be6b6cd25265b2d18cbd7f6225a68d5e2954d18f4dcbf0ece6b515efac7f13
+AUX named.init-r15 6129 BLAKE2B 352e22c20c7ea292404e22405e7ad24cad795992546abbcddf8f98be52a093e8eee99fcf40cfc0d6595353ee030e69849cf6a46ad30d8cfa96886db85695162f SHA512 2d30590b38f9a4dac6b83b0332f5b1d626dd0ec8548b8f140e8eba33886c2b167def71ff220188b4cb236f2a98d6c4d884a4a4a1b631bd6e3708442a73823d47
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
+AUX named.service-r2 326 BLAKE2B edfc1b9864fe5bcc2509b15319ba8f4d0c64bdb340b9d462ad5320d5faf74d7068cc601a48db0b1a07029bf12019823f25d672e0b62118088e2f48a6ebcb5ecc SHA512 755ea668286eed13baed20618e87916f7d1eea8fe95a909de84267fccf9bf6f64b8fb1be6f4da65d9bc9e87d604eeb409c2946f78ffce006284d2ec986873002
 DIST bind-9.16.48.tar.xz 5131176 BLAKE2B 4a503b45df412c435cb0f75b54ee1270140cccce7ecc159cdf3e0e3cbd3c0a0866b7472782f20aacf130f57df12d20a102ac6979498138ce00a2655806d003e7 SHA512 83829a5045e2a29dd2b491d3ab72b545f5664023fcd4aa205a44dbb7bcc5c737b4466c0d73f124b8d88fd33c56776871a07dde1ba0530d43eec8e7304a08d353
 DIST bind-9.16.48.tar.xz.asc 833 BLAKE2B 740ed58863ed3a7dee6ada4edd03cad5378ea0aa53cd6f071ca1911bb2d6b285ed292f32846790d42b97e8d9bb72588f1cd30c4e10557ac1e9f1df545923a9b1 SHA512 7bd813b5ab6f9677fc4ef21e0c3930f6319fa6c49d6869570794bc28212fe8935b72f9f217cfce692a2dec9ec29994f345d1b1145cef1ca976c5361f6ce0f75d
 DIST bind-9.16.50.tar.xz 5134620 BLAKE2B 0464d1e246d0a5c39e20faf733b7f4ee21d192cc0ccce5bba2a22ae4303c82005ccfb319fe2da51872c7258852a747984d7327c70dec08414ab2d194c412199b SHA512 7627e0606ac389343046fa9d1ca789ed732b3c8d99e83ba6f59593f816cebc0b2ebd319c2812ac1f604c68f5115bbc281d432036c0d31bbe489ee2d678374213
@@ -18,6 +19,6 @@ DIST bind-9.16.50.tar.xz.asc 833 BLAKE2B 7eabf67b96d1fc94ec096adf1b4d075c370b603
 DIST bind-9.18.29.tar.xz 5562720 BLAKE2B f3e7de6936362bcce4993e401ed8fdd9d597459e82ad908a918fff1da619f91ef4896595ea210b43f2b492d763d7be2b71105495858da55431b60874c7fd2312 SHA512 6c2676e2e2cb90f3bd73afb367813c54d1c961e12df1e12e41b9d0ee5a1d5cdf368d81410469753eaef37e43358b56796f078f3b2f20c3b247c4bef91d56c716
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.48.ebuild 11767 BLAKE2B 25623859c196a70b2f32726d187e3d6d041add334d89ab69a9ab97e0d5bf3bd70bef147d45704273a927871b74c14f6e15cc3d9e2f8a1b385eb91b5ac60b4146 SHA512 d5535d9e56c2bf8db6101d0618c7da1f899b2a41b39b85455102202f5a693c6bde2058993808d8633578c9a14d9a9944fc2a3db7a78f37829a97fd2417d61444
-EBUILD bind-9.16.50.ebuild 11774 BLAKE2B ab24d2f2d762add29472d74766573ae533932e615623e7345a23eda7c643740e6f1c44ac5fa67f63eadb1f47769011cd09d81078627319921e8628ce7cf71c93 SHA512 dcb43005b9cffaf79b232b1256ae13de678db10dfbad2837c43b9673acdf3d017ea086728675791d46b80d30e139385aa9c35935ffcb82152df8df34a09a5f23
-EBUILD bind-9.18.29-r1.ebuild 7699 BLAKE2B 96d13da3199012ca71ec7e689082c3716d9abfa7a49caa13d873eba2f998176ab4254eb03f07b3f603fef60bf31d6c5c261a8450a10214fc497d2524a278a72d SHA512 2380b9e062893a803dc95e1d3beef9cf74ff3614bd9cef71534da682b8adf3892e75ce71041bd7cd67462a87cd6f6fd5cbe75d82bc9fb82f3c6f4239c97cf4c7
+EBUILD bind-9.16.50.ebuild 11773 BLAKE2B ac00cebdd991391f1e5d00566d768382ff7ae0213f3d89c1a0f07aecad86e0f51b9958a578d1cd44ea8b0e91941115081e358fe9f6f4614841c2a45d8ee044b2 SHA512 dcb80f44cfdbe162b625d704f017d75371240bc9773740d765d1079c419f6cc62e330758bdb78f6c7324b9ca182b5e81c92cafdcaec45004f2978e3d1d2eb262
+EBUILD bind-9.18.29-r2.ebuild 7698 BLAKE2B 2d47d88714f32158c5c15155b2a195da2deceab11019a1be73e6b5ea3787f758ee007973616046c9ffb348dff55c0ceb2fb0b0dcb6079fc8c7c40ea331631d12 SHA512 12a3a98b3a7db108ee192adf02812f3625e7c5aa1117a1c317b0f5485c043ad337c2b8666f7c2d6c22b4c9ad02e71a2b7c0a9a77f56c7b4f77963c1eb4c46a20
 MISC metadata.xml 915 BLAKE2B e415b3c30f15ba3e3d367dd28ed8dac1e6791fbec6b90ebd5881e217db11987365a8eb574b5e6f008e1228fb38aa461a85e7c45c3521e0a48fb6a4808b3b82ce SHA512 575d7c9992c1b3fd82a28cd5bbb585f568240f90dff5e00384c8ff4f937f582d37d2121fa35664b812192b20a16f2a44c196fb841e4fa3d4fd2c725900ac7d51
diff --git a/net-dns/bind/bind-9.16.50.ebuild b/net-dns/bind/bind-9.16.50.ebuild
index 94d369920eea..4ed4b7ee7847 100644
--- a/net-dns/bind/bind-9.16.50.ebuild
+++ b/net-dns/bind/bind-9.16.50.ebuild
@@ -38,7 +38,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug #602682
 IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi"
 IUSE+=" json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib"
diff --git a/net-dns/bind/bind-9.18.29-r1.ebuild b/net-dns/bind/bind-9.18.29-r2.ebuild
index 268786e54053..cbd163402fca 100644
--- a/net-dns/bind/bind-9.18.29-r1.ebuild
+++ b/net-dns/bind/bind-9.18.29-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+caps dnsrps dnstap doc doh fixed-rrset idn +jemalloc geoip gssapi lmdb selinux static-libs test xml"
+IUSE="+caps dnsrps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -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