gentoo auto-resync : 09:04:2024 - 12:31:21

3 files changed, 53 insertions, 37 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 9e9bf1509bcc..9fada78f9113 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 6f667addebf0..a5f6d2daad13 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -4,8 +4,9 @@ AUX dnsdist.initd 1337 BLAKE2B e2619182674439be6942a0a936208326c12cfc2839bba4fd6
 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
+DIST dnsdist-1.9.3.tar.bz2 1577027 BLAKE2B 663b8a2161c5a7b94541cd775f135a99997024648c5bb57fd2ec18c7ede29aebda142452f97332300c45af32b5131e4dd5f9c1f904a1d68962398fa9a28c474e SHA512 26b4fa70c1ad70e21d86cc51389bffacbfecedd769e2bb39f376d1dc85491c9eddbd1aea1e4a9bd08d05fc58c2f1fc906d1ff19c8dfd653a779f4171242a546f
 EBUILD dnsdist-1.8.0.ebuild 2237 BLAKE2B 0ceb0e09c542ebd775c93d1adbcd4630ee82f64f90318a6764e54a80eaac0ccc28702bd9bf581064ac64c7cf1debfe25e4565e6357d33aa42d543e49045b557f SHA512 6d531a84be771b5e1913bba6daa2acba9dc8af28196d70b2446efee85d9fcf10e5da43b38d867af2c93eb7fd12dbd3573a774b46529f76b970b622a4964fc486
 EBUILD dnsdist-1.8.1.ebuild 2237 BLAKE2B 0ceb0e09c542ebd775c93d1adbcd4630ee82f64f90318a6764e54a80eaac0ccc28702bd9bf581064ac64c7cf1debfe25e4565e6357d33aa42d543e49045b557f SHA512 6d531a84be771b5e1913bba6daa2acba9dc8af28196d70b2446efee85d9fcf10e5da43b38d867af2c93eb7fd12dbd3573a774b46529f76b970b622a4964fc486
 EBUILD dnsdist-1.9.0-r1.ebuild 2710 BLAKE2B 087a17ad4310caa1efa1d2ba556d9c4047b6274a10cf994c7e351fe4f4f9d4e92155b29862db99816a62f53da2cb91e6743dec57b03265d847fccea0c4c83708 SHA512 1aa36c259f650b13d3c9a628de08423722ec23690947f8a817575a6d1716c340c8ca1b808bb55cf9fa9eb00058043a3f3a114515b7de417cef07c8eb1a5f98bd
-EBUILD dnsdist-1.9.0.ebuild 2570 BLAKE2B f3a226e925582c144280e2e2d7e1133c53e88372ba98398c017ea23d1092f0b8278b5903c06cab3b3d398417063b773b3944065786c77c284c6f99fa03e4e80a SHA512 f98551e7935deab841167977cd479c72dc2c90dcc45d66317c3011704cb683780797fe7cae0830a80035e4a2a28dec07b62b285e4bbb386b8721e022fccfa84a
+EBUILD dnsdist-1.9.3.ebuild 2710 BLAKE2B 087a17ad4310caa1efa1d2ba556d9c4047b6274a10cf994c7e351fe4f4f9d4e92155b29862db99816a62f53da2cb91e6743dec57b03265d847fccea0c4c83708 SHA512 1aa36c259f650b13d3c9a628de08423722ec23690947f8a817575a6d1716c340c8ca1b808bb55cf9fa9eb00058043a3f3a114515b7de417cef07c8eb1a5f98bd
 MISC metadata.xml 1965 BLAKE2B c45e150d13af41f787befd5775596b83073e7041be244ba99240106d07f044bcbfd24a46165e04ca48990e24870402322fe496578ef784252a2973434cfee76d SHA512 83ced0072f306d0e296f66ce83cdc8e3b94e9a1c6946bb01722a3139b49dde27bc4ee4df5b4816755c412aa05c83278ba5f072741bb078f25cb3ac8c843949cc
diff --git a/net-dns/dnsdist/dnsdist-1.9.0.ebuild b/net-dns/dnsdist/dnsdist-1.9.3.ebuild
index 245bc728ac4b..473717e4807a 100644
--- a/net-dns/dnsdist/dnsdist-1.9.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.9.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
@@ -15,66 +15,81 @@ KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dnscrypt dnstap doh doh3 gnutls ipcipher +lmdb quic regex remote-logging snmp +ssl systemd test"
+IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )
-		doh3? ( ssl !gnutls quic )
-		ipcipher? ( ssl !gnutls )
-		quic? ( ssl !gnutls )
-		ssl? ( !gnutls )"
+		doh? ( ssl )
+		doh3? ( ssl quic )
+		ipcipher? ( ssl )
+		quic? ( ssl )"
 
 RDEPEND="acct-group/dnsdist
 	acct-user/dnsdist
+	bpf? ( dev-libs/libbpf:= )
+	cdb? ( dev-db/tinycdb:= )
 	dev-libs/boost:=
-	dev-libs/libedit:=
+	sys-libs/libcap
+	dev-libs/libedit
 	dev-libs/libsodium:=
-	>=dev-libs/protobuf-3:=
-	dnstap? ( dev-libs/fstrm:= )
+	dnstap? ( dev-libs/fstrm )
+	doh? ( net-libs/nghttp2:= )
 	doh3? ( net-libs/quiche:= )
 	lmdb? ( dev-db/lmdb:= )
-	quic? ( net-libs/quiche:= )
+	quic? ( net-libs/quiche )
 	regex? ( dev-libs/re2:= )
 	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
+	ssl? ( dev-libs/openssl:= )
 	systemd? ( sys-apps/systemd:0= )
+	xdp? ( net-libs/xdp-tools )
 	${LUA_DEPS}
-	net-libs/nghttp2
 "
 
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	# clean up duplicate file
+	rm -f README.md
+}
+
 src_configure() {
 	# bug #822855
 	append-lfs-flags
 
-	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") \
+	# some things can only be enabled/disabled by defines
+	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
+	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
+
+	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+		-i "${S}/configure"
+
+	local myeconfargs=(
+		--sysconfdir=/etc/dnsdist
+		--with-lua="${ELUA}"
+		--without-h2o
+		--enable-tls-providers
+		--without-gnutls
+		$(use_with bpf ebpf)
+		$(use_with cdb cdb)
+		$(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_enable ssl dns-over-tls)
 		$(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" || die
+		$(use_with xdp xsk)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {