summaryrefslogtreecommitdiff
path: root/net-dns
diff options
context:
space:
mode:
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/Manifest.gzbin9376 -> 9368 bytes
-rw-r--r--net-dns/bind-tools/Manifest10
-rw-r--r--net-dns/bind-tools/bind-tools-9.14.4.ebuild1
-rw-r--r--net-dns/bind-tools/bind-tools-9.14.5.ebuild1
-rw-r--r--net-dns/bind-tools/bind-tools-9.14.6.ebuild138
-rw-r--r--net-dns/bind-tools/bind-tools-9.15.2.ebuild1
-rw-r--r--net-dns/bind-tools/bind-tools-9.15.3.ebuild139
-rw-r--r--net-dns/bind/Manifest10
-rw-r--r--net-dns/bind/bind-9.14.4.ebuild1
-rw-r--r--net-dns/bind/bind-9.14.5.ebuild1
-rw-r--r--net-dns/bind/bind-9.14.6.ebuild373
-rw-r--r--net-dns/bind/bind-9.15.2.ebuild25
-rw-r--r--net-dns/bind/bind-9.15.3.ebuild380
-rw-r--r--net-dns/dnscap/Manifest5
-rw-r--r--net-dns/dnscap/dnscap-0_p20130814.ebuild24
-rw-r--r--net-dns/dnscap/dnscap-1.10.2.ebuild26
-rw-r--r--net-dns/dnscap/files/dnscap-0_p20130814.install.patch22
-rw-r--r--net-dns/dnsmasq/Manifest4
-rw-r--r--net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild2
-rw-r--r--net-dns/dnsmasq/dnsmasq-2.80.ebuild1
-rw-r--r--net-dns/ldns-utils/Manifest4
-rw-r--r--net-dns/ldns-utils/ldns-utils-1.7.1.ebuild66
-rw-r--r--net-dns/ldns-utils/metadata.xml2
23 files changed, 1164 insertions, 72 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 6ae46d61e444..f337c2eb97a9 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
Binary files differ
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 696ee03f7c74..4ef5d607d145 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,8 +1,12 @@
AUX sparc-pause-instruction.patch 4109 BLAKE2B e0a705c5b29033f54ae5d707a0159d8814fb15be4fdc33f91834f2aa50c3c37ca2d653d17222f16bb4e45f8d2e6a983f15ef70ebcd07f579426d3d97b5d78ecf SHA512 590fa784999692700db796291236ce9436e775b16cb737f853d2b5e0b9433f2993682edad2e9f25be140d6fe00edc3768947670a404079b603f8e93651d6da84
DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084
+DIST bind-9.14.6.tar.gz 6314291 BLAKE2B f114cf3516e863656d1b0f3bbc634c5b5f5c539ffa4591cbe09f7cc1e26f30b0bff2d4913297b73304387944ba249b847b7983d4279d625645ec64387a0121ed SHA512 129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366
DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646
-EBUILD bind-tools-9.14.4.ebuild 3195 BLAKE2B d1c2e157df3e38c512e3fddc3c6da2149b960cd4ea68e7127463e8518cc681b7a872b7500c0e6bdec9c9d9739d115c4289907a39ab4b5787504d1b43a6ca834d SHA512 180240d41e9bc9d9057ecc19d5d82886f7dd5e0f80f5841d9371b44048904322fb9a985633a20b0e1a1faef15ef74ae9fd8d0e1b34ea9b5dbc316f7c22005b62
-EBUILD bind-tools-9.14.5.ebuild 3148 BLAKE2B 5399c325ed33fc10c9aeb2bd1c2a2e5cbecbc5beee693b8fbdf4620aba7fec57764636f6ba99600599f91cbf6c9266b9701d3c0eece2590f841df38847320c59 SHA512 5d5ae428ae45da3e7af8b7d657054025858af9ce08dec4fa1098d7446f1bee09ce5bc5968937c2d1196d8a494ff78ad938b0bedb0f1ff45bae9f7ce466295f6e
-EBUILD bind-tools-9.15.2.ebuild 2930 BLAKE2B a08144a58d307eef0ad98ce59b91f8dd2f439f982132df6cab8b3c2f23c652a0333b307beba6e21966b23681ca4462a43ad7ab27da88f0b0490b07e1d14278be SHA512 a5b22961bc788d1b2b89c8ae16722675ff193ef0089cd9c7956d100f1dd38cc0888b01e32a0b85ec9fff43eeff5ffe7875b8b7ed807853f90b51170fcb06271e
+DIST bind-9.15.3.tar.gz 6296471 BLAKE2B 30815330f4273b7b6df34857fdd7d03490e03e3d340986c01c1d382927480bcd6c01cefdb689c7c397cbb1495b1f06503dbeb425a823a5c676211d45b7b6663a SHA512 2c594c48f1e06c6ab2e0977473fbdb8d3bdbf089bc5c727424510f1bec3fc6dac9a21206724e886f6a88d1e8098aa3b03aed226a92ae91a6c7f3528187288cc0
+EBUILD bind-tools-9.14.4.ebuild 3229 BLAKE2B cb70c1a055c7a51fd1be5ce461fc50f327ac7f283f46cc07c5687b90dd82667d3e5aa205590031d80fddb3ffa9eebd560995fcebdde05511a75b93465b2bd84f SHA512 81fa51660bb87b57a013d075275cad7efaa373c8896eeb4069991a2470318d4b8f32a6e8af8646062a477d38e5ae764ef8cdffc4eb1fc843ddc6c6d10dade19a
+EBUILD bind-tools-9.14.5.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908
+EBUILD bind-tools-9.14.6.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908
+EBUILD bind-tools-9.15.2.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8
+EBUILD bind-tools-9.15.3.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8
MISC metadata.xml 488 BLAKE2B 44d0112102447f6d6f8c76aa5e3018de5fc4746240a1a7f187cb7bc493e9a442812c5b0f1c4a8a0a3410af12fbd2e390f6291c981440840b42348f403a278e2c SHA512 ac2a79f4622fd4aa957f9ad0618c631d4c68497443015bbd12c1670576d4515649f26c39c555046771b2aadd5f9b53fdc4c478ba7fb07e24f06b3a4f30f071e0
diff --git a/net-dns/bind-tools/bind-tools-9.14.4.ebuild b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
index fd6ff9184d41..31924994d66e 100644
--- a/net-dns/bind-tools/bind-tools-9.14.4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
@@ -67,6 +67,7 @@ src_configure() {
--without-libjson
--without-zlib
--without-lmdb
+ --with-openssl="${EPREFIX}"/usr
$(use_with idn libidn2)
$(use_with xml libxml2)
$(use_with gssapi)
diff --git a/net-dns/bind-tools/bind-tools-9.14.5.ebuild b/net-dns/bind-tools/bind-tools-9.14.5.ebuild
index cccff23c8588..135ea809d2a3 100644
--- a/net-dns/bind-tools/bind-tools-9.14.5.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.5.ebuild
@@ -65,6 +65,7 @@ src_configure() {
--without-libjson
--without-zlib
--without-lmdb
+ --with-openssl="${EPREFIX}"/usr
$(use_with idn libidn2)
$(use_with xml libxml2)
$(use_with gssapi)
diff --git a/net-dns/bind-tools/bind-tools-9.14.6.ebuild b/net-dns/bind-tools/bind-tools-9.14.6.ebuild
new file mode 100644
index 000000000000..135ea809d2a3
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.14.6.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+COMMON_DEPEND="
+ caps? ( sys-libs/libcap )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ xml? ( dev-libs/libxml2 )
+ idn? ( net-dns/libidn2:= )
+ gssapi? ( virtual/krb5 )
+ libedit? ( dev-libs/libedit )
+ !libedit? (
+ readline? ( sys-libs/readline:0= )
+ )"
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_EPEND}
+ !<net-dns/bind-9.10.2"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+ default
+
+ export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+ # Disable tests for now, bug 406399
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+ # bug #220361
+ rm aclocal.m4 || die
+ rm -rf libtool.m4/ || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --localstatedir="${EPREFIX}"/var
+ --without-python
+ --without-libjson
+ --without-zlib
+ --without-lmdb
+ --with-openssl="${EPREFIX}"/usr
+ $(use_with idn libidn2)
+ $(use_with xml libxml2)
+ $(use_with gssapi)
+ $(use_with readline)
+ $(use_enable caps linux-caps)
+ )
+
+ # bug 607400
+ if use libedit ; then
+ myeconfargs+=( --with-readline=-ledit )
+ elif use readline ; then
+ myeconfargs+=( --with-readline=-lreadline )
+ else
+ myeconfargs+=( --without-readline )
+ fi
+
+ # bug 344029
+ append-cflags "-DDIG_SIGCHASE"
+
+ # to expose CMSG_* macros from sys/sockets.h
+ [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+ # localstatedir for nsupdate -l, bug 395785
+ tc-export BUILD_CC
+ econf "${myeconfargs[@]}"
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+ local AR=$(tc-getAR)
+
+ emake AR="${AR}" -C lib/
+ emake AR="${AR}" -C bin/delv/
+ emake AR="${AR}" -C bin/dig/
+ emake AR="${AR}" -C bin/nsupdate/
+ emake AR="${AR}" -C bin/dnssec/
+}
+
+src_install() {
+ dodoc README CHANGES
+
+ cd "${S}"/bin/delv || die
+ dobin delv
+ doman delv.1
+
+ cd "${S}"/bin/dig || die
+ dobin dig host nslookup
+ doman {dig,host,nslookup}.1
+
+ cd "${S}"/bin/nsupdate || die
+ dobin nsupdate
+ doman nsupdate.1
+ if use doc; then
+ docinto html
+ dodoc nsupdate.html
+ fi
+
+ cd "${S}"/bin/dnssec || die
+ for tool in dsfromkey importkey keyfromlabel keygen \
+ revoke settime signzone verify; do
+ dobin dnssec-"${tool}"
+ doman dnssec-"${tool}".8
+ if use doc; then
+ docinto html
+ dodoc dnssec-"${tool}".html
+ fi
+ done
+}
diff --git a/net-dns/bind-tools/bind-tools-9.15.2.ebuild b/net-dns/bind-tools/bind-tools-9.15.2.ebuild
index cb870329d1a3..5a710f6efc50 100644
--- a/net-dns/bind-tools/bind-tools-9.15.2.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.15.2.ebuild
@@ -66,6 +66,7 @@ src_configure() {
--without-libjson
--without-zlib
--without-lmdb
+ --with-openssl="${EPREFIX}"/usr
$(use_with idn libidn2)
$(use_with xml libxml2)
$(use_with gssapi)
diff --git a/net-dns/bind-tools/bind-tools-9.15.3.ebuild b/net-dns/bind-tools/bind-tools-9.15.3.ebuild
new file mode 100644
index 000000000000..5a710f6efc50
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.15.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+COMMON_DEPEND="
+ caps? ( sys-libs/libcap )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ xml? ( dev-libs/libxml2 )
+ idn? ( net-dns/libidn2:= )
+ gssapi? ( virtual/krb5 )
+ libedit? ( dev-libs/libedit )
+ !libedit? (
+ readline? ( sys-libs/readline:0= )
+ )"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ !<net-dns/bind-9.10.2"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+ default
+
+ export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+ # Disable tests for now, bug 406399
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+ # bug #220361
+ rm aclocal.m4 || die
+ rm -rf libtool.m4/ || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --localstatedir="${EPREFIX}"/var
+ --without-python
+ --without-libjson
+ --without-zlib
+ --without-lmdb
+ --with-openssl="${EPREFIX}"/usr
+ $(use_with idn libidn2)
+ $(use_with xml libxml2)
+ $(use_with gssapi)
+ $(use_with readline)
+ $(use_enable caps linux-caps)
+ )
+
+ # bug 607400
+ if use libedit ; then
+ myeconfargs+=( --with-readline=-ledit )
+ elif use readline ; then
+ myeconfargs+=( --with-readline=-lreadline )
+ else
+ myeconfargs+=( --without-readline )
+ fi
+
+ # bug 344029
+ append-cflags "-DDIG_SIGCHASE"
+
+ # to expose CMSG_* macros from sys/sockets.h
+ [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+ # localstatedir for nsupdate -l, bug 395785
+ tc-export BUILD_CC
+ econf "${myeconfargs[@]}"
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+ local AR=$(tc-getAR)
+
+ emake AR="${AR}" -C lib/
+ emake AR="${AR}" -C bin/delv/
+ emake AR="${AR}" -C bin/dig/
+ emake AR="${AR}" -C bin/nsupdate/
+ emake AR="${AR}" -C bin/dnssec/
+}
+
+src_install() {
+ dodoc README CHANGES
+
+ cd "${S}"/bin/delv || die
+ dobin delv
+ doman delv.1
+
+ cd "${S}"/bin/dig || die
+ dobin dig host nslookup
+ doman {dig,host,nslookup}.1
+
+ cd "${S}"/bin/nsupdate || die
+ dobin nsupdate
+ doman nsupdate.1
+ if use doc; then
+ docinto html
+ dodoc nsupdate.html
+ fi
+
+ cd "${S}"/bin/dnssec || die
+ for tool in dsfromkey importkey keyfromlabel keygen \
+ revoke settime signzone verify; do
+ dobin dnssec-"${tool}"
+ doman dnssec-"${tool}".8
+ if use doc; then
+ docinto html
+ dodoc dnssec-"${tool}".html
+ fi
+ done
+}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index c5d06852a638..f1d6fa144e36 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -9,9 +9,13 @@ AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d950383
AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084
+DIST bind-9.14.6.tar.gz 6314291 BLAKE2B f114cf3516e863656d1b0f3bbc634c5b5f5c539ffa4591cbe09f7cc1e26f30b0bff2d4913297b73304387944ba249b847b7983d4279d625645ec64387a0121ed SHA512 129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366
DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646
+DIST bind-9.15.3.tar.gz 6296471 BLAKE2B 30815330f4273b7b6df34857fdd7d03490e03e3d340986c01c1d382927480bcd6c01cefdb689c7c397cbb1495b1f06503dbeb425a823a5c676211d45b7b6663a SHA512 2c594c48f1e06c6ab2e0977473fbdb8d3bdbf089bc5c727424510f1bec3fc6dac9a21206724e886f6a88d1e8098aa3b03aed226a92ae91a6c7f3528187288cc0
DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.14.4.ebuild 11612 BLAKE2B ec1aed9cca707a5bf5248dbf0d7be564b68c4ca011235799dca4621827b35f19f5ede9a161b4caf3e0bf2f2790d3d2ee708b40bc96026a58fc27badd6891d5ba SHA512 acc4a3b1eea4fa388f3220f360433217a6697bd4d142d83d4bb6f05ed73edeebb14a6c0c94f112c635f2daad0421663ba931f682de6a90a0c8a0c82512296b78
-EBUILD bind-9.14.5.ebuild 11321 BLAKE2B d7dedb82cfa5ef77f53715e24e100e2c1add21ceb03607126e4a8fcc99ffcfe0b08f57b9296f7811186882c3d12a9f247accb78049d584f247d1a31a229f5c11 SHA512 5476cecbcc8198e6b57a33b8092cf02b495fb2259af9ebec0e8b79ae0e61f6323e30bbbed67b1247349bc358839785ec7a306eaca3297ccfb801c2b0de8b4bc4
-EBUILD bind-9.15.2.ebuild 11417 BLAKE2B 89c03b4ef7bb016be184503812513e270fd6608d6121525f241e60dcec1131c8206179ecc28fd152c1ec529c490ee8e13539b48b2c897cd0f9b6e219c916746a SHA512 298b38b6701f10d07d9860b6fdeafca10c46711b0a97520ca8b80d21e96dd6b9319114f86dab9a1002781b9b8344d19c676100ee0ca482540c73de408a182454
+EBUILD bind-9.14.4.ebuild 11646 BLAKE2B 8112eb9963f76aeab8b708d1f859fb23fb9bdca794c5608dd62f97f616f2344288e895ef3b2d4201ee8efb14d935b73d38808b03efcba364f27c610e3d56990c SHA512 1318ea4e198956c1f28cddb2d5ed05b8583f02b4d03bc006183341690e19213f29f3a9f514a70e2ed2c22c969f4dfe35cbf3b32e7cd55a7ffb2d0008d565b213
+EBUILD bind-9.14.5.ebuild 11355 BLAKE2B cfecd5bcd818c0d877d2e9fac5936351ce5d445a06c5f07e18ed22f0125bdb7054d9b6abe64f6ad42f0f2abe8d4daaffb1ff95b6d72ff5f80e3556468b934936 SHA512 b948632349e8ff57fb252396b78fca62acb7bbab2d28d5128cc9d7700df5f1ab570f101026c8a518512c7747fe904af40fbfc01f158f6e81395c69169c2c5c02
+EBUILD bind-9.14.6.ebuild 11355 BLAKE2B cfecd5bcd818c0d877d2e9fac5936351ce5d445a06c5f07e18ed22f0125bdb7054d9b6abe64f6ad42f0f2abe8d4daaffb1ff95b6d72ff5f80e3556468b934936 SHA512 b948632349e8ff57fb252396b78fca62acb7bbab2d28d5128cc9d7700df5f1ab570f101026c8a518512c7747fe904af40fbfc01f158f6e81395c69169c2c5c02
+EBUILD bind-9.15.2.ebuild 11454 BLAKE2B 6c1ea71ffab3a2b9e3391da5250dc92d93a811faa88a837e14b2893d07696e669f97ecd62db0b5aaf66928b03487a720b8d45063e9d6ed83da496c8d45f57e21 SHA512 88022b4c1dc7a3065bd5cef960f1eeb9954e1f7f399472af5d9374838b95897130cb3f5565bd626b76b2a8574182095f7bc1d3909ff0f024ea85eed4583a6b63
+EBUILD bind-9.15.3.ebuild 11458 BLAKE2B 62acb41ae664893fdd657cdc5466bd14de8cdb5f91f16f644a0ca0edb31fd0237a053ed770c3309b9f9bbe2d480aa2c60ca173d611fab845c604bf178955bafe SHA512 7a55459af4d9f45783de288e512aedb591c73359807ea30cc31ed662b08f7242755dc7c74307472098acc148611a7bc2957749b3051b321d4487bfa6cc084b7d
MISC metadata.xml 1188 BLAKE2B 6da9a02bb959544829b980c3edfbe859b73e9f21485e78a23c00d9351fd933de5ba668ebffcffbec7da118116d95232ccaae7d4528de9c2dac6565cabc4f29cc SHA512 0589922970d0998c59e48e485c4475eede9a04cc5b029e1c4c2988d478e72287230613003777034b1df98042c0e7b4f79cfe22585c108b2c668d20710d43c655
diff --git a/net-dns/bind/bind-9.14.4.ebuild b/net-dns/bind/bind-9.14.4.ebuild
index 56b57d6e2972..3c1d3ba5ad9b 100644
--- a/net-dns/bind/bind-9.14.4.ebuild
+++ b/net-dns/bind/bind-9.14.4.ebuild
@@ -134,6 +134,7 @@ src_configure() {
--with-libtool
--enable-full-report
--without-readline
+ --with-openssl="${EPREFIX}"/usr
$(use_enable caps linux-caps)
$(use_enable dnsrps)
$(use_enable dnstap)
diff --git a/net-dns/bind/bind-9.14.5.ebuild b/net-dns/bind/bind-9.14.5.ebuild
index 6f05b895942c..5d27afa5590b 100644
--- a/net-dns/bind/bind-9.14.5.ebuild
+++ b/net-dns/bind/bind-9.14.5.ebuild
@@ -136,6 +136,7 @@ src_configure() {
--with-libtool
--enable-full-report
--without-readline
+ --with-openssl="${EPREFIX}"/usr
$(use_enable caps linux-caps)
$(use_enable dnsrps)
$(use_enable dnstap)
diff --git a/net-dns/bind/bind-9.14.6.ebuild b/net-dns/bind/bind-9.14.6.ebuild
new file mode 100644
index 000000000000..5d27afa5590b
--- /dev/null
+++ b/net-dns/bind/bind-9.14.6.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
+ doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+# sdb-ldap? (
+# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+# )"
+
+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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# -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
+urandom xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="
+ ?? ( geoip geoip2 )
+ postgres? ( dlz )
+ berkdb? ( dlz )
+ mysql? ( dlz )
+ odbc? ( dlz )
+ ldap? ( dlz )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+# sdb-ldap? ( dlz )
+
+DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
+ libressl? ( dev-libs/libressl )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ odbc? ( >=dev-db/unixODBC-2.2.6 )
+ ldap? ( net-nds/openldap )
+ postgres? ( dev-db/postgresql:= )
+ caps? ( >=sys-libs/libcap-2.1.0 )
+ xml? ( dev-libs/libxml2 )
+ geoip? ( >=dev-libs/geoip-1.4.6 )
+ geoip2? ( dev-libs/libmaxminddb )
+ gssapi? ( virtual/krb5 )
+ json? ( dev-libs/json-c:= )
+ lmdb? ( dev-db/lmdb )
+ zlib? ( sys-libs/zlib )
+ dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/ply[${PYTHON_USEDEP}]
+ )"
+# sdb-ldap? ( net-nds/openldap )
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-bind )
+ || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+pkg_setup() {
+ ebegin "Creating named group and user"
+ enewgroup named 40
+ enewuser named 40 -1 /etc/bind named
+ eend ${?}
+}
+
+src_prepare() {
+ default
+
+ export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+ # Adjusting PATHs in manpages
+ for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+ sed -i \
+ -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+ -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+ -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+ "${i}" || die "sed failed, ${i} doesn't exist"
+ done
+
+# if use dlz; then
+# # sdb-ldap patch as per bug #160567
+# # Upstream URL: http://bind9-ldap.bayour.com/
+# # New patch take from bug 302735
+# if use sdb-ldap; then
+# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+# fi
+# fi
+
+ # should be installed by bind-tools
+ sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+ # Disable tests for now, bug 406399
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+ # bug #220361
+ rm aclocal.m4 || die
+ rm -rf libtool.m4/ || die
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --sysconfdir=/etc/bind
+ --localstatedir=/var
+ --with-libtool
+ --enable-full-report
+ --without-readline
+ --with-openssl="${EPREFIX}"/usr
+ $(use_enable caps linux-caps)
+ $(use_enable dnsrps)
+ $(use_enable dnstap)
+ $(use_enable fixed-rrset)
+ # $(use_enable static-libs static)
+ $(use_with berkdb dlz-bdb)
+ $(use_with dlz dlopen)
+ $(use_with dlz dlz-filesystem)
+ $(use_with dlz dlz-stub)
+ $(use_with gssapi)
+ $(use_with json libjson)
+ $(use_with ldap dlz-ldap)
+ $(use_with mysql dlz-mysql)
+ $(use_with odbc dlz-odbc)
+ $(use_with postgres dlz-postgres)
+ $(use_with lmdb)
+ $(use_with python)
+ $(use_with xml libxml2)
+ $(use_with zlib)
+ )
+
+ use geoip && myeconfargs+=( --with-geoip )
+ use geoip2 && myeconfargs+=( --with-geoip2 )
+
+ # bug #158664
+# gcc-specs-ssp && replace-flags -O[23s] -O
+
+ # To include db.h from proper path
+ use berkdb && append-flags "-I$(db_includedir)"
+
+ export BUILD_CC=$(tc-getBUILD_CC)
+ econf "${myeconfargs[@]}"
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+ default
+
+ dodoc CHANGES README
+
+ if use doc; then
+ dodoc doc/arm/Bv9ARM.pdf
+
+ docinto misc
+ dodoc -r doc/misc/
+
+ # might a 'html' useflag make sense?
+ docinto html
+ dodoc -r doc/arm/
+
+ docinto contrib
+ dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+ # some handy-dandy dynamic dns examples
+ pushd "${ED%/}"/usr/share/doc/${PF} 1>/dev/null || die
+ tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+ popd 1>/dev/null || die
+ fi
+
+ insinto /etc/bind
+ newins "${FILESDIR}"/named.conf-r8 named.conf
+
+ # ftp://ftp.rs.internic.net/domain/named.cache:
+ insinto /var/bind
+ newins "${FILESDIR}"/named.cache-r3 named.cache
+
+ insinto /var/bind/pri
+ newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+ newinitd "${FILESDIR}"/named.init-r13 named
+ newconfd "${FILESDIR}"/named.confd-r7 named
+
+ newenvd "${FILESDIR}"/10bind.env 10bind
+
+ # Let's get rid of those tools and their manpages since they're provided by bind-tools
+ rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
+ rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+ rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+ rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+ for tool in dsfromkey importkey keyfromlabel keygen \
+ revoke settime signzone verify; do
+ rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+ rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+ done
+
+ # bug 405251, library archives aren't properly handled by --enable/disable-static
+ if ! use static-libs; then
+ find "${ED}" -type f -name '*.a' -delete || die
+ fi
+
+ # bug 405251
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ if use python; then
+ install_python_tools() {
+ dosbin bin/python/dnssec-{checkds,coverage}
+ }
+ python_foreach_impl install_python_tools
+
+ python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
+ python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
+ fi
+
+ # bug 450406
+ dosym named.cache /var/bind/root.cache
+
+ dosym "${ED}"/var/bind/pri /etc/bind/pri
+ dosym "${ED}"/var/bind/sec /etc/bind/sec
+ dosym "${ED}"/var/bind/dyn /etc/bind/dyn
+ keepdir /var/bind/{pri,sec,dyn}
+
+ dodir /var/log/named
+
+ fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+ fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+ 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_dotmpfilesd "${FILESDIR}"/named.conf
+ exeinto /usr/libexec
+ doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+ if [ ! -f '/etc/bind/rndc.key' ]; 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
+ chown root:named /etc/bind/rndc.key || die
+ chmod 0640 /etc/bind/rndc.key || die
+ fi
+
+ einfo
+ einfo "You can edit /etc/conf.d/named to customize named settings"
+ einfo
+ use mysql || use postgres || use ldap && {
+ elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+ elog "uncomment the specified rc_named_* lines in your"
+ elog "/etc/conf.d/named config to ensure they'll start before bind"
+ einfo
+ }
+ einfo "If you'd like to run bind in a chroot AND this is a new"
+ einfo "install OR your bind doesn't already run in a chroot:"
+ einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+ einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+ einfo
+
+ CHROOT=$(source /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"
+ elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+ elog "If you decide to use the new/default method, ensure to make backup"
+ elog "first and merge your existing configs/zones to /etc/bind and"
+ elog "/var/bind because bind will now mount the needed directories into"
+ elog "the chroot dir."
+ fi
+}
+
+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})
+
+ if [[ -z "${CHROOT}" ]]; then
+ eerror "This config script is designed to automate setting up"
+ eerror "a chrooted bind/named. To do so, please first uncomment"
+ eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+ die "Unset CHROOT"
+ fi
+ if [[ -d "${CHROOT}" ]]; then
+ ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+ ewarn "To enable the old behaviour (without using mount) uncomment the"
+ ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+ ewarn
+ ewarn "${CHROOT} already exists... some things might become overridden"
+ ewarn "press CTRL+C if you don't want to continue"
+ sleep 10
+ fi
+
+ 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
+
+ chown root:named \
+ ${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/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
+ fi
+
+ if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+ if use geoip; then
+ mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+ elif use geoip2; then
+ mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+ fi
+ fi
+
+ elog "You may need to add the following line to your syslog-ng.conf:"
+ elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/bind-9.15.2.ebuild b/net-dns/bind/bind-9.15.2.ebuild
index b26c1f1fbdb5..721776421718 100644
--- a/net-dns/bind/bind-9.15.2.ebuild
+++ b/net-dns/bind/bind-9.15.2.ebuild
@@ -134,6 +134,7 @@ src_configure() {
--with-libtool
--enable-full-report
--without-readline
+ --with-openssl="${EPREFIX}"/usr
$(use_enable caps linux-caps)
$(use_enable dnsrps)
$(use_enable dnstap)
@@ -189,7 +190,7 @@ src_install() {
dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
# some handy-dandy dynamic dns examples
- pushd "${ED%/}"/usr/share/doc/${PF} 1>/dev/null || die
+ pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
popd 1>/dev/null || die
fi
@@ -218,14 +219,14 @@ src_install() {
newenvd "${FILESDIR}"/10bind.env 10bind
# Let's get rid of those tools and their manpages since they're provided by bind-tools
- rm -f "${ED%/}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
- rm -f "${ED%/}"/usr/share/man/man8/nsupdate.8* || die
- rm -f "${ED%/}"/usr/bin/{dig,host,nslookup,nsupdate} || die
- rm -f "${ED%/}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+ rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
+ rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+ rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+ rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
for tool in dsfromkey importkey keyfromlabel keygen \
revoke settime signzone verify; do
- rm -f "${ED%/}"/usr/{,s}bin/dnssec-"${tool}" || die
- rm -f "${ED%/}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+ rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+ rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
done
# bug 405251, library archives aren't properly handled by --enable/disable-static
@@ -242,16 +243,16 @@ src_install() {
}
python_foreach_impl install_python_tools
- python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds"
- python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage"
+ python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
+ python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
fi
# bug 450406
dosym named.cache /var/bind/root.cache
- dosym /var/bind/pri /etc/bind/pri
- dosym /var/bind/sec /etc/bind/sec
- dosym /var/bind/dyn /etc/bind/dyn
+ dosym "${ED}"/var/bind/pri /etc/bind/pri
+ dosym "${ED}"/var/bind/sec /etc/bind/sec
+ dosym "${ED}"/var/bind/dyn /etc/bind/dyn
keepdir /var/bind/{pri,sec,dyn}
dodir /var/log/named
diff --git a/net-dns/bind/bind-9.15.3.ebuild b/net-dns/bind/bind-9.15.3.ebuild
new file mode 100644
index 000000000000..bfdb5db3d257
--- /dev/null
+++ b/net-dns/bind/bind-9.15.3.ebuild
@@ -0,0 +1,380 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
+ doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+# sdb-ldap? (
+# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+# )"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS=""
+# -berkdb by default re bug 602682
+IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi
+json ldap libressl lmdb mysql odbc postgres python selinux static-libs
+urandom xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="
+ postgres? ( dlz )
+ berkdb? ( dlz )
+ mysql? ( dlz )
+ odbc? ( dlz )
+ ldap? ( dlz )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+# sdb-ldap? ( dlz )
+
+DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
+ libressl? ( dev-libs/libressl )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ odbc? ( >=dev-db/unixODBC-2.2.6 )
+ ldap? ( net-nds/openldap )
+ postgres? ( dev-db/postgresql:= )
+ caps? ( >=sys-libs/libcap-2.1.0 )
+ xml? ( dev-libs/libxml2 )
+ geoip? ( >=dev-libs/geoip-1.4.6 )
+ gssapi? ( virtual/krb5 )
+ json? ( dev-libs/json-c:= )
+ lmdb? ( dev-db/lmdb )
+ zlib? ( sys-libs/zlib )
+ dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/ply[${PYTHON_USEDEP}]
+ )"
+# sdb-ldap? ( net-nds/openldap )
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-bind )
+ || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+pkg_setup() {
+ ebegin "Creating named group and user"
+ enewgroup named 40
+ enewuser named 40 -1 /etc/bind named
+ eend ${?}
+}
+
+src_prepare() {
+ default
+
+ export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+ # Adjusting PATHs in manpages
+ for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+ sed -i \
+ -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+ -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+ -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+ "${i}" || die "sed failed, ${i} doesn't exist"
+ done
+
+# if use dlz; then
+# # sdb-ldap patch as per bug #160567
+# # Upstream URL: http://bind9-ldap.bayour.com/
+# # New patch take from bug 302735
+# if use sdb-ldap; then
+# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+# fi
+# fi
+
+ # should be installed by bind-tools
+ sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+ # Disable tests for now, bug 406399
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+ # bug #220361
+ rm aclocal.m4 || die
+ rm -rf libtool.m4/ || die
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --sysconfdir=/etc/bind
+ --localstatedir=/var
+ --with-libtool
+ --enable-full-report
+ --without-readline
+ --with-openssl="${EPREFIX}"/usr
+ $(use_enable caps linux-caps)
+ $(use_enable dnsrps)
+ $(use_enable dnstap)
+ $(use_enable fixed-rrset)
+ # $(use_enable static-libs static)
+ $(use_with berkdb dlz-bdb)
+ $(use_with dlz dlopen)
+ $(use_with dlz dlz-filesystem)
+ $(use_with dlz dlz-stub)
+ $(use_with gssapi)
+ $(use_with json libjson)
+ $(use_with ldap dlz-ldap)
+ $(use_with mysql dlz-mysql)
+ $(use_with odbc dlz-odbc)
+ $(use_with postgres dlz-postgres)
+ $(use_with lmdb)
+ $(use_with python)
+ $(use_with xml libxml2)
+ $(use_with zlib)
+ )
+
+ use geoip && myeconfargs+=( --enable-geoip )
+
+ # bug #158664
+# gcc-specs-ssp && replace-flags -O[23s] -O
+
+ # To include db.h from proper path
+ use berkdb && append-flags "-I$(db_includedir)"
+
+ export BUILD_CC=$(tc-getBUILD_CC)
+ econf "${myeconfargs[@]}"
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+ default
+
+ dodoc CHANGES README
+
+ if use doc; then
+ dodoc doc/arm/Bv9ARM.pdf
+
+ docinto misc
+ dodoc -r doc/misc/
+
+ # might a 'html' useflag make sense?
+ docinto html
+ dodoc -r doc/arm/
+
+ docinto contrib
+ dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+ # some handy-dandy dynamic dns examples
+ pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
+ tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+ popd 1>/dev/null || die
+ fi
+
+ insinto /etc/bind
+ newins "${FILESDIR}"/named.conf-r8 named.conf
+
+ # ftp://ftp.rs.internic.net/domain/named.cache:
+ insinto /var/bind
+ newins "${FILESDIR}"/named.cache-r3 named.cache
+
+ insinto /var/bind/pri
+ newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+ newinitd "${FILESDIR}"/named.init-r13 named
+ newconfd "${FILESDIR}"/named.confd-r7 named
+
+ if use gost; then
+ sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' \
+ -i "${ED%/}/etc/init.d/named" || die
+ else
+ sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' \
+ -i "${ED%/}/etc/init.d/named" || die
+ fi
+
+ newenvd "${FILESDIR}"/10bind.env 10bind
+
+ # Let's get rid of those tools and their manpages since they're provided by bind-tools
+ rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
+ rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+ rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+ rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+ for tool in dsfromkey importkey keyfromlabel keygen \
+ revoke settime signzone verify; do
+ rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+ rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+ done
+
+ # bug 405251, library archives aren't properly handled by --enable/disable-static
+ if ! use static-libs; then
+ find "${ED}" -type f -name '*.a' -delete || die
+ fi
+
+ # bug 405251
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ if use python; then
+ install_python_tools() {
+ dosbin bin/python/dnssec-{checkds,coverage}
+ }
+ python_foreach_impl install_python_tools
+
+ python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds"
+ python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage"
+ fi
+
+ # bug 450406
+ dosym named.cache /var/bind/root.cache
+
+ dosym "${ED}"/var/bind/pri /etc/bind/pri
+ dosym "${ED}"/var/bind/sec /etc/bind/sec
+ dosym "${ED}"/var/bind/dyn /etc/bind/dyn
+ keepdir /var/bind/{pri,sec,dyn}
+
+ dodir /var/log/named
+
+ fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+ fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+ 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_dotmpfilesd "${FILESDIR}"/named.conf
+ exeinto /usr/libexec
+ doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+ if [ ! -f '/etc/bind/rndc.key' ]; 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
+ chown root:named /etc/bind/rndc.key || die
+ chmod 0640 /etc/bind/rndc.key || die
+ fi
+
+ einfo
+ einfo "You can edit /etc/conf.d/named to customize named settings"
+ einfo
+ use mysql || use postgres || use ldap && {
+ elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+ elog "uncomment the specified rc_named_* lines in your"
+ elog "/etc/conf.d/named config to ensure they'll start before bind"
+ einfo
+ }
+ einfo "If you'd like to run bind in a chroot AND this is a new"
+ einfo "install OR your bind doesn't already run in a chroot:"
+ einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+ einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+ einfo
+
+ CHROOT=$(source /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"
+ elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+ elog "If you decide to use the new/default method, ensure to make backup"
+ elog "first and merge your existing configs/zones to /etc/bind and"
+ elog "/var/bind because bind will now mount the needed directories into"
+ elog "the chroot dir."
+ fi
+}
+
+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})
+
+ if [[ -z "${CHROOT}" ]]; then
+ eerror "This config script is designed to automate setting up"
+ eerror "a chrooted bind/named. To do so, please first uncomment"
+ eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+ die "Unset CHROOT"
+ fi
+ if [[ -d "${CHROOT}" ]]; then
+ ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+ ewarn "To enable the old behaviour (without using mount) uncomment the"
+ ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+ ewarn
+ ewarn "${CHROOT} already exists... some things might become overridden"
+ ewarn "press CTRL+C if you don't want to continue"
+ sleep 10
+ fi
+
+ 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
+ # As of bind 9.8.0
+ if has_version net-dns/bind[gost]; then
+ mkdir -m 0755 -p ${CHROOT}/usr/$(get_libdir)/engines || die
+ if [ "$(get_libdir)" = "lib64" ]; then
+ ln -s lib64 ${CHROOT}/usr/lib || die
+ fi
+ fi
+ chown root:named \
+ ${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/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
+ fi
+
+ if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+ mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+ fi
+
+ elog "You may need to add the following line to your syslog-ng.conf:"
+ elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/dnscap/Manifest b/net-dns/dnscap/Manifest
index 84d4aa9daed9..1ccf13bb7999 100644
--- a/net-dns/dnscap/Manifest
+++ b/net-dns/dnscap/Manifest
@@ -1,6 +1,5 @@
-AUX dnscap-0_p20130814.install.patch 853 BLAKE2B 5f237bc91ee0e83d498d8df525d81aa137f520d484fbb05df29084669be611574bc53ad5258d3ccbc8068ff574c14126a19e22bf6a27cbf99cfc20b70565cc50 SHA512 03bda20b9034e2a594ae08824306583f1591ddc9b3fe5542d84e4a4534100a8b09f70b34db89a7a3edc97e4b4c9219a6586ca7b0f79878206efa8407bd44d23a
-DIST dnscap-0_p20130814.tar.gz 99609 BLAKE2B 5881d0d98d664246dd79272cb52f2afbd1261002c70951e33288b09e105b802f55bb0b639c20f1b008e10ceb13f7c81d646ba54db7c30204c1a0a92eb9c69bf2 SHA512 135b6498013bf4a12882ed5cf89cf2df480a357b16a65e99b1c8c1b3b400217611a4c16d1b34ffc521f7eedfdda61662180801c89d80cbbc8719dcec50128531
DIST dnscap-1.10.0.tar.gz 661981 BLAKE2B e4c3c1cf0ddc21fb5c28abb339607c0233097394cd5c75b55a90d89903aab4beaf32f8ab8fc09a57c16eb2d9598c8fa6b98d034a5c5c5226c1c7a0e8a03e8b9b SHA512 b116bcdf876dd1b03d9d093549e8e19db6f366d6df4eef3ddd09cf8eb1d79e94c9abebdd702702efb105633b2e437bbc835abcb1252599261a546881de477791
-EBUILD dnscap-0_p20130814.ebuild 612 BLAKE2B a748e878a845cdc1158cdc7d536d313ac63ae8e80e1b6ad6ed009ac055aff362045490667c6d9706120d0a510ecc6c5fd94e11c91555e5342ed7bf6418dd486d SHA512 a9edfc5e175ffb73dbcf5eac7840a4c74efb96e481b8cab477f4bcf584f61480cd015e3fd65e49255f12f103b7dc48fd23663ea48fe39de538ec7391c5df129e
+DIST dnscap-1.10.2.tar.gz 655932 BLAKE2B 317547e9d7b8f87d08e954639b62e1894e4d8e37eb9612a984dc10deb674c35973f03f94843df0e9eeb74c94904de00b2718e7121f3dddb9e343b3519d13e02e SHA512 22df8068a17b202b1dfed2dc4ce1c4178abf32af16a3b15a76ae8f46510b3979d44c62eac673afd8452abda69a49e3da133f740217b7ab64631d2c18657a9a8b
EBUILD dnscap-1.10.0.ebuild 587 BLAKE2B 5783d7fef07d955b3bdb6fc3dc596e1c3f5422242eee1a6e173b867e8fda95b2b6899c2c27f22fb7499e0e45c4028af0246572963ca92d3c4e0438bc1b4b956a SHA512 53a156266ecaa02f80ab4572b361bbf6f5194b50f8732b8ca6c891453a4447711b9bca18669989d2e99666c811116cb70e476cf8eae8ed26861fdb4377422d3c
+EBUILD dnscap-1.10.2.ebuild 587 BLAKE2B 5783d7fef07d955b3bdb6fc3dc596e1c3f5422242eee1a6e173b867e8fda95b2b6899c2c27f22fb7499e0e45c4028af0246572963ca92d3c4e0438bc1b4b956a SHA512 53a156266ecaa02f80ab4572b361bbf6f5194b50f8732b8ca6c891453a4447711b9bca18669989d2e99666c811116cb70e476cf8eae8ed26861fdb4377422d3c
MISC metadata.xml 456 BLAKE2B bdda5ca1757331c14c11df81e2bb7e5915f9c771b8ecac997fb528334ab9e0d961f79fbb690f47329b5d7ae77cba7a6e44e01f26160a5a21a4c2be0374d74955 SHA512 b9d9248bcc882d4c50403ebed1474aeae687682141798d16965a1eea88700dcd28bf95a16437397b919abdfbf0f812612f2578251c147a6f1b11dcae799af383
diff --git a/net-dns/dnscap/dnscap-0_p20130814.ebuild b/net-dns/dnscap/dnscap-0_p20130814.ebuild
deleted file mode 100644
index 63d02bf19d69..000000000000
--- a/net-dns/dnscap/dnscap-0_p20130814.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="network capture utility designed specifically for DNS traffic"
-HOMEPAGE="https://dnscap.dns-oarc.net/"
-
-## github commit tarball
-MY_GIT_COMMIT="727ed7d5e46625abc2c8d988689a300589e948b6"
-MY_P="DNS-OARC-${PN}-${MY_GIT_COMMIT:0:7}"
-SRC_URI="https://github.com/DNS-OARC/${PN}/tarball/${MY_GIT_COMMIT} -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="ISC"
-IUSE=""
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}.install.patch" )
diff --git a/net-dns/dnscap/dnscap-1.10.2.ebuild b/net-dns/dnscap/dnscap-1.10.2.ebuild
new file mode 100644
index 000000000000..38e157300abc
--- /dev/null
+++ b/net-dns/dnscap/dnscap-1.10.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Network capture utility designed specifically for DNS traffic"
+HOMEPAGE="https://dnscap.dns-oarc.net/"
+SRC_URI="https://www.dns-oarc.net/files/dnscap/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="ISC"
+IUSE=""
+
+RDEPEND="net-libs/libpcap
+ net-libs/ldns
+ sys-libs/zlib
+ dev-libs/openssl:=
+ dev-perl/YAML"
+
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+ elog "If you plan to use dnscap's -x/-X features, it is necessary to install"
+ elog "net-dns/bind as well."
+}
diff --git a/net-dns/dnscap/files/dnscap-0_p20130814.install.patch b/net-dns/dnscap/files/dnscap-0_p20130814.install.patch
deleted file mode 100644
index b09c7cfdbfcf..000000000000
--- a/net-dns/dnscap/files/dnscap-0_p20130814.install.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN verisign-dnscap-727ed7d.orig/Makefile.in verisign-dnscap-727ed7d/Makefile.in
---- verisign-dnscap-727ed7d.orig/Makefile.in 2013-08-14 01:31:33.000000000 +0200
-+++ verisign-dnscap-727ed7d/Makefile.in 2014-04-26 22:04:35.438580361 +0200
-@@ -45,13 +45,11 @@
- all: ${prog} ${prog}.cat1
-
- install: all
-- install -d -m 755 ${bindir}
-- if [ -f ${bindir}/${prog} ]; then \
-- mv -f ${bindir}/${prog} ${bindir}/${prog}.old; fi
-- install -m 755 ${prog} ${bindir}/
-- install -d -m 755 ${mandir}
-- install -d -m 755 ${mandir}/cat1
-- install -m 644 ${prog}.cat1 ${mandir}/cat1/${prog}.1
-+ install -d -m 755 $(DESTDIR)${bindir}
-+ install -m 755 ${prog} $(DESTDIR)${bindir}/
-+ install -d -m 755 $(DESTDIR)${mandir}
-+ install -d -m 755 $(DESTDIR)${mandir}/cat1
-+ install -m 644 ${prog}.cat1 $(DESTDIR)${mandir}/cat1/${prog}.1
-
- .c.o:
- ${CC} ${CFLAGS} -c $<
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index f202ce28e1a4..7b71a162652f 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -8,6 +8,6 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
EBUILD dnsmasq-2.79.ebuild 4594 BLAKE2B 28cf745cd261bf067114adc98733f5e00a2f6a10a906d4eaf2175c0457d538d7d96b91fe87a87320c3df27a5c64234ed7d5bbee993070964fa421b8e5b12693c SHA512 eb8ac4fdf747657983909b22baa2e0af5f2299d2a5ab4d97933b185e528cddbb1d4cc7ca14c2efddcd8c6f4ec9861f3c37d9fc59c96b68f55c45a274acf7eff7
-EBUILD dnsmasq-2.80-r1.ebuild 4804 BLAKE2B 0cdafef75a132aca8365120e4fa54df4f48de281cd5d2a5e587864389fb86c332bdcc459c148b712e8acdf4b172bf094cb7e07133f1ad7a1d02dd0dae06b6809 SHA512 d2c342597d88de56440c0345b93ae57de6cfe1f132ff5b6c570426b7f8e08891738764b9adc772240b7f75b988668c350f421a230615dfa50a4643dcff930910
-EBUILD dnsmasq-2.80.ebuild 4742 BLAKE2B 4844bb2c2fed9d35ee6358bedf86c9fac3feacedc965628b53687bc22ac672f2a5a7eef90f112a0a1446fb99ce79c7233d2178b5bf7773e8fad23dc2a1557f2b SHA512 a278d6e216bde4d31671481eb7d9ec302789854119229c0852a1204b7b059213ca19ed48b99afe75221e39494c358f537d56a6da1e5275ef563844ff4083e49e
+EBUILD dnsmasq-2.80-r1.ebuild 4803 BLAKE2B f596685ea68a061c1319b6f49c9d27089bc0ef36822d6074cc70e02155d4866a97c2059077901b0576c96bf09ba6328bb74bc6f720553e635ca3758381ac05f9 SHA512 69fd9a952d9414842bc9cabec39b3ab065010ebcd93c6804208d7fb6085e0917c9a00679cc84b36fef2591b3bf838319a5d4f94f499f5d25b197ed9b28f944d7
+EBUILD dnsmasq-2.80.ebuild 4684 BLAKE2B 64850d70d7fe613c4e3b89944052ccba458f702e59f6d3f6b5228d4a32e65221c64a7ae9a168edd9499723276f0b8fab10a1f97d4b5eaab89c6c87359e7f652d SHA512 0a14dca3228b931f646d465de4426d2e48ae4e4a1c76637620e8a4d6e9c5cfd877ffd34b2841508a405749626e5fb6299cae5485a2529ca79cf891f66d4897a2
MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
index be6a1b57d82a..2319ec5f277b 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/dnsmasq/dnsmasq-2.80.ebuild b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
index 1e8a6dddf189..fb46b1495fa4 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
@@ -1,5 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
-# Copyright 2017-2018 Sony Interactive Entertainment Inc.
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 504ad3a77dbf..eaecec5d4381 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,3 +1,5 @@
DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
+DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
EBUILD ldns-utils-1.7.0-r1.ebuild 1196 BLAKE2B 3743024ce280c8a1fd29b37f87333fd87d578cec89498be2b4cd8870f88f57081575c7236c883c95ed908bd5dd7b70ceda7311a6a660f3e2048b05ac1d97e353 SHA512 1305efbed428c05b10ec75e84ddf9dceb6d9087e87e3d1a1ae8b560a98db30b03366c005207135f3506d0fc40892fae4a8046f6b3a78367c490a8cae9940a06d
-MISC metadata.xml 742 BLAKE2B 78bcba18e70bea755bab35347639a1a529961e91b709b789c045db918525939e9fdb4a7adb6dd7801c64bd02090503d5b3edbe444fbf34615ec3ebb5342d2288 SHA512 a0c0fc0a7dd05890fa9b2d6bf99c5b96990d76993d27d18a382ab69e1200aa5f472865c5de928575d773f70ef21314519bc46a1d2a138da34d569bf56a7d8748
+EBUILD ldns-utils-1.7.1.ebuild 1436 BLAKE2B f8588b0b321c76b5c2e2234706aaa8ac1605921c9ca7dc10a3e02bf5650e3056bdadffa4465b0a4b47cc324a842a7f0134eef87a17fc1f54a20fd61dcdba1882 SHA512 f2b7fa3be15f3fdd51e2b5410c463c4e7d9bc0164ff2b7c606b242d52f03d4415acfc17e3bfcfb87b6eb1b14c5c4c472cbca2222fba023ef48450c11d0b10ad8
+MISC metadata.xml 848 BLAKE2B a31c8bfb2c5a90add80c4f608cdbd02e3bf15126726ed92203425b166ae01cf8240fa040d98ba44991cd315bdb388664692eca5820fc807cf3fddefc7663ffb4 SHA512 6ce3c5421c6e739f0c15a5b7e9120638cddc78fa3d9c2f564acfccd4c98bb3034512ce1a68422ba0ef7896750c1a41e273f2960d9d1f0ffc21c9028342482366
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
new file mode 100644
index 000000000000..6a6ba48f563a
--- /dev/null
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${P/-utils}
+
+DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
+
+REQUIRED_USE="
+ ecdsa? ( ssl )
+ ed25519? ( ssl )
+ ed448? ( ssl )
+ dane? ( ssl )
+ gost? ( ssl )
+"
+
+DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,ed25519?,ed448?,gost?]
+ examples? ( net-libs/libpcap )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ # >=openssl-1.1.0 required for dane-ta
+ if has_version "<dev-libs/openssl-1.1.0"; then
+ local dane_ta_usage="--disable-dane-ta-usage"
+ else
+ local dane_ta_usage=""
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --with-drill \
+ $(use_with ssl) \
+ $(use_with examples) \
+ $(use_enable dane) \
+ $(use_enable ecdsa) \
+ $(use_enable ed25519) \
+ $(use_enable ed448) \
+ $(use_enable gost) \
+ $(use_enable ssl sha2) \
+ $dane_ta_usage
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ #cd "${S}"/drill
+ emake DESTDIR="${D}" install-drill
+ dodoc drill/{ChangeLog.22-nov-2005,README,REGRESSIONS}
+
+ if use examples; then
+ emake DESTDIR="${D}" install-examples
+ newdoc examples/README README.examples
+ fi
+}
diff --git a/net-dns/ldns-utils/metadata.xml b/net-dns/ldns-utils/metadata.xml
index 03fefe6a973c..8980068eb12e 100644
--- a/net-dns/ldns-utils/metadata.xml
+++ b/net-dns/ldns-utils/metadata.xml
@@ -14,6 +14,8 @@
<use>
<flag name="dane">Enable DNS-based Authentication of Named Entities (DANE) support</flag>
<flag name="ecdsa">Enable ECDSA support</flag>
+ <flag name="ed25519">Enable ED25519 support</flag>
+ <flag name="ed448">Enable ED448 support</flag>
<flag name="gost">Enable GOST support</flag>
</use>
</pkgmetadata>