1 |
commit: 31dd00f6488dc707074208b71c8e0997faf6e1f2 |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 17 11:47:04 2019 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 17 11:48:01 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31dd00f6 |
7 |
|
8 |
net-libs/gnutls: cleanup old |
9 |
|
10 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
12 |
|
13 |
net-libs/gnutls/Manifest | 3 - |
14 |
net-libs/gnutls/files/gnutls-3.5.19-idn2.patch | 47 -------- |
15 |
net-libs/gnutls/files/gnutls-3.6.5-build.patch | 31 ----- |
16 |
net-libs/gnutls/files/gnutls-3.6.5-libressl.patch | 53 --------- |
17 |
net-libs/gnutls/gnutls-3.5.19-r1.ebuild | 135 --------------------- |
18 |
net-libs/gnutls/gnutls-3.5.19.ebuild | 137 ---------------------- |
19 |
net-libs/gnutls/gnutls-3.6.5.ebuild | 137 ---------------------- |
20 |
net-libs/gnutls/gnutls-3.6.6.ebuild | 132 --------------------- |
21 |
net-libs/gnutls/metadata.xml | 3 - |
22 |
9 files changed, 678 deletions(-) |
23 |
|
24 |
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest |
25 |
index b47e8e66dce..6dbf4d22866 100644 |
26 |
--- a/net-libs/gnutls/Manifest |
27 |
+++ b/net-libs/gnutls/Manifest |
28 |
@@ -1,4 +1 @@ |
29 |
-DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f |
30 |
-DIST gnutls-3.6.5.tar.xz 8192888 BLAKE2B 1d305d49c461657b921a51e6c3577e8aea76ba2a4ecbb0ba165ca1f452560b691f12733e3b3ef6d1206096a7393a6fdd05bedb5d5653c7e18e14c5c2f5993de2 SHA512 127f053ce45c63cd745fa5a654a2d8e4fbc322f5e17dcc3740fb2e7b376dd18dad59318d66e6e93e37d6a179fca4b35cf2ae62d13be5645cd2d06badd79d4dce |
31 |
-DIST gnutls-3.6.6.tar.xz 8257612 BLAKE2B 1b201eedcad7e4424cc6f53d21de5c8105fdea3f0bbc2ea1eceac6fed20a45ad8009fc0f4d9bd7c3e8e3a4cd261d6c32a180a273b22494c4b2f1982244bd4698 SHA512 4ff34f38d7dc543bc5750d8fdfe9be84af60c66e8d41da45f6cffc11d6c6c726784fd2d471b3416604ca1f3f9efb22ff7a290d5c92c96deda38df6ae3e794cc1 |
32 |
DIST gnutls-3.6.7.tar.xz 8153728 BLAKE2B 993a45edff335e75f36de27373d5db01094c81ebc5eb13d9e04a01f7f32ce6189f71f05a18c90c2e57aec688750e917ee948261726acdd7752d9d7d42a9c7ac2 SHA512 ae9b8996eb9b7269d28213f0aca3a4a17890ba8d47e3dc3b8e754ab8e2b4251e9412aaaa161a8bf56167f04cc169b4cada46f55a7bde92b955eb36cd717a99f3 |
33 |
|
34 |
diff --git a/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch b/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch |
35 |
deleted file mode 100644 |
36 |
index 1f16302c81b..00000000000 |
37 |
--- a/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch |
38 |
+++ /dev/null |
39 |
@@ -1,47 +0,0 @@ |
40 |
-From b0dfccd2149086cf5d2db44c329664a56b126216 Mon Sep 17 00:00:00 2001 |
41 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
42 |
-Date: Sun, 6 Jan 2019 20:02:50 +0200 |
43 |
-Subject: [PATCH] idn2: do not use deprecated idn2_to_unicode_8z8z in |
44 |
- idn2-2.1.0 |
45 |
- |
46 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
47 |
---- |
48 |
- lib/str-idna.c | 6 +++--- |
49 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
50 |
- |
51 |
-https://gitlab.com/gnutls/gnutls/merge_requests/864 |
52 |
- |
53 |
-diff --git a/lib/str-idna.c b/lib/str-idna.c |
54 |
-index 3bf2db877..95ca9b769 100644 |
55 |
---- a/lib/str-idna.c |
56 |
-+++ b/lib/str-idna.c |
57 |
-@@ -145,7 +145,7 @@ int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsig |
58 |
- return ret; |
59 |
- } |
60 |
- |
61 |
--#ifdef HAVE_LIBIDN2 |
62 |
-+#if defined(HAVE_LIBIDN2) && IDN2_VERSION_NUMBER < 0x02000000 |
63 |
- int _idn2_punycode_decode( |
64 |
- size_t input_length, |
65 |
- const char input[], |
66 |
-@@ -153,7 +153,7 @@ int _idn2_punycode_decode( |
67 |
- uint32_t output[], |
68 |
- unsigned char case_flags[]); |
69 |
- |
70 |
--static int _idn2_to_unicode_8z8z(const char *src, char **dst) |
71 |
-+static int idn2_to_unicode_8z8z(const char *src, char **dst, int flags) |
72 |
- { |
73 |
- int rc, run; |
74 |
- size_t out_len = 0; |
75 |
-@@ -253,7 +253,7 @@ int gnutls_idna_reverse_map(const char *input, unsigned ilen, gnutls_datum_t *ou |
76 |
- |
77 |
- #ifdef HAVE_LIBIDN2 |
78 |
- /* currently libidn2 just converts single labels, thus a wrapper function */ |
79 |
-- rc = _idn2_to_unicode_8z8z((char*)istr.data, &u8); |
80 |
-+ rc = idn2_to_unicode_8z8z((char*)istr.data, &u8, 0); |
81 |
- if (rc != IDN2_OK) { |
82 |
- gnutls_assert(); |
83 |
- _gnutls_debug_log("unable to convert ACE name '%s' to UTF-8 format: %s\n", istr.data, idn2_strerror(rc)); |
84 |
--- |
85 |
-2.19.2 |
86 |
- |
87 |
|
88 |
diff --git a/net-libs/gnutls/files/gnutls-3.6.5-build.patch b/net-libs/gnutls/files/gnutls-3.6.5-build.patch |
89 |
deleted file mode 100644 |
90 |
index 00c11da4ae7..00000000000 |
91 |
--- a/net-libs/gnutls/files/gnutls-3.6.5-build.patch |
92 |
+++ /dev/null |
93 |
@@ -1,31 +0,0 @@ |
94 |
-From b7fdb4125e4eebc5af2155b6d36cf17339a3abf5 Mon Sep 17 00:00:00 2001 |
95 |
-From: Dmitry Eremin-Solenikov <dbaryshkov@×××××.com> |
96 |
-Date: Tue, 25 Dec 2018 14:44:11 +0300 |
97 |
-Subject: [PATCH] tests: cipher-openssl-compat: don't call |
98 |
- EVP_CIPHER_CTX_init() |
99 |
- |
100 |
-There is no need to call EVP_CIPHER_CTX_init() after |
101 |
-EVP_CIPHER_CTX_new(). |
102 |
- |
103 |
-Fixes #658 |
104 |
- |
105 |
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@×××××.com> |
106 |
---- |
107 |
- tests/slow/cipher-openssl-compat.c | 1 - |
108 |
- 1 file changed, 1 deletion(-) |
109 |
- |
110 |
-diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c |
111 |
-index a4cb3522d..64adf25a4 100644 |
112 |
---- a/tests/slow/cipher-openssl-compat.c |
113 |
-+++ b/tests/slow/cipher-openssl-compat.c |
114 |
-@@ -106,7 +106,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher, |
115 |
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L |
116 |
- if (gcipher == GNUTLS_CIPHER_AES_128_CCM |
117 |
- || gcipher == GNUTLS_CIPHER_AES_256_CCM) { |
118 |
-- assert(EVP_CIPHER_CTX_init(ctx)==1); |
119 |
- assert(EVP_CipherInit_ex(ctx, evp_cipher, 0, 0, 0, 0) > |
120 |
- 0); |
121 |
- |
122 |
--- |
123 |
-2.19.2 |
124 |
- |
125 |
|
126 |
diff --git a/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch b/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch |
127 |
deleted file mode 100644 |
128 |
index 16cac8c13b9..00000000000 |
129 |
--- a/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch |
130 |
+++ /dev/null |
131 |
@@ -1,53 +0,0 @@ |
132 |
-From bfd036b31f2a47ae40e104b2ea1a0e095900cf52 Mon Sep 17 00:00:00 2001 |
133 |
-From: Dmitry Eremin-Solenikov <dbaryshkov@×××××.com> |
134 |
-Date: Tue, 25 Dec 2018 14:43:56 +0300 |
135 |
-Subject: [PATCH] tests: cipher-openssl-compat: don't fail if OpenSSL doesn't |
136 |
- provide cipher |
137 |
- |
138 |
-LibreSSL does not provide ChaCha20-Poly1305 through EVP_CIPHER |
139 |
-interface, so let's skip the test if cipher is not available. |
140 |
- |
141 |
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@×××××.com> |
142 |
---- |
143 |
- tests/slow/cipher-openssl-compat.c | 18 +++++++++++++----- |
144 |
- 1 file changed, 13 insertions(+), 5 deletions(-) |
145 |
- |
146 |
-diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c |
147 |
-index c9b39d026..a4cb3522d 100644 |
148 |
---- a/tests/slow/cipher-openssl-compat.c |
149 |
-+++ b/tests/slow/cipher-openssl-compat.c |
150 |
-@@ -38,6 +38,19 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher, |
151 |
- |
152 |
- success("cipher: %s\n", ocipher); |
153 |
- |
154 |
-+ /* decrypt with openssl */ |
155 |
-+ evp_cipher = EVP_get_cipherbyname(ocipher); |
156 |
-+ if (!evp_cipher) { |
157 |
-+ /* XXX: fix version check later when LibreSSL fixes support for aes-ccm and chacha20-poly1305 */ |
158 |
-+#ifdef LIBRESSL_VERSION_NUMBER |
159 |
-+ fprintf(stderr, "EVP_get_cipherbyname failed for %s\n", ocipher); |
160 |
-+ return -1; |
161 |
-+#else |
162 |
-+ /* OpenSSL should always work! */ |
163 |
-+ fail("EVP_get_cipherbyname failed for %s\n", ocipher); |
164 |
-+#endif |
165 |
-+ } |
166 |
-+ |
167 |
- for (i = 0; i < 32; i++) { /* try with multiple keys and nonces */ |
168 |
- assert(gnutls_rnd |
169 |
- (GNUTLS_RND_NONCE, orig_plain_data, |
170 |
-@@ -88,11 +101,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher, |
171 |
- |
172 |
- gnutls_aead_cipher_deinit(hd); |
173 |
- |
174 |
-- /* decrypt with openssl */ |
175 |
-- evp_cipher = EVP_get_cipherbyname(ocipher); |
176 |
-- if (!evp_cipher) |
177 |
-- fail("EVP_get_cipherbyname failed for %s\n", ocipher); |
178 |
-- |
179 |
- ctx = EVP_CIPHER_CTX_new(); |
180 |
- |
181 |
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L |
182 |
--- |
183 |
-2.19.2 |
184 |
- |
185 |
|
186 |
diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
187 |
deleted file mode 100644 |
188 |
index 5917ea116d3..00000000000 |
189 |
--- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
190 |
+++ /dev/null |
191 |
@@ -1,135 +0,0 @@ |
192 |
-# Copyright 1999-2019 Gentoo Authors |
193 |
-# Distributed under the terms of the GNU General Public License v2 |
194 |
- |
195 |
-EAPI=7 |
196 |
- |
197 |
-inherit libtool multilib-minimal |
198 |
- |
199 |
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" |
200 |
-HOMEPAGE="http://www.gnutls.org/" |
201 |
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" |
202 |
- |
203 |
-LICENSE="GPL-3 LGPL-2.1" |
204 |
-SLOT="0/30" # libgnutls.so number |
205 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
206 |
-IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" |
207 |
- |
208 |
-REQUIRED_USE=" |
209 |
- test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )" |
210 |
- |
211 |
-# NOTICE: sys-devel/autogen is required at runtime as we |
212 |
-# use system libopts |
213 |
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] |
214 |
- dev-libs/libunistring:=[${MULTILIB_USEDEP}] |
215 |
- >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}] |
216 |
- >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] |
217 |
- tools? ( sys-devel/autogen:= ) |
218 |
- dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) |
219 |
- guile? ( >=dev-scheme/guile-2:=[networking] ) |
220 |
- nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) |
221 |
- pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] ) |
222 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] ) |
223 |
- idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )" |
224 |
-DEPEND="${RDEPEND} |
225 |
- test? ( |
226 |
- seccomp? ( sys-libs/libseccomp ) |
227 |
- )" |
228 |
-BDEPEND=">=virtual/pkgconfig-0-r1 |
229 |
- doc? ( dev-util/gtk-doc ) |
230 |
- nls? ( sys-devel/gettext ) |
231 |
- tools? ( sys-devel/autogen ) |
232 |
- valgrind? ( dev-util/valgrind ) |
233 |
- test-full? ( |
234 |
- app-crypt/dieharder |
235 |
- app-misc/datefudge |
236 |
- dev-libs/softhsm:2[-bindist] |
237 |
- net-dialup/ppp |
238 |
- net-misc/socat |
239 |
- )" |
240 |
- |
241 |
-DOCS=( |
242 |
- README.md |
243 |
- doc/certtool.cfg |
244 |
-) |
245 |
- |
246 |
-HTML_DOCS=() |
247 |
- |
248 |
-PATCHES=( |
249 |
- "${FILESDIR}/${P}-idn2.patch" |
250 |
-) |
251 |
- |
252 |
-pkg_setup() { |
253 |
- # bug#520818 |
254 |
- export TZ=UTC |
255 |
- |
256 |
- use doc && HTML_DOCS+=( |
257 |
- doc/gnutls.html |
258 |
- ) |
259 |
-} |
260 |
- |
261 |
-src_prepare() { |
262 |
- default |
263 |
- |
264 |
- # force regeneration of autogen-ed files |
265 |
- local file |
266 |
- for file in $(grep -l AutoGen-ed src/*.c) ; do |
267 |
- rm src/$(basename ${file} .c).{c,h} || die |
268 |
- done |
269 |
- |
270 |
- # Use sane .so versioning on FreeBSD. |
271 |
- elibtoolize |
272 |
-} |
273 |
- |
274 |
-multilib_src_configure() { |
275 |
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}" |
276 |
- |
277 |
- # TPM needs to be tested before being enabled |
278 |
- libconf+=( --without-tpm ) |
279 |
- |
280 |
- # hardware-accell is disabled on OSX because the asm files force |
281 |
- # GNU-stack (as doesn't support that) and when that's removed ld |
282 |
- # complains about duplicate symbols |
283 |
- [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) |
284 |
- |
285 |
- # Cygwin as does not understand these asm files at all |
286 |
- [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) |
287 |
- |
288 |
- ECONF_SOURCE=${S} econf \ |
289 |
- $(multilib_native_enable manpages) \ |
290 |
- $(multilib_native_use_enable doc gtk-doc) \ |
291 |
- $(multilib_native_use_enable doc) \ |
292 |
- $(multilib_native_use_enable guile) \ |
293 |
- $(multilib_native_use_enable seccomp seccomp-tests) \ |
294 |
- $(multilib_native_use_enable test tests) \ |
295 |
- $(multilib_native_use_enable test-full full-test-suite) \ |
296 |
- $(multilib_native_use_enable tools) \ |
297 |
- $(multilib_native_use_enable valgrind valgrind-tests) \ |
298 |
- $(use_enable cxx) \ |
299 |
- $(use_enable dane libdane) \ |
300 |
- $(use_enable nls) \ |
301 |
- $(use_enable openpgp openpgp-authentication) \ |
302 |
- $(use_enable openssl openssl-compatibility) \ |
303 |
- $(use_enable sslv2 ssl2-support) \ |
304 |
- $(use_enable sslv3 ssl3-support) \ |
305 |
- $(use_enable static-libs static) \ |
306 |
- $(use_enable tls-heartbeat heartbeat-support) \ |
307 |
- $(use_with idn libidn2) \ |
308 |
- $(use_with idn) \ |
309 |
- $(use_with pkcs11 p11-kit) \ |
310 |
- $(use_with zlib) \ |
311 |
- --disable-rpath \ |
312 |
- --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ |
313 |
- --without-included-libtasn1 \ |
314 |
- "${libconf[@]}" \ |
315 |
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
316 |
-} |
317 |
- |
318 |
-multilib_src_install_all() { |
319 |
- einstalldocs |
320 |
- find "${D}" -name '*.la' -delete || die |
321 |
- |
322 |
- if use examples; then |
323 |
- docinto examples |
324 |
- dodoc doc/examples/*.c |
325 |
- fi |
326 |
-} |
327 |
|
328 |
diff --git a/net-libs/gnutls/gnutls-3.5.19.ebuild b/net-libs/gnutls/gnutls-3.5.19.ebuild |
329 |
deleted file mode 100644 |
330 |
index cb1358dae23..00000000000 |
331 |
--- a/net-libs/gnutls/gnutls-3.5.19.ebuild |
332 |
+++ /dev/null |
333 |
@@ -1,137 +0,0 @@ |
334 |
-# Copyright 1999-2019 Gentoo Authors |
335 |
-# Distributed under the terms of the GNU General Public License v2 |
336 |
- |
337 |
-EAPI=6 |
338 |
- |
339 |
-inherit libtool ltprune multilib-minimal versionator |
340 |
- |
341 |
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" |
342 |
-HOMEPAGE="http://www.gnutls.org/" |
343 |
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" |
344 |
- |
345 |
-LICENSE="GPL-3 LGPL-2.1" |
346 |
-SLOT="0/30" # libgnutls.so number |
347 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
348 |
-IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" |
349 |
- |
350 |
-REQUIRED_USE=" |
351 |
- test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )" |
352 |
- |
353 |
-# NOTICE: sys-devel/autogen is required at runtime as we |
354 |
-# use system libopts |
355 |
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] |
356 |
- dev-libs/libunistring:=[${MULTILIB_USEDEP}] |
357 |
- >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}] |
358 |
- >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] |
359 |
- tools? ( sys-devel/autogen ) |
360 |
- dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) |
361 |
- guile? ( >=dev-scheme/guile-1.8:=[networking] ) |
362 |
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
363 |
- pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) |
364 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
365 |
- idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )" |
366 |
-DEPEND="${RDEPEND} |
367 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
368 |
- doc? ( dev-util/gtk-doc ) |
369 |
- nls? ( sys-devel/gettext ) |
370 |
- valgrind? ( dev-util/valgrind ) |
371 |
- test? ( |
372 |
- seccomp? ( sys-libs/libseccomp ) |
373 |
- ) |
374 |
- test-full? ( |
375 |
- guile? ( >=dev-scheme/guile-2 ) |
376 |
- app-crypt/dieharder |
377 |
- app-misc/datefudge |
378 |
- dev-libs/softhsm:2[-bindist] |
379 |
- net-dialup/ppp |
380 |
- net-misc/socat |
381 |
- )" |
382 |
- |
383 |
-DOCS=( |
384 |
- README.md |
385 |
- doc/certtool.cfg |
386 |
-) |
387 |
- |
388 |
-HTML_DOCS=() |
389 |
- |
390 |
-PATCHES=( |
391 |
- "${FILESDIR}/${P}-idn2.patch" |
392 |
-) |
393 |
- |
394 |
-pkg_setup() { |
395 |
- # bug#520818 |
396 |
- export TZ=UTC |
397 |
- |
398 |
- use doc && HTML_DOCS+=( |
399 |
- doc/gnutls.html |
400 |
- ) |
401 |
-} |
402 |
- |
403 |
-src_prepare() { |
404 |
- default |
405 |
- |
406 |
- # force regeneration of autogen-ed files |
407 |
- local file |
408 |
- for file in $(grep -l AutoGen-ed src/*.c) ; do |
409 |
- rm src/$(basename ${file} .c).{c,h} || die |
410 |
- done |
411 |
- |
412 |
- # Use sane .so versioning on FreeBSD. |
413 |
- elibtoolize |
414 |
-} |
415 |
- |
416 |
-multilib_src_configure() { |
417 |
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}" |
418 |
- |
419 |
- # remove magic of library detection |
420 |
- # bug#438222 |
421 |
- local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) |
422 |
- |
423 |
- # TPM needs to be tested before being enabled |
424 |
- libconf+=( --without-tpm ) |
425 |
- |
426 |
- # hardware-accell is disabled on OSX because the asm files force |
427 |
- # GNU-stack (as doesn't support that) and when that's removed ld |
428 |
- # complains about duplicate symbols |
429 |
- [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) |
430 |
- |
431 |
- # Cygwin as does not understand these asm files at all |
432 |
- [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) |
433 |
- |
434 |
- ECONF_SOURCE=${S} econf \ |
435 |
- $(multilib_native_enable manpages) \ |
436 |
- $(multilib_native_use_enable doc gtk-doc) \ |
437 |
- $(multilib_native_use_enable doc) \ |
438 |
- $(multilib_native_use_enable guile) \ |
439 |
- $(multilib_native_use_enable seccomp seccomp-tests) \ |
440 |
- $(multilib_native_use_enable test tests) \ |
441 |
- $(multilib_native_use_enable test-full full-test-suite) \ |
442 |
- $(multilib_native_use_enable tools) \ |
443 |
- $(multilib_native_use_enable valgrind valgrind-tests) \ |
444 |
- $(use_enable cxx) \ |
445 |
- $(use_enable dane libdane) \ |
446 |
- $(use_enable nls) \ |
447 |
- $(use_enable openpgp openpgp-authentication) \ |
448 |
- $(use_enable openssl openssl-compatibility) \ |
449 |
- $(use_enable sslv2 ssl2-support) \ |
450 |
- $(use_enable sslv3 ssl3-support) \ |
451 |
- $(use_enable static-libs static) \ |
452 |
- $(use_enable tls-heartbeat heartbeat-support) \ |
453 |
- $(use_with idn libidn2) \ |
454 |
- $(use_with idn) \ |
455 |
- $(use_with pkcs11 p11-kit) \ |
456 |
- $(use_with zlib) \ |
457 |
- --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ |
458 |
- --without-included-libtasn1 \ |
459 |
- "${libconf[@]}" |
460 |
-} |
461 |
- |
462 |
-multilib_src_install_all() { |
463 |
- einstalldocs |
464 |
- prune_libtool_files --all |
465 |
- |
466 |
- if use examples; then |
467 |
- docinto examples |
468 |
- dodoc doc/examples/*.c |
469 |
- fi |
470 |
-} |
471 |
|
472 |
diff --git a/net-libs/gnutls/gnutls-3.6.5.ebuild b/net-libs/gnutls/gnutls-3.6.5.ebuild |
473 |
deleted file mode 100644 |
474 |
index 9d141a5165c..00000000000 |
475 |
--- a/net-libs/gnutls/gnutls-3.6.5.ebuild |
476 |
+++ /dev/null |
477 |
@@ -1,137 +0,0 @@ |
478 |
-# Copyright 1999-2019 Gentoo Authors |
479 |
-# Distributed under the terms of the GNU General Public License v2 |
480 |
- |
481 |
-EAPI=7 |
482 |
- |
483 |
-inherit libtool multilib-minimal |
484 |
- |
485 |
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" |
486 |
-HOMEPAGE="http://www.gnutls.org/" |
487 |
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" |
488 |
- |
489 |
-LICENSE="GPL-3 LGPL-2.1" |
490 |
-SLOT="0/30" # libgnutls.so number |
491 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
492 |
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind" |
493 |
- |
494 |
-REQUIRED_USE=" |
495 |
- test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" |
496 |
- |
497 |
-# NOTICE: sys-devel/autogen is required at runtime as we |
498 |
-# use system libopts |
499 |
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] |
500 |
- dev-libs/libunistring:=[${MULTILIB_USEDEP}] |
501 |
- >=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}] |
502 |
- >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] |
503 |
- tools? ( sys-devel/autogen:= ) |
504 |
- dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) |
505 |
- guile? ( >=dev-scheme/guile-2:=[networking] ) |
506 |
- nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) |
507 |
- pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] ) |
508 |
- idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )" |
509 |
-DEPEND="${RDEPEND} |
510 |
- test? ( |
511 |
- seccomp? ( sys-libs/libseccomp ) |
512 |
- )" |
513 |
-BDEPEND=">=virtual/pkgconfig-0-r1 |
514 |
- doc? ( dev-util/gtk-doc ) |
515 |
- nls? ( sys-devel/gettext ) |
516 |
- tools? ( sys-devel/autogen ) |
517 |
- valgrind? ( dev-util/valgrind ) |
518 |
- test-full? ( |
519 |
- app-crypt/dieharder |
520 |
- >=app-misc/datefudge-1.22 |
521 |
- dev-libs/softhsm:2[-bindist] |
522 |
- net-dialup/ppp |
523 |
- net-misc/socat |
524 |
- )" |
525 |
- |
526 |
-DOCS=( |
527 |
- README.md |
528 |
- doc/certtool.cfg |
529 |
-) |
530 |
- |
531 |
-HTML_DOCS=() |
532 |
- |
533 |
-PATCHES=( |
534 |
- "${FILESDIR}/${P}-build.patch" |
535 |
- "${FILESDIR}/${P}-libressl.patch" |
536 |
-) |
537 |
- |
538 |
-pkg_setup() { |
539 |
- # bug#520818 |
540 |
- export TZ=UTC |
541 |
- |
542 |
- use doc && HTML_DOCS+=( |
543 |
- doc/gnutls.html |
544 |
- ) |
545 |
-} |
546 |
- |
547 |
-src_prepare() { |
548 |
- default |
549 |
- |
550 |
- # force regeneration of autogen-ed files |
551 |
- local file |
552 |
- for file in $(grep -l AutoGen-ed src/*.c) ; do |
553 |
- rm src/$(basename ${file} .c).{c,h} || die |
554 |
- done |
555 |
- |
556 |
- # Use sane .so versioning on FreeBSD. |
557 |
- elibtoolize |
558 |
- |
559 |
- # detect also guile-2.2, bug#673574 |
560 |
- # aclocal/autoreconf will require more dependencies |
561 |
- # that we want to have |
562 |
- sed -i 's/\(_guile_versions_to_search="\)\(.*\)\("\)/\1\2 2.2\3/' configure || die |
563 |
-} |
564 |
- |
565 |
-multilib_src_configure() { |
566 |
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}" |
567 |
- |
568 |
- # TPM needs to be tested before being enabled |
569 |
- libconf+=( --without-tpm ) |
570 |
- |
571 |
- # hardware-accell is disabled on OSX because the asm files force |
572 |
- # GNU-stack (as doesn't support that) and when that's removed ld |
573 |
- # complains about duplicate symbols |
574 |
- [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) |
575 |
- |
576 |
- # Cygwin as does not understand these asm files at all |
577 |
- [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) |
578 |
- |
579 |
- ECONF_SOURCE=${S} econf \ |
580 |
- $(multilib_native_enable manpages) \ |
581 |
- $(multilib_native_use_enable doc gtk-doc) \ |
582 |
- $(multilib_native_use_enable doc) \ |
583 |
- $(multilib_native_use_enable guile) \ |
584 |
- $(multilib_native_use_enable seccomp seccomp-tests) \ |
585 |
- $(multilib_native_use_enable test tests) \ |
586 |
- $(multilib_native_use_enable test-full full-test-suite) \ |
587 |
- $(multilib_native_use_enable tools) \ |
588 |
- $(multilib_native_use_enable valgrind valgrind-tests) \ |
589 |
- $(use_enable cxx) \ |
590 |
- $(use_enable dane libdane) \ |
591 |
- $(use_enable nls) \ |
592 |
- $(use_enable openssl openssl-compatibility) \ |
593 |
- $(use_enable sslv2 ssl2-support) \ |
594 |
- $(use_enable sslv3 ssl3-support) \ |
595 |
- $(use_enable static-libs static) \ |
596 |
- $(use_enable tls-heartbeat heartbeat-support) \ |
597 |
- $(use_with idn) \ |
598 |
- $(use_with pkcs11 p11-kit) \ |
599 |
- --disable-rpath \ |
600 |
- --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ |
601 |
- --without-included-libtasn1 \ |
602 |
- "${libconf[@]}" \ |
603 |
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
604 |
-} |
605 |
- |
606 |
-multilib_src_install_all() { |
607 |
- einstalldocs |
608 |
- find "${D}" -name '*.la' -delete || die |
609 |
- |
610 |
- if use examples; then |
611 |
- docinto examples |
612 |
- dodoc doc/examples/*.c |
613 |
- fi |
614 |
-} |
615 |
|
616 |
diff --git a/net-libs/gnutls/gnutls-3.6.6.ebuild b/net-libs/gnutls/gnutls-3.6.6.ebuild |
617 |
deleted file mode 100644 |
618 |
index 727e95bff15..00000000000 |
619 |
--- a/net-libs/gnutls/gnutls-3.6.6.ebuild |
620 |
+++ /dev/null |
621 |
@@ -1,132 +0,0 @@ |
622 |
-# Copyright 1999-2019 Gentoo Authors |
623 |
-# Distributed under the terms of the GNU General Public License v2 |
624 |
- |
625 |
-EAPI=7 |
626 |
- |
627 |
-inherit libtool multilib-minimal |
628 |
- |
629 |
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" |
630 |
-HOMEPAGE="http://www.gnutls.org/" |
631 |
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" |
632 |
- |
633 |
-LICENSE="GPL-3 LGPL-2.1" |
634 |
-SLOT="0/30" # libgnutls.so number |
635 |
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
636 |
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind" |
637 |
- |
638 |
-REQUIRED_USE=" |
639 |
- test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" |
640 |
- |
641 |
-# NOTICE: sys-devel/autogen is required at runtime as we |
642 |
-# use system libopts |
643 |
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] |
644 |
- dev-libs/libunistring:=[${MULTILIB_USEDEP}] |
645 |
- >=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}] |
646 |
- >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] |
647 |
- tools? ( sys-devel/autogen:= ) |
648 |
- dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) |
649 |
- guile? ( >=dev-scheme/guile-2:=[networking] ) |
650 |
- nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) |
651 |
- pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] ) |
652 |
- idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )" |
653 |
-DEPEND="${RDEPEND} |
654 |
- test? ( |
655 |
- seccomp? ( sys-libs/libseccomp ) |
656 |
- )" |
657 |
-BDEPEND=">=virtual/pkgconfig-0-r1 |
658 |
- doc? ( dev-util/gtk-doc ) |
659 |
- nls? ( sys-devel/gettext ) |
660 |
- tools? ( sys-devel/autogen ) |
661 |
- valgrind? ( dev-util/valgrind ) |
662 |
- test-full? ( |
663 |
- app-crypt/dieharder |
664 |
- >=app-misc/datefudge-1.22 |
665 |
- dev-libs/softhsm:2[-bindist] |
666 |
- net-dialup/ppp |
667 |
- net-misc/socat |
668 |
- )" |
669 |
- |
670 |
-DOCS=( |
671 |
- README.md |
672 |
- doc/certtool.cfg |
673 |
-) |
674 |
- |
675 |
-HTML_DOCS=() |
676 |
- |
677 |
-pkg_setup() { |
678 |
- # bug#520818 |
679 |
- export TZ=UTC |
680 |
- |
681 |
- use doc && HTML_DOCS+=( |
682 |
- doc/gnutls.html |
683 |
- ) |
684 |
-} |
685 |
- |
686 |
-src_prepare() { |
687 |
- default |
688 |
- |
689 |
- # force regeneration of autogen-ed files |
690 |
- local file |
691 |
- for file in $(grep -l AutoGen-ed src/*.c) ; do |
692 |
- rm src/$(basename ${file} .c).{c,h} || die |
693 |
- done |
694 |
- |
695 |
- # Use sane .so versioning on FreeBSD. |
696 |
- elibtoolize |
697 |
- |
698 |
- # detect also guile-2.2, bug#676402 |
699 |
- # aclocal/autoreconf will require more dependencies |
700 |
- # that we want to have |
701 |
- sed -i 's/_guile_required_version=2.2$/_guile_required_version=2.0/' configure || die |
702 |
-} |
703 |
- |
704 |
-multilib_src_configure() { |
705 |
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}" |
706 |
- |
707 |
- # TPM needs to be tested before being enabled |
708 |
- libconf+=( --without-tpm ) |
709 |
- |
710 |
- # hardware-accell is disabled on OSX because the asm files force |
711 |
- # GNU-stack (as doesn't support that) and when that's removed ld |
712 |
- # complains about duplicate symbols |
713 |
- [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) |
714 |
- |
715 |
- # Cygwin as does not understand these asm files at all |
716 |
- [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) |
717 |
- |
718 |
- ECONF_SOURCE=${S} econf \ |
719 |
- $(multilib_native_enable manpages) \ |
720 |
- $(multilib_native_use_enable doc gtk-doc) \ |
721 |
- $(multilib_native_use_enable doc) \ |
722 |
- $(multilib_native_use_enable guile) \ |
723 |
- $(multilib_native_use_enable seccomp seccomp-tests) \ |
724 |
- $(multilib_native_use_enable test tests) \ |
725 |
- $(multilib_native_use_enable test-full full-test-suite) \ |
726 |
- $(multilib_native_use_enable tools) \ |
727 |
- $(multilib_native_use_enable valgrind valgrind-tests) \ |
728 |
- $(use_enable cxx) \ |
729 |
- $(use_enable dane libdane) \ |
730 |
- $(use_enable nls) \ |
731 |
- $(use_enable openssl openssl-compatibility) \ |
732 |
- $(use_enable sslv2 ssl2-support) \ |
733 |
- $(use_enable sslv3 ssl3-support) \ |
734 |
- $(use_enable static-libs static) \ |
735 |
- $(use_enable tls-heartbeat heartbeat-support) \ |
736 |
- $(use_with idn) \ |
737 |
- $(use_with pkcs11 p11-kit) \ |
738 |
- --disable-rpath \ |
739 |
- --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ |
740 |
- --without-included-libtasn1 \ |
741 |
- "${libconf[@]}" \ |
742 |
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
743 |
-} |
744 |
- |
745 |
-multilib_src_install_all() { |
746 |
- einstalldocs |
747 |
- find "${D}" -name '*.la' -delete || die |
748 |
- |
749 |
- if use examples; then |
750 |
- docinto examples |
751 |
- dodoc doc/examples/*.c |
752 |
- fi |
753 |
-} |
754 |
|
755 |
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml |
756 |
index 85804ccbea4..d90b1d71c77 100644 |
757 |
--- a/net-libs/gnutls/metadata.xml |
758 |
+++ b/net-libs/gnutls/metadata.xml |
759 |
@@ -10,9 +10,6 @@ |
760 |
Build libgnutls-dane, implementing DNS-based Authentication of |
761 |
Named Entities. Requires <pkg>net-dns/unbound</pkg> |
762 |
</flag> |
763 |
- <flag name="openpgp"> |
764 |
- Enable openpgp support |
765 |
- </flag> |
766 |
<flag name="openssl"> |
767 |
Build openssl compatibility libraries |
768 |
</flag> |