public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot/, net-dns/knot/files/
@ 2015-12-09 14:46 Ian Delaney
  0 siblings, 0 replies; 7+ messages in thread
From: Ian Delaney @ 2015-12-09 14:46 UTC (permalink / raw
  To: gentoo-commits

commit:     76519647495ea758a6ba3148362a6a89d15a1432
Author:     Arc Riley <arcriley <AT> gmail <DOT> com>
AuthorDate: Sat Nov 28 05:25:40 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 11:26:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76519647

net-dns/knot: Version bump; remove old unstable version

 net-dns/knot/Manifest                                      |  3 ++-
 .../files/2.0.0_beta-spell-enable-vars-correctly.patch     | 11 -----------
 ...ies.patch => 2.0.2-dont-create-extra-directories.patch} |  0
 net-dns/knot/files/knot.service                            | 14 ++++++++++++++
 net-dns/knot/{knot-2.0.0_beta.ebuild => knot-2.0.2.ebuild} |  9 +++++----
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index c375116..b11fd13 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,3 +1,4 @@
 DIST knot-1.5.3.tar.gz 1175445 SHA256 8d82ad5b2c7162750dc40c57d45dcae2665171a862767a350379fe1c4e0afcdd SHA512 4426ed136e5bcdb0d2b1729ab838418c880728a045dc1a40a6b6fc2a3b77ddcd7a375c8ec160efb6d009fc12eaf55587cf00af141f84d0bd1eb9cdac888fd445 WHIRLPOOL dbc1f59e2f2801f61dfbff4f2fcdc33e72647226e300adc85e9b0febd996aaad9615da33e21ebe22f83c6bf4c52cbcb7ca3a60fef8b66a9339d08f255909f16d
 DIST knot-1.6.3.tar.xz 785052 SHA256 48da608e29c2c1ef5937eb692f8ef0462ebb50fa7d128478a23e0a9788533e86 SHA512 c39f74ec49ec13d845705a11cf4b5474f101687db5cc44be0c2c8347faacf2fe4436d684a3e96d99afedd8408da1c7b3ad39fa5dc7bc3e52dafc899ac3a04958 WHIRLPOOL 4d6ae6b05be05c5a0c11f707a2c438801e9e7570d1aa2e946f659d9ccec25728c972cfa6caf96ccedb34f95fa28f4e904179cc123f34a78889961902333ce0f5
-DIST knot-2.0.0-beta.tar.xz 939468 SHA256 7ed997d15b523abcaede51d7ce3670a687d7658b96eb742b9dd87ac5d3e0e9af SHA512 98c872eea28b00b5da52ff8c74c6cf1c88b11e3d68038126a76de99ae2b39c60430294382b14a530fc2912cad419a7d509386deb78b7faa64320cdec21a1bc36 WHIRLPOOL 3b505d757a7591d32e33a07e9a46cb210e886a566bed705b326ce4d5be18d62865fdf165a97e21c8ad756631a5a448ef9ded67bae0002047ad209d7dad2ab5b6
+DIST knot-2.0.2.tar.xz 958800 SHA256 0418a22f9e801503993b3c872f2403bf73eab5ef7266128789b0531b41ea0c7e SHA512 5bb36f01a2f39c97d1278be1bb1be60e842a75b3a0f2bc51651907ad937a42229f0df988a5e865de7f869011eb4ac836bda1c5d92c86357ac2556dcf8134b09f WHIRLPOOL f10c2e35d80b8f05959aec9c18360c9ffb7b3572eff278527131271695efd3ed03b1da52b523ef9330dcece17de6ca3314f59e29d18054c057f6ac1368e75308
+

diff --git a/net-dns/knot/files/2.0.0_beta-spell-enable-vars-correctly.patch b/net-dns/knot/files/2.0.0_beta-spell-enable-vars-correctly.patch
deleted file mode 100644
index 5861ee5..0000000
--- a/net-dns/knot/files/2.0.0_beta-spell-enable-vars-correctly.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2015-05-10 19:25:43.365929384 +0200
-+++ configure	2015-05-10 19:26:00.452648532 +0200
-@@ -12833,7 +12833,7 @@
- if test "$enable_daemon" = "yes"; then :
- 
- 
--if test "$enable_system" != "no"; then :
-+if test "$enable_systemd" != "no"; then :
- 
-   case $enable_systemd in #(
-   auto) :

diff --git a/net-dns/knot/files/2.0.0_beta-dont-create-extra-directories.patch b/net-dns/knot/files/2.0.2-dont-create-extra-directories.patch
similarity index 100%
rename from net-dns/knot/files/2.0.0_beta-dont-create-extra-directories.patch
rename to net-dns/knot/files/2.0.2-dont-create-extra-directories.patch

diff --git a/net-dns/knot/files/knot.service b/net-dns/knot/files/knot.service
new file mode 100644
index 0000000..4684f9c
--- /dev/null
+++ b/net-dns/knot/files/knot.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Knot high-performance DNS Server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/knotd
+ExecReload=/usr/sbin/knotc reload
+ExecStop=/usr/sbin/knotc stop
+PrivateTmp=true
+RuntimeDirectory=knot
+RuntimeDirectoryMode=750
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-dns/knot/knot-2.0.0_beta.ebuild b/net-dns/knot/knot-2.0.2.ebuild
similarity index 90%
rename from net-dns/knot/knot-2.0.0_beta.ebuild
rename to net-dns/knot/knot-2.0.2.ebuild
index 0ed9ae0..deb9f03 100644
--- a/net-dns/knot/knot-2.0.0_beta.ebuild
+++ b/net-dns/knot/knot-2.0.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils user
+inherit bash-completion-r1 eutils systemd user
 
 DESCRIPTION="High-performance authoritative-only DNS server"
 HOMEPAGE="http://www.knot-dns.cz/"
@@ -12,7 +12,7 @@ SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="debug dnstap doc caps +fastparser idn systemd"
 
 RDEPEND="
