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

2024-04-07 Thread Matthew Smith
commit: 42908cf32f480ccffcabecf05c94ea91a2efdcee
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Apr  7 10:38:53 2024 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Apr  7 10:40:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42908cf3

net-dns/knot-resolver: add 5.7.2

Signed-off-by: Matthew Smith  gentoo.org>

 net-dns/knot-resolver/Manifest   |   2 +
 net-dns/knot-resolver/knot-resolver-5.7.2.ebuild | 101 +++
 2 files changed, 103 insertions(+)

diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index f0901331dea4..e689e1deb0f5 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,2 +1,4 @@
 DIST knot-resolver-5.7.1.tar.xz 1928088 BLAKE2B 
66a7f4e5e16a07f4ef2ed7ec42e40068dc9642362deffb2f78a1aa14e7cffe7e170ebde4180d460b9d5701632258e9e2148b34f5967200651762c2e8b5fe371a
 SHA512 
89ebff7e239ea09d9d180386f4551952fb59a3f1d0ca01a172acf27d2eade16ae578142d811333e49ad3a2f629cf5b23d038043c0768469078fcfd5cbfb5020b
 DIST knot-resolver-5.7.1.tar.xz.asc 833 BLAKE2B 
058a040d23a7e55dc9faf7b02967f9e5d9582f2fdbed9b8737843d0e734a1dd1bc7503e367904664fc5f42f79f1839c43aaf1c00a3fbce50c1a7d2ddf7c515cc
 SHA512 
0ec86e0aba583383df4f1ed909ef71a3473bc1412970b91d184372b53c5471ac41e6bf60e9a817c184501113f2d8272c3b0d2c379f80dfe2476ef32c861dd235
+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 
cf05ceca45544cf249b1029b93619a1d5fcf839bca1259a7b411a1ddef1da0aff187ea0023c587de1981e91a8d26af3bb22341cf426e5055e8ca1c4024e2

diff --git a/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild
new file mode 100644
index ..9877746f6cda
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild
@@ -0,0 +1,101 @@
+# 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://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 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() {
+   

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

2024-02-16 Thread Matthew Smith
commit: 62c0efbb862c9a2cfb921f69c8b9c64cc0cde30b
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Feb 16 08:02:47 2024 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Feb 16 08:02:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c0efbb

net-dns/knot-resolver: drop vulnerable 5.7.0-r2

Bug: https://bugs.gentoo.org/924459
Signed-off-by: Matthew Smith  gentoo.org>

 net-dns/knot-resolver/Manifest |  2 -
 .../knot-resolver/knot-resolver-5.7.0-r2.ebuild| 99 --
 2 files changed, 101 deletions(-)

diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index 2972f0eb00dd..f0901331dea4 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,4 +1,2 @@
-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
 DIST knot-resolver-5.7.1.tar.xz 1928088 BLAKE2B 
66a7f4e5e16a07f4ef2ed7ec42e40068dc9642362deffb2f78a1aa14e7cffe7e170ebde4180d460b9d5701632258e9e2148b34f5967200651762c2e8b5fe371a
 SHA512 
89ebff7e239ea09d9d180386f4551952fb59a3f1d0ca01a172acf27d2eade16ae578142d811333e49ad3a2f629cf5b23d038043c0768469078fcfd5cbfb5020b
 DIST knot-resolver-5.7.1.tar.xz.asc 833 BLAKE2B 
058a040d23a7e55dc9faf7b02967f9e5d9582f2fdbed9b8737843d0e734a1dd1bc7503e367904664fc5f42f79f1839c43aaf1c00a3fbce50c1a7d2ddf7c515cc
 SHA512 
0ec86e0aba583383df4f1ed909ef71a3473bc1412970b91d184372b53c5471ac41e6bf60e9a817c184501113f2d8272c3b0d2c379f80dfe2476ef32c861dd235

diff --git a/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
deleted file mode 100644
index 6757ff637a8b..
--- a/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
+++ /dev/null
@@ -1,99 +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://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
-
-   # 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
-   $(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
-}



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

