diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-04-30 12:55:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-04-30 12:55:03 +0100 |
commit | 03cc7efd31c3d3609e5e94dd73330a1def6851c7 (patch) | |
tree | aec77453939ee072436c1cf2aa88fffadba922d0 /net-dns/bind | |
parent | 9e65a38a260a44292ceb8a0bf4fea5f0b5666826 (diff) |
gentoo auto-resync : 30:04:2025 - 12:55:02edge
Diffstat (limited to 'net-dns/bind')
-rw-r--r-- | net-dns/bind/Manifest | 8 | ||||
-rw-r--r-- | net-dns/bind/bind-9.18.31-r1.ebuild | 6 | ||||
-rw-r--r-- | net-dns/bind/bind-9.20.7.ebuild | 4 | ||||
-rw-r--r-- | net-dns/bind/files/ldap-library-path-on-multilib-machines.patch | 13 | ||||
-rw-r--r-- | net-dns/bind/files/named.confd-r7 | 48 | ||||
-rw-r--r-- | net-dns/bind/files/named.init-r14 | 252 | ||||
-rw-r--r-- | net-dns/bind/files/named.service-r1 | 13 |
7 files changed, 11 insertions, 333 deletions
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index e3f3483da7c5..6daa25b0cab5 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -1,21 +1,17 @@ AUX 10bind.env 27 BLAKE2B e5ddb2daced1b9430cb8e4b691bc0f1164f71a6e2032fa4efd18b629a6aeb971336d5eaa38c6474a3143cb34691c22d4564ebb010d9efd00cf6e2634daa8e68c SHA512 8ae5326b158b8a3eeaab667c84dd712fefd25d10832598783fa497285183cbdee554796c22d32fec54cd00461469f29ed473a730304a00aacdf06c1bb6c33d55 AUX generate-rndc-key.sh 183 BLAKE2B 33f2297745ef8e5aed09107cee6d0017d3870ea9db249a17850ae7a55f613b03a136bc61b8ac4526858178a0f8713eabda6c5f30917415f9a3ad6b34668f45ab SHA512 6c611120185c1a61b2b6da228efc28302ebd36c819b97793920543ce2cfff4da84f43ec53ddd072f008b04c7087cc19108c4279cb962d12a7e073b47235d14ee -AUX ldap-library-path-on-multilib-machines.patch 431 BLAKE2B d067f241334742ec093af75e83e2b0678f04048b73e7f97e637b42fad301f48fa930b10ac4b8c24ea86c7fe011eb598e21ada7514b47b2c05a9c14feb8b1487b SHA512 9c668a117a5ae5fc8414eb545b4a69e40826982092190cdb36e67092c98f4c148ac749988da3ed6f9b32f6559e13046c50a77a7e307cd8bd6256d1f44ba44468 AUX localhost.zone-r3 426 BLAKE2B d34cf12d484c6bb705d3bd8bfbf93514e504497a99da983f6176234239cc664131502744f3cd743d938dec0309f0d8df2c1d0c5325b5cb61023ed192d32bbedd SHA512 979d8693046033c24490dca536f0d649795bbdf57eed32017b32d07d7d3c51b35197e4edd79d8258074a1bf14b71376472ba6ae749f62ceaf74d7a6a0559fa89 AUX named.cache-r4 3313 BLAKE2B 768056568cb440329234b335de5d5571901a272f70a13490f33b53d5b50e1af0c0b9115a15b81a0d93d61f23862dfb7f18ccf3362965cf401928fbb16f3cd3ae SHA512 eddbd04aa031ae6f87930107fb7a4995295f798f399d24e35ae1291188449f67291fddf2cc23624bbc09aa3993041eeac233e926770c4d4f553bdd52dd7c8592 AUX named.conf 32 BLAKE2B 15548145717b526be3d7898a0c2144a13e29b0595a3c27d220cc45646156cc8ddae954cb3b3907ca845765fc8ce30508d8e570c0a492b965027531a0f6df43ac SHA512 c344fd4949eb80114d0c157517ece3f4b9505b94e3de00489d4b2b23beb74612f38cf3443f2f3b98fe01d98ad1842f45ff1d1826d67937e72e4629bbdf683a59 AUX named.conf-r8 4020 BLAKE2B beb900a89be0f2acc1b08a8d29443c87b098e5ac1f1de9c63b22f6f50df2644d583d4fc504f55710f6549142bf6bfaa7c9fb3097202276135b9bbdb69af32f90 SHA512 60ab117e488604810a6e42a627eae465f6241208e726e763127f84102d05a661cceeddd00bc9d8d92c3da7d73d034ef876ace6744a0516b2bcadbaff1d9c82ad AUX named.conf.auth 625 BLAKE2B 492bc2381d0740d454f9aed0d37eb5c5ddd610fac09d0eae834fef9ffc7a5a86d055ed85247fd4aa2188e92f5f23e14a16de19512483895b269248727fc42b29 SHA512 9f9cb297c366cbb209eff66a6aa7ca2833c606077302df98e767c126897b2c249567141c03931708abfe609d4e05b28faa047a51339a293c8b8d2b923ebb28e6 -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 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.18.29.tar.xz 5562720 BLAKE2B f3e7de6936362bcce4993e401ed8fdd9d597459e82ad908a918fff1da619f91ef4896595ea210b43f2b492d763d7be2b71105495858da55431b60874c7fd2312 SHA512 6c2676e2e2cb90f3bd73afb367813c54d1c961e12df1e12e41b9d0ee5a1d5cdf368d81410469753eaef37e43358b56796f078f3b2f20c3b247c4bef91d56c716 DIST bind-9.18.31.tar.xz 5385812 BLAKE2B e069ab3caab887a87220b54804e5b19a4c21b8d3e4e8f1bc6a7135b3990a228d6c48b1ca4a22c75242485275eff1de145a9aff89addf81124e7dfcafd8ab30cf SHA512 e51873484be3ee367eb1e601b8e0adc45abcdb16df04021ea42ffcc51b99821f8b30f67b2a693a90ad3efa51698a651c8da9d7947ee8fa19680f627afe1f7034 DIST bind-9.20.7.tar.xz 5655168 BLAKE2B c5198939382e7295b4dfcb2ddbd86e5bccc10047d5e963dab2381404eb7a14543218e3caa438b395a2982cb607da84012f3a76a41c790a48ed615238bc080b5c SHA512 b9570c0c6588819108017d30dc7fb5e2f34361f941186d29da3d2830bbe3333c8c16bdb6581f5bec4786d90b74db860a9cad5f66d4f1c65168eae69f401a9df0 EBUILD bind-9.18.29-r2.ebuild 8059 BLAKE2B 83177d8730b434be0b85d40e66c10bc4da90b3cdc542c096d0146df4908b349fdbad80e0116e3255a74e4004a9a3f0aa70a7cfa8b11a13f6d6aa0dcd701d8f71 SHA512 d1668e8f437b869cab9bffe27dd2ab9d5965bbdec1046c39f42dc96c19243a3b8d735b754d42983612ae5e8863fb8a83d0e487cc876e929a3cc250cda6fe5438 -EBUILD bind-9.18.31-r1.ebuild 8157 BLAKE2B 8c8c8f73b8256ccab95976e352ace4a91963b1984a4672a91131d34cbc05f1e77c9323a56725e1198b9efb20e8db7fc0018ced91283339bc95ea0050b4ea3d31 SHA512 cd511adc466572116ffad991cf918ef5ead59f87f09b16c5af72d0b2f40dcba5faf61e2242dd3df4f0ce5b4be621fcecd54a65d777cd70fe509d79271a75cb3a -EBUILD bind-9.20.7.ebuild 7951 BLAKE2B 4ca102e01d0cb5ebab982398ae1c4a8cc45a4c7db222cc019834895c055507d4e558c70a5a819b1384b9bc8370efd1853851224df717ea2d0d4cbf68308a552d SHA512 067621bbf40d8a7b8d534efbae93b366659553aeeaa2b76fe499f44a6fb2d8c0dfb8967d223172c0bafee027eb96430e58fee788c5311f0e439f79fc7d2a571b +EBUILD bind-9.18.31-r1.ebuild 8329 BLAKE2B cdad92e9a815966e8bda81dc01a5b033147ba2b61ef0a968a683b68ca39a687a80e573d4e5023b5d9ae513493ab9a9b6e22f83df406f115b56531f2daa0540f3 SHA512 54afd15bf87a1847acf7daf58da9b7bd14d915e1d6c63fa08925a4ff99973ca54ce8eb284b1e90d63ba7a747e25f41500024920f40e87e03882956be09029e24 +EBUILD bind-9.20.7.ebuild 8127 BLAKE2B a3a7bc50554eaf6e48400baff6a9aab3a75f512300a33fe2e4301bcbf7568459a4c276e9c2c9e58c30c50d2c4a30efb3c8376bc9da07bf13715986d81505cafa SHA512 15d287a6b2f76d8d2706e5af721cc58963ace6d573404cfdfe3ab9bec0d47b464f4e9b121e98bca539d2e34b7fade475d33ab40f181781b7f158a2a5f5b461e6 MISC metadata.xml 721 BLAKE2B 2e4f2ec16173bbaca9fed8a590aa3d43595758e3ee77f0f6d3967a7fbf39a80817880d92c32d723a71c85c3826a504037d2a048be9714663ff6a9b6ac6bae3d5 SHA512 6045c978309645a93dc761dff06886718c8f0337478a8c408d50811a0b90df4cc4b2bc94c64d30455e0262c7452ef01b8f51276bd14bea8f9276251a1288ada4 diff --git a/net-dns/bind/bind-9.18.31-r1.ebuild b/net-dns/bind/bind-9.18.31-r1.ebuild index 7a4542ff6000..8d0a0b08e6d5 100644 --- a/net-dns/bind/bind-9.18.31-r1.ebuild +++ b/net-dns/bind/bind-9.18.31-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+caps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml" RESTRICT="!test? ( test )" @@ -66,6 +66,10 @@ src_prepare() { } src_configure() { + # configure automagically uses sphinx even if prebuilt man pages + # are available. Force fallback to prebuilt ones. + use doc || export ac_cv_path_SPHINX_BUILD= SPHINX_BUILD= + local myeconfargs=( --prefix="${EPREFIX}"/usr --sysconfdir="${EPREFIX}"/etc/bind diff --git a/net-dns/bind/bind-9.20.7.ebuild b/net-dns/bind/bind-9.20.7.ebuild index 097857a4740c..a19f5a14882c 100644 --- a/net-dns/bind/bind-9.20.7.ebuild +++ b/net-dns/bind/bind-9.20.7.ebuild @@ -64,6 +64,10 @@ src_prepare() { } src_configure() { + # configure automagically uses sphinx even if prebuilt man pages + # are available. Force fallback to prebuilt ones. + use doc || export ac_cv_path_SPHINX_BUILD= SPHINX_BUILD= + local myeconfargs=( --prefix="${EPREFIX}"/usr --sysconfdir="${EPREFIX}"/etc/bind diff --git a/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch b/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch deleted file mode 100644 index 5286c72f11be..000000000000 --- a/net-dns/bind/files/ldap-library-path-on-multilib-machines.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in -index f769cf1..721d480 100644 ---- a/contrib/dlz/config.dlz.in -+++ b/contrib/dlz/config.dlz.in -@@ -396,7 +396,7 @@ case "$use_dlz_ldap" in - *) - DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver, - [-I$use_dlz_ldap/include], -- [-L$use_dlz_ldap/lib -lldap -llber]) -+ [-lldap -llber]) - - AC_MSG_RESULT( - [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include]) diff --git a/net-dns/bind/files/named.confd-r7 b/net-dns/bind/files/named.confd-r7 deleted file mode 100644 index 477a4806151d..000000000000 --- a/net-dns/bind/files/named.confd-r7 +++ /dev/null @@ -1,48 +0,0 @@ -# Set various named options here. -# -#OPTIONS="" - -# Set this to the number of processors you want bind to use. -# Leave this unchanged if you want bind to automatically detect the number -#CPU="1" - -# If you wish to run bind in a chroot: -# 1) un-comment the CHROOT= assignment, below. You may use -# a different chroot directory but MAKE SURE it's empty. -# 2) run: emerge --config =<bind-version> -# -#CHROOT="/chroot/dns" - -# Uncomment to enable binmount of /usr/share/GeoIP -#CHROOT_GEOIP="1" - -# Uncomment the line below to avoid that the init script mounts the needed paths -# into the chroot directory. -# You have to copy all needed config files by hand if you say CHROOT_NOMOUNT="1". -#CHROOT_NOMOUNT="1" - -# Uncomment this option if you have setup your own chroot environment and you -# don't want/need the chroot consistency check -#CHROOT_NOCHECK=1 - -# Default pid file location -PIDFILE="${CHROOT}/run/named/named.pid" - -# Scheduling priority: 19 is the lowest and -20 is the highest. -# Default: 0 -#NAMED_NICELEVEL="0" - -# Uncomment rc_named_use/rc_named_after for the database you need. -# Its necessary to ensure the database backend will be started before named. - -# MySQL -#rc_named_use="mysql" -#rc_named_after="mysql" - -# PostgreSQL -#rc_named_use="pg_autovacuum postgresql" -#rc_named_after="pg_autovacuum postgresql" - -# LDAP -#rc_named_use="ldap" -#rc_named_after="ldap" diff --git a/net-dns/bind/files/named.init-r14 b/net-dns/bind/files/named.init-r14 deleted file mode 100644 index ff6ab216abc1..000000000000 --- a/net-dns/bind/files/named.init-r14 +++ /dev/null @@ -1,252 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="checkconfig checkzones" -extra_started_commands="reload" - -depend() { - need net - use logger - provide dns -} - -NAMED_CONF=${CHROOT}/etc/bind/named.conf - -OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0} -MOUNT_CHECK_TIMEOUT=${MOUNT_CHECK_TIMEOUT:-60} - -_mount() { - local from - local to - local opts - local ret=0 - - if [ "${#}" -lt 3 ]; then - eerror "_mount(): to few arguments" - return 1 - fi - - from=$1 - to=$2 - shift 2 - - opts="${*}" - shift $# - - if [ -z "$(awk "\$2 == \"${to}\" { print \$2 }" /proc/mounts)" ]; then - einfo "mounting ${from} to ${to}" - mount ${from} ${to} ${opts} - ret=$? - - eend $ret - return $ret - fi - - return 0 -} - -_umount() { - local dir=$1 - local ret=0 - - if [ -n "$(awk "\$2 == \"${dir}\" { print \$2 }" /proc/mounts)" ]; then - ebegin "umounting ${dir}" - umount ${dir} - ret=$? - - eend $ret - return $ret - fi - - return 0 -} - -_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) - [ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/run/named/named.pid -} - -check_chroot() { - if [ -n "${CHROOT}" ]; then - [ ! -d "${CHROOT}" ] && return 1 - [ ! -d "${CHROOT}/dev" ] || [ ! -d "${CHROOT}/etc" ] || [ ! -d "${CHROOT}/var" ] && return 1 - [ ! -d "${CHROOT}/run" ] || [ ! -d "${CHROOT}/var/log" ] && return 1 - [ ! -d "${CHROOT}/etc/bind" ] || [ ! -d "${CHROOT}/var/bind" ] && return 1 - [ ! -d "${CHROOT}/var/log/named" ] && return 1 - [ ! -c "${CHROOT}/dev/null" ] || [ ! -c "${CHROOT}/dev/zero" ] && return 1 - [ ! -c "${CHROOT}/dev/urandom" ] && return 1 - [ "${CHROOT_GEOIP:-0}" -eq 1 ] && [ ! -d "${CHROOT}/usr/share/GeoIP" ] && return 1 - if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then - if [ -d "/usr/lib64" ]; then - [ ! -d "${CHROOT}/usr/lib64/engines" ] && return 1 - elif [ -d "/usr/lib" ]; then - [ ! -d "${CHROOT}/usr/lib/engines" ] && return 1 - fi - fi - fi - - return 0 -} - -checkconfig() { - ebegin "Checking named configuration" - - if [ ! -f "${NAMED_CONF}" ] ; then - eerror "No ${NAMED_CONF} file exists!" - return 1 - fi - - /usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || { - eerror "named-checkconf failed! Please fix your config first." - return 1 - } - - eend 0 - return 0 -} - -checkzones() { - ebegin "Checking named configuration and zones" - /usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} - eend $? -} - -start() { - local piddir - - ebegin "Starting ${CHROOT:+chrooted }named" - - if [ -n "${CHROOT}" ]; then - if [ ${CHROOT_NOCHECK:-0} -eq 0 ]; then - check_chroot || { - eend 1 - eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first" - return 1 - } - fi - - if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then - if [ ! -e /usr/lib/engines/libgost.so ]; then - eend 1 - eerror "Couldn't find /usr/lib/engines/libgost.so but bind has been built with openssl and libgost support" - return 1 - fi - cp -Lp /usr/lib/engines/libgost.so "${CHROOT}/usr/lib/engines/libgost.so" || { - eend 1 - eerror "Couldn't copy /usr/lib/engines/libgost.so into '${CHROOT}/usr/lib/engines/'" - return 1 - } - fi - cp -Lp /etc/localtime "${CHROOT}/etc/localtime" - - if [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then - einfo "Mounting chroot dirs" - _mount /etc/bind ${CHROOT}/etc/bind -o bind - _mount /var/bind ${CHROOT}/var/bind -o bind - _mount /var/log/named ${CHROOT}/var/log/named -o bind - if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then - _mount /usr/share/GeoIP ${CHROOT}/usr/share/GeoIP -o bind - fi - fi - - # On initial startup, if piddir inside the chroot /var/run/named - # Then the .../var/run part might not exist yet - checkpath -q -d -o root:root -m 0755 "${piddir}/.." - fi - - checkconfig || { eend 1; return 1; } - - # create piddir (usually /run/named) if necessary, bug 334535 - _get_pidfile - piddir="${PIDFILE%/*}" - checkpath -q -d -o root:named -m 0770 "${piddir}" || { - eerror "Failed to create PID directory at $piddir" - eend 1 - return 1 - } - - # In case someone have $CPU set in /etc/conf.d/named - if [ -n "${CPU}" ] && [ "${CPU}" -gt 0 ]; then - CPU="-n ${CPU}" - fi - - start-stop-daemon --start --pidfile ${PIDFILE} \ - --nicelevel ${NAMED_NICELEVEL:-0} \ - --exec /usr/sbin/named \ - -- -u named ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT} - eend $? -} - -stop() { - local reported=0 - - ebegin "Stopping ${CHROOT:+chrooted }named" - - # Workaround for now, until openrc's restart has been fixed. - # openrc doesn't care about a restart() function in init scripts. - if [ "${RC_CMD}" = "restart" ]; then - if [ -n "${CHROOT}" -a ${CHROOT_NOCHECK:-0} -eq 0 ]; then - check_chroot || { - eend 1 - eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first" - return 1 - } - fi - - checkconfig || { eend 1; return 1; } - fi - - # -R 10, bug 335398 - _get_pidfile - start-stop-daemon --stop --retry 10 --pidfile $PIDFILE \ - --exec /usr/sbin/named - - if [ -n "${CHROOT}" ] && [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then - ebegin "Umounting chroot dirs" - - # just to be sure everything gets clean - while fuser -s ${CHROOT} 2>/dev/null; do - if [ "${reported}" -eq 0 ]; then - einfo "Waiting until all named processes are stopped (max. ${MOUNT_CHECK_TIMEOUT} seconds)" - elif [ "${reported}" -eq "${MOUNT_CHECK_TIMEOUT}" ]; then - eerror "Waiting until all named processes are stopped failed!" - eend 1 - break - fi - sleep 1 - reported=$((reported+1)) - done - - [ "${CHROOT_GEOIP:-0}" -eq 1 ] && _umount ${CHROOT}/usr/share/GeoIP - _umount ${CHROOT}/etc/bind - _umount ${CHROOT}/var/log/named - _umount ${CHROOT}/var/bind - fi - - eend $? -} - -reload() { - local ret - - ebegin "Reloading named.conf and zone files" - - checkconfig || { eend 1; return 1; } - - _get_pidfile - if [ -n "${PIDFILE}" ]; then - start-stop-daemon --pidfile $PIDFILE --signal HUP - ret=$? - else - ewarn "Unable to determine the pidfile... this is" - ewarn "a fallback mode. Please check your installation!" - - $RC_SERVICE restart - ret=$? - fi - - eend $ret -} diff --git a/net-dns/bind/files/named.service-r1 b/net-dns/bind/files/named.service-r1 deleted file mode 100644 index 65fbdb941ca0..000000000000 --- a/net-dns/bind/files/named.service-r1 +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Internet domain name server -After=network.target - -[Service] -ExecStartPre=/usr/libexec/generate-rndc-key.sh -ExecStartPre=/usr/sbin/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 |