[gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     06c1962f71eaf86b851b335d3af450c9d720a993
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 13:56:35 2021 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 13:56:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c1962f

net-libs/mbedtls: version bumps to 2.16.12, 2.28.0, 3.1.0

See https://bugs.gentoo.org/829660

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 net-libs/mbedtls/Manifest                              |  4 +++-
 .../{mbedtls-3.0.0.ebuild => mbedtls-2.16.12.ebuild}   | 18 +++++++++++-------
 .../{mbedtls-3.0.0.ebuild => mbedtls-2.28.0.ebuild}    | 15 ++++++++++-----
 .../{mbedtls-3.0.0.ebuild => mbedtls-3.1.0.ebuild}     |  0
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 1551b46251fb..855bdcea15c8 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,3 +1,5 @@
 DIST mbedtls-2.16.11.tar.gz 2692209 BLAKE2B 9d7bccfc0d1bc5a038b6dcb866722a27362c229a5f1b515396aabbb53e77cfe36525446fb2557c817772810f24335a51c9a5c45bcfa866d8a07ff4e96498dbde SHA512 b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee
+DIST mbedtls-2.16.12.tar.gz 2702190 BLAKE2B 3cbe0bcfd0eca279d9b4b3816416b8e778f0aa38d368d810701e65140f0d1524afabe4fd1a1a65297f872a7dfafb7d2feeb7382fe8ea2b180f24551ceac53c26 SHA512 40c4487cc40afcf929bc7158d735a869ebada41c811f63a10d74e9b9644960e2a0aeb7c7c9841c0aef815425990847d47e7f42f9bafe0b2a959e769e3d74ebe9
 DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
-DIST mbedtls-3.0.0.tar.gz 4163127 BLAKE2B 5d94124a251dbcc38de614319f93c6f0346de516fd944c765ab3e60d46fba8fbbdba7a6f9e00f5f0550137301b4de98795851df788e367c4fcf03abb981d3c63 SHA512 be11878d82fc93d0847718514f4887c68d7b186c54682316c4a01082583a917b81f9760bb708aab72bf37148581a8dbc9f7048faf745cd2e1cd7e5bf8c48abad
+DIST mbedtls-2.28.0.tar.gz 3712239 BLAKE2B 1141465bc5b73e7fd94bbd02c79290093fd075626be93aea839a54ebff81fb00917f0a4fe7911fee983a36147fa4922d258714a330b40b0da4764a3b2419df8b SHA512 2ddc161caeebe8bf1e8cf23c398f65ceff699eb6487a7bcaf6a665879aac5458e21e26b06370085cbdae6ce6b5394afece656aa6307bbb3f5b701bcb41f3dd64
+DIST mbedtls-3.1.0.tar.gz 3766628 BLAKE2B a52e8fb9a3b88c1cf7cb0c8f5598f90a1c9ca05dbc399432293c3acb77aaf0a1b92a9792bda986b47e925736b21c83de1c891b21d45fd2dc8cb5d7d1b09168e7 SHA512 c374fafad89f8793ed1a302634a403b855317d9759377d4bade13c61857d0317a2fc144ab3a9aaee52901ff7a3c4b4b0e7e81ebe5510ab4d228103def01ae628

diff --git a/net-libs/mbedtls/mbedtls-3.0.0.ebuild b/net-libs/mbedtls/mbedtls-2.16.12.ebuild
similarity index 79%
copy from net-libs/mbedtls/mbedtls-3.0.0.ebuild
copy to net-libs/mbedtls/mbedtls-2.16.12.ebuild
index 54ef48f6e4fa..c9dc1eab6f6e 100644
--- a/net-libs/mbedtls/mbedtls-3.0.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.12.ebuild
@@ -11,15 +11,16 @@ SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
 S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
-SLOT="0/10.16.4" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads"
+SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	programs? (
 		dev-libs/openssl:0=
-	)"
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen media-gfx/graphviz )
 	test? ( dev-lang/perl )"
@@ -29,11 +30,13 @@ enable_mbedtls_option() {
 	# check that config.h syntax is the same at version bump
 	sed -i \
 		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/mbedtls_config.h || die
+		include/mbedtls/config.h || die
 }
 
 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
 
@@ -43,12 +46,12 @@ 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="${EPREFIX}/usr/$(get_libdir)"
-		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
 	)
 
 	cmake_src_configure
@@ -60,7 +63,8 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	# psa isn't ready yet, even in 3.0.0.
+	# psa isn't ready yet, it might be in 3.x(?) but certainly not
+	# at the moment.
 	# bug #718390
 	local myctestargs=(
 		-E "(psa_crypto|psa_its-suite)"

diff --git a/net-libs/mbedtls/mbedtls-3.0.0.ebuild b/net-libs/mbedtls/mbedtls-2.28.0.ebuild
similarity index 81%
copy from net-libs/mbedtls/mbedtls-3.0.0.ebuild
copy to net-libs/mbedtls/mbedtls-2.28.0.ebuild
index 54ef48f6e4fa..227fbc135dc4 100644
--- a/net-libs/mbedtls/mbedtls-3.0.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.28.0.ebuild
@@ -11,15 +11,16 @@ SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
 S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
-SLOT="0/10.16.4" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+SLOT="0/7.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads"
+IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	programs? (
 		dev-libs/openssl:0=
-	)"
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen media-gfx/graphviz )
 	test? ( dev-lang/perl )"
@@ -29,11 +30,13 @@ enable_mbedtls_option() {
 	# check that config.h syntax is the same at version bump
 	sed -i \
 		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/mbedtls_config.h || die
+		include/mbedtls/config.h || die
 }
 
 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
 
@@ -43,6 +46,7 @@ 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
@@ -60,7 +64,8 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	# psa isn't ready yet, even in 3.0.0.
+	# psa isn't ready yet, it might be in 3.x(?) but certainly not
+	# at the moment.
 	# bug #718390
 	local myctestargs=(
 		-E "(psa_crypto|psa_its-suite)"

diff --git a/net-libs/mbedtls/mbedtls-3.0.0.ebuild b/net-libs/mbedtls/mbedtls-3.1.0.ebuild
similarity index 100%
rename from net-libs/mbedtls/mbedtls-3.0.0.ebuild
rename to net-libs/mbedtls/mbedtls-3.1.0.ebuild