@@ -34,8 +34,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P/_/-}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-spell-enable-vars-correctly.patch"
-	epatch "${FILESDIR}/${PV}-dont-create-extra-directories.patch"
+	epatch "${FILESDIR}/2.0.2-dont-create-extra-directories.patch"
 }
 
 src_configure() {
@@ -43,6 +42,7 @@ src_configure() {
 		--with-storage="${EPREFIX}/var/lib/${PN}" \
 		--with-rundir="${EPREFIX}/var/run/${PN}" \
 		--with-lmdb \
+		--with-bash-completions="$(get_bashcompdir)" \
 		$(use_enable fastparser) \
 		$(use_enable debug debug server,zones,ns,loader,dnssec) \
 		$(use_enable debug debuglevel details) \
@@ -88,6 +88,7 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}/knot.init" knot
+	systemd_dounit "${FILESDIR}/knot.service"
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot/, net-dns/knot/files/
@ 2016-08-30 16:32 Patrice Clement
  0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-08-30 16:32 UTC (permalink / raw
  To: gentoo-commits

commit:     71006dc98d472ee4b0842f4da61de340bc6903b4
Author:     Pierre-Olivier Mercier <nemunaire <AT> nemunai <DOT> re>
AuthorDate: Thu Aug 25 19:49:29 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 16:32:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71006dc9

net-dns/knot: version bump + clean up.

* bump to EAPI=6
* call eapply_user
* generate only HTML documentation
* parallel testing have been fixed
* backport a patch fixing tests on big-endian arch

Gentoo-Bug: https://bugs.gentoo.org/581568
Gentoo-Bug: https://bugs.gentoo.org/588654
Gentoo-Bug: https://bugs.gentoo.org/589166
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2117

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-dns/knot/Manifest                              |   4 +-
 .../1.6.3-dont-create-extra-directories.patch      |  15 --
 .../2.0.2-dont-create-extra-directories.patch      |  15 --
 ...ire-format-when-writing-FNV64-hash-values.patch | 216 +++++++++++++++++++++
 net-dns/knot/files/knot-2.1.0-nettle.patch         |  26 ---
 .../knot/{knot-1.6.6.ebuild => knot-1.6.8.ebuild}  |  45 ++---
 .../knot/{knot-2.1.0.ebuild => knot-2.3.0.ebuild}  |  48 ++---
 7 files changed, 247 insertions(+), 122 deletions(-)

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 9c93d00..5fc7ed3 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,2 +1,2 @@
-DIST knot-1.6.6.tar.xz 793380 SHA256 6ccae42b0878201e2113a048317bf518acad70fe436b04e24da32703d27edf03 SHA512 ac8ab0feb45a584f6e68fda99c818502e48413a6e986c05fa63f9a62363d181b998d9ee19ff777a37fc1a0bdf6faa80eb5c15fddc4a2309223055ddc703d5597 WHIRLPOOL 5cd520404d2981435c9ecdbc55ef0f54268419fea0a01868f05ee6c67bb2248aad63473afed738b55ef1c3e67db15aedc2f30027b86df4f390c2296b8e77b07c
-DIST knot-2.1.0.tar.xz 999188 SHA256 1f6ea98da000386bf86e015655a9ec974d361b62711caf06b55f3d9bb2aa85a9 SHA512 303440fe9d7da86daecc484be6fe0956b6ebd3c55824018c30541767a24b856c8ef5a34a378d38cfaffafa1df7150cea77b2cb28b5bf1b7f97abf28c6d71caa7 WHIRLPOOL 6b44a4ae1e8eb3d8b114e166c148c5a0c6bceb63502080d62d7078a095040c91906d0e9e7a9ee813757247e7c14ef566d28997795e2de6753a63ac9c38944fbe
+DIST knot-1.6.8.tar.xz 806748 SHA256 8d95dfd359fb187289d7d085e217d8fabb6022135d358134ed4165418a269237 SHA512 ee205a0813729bea712b0ac550209538382a2f0a7698607c3baa045a345f08e118e1b927116ad00fa58939051db70a6b21e154259276f3647acc80edf043efc8 WHIRLPOOL ed33ebdf99ba402b18550a880fb10e24f428108e297cb007d48ebbc0eea3f2e803034fe72052989e2eeb22859e3d47a5f93303b363bb50daddec868fd030e1a4
+DIST knot-2.3.0.tar.xz 1066852 SHA256 8abf9a6562ecf2f7f4222d16ca6c75463399870db360eda7caa40530b469533c SHA512 28f0f6a00af3feb95ebd9af0c324ffeff1093f8e74136ce81f5a6e7f4434f22b9e371715b4b116de9b8faf39776be4d943c2ae09fb786e6061cc0394a767e8b6 WHIRLPOOL b0cc054c79d6b2ef7e9e0c2dba727042d92d235a08a0b15c56189c06f69087aee36d21947e1bf33304bbe0834d50421e9f01a4b4d7597aed05ed1b552c5ea52c

diff --git a/net-dns/knot/files/1.6.3-dont-create-extra-directories.patch b/net-dns/knot/files/1.6.3-dont-create-extra-directories.patch
deleted file mode 100644
index e8d84a1..00000000
--- a/net-dns/knot/files/1.6.3-dont-create-extra-directories.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/Makefile.in.orig	2015-05-03 16:34:53.177934984 +0200
-+++ src/Makefile.in	2015-05-03 16:35:11.481325329 +0200
-@@ -2712,12 +2712,6 @@
- 	uninstall-sbinPROGRAMS
- 
- 
--# Create storage and run-time directories
--install-data-hook:
--	$(INSTALL) -d $(DESTDIR)/@config_dir@
--	$(INSTALL) -d $(DESTDIR)/@run_dir@
--	$(INSTALL) -d $(DESTDIR)/@storage_dir@
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:

diff --git a/net-dns/knot/files/2.0.2-dont-create-extra-directories.patch b/net-dns/knot/files/2.0.2-dont-create-extra-directories.patch
deleted file mode 100644
index 538afec..00000000
--- a/net-dns/knot/files/2.0.2-dont-create-extra-directories.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/Makefile.in.orig	2015-05-10 20:59:26.854079700 +0200
-+++ src/Makefile.in	2015-05-10 21:00:01.870857369 +0200
-@@ -3401,12 +3401,6 @@
- 	uninstall-pkgconfigDATA uninstall-sbinPROGRAMS
- 
- 
--# Create storage and run-time directories
--@HAVE_DAEMON_TRUE@install-data-hook:
--@HAVE_DAEMON_TRUE@	$(INSTALL) -d $(DESTDIR)/@config_dir@
--@HAVE_DAEMON_TRUE@	$(INSTALL) -d $(DESTDIR)/@run_dir@
--@HAVE_DAEMON_TRUE@	$(INSTALL) -d $(DESTDIR)/@storage_dir@
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:

diff --git a/net-dns/knot/files/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch b/net-dns/knot/files/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch
new file mode 100644
index 00000000..60667ab
--- /dev/null
+++ b/net-dns/knot/files/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch
@@ -0,0 +1,216 @@
+From 84849be189c49ef9556bd84d5e5103317372e8a7 Mon Sep 17 00:00:00 2001
+From: Karel Slany <karel.slany@nic.cz>
+Date: Thu, 11 Aug 2016 11:39:39 +0200
+Subject: [PATCH] Added conversion to wire format when writing FNV64 hash values.
+
+Test on big-endian machines have been failing.
+---
+ src/libknot/cookies/alg-fnv64.c     |  6 +++---
+ tests/libknot/test_cookies-client.c | 20 ++++++++++----------
+ tests/libknot/test_cookies-server.c | 20 ++++++++++----------
+ 3 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/libknot/cookies/alg-fnv64.c b/src/libknot/cookies/alg-fnv64.c
+index 9989a4f..5e263c1 100644
+--- a/src/libknot/cookies/alg-fnv64.c
++++ b/src/libknot/cookies/alg-fnv64.c
+@@ -17,10 +17,10 @@
+ #include <assert.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+-#include <string.h>
+ 
+ #include "contrib/fnv/fnv.h"
+ #include "contrib/sockaddr.h"
++#include "contrib/wire.h"
+ #include "libknot/attribute.h"
+ #include "libknot/cookies/alg-fnv64.h"
+ #include "libknot/rrtype/opt-cookie.h"
+@@ -80,7 +80,7 @@ static uint16_t cc_gen_fnv64(const struct knot_cc_input *input,
+ 	assert(KNOT_OPT_COOKIE_CLNT == sizeof(hash_val));
+ 
+ 	cc_len = sizeof(hash_val);
+-	memcpy(cc_out, &hash_val, cc_len);
++	wire_write_u64(cc_out, hash_val);
+ 
+ 	return cc_len;
+ }
+@@ -127,7 +127,7 @@ static uint16_t sc_gen_fnv64(const struct knot_sc_input *input,
+ 	assert(SRVR_FNV64_HASH_SIZE == sizeof(hash_val));
+ 
+ 	hash_len = sizeof(hash_val);
+-	memcpy(hash_out, &hash_val, hash_len);
++	wire_write_u64(hash_out, hash_val);
+ 
+ 	return hash_len;
+ }
+diff --git a/tests/libknot/test_cookies-client.c b/tests/libknot/test_cookies-client.c
+index 44be903..712dbba 100644
+--- a/tests/libknot/test_cookies-client.c
++++ b/tests/libknot/test_cookies-client.c
+@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
+ 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
+ 	{
+-		uint8_t expected[] = { 0x74, 0x31, 0xf9, 0xa8, 0x03, 0xef, 0x15, 0xb1 };
++		uint8_t expected[] = { 0xb1, 0x15, 0xef, 0x03, 0xa8, 0xf9, 0x31, 0x74 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
+ 	}
+ 
+@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
+ 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
+ 	{
+-		uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 };
++		uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
+ 	}
+ 
+@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
+ 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
+ 	{
+-		uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 };
++		uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
+ 	}
+ 
+@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
+ 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
+ 	{
+-		uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa };
++		uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
+ 	}
+ 
+@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
+ 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
+ 	{
+-		uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa };
++		uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
+ 	}
+ 
+@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
+ 	}
+ 
+ 	{
+-		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
++		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
+ 		ret = knot_cc_check(cookie, sizeof(cookie), NULL, &knot_cc_alg_fnv64);
+ 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no input");
+ 	}
+@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
+ 	cc_in.secret_data = secret;
+ 	cc_in.secret_len = sizeof(secret);
+ 	{
+-		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
++		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
+ 		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, NULL);
+ 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no algorithm");
+ 	}
+@@ -201,7 +201,7 @@ int main(int argc, char *argv[])
+ 	cc_in.secret_data = secret;
+ 	cc_in.secret_len = sizeof(secret);
+ 	{
+-		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
++		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
+ 		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64);
+ 		ok(ret == KNOT_EOK, "cookies: FNV64 client good cookie check");
+ 	}
+@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
+ 	cc_in.secret_data = secret;
+ 	cc_in.secret_len = sizeof(secret);
+ 	{
+-		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
++		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
+ 		ret = knot_cc_check(cookie, sizeof(cookie) - 1, &cc_in, &knot_cc_alg_fnv64);
+ 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid length");
+ 	}
+@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
+ 	cc_in.secret_data = secret;
+ 	cc_in.secret_len = sizeof(secret);
+ 	{
+-		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xae };
++		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x32 };
+ 		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64);
+ 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid cookie");
+ 	}
+diff --git a/tests/libknot/test_cookies-server.c b/tests/libknot/test_cookies-server.c
+index 32001c1..66a54ba 100644
+--- a/tests/libknot/test_cookies-server.c
++++ b/tests/libknot/test_cookies-server.c
+@@ -28,10 +28,10 @@
+ #include "libknot/rrtype/opt-cookie.h"
+ 
+ const char *cookie_opts[] = {
+-	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x18", /* 8 octets long wrong server cookie. */
+-	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x19", /* 8 octets long OK server cookie. */
+-	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x38", /* 8B nonce 8B hash long wrong server cookie. */
+-	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x39" /* 8B nonce 8B hash long OK server cookie. */
++	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xdf", /* 8 octets long wrong server cookie. */
++	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xe0", /* 8 octets long OK server cookie. */
++	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xbf", /* 8B nonce 8B hash long wrong server cookie. */
++	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xc0"/* 8B nonce 8B hash long OK server cookie. */
+ };
+ 
+ #define ROPT(i) ((const uint8_t *)cookie_opts[(i)])
+@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0x75, 0x45, 0x7c, 0x9a, 0xe0, 0x13, 0xa8, 0xea };
++		uint8_t expected[] = { 0xea, 0xa8, 0x13, 0xe0, 0x9a, 0x7c, 0x45, 0x75 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0xc0, 0xbd, 0xdb, 0xec, 0x19, 0x78, 0x88, 0x39 };
++		uint8_t expected[] = { 0x39, 0x88, 0x78, 0x19, 0xec, 0xdb, 0xbd, 0xc0 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0xe0, 0xd9, 0x95, 0x4e, 0xbc, 0xc3, 0x99, 0x19 };
++		uint8_t expected[] = { 0x19, 0x99, 0xc3, 0xbc, 0x4e, 0x95, 0xd9, 0xe0 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+@@ -244,7 +244,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0x4d, 0xde, 0xfa, 0x22, 0xb9, 0x0a, 0xcc, 0xd8 };
++		uint8_t expected[] = { 0xd8, 0xcc, 0x0a, 0xb9, 0x22, 0xfa, 0xde, 0x4d };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+@@ -261,7 +261,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0xa0, 0x35, 0xe3, 0xe0, 0x78, 0x7a, 0x91, 0xaf };
++		uint8_t expected[] = { 0xaf, 0x91, 0x7a, 0x78, 0xe0, 0xe3, 0x35, 0xa0 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0x8e, 0xa3, 0xf8, 0x97, 0x84, 0x0a, 0x3d, 0x8b };
++		uint8_t expected[] = { 0x8b, 0x3d, 0x0a, 0x84, 0x97, 0xf8, 0xa3, 0x8e };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+--
+libgit2 0.24.0
+