2024-02-15 Thread Sam James
commit: 49b598ae8d1d9ea36a2924ae234a8ec56382f8e2
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 15 20:03:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 15 20:03:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b598ae

net-dns/knot-resolver: Stabilize 5.7.1 amd64, #924497

Signed-off-by: Sam James  gentoo.org>

 net-dns/knot-resolver/knot-resolver-5.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/knot-resolver/knot-resolver-5.7.1.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.7.1.ebuild
index d290dfce00fe..a30c19804140 100644
--- a/net-dns/knot-resolver/knot-resolver-5.7.1.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="caps dnstap jemalloc kresc nghttp2 systemd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"



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

2024-02-14 Thread Matthew Smith
commit: f5f77958c503a234dcf58feabeeb04922ccc986c
Author: Matthew Smith  gentoo  org>
AuthorDate: Wed Feb 14 08:31:27 2024 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Wed Feb 14 08:31:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f77958

net-dns/knot-resolver: add 5.7.1

Add jemalloc USE flag to fix automagic dependency.

Bug: https://bugs.gentoo.org/924459
Signed-off-by: Matthew Smith  gentoo.org>

 net-dns/knot-resolver/Manifest   |   2 +
 net-dns/knot-resolver/knot-resolver-5.7.1.ebuild | 101 +++
 2 files changed, 103 insertions(+)

diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index 1dce09d66a1b..2972f0eb00dd 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,2 +1,4 @@
 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
+DIST knot-resolver-5.7.1.tar.xz 1928088 BLAKE2B 
66a7f4e5e16a07f4ef2ed7ec42e40068dc9642362deffb2f78a1aa14e7cffe7e170ebde4180d460b9d5701632258e9e2148b34f5967200651762c2e8b5fe371a
 SHA512 
89ebff7e239ea09d9d180386f4551952fb59a3f1d0ca01a172acf27d2eade16ae578142d811333e49ad3a2f629cf5b23d038043c0768469078fcfd5cbfb5020b
+DIST knot-resolver-5.7.1.tar.xz.asc 833 BLAKE2B 
058a040d23a7e55dc9faf7b02967f9e5d9582f2fdbed9b8737843d0e734a1dd1bc7503e367904664fc5f42f79f1839c43aaf1c00a3fbce50c1a7d2ddf7c515cc
 SHA512 
0ec86e0aba583383df4f1ed909ef71a3473bc1412970b91d184372b53c5471ac41e6bf60e9a817c184501113f2d8272c3b0d2c379f80dfe2476ef32c861dd235

diff --git a/net-dns/knot-resolver/knot-resolver-5.7.1.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.7.1.ebuild
new file mode 100644
index ..d290dfce00fe
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.7.1.ebuild
@@ -0,0 +1,101 @@
+# 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://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 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 )
+"
+
+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 

[gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/

2024-01-21 Thread Matthew Smith
commit: a68f45ea0f1c0f438465e8f401744a41294c8b24
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Jan 21 19:44:11 2024 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Jan 21 19:44:53 2024 +
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  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



[gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/

2024-01-21 Thread Matthew Smith
commit: 91c56fb74d6419e4384f56a6dd514a33cdef5ca8
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Jan 21 14:11:02 2024 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Jan 21 14:12:06 2024 +
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  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 ..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
 }



[gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/

2023-11-27 Thread Matthew Smith
commit: f94aa3d33429bf55f0e948af14b719d160e8b2af
Author: Matthew Smith  gentoo  org>
AuthorDate: Mon Nov 27 08:35:28 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Mon Nov 27 08:35:28 2023 +
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  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..
--- 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..
--- 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..
--- 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:= )
-"

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

2023-11-26 Thread Sam James
commit: 100a0448932e53b61930cf5b06e02614039b8641
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 26 23:17:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 26 23:18:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100a0448

net-dns/knot-resolver: Stabilize 5.7.0 amd64, #918588

Signed-off-by: Sam James  gentoo.org>

 net-dns/knot-resolver/knot-resolver-5.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/knot-resolver/knot-resolver-5.7.0.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.7.0.ebuild
index 7e20818b9341..7388f32ffb47 100644
--- a/net-dns/knot-resolver/knot-resolver-5.7.0.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="caps dnstap kresc nghttp2 systemd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"



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

2023-09-29 Thread Matthew Smith
commit: 1f6fa51d6bf076c0a93c399fc340f0388041ee88
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Sep 29 10:10:03 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Sep 29 10:10:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6fa51d

net-dns/knot-resolver: add 5.7.0

Signed-off-by: Matthew Smith  gentoo.org>

 net-dns/knot-resolver/Manifest   |  2 +
 net-dns/knot-resolver/knot-resolver-5.7.0.ebuild | 96 
 2 files changed, 98 insertions(+)

diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index 2cf178c5624e..85106ad91e9d 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,2 +1,4 @@
 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/knot-resolver-5.7.0.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.7.0.ebuild
new file mode 100644
index ..1c2b1ab746e9
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.7.0.ebuild
@@ -0,0 +1,96 @@
+# 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="${BROOT}"/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
+}



[gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/files/, net-dns/knot-resolver/

2023-09-17 Thread Matthew Smith
commit: a1c699c2a6c5e30dfd7fa8e645756bb90cf87409
Author: Nicolas PARLANT  parhuet  fr>
AuthorDate: Sun Sep 17 07:35:57 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Sep 17 07:35:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c699c2

net-dns/knot-resolver: drop privileges in kresd.initd

Closes: https://github.com/gentoo/gentoo/pull/32871
Signed-off-by: Nicolas PARLANT  parhuet.fr>
Signed-off-by: Matthew Smith  gentoo.org>

 net-dns/knot-resolver/files/kresd.confd-r1 |  9 ++
 net-dns/knot-resolver/files/kresd.initd-r1 | 31 +++
 .../knot-resolver/knot-resolver-5.6.0-r2.ebuild| 96 ++
 3 files changed, 136 insertions(+)

diff --git a/net-dns/knot-resolver/files/kresd.confd-r1 
b/net-dns/knot-resolver/files/kresd.confd-r1
new file mode 100644
index ..2b67587c646a
--- /dev/null
+++ b/net-dns/knot-resolver/files/kresd.confd-r1
@@ -0,0 +1,9 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+#KRESD_USER=knot-resolver
+#KRESD_GROUP=knot-resolver
+#KRESD_CONFIG="/etc/knot-resolver/kresd.conf"
+#KRESD_RUNDIR="/var/run/kresd"
+#KRESD_PIDFILE="/var/run/kresd.pid"
+KRESD_OPTS=""
\ No newline at end of file

diff --git a/net-dns/knot-resolver/files/kresd.initd-r1 
b/net-dns/knot-resolver/files/kresd.initd-r1
new file mode 100644
index ..9732b48cc2cb
--- /dev/null
+++ b/net-dns/knot-resolver/files/kresd.initd-r1
@@ -0,0 +1,31 @@
+#!/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.6.0-r2.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.6.0-r2.ebuild
new file mode 100644
index ..1c2b1ab746e9
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.6.0-r2.ebuild
@@ -0,0 +1,96 @@
+# 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="${BROOT}"/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}

[gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/files/, net-dns/knot-resolver/

2023-07-26 Thread Matthew Smith
commit: f78480292d1ae4d2a89762eb33fb72101af5d446
Author: Spencer Pavkovic  nandre  com>
AuthorDate: Mon Jul 24 23:51:06 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Wed Jul 26 20:33:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7848029

net-dns/knot-resolver: added OpenRC init script

Signed-off-by: Spencer Pavkovic  nandre.com>
Closes: https://github.com/gentoo/gentoo/pull/32028
Signed-off-by: Matthew Smith  gentoo.org>

 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 ++
 3 files changed, 124 insertions(+)

diff --git a/net-dns/knot-resolver/files/kresd.confd 
b/net-dns/knot-resolver/files/kresd.confd
new file mode 100644
index ..6749da309845
--- /dev/null
+++ b/net-dns/knot-resolver/files/kresd.confd
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index ..b443d98d749d
--- /dev/null
+++ b/net-dns/knot-resolver/files/kresd.initd
@@ -0,0 +1,23 @@
+#!/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
new file mode 100644
index ..eb66bdf93586
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.6.0-r1.ebuild
@@ -0,0 +1,96 @@
+# 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="${BROOT}"/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
+}



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

2023-02-27 Thread Matthew Smith
commit: 1175a164201bad5751040ae5d4a008a31a783332
Author: Matthew Smith  gentoo  org>
AuthorDate: Mon Feb 27 18:22:19 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Mon Feb 27 18:22:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1175a164

net-dns/knot-resolver: drop 5.5.3

Bug: https://bugs.gentoo.org/897928
Signed-off-by: Matthew Smith  gentoo.org>

 net-dns/knot-resolver/Manifest   |  2 -
 net-dns/knot-resolver/knot-resolver-5.5.3.ebuild | 93 
 2 files changed, 95 deletions(-)

diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index b7fadf0b1f97..2cf178c5624e 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,4 +1,2 @@
-DIST knot-resolver-5.5.3.tar.xz 1921668 BLAKE2B 
7efdf1a69081d8f9f43b5bbe1b483826b94b87a0b001a449a5f89988afce070e4e3310e513e6281691bd81274a523ab8c7e52fe56a3d62019efe07809033a5a8
 SHA512 
7bf29bbf82e71727c1f47095a04a12712ca89a6f34d3a325337625ad116f49a47a90cb402525fdbf59cb0889b64d7083b908c335d65429b24d776603a3a8f28a
-DIST knot-resolver-5.5.3.tar.xz.asc 833 BLAKE2B 
7ab348587c2604f14171d09436b2a296e9fb7124e6f899aba91215d32d8642dc5b9ae8300edf55c0790289bc954d5cf95c71b66a20b960c848d15e34469fc2f3
 SHA512 
1e95fffdb1c78a225b5bf861f978c1c18a9935ecd495e8f708ed4a241308b9302d2cf5a5ec51334dbecf50950af5f775bfff78995663cf1681a3dbc354d3a686
 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

diff --git a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
deleted file mode 100644
index e8618808dcc5..
--- a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2022 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="${BROOT}"/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
-}



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

