[gentoo-commits] repo/gentoo:master commit in: net-dns/dnsdist/

["Andreas Schuerch" <nativemad@gentoo.org>]

commit:     0e190b9e69ca8ce1fa989825c129f634b3338c66
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 11:12:14 2024 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 11:17:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e190b9e

net-dns/dnsdist: add 1.9.0, drop 1.7.3-r1

Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org>

 net-dns/dnsdist/Manifest                           |  2 +-
 ...nsdist-1.7.3-r1.ebuild => dnsdist-1.9.0.ebuild} | 26 ++++++++++++++--------
 net-dns/dnsdist/metadata.xml                       | 10 +++++++--
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 0da24572ca66..335f8a05e096 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,3 +1,3 @@
-DIST dnsdist-1.7.3.tar.bz2 1379011 BLAKE2B e7d1cb9dba3d3ad1dd696d324697ffac60863112eae83307237639bea339f7ed1c3f320002d3467a44ab38a9ea60ade95fff43645c889d29465760f7f467b996 SHA512 2a39096709db5b41cf3bd21170689bc85ad2cd550896d02ddd85eff7410780ea59d6cf8e08b0a08962ee93b49b7f3228dfa649275453215e23c25098aca40e1a
 DIST dnsdist-1.8.0.tar.bz2 1480500 BLAKE2B 47cfcfe3756cdc4520c1ba1e11b7d60191125ef900ba829ff7437ac2041352b845ab5f7183f53fea9b3aa6f44c5745de3878c2b72f2be048fa57d2c2e9325c0c SHA512 426db3e83729bd2f8a8c8b1c02d719c6618acc0aec09d1f2670c159d441c1cad2fdc85c5ffe919e76d1b1e8e24198bf29133802cb857dfacde2dfed2532001f1
 DIST dnsdist-1.8.1.tar.bz2 1492793 BLAKE2B 84fdf2f360c41ea235f3989d2bc14ad05e98d7b51dd20d983e7ad53ce5a6c00c7075b673e8a15fe3fd710a4e15c80db4d7431256bfb4291bd5785482d3f7f7e5 SHA512 db50c56587084ebdea3eb7f8e5b79178aea67b608cf6afce1453932b5225b3474a459cdc3dc8e4618a36a9edb405403dfefaed7fadd5848b5612de6bfb356f3a
+DIST dnsdist-1.9.0.tar.bz2 1620891 BLAKE2B 9e14f275d83429ab3e83bdbbd6fe8d97b3212763398798d704adcc18d07ad8aebe16c5345425cdb589f6166155717d9649c16546bf981eb265e1349e74d11134 SHA512 32c0b9b3a1b58839da6dbde05eee382b78fbe58d68aed14f4927dc172dfcb15ba68b6d2246a8305b709e136e0e0c8666b6dd139ac258c8209083ff3b5673b997

diff --git a/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild b/net-dns/dnsdist/dnsdist-1.9.0.ebuild
similarity index 79%
rename from net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
rename to net-dns/dnsdist/dnsdist-1.9.0.ebuild
index 72f5311ffcfb..245bc728ac4b 100644
--- a/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,12 +15,16 @@ KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
+IUSE="dnscrypt dnstap doh doh3 gnutls ipcipher +lmdb quic regex remote-logging snmp +ssl systemd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 		dnscrypt? ( ssl )
 		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
+		doh? ( ssl !gnutls )
+		doh3? ( ssl !gnutls quic )
+		ipcipher? ( ssl !gnutls )
+		quic? ( ssl !gnutls )
+		ssl? ( !gnutls )"
 
 RDEPEND="acct-group/dnsdist
 	acct-user/dnsdist
@@ -29,8 +33,9 @@ RDEPEND="acct-group/dnsdist
 	dev-libs/libsodium:=
 	>=dev-libs/protobuf-3:=
 	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
+	doh3? ( net-libs/quiche:= )
 	lmdb? ( dev-db/lmdb:= )
+	quic? ( net-libs/quiche:= )
 	regex? ( dev-libs/re2:= )
 	snmp? ( net-analyzer/net-snmp:= )
 	ssl? (
@@ -45,10 +50,6 @@ RDEPEND="acct-group/dnsdist
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-1.7.3-gcc13.patch
-)
-
 src_configure() {
 	# bug #822855
 	append-lfs-flags
@@ -56,17 +57,24 @@ src_configure() {
 	econf \
 		--sysconfdir=/etc/dnsdist \
 		--with-lua="${ELUA}" \
+		--enable-tls-providers \
+		--enable-asan \
+		--enable-lsan \
+		--enable-ubsan \
 		$(use_enable doh dns-over-https) \
+		$(use_enable doh3 dns-over-http3) \
 		$(use_enable dnscrypt) \
 		$(use_enable dnstap) \
+		$(use_enable ipcipher) \
 		$(use_with lmdb ) \
+		$(use_enable quic dns-over-quic ) \
 		$(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"
+			-i "${S}/configure" || die
 }
 
 src_install() {

diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index 97a6142b5727..3b1c4911d481 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>nativemad@gentoo.org</email>
+		<name>Andreas Schuerch</name>
+	</maintainer>
 	<longdescription lang="en">
 		dnsdist is a highly DNS-, DoS- and abuse-aware loadbalancer. Its goal in life is to route traffic to the best server, delivering top performance to legitimate users while shunting or blocking abusive traffic.
 	</longdescription>
@@ -10,9 +13,12 @@
 		<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="doh">Enable support for dns over http via <pkg>net-libs/nghttp2</pkg></flag>
+		<flag name="doh3">Enable support for dns over http3 via <pkg>net-libs/quiche</pkg></flag>
 		<flag name="dnstap">Enable support for dnstap</flag>
 		<flag name="lmdb">Enable support for lmdb</flag>
+		<flag name="quic">Enable support for dns over quic via <pkg>net-libs/quiche</pkg></flag>
+		<flag name="ipcipher">Enable support for ipcipher via <pkg>dev-libs/openssl</pkg></flag>
 	</use>	
 	<upstream>
 		<remote-id type="github">PowerDNS/pdns</remote-id>