commit:     3c8c03a206c3b868d48a4adf927de046286f5f73
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Thu Sep 18 12:40:59 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 18 22:59:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c8c03a2

net-dns/dnsdist: add 1.9.11, 2.0.1 for CVE-2025-8671

Also clean up 2.0.0.

Bug: https://bugs.gentoo.org/962197
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Part-of: https://github.com/gentoo/gentoo/pull/43836
Closes: https://github.com/gentoo/gentoo/pull/43836
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/dnsdist/Manifest                           |  7 ++--
 ...{dnsdist-2.0.0.ebuild => dnsdist-1.9.11.ebuild} | 39 ++++------------------
 .../{dnsdist-2.0.0.ebuild => dnsdist-2.0.1.ebuild} |  0
 3 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 7d00cad96205..1deff8da9c1c 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,4 +1,5 @@
 DIST dnsdist-1.9.10.tar.bz2 1598472 BLAKE2B 
ea66ca17ef66ecc64fd3a7379b22c2b0448c2a41f325e574a4edb20dfe408315be84a407b78f30a441479fbbcba31a28da2e310c275877739918ad3f9870acd1
 SHA512 
d7249861bb5454dce3d179701e1c686c5c5ed177ca39b07ca6b1f27d2ab7a014d0d255ee6b70153962dc5d9a84545ae4a4a55c53c8e75f308cda5406eed57e9b
-DIST dnsdist-2.0.0.tar.xz 2275260 BLAKE2B 
890bd555ec539ef5d3e9906e15410006471f1dc4848c768a3c631fe399f35e8b42ffc01a53aa9ff3b2f1248d635b9f9b90c1527f7e391848795b28c065398290
 SHA512 
dee84019ae317bc4e0b4d2f94e38a221bfa94460d3bb8d82ad152eed99bef1e2bd2631f5c1e6930fb9957a928ed9cf891ef8165137cd8ec1902fb734d5aab8fb
-DIST dnsdist-docs-2.0.0.tar.xz 1384988 BLAKE2B 
faaf319de9ae2d85870cf62df791769fe2600a0af4c76b4b075337be32acfcf735d8193abff5deb45726fe8005f9909d9b7fd760c8c91db1b875f5647e453a5c
 SHA512 
df652d67c55f8478331652dd8f31bc90c8a6fb4eb139706e4ac0a4721c3aa84f6f7b2da0c0de76c801f7a1d56bb01415384b27ee6b2ade6965d14d7a25958f91
-DIST dnsdist-rust-2.0.0-crates.tar.xz 5268364 BLAKE2B 
36b370eacb7332d04de0fa1be2a49983c030c94df00abcc6681180b1ad5fa8bfe3e19744543b3707e305d57649837a632c1400fd4ae1b4626f084310db8f9bad
 SHA512 
a9f1e10a71a9fb2e6879077224823dd278f1a27c5698076e69bc4bcdf89cff5e54ffd0fce90113131358398289400da263b90c895d167cb3c007fcc96654e116
+DIST dnsdist-1.9.11.tar.bz2 1598511 BLAKE2B 
54b197e625e10aa84238264e33b8df398d151645883586c778669741f96f21aee8b2242cec593e9ed2db19a134600cceb5eb69c193a1e527b6da4025b9658c73
 SHA512 
d1460051e4cc30c4df48f640dc18846ea68102227df3ef016cdb63c8ef62151ee99748c370dc3084aa06b9e2c902a9991db8d2134cded71dac18b1271d1bd2db
+DIST dnsdist-2.0.1.tar.xz 2279512 BLAKE2B 
6eee67a678ef1a044f60f8989befdcf84ce487bcbe03d2aedbb196b1393f7b5227e93ca25a56e4c400c4159e6e7ec1474e26311ae76c55116f438de234b724d7
 SHA512 
