From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- net-libs/gnutls/Manifest | 14 +-- net-libs/gnutls/files/gnutls-3.5.19-idn2.patch | 47 -------- net-libs/gnutls/files/gnutls-3.6.5-build.patch | 31 ----- net-libs/gnutls/files/gnutls-3.6.5-libressl.patch | 53 --------- net-libs/gnutls/gnutls-3.5.19-r1.ebuild | 135 --------------------- net-libs/gnutls/gnutls-3.5.19.ebuild | 137 ---------------------- net-libs/gnutls/gnutls-3.6.5.ebuild | 137 ---------------------- net-libs/gnutls/gnutls-3.6.6.ebuild | 132 --------------------- net-libs/gnutls/gnutls-3.6.7.ebuild | 2 +- net-libs/gnutls/metadata.xml | 3 - 10 files changed, 3 insertions(+), 688 deletions(-) delete mode 100644 net-libs/gnutls/files/gnutls-3.5.19-idn2.patch delete mode 100644 net-libs/gnutls/files/gnutls-3.6.5-build.patch delete mode 100644 net-libs/gnutls/files/gnutls-3.6.5-libressl.patch delete mode 100644 net-libs/gnutls/gnutls-3.5.19-r1.ebuild delete mode 100644 net-libs/gnutls/gnutls-3.5.19.ebuild delete mode 100644 net-libs/gnutls/gnutls-3.6.5.ebuild delete mode 100644 net-libs/gnutls/gnutls-3.6.6.ebuild (limited to 'net-libs/gnutls') diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index e6ce019ebf72..657893523764 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -1,13 +1,3 @@ -AUX gnutls-3.5.19-idn2.patch 1569 BLAKE2B a6b309be79e09bd873f3ad305a4517c675f127bb54df6d9dd22854b8a8591a1551b3163bfb8596296b323a9a15008d5676ed132e1eaf36e59c6267c81f2552e9 SHA512 b39a091b55413b1be9042b898eaf37c57d6cc3485bcab25169b68b1c19f249b2489609afc5fe08f7103800687c01b1580124dd6433013ca9f89e5a5e47c4cd3e -AUX gnutls-3.6.5-build.patch 1039 BLAKE2B 68db1ec474c173086b3beac504aa5cb6966c963e18cc8a2afbb3ba1b9399ddf405f2afa52124049edacab4a2244f00d4dbdb5028257dcfd69ccb37ae6d8455f6 SHA512 718e2d811251396facc5be449bd1390c305202c554ddd74498224c988a8f4f2d6141664be2504f833a598aae505198ad6a3c4cf5ace89739638488198d43818d -AUX gnutls-3.6.5-libressl.patch 1844 BLAKE2B b86f019f07cad8369a57cc829d45098be27feaef9898e0029ce3e953653ef0cb65b3b03c995fbd61eb5a2553044a08091a4a0cc0483ce2399bb5f94ab4c625cc SHA512 7a5831992a46c8a894ee4fa29c290fdb010407a749065c7dda1e67a1d2dda0940c03400f3fcb3c74dbea54835fa805575c749b43fcfd3121557ddd0bab95d142 -DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f -DIST gnutls-3.6.5.tar.xz 8192888 BLAKE2B 1d305d49c461657b921a51e6c3577e8aea76ba2a4ecbb0ba165ca1f452560b691f12733e3b3ef6d1206096a7393a6fdd05bedb5d5653c7e18e14c5c2f5993de2 SHA512 127f053ce45c63cd745fa5a654a2d8e4fbc322f5e17dcc3740fb2e7b376dd18dad59318d66e6e93e37d6a179fca4b35cf2ae62d13be5645cd2d06badd79d4dce -DIST gnutls-3.6.6.tar.xz 8257612 BLAKE2B 1b201eedcad7e4424cc6f53d21de5c8105fdea3f0bbc2ea1eceac6fed20a45ad8009fc0f4d9bd7c3e8e3a4cd261d6c32a180a273b22494c4b2f1982244bd4698 SHA512 4ff34f38d7dc543bc5750d8fdfe9be84af60c66e8d41da45f6cffc11d6c6c726784fd2d471b3416604ca1f3f9efb22ff7a290d5c92c96deda38df6ae3e794cc1 DIST gnutls-3.6.7.tar.xz 8153728 BLAKE2B 993a45edff335e75f36de27373d5db01094c81ebc5eb13d9e04a01f7f32ce6189f71f05a18c90c2e57aec688750e917ee948261726acdd7752d9d7d42a9c7ac2 SHA512 ae9b8996eb9b7269d28213f0aca3a4a17890ba8d47e3dc3b8e754ab8e2b4251e9412aaaa161a8bf56167f04cc169b4cada46f55a7bde92b955eb36cd717a99f3 -EBUILD gnutls-3.5.19-r1.ebuild 4076 BLAKE2B fc87e54e6220a9cd053aa99da22d0ea9510c2c08b09b6034d31a13e3629d091d454b23123b0b07bd8e2151f5b8748e2f611fb7a9db6a5e24753c8d8068a8208c SHA512 9631e193f752dcb8bcef414cea69672f09c3b1abc505fb27182c61808ad71f8a448555670fb12196b1781539fa5be05814aa8bdc5ede1d0981f31a0f30cda23c -EBUILD gnutls-3.5.19.ebuild 4145 BLAKE2B 4da053f06d49a5e1e109cbb5691e51c7fe6c012a46bd68d7da329fbf5ce15080229013da2afe8d4f53ba91fb67fc511b64e71156dcb0282e03b09eae183d3811 SHA512 4856b74e9bcf1716c2202c94e075dbb2ac3f9077bd0d083dbd3a17f44d79a93e206de19b0f584b4bcc5f9436ab44cd6e88e2d828487edaa102fb2911905d3ff7 -EBUILD gnutls-3.6.5.ebuild 4178 BLAKE2B 5c96edf0869162b0c675b567827269e424fd7e6c32f2a15ec59cbcb2632eb830dfefc1445f0a64d5ae5e2ee6ffb79d43a5bb57b8ecc3de295bc732f6da6aaf09 SHA512 19f72f1e92ff14263397ef949065f4d536457e1b8a760cf7b736368d22cc1791ed9ffa4e8b4525efe0f84887905cc405b7d9e023c2b13324c7b680594e944fb1 -EBUILD gnutls-3.6.6.ebuild 4108 BLAKE2B b4501e92642faa08de2b35bc109601d3f6d170f80e0e54713cf0c4824d150f396e5881c12b40b12add1235d88c36f61ad421391478631eb89823a5bdde0c7370 SHA512 c54db18e14381188a2c83a1702108837bca6000a6cb1236dde5973f8be34bc5c3056233d0e6075e389fd9a694fe00a252bd7193dfebd6839ef316a7fb03c386d -EBUILD gnutls-3.6.7.ebuild 3907 BLAKE2B 2dbce39fbfca85220f4adbbe2e462d9479aff2f427b7707a45785ed0c62072e9179d534764631a9d29569b630c8cfbc6a151b377e0b6ac578913e13c2c893275 SHA512 2e3f014cd62d08b0861d2f85271ed1029122c21fbaa938f41e7ffdb6a1607fafdb151ddbfb6981267db185ba1a0f8eeadfc778b3db8764f85cff1fc0de518436 -MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992 +EBUILD gnutls-3.6.7.ebuild 3900 BLAKE2B 4c6eb444795f80a43e6e55be51129fabaf1dfc6596d089d7e45789ab8dcc6d3c6e521f22f96b2c6c478dba5e5b52ecdd6b4c5f68d96514d21307be56451c3b17 SHA512 6b08e474c649e168cb3ab05d4f36bfc18716eb57302a42346f5c937c1ba1b87292ada6b410e55755d47845da35f7330cd9fc8cbf34a36e958d894a644dbf29b2 +MISC metadata.xml 1194 BLAKE2B 2f5c69b9b4ed31a5bf470451931963cac503fa11a8d3d575279d2b8002ed5b7d5bfdb4ca2f141b1f2d7c8f802d2d51ea9de0875d4f9dcdd7febcef200cb8a932 SHA512 fefa4338d539e248747ef69447b20b7d5b70fd814bd9daee6a659f09888c7ff90dfa6bfa1d8778383cf14fbd3b0bd919bdccac2f5adc9b2d2decb00211325b0d diff --git a/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch b/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch deleted file mode 100644 index 1f16302c81be..000000000000 --- a/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b0dfccd2149086cf5d2db44c329664a56b126216 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Sun, 6 Jan 2019 20:02:50 +0200 -Subject: [PATCH] idn2: do not use deprecated idn2_to_unicode_8z8z in - idn2-2.1.0 - -Signed-off-by: Alon Bar-Lev ---- - lib/str-idna.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -https://gitlab.com/gnutls/gnutls/merge_requests/864 - -diff --git a/lib/str-idna.c b/lib/str-idna.c -index 3bf2db877..95ca9b769 100644 ---- a/lib/str-idna.c -+++ b/lib/str-idna.c -@@ -145,7 +145,7 @@ int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsig - return ret; - } - --#ifdef HAVE_LIBIDN2 -+#if defined(HAVE_LIBIDN2) && IDN2_VERSION_NUMBER < 0x02000000 - int _idn2_punycode_decode( - size_t input_length, - const char input[], -@@ -153,7 +153,7 @@ int _idn2_punycode_decode( - uint32_t output[], - unsigned char case_flags[]); - --static int _idn2_to_unicode_8z8z(const char *src, char **dst) -+static int idn2_to_unicode_8z8z(const char *src, char **dst, int flags) - { - int rc, run; - size_t out_len = 0; -@@ -253,7 +253,7 @@ int gnutls_idna_reverse_map(const char *input, unsigned ilen, gnutls_datum_t *ou - - #ifdef HAVE_LIBIDN2 - /* currently libidn2 just converts single labels, thus a wrapper function */ -- rc = _idn2_to_unicode_8z8z((char*)istr.data, &u8); -+ rc = idn2_to_unicode_8z8z((char*)istr.data, &u8, 0); - if (rc != IDN2_OK) { - gnutls_assert(); - _gnutls_debug_log("unable to convert ACE name '%s' to UTF-8 format: %s\n", istr.data, idn2_strerror(rc)); --- -2.19.2 - diff --git a/net-libs/gnutls/files/gnutls-3.6.5-build.patch b/net-libs/gnutls/files/gnutls-3.6.5-build.patch deleted file mode 100644 index 00c11da4ae7c..000000000000 --- a/net-libs/gnutls/files/gnutls-3.6.5-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b7fdb4125e4eebc5af2155b6d36cf17339a3abf5 Mon Sep 17 00:00:00 2001 -From: Dmitry Eremin-Solenikov -Date: Tue, 25 Dec 2018 14:44:11 +0300 -Subject: [PATCH] tests: cipher-openssl-compat: don't call - EVP_CIPHER_CTX_init() - -There is no need to call EVP_CIPHER_CTX_init() after -EVP_CIPHER_CTX_new(). - -Fixes #658 - -Signed-off-by: Dmitry Eremin-Solenikov ---- - tests/slow/cipher-openssl-compat.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c -index a4cb3522d..64adf25a4 100644 ---- a/tests/slow/cipher-openssl-compat.c -+++ b/tests/slow/cipher-openssl-compat.c -@@ -106,7 +106,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher, - #if OPENSSL_VERSION_NUMBER >= 0x10100000L - if (gcipher == GNUTLS_CIPHER_AES_128_CCM - || gcipher == GNUTLS_CIPHER_AES_256_CCM) { -- assert(EVP_CIPHER_CTX_init(ctx)==1); - assert(EVP_CipherInit_ex(ctx, evp_cipher, 0, 0, 0, 0) > - 0); - --- -2.19.2 - diff --git a/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch b/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch deleted file mode 100644 index 16cac8c13b98..000000000000 --- a/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bfd036b31f2a47ae40e104b2ea1a0e095900cf52 Mon Sep 17 00:00:00 2001 -From: Dmitry Eremin-Solenikov -Date: Tue, 25 Dec 2018 14:43:56 +0300 -Subject: [PATCH] tests: cipher-openssl-compat: don't fail if OpenSSL doesn't - provide cipher - -LibreSSL does not provide ChaCha20-Poly1305 through EVP_CIPHER -interface, so let's skip the test if cipher is not available. - -Signed-off-by: Dmitry Eremin-Solenikov ---- - tests/slow/cipher-openssl-compat.c | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c -index c9b39d026..a4cb3522d 100644 ---- a/tests/slow/cipher-openssl-compat.c -+++ b/tests/slow/cipher-openssl-compat.c -@@ -38,6 +38,19 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher, - - success("cipher: %s\n", ocipher); - -+ /* decrypt with openssl */ -+ evp_cipher = EVP_get_cipherbyname(ocipher); -+ if (!evp_cipher) { -+ /* XXX: fix version check later when LibreSSL fixes support for aes-ccm and chacha20-poly1305 */ -+#ifdef LIBRESSL_VERSION_NUMBER -+ fprintf(stderr, "EVP_get_cipherbyname failed for %s\n", ocipher); -+ return -1; -+#else -+ /* OpenSSL should always work! */ -+ fail("EVP_get_cipherbyname failed for %s\n", ocipher); -+#endif -+ } -+ - for (i = 0; i < 32; i++) { /* try with multiple keys and nonces */ - assert(gnutls_rnd - (GNUTLS_RND_NONCE, orig_plain_data, -@@ -88,11 +101,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher, - - gnutls_aead_cipher_deinit(hd); - -- /* decrypt with openssl */ -- evp_cipher = EVP_get_cipherbyname(ocipher); -- if (!evp_cipher) -- fail("EVP_get_cipherbyname failed for %s\n", ocipher); -- - ctx = EVP_CIPHER_CTX_new(); - - #if OPENSSL_VERSION_NUMBER >= 0x10100000L --- -2.19.2 - diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild deleted file mode 100644 index 5917ea116d35..000000000000 --- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool multilib-minimal - -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" -HOMEPAGE="http://www.gnutls.org/" -SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" - -LICENSE="GPL-3 LGPL-2.1" -SLOT="0/30" # libgnutls.so number -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" -IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" - -REQUIRED_USE=" - test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )" - -# NOTICE: sys-devel/autogen is required at runtime as we -# use system libopts -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] - dev-libs/libunistring:=[${MULTILIB_USEDEP}] - >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}] - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] - tools? ( sys-devel/autogen:= ) - dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) - guile? ( >=dev-scheme/guile-2:=[networking] ) - nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) - pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] ) - idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( - seccomp? ( sys-libs/libseccomp ) - )" -BDEPEND=">=virtual/pkgconfig-0-r1 - doc? ( dev-util/gtk-doc ) - nls? ( sys-devel/gettext ) - tools? ( sys-devel/autogen ) - valgrind? ( dev-util/valgrind ) - test-full? ( - app-crypt/dieharder - app-misc/datefudge - dev-libs/softhsm:2[-bindist] - net-dialup/ppp - net-misc/socat - )" - -DOCS=( - README.md - doc/certtool.cfg -) - -HTML_DOCS=() - -PATCHES=( - "${FILESDIR}/${P}-idn2.patch" -) - -pkg_setup() { - # bug#520818 - export TZ=UTC - - use doc && HTML_DOCS+=( - doc/gnutls.html - ) -} - -src_prepare() { - default - - # force regeneration of autogen-ed files - local file - for file in $(grep -l AutoGen-ed src/*.c) ; do - rm src/$(basename ${file} .c).{c,h} || die - done - - # Use sane .so versioning on FreeBSD. - elibtoolize -} - -multilib_src_configure() { - LINGUAS="${LINGUAS//en/en@boldquot en@quot}" - - # TPM needs to be tested before being enabled - libconf+=( --without-tpm ) - - # hardware-accell is disabled on OSX because the asm files force - # GNU-stack (as doesn't support that) and when that's removed ld - # complains about duplicate symbols - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - - # Cygwin as does not understand these asm files at all - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) - - ECONF_SOURCE=${S} econf \ - $(multilib_native_enable manpages) \ - $(multilib_native_use_enable doc gtk-doc) \ - $(multilib_native_use_enable doc) \ - $(multilib_native_use_enable guile) \ - $(multilib_native_use_enable seccomp seccomp-tests) \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable test-full full-test-suite) \ - $(multilib_native_use_enable tools) \ - $(multilib_native_use_enable valgrind valgrind-tests) \ - $(use_enable cxx) \ - $(use_enable dane libdane) \ - $(use_enable nls) \ - $(use_enable openpgp openpgp-authentication) \ - $(use_enable openssl openssl-compatibility) \ - $(use_enable sslv2 ssl2-support) \ - $(use_enable sslv3 ssl3-support) \ - $(use_enable static-libs static) \ - $(use_enable tls-heartbeat heartbeat-support) \ - $(use_with idn libidn2) \ - $(use_with idn) \ - $(use_with pkcs11 p11-kit) \ - $(use_with zlib) \ - --disable-rpath \ - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ - --without-included-libtasn1 \ - "${libconf[@]}" \ - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc doc/examples/*.c - fi -} diff --git a/net-libs/gnutls/gnutls-3.5.19.ebuild b/net-libs/gnutls/gnutls-3.5.19.ebuild deleted file mode 100644 index cb1358dae232..000000000000 --- a/net-libs/gnutls/gnutls-3.5.19.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit libtool ltprune multilib-minimal versionator - -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" -HOMEPAGE="http://www.gnutls.org/" -SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" - -LICENSE="GPL-3 LGPL-2.1" -SLOT="0/30" # libgnutls.so number -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" -IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" - -REQUIRED_USE=" - test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )" - -# NOTICE: sys-devel/autogen is required at runtime as we -# use system libopts -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] - dev-libs/libunistring:=[${MULTILIB_USEDEP}] - >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}] - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] - tools? ( sys-devel/autogen ) - dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) - guile? ( >=dev-scheme/guile-1.8:=[networking] ) - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) - pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - doc? ( dev-util/gtk-doc ) - nls? ( sys-devel/gettext ) - valgrind? ( dev-util/valgrind ) - test? ( - seccomp? ( sys-libs/libseccomp ) - ) - test-full? ( - guile? ( >=dev-scheme/guile-2 ) - app-crypt/dieharder - app-misc/datefudge - dev-libs/softhsm:2[-bindist] - net-dialup/ppp - net-misc/socat - )" - -DOCS=( - README.md - doc/certtool.cfg -) - -HTML_DOCS=() - -PATCHES=( - "${FILESDIR}/${P}-idn2.patch" -) - -pkg_setup() { - # bug#520818 - export TZ=UTC - - use doc && HTML_DOCS+=( - doc/gnutls.html - ) -} - -src_prepare() { - default - - # force regeneration of autogen-ed files - local file - for file in $(grep -l AutoGen-ed src/*.c) ; do - rm src/$(basename ${file} .c).{c,h} || die - done - - # Use sane .so versioning on FreeBSD. - elibtoolize -} - -multilib_src_configure() { - LINGUAS="${LINGUAS//en/en@boldquot en@quot}" - - # remove magic of library detection - # bug#438222 - local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) - - # TPM needs to be tested before being enabled - libconf+=( --without-tpm ) - - # hardware-accell is disabled on OSX because the asm files force - # GNU-stack (as doesn't support that) and when that's removed ld - # complains about duplicate symbols - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - - # Cygwin as does not understand these asm files at all - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) - - ECONF_SOURCE=${S} econf \ - $(multilib_native_enable manpages) \ - $(multilib_native_use_enable doc gtk-doc) \ - $(multilib_native_use_enable doc) \ - $(multilib_native_use_enable guile) \ - $(multilib_native_use_enable seccomp seccomp-tests) \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable test-full full-test-suite) \ - $(multilib_native_use_enable tools) \ - $(multilib_native_use_enable valgrind valgrind-tests) \ - $(use_enable cxx) \ - $(use_enable dane libdane) \ - $(use_enable nls) \ - $(use_enable openpgp openpgp-authentication) \ - $(use_enable openssl openssl-compatibility) \ - $(use_enable sslv2 ssl2-support) \ - $(use_enable sslv3 ssl3-support) \ - $(use_enable static-libs static) \ - $(use_enable tls-heartbeat heartbeat-support) \ - $(use_with idn libidn2) \ - $(use_with idn) \ - $(use_with pkcs11 p11-kit) \ - $(use_with zlib) \ - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ - --without-included-libtasn1 \ - "${libconf[@]}" -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --all - - if use examples; then - docinto examples - dodoc doc/examples/*.c - fi -} diff --git a/net-libs/gnutls/gnutls-3.6.5.ebuild b/net-libs/gnutls/gnutls-3.6.5.ebuild deleted file mode 100644 index 9d141a5165c5..000000000000 --- a/net-libs/gnutls/gnutls-3.6.5.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool multilib-minimal - -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" -HOMEPAGE="http://www.gnutls.org/" -SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" - -LICENSE="GPL-3 LGPL-2.1" -SLOT="0/30" # libgnutls.so number -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" -IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind" - -REQUIRED_USE=" - test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" - -# NOTICE: sys-devel/autogen is required at runtime as we -# use system libopts -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] - dev-libs/libunistring:=[${MULTILIB_USEDEP}] - >=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}] - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] - tools? ( sys-devel/autogen:= ) - dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) - guile? ( >=dev-scheme/guile-2:=[networking] ) - nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) - pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] ) - idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( - seccomp? ( sys-libs/libseccomp ) - )" -BDEPEND=">=virtual/pkgconfig-0-r1 - doc? ( dev-util/gtk-doc ) - nls? ( sys-devel/gettext ) - tools? ( sys-devel/autogen ) - valgrind? ( dev-util/valgrind ) - test-full? ( - app-crypt/dieharder - >=app-misc/datefudge-1.22 - dev-libs/softhsm:2[-bindist] - net-dialup/ppp - net-misc/socat - )" - -DOCS=( - README.md - doc/certtool.cfg -) - -HTML_DOCS=() - -PATCHES=( - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-libressl.patch" -) - -pkg_setup() { - # bug#520818 - export TZ=UTC - - use doc && HTML_DOCS+=( - doc/gnutls.html - ) -} - -src_prepare() { - default - - # force regeneration of autogen-ed files - local file - for file in $(grep -l AutoGen-ed src/*.c) ; do - rm src/$(basename ${file} .c).{c,h} || die - done - - # Use sane .so versioning on FreeBSD. - elibtoolize - - # detect also guile-2.2, bug#673574 - # aclocal/autoreconf will require more dependencies - # that we want to have - sed -i 's/\(_guile_versions_to_search="\)\(.*\)\("\)/\1\2 2.2\3/' configure || die -} - -multilib_src_configure() { - LINGUAS="${LINGUAS//en/en@boldquot en@quot}" - - # TPM needs to be tested before being enabled - libconf+=( --without-tpm ) - - # hardware-accell is disabled on OSX because the asm files force - # GNU-stack (as doesn't support that) and when that's removed ld - # complains about duplicate symbols - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - - # Cygwin as does not understand these asm files at all - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) - - ECONF_SOURCE=${S} econf \ - $(multilib_native_enable manpages) \ - $(multilib_native_use_enable doc gtk-doc) \ - $(multilib_native_use_enable doc) \ - $(multilib_native_use_enable guile) \ - $(multilib_native_use_enable seccomp seccomp-tests) \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable test-full full-test-suite) \ - $(multilib_native_use_enable tools) \ - $(multilib_native_use_enable valgrind valgrind-tests) \ - $(use_enable cxx) \ - $(use_enable dane libdane) \ - $(use_enable nls) \ - $(use_enable openssl openssl-compatibility) \ - $(use_enable sslv2 ssl2-support) \ - $(use_enable sslv3 ssl3-support) \ - $(use_enable static-libs static) \ - $(use_enable tls-heartbeat heartbeat-support) \ - $(use_with idn) \ - $(use_with pkcs11 p11-kit) \ - --disable-rpath \ - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ - --without-included-libtasn1 \ - "${libconf[@]}" \ - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc doc/examples/*.c - fi -} diff --git a/net-libs/gnutls/gnutls-3.6.6.ebuild b/net-libs/gnutls/gnutls-3.6.6.ebuild deleted file mode 100644 index 727e95bff15c..000000000000 --- a/net-libs/gnutls/gnutls-3.6.6.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool multilib-minimal - -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" -HOMEPAGE="http://www.gnutls.org/" -SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" - -LICENSE="GPL-3 LGPL-2.1" -SLOT="0/30" # libgnutls.so number -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" -IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind" - -REQUIRED_USE=" - test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" - -# NOTICE: sys-devel/autogen is required at runtime as we -# use system libopts -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] - dev-libs/libunistring:=[${MULTILIB_USEDEP}] - >=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}] - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] - tools? ( sys-devel/autogen:= ) - dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) - guile? ( >=dev-scheme/guile-2:=[networking] ) - nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) - pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] ) - idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( - seccomp? ( sys-libs/libseccomp ) - )" -BDEPEND=">=virtual/pkgconfig-0-r1 - doc? ( dev-util/gtk-doc ) - nls? ( sys-devel/gettext ) - tools? ( sys-devel/autogen ) - valgrind? ( dev-util/valgrind ) - test-full? ( - app-crypt/dieharder - >=app-misc/datefudge-1.22 - dev-libs/softhsm:2[-bindist] - net-dialup/ppp - net-misc/socat - )" - -DOCS=( - README.md - doc/certtool.cfg -) - -HTML_DOCS=() - -pkg_setup() { - # bug#520818 - export TZ=UTC - - use doc && HTML_DOCS+=( - doc/gnutls.html - ) -} - -src_prepare() { - default - - # force regeneration of autogen-ed files - local file - for file in $(grep -l AutoGen-ed src/*.c) ; do - rm src/$(basename ${file} .c).{c,h} || die - done - - # Use sane .so versioning on FreeBSD. - elibtoolize - - # detect also guile-2.2, bug#676402 - # aclocal/autoreconf will require more dependencies - # that we want to have - sed -i 's/_guile_required_version=2.2$/_guile_required_version=2.0/' configure || die -} - -multilib_src_configure() { - LINGUAS="${LINGUAS//en/en@boldquot en@quot}" - - # TPM needs to be tested before being enabled - libconf+=( --without-tpm ) - - # hardware-accell is disabled on OSX because the asm files force - # GNU-stack (as doesn't support that) and when that's removed ld - # complains about duplicate symbols - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - - # Cygwin as does not understand these asm files at all - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) - - ECONF_SOURCE=${S} econf \ - $(multilib_native_enable manpages) \ - $(multilib_native_use_enable doc gtk-doc) \ - $(multilib_native_use_enable doc) \ - $(multilib_native_use_enable guile) \ - $(multilib_native_use_enable seccomp seccomp-tests) \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable test-full full-test-suite) \ - $(multilib_native_use_enable tools) \ - $(multilib_native_use_enable valgrind valgrind-tests) \ - $(use_enable cxx) \ - $(use_enable dane libdane) \ - $(use_enable nls) \ - $(use_enable openssl openssl-compatibility) \ - $(use_enable sslv2 ssl2-support) \ - $(use_enable sslv3 ssl3-support) \ - $(use_enable static-libs static) \ - $(use_enable tls-heartbeat heartbeat-support) \ - $(use_with idn) \ - $(use_with pkcs11 p11-kit) \ - --disable-rpath \ - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ - --without-included-libtasn1 \ - "${libconf[@]}" \ - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc doc/examples/*.c - fi -} diff --git a/net-libs/gnutls/gnutls-3.6.7.ebuild b/net-libs/gnutls/gnutls-3.6.7.ebuild index a4545942986d..270c34f25223 100644 --- a/net-libs/gnutls/gnutls-3.6.7.ebuild +++ b/net-libs/gnutls/gnutls-3.6.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" LICENSE="GPL-3 LGPL-2.1" SLOT="0/30" # libgnutls.so number -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" +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" IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind" REQUIRED_USE=" diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml index 85804ccbea44..d90b1d71c770 100644 --- a/net-libs/gnutls/metadata.xml +++ b/net-libs/gnutls/metadata.xml @@ -10,9 +10,6 @@ Build libgnutls-dane, implementing DNS-based Authentication of Named Entities. Requires net-dns/unbound - - Enable openpgp support - Build openssl compatibility libraries -- cgit v1.2.3