2023-02-27 Thread Sam James
commit: f5e7ff46796c40d310badb87141e0daf5d8a99e6
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 27 15:35:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 27 15:40:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e7ff46

net-dns/knot-resolver: Stabilize 5.6.0 amd64, #898036

Signed-off-by: Sam James  gentoo.org>

 net-dns/knot-resolver/knot-resolver-5.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
index b191f7d5aaa2..eea083aed1b1 100644
--- a/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="caps dnstap kresc nghttp2 systemd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"



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

2023-02-05 Thread Matthew Smith
commit: 0eafb25facf55c318555a236a127193f6d2d883b
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Feb  5 09:31:18 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Feb  5 09:31:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eafb25f

net-dns/knot-resolver: add 5.6.0

Signed-off-by: Matthew Smith  gentoo.org>

 net-dns/knot-resolver/Manifest   |  2 +
 net-dns/knot-resolver/knot-resolver-5.6.0.ebuild | 93 
 2 files changed, 95 insertions(+)

diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index fc41ecdcc09b..b7fadf0b1f97 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,2 +1,4 @@
 DIST knot-resolver-5.5.3.tar.xz 1921668 BLAKE2B 
7efdf1a69081d8f9f43b5bbe1b483826b94b87a0b001a449a5f89988afce070e4e3310e513e6281691bd81274a523ab8c7e52fe56a3d62019efe07809033a5a8
 SHA512 
7bf29bbf82e71727c1f47095a04a12712ca89a6f34d3a325337625ad116f49a47a90cb402525fdbf59cb0889b64d7083b908c335d65429b24d776603a3a8f28a
 DIST knot-resolver-5.5.3.tar.xz.asc 833 BLAKE2B 
