1 |
commit: 71006dc98d472ee4b0842f4da61de340bc6903b4 |
2 |
Author: Pierre-Olivier Mercier <nemunaire <AT> nemunai <DOT> re> |
3 |
AuthorDate: Thu Aug 25 19:49:29 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 30 16:32:10 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71006dc9 |
7 |
|
8 |
net-dns/knot: version bump + clean up. |
9 |
|
10 |
* bump to EAPI=6 |
11 |
* call eapply_user |
12 |
* generate only HTML documentation |
13 |
* parallel testing have been fixed |
14 |
* backport a patch fixing tests on big-endian arch |
15 |
|
16 |
Gentoo-Bug: https://bugs.gentoo.org/581568 |
17 |
Gentoo-Bug: https://bugs.gentoo.org/588654 |
18 |
Gentoo-Bug: https://bugs.gentoo.org/589166 |
19 |
Package-Manager: portage-2.3.0 |
20 |
Closes: https://github.com/gentoo/gentoo/pull/2117 |
21 |
|
22 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
23 |
|
24 |
net-dns/knot/Manifest | 4 +- |
25 |
.../1.6.3-dont-create-extra-directories.patch | 15 -- |
26 |
.../2.0.2-dont-create-extra-directories.patch | 15 -- |
27 |
...ire-format-when-writing-FNV64-hash-values.patch | 216 +++++++++++++++++++++ |
28 |
net-dns/knot/files/knot-2.1.0-nettle.patch | 26 --- |
29 |
.../knot/{knot-1.6.6.ebuild => knot-1.6.8.ebuild} | 45 ++--- |
30 |
.../knot/{knot-2.1.0.ebuild => knot-2.3.0.ebuild} | 48 ++--- |
31 |
7 files changed, 247 insertions(+), 122 deletions(-) |
32 |
|
33 |
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest |
34 |
index 9c93d00..5fc7ed3 100644 |
35 |
--- a/net-dns/knot/Manifest |
36 |
+++ b/net-dns/knot/Manifest |
37 |
@@ -1,2 +1,2 @@ |
38 |
-DIST knot-1.6.6.tar.xz 793380 SHA256 6ccae42b0878201e2113a048317bf518acad70fe436b04e24da32703d27edf03 SHA512 ac8ab0feb45a584f6e68fda99c818502e48413a6e986c05fa63f9a62363d181b998d9ee19ff777a37fc1a0bdf6faa80eb5c15fddc4a2309223055ddc703d5597 WHIRLPOOL 5cd520404d2981435c9ecdbc55ef0f54268419fea0a01868f05ee6c67bb2248aad63473afed738b55ef1c3e67db15aedc2f30027b86df4f390c2296b8e77b07c |
39 |
-DIST knot-2.1.0.tar.xz 999188 SHA256 1f6ea98da000386bf86e015655a9ec974d361b62711caf06b55f3d9bb2aa85a9 SHA512 303440fe9d7da86daecc484be6fe0956b6ebd3c55824018c30541767a24b856c8ef5a34a378d38cfaffafa1df7150cea77b2cb28b5bf1b7f97abf28c6d71caa7 WHIRLPOOL 6b44a4ae1e8eb3d8b114e166c148c5a0c6bceb63502080d62d7078a095040c91906d0e9e7a9ee813757247e7c14ef566d28997795e2de6753a63ac9c38944fbe |
40 |
+DIST knot-1.6.8.tar.xz 806748 SHA256 8d95dfd359fb187289d7d085e217d8fabb6022135d358134ed4165418a269237 SHA512 ee205a0813729bea712b0ac550209538382a2f0a7698607c3baa045a345f08e118e1b927116ad00fa58939051db70a6b21e154259276f3647acc80edf043efc8 WHIRLPOOL ed33ebdf99ba402b18550a880fb10e24f428108e297cb007d48ebbc0eea3f2e803034fe72052989e2eeb22859e3d47a5f93303b363bb50daddec868fd030e1a4 |
41 |
+DIST knot-2.3.0.tar.xz 1066852 SHA256 8abf9a6562ecf2f7f4222d16ca6c75463399870db360eda7caa40530b469533c SHA512 28f0f6a00af3feb95ebd9af0c324ffeff1093f8e74136ce81f5a6e7f4434f22b9e371715b4b116de9b8faf39776be4d943c2ae09fb786e6061cc0394a767e8b6 WHIRLPOOL b0cc054c79d6b2ef7e9e0c2dba727042d92d235a08a0b15c56189c06f69087aee36d21947e1bf33304bbe0834d50421e9f01a4b4d7597aed05ed1b552c5ea52c |
42 |
|
43 |
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 |
44 |
deleted file mode 100644 |
45 |
index e8d84a1..00000000 |
46 |
--- a/net-dns/knot/files/1.6.3-dont-create-extra-directories.patch |
47 |
+++ /dev/null |
48 |
@@ -1,15 +0,0 @@ |
49 |
---- src/Makefile.in.orig 2015-05-03 16:34:53.177934984 +0200 |
50 |
-+++ src/Makefile.in 2015-05-03 16:35:11.481325329 +0200 |
51 |
-@@ -2712,12 +2712,6 @@ |
52 |
- uninstall-sbinPROGRAMS |
53 |
- |
54 |
- |
55 |
--# Create storage and run-time directories |
56 |
--install-data-hook: |
57 |
-- $(INSTALL) -d $(DESTDIR)/@config_dir@ |
58 |
-- $(INSTALL) -d $(DESTDIR)/@run_dir@ |
59 |
-- $(INSTALL) -d $(DESTDIR)/@storage_dir@ |
60 |
-- |
61 |
- # Tell versions [3.59,3.63) of GNU make to not export all variables. |
62 |
- # Otherwise a system limit (for SysV at least) may be exceeded. |
63 |
- .NOEXPORT: |
64 |
|
65 |
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 |
66 |
deleted file mode 100644 |
67 |
index 538afec..00000000 |
68 |
--- a/net-dns/knot/files/2.0.2-dont-create-extra-directories.patch |
69 |
+++ /dev/null |
70 |
@@ -1,15 +0,0 @@ |
71 |
---- src/Makefile.in.orig 2015-05-10 20:59:26.854079700 +0200 |
72 |
-+++ src/Makefile.in 2015-05-10 21:00:01.870857369 +0200 |
73 |
-@@ -3401,12 +3401,6 @@ |
74 |
- uninstall-pkgconfigDATA uninstall-sbinPROGRAMS |
75 |
- |
76 |
- |
77 |
--# Create storage and run-time directories |
78 |
--@HAVE_DAEMON_TRUE@install-data-hook: |
79 |
--@HAVE_DAEMON_TRUE@ $(INSTALL) -d $(DESTDIR)/@config_dir@ |
80 |
--@HAVE_DAEMON_TRUE@ $(INSTALL) -d $(DESTDIR)/@run_dir@ |
81 |
--@HAVE_DAEMON_TRUE@ $(INSTALL) -d $(DESTDIR)/@storage_dir@ |
82 |
-- |
83 |
- # Tell versions [3.59,3.63) of GNU make to not export all variables. |
84 |
- # Otherwise a system limit (for SysV at least) may be exceeded. |
85 |
- .NOEXPORT: |
86 |
|
87 |
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 |
88 |
new file mode 100644 |
89 |
index 00000000..60667ab |
90 |
--- /dev/null |
91 |
+++ b/net-dns/knot/files/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch |
92 |
@@ -0,0 +1,216 @@ |
93 |
+From 84849be189c49ef9556bd84d5e5103317372e8a7 Mon Sep 17 00:00:00 2001 |
94 |
+From: Karel Slany <karel.slany@×××.cz> |
95 |
+Date: Thu, 11 Aug 2016 11:39:39 +0200 |
96 |
+Subject: [PATCH] Added conversion to wire format when writing FNV64 hash values. |
97 |
+ |
98 |
+Test on big-endian machines have been failing. |
99 |
+--- |
100 |
+ src/libknot/cookies/alg-fnv64.c | 6 +++--- |
101 |
+ tests/libknot/test_cookies-client.c | 20 ++++++++++---------- |
102 |
+ tests/libknot/test_cookies-server.c | 20 ++++++++++---------- |
103 |
+ 3 files changed, 23 insertions(+), 23 deletions(-) |
104 |
+ |
105 |
+diff --git a/src/libknot/cookies/alg-fnv64.c b/src/libknot/cookies/alg-fnv64.c |
106 |
+index 9989a4f..5e263c1 100644 |
107 |
+--- a/src/libknot/cookies/alg-fnv64.c |
108 |
++++ b/src/libknot/cookies/alg-fnv64.c |
109 |
+@@ -17,10 +17,10 @@ |
110 |
+ #include <assert.h> |
111 |
+ #include <stdint.h> |
112 |
+ #include <stdlib.h> |
113 |
+-#include <string.h> |
114 |
+ |
115 |
+ #include "contrib/fnv/fnv.h" |
116 |
+ #include "contrib/sockaddr.h" |
117 |
++#include "contrib/wire.h" |
118 |
+ #include "libknot/attribute.h" |
119 |
+ #include "libknot/cookies/alg-fnv64.h" |
120 |
+ #include "libknot/rrtype/opt-cookie.h" |
121 |
+@@ -80,7 +80,7 @@ static uint16_t cc_gen_fnv64(const struct knot_cc_input *input, |
122 |
+ assert(KNOT_OPT_COOKIE_CLNT == sizeof(hash_val)); |
123 |
+ |
124 |
+ cc_len = sizeof(hash_val); |
125 |
+- memcpy(cc_out, &hash_val, cc_len); |
126 |
++ wire_write_u64(cc_out, hash_val); |
127 |
+ |
128 |
+ return cc_len; |
129 |
+ } |
130 |
+@@ -127,7 +127,7 @@ static uint16_t sc_gen_fnv64(const struct knot_sc_input *input, |
131 |
+ assert(SRVR_FNV64_HASH_SIZE == sizeof(hash_val)); |
132 |
+ |
133 |
+ hash_len = sizeof(hash_val); |
134 |
+- memcpy(hash_out, &hash_val, hash_len); |
135 |
++ wire_write_u64(hash_out, hash_val); |
136 |
+ |
137 |
+ return hash_len; |
138 |
+ } |
139 |
+diff --git a/tests/libknot/test_cookies-client.c b/tests/libknot/test_cookies-client.c |
140 |
+index 44be903..712dbba 100644 |
141 |
+--- a/tests/libknot/test_cookies-client.c |
142 |
++++ b/tests/libknot/test_cookies-client.c |
143 |
+@@ -110,7 +110,7 @@ int main(int argc, char *argv[]) |
144 |
+ hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); |
145 |
+ ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); |
146 |
+ { |
147 |
+- uint8_t expected[] = { 0x74, 0x31, 0xf9, 0xa8, 0x03, 0xef, 0x15, 0xb1 }; |
148 |
++ uint8_t expected[] = { 0xb1, 0x15, 0xef, 0x03, 0xa8, 0xf9, 0x31, 0x74 }; |
149 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); |
150 |
+ } |
151 |
+ |
152 |
+@@ -123,7 +123,7 @@ int main(int argc, char *argv[]) |
153 |
+ hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); |
154 |
+ ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); |
155 |
+ { |
156 |
+- uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 }; |
157 |
++ uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c }; |
158 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); |
159 |
+ } |
160 |
+ |
161 |
+@@ -136,7 +136,7 @@ int main(int argc, char *argv[]) |
162 |
+ hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); |
163 |
+ ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); |
164 |
+ { |
165 |
+- uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 }; |
166 |
++ uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c }; |
167 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); |
168 |
+ } |
169 |
+ |
170 |
+@@ -149,7 +149,7 @@ int main(int argc, char *argv[]) |
171 |
+ hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); |
172 |
+ ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); |
173 |
+ { |
174 |
+- uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa }; |
175 |
++ uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 }; |
176 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); |
177 |
+ } |
178 |
+ |
179 |
+@@ -162,7 +162,7 @@ int main(int argc, char *argv[]) |
180 |
+ hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len); |
181 |
+ ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output"); |
182 |
+ { |
183 |
+- uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa }; |
184 |
++ uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 }; |
185 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content"); |
186 |
+ } |
187 |
+ |
188 |
+@@ -179,7 +179,7 @@ int main(int argc, char *argv[]) |
189 |
+ } |
190 |
+ |
191 |
+ { |
192 |
+- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; |
193 |
++ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; |
194 |
+ ret = knot_cc_check(cookie, sizeof(cookie), NULL, &knot_cc_alg_fnv64); |
195 |
+ ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no input"); |
196 |
+ } |
197 |
+@@ -190,7 +190,7 @@ int main(int argc, char *argv[]) |
198 |
+ cc_in.secret_data = secret; |
199 |
+ cc_in.secret_len = sizeof(secret); |
200 |
+ { |
201 |
+- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; |
202 |
++ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; |
203 |
+ ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, NULL); |
204 |
+ ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no algorithm"); |
205 |
+ } |
206 |
+@@ -201,7 +201,7 @@ int main(int argc, char *argv[]) |
207 |
+ cc_in.secret_data = secret; |
208 |
+ cc_in.secret_len = sizeof(secret); |
209 |
+ { |
210 |
+- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; |
211 |
++ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; |
212 |
+ ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64); |
213 |
+ ok(ret == KNOT_EOK, "cookies: FNV64 client good cookie check"); |
214 |
+ } |
215 |
+@@ -212,7 +212,7 @@ int main(int argc, char *argv[]) |
216 |
+ cc_in.secret_data = secret; |
217 |
+ cc_in.secret_len = sizeof(secret); |
218 |
+ { |
219 |
+- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf }; |
220 |
++ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 }; |
221 |
+ ret = knot_cc_check(cookie, sizeof(cookie) - 1, &cc_in, &knot_cc_alg_fnv64); |
222 |
+ ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid length"); |
223 |
+ } |
224 |
+@@ -223,7 +223,7 @@ int main(int argc, char *argv[]) |
225 |
+ cc_in.secret_data = secret; |
226 |
+ cc_in.secret_len = sizeof(secret); |
227 |
+ { |
228 |
+- uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xae }; |
229 |
++ uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x32 }; |
230 |
+ ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64); |
231 |
+ ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid cookie"); |
232 |
+ } |
233 |
+diff --git a/tests/libknot/test_cookies-server.c b/tests/libknot/test_cookies-server.c |
234 |
+index 32001c1..66a54ba 100644 |
235 |
+--- a/tests/libknot/test_cookies-server.c |
236 |
++++ b/tests/libknot/test_cookies-server.c |
237 |
+@@ -28,10 +28,10 @@ |
238 |
+ #include "libknot/rrtype/opt-cookie.h" |
239 |
+ |
240 |
+ const char *cookie_opts[] = { |
241 |
+- "\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. */ |
242 |
+- "\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. */ |
243 |
+- "\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. */ |
244 |
+- "\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. */ |
245 |
++ "\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. */ |
246 |
++ "\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. */ |
247 |
++ "\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. */ |
248 |
++ "\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. */ |
249 |
+ }; |
250 |
+ |
251 |
+ #define ROPT(i) ((const uint8_t *)cookie_opts[(i)]) |
252 |
+@@ -193,7 +193,7 @@ int main(int argc, char *argv[]) |
253 |
+ hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); |
254 |
+ ok(hash_len != 0, "cookies: FNV64 server cookie output"); |
255 |
+ { |
256 |
+- uint8_t expected[] = { 0x75, 0x45, 0x7c, 0x9a, 0xe0, 0x13, 0xa8, 0xea }; |
257 |
++ uint8_t expected[] = { 0xea, 0xa8, 0x13, 0xe0, 0x9a, 0x7c, 0x45, 0x75 }; |
258 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); |
259 |
+ } |
260 |
+ |
261 |
+@@ -210,7 +210,7 @@ int main(int argc, char *argv[]) |
262 |
+ hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); |
263 |
+ ok(hash_len != 0, "cookies: FNV64 server cookie output"); |
264 |
+ { |
265 |
+- uint8_t expected[] = { 0xc0, 0xbd, 0xdb, 0xec, 0x19, 0x78, 0x88, 0x39 }; |
266 |
++ uint8_t expected[] = { 0x39, 0x88, 0x78, 0x19, 0xec, 0xdb, 0xbd, 0xc0 }; |
267 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); |
268 |
+ } |
269 |
+ |
270 |
+@@ -227,7 +227,7 @@ int main(int argc, char *argv[]) |
271 |
+ hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); |
272 |
+ ok(hash_len != 0, "cookies: FNV64 server cookie output"); |
273 |
+ { |
274 |
+- uint8_t expected[] = { 0xe0, 0xd9, 0x95, 0x4e, 0xbc, 0xc3, 0x99, 0x19 }; |
275 |
++ uint8_t expected[] = { 0x19, 0x99, 0xc3, 0xbc, 0x4e, 0x95, 0xd9, 0xe0 }; |
276 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); |
277 |
+ } |
278 |
+ |
279 |
+@@ -244,7 +244,7 @@ int main(int argc, char *argv[]) |
280 |
+ hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); |
281 |
+ ok(hash_len != 0, "cookies: FNV64 server cookie output"); |
282 |
+ { |
283 |
+- uint8_t expected[] = { 0x4d, 0xde, 0xfa, 0x22, 0xb9, 0x0a, 0xcc, 0xd8 }; |
284 |
++ uint8_t expected[] = { 0xd8, 0xcc, 0x0a, 0xb9, 0x22, 0xfa, 0xde, 0x4d }; |
285 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); |
286 |
+ } |
287 |
+ |
288 |
+@@ -261,7 +261,7 @@ int main(int argc, char *argv[]) |
289 |
+ hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); |
290 |
+ ok(hash_len != 0, "cookies: FNV64 server cookie output"); |
291 |
+ { |
292 |
+- uint8_t expected[] = { 0xa0, 0x35, 0xe3, 0xe0, 0x78, 0x7a, 0x91, 0xaf }; |
293 |
++ uint8_t expected[] = { 0xaf, 0x91, 0x7a, 0x78, 0xe0, 0xe3, 0x35, 0xa0 }; |
294 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); |
295 |
+ } |
296 |
+ |
297 |
+@@ -278,7 +278,7 @@ int main(int argc, char *argv[]) |
298 |
+ hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len); |
299 |
+ ok(hash_len != 0, "cookies: FNV64 server cookie output"); |
300 |
+ { |
301 |
+- uint8_t expected[] = { 0x8e, 0xa3, 0xf8, 0x97, 0x84, 0x0a, 0x3d, 0x8b }; |
302 |
++ uint8_t expected[] = { 0x8b, 0x3d, 0x0a, 0x84, 0x97, 0xf8, 0xa3, 0x8e }; |
303 |
+ ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content"); |
304 |
+ } |
305 |
+ |
306 |
+-- |
307 |
+libgit2 0.24.0 |
308 |
+ |
309 |
|
310 |
diff --git a/net-dns/knot/files/knot-2.1.0-nettle.patch b/net-dns/knot/files/knot-2.1.0-nettle.patch |
311 |
deleted file mode 100644 |
312 |
index 8f89ae8..00000000 |
313 |
--- a/net-dns/knot/files/knot-2.1.0-nettle.patch |
314 |
+++ /dev/null |
315 |
@@ -1,26 +0,0 @@ |
316 |
-diff --git a/src/dnssec/lib/binary.c b/src/dnssec/lib/binary.c |
317 |
-index 454dc5a..8d642be 100644 |
318 |
---- a/src/dnssec/lib/binary.c |
319 |
-+++ b/src/dnssec/lib/binary.c |
320 |
-@@ -15,16 +15,18 @@ |
321 |
- */ |
322 |
- |
323 |
- #include <assert.h> |
324 |
--#include <nettle/base64.h> |
325 |
- #include <string.h> |
326 |
-+#include <nettle/base64.h> |
327 |
-+#ifdef HAVE_NETTLE_VERSION_H |
328 |
-+#include <nettle/version.h> |
329 |
-+#endif |
330 |
- |
331 |
- #include "binary.h" |
332 |
- #include "error.h" |
333 |
- #include "shared.h" |
334 |
- |
335 |
- typedef |
336 |
--#ifdef HAVE_NETTLE_VERSION_H |
337 |
-- #include <nettle/version.h> |
338 |
-+#ifdef NETTLE_VERSION_MAJOR |
339 |
- #if NETTLE_VERSION_MAJOR >= 3 |
340 |
- size_t |
341 |
- #else |
342 |
|
343 |
diff --git a/net-dns/knot/knot-1.6.6.ebuild b/net-dns/knot/knot-1.6.8.ebuild |
344 |
similarity index 56% |
345 |
rename from net-dns/knot/knot-1.6.6.ebuild |
346 |
rename to net-dns/knot/knot-1.6.8.ebuild |
347 |
index 44bb39f..fc0cef0 100644 |
348 |
--- a/net-dns/knot/knot-1.6.6.ebuild |
349 |
+++ b/net-dns/knot/knot-1.6.8.ebuild |
350 |
@@ -1,8 +1,8 @@ |
351 |
-# Copyright 1999-2015 Gentoo Foundation |
352 |
+# Copyright 1999-2016 Gentoo Foundation |
353 |
# Distributed under the terms of the GNU General Public License v2 |
354 |
# $Id$ |
355 |
|
356 |
-EAPI=5 |
357 |
+EAPI=6 |
358 |
|
359 |
inherit eutils user |
360 |
|
361 |
@@ -19,7 +19,10 @@ RDEPEND=" |
362 |
>=dev-libs/openssl-1.0.1 |
363 |
>=dev-libs/userspace-rcu-0.5.4 |
364 |
caps? ( >=sys-libs/libcap-ng-0.6.4 ) |
365 |
- dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) |
366 |
+ dnstap? ( |
367 |
+ dev-libs/fstrm |
368 |
+ dev-libs/protobuf-c |
369 |
+ ) |
370 |
idn? ( net-dns/libidn ) |
371 |
lmdb? ( dev-db/lmdb ) |
372 |
systemd? ( sys-apps/systemd ) |
373 |
@@ -29,15 +32,11 @@ DEPEND="${RDEPEND} |
374 |
virtual/pkgconfig |
375 |
sys-devel/flex |
376 |
sys-devel/bison |
377 |
- doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo ) |
378 |
+ doc? ( dev-python/sphinx ) |
379 |
" |
380 |
|
381 |
S="${WORKDIR}/${P/_/-}" |
382 |
|
383 |
-src_prepare() { |
384 |
- epatch "${FILESDIR}/1.6.3-dont-create-extra-directories.patch" |
385 |
-} |
386 |
- |
387 |
src_configure() { |
388 |
econf \ |
389 |
--with-storage="${EPREFIX}/var/lib/${PN}" \ |
390 |
@@ -53,40 +52,22 @@ src_configure() { |
391 |
|
392 |
src_compile() { |
393 |
default |
394 |
- use doc && emake -C doc html-local singlehtml pdf-local info-local |
395 |
+ use doc && emake -C doc html |
396 |
} |
397 |
|
398 |
-# Portage's automatic test code runs "make -n check" to see if there |
399 |
-# is a "check" target, but that fails here because the test |
400 |
-# infrastructure hasn't been built yet. Just run "make check", which |
401 |
-# will build it and then run the tests. |
402 |
src_test() { |
403 |
- emake -j1 check |
404 |
+ emake check |
405 |
} |
406 |
|
407 |
src_install() { |
408 |
- default |
409 |
- keepdir /var/lib/${PN} |
410 |
+ use doc && HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} ) |
411 |
|
412 |
- if use doc; then |
413 |
- dodoc doc/_build/latex/KnotDNS.pdf |
414 |
- |
415 |
- docinto html |
416 |
- dodoc doc/_build/html/*.html doc/_build/html/*.js |
417 |
- docinto html/_sources |
418 |
- dodoc doc/_build/html/_sources/* |
419 |
- docinto html/_static |
420 |
- dodoc doc/_build/html/_static/* |
421 |
- |
422 |
- docinto singlehtml |
423 |
- dodoc doc/_build/singlehtml/index.html |
424 |
- docinto singlehtml/_static/ |
425 |
- dodoc doc/_build/singlehtml/_static/* |
426 |
+ default |
427 |
|
428 |
- doinfo doc/_build/texinfo/KnotDNS.info |
429 |
- fi |
430 |
+ keepdir /var/lib/${PN} |
431 |
|
432 |
newinitd "${FILESDIR}/knot.init" knot |
433 |
+ systemd_dounit "${FILESDIR}/knot.service" |
434 |
} |
435 |
|
436 |
pkg_postinst() { |
437 |
|
438 |
diff --git a/net-dns/knot/knot-2.1.0.ebuild b/net-dns/knot/knot-2.3.0.ebuild |
439 |
similarity index 59% |
440 |
rename from net-dns/knot/knot-2.1.0.ebuild |
441 |
rename to net-dns/knot/knot-2.3.0.ebuild |
442 |
index 03ba610..5a9ceca 100644 |
443 |
--- a/net-dns/knot/knot-2.1.0.ebuild |
444 |
+++ b/net-dns/knot/knot-2.3.0.ebuild |
445 |
@@ -2,7 +2,7 @@ |
446 |
# Distributed under the terms of the GNU General Public License v2 |
447 |
# $Id$ |
448 |
|
449 |
-EAPI=5 |
450 |
+EAPI=6 |
451 |
|
452 |
inherit bash-completion-r1 eutils systemd user |
453 |
|
454 |
@@ -21,22 +21,25 @@ RDEPEND=" |
455 |
>=dev-db/lmdb-0.9.15 |
456 |
>=dev-libs/userspace-rcu-0.5.4 |
457 |
caps? ( >=sys-libs/libcap-ng-0.6.4 ) |
458 |
- dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) |
459 |
+ dnstap? ( |
460 |
+ dev-libs/fstrm |
461 |
+ dev-libs/protobuf-c |
462 |
+ ) |
463 |
idn? ( net-dns/libidn ) |
464 |
+ dev-libs/libedit |
465 |
systemd? ( sys-apps/systemd ) |
466 |
" |
467 |
|
468 |
DEPEND="${RDEPEND} |
469 |
virtual/pkgconfig |
470 |
- doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo ) |
471 |
+ doc? ( dev-python/sphinx ) |
472 |
" |
473 |
|
474 |
-S="${WORKDIR}/${P/_/-}" |
475 |
+PATCHES=( |
476 |
+ "${FILESDIR}/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch" |
477 |
+) |
478 |
|
479 |
-src_prepare() { |
480 |
- epatch "${FILESDIR}/2.0.2-dont-create-extra-directories.patch" |
481 |
- epatch "${FILESDIR}/knot-2.1.0-nettle.patch" |
482 |
-} |
483 |
+S="${WORKDIR}/${P/_/-}" |
484 |
|
485 |
src_configure() { |
486 |
econf \ |
487 |
@@ -55,38 +58,19 @@ src_configure() { |
488 |
|
489 |
src_compile() { |
490 |
default |
491 |
- use doc && emake -C doc html-local singlehtml pdf-local info-local |
492 |
+ use doc && emake -C doc html |
493 |
} |
494 |
|
495 |
-# Portage's automatic test code runs "make -n check" to see if there |
496 |
-# is a "check" target, but that fails here because the test |
497 |
-# infrastructure hasn't been built yet. Just run "make check", which |
498 |
-# will build it and then run the tests. |
499 |
src_test() { |
500 |
- emake -j1 check |
501 |
+ emake check |
502 |
} |
503 |
|
504 |
src_install() { |
505 |
- default |
506 |
- keepdir /var/lib/${PN} |
507 |
+ use doc && HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} ) |
508 |
|
509 |
- if use doc; then |
510 |
- dodoc doc/_build/latex/KnotDNS.pdf |
511 |
- |
512 |
- docinto html |
513 |
- dodoc doc/_build/html/*.html doc/_build/html/*.js |
514 |
- docinto html/_sources |
515 |
- dodoc doc/_build/html/_sources/* |
516 |
- docinto html/_static |
517 |
- dodoc doc/_build/html/_static/* |
518 |
- |
519 |
- docinto singlehtml |
520 |
- dodoc doc/_build/singlehtml/index.html |
521 |
- docinto singlehtml/_static/ |
522 |
- dodoc doc/_build/singlehtml/_static/* |
523 |
+ default |
524 |
|
525 |
- doinfo doc/_build/texinfo/KnotDNS.info |
526 |
- fi |
527 |
+ keepdir /var/lib/${PN} |
528 |
|
529 |
newinitd "${FILESDIR}/knot.init" knot |
530 |
systemd_dounit "${FILESDIR}/knot.service" |