commit: b022a4b475735f88cf8e61ea9d949600c33fdb36
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 10:26:40 2020 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 10:26:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b022a4b4
net-dns/dnsdist: version bump, remove 9999
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org>
net-dns/dnsdist/Manifest | 1 +
.../{dnsdist-9999.ebuild => dnsdist-1.4.0.ebuild} | 52 ++++++++--------------
net-dns/dnsdist/metadata.xml | 3 ++
3 files changed, 22 insertions(+), 34 deletions(-)
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 52184b556f1..c3750fa2697 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1 +1,2 @@
DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B
e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010
SHA512
c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
+DIST dnsdist-1.4.0.tar.bz2 1044479 BLAKE2B
79aef57ed2b1036f222e8bcfdf615c3221c9dfdbc8fd3f80d778fb050f74bc200958b4d605dcadd5c23ac6c4b5b1a36048108cd85394920e99d6037177b81342
SHA512
c9450e97325d8ad8c8c3a395412c46ea8053cbe1ebe73329a1618212ba29bdf2f8da908ae2b90c314b5aab613387f42363e3a5322b1a36f60190fb48e1c425c5
diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild
b/net-dns/dnsdist/dnsdist-1.4.0.ebuild
similarity index 59%
rename from net-dns/dnsdist/dnsdist-9999.ebuild
rename to net-dns/dnsdist/dnsdist-1.4.0.ebuild
index 493fd0f5e4c..dae9b523e36 100644
--- a/net-dns/dnsdist/dnsdist-9999.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.4.0.ebuild
@@ -1,45 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git";
-
-if [[ ${PV} = 9999 ]]; then
- ADDITIONAL_ECLASSES="autotools git-r3"
-fi
-
-inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
+inherit eutils flag-o-matic user
DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
HOMEPAGE="https://dnsdist.org";
-if [[ ${PV} == 9999 ]]; then
- SRC_URI=""
- S="${WORKDIR}/${P}/pdns/dnsdistdist"
-else
- SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2";
- KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2";
+KEYWORDS="~amd64 ~x86"
LICENSE="GPL-2"
SLOT="0"
-IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
+IUSE="dnscrypt dnstap doh gnutls +lmdb luajit regex remote-logging snmp +ssl
systemd test"
RESTRICT="!test? ( test )"
REQUIRED_USE="dnscrypt? ( ssl )
- gnutls? ( ssl )"
+ gnutls? ( ssl )
+ doh? ( ssl !gnutls )"
RDEPEND="
>=dev-libs/boost-1.35:=
dev-libs/libedit:=
- fstrm? ( dev-libs/fstrm:= )
+ dnscrypt? ( dev-libs/libsodium:= )
+ dnstap? ( dev-libs/fstrm:= )
+ doh? ( www-servers/h2o:=[libh2o] )
+ lmdb? ( dev-db/lmdb:= )
luajit? ( dev-lang/luajit:= )
!luajit? ( >=dev-lang/lua-5.1:= )
- remote-logging? ( >=dev-libs/protobuf-3:= )
regex? ( dev-libs/re2:= )
+ remote-logging? ( >=dev-libs/protobuf-3:= )
snmp? ( net-analyzer/net-snmp:= )
ssl? (
- dev-libs/libsodium:=
gnutls? ( net-libs/gnutls:= )
!gnutls? ( dev-libs/openssl:= )
)
@@ -50,34 +42,26 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
-[[ ${PV} == 9999 ]] && DEPEND+="
- app-text/pandoc
- dev-util/ragel
- dev-python/virtualenv
-"
-
src_prepare() {
default
- [[ ${PV} == 9999 ]] && eautoreconf
}
src_configure() {
econf \
--sysconfdir=/etc/dnsdist \
+ $(use_enable doh dns-over-https) \
$(use_enable dnscrypt) \
- $(use_enable fstrm) \
+ $(use_enable dnstap) \
+ $(use_with lmdb ) \
$(use luajit && echo "--with-lua=luajit" || echo
"--with-lua=lua" ) \
- $(use_enable regex re2) \
+ $(use_with regex re2) \
$(use_with remote-logging protobuf) \
$(use_with snmp net-snmp) \
- $(use_enable ssl libsodium) \
- $(use ssl && { echo "--enable-dns-over-tls" && use_enable
gnutls && use_enable !gnutls libssl;} || echo "--disable-gnutls
--disable-libssl") \
+ $(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls
&& use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
$(use_enable systemd) \
$(use_enable test unit-tests)
- if [ ${PV} == "1.3.3" ]; then
- sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath
$wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+ sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath
$wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-i "${S}/configure"
- fi
}
src_install() {
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index e4d52294acd..d42d77d511d 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -14,5 +14,8 @@
<flag name="regex">Enable support for regular expression
matching via <pkg>dev-libs/re2</pkg></flag>
<flag name="remote-logging">Enable support for remote logging
via <pkg>dev-libs/protobuf</pkg></flag>
<flag name="ssl">Enable support for and encrypted client-server
communication via <pkg>dev-libs/libsodium</pkg></flag>
+ <flag name="doh">Enable support for dns over http via
<pkg>www-servers/h2o</pkg></flag>
+ <flag name="dnstap">Enable support for dnstap</flag>
+ <flag name="lmdb">Enable support for lmdb</flag>
</use>
</pkgmetadata>
