From 9db3a59749e81b5ca1855f5aa36166699d83081f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 5 May 2021 12:28:48 +0300 Subject: [PATCH] =?UTF-8?q?net-dns/bind:=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20+=20sdb-ldap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net-dns/bind/Manifest | 1 + ....16.6-r4.ebuild => bind-9.16.12-r1.ebuild} | 19 ++++++++----------- 2 files changed, 9 insertions(+), 11 deletions(-) rename net-dns/bind/{bind-9.16.6-r4.ebuild => bind-9.16.12-r1.ebuild} (95%) diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index fdb61a4a2..8263b40b1 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -1,2 +1,3 @@ +DIST bind-9.16.12.tar.xz 5017756 BLAKE2B e48fe94432a93df1f7f61b2d7ecb596e82a156deab3ee8dd3f5f11139028d42f839c483200ca6954076dfb68e768353a0ceb0d360d9e1dff3e36cf5ad06e8c43 SHA512 001613bd3c8bfc73d60bf3c053b233233a981132206e1ae5847820c5416ba0d65b0e026817ea3a718c7d3745c28a8de8dd9fb4355344955bead7bc2e1433e074 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac diff --git a/net-dns/bind/bind-9.16.6-r4.ebuild b/net-dns/bind/bind-9.16.12-r1.ebuild similarity index 95% rename from net-dns/bind/bind-9.16.6-r4.ebuild rename to net-dns/bind/bind-9.16.12-r1.ebuild index 61aa1b07d..0ef903d6a 100644 --- a/net-dns/bind/bind-9.16.6-r4.ebuild +++ b/net-dns/bind/bind-9.16.12-r1.ebuild @@ -12,9 +12,9 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_COMPAT=( python3_{7..9} ) -inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use systemd +inherit python-r1 autotools toolchain-funcs flag-o-matic multilib db-use systemd MY_PV="${PV/_p/-P}" MY_PV="${MY_PV/_rc/rc}" @@ -36,7 +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 libressl lmdb mysql odbc postgres python selinux static-libs +json ldap lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib sdb-ldap" # sdb-ldap - patch broken # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 @@ -57,8 +57,8 @@ REQUIRED_USE=" DEPEND=" acct-group/named acct-user/named - !libressl? ( dev-libs/openssl:=[-bindist] ) - libressl? ( dev-libs/libressl:= ) + berkdb? ( sys-libs/db:= ) + dev-libs/openssl:=[-bindist] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) @@ -87,10 +87,6 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${MY_P}" PATCHES=( - # should fix https://bugs.gentoo.org/741162 taken from: - # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/4073 - "${FILESDIR}/bind-9.16.6-bug-741162.patch" - "${FILESDIR}/ldap-library-path-on-multilib-machines.patch" ) @@ -283,7 +279,7 @@ src_install() { fperms 0770 /var/log/named /var/bind/{,sec,dyn} systemd_newunit "${FILESDIR}/named.service-r1" named.service - systemd_dotmpfilesd "${FILESDIR}"/named.conf + dotmpfilesd "${FILESDIR}"/named.conf exeinto /usr/libexec doexe "${FILESDIR}/generate-rndc-key.sh" } @@ -298,7 +294,8 @@ python_install() { } pkg_postinst() { - if [ ! -f '/etc/bind/rndc.key' ]; then + 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