4 files changed, 27 insertions, 6 deletions
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 70da58970ab8..bb4ef40706b6 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,7 +1,7 @@
 DIST mbedtls-2.28.8.tar.bz2 3343796 BLAKE2B 1efde6698662873c40df9733bae902db4e009f3dd26a937e05707ca1a208b71675df0737b44b5895a60cfbf42f18f92dae88cba62f32b55733947b9c0481880e SHA512 c8e91ec50ab2caf1f33e907279dc30fca2a8cd97e6e531be857149589e52aeffb95b445b2a9fa674886f0071f446381da3bb8107f7e850f3390128b069ac9ea7
 DIST mbedtls-2.28.9.tar.bz2 3357068 BLAKE2B 14b845f826c3a1953ca3ab82d2f557d8fe6f1a2f57b31134c89933571a87ab9027de50f8f094d4086509d60e38d4c82ac67180f848aa6d06f3ce9f390c8ed63c SHA512 305f97c0b0ba7d57639532a24600234d8f849a4a5795773673b31cc1fdcd1cd56aea42bec2ff87439296e1528dcc2bed5e2a29fbdbf7edad4f5c4da232079d99
 DIST mbedtls-3.6.2.tar.bz2 4979769 BLAKE2B dbf34ca3cffca7a9bdb10191bd58971583ae3f2cdef3e350ccda08eae2e7b52f5fd4d1aff5582ee120b6e35e6843d7dd323ba7da5f1428c16130e5ed7c0d689e SHA512 7ab3b1ec179681949e1b0d171e04f75a605ae9ed8177cf3f6f27c401efca4aff930437ecc425c9a994d36f50ddd6f0f0dd7feeb42251128ac875b4c57fe3811b
-EBUILD mbedtls-2.28.8.ebuild 2770 BLAKE2B 97b08c08b32b809725b8eeb9d4325cfcbfbf8e3413083867b0f2cbfb4eecaf86fca2a8c4c7dd77ca66c70f60179dfdc04e2047ef1aff86ec3eb1122fec1ddb2e SHA512 7d1c512416845ad5002c2d91cd90bf545f6b42b26f9bd6408f7309cfd674cee1d2c842af68168415f25e5eb34e0d2694ae085445fccc30cdd17846c05d5c154b
-EBUILD mbedtls-2.28.9.ebuild 2767 BLAKE2B 6c23118f565cbf52b3d3099340718252f04bce393098222654d7d3598170c29085f4190b5fc312e0c2c4b117585b1e605ee57367e3e16dea33e93fef9afac386 SHA512 22d14017a0b9eb862f8fbcc3a1f6a55b9c857f7a99b02a002f638f3aeb2790a043ebaab86b10e81bad2017519dfa6db44ebf273f4a654898e7e306a017206e26
-EBUILD mbedtls-3.6.2.ebuild 2482 BLAKE2B 7f11721496a31ffca1cae04b287166e832b8756cb465d4416ec4e53435da9cc6483801f23579296133abd9849d9a8f1c57ba3b2b7ae8ee6d39a715695035004e SHA512 1df63381c789efeaa68a3b18faf53e4ffa31ce37bb2bb4b37d2ca46de01b86de2a153b01be23939d6218238a444965ee548a74f4610409de0bb27882192643aa
+EBUILD mbedtls-2.28.8-r1.ebuild 2980 BLAKE2B dd7a9f676873de5331eb5ba05eaab78db29dc5b6f160296e31aaba08589703c8f593df323ca32ff47fb3a979e9983a26aae16dfe90fe69780c51c0bb19898ad6 SHA512 5f0eaf264c8dc4a857964a00dcf8abcb90b2f288f98f61efa558bdc33b6a2579a0e6bf9c53fb803cc72ee70cff4870fe8bb2c7a4018f2a836f3d46de1d495c9f
+EBUILD mbedtls-2.28.9-r1.ebuild 2977 BLAKE2B 7cff1791e89944adb555305436b61a335698ba87b096b9f3a252e2dd0a3fc001577d19e359e36273bf158e36d6c256de1010323e62fe9403ea7d7189e07e9bc7 SHA512 b866cd79a56cfb851a2a3a9de508bcb1f23cc27400a2ed9633ebe4dfb471b8c5e4917fd6c3597eb4a0a5d1b1eb92522d2801614d634a926c3049f4df553e86ea
+EBUILD mbedtls-3.6.2-r1.ebuild 2692 BLAKE2B f97652d35818ae78f9d429e253ecd57815ef633090a5d55061761608cf55220df8c1cc07ce9d36d79e0033f65516c13b6e8a150075c012940849deeed62e9346 SHA512 0df1ad4a169e18051d7e2b35b0813854715256dbd24a8accd2e4daa5c285bc3ee878673eeb5b7373e04fd3fbbadd939286719748788d8eec874d9b12451712fe
 MISC metadata.xml 1058 BLAKE2B 6b3d24de59849c4fe1a629007300b3bc85aa9e7808e54f91a257c5d9de5eaf7b0567ad248aa928ea6b30a8977ff2d70410721bb03a7839c3f97d7d1c5f416e13 SHA512 8f8a6fef48532d23d10efc7a2334606840ae80d46373a423ab1898950e23487587c8babca2aacfbe7fa5dd4d1327d42e171ad01235f813541acfce27a0fa968b
diff --git a/net-libs/mbedtls/mbedtls-2.28.8.ebuild b/net-libs/mbedtls/mbedtls-2.28.8-r1.ebuild
index 277de889ee8d..748942d2e93f 100644
--- a/net-libs/mbedtls/mbedtls-2.28.8.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.28.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake multilib-minimal python-any-r1
+inherit cmake flag-o-matic multilib-minimal python-any-r1
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
@@ -49,6 +49,13 @@ src_prepare() {
 	cmake_src_prepare
 }
 
+src_configure() {
+	# Workaround for https://github.com/Mbed-TLS/mbedtls/issues/9814 (bug #946544)
+	append-flags $(test-flags-CC -fzero-init-padding-bits=unions)
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
diff --git a/net-libs/mbedtls/mbedtls-2.28.9.ebuild b/net-libs/mbedtls/mbedtls-2.28.9-r1.ebuild
index 3bcc990f2b70..622ce0e78ec5 100644
--- a/net-libs/mbedtls/mbedtls-2.28.9.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.28.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake multilib-minimal python-any-r1
+inherit cmake flag-o-matic multilib-minimal python-any-r1
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
@@ -48,6 +48,13 @@ src_prepare() {
 	cmake_src_prepare
 }
 
+src_configure() {
+	# Workaround for https://github.com/Mbed-TLS/mbedtls/issues/9814 (bug #946544)
+	append-flags $(test-flags-CC -fzero-init-padding-bits=unions)
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
diff --git a/net-libs/mbedtls/mbedtls-3.6.2.ebuild b/net-libs/mbedtls/mbedtls-3.6.2-r1.ebuild
index 0d3fb3694a4e..89dea0151ff0 100644
--- a/net-libs/mbedtls/mbedtls-3.6.2.ebuild
+++ b/net-libs/mbedtls/mbedtls-3.6.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake multilib-minimal python-any-r1
+inherit cmake flag-o-matic multilib-minimal python-any-r1
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
@@ -42,6 +42,13 @@ src_prepare() {
 	cmake_src_prepare
 }
 
+src_configure() {
+	# Workaround for https://github.com/Mbed-TLS/mbedtls/issues/9814 (bug #946544)
+	append-flags $(test-flags-CC -fzero-init-padding-bits=unions)
+
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)