7ab348587c2604f14171d09436b2a296e9fb7124e6f899aba91215d32d8642dc5b9ae8300edf55c0790289bc954d5cf95c71b66a20b960c848d15e34469fc2f3
 SHA512 
1e95fffdb1c78a225b5bf861f978c1c18a9935ecd495e8f708ed4a241308b9302d2cf5a5ec51334dbecf50950af5f775bfff78995663cf1681a3dbc354d3a686
+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

diff --git a/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
new file mode 100644
index ..b191f7d5aaa2
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
@@ -0,0 +1,93 @@
+# 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="${BROOT}"/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
+}



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

2022-12-03 Thread Arthur Zamarin
commit: a4d93abc3dd7630088d3cfe1f34fae90df186fda
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec  3 14:42:44 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec  3 14:42:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d93abc

net-dns/knot-resolver: Stabilize 5.5.3 amd64, #884109

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-dns/knot-resolver/knot-resolver-5.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
index e059f6d60333..e8618808dcc5 100644
--- a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="caps dnstap kresc nghttp2 systemd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"



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

2022-11-01 Thread Matthew Smith
commit: edd78a9db2d9bf504bfcffd9c996b8e3f14a82b9
Author: Matthew Smith  gentoo  org>
AuthorDate: Tue Nov  1 17:47:33 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Tue Nov  1 17:47:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd78a9d

net-dns/knot-resolver: add missing verify-sig depend

Closes: https://bugs.gentoo.org/878437
Signed-off-by: Matthew Smith  gentoo.org>

 net-dns/knot-resolver/knot-resolver-5.5.3.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
