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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 669661382C5 for ; Sat, 29 May 2021 14:19:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0A7EE0809; Sat, 29 May 2021 14:19:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A782BE0809 for ; Sat, 29 May 2021 14:19:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8BDC340E07 for ; Sat, 29 May 2021 14:19:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DF2C59C for ; Sat, 29 May 2021 14:19:18 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1622297955.03b0458f99af0352b933bec57b7aff351f2c4480.zlogene@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.16.15.ebuild net-dns/bind/metadata.xml X-VCS-Directories: net-dns/bind/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 03b0458f99af0352b933bec57b7aff351f2c4480 X-VCS-Branch: master Date: Sat, 29 May 2021 14:19:18 +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: bd315fd0-f39b-424a-acc2-acd2e3da1063 X-Archives-Hash: fa7d365aab8aa660e48ee48241ad5d20 commit: 03b0458f99af0352b933bec57b7aff351f2c4480 Author: Mikle Kolyada gentoo org> AuthorDate: Sat May 29 14:18:18 2021 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sat May 29 14:19:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b0458f net-dns/bind: fix rndc keygen Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> net-dns/bind/bind-9.16.15.ebuild | 24 ++++-------------------- net-dns/bind/metadata.xml | 1 - 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/net-dns/bind/bind-9.16.15.ebuild b/net-dns/bind/bind-9.16.15.ebuild index 629ba6fe981..9fab32caeb8 100644 --- a/net-dns/bind/bind-9.16.15.ebuild +++ b/net-dns/bind/bind-9.16.15.ebuild @@ -36,8 +36,7 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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 -json ldap lmdb mysql odbc postgres python selinux static-libs -urandom xml +zlib" +json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib" # sdb-ldap - patch broken # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 @@ -281,16 +280,9 @@ python_install() { pkg_postinst() { tmpfiles_process "${FILESDIR}"/named.conf - if [ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]; then - if use urandom; then - einfo "Using /dev/urandom for generating rndc.key" - /usr/sbin/rndc-confgen -r /dev/urandom -a - echo - else - einfo "Using /dev/random for generating rndc.key" - /usr/sbin/rndc-confgen -a - echo - fi + if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then + einfo "Using /dev/urandom for generating rndc.key" + /usr/sbin/rndc-confgen -a chown root:named /etc/bind/rndc.key || die chmod 0640 /etc/bind/rndc.key || die fi @@ -363,14 +355,6 @@ pkg_config() { mknod ${CHROOT}/dev/zero c 1 5 || die chmod 0666 ${CHROOT}/dev/zero || die - if use urandom; then - mknod ${CHROOT}/dev/urandom c 1 9 || die - chmod 0666 ${CHROOT}/dev/urandom || die - else - mknod ${CHROOT}/dev/random c 1 8 || die - chmod 0666 ${CHROOT}/dev/random || die - fi - if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then cp -a /etc/bind ${CHROOT}/etc/ || die cp -a /var/bind ${CHROOT}/var/ || die diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml index e9cc55bb874..6bcb4fe262b 100644 --- a/net-dns/bind/metadata.xml +++ b/net-dns/bind/metadata.xml @@ -18,6 +18,5 @@ Enable gssapi support Enable JSON statistics channel Enable LMDB support to store configuration for 'addzone' zones - Use /dev/urandom instead of /dev/random