gentoo resync : 30.05.2020

5 files changed, 0 insertions, 239 deletions

diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index a7c304c91e2d..8a3712f89214 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,11 +1,5 @@
-AUX mbedtls-2.19.1-zlib.patch 1163 BLAKE2B a5b44c2af4d9e7dd37a004063b69ae9878bf240abcd75376c14e73b01a99586e06da1ece285cbbb06905dfbeff28c173bb9d170a9a22ad1045fa20b225185df0 SHA512 cc8128b55383caddc9a3d51a22222b5da51b41bdaa0b44ad4d9a447b85b9ac96eb7aa7c9e88823e62ec51ee5567531138741f03603c563cfe99172226e61ed73
-AUX mbedtls-dont-overwrite-headers.patch 2183 BLAKE2B 1353eb9c929e4d79bc1f4eecd671c9b6602917198724b42e1b43153a4751cd5a36737fd706f97e933beb857a246dc16574f4d989cc674661dd774f7df9d1c3a3 SHA512 19dec50ce70821b0c94e7bd9c50c1f8ebd7d7abc087cb91a637e5349ac938b4b07236f7fc4580e4a348ecb9de68d4b0b45cdced6e5103ce94178be710b2563a3
-AUX mbedtls-un-pebcak-705038-wrong-file.patch 2766 BLAKE2B df7ef73f53f4a2b69cc8b435d21decffb580d28e75b9ec52620c305dfc395cc088cf7e4bbcaad381a3c9f8587b1678700d8df1cd65ceeef8079e4ed250ec9ec7 SHA512 376a5c7009122b60345b9edc3ce8a2f765d1c7ef11f6a398a9b9fe1c6e4a9d36d62483f036a6c77e21fc86f2900d9d3a7c477582463a80121097a56cb08a0515
-DIST mbedcrypto-2.0.0.tar.gz 3001813 BLAKE2B 35a01b7cb11a94cb5ef333f5939945b40ecd0da482959980931e389ac5aec3c1c1b2f40970bbde4587454aee5957dce220593bfc31943ec3deddfa70d2386a25 SHA512 3a8fa6b7160065ef175139ba9cb4c8599be11f9d0df5fd60f9f96c425400a0a40eaa31d571ce61d4a00e3b10c1e2b81756c1ad31df6fc32777f40ade7806948a
 DIST mbedtls-2.16.6.tar.gz 2603563 BLAKE2B a4011bb2b7e3eca554cded05c4650fc16b48d86ae1ac7fefe29df6b29e38c1e76c880f082be83759b4dddd96f831a1238c2df41671bd9794b028402b3dd63f60 SHA512 a4c2e70c0cc6b1f1571a9f2ec27ede2620eb1937361599cab0e05b807068397d25695d5cd23931fd0f4cc051de6367c2b6c77f3507ed8b33cd492589c51eebac
-DIST mbedtls-2.19.1.tar.gz 1165843 BLAKE2B c8e6764b493a6ca011e74d7b297d5ae5140d7bdf17c1cfd5b9d37913d615ad3c5a6dbf71d44cbf14c938646e51bbf04cd63cc1657eb3775addb2dee3ee94c587 SHA512 07ec1cdf98e51ed35bb2940e485d7d8422e9fd440d2077d5cd4c80781d73848228386fe9064773ef8bb1a02c1bc060185b9c8310349d695926bd2c9b7cf6582b
 DIST mbedtls-2.22.0.tar.gz 3822997 BLAKE2B 0857479e89f9850f611cb8c946c489f715a83edba88673b874cd3e6530a7f72c48671e02435087a48aa9a550d0901a5fd2990f9b3a4d69edceecf1fa01772ab6 SHA512 391b99a59ed4edf9625e71e610ea71c6cefa4ea1210d306eb595d85f7408d5decf5fc995d4a411698f1536651ee1230b305dd354df15dbeef9469aa6a7980e09
 EBUILD mbedtls-2.16.6.ebuild 2456 BLAKE2B 824980b51af9638aeaff09e840d570c0ae353064101e483a7544efdea43c211f4ff05d9656ad01987269cf3826a303196319460bb66c727ebd5055b6bccb0e1c SHA512 41169cfda1cbdb59eedcd9addad2bd6e3aaea65a5ad2f3d2ef1aa155ad7427825b6338cf212fec49821996fd985b96de97220d8cf7d689370fabd48cd5fcd7b7
