commit:     fb1a4d27ff1d260c4cbd54aef819a64683b82876
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Thu Dec  8 21:51:31 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 08:35:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb1a4d27

net-dns/dnsdist: make libsodium dependency unconditional

Upstream recommends using console encryption, even for local
connections. This requires libsodium to be available, so make the
dependency unconditional so it's always available, and not just when
dnscrypt is requested.

Signed-off-by: Doug Freed <dwfreed <AT> mtu.edu>
Closes: https://github.com/gentoo/gentoo/pull/28605
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-dns/dnsdist/dnsdist-1.5.1-r101.ebuild | 85 +++++++++++++++++++++++++++++++
 net-dns/dnsdist/dnsdist-1.6.1-r1.ebuild   | 80 +++++++++++++++++++++++++++++
 net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild   | 84 ++++++++++++++++++++++++++++++
 3 files changed, 249 insertions(+)

diff --git a/net-dns/dnsdist/dnsdist-1.5.1-r101.ebuild 
b/net-dns/dnsdist/dnsdist-1.5.1-r101.ebuild
new file mode 100644
index 000000000000..3539d16b1d87
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.5.1-r101.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org";
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2";
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd 
test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+               dnscrypt? ( ssl )
+               gnutls? ( ssl )
+               doh? ( ssl !gnutls )"
+
+RDEPEND="acct-group/dnsdist
+       acct-user/dnsdist
+       dev-libs/boost:=
+       dev-libs/libedit:=
+       dev-libs/libsodium:=
+       dnstap? ( dev-libs/fstrm:= )
+       doh? ( www-servers/h2o:=[libh2o] )
+       lmdb? ( dev-db/lmdb:= )
+       regex? ( dev-libs/re2:= )
+       remote-logging? ( >=dev-libs/protobuf-3:= )
+       snmp? ( net-analyzer/net-snmp:= )
+       ssl? (
+               gnutls? ( net-libs/gnutls:= )
+               !gnutls? ( dev-libs/openssl:= )
+       )
+       systemd? ( sys-apps/systemd:0= )
+       ${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+       default
+}
+
+src_configure() {
+       econf \
+               --sysconfdir=/etc/dnsdist \
+               --with-lua="${ELUA}" \
+               $(use_enable doh dns-over-https) \
+               $(use_enable dnscrypt) \
+               $(use_enable dnstap) \
+               $(use_with lmdb ) \
+               $(use_with regex re2) \
+               $(use_with remote-logging protobuf) \
+               $(use_with snmp net-snmp) \
+               $(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)
+               sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath 
$wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+                       -i "${S}/configure"
+}
+
+src_install() {
+       default
+
+       insinto /etc/dnsdist
+       doins "${FILESDIR}"/dnsdist.conf.example
+
+       newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+       newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+       elog "dnsdist provides multiple instances support. You can create more 
instances"
+       elog "by symlinking the dnsdist init script to another name."
+       elog
+       elog "The name must be in the format dnsdist.<suffix> and dnsdist will 
use the"
+       elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of 
the default."
+}

diff --git a/net-dns/dnsdist/dnsdist-1.6.1-r1.ebuild 
b/net-dns/dnsdist/dnsdist-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..5fba22a93769
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.6.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org";
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2";
+KEYWORDS="~amd64"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd 
test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+               dnscrypt? ( ssl )
+               gnutls? ( ssl )
+               doh? ( ssl !gnutls )"
+
+RDEPEND="acct-group/dnsdist
+       acct-user/dnsdist
+       dev-libs/boost:=
+       dev-libs/libedit:=
+       dev-libs/libsodium:=
+       >=dev-libs/protobuf-3:=
+       dnstap? ( dev-libs/fstrm:= )
+       doh? ( www-servers/h2o:=[libh2o] )
+       lmdb? ( dev-db/lmdb:= )
+       regex? ( dev-libs/re2:= )
+       snmp? ( net-analyzer/net-snmp:= )
+       ssl? (
+               gnutls? ( net-libs/gnutls:= )
+               !gnutls? ( dev-libs/openssl:= )
+       )
+       systemd? ( sys-apps/systemd:0= )
+       ${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+       econf \
+               --sysconfdir=/etc/dnsdist \
+               --with-lua="${ELUA}" \
+               $(use_enable doh dns-over-https) \
+               $(use_enable dnscrypt) \
+               $(use_enable dnstap) \
+               $(use_with lmdb ) \
+               $(use_with regex re2) \
+               $(use_with snmp net-snmp) \
+               $(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)
+               sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath 
$wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+                       -i "${S}/configure"
+}
+
+src_install() {
+       default
+
+       insinto /etc/dnsdist
+       doins "${FILESDIR}"/dnsdist.conf.example
+
+       newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+       newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+       elog "dnsdist provides multiple instances support. You can create more 
instances"
+       elog "by symlinking the dnsdist init script to another name."
+       elog
+       elog "The name must be in the format dnsdist.<suffix> and dnsdist will 
use the"
+       elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of 
the default."
+}

diff --git a/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild 
b/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..c0ec5088ac0e
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org";
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2";
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd 
test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+               dnscrypt? ( ssl )
+               gnutls? ( ssl )
+               doh? ( ssl !gnutls )"
+
+RDEPEND="acct-group/dnsdist
+       acct-user/dnsdist
+       dev-libs/boost:=
+       dev-libs/libedit:=
+       dev-libs/libsodium:=
+       >=dev-libs/protobuf-3:=
+       dnstap? ( dev-libs/fstrm:= )
+       doh? ( www-servers/h2o:=[libh2o] )
+       lmdb? ( dev-db/lmdb:= )
+       regex? ( dev-libs/re2:= )
+       snmp? ( net-analyzer/net-snmp:= )
+       ssl? (
+               gnutls? ( net-libs/gnutls:= )
+               !gnutls? ( dev-libs/openssl:= )
+       )
+       systemd? ( sys-apps/systemd:0= )
+       ${LUA_DEPS}
+       net-libs/nghttp2
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+       # bug #822855
+       append-lfs-flags
+
+       econf \
+               --sysconfdir=/etc/dnsdist \
+               --with-lua="${ELUA}" \
+               $(use_enable doh dns-over-https) \
+               $(use_enable dnscrypt) \
+               $(use_enable dnstap) \
+               $(use_with lmdb ) \
+               $(use_with regex re2) \
+               $(use_with snmp net-snmp) \
+               $(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)
+               sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath 
$wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+                       -i "${S}/configure"
+}
+
+src_install() {
+       default
+
+       insinto /etc/dnsdist
+       doins "${FILESDIR}"/dnsdist.conf.example
+
+       newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+       newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+       elog "dnsdist provides multiple instances support. You can create more 
instances"
+       elog "by symlinking the dnsdist init script to another name."
+       elog
+       elog "The name must be in the format dnsdist.<suffix> and dnsdist will 
use the"
+       elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of 
the default."
+}

Reply via email to