* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/
@ 2023-11-27 8:35 Matthew Smith
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Smith @ 2023-11-27 8:35 UTC (permalink / raw
To: gentoo-commits
commit: f94aa3d33429bf55f0e948af14b719d160e8b2af
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 08:35:28 2023 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 08:35:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94aa3d3
net-dns/knot-resolver: drop vulnerable 5.6.0, 5.6.0-r1, 5.6.0-r2
Bug: https://bugs.gentoo.org/918587
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
net-dns/knot-resolver/Manifest | 2 -
net-dns/knot-resolver/files/kresd.confd | 5 --
net-dns/knot-resolver/files/kresd.initd | 23 ------
.../knot-resolver/knot-resolver-5.6.0-r1.ebuild | 96 ----------------------
.../knot-resolver/knot-resolver-5.6.0-r2.ebuild | 96 ----------------------
net-dns/knot-resolver/knot-resolver-5.6.0.ebuild | 93 ---------------------
6 files changed, 315 deletions(-)
diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index 85106ad91e9d..1dce09d66a1b 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,4 +1,2 @@
-DIST knot-resolver-5.6.0.tar.xz 1923196 BLAKE2B 8d1595e29ca5a3d597f15eda799a1e4e91bcd992c25f442f7b9247b4facec21fb41a89c4db3b2efcd8b8384d9463965ea16c617950fb408685ee6d565686d4e2 SHA512 efa978a8885e9aa6459bad8016e872ded5923d6c4367bb9586764ebfbad903923583ede9cab6339107d32450bf0846a40b8ab72ba7011d57827a86d822b95840
-DIST knot-resolver-5.6.0.tar.xz.asc 833 BLAKE2B 0a5ea3a5458be6a9b8a6cb34e3862119a53841b98148cc543046d745e14cfb49952bf2dbece6cfb3ed302affbcc6dce1911fc8900c0f4cb0acf22698d8b2257c SHA512 1c3ebe636b8295b31fffe08bd1ffade9d6c83a0584ef5cf84cb9f3951260b2e77272c4524789f244cd209381c7adb8c2e4b140e2fae616927a7d037cb187b165
DIST knot-resolver-5.7.0.tar.xz 1926196 BLAKE2B 8debd339b12781374721b4800957d4a30ed1e3455110babbab4ad9cac7b72eabe3436fe42c97a6c898d6ac48644102ac8afcbbaca435d8fc7c54fd7bd21c2457 SHA512 38095b94ef341717ba99f1dd354fe184acdce05cb234ff685d2ff84992d8cba6ca1b8b3623998dfd3ffe9d728282963c6973c30996b836060c75e1d2ac3ee544
DIST knot-resolver-5.7.0.tar.xz.asc 833 BLAKE2B 1a8384c1db6101ab52db3b7472f6d0022e7046b0544cfc272807376391994c7d57f53a1def2be68cc86a587997bc64d8bddcfbda07969b5ae8573a9396394619 SHA512 a0403af705ac39d80ec0a3a608e0210f50bc647c078a8dc74a3c814b6c3541a777a2c83ce11c448a10ac9bfa8f96b38537c5a54c2d4cd15ba3ee402793eb92a4
diff --git a/net-dns/knot-resolver/files/kresd.confd b/net-dns/knot-resolver/files/kresd.confd
deleted file mode 100644
index 6749da309845..000000000000
--- a/net-dns/knot-resolver/files/kresd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2023 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-KRESD_OPTS="-n /var/run/kresd"
-
-#KRESD_PIDFILE="/var/run/kresd.pid"
\ No newline at end of file
diff --git a/net-dns/knot-resolver/files/kresd.initd b/net-dns/knot-resolver/files/kresd.initd
deleted file mode 100644
index b443d98d749d..000000000000
--- a/net-dns/knot-resolver/files/kresd.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/kresd"
-command_args="${KRESD_OPTS}"
-pidfile="${KRESD_PIDFILE:-/var/run/${RC_SVCNAME}.pid}"
-command_background=true
-start_stop_daemon_args="--start -bm --pidfile ${pidfile} --exec ${command} -- ${command_args}"
-
-name="knot-resolver"
-description="scaleable caching DNS resolver"
-
-depend() {
- need net
- use logger
- provide dns
-}
-
-start() {
- checkpath --directory /var/run/kresd
- default_start
-}
diff --git a/net-dns/knot-resolver/knot-resolver-5.6.0-r1.ebuild b/net-dns/knot-resolver/knot-resolver-5.6.0-r1.ebuild
deleted file mode 100644
index dd8eb0f8c6c6..000000000000
--- a/net-dns/knot-resolver/knot-resolver-5.6.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-
-inherit lua-single meson tmpfiles verify-sig
-
-DESCRIPTION="A scaleable caching DNS resolver"
-HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
-SRC_URI="
- https://secure.nic.cz/files/${PN}/${P}.tar.xz
- verify-sig? ( https://secure.nic.cz/files/${PN}/${P}.tar.xz.asc )
-"
-
-LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="caps dnstap kresc nghttp2 systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- ${LUA_DEPS}
- acct-group/knot-resolver
- acct-user/knot-resolver
- dev-db/lmdb:=
- dev-libs/libuv:=
- net-dns/knot:=
- net-libs/gnutls:=
- caps? ( sys-libs/libcap-ng )
- dnstap? (
- dev-libs/fstrm
- dev-libs/protobuf-c:=
- )
- kresc? ( dev-libs/libedit )
- nghttp2? ( net-libs/nghttp2:= )
- systemd? ( sys-apps/systemd:= )
-"
-DEPEND="
- ${RDEPEND}
- test? (
- dev-util/cmocka
- )
-"
-BDEPEND="
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-knot-resolver )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.5.3-docdir.patch
- "${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
-
-src_unpack() {
- if use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
- fi
-
- unpack ${P}.tar.xz
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var # double lib
- # https://bugs.gentoo.org/870019
- -Dauto_features=disabled
- -Ddoc=disabled
- -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
- -Dopenssl=disabled
- $(meson_feature caps capng)
- $(meson_feature dnstap)
- $(meson_feature kresc client)
- $(meson_feature nghttp2)
- $(meson_feature test unit_tests)
- $(meson_feature systemd systemd_files)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- fowners -R ${PN}: /etc/${PN}
-
- newinitd "${FILESDIR}"/kresd.initd kresd
- newconfd "${FILESDIR}"/kresd.confd kresd
-}
-
-pkg_postinst() {
- use systemd && tmpfiles_process knot-resolver.conf
-}
diff --git a/net-dns/knot-resolver/knot-resolver-5.6.0-r2.ebuild b/net-dns/knot-resolver/knot-resolver-5.6.0-r2.ebuild
deleted file mode 100644
index 7e20818b9341..000000000000
--- a/net-dns/knot-resolver/knot-resolver-5.6.0-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-
-inherit lua-single meson tmpfiles verify-sig
-
-DESCRIPTION="A scaleable caching DNS resolver"
-HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
-SRC_URI="
- https://secure.nic.cz/files/${PN}/${P}.tar.xz
- verify-sig? ( https://secure.nic.cz/files/${PN}/${P}.tar.xz.asc )
-"
-
-LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="caps dnstap kresc nghttp2 systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- ${LUA_DEPS}
- acct-group/knot-resolver
- acct-user/knot-resolver
- dev-db/lmdb:=
- dev-libs/libuv:=
- net-dns/knot:=
- net-libs/gnutls:=
- caps? ( sys-libs/libcap-ng )
- dnstap? (
- dev-libs/fstrm
- dev-libs/protobuf-c:=
- )
- kresc? ( dev-libs/libedit )
- nghttp2? ( net-libs/nghttp2:= )
- systemd? ( sys-apps/systemd:= )
-"
-DEPEND="
- ${RDEPEND}
- test? (
- dev-util/cmocka
- )
-"
-BDEPEND="
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-knot-resolver )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.5.3-docdir.patch
- "${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
-
-src_unpack() {
- if use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
- fi
-
- unpack ${P}.tar.xz
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var # double lib
- # https://bugs.gentoo.org/870019
- -Dauto_features=disabled
- -Ddoc=disabled
- -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
- -Dopenssl=disabled
- $(meson_feature caps capng)
- $(meson_feature dnstap)
- $(meson_feature kresc client)
- $(meson_feature nghttp2)
- $(meson_feature test unit_tests)
- $(meson_feature systemd systemd_files)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- fowners -R ${PN}: /etc/${PN}
-
- newinitd "${FILESDIR}"/kresd.initd-r1 kresd
- newconfd "${FILESDIR}"/kresd.confd-r1 kresd
-}
-
-pkg_postinst() {
- use systemd && tmpfiles_process knot-resolver.conf
-}
diff --git a/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild b/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
deleted file mode 100644
index d5db86644e66..000000000000
--- a/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-
-inherit lua-single meson tmpfiles verify-sig
-
-DESCRIPTION="A scaleable caching DNS resolver"
-HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
-SRC_URI="
- https://secure.nic.cz/files/${PN}/${P}.tar.xz
- verify-sig? ( https://secure.nic.cz/files/${PN}/${P}.tar.xz.asc )
-"
-
-LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="caps dnstap kresc nghttp2 systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- ${LUA_DEPS}
- acct-group/knot-resolver
- acct-user/knot-resolver
- dev-db/lmdb:=
- dev-libs/libuv:=
- net-dns/knot:=
- net-libs/gnutls:=
- caps? ( sys-libs/libcap-ng )
- dnstap? (
- dev-libs/fstrm
- dev-libs/protobuf-c:=
- )
- kresc? ( dev-libs/libedit )
- nghttp2? ( net-libs/nghttp2:= )
- systemd? ( sys-apps/systemd:= )
-"
-DEPEND="
- ${RDEPEND}
- test? (
- dev-util/cmocka
- )
-"
-BDEPEND="
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-knot-resolver )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.5.3-docdir.patch
- "${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
-
-src_unpack() {
- if use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
- fi
-
- unpack ${P}.tar.xz
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var # double lib
- # https://bugs.gentoo.org/870019
- -Dauto_features=disabled
- -Ddoc=disabled
- -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
- -Dopenssl=disabled
- $(meson_feature caps capng)
- $(meson_feature dnstap)
- $(meson_feature kresc client)
- $(meson_feature nghttp2)
- $(meson_feature test unit_tests)
- $(meson_feature systemd systemd_files)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- fowners -R ${PN}: /etc/${PN}
-}
-
-pkg_postinst() {
- use systemd && tmpfiles_process knot-resolver.conf
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/
@ 2024-01-21 14:12 Matthew Smith
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Smith @ 2024-01-21 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 91c56fb74d6419e4384f56a6dd514a33cdef5ca8
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 14:11:02 2024 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 14:12:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c56fb7
net-dns/knot-resolver: always install tmpfiles config
Closes: https://bugs.gentoo.org/921567
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
.../files/knot-resolver-5.7.0-tmpfiles.patch | 47 ++++++++++++++++++++++
...-5.7.0.ebuild => knot-resolver-5.7.0-r1.ebuild} | 7 +++-
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch b/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
new file mode 100644
index 000000000000..e199806972cb
--- /dev/null
+++ b/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
@@ -0,0 +1,47 @@
+Always install tmpfiles config.
+
+Bug: https://bugs.gentoo.org/921567
+Bug: https://gitlab.nic.cz/knot/knot-resolver/-/issues/886
+--- a/systemd/meson.build
++++ b/systemd/meson.build
+@@ -12,6 +12,18 @@ systemd_config.set('etc_dir', etc_dir)
+ systemd_config.set('run_dir', run_dir)
+ systemd_config.set('lib_dir', lib_dir)
+
++## tmpfiles
++tmpfiles = configure_file(
++ input: 'tmpfiles.d/knot-resolver.conf.in',
++ output: 'knot-resolver.tmpfiles',
++ configuration: systemd_config,
++)
++install_data(
++ tmpfiles,
++ rename: ['knot-resolver.conf'],
++ install_dir: systemd_tmpfiles_dir,
++)
++
+ if systemd_files == 'enabled'
+ ## unit files
+ kresd_service = configure_file(
+@@ -39,18 +51,6 @@ if systemd_files == 'enabled'
+ )
+ install_man(kresd_systemd_man)
+
+- ## tmpfiles
+- tmpfiles = configure_file(
+- input: 'tmpfiles.d/knot-resolver.conf.in',
+- output: 'knot-resolver.tmpfiles',
+- configuration: systemd_config,
+- )
+- install_data(
+- tmpfiles,
+- rename: ['knot-resolver.conf'],
+- install_dir: systemd_tmpfiles_dir,
+- )
+-
+ ## sysusers
+ sysusers = configure_file(
+ input: 'sysusers.d/knot-resolver.conf.in',
+--
+2.43.0
+
diff --git a/net-dns/knot-resolver/knot-resolver-5.7.0.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
similarity index 93%
rename from net-dns/knot-resolver/knot-resolver-5.7.0.ebuild
rename to net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
index 7388f32ffb47..23e7e7d6f11e 100644
--- a/net-dns/knot-resolver/knot-resolver-5.7.0.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -52,6 +52,9 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-5.5.3-docdir.patch
"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
+
+ # Bug #921567
+ "${FILESDIR}"/${PN}-5.7.0-tmpfiles.patch
)
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
@@ -92,5 +95,5 @@ src_install() {
}
pkg_postinst() {
- use systemd && tmpfiles_process knot-resolver.conf
+ tmpfiles_process knot-resolver.conf
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/
@ 2024-01-21 19:46 Matthew Smith
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Smith @ 2024-01-21 19:46 UTC (permalink / raw
To: gentoo-commits
commit: a68f45ea0f1c0f438465e8f401744a41294c8b24
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 19:44:11 2024 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 19:44:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68f45ea
net-dns/knot-resolver: fix USE=-systemd tmpfiles
Closes: https://bugs.gentoo.org/922635
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
...tmpfiles.patch => knot-resolver-5.7.0-r2-tmpfiles.patch} | 13 +++++++++++++
...solver-5.7.0-r1.ebuild => knot-resolver-5.7.0-r2.ebuild} | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
similarity index 85%
rename from net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
rename to net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
index e199806972cb..a909a6e8c89b 100644
--- a/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
+++ b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
@@ -2,6 +2,19 @@ Always install tmpfiles config.
Bug: https://bugs.gentoo.org/921567
Bug: https://gitlab.nic.cz/knot/knot-resolver/-/issues/886
+--- a/meson.build
++++ b/meson.build
+@@ -237,9 +237,7 @@ subdir('etc')
+
+
+ # Systemd unit files
+-if systemd_files != 'disabled'
+- subdir('systemd')
+-endif
++subdir('systemd')
+
+
+ # Additional files
--- a/systemd/meson.build
+++ b/systemd/meson.build
@@ -12,6 +12,18 @@ systemd_config.set('etc_dir', etc_dir)
diff --git a/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
similarity index 97%
rename from net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
rename to net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
index 23e7e7d6f11e..6757ff637a8b 100644
--- a/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
@@ -54,7 +54,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
# Bug #921567
- "${FILESDIR}"/${PN}-5.7.0-tmpfiles.patch
+ "${FILESDIR}"/${PN}-5.7.0-r2-tmpfiles.patch
)
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/
@ 2024-11-22 7:38 Florian Schmaus
0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2024-11-22 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 3a62b7a576b34cd468e35861e94b9b779b38ac48
Author: PPN-SD <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Wed Oct 16 19:42:14 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 07:27:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a62b7a5
net-dns/knot-resolver: add 5.7.4
useflag systemd reworked
useflag xdp added
Signed-off-by: PPN-SD <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-dns/knot-resolver/Manifest | 2 +
.../files/knot-resolver-5.7.4-libsystemd.patch | 25 ++++++
net-dns/knot-resolver/knot-resolver-5.7.4.ebuild | 92 ++++++++++++++++++++++
net-dns/knot-resolver/metadata.xml | 3 +
4 files changed, 122 insertions(+)
diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index 1cc82c44b65a..a237914c0214 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,2 +1,4 @@
DIST knot-resolver-5.7.2.tar.xz 1928336 BLAKE2B c4f17a050752a5d1ed141bae646f53f313e866b91b80bb72d37c6b2907d365333ca02fbadf4ff49e5559b721b695d1e7af3417a25e0518dbdfdec1860f890408 SHA512 973e9a541b54cee0d230247d279785a83ce2127216b12ee9f314a49adedac3e23e8369900d6f0985b0a666e9bcae7772f29224565e6208ed4988b13530e4ff0b
DIST knot-resolver-5.7.2.tar.xz.asc 833 BLAKE2B f73f52d7b2326a58a37b821cd8495d20c93017bd1f7bad2cc828f807f1886fc376dc95405b3b36047719f8566e27d7c1052b7ab11fae3d1d67c5563a293d965e SHA512 cf05ceca455400004cf249b1029b93619a1d5fcf839bca1259a7b411a1ddef1da0aff187ea0023c587de1981e91a8d26af3bb22341cf426e5055e8ca1c4024e2
+DIST knot-resolver-5.7.4.tar.xz 1931124 BLAKE2B 670bd0bac1417fde0f7b6a02797e49e22af081e55b63c23e1fcd8dee369f21b7a2a8997fe641f69e7f0de5cbc7960307f32c939eb85c260fb2de015542dfce1e SHA512 5d8ea5b5b0cba5a1058aaa6e04573c838895d6b2c204e8d09c9ad898fb074c52ef7589afdad164b007edf151167d31fd0f940466edfeec597f96e5bc1cd72171
+DIST knot-resolver-5.7.4.tar.xz.asc 833 BLAKE2B 6432bc23ff779998eb351d57db34bcd9e41ea928fa5d83463122012d8adad16edec7afbcbfb0f0b41789c7797c895216b793ced2d6a01d69fdc3b0f2d12879cb SHA512 d34a0e1fd8be372c325199ace5bb6f20b2b395a4fb5a6f6f4c2c89f29741ecfd36234900b0e836c174df831716012589231551b13426a6728e37aba6c74c197f
diff --git a/net-dns/knot-resolver/files/knot-resolver-5.7.4-libsystemd.patch b/net-dns/knot-resolver/files/knot-resolver-5.7.4-libsystemd.patch
new file mode 100644
index 000000000000..faa9d33cd464
--- /dev/null
+++ b/net-dns/knot-resolver/files/knot-resolver-5.7.4-libsystemd.patch
@@ -0,0 +1,25 @@
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -229,3 +229,10 @@
+ value: 'auto',
+ description: 'add rpath to the knot resolver executables',
+ )
++
++option(
++ 'systemd',
++ type: 'feature',
++ value: 'auto',
++ description: 'systemd watchdog support',
++)
+
+--- a/meson.build
++++ b/meson.build
+@@ -126,7 +126,7 @@
+
+ ### Systemd
+ systemd_files = get_option('systemd_files')
+-libsystemd = dependency('libsystemd', required: systemd_files == 'enabled')
++libsystemd = dependency('libsystemd', required: get_option('systemd'))
+
+ ### Allocator
+ # use empty name to disable the dependency, but still compile the dependent kresd
diff --git a/net-dns/knot-resolver/knot-resolver-5.7.4.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.4.ebuild
new file mode 100644
index 000000000000..6a8533cca0cc
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.7.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+
+inherit lua-single meson tmpfiles verify-sig
+
+DESCRIPTION="A scaleable caching DNS resolver"
+HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
+SRC_URI="
+ https://knot-resolver.nic.cz/release/${P}.tar.xz
+ verify-sig? ( https://knot-resolver.nic.cz/release/${P}.tar.xz.asc )
+"
+
+LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="caps dnstap jemalloc kresc nghttp2 systemd test xdp"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+ ${LUA_DEPS}
+ acct-group/knot-resolver
+ acct-user/knot-resolver
+ dev-db/lmdb:=
+ net-dns/knot:=
+ dev-libs/libuv:=
+ net-libs/gnutls:=
+ caps? ( sys-libs/libcap-ng )
+ dnstap? (
+ dev-libs/fstrm
+ dev-libs/protobuf-c:=
+ )
+ jemalloc? ( dev-libs/jemalloc:= )
+ kresc? ( dev-libs/libedit )
+ nghttp2? ( net-libs/nghttp2:= )
+ systemd? ( sys-apps/systemd:= )
+ xdp? ( net-dns/knot:=[xdp] )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-util/cmocka )
+"
+BDEPEND="
+ virtual/pkgconfig
+ verify-sig? ( >=sec-keys/openpgp-keys-knot-resolver-20240304 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.5.3-docdir.patch
+ "${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
+ "${FILESDIR}"/${PN}-5.7.4-libsystemd.patch
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
+
+src_configure() {
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var # double lib
+ # https://bugs.gentoo.org/870019
+ -Dauto_features=disabled
+ -Ddoc=disabled
+ -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+ -Dopenssl=disabled
+ -Dmalloc=$(usex jemalloc jemalloc disabled)
+ -Dsystemd_files=enabled
+ $(meson_feature caps capng)
+ $(meson_feature dnstap)
+ $(meson_feature kresc client)
+ $(meson_feature nghttp2)
+ $(meson_feature systemd)
+ $(meson_feature test unit_tests)
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ fowners -R ${PN}: /etc/${PN}
+
+ newinitd "${FILESDIR}"/kresd.initd-r1 kresd
+ newconfd "${FILESDIR}"/kresd.confd-r1 kresd
+}
+
+pkg_postinst() {
+ tmpfiles_process knot-resolver.conf
+}
diff --git a/net-dns/knot-resolver/metadata.xml b/net-dns/knot-resolver/metadata.xml
index a535381c62c3..c6e3e25b513e 100644
--- a/net-dns/knot-resolver/metadata.xml
+++ b/net-dns/knot-resolver/metadata.xml
@@ -12,5 +12,8 @@
<flag name="nghttp2">
DNS-over-HTTPS support
</flag>
+ <flag name="xdp">
+ Enable eXpress Data Path
+ </flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/
@ 2025-02-16 16:36 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-02-16 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 4c13b122e477a9a26c908e77148187f153b4f643
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Thu Jan 23 13:49:01 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 16:34:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c13b122
net-dns/knot-resolver: drop 5.7.2
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-dns/knot-resolver/Manifest | 2 -
.../files/knot-resolver-5.7.0-r2-tmpfiles.patch | 60 ------------
net-dns/knot-resolver/files/kresd.initd-r1 | 31 -------
net-dns/knot-resolver/knot-resolver-5.7.2.ebuild | 101 ---------------------
4 files changed, 194 deletions(-)
diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index c38fb5295503..c1b1ecd370d2 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,5 +1,3 @@
-DIST knot-resolver-5.7.2.tar.xz 1928336 BLAKE2B c4f17a050752a5d1ed141bae646f53f313e866b91b80bb72d37c6b2907d365333ca02fbadf4ff49e5559b721b695d1e7af3417a25e0518dbdfdec1860f890408 SHA512 973e9a541b54cee0d230247d279785a83ce2127216b12ee9f314a49adedac3e23e8369900d6f0985b0a666e9bcae7772f29224565e6208ed4988b13530e4ff0b
-DIST knot-resolver-5.7.2.tar.xz.asc 833 BLAKE2B f73f52d7b2326a58a37b821cd8495d20c93017bd1f7bad2cc828f807f1886fc376dc95405b3b36047719f8566e27d7c1052b7ab11fae3d1d67c5563a293d965e SHA512 cf05ceca455400004cf249b1029b93619a1d5fcf839bca1259a7b411a1ddef1da0aff187ea0023c587de1981e91a8d26af3bb22341cf426e5055e8ca1c4024e2
DIST knot-resolver-5.7.4.tar.xz 1931124 BLAKE2B 670bd0bac1417fde0f7b6a02797e49e22af081e55b63c23e1fcd8dee369f21b7a2a8997fe641f69e7f0de5cbc7960307f32c939eb85c260fb2de015542dfce1e SHA512 5d8ea5b5b0cba5a1058aaa6e04573c838895d6b2c204e8d09c9ad898fb074c52ef7589afdad164b007edf151167d31fd0f940466edfeec597f96e5bc1cd72171
DIST knot-resolver-5.7.4.tar.xz.asc 833 BLAKE2B 6432bc23ff779998eb351d57db34bcd9e41ea928fa5d83463122012d8adad16edec7afbcbfb0f0b41789c7797c895216b793ced2d6a01d69fdc3b0f2d12879cb SHA512 d34a0e1fd8be372c325199ace5bb6f20b2b395a4fb5a6f6f4c2c89f29741ecfd36234900b0e836c174df831716012589231551b13426a6728e37aba6c74c197f
DIST knot-resolver-6.0.10.tar.xz 2138660 BLAKE2B 9a80e76272b4cb7a30b75b832627529dfbdec7114ef25a576c9a590221e21ef17efef23ec328783f2b687e8f2e0d0cee5b54048a37a0d08a35004ba3e510e14c SHA512 63d5c7a45ca52f02616ac6374625ccddd631cd71a5b6ebc99498e0c28f581eefef1dd5bbb0d8676f1ec53c2023f2b28cebc432e981c51b6166b4b3b1d8443704
diff --git a/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
deleted file mode 100644
index a909a6e8c89b..000000000000
--- a/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Always install tmpfiles config.
-
-Bug: https://bugs.gentoo.org/921567
-Bug: https://gitlab.nic.cz/knot/knot-resolver/-/issues/886
---- a/meson.build
-+++ b/meson.build
-@@ -237,9 +237,7 @@ subdir('etc')
-
-
- # Systemd unit files
--if systemd_files != 'disabled'
-- subdir('systemd')
--endif
-+subdir('systemd')
-
-
- # Additional files
---- a/systemd/meson.build
-+++ b/systemd/meson.build
-@@ -12,6 +12,18 @@ systemd_config.set('etc_dir', etc_dir)
- systemd_config.set('run_dir', run_dir)
- systemd_config.set('lib_dir', lib_dir)
-
-+## tmpfiles
-+tmpfiles = configure_file(
-+ input: 'tmpfiles.d/knot-resolver.conf.in',
-+ output: 'knot-resolver.tmpfiles',
-+ configuration: systemd_config,
-+)
-+install_data(
-+ tmpfiles,
-+ rename: ['knot-resolver.conf'],
-+ install_dir: systemd_tmpfiles_dir,
-+)
-+
- if systemd_files == 'enabled'
- ## unit files
- kresd_service = configure_file(
-@@ -39,18 +51,6 @@ if systemd_files == 'enabled'
- )
- install_man(kresd_systemd_man)
-
-- ## tmpfiles
-- tmpfiles = configure_file(
-- input: 'tmpfiles.d/knot-resolver.conf.in',
-- output: 'knot-resolver.tmpfiles',
-- configuration: systemd_config,
-- )
-- install_data(
-- tmpfiles,
-- rename: ['knot-resolver.conf'],
-- install_dir: systemd_tmpfiles_dir,
-- )
--
- ## sysusers
- sysusers = configure_file(
- input: 'sysusers.d/knot-resolver.conf.in',
---
-2.43.0
-
diff --git a/net-dns/knot-resolver/files/kresd.initd-r1 b/net-dns/knot-resolver/files/kresd.initd-r1
deleted file mode 100644
index 9732b48cc2cb..000000000000
--- a/net-dns/knot-resolver/files/kresd.initd-r1
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${KRESD_GROUP:=knot-resolver}
-: ${KRESD_USER:=knot-resolver}
-: ${KRESD_CONFIG:=/etc/knot-resolver/kresd.conf}
-: ${KRESD_RUNDIR:=/var/run/kresd}
-: ${KRESD_PIDFILE:=/var/run/kresd.pid}
-
-command="/usr/sbin/kresd"
-command_args="${KRESD_OPTS} -n -c ${KRESD_CONFIG} ${KRESD_RUNDIR}"
-command_user="${KRESD_USER}:${KRESD_GROUP}"
-pidfile="${KRESD_PIDFILE}"
-command_background=true
-retry="TERM/60/KILL/5"
-
-capabilities="^cap_net_bind_service,^cap_setpcap"
-
-name="knot-resolver"
-description="scaleable caching DNS resolver"
-
-depend() {
- need net
- use logger
- provide dns
-}
-
-start_pre() {
- checkpath -d -m 0750 -o "${KRESD_USER}:${KRESD_GROUP}" ${KRESD_RUNDIR}
-}
diff --git a/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild
deleted file mode 100644
index f6591f2c3a50..000000000000
--- a/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-
-inherit lua-single meson tmpfiles verify-sig
-
-DESCRIPTION="A scaleable caching DNS resolver"
-HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
-SRC_URI="
- https://knot-resolver.nic.cz/release/${P}.tar.xz
- verify-sig? ( https://knot-resolver.nic.cz/release/${P}.tar.xz.asc )
-"
-
-LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="caps dnstap jemalloc kresc nghttp2 systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- ${LUA_DEPS}
- acct-group/knot-resolver
- acct-user/knot-resolver
- dev-db/lmdb:=
- dev-libs/libuv:=
- net-dns/knot:=
- net-libs/gnutls:=
- caps? ( sys-libs/libcap-ng )
- dnstap? (
- dev-libs/fstrm
- dev-libs/protobuf-c:=
- )
- jemalloc? ( dev-libs/jemalloc:= )
- kresc? ( dev-libs/libedit )
- nghttp2? ( net-libs/nghttp2:= )
- systemd? ( sys-apps/systemd:= )
-"
-DEPEND="
- ${RDEPEND}
- test? (
- dev-util/cmocka
- )
-"
-BDEPEND="
- virtual/pkgconfig
- verify-sig? ( >=sec-keys/openpgp-keys-knot-resolver-20240304 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.5.3-docdir.patch
- "${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
-
- # Bug #921567
- "${FILESDIR}"/${PN}-5.7.0-r2-tmpfiles.patch
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
-
-src_unpack() {
- if use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
- fi
-
- unpack ${P}.tar.xz
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var # double lib
- # https://bugs.gentoo.org/870019
- -Dauto_features=disabled
- -Ddoc=disabled
- -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
- -Dopenssl=disabled
- -Dmalloc=$(usex jemalloc jemalloc disabled)
- $(meson_feature caps capng)
- $(meson_feature dnstap)
- $(meson_feature kresc client)
- $(meson_feature nghttp2)
- $(meson_feature test unit_tests)
- $(meson_feature systemd systemd_files)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- fowners -R ${PN}: /etc/${PN}
-
- newinitd "${FILESDIR}"/kresd.initd-r1 kresd
- newconfd "${FILESDIR}"/kresd.confd-r1 kresd
-}
-
-pkg_postinst() {
- tmpfiles_process knot-resolver.conf
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-02-16 16:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-21 19:46 [gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/ Matthew Smith
-- strict thread matches above, loose matches on Subject: below --
2025-02-16 16:36 Sam James
2024-11-22 7:38 Florian Schmaus
2024-01-21 14:12 Matthew Smith
2023-11-27 8:35 Matthew Smith
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox