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 <[email protected]> +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"