8e0b6b9d9db36e19c4617e79a36f86f8bc1a0096569dab0dc178ee9fa1b3af3b8baaa40252be9c7450a01e2d169a530edcc8f52e794e4efa649f5f0582b579d1
+DIST dnsdist-docs-2.0.1.tar.xz 1382776 BLAKE2B 
9b701e1c06118f242cf5fef019c015d5bd9608db893c1e708666d572cc8d0b3745f5bd935e76995e2894288a3d039aea9de6a409295ba096a72acd960d4e5507
 SHA512 
fc0ce707ec6dddf0057f8fd4bafe7513017b8e71e39b77e0525a67fbab68bbc1393490368eacad31ffccebebed156d0cc6ec646dbba30369ff67c63d71410057
+DIST dnsdist-rust-2.0.1-crates.tar.xz 5268364 BLAKE2B 
36b370eacb7332d04de0fa1be2a49983c030c94df00abcc6681180b1ad5fa8bfe3e19744543b3707e305d57649837a632c1400fd4ae1b4626f084310db8f9bad
 SHA512 
a9f1e10a71a9fb2e6879077224823dd278f1a27c5698076e69bc4bcdf89cff5e54ffd0fce90113131358398289400da263b90c895d167cb3c007fcc96654e116

diff --git a/net-dns/dnsdist/dnsdist-2.0.0.ebuild 
b/net-dns/dnsdist/dnsdist-1.9.11.ebuild
similarity index 71%
copy from net-dns/dnsdist/dnsdist-2.0.0.ebuild
copy to net-dns/dnsdist/dnsdist-1.9.11.ebuild
index 3efa0746c516..b80492557968 100644
--- a/net-dns/dnsdist/dnsdist-2.0.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.9.11.ebuild
@@ -4,24 +4,20 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{11..14} )
-RUST_MIN_VER=1.85.1
-RUST_OPTIONAL=1
 
-inherit cargo flag-o-matic lua-single python-any-r1
+inherit flag-o-matic lua-single
 
 DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
 HOMEPAGE="https://www.dnsdist.org/index.html";
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.xz
-       doc? ( 
https://www.applied-asynchrony.com/distfiles/${PN}-docs-${PV}.tar.xz )
-       yaml? ( 
https://www.applied-asynchrony.com/distfiles/${PN}-rust-${PV}-crates.tar.xz )"
 
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2";
 LICENSE="GPL-2"
 SLOT="0"
+
 KEYWORDS="~amd64 ~x86"
-IUSE="bpf cdb dnscrypt dnstap doc doh doh3 ipcipher lmdb quic regex snmp +ssl 
systemd test web xdp yaml"
-RESTRICT="!test? ( 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 )
                doh? ( ssl )
@@ -51,19 +47,10 @@ RDEPEND="acct-group/dnsdist
 "
 
 DEPEND="${RDEPEND}"
-BDEPEND="$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-       virtual/pkgconfig
-       yaml? ( ${RUST_DEPEND} )
-"
+BDEPEND="virtual/pkgconfig"
 
 pkg_setup() {
        lua-single_pkg_setup
-       python-any-r1_pkg_setup
-       use yaml && rust_pkg_setup
-}
-
-python_check_deps() {
-       python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
@@ -102,28 +89,14 @@ src_configure() {
                $(use_enable systemd)
                $(use_enable test unit-tests)
                $(use_with xdp xsk)
-               $(use_enable yaml)
        )
 
        econf "${myeconfargs[@]}"
 }
 
-# explicitly implement src_compile/test to override the
-# otherwise automagic cargo_src_compile/test phases
-
-src_compile() {
-       emake
-}
-
-src_test() {
-       emake check
-}
-
 src_install() {
        default
 
-       use doc && dodoc -r "${WORKDIR}"/html
-
        insinto /etc/dnsdist
        doins "${FILESDIR}"/dnsdist.conf.example
 

diff --git a/net-dns/dnsdist/dnsdist-2.0.0.ebuild 
b/net-dns/dnsdist/dnsdist-2.0.1.ebuild
similarity index 100%
rename from net-dns/dnsdist/dnsdist-2.0.0.ebuild
rename to net-dns/dnsdist/dnsdist-2.0.1.ebuild

Reply via email to