-EBUILD mbedtls-2.19.1-r2.ebuild 2848 BLAKE2B f20b47e615ee152e8b3e444cf5e2fb113eb2e4d32b9d904dd7e797c8cdb842fc0e50b1db4a2ae24cb3751bf8358713c40bd10943229f9607b32c20a9143e398a SHA512 bfdfbc437b6fea7e3f9737a5b78ff69f4ec7c3a05a773d1f396b052cc54f88dc6eef5ae6587cd6d61e765bd7b202904d0b55e0a3ecf47e90d12e9775c425d17c
 EBUILD mbedtls-2.22.0-r1.ebuild 2456 BLAKE2B b45760f975b321105ca5c8d71c9ec08b73a9bcf16acd35b72b48d4200c1dd4bbaef247d4b6702178c8d0f3847d858d804712a969dc5026a5bb9be4b54c67cdda SHA512 be621cdabf58009ea35059af3fe8a6e7600167301707099df92e255b018d8f504ca1915492f542e218982f24f8c2da7dfeed44443b5431f489df905fbaaa71df
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch b/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch
deleted file mode 100644
index ba4559cfc9be..000000000000
--- a/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9f25b8deff8e5b8fad8493db421b4639f14d2e5d Mon Sep 17 00:00:00 2001
-From: jiblime <47689567+jiblime@users.noreply.github.com>
-Date: Wed, 18 Dec 2019 21:40:01 -0800
-Subject: [PATCH] Fixes definition error when the deprecated
- MBEDTLS_ZLIB_SUPPORT and ENABLE_ZLIB_SUPPORT macro are defined/enabled for
- zlib support in mbedtls
-
-100% tests passed, 0 tests failed out of 85
-
-https://github.com/ARMmbed/mbedtls/blob/mbedtls-2.19.1/library/ssl_tls.c#L1842
-
-https://github.com/ARMmbed/mbedtls/blob/mbedtls-2.19.1/library/ssl_tls.c#L1862
----
- library/ssl_tls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/library/ssl_tls.c b/library/ssl_tls.c
-index 6cf7781f2a..51ae9da3c6 100644
---- a/library/ssl_tls.c
-+++ b/library/ssl_tls.c
-@@ -1880,7 +1880,7 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl )
- 
-     /* Allocate compression buffer */
- #if defined(MBEDTLS_ZLIB_SUPPORT)
--    if( session->compression == MBEDTLS_SSL_COMPRESS_DEFLATE &&
-+    if( ssl->session_negotiate->compression == MBEDTLS_SSL_COMPRESS_DEFLATE &&
-         ssl->compress_buf == NULL )
-     {
-         MBEDTLS_SSL_DEBUG_MSG( 3, ( "Allocating compression buffer" ) );
diff --git a/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch b/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch
deleted file mode 100644
index 4e39308ac5a7..000000000000
--- a/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From de35f31091b7e6cb20ebc8d8c0afc3b20bc57098 Mon Sep 17 00:00:00 2001
-From: Mihai Moldovan <ionic@ionic.de>
-Date: Thu, 16 Jan 2020 08:59:39 +0100
-Subject: [PATCH] Avoid overwriting tls headers in submodule mode
-
-When crypto is embedded as a submodule and the cmake build system is
-used, it would previously overwrite some header files installed by tls.
-Most of them are harmless (since they should be identical), but config.h
-is a special case.
-
-tls's and crypto's config.h files differ widely in scope and overwriting
-the more general, bigger config.h file from tls with crypto's smaller
-one will make a lot of features unavailable in programs using tls.
-
-Let's just avoid overwriting any tls header in submodule mode.
-
-Note that this will not fix the potential issue that crypto might be
-using a different configuration than tls in the submodule case.
-
-Fixes ARMmbed/mbedtls#2965
----
- include/CMakeLists.txt | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
-index 02f924df4..92229a221 100644
---- a/include/CMakeLists.txt
-+++ b/include/CMakeLists.txt
-@@ -5,6 +5,19 @@ if(INSTALL_MBEDTLS_HEADERS)
-     file(GLOB headers "mbedtls/*.h")
-     file(GLOB psa_headers "psa/*.h")
- 
-+    if(USE_CRYPTO_SUBMODULE)
-+        # Don't overwrite mbedtls's header files!
-+        # config.h is supposed to be automatically checked for compatibility
-+        # in automatic builds, while the other files should not just be
-+        # compatible, but also identical in theory.
-+        # Practically, we don't check that in crypto but just assume that the
-+        # submodule configuration is sane and trust tls's headers.
-+        list(REMOVE_ITEM headers    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h")
-+    endif(USE_CRYPTO_SUBMODULE)
-+
-     install(FILES ${headers}
-         DESTINATION include/mbedtls
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
diff --git a/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch b/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch
deleted file mode 100644
index 73e870fa1e4b..000000000000
--- a/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Fix https://bugs.gentoo.org/705038
-
-Thanks Greg Turner <gmt@be-evil.net>
-
-diff -urpN mbedtls-mbedtls-2.19.1.orig/crypto/include/CMakeLists.txt mbedtls-mbedtls-2.19.1/crypto/include/CMakeLists.txt
---- mbedtls-mbedtls-2.19.1.orig/crypto/include/CMakeLists.txt	2020-01-26 09:01:50.324231295 -0800
-+++ mbedtls-mbedtls-2.19.1/crypto/include/CMakeLists.txt	2020-01-26 09:04:26.498880873 -0800
-@@ -5,6 +5,19 @@ if(INSTALL_MBEDTLS_HEADERS)
-     file(GLOB headers "mbedtls/*.h")
-     file(GLOB psa_headers "psa/*.h")
- 
-+    if(USE_CRYPTO_SUBMODULE)
-+        # Don't overwrite mbedtls's header files!
-+        # config.h is supposed to be automatically checked for compatibility
-+        # in automatic builds, while the other files should not just be
-+        # compatible, but also identical in theory.
-+        # Practically, we don't check that in crypto but just assume that the
-+        # submodule configuration is sane and trust tls's headers.
-+        list(REMOVE_ITEM headers    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h"
-+                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h")
-+    endif(USE_CRYPTO_SUBMODULE)
-+
-     install(FILES ${headers}
-         DESTINATION include/mbedtls
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-diff -urpN mbedtls-mbedtls-2.19.1.orig/include/CMakeLists.txt mbedtls-mbedtls-2.19.1/include/CMakeLists.txt
---- mbedtls-mbedtls-2.19.1.orig/include/CMakeLists.txt	2020-01-26 09:01:50.320231227 -0800
-+++ mbedtls-mbedtls-2.19.1/include/CMakeLists.txt	2020-01-26 09:03:45.761189288 -0800
-@@ -4,19 +4,6 @@ if(INSTALL_MBEDTLS_HEADERS)
- 
-     file(GLOB headers "mbedtls/*.h")
- 
--    if(USE_CRYPTO_SUBMODULE)
--        # Don't overwrite mbedtls's header files!
--        # config.h is supposed to be automatically checked for compatibility
--        # in automatic builds, while the other files should not just be
--        # compatible, but also identical in theory.
--        # Practically, we don't check that in crypto but just assume that the
--        # submodule configuration is sane and trust tls's headers.
--        list(REMOVE_ITEM headers    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h"
--                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h"
--                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h"
--                                    "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h")
--    endif(USE_CRYPTO_SUBMODULE)
--
-     install(FILES ${headers}
-         DESTINATION include/mbedtls
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
deleted file mode 100644
index f8d6153e9705..000000000000
--- a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-CRYPTO_SUBMODULE="mbedcrypto-2.0.0"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
-	https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/13" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-dont-overwrite-headers.patch
-	"${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch
-	"${FILESDIR}"/${PN}-2.19.1-zlib.patch #706112
-)
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	# pretend to be git submodule
-	rmdir "${S}"/crypto
-	mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}