diff --git a/net-dns/knot/files/knot-2.1.0-nettle.patch b/net-dns/knot/files/knot-2.1.0-nettle.patch
deleted file mode 100644
index 8f89ae8..00000000
--- a/net-dns/knot/files/knot-2.1.0-nettle.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/dnssec/lib/binary.c b/src/dnssec/lib/binary.c
-index 454dc5a..8d642be 100644
---- a/src/dnssec/lib/binary.c
-+++ b/src/dnssec/lib/binary.c
-@@ -15,16 +15,18 @@
- */
- 
- #include <assert.h>
--#include <nettle/base64.h>
- #include <string.h>
-+#include <nettle/base64.h>
-+#ifdef HAVE_NETTLE_VERSION_H
-+#include <nettle/version.h>
-+#endif
- 
- #include "binary.h"
- #include "error.h"
- #include "shared.h"
- 
- typedef
--#ifdef HAVE_NETTLE_VERSION_H
--	#include <nettle/version.h>
-+#ifdef NETTLE_VERSION_MAJOR
- 	#if NETTLE_VERSION_MAJOR >= 3
- 		size_t
- 	#else

diff --git a/net-dns/knot/knot-1.6.6.ebuild b/net-dns/knot/knot-1.6.8.ebuild
similarity index 56%
rename from net-dns/knot/knot-1.6.6.ebuild
rename to net-dns/knot/knot-1.6.8.ebuild
index 44bb39f..fc0cef0 100644
--- a/net-dns/knot/knot-1.6.6.ebuild
+++ b/net-dns/knot/knot-1.6.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils user
 
@@ -19,7 +19,10 @@ RDEPEND="
 	>=dev-libs/openssl-1.0.1
 	>=dev-libs/userspace-rcu-0.5.4
 	caps? ( >=sys-libs/libcap-ng-0.6.4 )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
 	idn? ( net-dns/libidn )
 	lmdb? ( dev-db/lmdb )
 	systemd? ( sys-apps/systemd )
@@ -29,15 +32,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/flex
 	sys-devel/bison
-	doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo )
+	doc? ( dev-python/sphinx )
 "
 
 S="${WORKDIR}/${P/_/-}"
 