index 608408bc9bf9..e059f6d60333 100644
--- a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
@@ -44,7 +44,10 @@ DEPEND="
  dev-util/cmocka
)
 "
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+   virtual/pkgconfig
+   verify-sig? ( sec-keys/openpgp-keys-knot-resolver )
+"
 
 PATCHES=(
"${FILESDIR}"/${PN}-5.5.3-docdir.patch



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

2022-10-19 Thread Matthew Smith
commit: 3fcaad40bde3a06a1fa625d5d3aa436dc01825fd
Author: Matthew Smith  gentoo  org>
AuthorDate: Wed Oct 19 14:52:54 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Wed Oct 19 14:52:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fcaad40

net-dns/knot-resolver: only call tmpfiles_process if USE=systemd

Closes: https://bugs.gentoo.org/877337
Signed-off-by: Matthew Smith  gentoo.org>

 net-dns/knot-resolver/knot-resolver-5.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
index 58013de8e63e..608408bc9bf9 100644
--- a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
@@ -86,5 +86,5 @@ src_install() {
 }
 
 pkg_postinst() {
-   tmpfiles_process knot-resolver.conf
+   use systemd && tmpfiles_process knot-resolver.conf
 }



[gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/files/, net-dns/knot-resolver/

2022-10-16 Thread Matthew Smith
commit: c510a209fc1db8d090cdd93a31aaedbc7a436df9
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Oct 16 13:35:15 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Oct 16 13:36:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c510a209

net-dns/knot-resolver: new package, add 5.5.3

Signed-off-by: Matthew Smith  gentoo.org>

 net-dns/knot-resolver/Manifest |  2 +
 .../files/knot-resolver-5.5.3-docdir.patch | 32 
 .../files/knot-resolver-5.5.3-nghttp-openssl.patch | 38 +
 net-dns/knot-resolver/knot-resolver-5.5.3.ebuild   | 90 ++
 net-dns/knot-resolver/metadata.xml | 19 +
 5 files changed, 181 insertions(+)

diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
new file mode 100644
index ..fc41ecdcc09b
--- /dev/null
+++ b/net-dns/knot-resolver/Manifest
@@ -0,0 +1,2 @@
+DIST knot-resolver-5.5.3.tar.xz 1921668 BLAKE2B 
7efdf1a69081d8f9f43b5bbe1b483826b94b87a0b001a449a5f89988afce070e4e3310e513e6281691bd81274a523ab8c7e52fe56a3d62019efe07809033a5a8
 SHA512 
7bf29bbf82e71727c1f47095a04a12712ca89a6f34d3a325337625ad116f49a47a90cb402525fdbf59cb0889b64d7083b908c335d65429b24d776603a3a8f28a
+DIST knot-resolver-5.5.3.tar.xz.asc 833 BLAKE2B 
7ab348587c2604f14171d09436b2a296e9fb7124e6f899aba91215d32d8642dc5b9ae8300edf55c0790289bc954d5cf95c71b66a20b960c848d15e34469fc2f3
 SHA512 
1e95fffdb1c78a225b5bf861f978c1c18a9935ecd495e8f708ed4a241308b9302d2cf5a5ec51334dbecf50950af5f775bfff78995663cf1681a3dbc354d3a686

diff --git a/net-dns/knot-resolver/files/knot-resolver-5.5.3-docdir.patch 
b/net-dns/knot-resolver/files/knot-resolver-5.5.3-docdir.patch
new file mode 100644
index ..d75b98c3acca
--- /dev/null
+++ b/net-dns/knot-resolver/files/knot-resolver-5.5.3-docdir.patch
@@ -0,0 +1,32 @@
+From 4086abfd85e0bacc027ac1773d524093387265f9 Mon Sep 17 00:00:00 2001
+From: Matthew Smith 
+Date: Sun, 16 Oct 2022 13:49:25 +0100
+Subject: [PATCH] build: docdir option
+
+--- a/meson.build
 b/meson.build
+@@ -46,7 +46,7 @@ endif
+ ## Paths
+ prefix = get_option('prefix')
+ data_dir = prefix / get_option('datadir') / 'knot-resolver'
+-doc_dir = prefix / get_option('datadir') / 'doc' / 'knot-resolver'
++doc_dir = get_option('docdir')
+ info_dir = prefix / get_option('datadir') / 'info'
+ examples_dir = doc_dir / 'examples'
+ etc_dir = prefix / get_option('sysconfdir') / 'knot-resolver'
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -1,6 +1,13 @@
+ # Configuration options
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
++option(
++  'docdir',
++  type: 'string',
++  value: '/usr/share/doc/knot-resolver',
++  description: 'path to store documentation',
++)
++
+ option(
+   'keyfile_default',
+   type: 'string',

diff --git 
a/net-dns/knot-resolver/files/knot-resolver-5.5.3-nghttp-openssl.patch 
b/net-dns/knot-resolver/files/knot-resolver-5.5.3-nghttp-openssl.patch
new file mode 100644
index ..49340be1506c
--- /dev/null
+++ b/net-dns/knot-resolver/files/knot-resolver-5.5.3-nghttp-openssl.patch
@@ -0,0 +1,38 @@
+From 30087f85bb8d19586350c2a64648c0578c5c096c Mon Sep 17 00:00:00 2001
+From: Matthew Smith 
+Date: Sun, 16 Oct 2022 13:44:40 +0100
+Subject: [PATCH] build: Add nghttp2 and openssl options
+
+--- a/meson.build
 b/meson.build
+@@ -87,8 +87,8 @@ group = get_option('group')
+ 
+ ## Optional dependencies
+ message('--- optional dependencies ---')
+-nghttp2 = dependency('libnghttp2', required: false)
+-openssl = dependency('openssl', required: false)
++nghttp2 = dependency('libnghttp2', required: get_option('nghttp2'))
++openssl = dependency('openssl', required: get_option('openssl'))
+ 
+ have_asprintf = meson.get_compiler('c').has_function('asprintf',
+   prefix: '#define _GNU_SOURCE\n#include ')
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -205,3 +205,17 @@ option(
+   value: 'auto',
+   description: 'cmocka unit tests',
+ )
++
++option(
++  'nghttp2',
++  type: 'feature',
++  value: 'auto',
++  description: 'dns over https support',
++)
++
++option(
++  'openssl',
++  type: 'feature',
++  value: 'auto',
++  description: 'auxiliary debug library for http module',
++)

diff --git a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild 
b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
new file mode 100644
index ..58013de8e63e
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022 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"