Re: [PR PATCH] [Updated] mbedtls: update to 2.28.5.

[Bnyro <Bnyro@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

There is an updated pull request by Bnyro against master on the void-packages repository

https://github.com/Bnyro/void-packages mbedtls
https://github.com/void-linux/void-packages/pull/46137

mbedtls: update to 2.28.5.

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc



A patch file from https://github.com/void-linux/void-packages/pull/46137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mbedtls-46137.patch --]
[-- Type: text/x-diff, Size: 9642 bytes --]

From f3942163f2394370d70bbddb251718ec73208ec3 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/12] mbedtls: update to 2.28.5.

---
 common/shlibs            | 6 +++---
 srcpkgs/mbedtls/template | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 36ddac17b0257..ddb4586a1c5f5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2176,9 +2176,9 @@ librrd_th.so.4 rrdtool-1.4.9_1
 libmosquitto.so.1 libmosquitto-1.6.3_5
 libmosquittopp.so.1 libmosquittopp-1.6.3_5
 libmpv.so.2 mpv-0.35.0_1
-libmbedtls.so.12 mbedtls-2.13.1_1
-libmbedcrypto.so.3 mbedtls-2.9.0_1
-libmbedx509.so.0 mbedtls-2.9.0_1
+libmbedtls.so.14 mbedtls-2.28.4_1
+libmbedcrypto.so.7 mbedtls-2.28.4_1
+libmbedx509.so.1 mbedtls-2.28.4_1
 libdmtx.so.0 libdmtx-0.7.4_1
 libdbus-c++-1.so.0 libdbus-c++-0.9.0_1
 libdbus-c++-glib-1.so.0 libdbus-c++-0.9.0_1
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index ac910923171c5..0d3ffaf9412fc 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,6 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=2.28.5
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
@@ -12,7 +11,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz"
-checksum=294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393
+checksum=849e86b626e42ded6bf67197b64aa771daa54e2a7e2868dc67e1e4711959e5e3
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
@@ -24,7 +23,7 @@ mbedtls-utils_package() {
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin
-		rm "${PKGDESTDIR}"/usr/bin/query_compile_time_config
+		rm "${PKGDESTDIR}"/usr/bin/{query_compile_time_config,hello}
 	}
 }
 

From 35fb05ba9cc7ddc2bc3f03885bdfa2208fb26a3b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:32 +0100
Subject: [PATCH 02/12] bctoolbox: revbump for mbedtls-2.28.5

---
 srcpkgs/bctoolbox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 1819e487d0808..30c48b691ba49 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
 # Template file for 'bctoolbox'
 pkgname=bctoolbox
 version=5.2.111
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
  -DENABLE_STRICT=FALSE -DCMAKE_MODULE_PATH=/usr/lib/cmake"

From 4d1aafc3fc80d24de14887c4da252c0475adc918 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 03/12] dislocker: revbump for mbedtls-2.28.5

---
 srcpkgs/dislocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index bd92028fe168e..539f0a718f8bb 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
 # Template file for 'dislocker'
 pkgname=dislocker
 version=0.7.3
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DLIB_INSTALL_DIR=lib"
 makedepends="mbedtls-devel fuse-devel"

From c03f73b4761a91abe606f3e10c5e54d88dcdb635 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 04/12] godot: revbump for mbedtls-2.28.5

---
 srcpkgs/godot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index e57051ab29d35..ffa69fc1860b3 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
 # Template file for 'godot'
 pkgname=godot
 version=4.1.2
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
 # Build currently fails with embree-4.X

From 7fd92b933b32b5547aff557054f150b1d55ed2c4 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 05/12] hiawatha: revbump for mbedtls-2.28.5

---
 srcpkgs/hiawatha/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index 9c2500430dcb8..0f89bb96d49dd 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,7 +1,7 @@
 # Template file for 'hiawatha'
 pkgname=hiawatha
 version=10.12
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
  -DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha

From 9cbd68ca6f696eb96aa92115a5c07aca2a0b4d39 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 06/12] imhex: revbump for mbedtls-2.28.5

---
 srcpkgs/imhex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 94a058c2b1639..ea1c58b78a870 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
 # Template file for 'imhex'
 pkgname=imhex
 version=1.30.1
-revision=2
+revision=3
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu

From cbdb78b217f623f8252361a91c60b953799f4f8b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 07/12] librist: revbump for mbedtls-2.28.5

---
 srcpkgs/librist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librist/template b/srcpkgs/librist/template
index f075679388de8..7d7197c6da4d9 100644
--- a/srcpkgs/librist/template
+++ b/srcpkgs/librist/template
@@ -1,7 +1,7 @@
 # Template file for 'librist'
 pkgname=librist
 version=0.2.7
-revision=1
+revision=2
 build_style=meson
 makedepends="mbedtls-devel"
 short_desc="Reliable Internet Stream Transport (RIST)"

From 125c78cc18b558989a0d5d847e035107e74d41b7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 08/12] openrgb: revbump for mbedtls-2.28.5

---
 srcpkgs/openrgb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openrgb/template b/srcpkgs/openrgb/template
index cff1fe115070b..1cfa541d2a23e 100644
--- a/srcpkgs/openrgb/template
+++ b/srcpkgs/openrgb/template
@@ -1,7 +1,7 @@
 # Template file for 'openrgb'
 pkgname=openrgb
 version=0.9
-revision=4
+revision=5
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools git pkg-config"
 makedepends="qt5-devel libusb-devel hidapi-devel mbedtls-devel"

From fe8fb20832e700ebe4a3192e8c26dd4a5810a170 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 09/12] retroarch: revbump for mbedtls-2.28.5

---
 srcpkgs/retroarch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 895c4d739380c..cb3125c5dbf1a 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.16.0.3
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  --enable-udev --disable-builtinflac --disable-builtinglslang

From 480ba17efe92db4a6215a061ebe5788d752c3fcf Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 10/12] rvault: revbump for mbedtls-2.28.5

---
 srcpkgs/rvault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b7..53d170711c116 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,7 +1,7 @@
 # Template file for 'rvault'
 pkgname=rvault
 version=0.4
-revision=4
+revision=5
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes

From 29bc1fe8c68383aea4785bec3334894fd8350368 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 11/12] shadowsocks-libev: revbump for mbedtls-2.28.5

---
 srcpkgs/shadowsocks-libev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template
index ed1c93cf4e06d..49b4737e399fd 100644
--- a/srcpkgs/shadowsocks-libev/template
+++ b/srcpkgs/shadowsocks-libev/template
@@ -1,7 +1,7 @@
 # Template file for 'shadowsocks-libev'
 pkgname=shadowsocks-libev
 version=3.3.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config asciidoc xmlto"

From b58464b8281b2fcfcc4fc3aa5765cae2df99b319 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 12/12] tpm2-tss: revbump for mbedtls-2.28.5

---
 srcpkgs/tpm2-tss/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index 0b9b4b28e6933..683fc6e506805 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
 # Template file for 'tpm2-tss'
 pkgname=tpm2-tss
 version=3.2.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
 hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"