-src_prepare() {
-	epatch "${FILESDIR}/1.6.3-dont-create-extra-directories.patch"
-}
-
 src_configure() {
 	econf \
 		--with-storage="${EPREFIX}/var/lib/${PN}" \
@@ -53,40 +52,22 @@ src_configure() {
 
 src_compile() {
 	default
-	use doc && emake -C doc html-local singlehtml pdf-local info-local
+	use doc && emake -C doc html
 }
 
-# Portage's automatic test code runs "make -n check" to see if there
-# is a "check" target, but that fails here because the test
-# infrastructure hasn't been built yet. Just run "make check", which
-# will build it and then run the tests.
 src_test() {
-	emake -j1 check
+	emake check
 }
 
 src_install() {
-	default
-	keepdir /var/lib/${PN}
+	use doc && HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
 
-	if use doc; then
-		dodoc doc/_build/latex/KnotDNS.pdf
-
-		docinto html
-		dodoc doc/_build/html/*.html doc/_build/html/*.js
-		docinto html/_sources
-		dodoc doc/_build/html/_sources/*
-		docinto html/_static
-		dodoc doc/_build/html/_static/*
-
-		docinto singlehtml
-		dodoc doc/_build/singlehtml/index.html
-		docinto singlehtml/_static/
-		dodoc doc/_build/singlehtml/_static/*
+	default
 
-		doinfo doc/_build/texinfo/KnotDNS.info
-	fi
+	keepdir /var/lib/${PN}
 
 	newinitd "${FILESDIR}/knot.init" knot
+	systemd_dounit "${FILESDIR}/knot.service"
 }
 
 pkg_postinst() {

diff --git a/net-dns/knot/knot-2.1.0.ebuild b/net-dns/knot/knot-2.3.0.ebuild
similarity index 59%
rename from net-dns/knot/knot-2.1.0.ebuild
rename to net-dns/knot/knot-2.3.0.ebuild
index 03ba610..5a9ceca 100644
--- a/net-dns/knot/knot-2.1.0.ebuild
+++ b/net-dns/knot/knot-2.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit bash-completion-r1 eutils systemd user
 
@@ -21,22 +21,25 @@ RDEPEND="
 	>=dev-db/lmdb-0.9.15
 	>=dev-libs/userspace-rcu-0.5.4
 	caps? ( >=sys-libs/libcap-ng-0.6.4 )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
 	idn? ( net-dns/libidn )
+	dev-libs/libedit
 	systemd? ( sys-apps/systemd )
 "
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo )
+	doc? ( dev-python/sphinx )
 "
 
-S="${WORKDIR}/${P/_/-}"
+PATCHES=(
+	"${FILESDIR}/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch"
+)
 
-src_prepare() {
-	epatch "${FILESDIR}/2.0.2-dont-create-extra-directories.patch"
-	epatch "${FILESDIR}/knot-2.1.0-nettle.patch"
-}
+S="${WORKDIR}/${P/_/-}"
 
 src_configure() {
 	econf \
@@ -55,38 +58,19 @@ src_configure() {
 
 src_compile() {
 	default
-	use doc && emake -C doc html-local singlehtml pdf-local info-local
+	use doc && emake -C doc html
 }
 
-# Portage's automatic test code runs "make -n check" to see if there
-# is a "check" target, but that fails here because the test
-# infrastructure hasn't been built yet. Just run "make check", which
-# will build it and then run the tests.
 src_test() {
-	emake -j1 check
+	emake check
 }
 
 src_install() {
-	default
-	keepdir /var/lib/${PN}
+	use doc && HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
 
-	if use doc; then
-		dodoc doc/_build/latex/KnotDNS.pdf
-
-		docinto html
-		dodoc doc/_build/html/*.html doc/_build/html/*.js
-		docinto html/_sources
-		dodoc doc/_build/html/_sources/*
-		docinto html/_static
-		dodoc doc/_build/html/_static/*
-
-		docinto singlehtml
-		dodoc doc/_build/singlehtml/index.html
-		docinto singlehtml/_static/
-		dodoc doc/_build/singlehtml/_static/*
+	default
 
-		doinfo doc/_build/texinfo/KnotDNS.info
-	fi
+	keepdir /var/lib/${PN}
 
 	newinitd "${FILESDIR}/knot.init" knot
 	systemd_dounit "${FILESDIR}/knot.service"


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot/, net-dns/knot/files/
@ 2016-10-15 15:08 Patrice Clement
  0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-10-15 15:08 UTC (permalink / raw
  To: gentoo-commits

commit:     eea282ad74f5640e9775e785e68b0f05e1fb3a94
Author:     Pierre-Olivier Mercier <nemunaire <AT> nemunai <DOT> re>
AuthorDate: Fri Oct 14 09:43:27 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 15:08:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea282ad

net-dns/knot: version bump to 2.3.1.

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2552
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-dns/knot/Manifest                              |   2 +-
 ...ire-format-when-writing-FNV64-hash-values.patch | 216 ---------------------
 .../knot/{knot-2.3.0.ebuild => knot-2.3.1.ebuild}  |   8 +-
 3 files changed, 3 insertions(+), 223 deletions(-)

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 6193b8c..bbe30e5 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1 +1 @@
-DIST knot-2.3.0.tar.xz 1066852 SHA256 8abf9a6562ecf2f7f4222d16ca6c75463399870db360eda7caa40530b469533c SHA512 28f0f6a00af3feb95ebd9af0c324ffeff1093f8e74136ce81f5a6e7f4434f22b9e371715b4b116de9b8faf39776be4d943c2ae09fb786e6061cc0394a767e8b6 WHIRLPOOL b0cc054c79d6b2ef7e9e0c2dba727042d92d235a08a0b15c56189c06f69087aee36d21947e1bf33304bbe0834d50421e9f01a4b4d7597aed05ed1b552c5ea52c
+DIST knot-2.3.1.tar.xz 1072808 SHA256 42e4ec64dc8f017329d1753eb074a5759d6bb380e1f2a272101adccc0552f9b4 SHA512 10d8c09d7cce88aba95b067da9b138af710864de4ef9c00d7ab165b4aca621d9ff15a49b5102e0cdd7bfb14e2806ed8587fd138b6e6af74a01e26e6d6ffe1163 WHIRLPOOL 70cdb9434a80c56b7e425b1aa3389ae22c9dea289a8081464be21abf6afebc46a9bffaa6363955a01aa3aa1bea3a71e46ef75dfce77c7e0a63dcd3c8622287c0

diff --git a/net-dns/knot/files/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch b/net-dns/knot/files/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch
deleted file mode 100644
index 60667ab..00000000
--- a/net-dns/knot/files/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 84849be189c49ef9556bd84d5e5103317372e8a7 Mon Sep 17 00:00:00 2001
-From: Karel Slany <karel.slany@nic.cz>
-Date: Thu, 11 Aug 2016 11:39:39 +0200
-Subject: [PATCH] Added conversion to wire format when writing FNV64 hash values.
-
-Test on big-endian machines have been failing.
----
- src/libknot/cookies/alg-fnv64.c     |  6 +++---
- tests/libknot/test_cookies-client.c | 20 ++++++++++----------
- tests/libknot/test_cookies-server.c | 20 ++++++++++----------
- 3 files changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/src/libknot/cookies/alg-fnv64.c b/src/libknot/cookies/alg-fnv64.c
-index 9989a4f..5e263c1 100644
---- a/src/libknot/cookies/alg-fnv64.c
-+++ b/src/libknot/cookies/alg-fnv64.c
-@@ -17,10 +17,10 @@
- #include <assert.h>
- #include <stdint.h>
- #include <stdlib.h>
--#include <string.h>
- 
- #include "contrib/fnv/fnv.h"
- #include "contrib/sockaddr.h"
-+#include "contrib/wire.h"
- #include "libknot/attribute.h"
- #include "libknot/cookies/alg-fnv64.h"
- #include "libknot/rrtype/opt-cookie.h"
-@@ -80,7 +80,7 @@ static uint16_t cc_gen_fnv64(const struct knot_cc_input *input,
- 	assert(KNOT_OPT_COOKIE_CLNT == sizeof(hash_val));
- 
- 	cc_len = sizeof(hash_val);
--	memcpy(cc_out, &hash_val, cc_len);
-+	wire_write_u64(cc_out, hash_val);
- 
- 	return cc_len;
- }
-@@ -127,7 +127,7 @@ static uint16_t sc_gen_fnv64(const struct knot_sc_input *input,
- 	assert(SRVR_FNV64_HASH_SIZE == sizeof(hash_val));
- 
- 	hash_len = sizeof(hash_val);
--	memcpy(hash_out, &hash_val, hash_len);
-+	wire_write_u64(hash_out, hash_val);
- 
- 	return hash_len;
- }
-diff --git a/tests/libknot/test_cookies-client.c b/tests/libknot/test_cookies-client.c
-index 44be903..712dbba 100644
---- a/tests/libknot/test_cookies-client.c
-+++ b/tests/libknot/test_cookies-client.c
-@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
- 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
- 	{
--		uint8_t expected[] = { 0x74, 0x31, 0xf9, 0xa8, 0x03, 0xef, 0x15, 0xb1 };
-+		uint8_t expected[] = { 0xb1, 0x15, 0xef, 0x03, 0xa8, 0xf9, 0x31, 0x74 };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
- 	}
- 
-@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
- 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
- 	{
--		uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 };
-+		uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
- 	}
- 
-@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
- 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
- 	{
--		uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 };
-+		uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
- 	}
- 
-@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
- 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
- 	{
--		uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa };
-+		uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
- 	}
- 
-@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
- 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
- 	{
--		uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa };
-+		uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
- 	}
- 
-@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
- 	}
- 
- 	{
--		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
-+		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
- 		ret = knot_cc_check(cookie, sizeof(cookie), NULL, &knot_cc_alg_fnv64);
- 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no input");
- 	}
-@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
- 	cc_in.secret_data = secret;
- 	cc_in.secret_len = sizeof(secret);
- 	{
--		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
-+		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
- 		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, NULL);
- 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no algorithm");
- 	}
-@@ -201,7 +201,7 @@ int main(int argc, char *argv[])
- 	cc_in.secret_data = secret;
- 	cc_in.secret_len = sizeof(secret);
- 	{
--		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
-+		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
- 		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64);
- 		ok(ret == KNOT_EOK, "cookies: FNV64 client good cookie check");
- 	}
-@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
- 	cc_in.secret_data = secret;
- 	cc_in.secret_len = sizeof(secret);
- 	{
--		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
-+		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
- 		ret = knot_cc_check(cookie, sizeof(cookie) - 1, &cc_in, &knot_cc_alg_fnv64);
- 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid length");
- 	}
-@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
- 	cc_in.secret_data = secret;
- 	cc_in.secret_len = sizeof(secret);
- 	{
--		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xae };
-+		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x32 };
- 		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64);
- 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid cookie");
- 	}
-diff --git a/tests/libknot/test_cookies-server.c b/tests/libknot/test_cookies-server.c
-index 32001c1..66a54ba 100644
---- a/tests/libknot/test_cookies-server.c
-+++ b/tests/libknot/test_cookies-server.c
-@@ -28,10 +28,10 @@
- #include "libknot/rrtype/opt-cookie.h"
- 
- const char *cookie_opts[] = {
--	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x18", /* 8 octets long wrong server cookie. */
--	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x19", /* 8 octets long OK server cookie. */
--	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x38", /* 8B nonce 8B hash long wrong server cookie. */
--	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x39" /* 8B nonce 8B hash long OK server cookie. */
-+	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xdf", /* 8 octets long wrong server cookie. */
-+	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xe0", /* 8 octets long OK server cookie. */
-+	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xbf", /* 8B nonce 8B hash long wrong server cookie. */
-+	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xc0"/* 8B nonce 8B hash long OK server cookie. */
- };
- 
- #define ROPT(i) ((const uint8_t *)cookie_opts[(i)])
-@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
- 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
- 	{
--		uint8_t expected[] = { 0x75, 0x45, 0x7c, 0x9a, 0xe0, 0x13, 0xa8, 0xea };
-+		uint8_t expected[] = { 0xea, 0xa8, 0x13, 0xe0, 0x9a, 0x7c, 0x45, 0x75 };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
- 	}
- 
-@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
- 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
- 	{
--		uint8_t expected[] = { 0xc0, 0xbd, 0xdb, 0xec, 0x19, 0x78, 0x88, 0x39 };
-+		uint8_t expected[] = { 0x39, 0x88, 0x78, 0x19, 0xec, 0xdb, 0xbd, 0xc0 };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
- 	}
- 
-@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
- 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
- 	{
--		uint8_t expected[] = { 0xe0, 0xd9, 0x95, 0x4e, 0xbc, 0xc3, 0x99, 0x19 };
-+		uint8_t expected[] = { 0x19, 0x99, 0xc3, 0xbc, 0x4e, 0x95, 0xd9, 0xe0 };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
- 	}
- 
-@@ -244,7 +244,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
- 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
- 	{
--		uint8_t expected[] = { 0x4d, 0xde, 0xfa, 0x22, 0xb9, 0x0a, 0xcc, 0xd8 };
-+		uint8_t expected[] = { 0xd8, 0xcc, 0x0a, 0xb9, 0x22, 0xfa, 0xde, 0x4d };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
- 	}
- 
-@@ -261,7 +261,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
- 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
- 	{
--		uint8_t expected[] = { 0xa0, 0x35, 0xe3, 0xe0, 0x78, 0x7a, 0x91, 0xaf };
-+		uint8_t expected[] = { 0xaf, 0x91, 0x7a, 0x78, 0xe0, 0xe3, 0x35, 0xa0 };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
- 	}
- 
-@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
- 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
- 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
- 	{
--		uint8_t expected[] = { 0x8e, 0xa3, 0xf8, 0x97, 0x84, 0x0a, 0x3d, 0x8b };
-+		uint8_t expected[] = { 0x8b, 0x3d, 0x0a, 0x84, 0x97, 0xf8, 0xa3, 0x8e };
- 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
- 	}
- 
---
-libgit2 0.24.0
-

diff --git a/net-dns/knot/knot-2.3.0.ebuild b/net-dns/knot/knot-2.3.1.ebuild
similarity index 89%
rename from net-dns/knot/knot-2.3.0.ebuild
rename to net-dns/knot/knot-2.3.1.ebuild
index 5a9ceca..67019dc 100644
--- a/net-dns/knot/knot-2.3.0.ebuild
+++ b/net-dns/knot/knot-2.3.1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug dnstap doc caps +fastparser idn systemd"
 
 RDEPEND="
-	>=net-libs/gnutls-3.0
+	>=net-libs/gnutls-3.3
 	>=dev-libs/jansson-2.3
 	>=dev-db/lmdb-0.9.15
 	>=dev-libs/userspace-rcu-0.5.4
@@ -35,10 +35,6 @@ DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )
 "
 
-PATCHES=(
-	"${FILESDIR}/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch"
-)
-
 S="${WORKDIR}/${P/_/-}"
 
 src_configure() {
@@ -53,7 +49,7 @@ src_configure() {
 		$(use_enable dnstap) \
 		$(use_enable doc documentation) \
 		$(use_with idn libidn) \
-		$(usex systemd --enable-systemd=yes --enable-systemd=no)
+		--enable-systemd=$(usex systemd)
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot/, net-dns/knot/files/
@ 2017-08-22  9:07 Michał Górny
  0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2017-08-22  9:07 UTC (permalink / raw
  To: gentoo-commits

commit:     876e8830edfffb6579136f527f5914630b145744
Author:     Pierre-Olivier Mercier <nemunaire <AT> nemunai <DOT> re>
AuthorDate: Wed Aug 16 14:27:11 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 09:07:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876e8830

net-dns/knot: add upstreamed MIPS compatibility patch

 net-dns/knot/files/2.5.3-link-with-libatomic.patch | 117 +++++++++++++++++++++
 net-dns/knot/knot-2.5.3-r1.ebuild                  |   4 +
 2 files changed, 121 insertions(+)

diff --git a/net-dns/knot/files/2.5.3-link-with-libatomic.patch b/net-dns/knot/files/2.5.3-link-with-libatomic.patch
new file mode 100644
index 00000000000..14e5366f7d9
--- /dev/null
+++ b/net-dns/knot/files/2.5.3-link-with-libatomic.patch
@@ -0,0 +1,117 @@
+From 5cf2d1acf87fa0ab18375534ca210f1cabf212b3 Mon Sep 17 00:00:00 2001
+From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
+Date: Wed, 2 Aug 2017 23:16:43 +0200
+Subject: [PATCH] Link with libatomic on architectures that requires it
+
+---
+ configure.ac    | 10 +++++++++-
+ src/Makefile.am |  2 +-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2a28214..5bd1798 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -504,8 +504,16 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sched.h>]], [[cpuset_t* set = cpuset
+ AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM([[#include <stdint.h>]],
+                    [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])],
+-  [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])]
++  [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])
++    AC_LINK_IFELSE(
++     [AC_LANG_PROGRAM([[#include <stdint.h>]],
++                      [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])],
++     [atomic_LIBS=""],
++     [atomic_LIBS="-latomic"]
++  )],
++  [atomic_LIBS=""]
+ )
++AC_SUBST([atomic_LIBS])
+ 
+ # Prepare CFLAG_VISIBILITY to be used where needed
+ gl_VISIBILITY()
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 948912e..bf28013 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -399,7 +399,7 @@ libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(systemd_CFLAGS) \
+                        $(liburcu_CFLAGS) -DKNOTD_MOD_STATIC
+ libknotd_la_LDFLAGS  = $(AM_LDFLAGS) -export-symbols-regex '^knotd_'
+ libknotd_la_LIBADD   = libknot.la zscanner/libzscanner.la $(systemd_LIBS) \
+-                       $(liburcu_LIBS)
++                       $(liburcu_LIBS) $(atomic_LIBS)
+ 
+ ###################
+ # Knot DNS Daemon #
+--- a/src/Makefile.in	2017-08-05 18:09:14.029882010 +0200
++++ b/src/Makefile.in	2017-08-05 18:12:43.541190937 +0200
+@@ -379,7 +379,7 @@
+ @STATIC_MODULE_dnstap_TRUE@	contrib/dnstap/libdnstap.la
+ libknotd_la_DEPENDENCIES = libknot.la zscanner/libzscanner.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_2)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ am__libknotd_la_SOURCES_DIST = knot/conf/base.c knot/conf/base.h \
+ 	knot/conf/conf.c knot/conf/conf.h knot/conf/confdb.c \
+ 	knot/conf/confdb.h knot/conf/confio.c knot/conf/confio.h \
+@@ -937,6 +937,7 @@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
++atomic_LIBS = @atomic_LIBS@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -1275,7 +1276,8 @@
+ 	$(am__append_11)
+ libknotd_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^knotd_'
+ libknotd_la_LIBADD = libknot.la zscanner/libzscanner.la \
+-	$(systemd_LIBS) $(liburcu_LIBS) $(am__append_12)
++	$(systemd_LIBS) $(liburcu_LIBS) $(atomic_LIBS) \
++	$(am__append_12)
+ @HAVE_DAEMON_TRUE@sbin_SCRIPTS = utils/pykeymgr/pykeymgr
+ @HAVE_DAEMON_TRUE@CLEAN_FILES = $(sbin_SCRIPTS)
+ @HAVE_DAEMON_TRUE@knotddir = $(includedir)/knot
+--- a/configure	2017-08-05 18:09:14.039882551 +0200
++++ b/configure	2017-08-05 18:12:18.779857706 +0200
+@@ -655,6 +655,7 @@
+ CODE_COVERAGE_ENABLED_TRUE
+ HAVE_VISIBILITY
+ CFLAG_VISIBILITY
++atomic_LIBS
+ libidn_LIBS
+ libidn_CFLAGS
+ libidn2_LIBS
+@@ -16347,10 +16358,32 @@
+ 
+ $as_echo "#define HAVE_ATOMIC 1" >>confdefs.h
+ 
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdint.h>
++int
++main ()
++{
++uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  atomic_LIBS=""
++else
++  atomic_LIBS="-latomic"
++
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++else
++  atomic_LIBS=""
+ 
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
++
+ # Prepare CFLAG_VISIBILITY to be used where needed
+ 
+ 

diff --git a/net-dns/knot/knot-2.5.3-r1.ebuild b/net-dns/knot/knot-2.5.3-r1.ebuild
index 1913ab2364d..82772faaabb 100644
--- a/net-dns/knot/knot-2.5.3-r1.ebuild
+++ b/net-dns/knot/knot-2.5.3-r1.ebuild
@@ -47,6 +47,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P/_/-}"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-link-with-libatomic.patch"
+)
+
 src_configure() {
 	local my_conf=()
 	for u in "${KNOT_MODULES[@]#+}"; do


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot/, net-dns/knot/files/
@ 2024-11-20 21:11 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-11-20 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     175c80f5889302136f5c96f5590c974970fe8223
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 21:07:35 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 21:11:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=175c80f5

net-dns/knot: drop 3.1.5, 3.1.9

Closes: https://github.com/gentoo/gentoo/pull/39065
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-dns/knot/Manifest           |   2 -
 net-dns/knot/files/knot.service |  14 -----
 net-dns/knot/knot-3.1.5.ebuild  | 108 -------------------------------------
 net-dns/knot/knot-3.1.9.ebuild  | 115 ----------------------------------------
 4 files changed, 239 deletions(-)

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index c52dee9cd1eb..40abb4bd889c 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,4 +1,2 @@
-DIST knot-3.1.5.tar.xz 1414500 BLAKE2B c05fcd9e99d4c7dba03ad9fd9a1131ca4c2556d4911640ef929e68d4caea26ae69ddc61fa19f8c3c4f29efcd0c4c2e47593e86a0ac1826cc96c25f2fe4145bab SHA512 3a8cf04a2d65e04343a70009d43796ae00bf09e34348119b55ba70dac7deb7ff42906d88ef0e413d33dec28a952396a51781dee96727c0c2047b4c5ade54e6fa
-DIST knot-3.1.9.tar.xz 1441408 BLAKE2B 383829107bef6b35cbef3c531bc91050e7742ca930bf6645c25cab04203ee360837808c3b5342089ce9ba9ee704290ab95b2f76172577d251c6a9c18796245a0 SHA512 e4ba1c006edcde2dc820e74c39df7a8b8983dfb2d8b8845ac759c6c67dfaabc5aae38282995ed92879a683665c0c179502858631c89ad53c2738f79df951eef7
 DIST knot-3.2.2.tar.xz 1632748 BLAKE2B 185567dc883f946570fe60cd7d01d96162c5f13ac84330e5551c293b5011c162401fd25ddbdb43bf9242e13c3cdc8225be107dc579619fe54c05335601cd27ae SHA512 29fadb96c1ea525c6183f9e7552f4ad370579b67d74aec1910a92d561cc2c5656fd7876015f29161d279a07c23643f6584308bf9fa0e74d351b17af54e5e9a7f
 DIST knot-3.2.9.tar.xz 1642600 BLAKE2B 2c81b2afa96c6077778c3458b2ddeeb8b47ea99607ba755a904278f9755a32171738418ea442b1e6b4afcebe0db2c86e68845d38f8e78342b8354411d1e34af8 SHA512 baf8da222e38198c85fa62e45e71b29ddac7c90433b811710ace1e0395e6e7b5d63547ce8f3a62792ee11259ec2e36d6ddd8fff999416f9171671444a95086cf

diff --git a/net-dns/knot/files/knot.service b/net-dns/knot/files/knot.service
deleted file mode 100644
index 4684f9c858e2..000000000000
--- a/net-dns/knot/files/knot.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Knot high-performance DNS Server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/knotd
-ExecReload=/usr/sbin/knotc reload
-ExecStop=/usr/sbin/knotc stop
-PrivateTmp=true
-RuntimeDirectory=knot
-RuntimeDirectoryMode=750
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-dns/knot/knot-3.1.5.ebuild b/net-dns/knot/knot-3.1.5.ebuild
deleted file mode 100644
index 29970854cde7..000000000000
--- a/net-dns/knot/knot-3.1.5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-KNOT_MODULES=(
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	acct-group/knot
-	acct-user/knot
-	dev-db/lmdb
-	dev-libs/libedit
-	dev-libs/userspace-rcu:=
-	dev-python/lmdb
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	geoip? ( dev-libs/libmaxminddb:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
-		libidn2? ( net-dns/libidn2:= )
-	)
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable fastparser)
-		$(use_enable dnstap)
-		$(use_enable doc documentation)
-		$(use_enable utils utilities)
-		--enable-systemd=$(usex systemd)
-		$(use_with idn libidn)
-	)
-
-	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with ${u} module-${u})")
-	done
-
-	if use riscv; then
-		append-libs -latomic
-	fi
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-
-	default
-
-	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/knot
-}

diff --git a/net-dns/knot/knot-3.1.9.ebuild b/net-dns/knot/knot-3.1.9.ebuild
deleted file mode 100644
index c1c0a2de8e9b..000000000000
--- a/net-dns/knot/knot-3.1.9.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-KNOT_MODULES=(
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps doh +fastparser idn +libidn2 systemd +utils xdp ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	acct-group/knot
-	acct-user/knot
-	dev-db/lmdb:=
-	dev-libs/libedit
-	dev-libs/userspace-rcu:=
-	dev-python/lmdb:=
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	doh? ( net-libs/nghttp2:= )
-	geoip? ( dev-libs/libmaxminddb:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
-		libidn2? ( net-dns/libidn2:= )
-	)
-	systemd? ( sys-apps/systemd:= )
-	xdp? (
-		 dev-libs/libbpf:=
-		 net-libs/libmnl:=
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable fastparser)
-		$(use_enable dnstap)
-		$(use_enable doc documentation)
-		$(use_enable utils utilities)
-		$(use_enable xdp)
-		--enable-systemd=$(usex systemd)
-		$(use_with idn libidn)
-		$(use_with doh libnghttp2)
-	)
-
-	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with ${u} module-${u})")
-	done
-
-	if use riscv; then
-		append-libs -latomic
-	fi
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-
-	default
-
-	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/knot
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot/, net-dns/knot/files/
@ 2024-12-06 22:08 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-12-06 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     6026b7564d8f8711c859e87416a5dc67cf011ab5
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Fri Dec  6 21:56:13 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 22:08:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6026b756

net-dns/knot: fix init script to /usr/sbin

Closes: https://bugs.gentoo.org/945988
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/39613
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/knot/files/{knot-2.init => knot-3.init}             | 2 +-
 net-dns/knot/{knot-3.4.2-r1.ebuild => knot-3.4.2-r2.ebuild} | 2 +-
 net-dns/knot/{knot-3.4.3.ebuild => knot-3.4.3-r1.ebuild}    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-dns/knot/files/knot-2.init b/net-dns/knot/files/knot-3.init
similarity index 94%
rename from net-dns/knot/files/knot-2.init
rename to net-dns/knot/files/knot-3.init
index 746681496c53..907c328a58d0 100644
--- a/net-dns/knot/files/knot-2.init
+++ b/net-dns/knot/files/knot-3.init
@@ -21,7 +21,7 @@ extra_started_commands="reload"
 capabilities="^cap_net_bind_service,^cap_setpcap"
 
 checkconfig() {
-	/usr/bin/knotc conf-check 1>/dev/null || return 1
+	/usr/sbin/knotc conf-check 1>/dev/null || return 1
 }
 
 reload() {

diff --git a/net-dns/knot/knot-3.4.2-r1.ebuild b/net-dns/knot/knot-3.4.2-r2.ebuild
similarity index 98%
rename from net-dns/knot/knot-3.4.2-r1.ebuild
rename to net-dns/knot/knot-3.4.2-r2.ebuild
index f15285db8abe..3e4f6cadbe37 100644
--- a/net-dns/knot/knot-3.4.2-r1.ebuild
+++ b/net-dns/knot/knot-3.4.2-r2.ebuild
@@ -149,7 +149,7 @@ src_install() {
 	if use daemon; then
 		rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
 
-		newinitd "${FILESDIR}"/knot-2.init knot
+		newinitd "${FILESDIR}"/knot-3.init knot
 		newconfd "${FILESDIR}"/knot.confd knot
 
 		newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf

diff --git a/net-dns/knot/knot-3.4.3.ebuild b/net-dns/knot/knot-3.4.3-r1.ebuild
similarity index 98%
rename from net-dns/knot/knot-3.4.3.ebuild
rename to net-dns/knot/knot-3.4.3-r1.ebuild
index 4f77abcd9f47..40e3b8bd878c 100644
--- a/net-dns/knot/knot-3.4.3.ebuild
+++ b/net-dns/knot/knot-3.4.3-r1.ebuild
@@ -150,7 +150,7 @@ src_install() {
 	if use daemon; then
 		rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
 
-		newinitd "${FILESDIR}"/knot-2.init knot
+		newinitd "${FILESDIR}"/knot-3.init knot
 		newconfd "${FILESDIR}"/knot.confd knot
 
 		newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/knot/, net-dns/knot/files/
@ 2025-03-10  2:54 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-03-10  2:54 UTC (permalink / raw
  To: gentoo-commits

commit:     8229050b30cca4eb144a99b5b83db7078fba8d02
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Sat Mar  1 18:45:10 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 02:48:03 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8229050b

net-dns/knot: clean old

drop:
* 3.2.9-r1 as 3.2.X is no more active
* 3.4.3-r2 after 3.4.4 got stabilized

useflags desc:
* remove libidn2 (3.2.9 only)
* switch geoip to global

Closes: https://bugs.gentoo.org/927551
Closes: https://bugs.gentoo.org/913202
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/40838
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/knot/Manifest             |   2 -
 net-dns/knot/files/knot-1.service |  17 ----
 net-dns/knot/files/knot.init      |  41 --------
 net-dns/knot/knot-3.2.9-r1.ebuild | 126 -----------------------
 net-dns/knot/knot-3.4.3-r2.ebuild | 204 --------------------------------------
 net-dns/knot/metadata.xml         |   7 --
 6 files changed, 397 deletions(-)

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 9be4eec536e6..97ab67ba7cd1 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,3 +1 @@
-DIST knot-3.2.9.tar.xz 1642600 BLAKE2B 2c81b2afa96c6077778c3458b2ddeeb8b47ea99607ba755a904278f9755a32171738418ea442b1e6b4afcebe0db2c86e68845d38f8e78342b8354411d1e34af8 SHA512 baf8da222e38198c85fa62e45e71b29ddac7c90433b811710ace1e0395e6e7b5d63547ce8f3a62792ee11259ec2e36d6ddd8fff999416f9171671444a95086cf
-DIST knot-3.4.3.tar.xz 1637080 BLAKE2B d5d96a69b2464d75e4f2d3231339c1dedccc1cd95febc8bd5950f68c89a277d002d09a60e629a74b378bc7f765370aaef05bf41fd497e740be6c0a349c27f731 SHA512 c05a214a9e5564d09257aff44c0f42e9d084d47536197c95dff7aa125a8b53ed99e26c90affaa6833779778cd8d37af9cc473f108ab6acf7230c476b5858c03f
 DIST knot-3.4.4.tar.xz 1641460 BLAKE2B d477a4a368b0c6d6c1003a52041403d17bab4e3ecb6e532130b633894d4ee88711038b94e1d4cf12406eb281b800d701c00e40414d458b7bdefb1d632a779821 SHA512 bf8e80d430336934083c1f7c304306de78b254fba5d3b9dd8b44065a0f1527cd78b74d498d994822ed2d364b66091ad967d3cd991bde380fbba67ea34a1ee33f

diff --git a/net-dns/knot/files/knot-1.service b/net-dns/knot/files/knot-1.service
deleted file mode 100644
index 14a34a2b211f..000000000000
--- a/net-dns/knot/files/knot-1.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Knot high-performance DNS Server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/knotd
-ExecReload=/usr/sbin/knotc reload
-ExecStop=/usr/sbin/knotc stop
-PrivateTmp=true
-User=knot
-Group=knot
-RuntimeDirectory=knot
-RuntimeDirectoryMode=750
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-dns/knot/files/knot.init b/net-dns/knot/files/knot.init
deleted file mode 100644
index 8dc460c31cd4..000000000000
--- a/net-dns/knot/files/knot.init
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/sbin/knotd
-command_args="-d"
-pidfile=/var/run/knot/knot.pid
-required_files=/etc/knot/knot.conf
-extra_started_commands="reload"
-description_reload="Reload configuration and changed zones."
-
-depend() {
-	need net
-}
-
-start() {
-	checkpath -d -m 0750 -o knot:knot /var/run/knot/ /var/lib/knot/
-
-	ebegin "Starting knot"
-	start-stop-daemon --start \
-		--pidfile $pidfile --exec $command -- $command_args
-	eend $?
-}
-
-stop() {
-	ebegin "Stoping knot"
-	/usr/sbin/knotc stop >/dev/null 2>&1
-	# In case remote control is not working
-	if [ "$?" != 0 ]; then
-		if [ -f $pidfile ]; then
-			start-stop-daemon --stop --pidfile $pidfile
-		fi
-	fi
-	ewend $?
-}
-
-reload() {
-	ebegin "Reloading knot"
-	/usr/sbin/knotc reload >/dev/null
-	eend $?
-}

diff --git a/net-dns/knot/knot-3.2.9-r1.ebuild b/net-dns/knot/knot-3.2.9-r1.ebuild
deleted file mode 100644
index eba5990f6fb6..000000000000
--- a/net-dns/knot/knot-3.2.9-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd
-
-# subslot: libknot major.libdnssec major.libzscanner major
-KNOT_SUBSLOT="13.9.4"
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns"
-SRC_URI="https://knot-dns.nic.cz/release/${P/_/-}.tar.xz"
-
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-3+"
-SLOT="0/${KNOT_SUBSLOT}"
-KEYWORDS="amd64 ~riscv x86"
-
-KNOT_MODULES=(
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps doh +fastparser idn +libidn2 quic systemd +utils xdp ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	acct-group/knot
-	acct-user/knot
-	dev-db/lmdb:=
-	dev-libs/libedit
-	dev-libs/userspace-rcu:=
-	dev-python/lmdb:=
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	doh? ( net-libs/nghttp2:= )
-	geoip? ( dev-libs/libmaxminddb:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
-		libidn2? ( net-dns/libidn2:= )
-	)
-	quic? ( >=net-libs/ngtcp2-0.13.1:=[gnutls] )
-	systemd? ( sys-apps/systemd:= )
-	xdp? (
-		>=dev-libs/libbpf-1.0:=
-		net-libs/libmnl:=
-		net-libs/xdp-tools
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-# Used to check cpuset_t in sched.h with NetBSD.
-# False positive because linux have sched.h too but with cpu_set_t
-QA_CONFIG_IMPL_DECL_SKIP=( cpuset_create cpuset_destroy )
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable caps cap_ng)
-		$(use_enable fastparser)
-		$(use_enable dnstap)
-		$(use_enable doc documentation)
-		$(use_enable quic)
-		$(use_enable utils utilities)
-		$(use_enable xdp)
-		--enable-systemd=$(usex systemd)
-		$(use_with idn libidn)
-		$(use_with doh libnghttp2)
-	)
-
-	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with ${u} module-${u})")
-	done
-
-	if use riscv; then
-		append-libs -latomic
-	fi
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-
-	default
-
-	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/knot
-}

diff --git a/net-dns/knot/knot-3.4.3-r2.ebuild b/net-dns/knot/knot-3.4.3-r2.ebuild
deleted file mode 100644
index 7802470727a0..000000000000
--- a/net-dns/knot/knot-3.4.3-r2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit python-single-r1 flag-o-matic systemd tmpfiles
-
-# subslot: libknot major.libdnssec major.libzscanner major
-KNOT_SUBSLOT="15.9.4"
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns"
-SRC_URI="https://knot-dns.nic.cz/release/${P/_/-}.tar.xz"
-
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-3+"
-SLOT="0/${KNOT_SUBSLOT}"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-KNOT_MODULES=(
-	"+authsignal"
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-
-IUSE="caps +daemon dbus +doc doh +fastparser +idn pkcs11 prometheus python quic systemd test +utils xdp ${KNOT_MODULES[@]}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	prometheus? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	dev-libs/libedit
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	quic? ( net-libs/ngtcp2[gnutls] )
-"
-RDEPEND="
-	dev-db/lmdb:=
-	net-libs/gnutls:=[pkcs11?]
-	daemon? (
-		${COMMON_DEPEND}
-		acct-group/knot
-		acct-user/knot
-		dev-libs/userspace-rcu:=
-		caps? ( sys-libs/libcap-ng )
-		dbus? ( sys-apps/dbus )
-		geoip? ( dev-libs/libmaxminddb:= )
-		systemd? ( sys-apps/systemd:= )
-		)
-	utils? (
-		${COMMON_DEPEND}
-		doh? ( net-libs/nghttp2:= )
-		idn? ( net-dns/libidn2:= )
-	)
-	python? ( ${PYTHON_DEPS} )
-	prometheus? (
-		$(python_gen_cond_dep '
-			dev-python/prometheus-client[${PYTHON_USEDEP}]
-			dev-python/psutil[${PYTHON_USEDEP}]
-		')
-	)
-	xdp? (
-		>=dev-libs/libbpf-1.0:=
-		net-libs/xdp-tools
-		utils? ( net-libs/libmnl:= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	python? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		pkcs11? ( dev-libs/softhsm )
-	)
-"
-
-# Used to check cpuset_t in sched.h with NetBSD.
-# False positive because linux have sched.h too but with cpu_set_t
-QA_CONFIG_IMPL_DECL_SKIP=( cpuset_create cpuset_destroy )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://gitlab.nic.cz/knot/knot-dns/-/issues/946
-	cat > tests/contrib/test_atomic.c <<-_EOF_ || die
-		#include <tap/basic.h>
-		int main(int argc, char *argv[])
-		{
-		skip_all("not supported");
-		return 0;
-		}
-	_EOF_
-	cp tests/contrib/test_{atomic,spinlock}.c || die
-	default
-}
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable caps cap_ng)
-		$(use_enable daemon)
-		$(use_enable fastparser)
-		$(use_enable dnstap)
-		$(use_enable doc documentation)
-		$(use_with doh libnghttp2)
-		$(use_enable geoip maxminddb)
-		$(use_with idn libidn)
-		$(use_enable quic)
-		$(use_enable systemd)
-		$(use_enable utils utilities)
-		$(use_enable xdp)
-	)
-
-	# modules (except dnstap forced by use_enable if set with utils) are only used by daemon
-	if use daemon; then
-		for u in "${KNOT_MODULES[@]#+}"; do
-			my_conf+=("$(use_with ${u} module-${u})")
-		done
-	else
-			my_conf+=("--disable-modules")
-	fi
-
-	if use !daemon; then
-		my_conf+=("--enable-dbus=no")
-	elif use dbus; then
-		my_conf+=("--enable-dbus=libdbus")
-	elif use !dbus && use !systemd; then
-		my_conf+=("--enable-dbus=no")
-	elif use !dbus && use systemd; then
-		my_conf+=("--enable-dbus=systemd")
-	fi
-
-	if use riscv; then
-		append-libs -latomic
-	fi
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-
-	if use python; then
-		python_domodule python/libknot/libknot
-		newdoc python/libknot/README.md README.python.md
-	fi
-
-	if use prometheus; then
-		python_domodule python/knot_exporter/knot_exporter
-		python_scriptinto /usr/sbin
-		python_newscript python/knot_exporter/knot_exporter/knot_exporter.py knot-exporter
-		newdoc python/knot_exporter/README.md README.knot_exporter.md
-	fi
-
-	default
-
-	if use daemon; then
-		rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-
-		newinitd "${FILESDIR}"/knot-3.init knot
-		newconfd "${FILESDIR}"/knot.confd knot
-
-		newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-		use systemd && systemd_newunit distro/common/knot.service knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/knot
-}
-
-pkg_postinst() {
-	use daemon && tmpfiles_process ${PN}.conf
-}

diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index c402c8ad3c89..6a8f6b760ceb 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -33,13 +33,6 @@
 			Use a zone file parser that is faster, but requires
 			more memory and CPU time to compile
 		</flag>
-		<flag name="geoip">
-			Enable the Geography-based responses module
-		</flag>
-		<flag name="libidn2">
-			If IDN support is enabled, use <pkg>net-dns/libidn2</pkg> instead
-			of <pkg>net-dns/libidn</pkg>
-		</flag>
 		<flag name="noudp">
 			Enable the module which can send empty truncated
 			responses to UDP queries


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-03-10  2:54 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-09 14:46 [gentoo-commits] repo/gentoo:master commit in: net-dns/knot/, net-dns/knot/files/ Ian Delaney
  -- strict thread matches above, loose matches on Subject: below --
2016-08-30 16:32 Patrice Clement
2016-10-15 15:08 Patrice Clement
2017-08-22  9:07 Michał Górny
2024-11-20 21:11 Andreas Sturmlechner
2024-12-06 22:08 Sam James
2025-03-10  2:54 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox