* [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4
@ 2023-09-19 14:31 Bnyro
2023-09-19 14:42 ` [PR PATCH] [Updated] mbedtls: update to 2.28.4 Bnyro
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: Bnyro @ 2023-09-19 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
There is a new 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
tpm2-tss: revbump for mbedtls-2.28.4
#### 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: 9895 bytes --]
From 67f36ff84ac84118a5ee1b9a62cf381cee26ec0a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/13] mbedtls: update to 2.28.4.
---
common/shlibs | 3 +++
srcpkgs/mbedtls/template | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c9d59ef3b97ca..e6ccf31a41e03 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2206,6 +2206,9 @@ 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..5496f752e7664 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
# Template file for 'mbedtls'
pkgname=mbedtls
reverts="2.17.0_1"
-version=2.16.12
+version=2.28.4
revision=1
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
@@ -12,7 +12,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=578c4dcd15bbff3f5cd56aa07cd4f850fc733634e3d5947be4f7157d5bfd81ac
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
From 7aa11e84b510434e5ea4fcee5196219953820288 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 02/13] bctoolbox: revbump for mbedtls-2.28.4
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 3beea9e1f7216..c4b51dd43358d 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.2.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
-DCMAKE_MODULE_PATH=/usr/lib/cmake"
From 6e1a31d4e615ace1dc4c285dcc268e8241c97a78 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 03/13] dislocker: revbump for mbedtls-2.28.4
---
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 7f5ec8c016362b65d35d2a38b73fa9f68cece235 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 04/13] godot: revbump for mbedtls-2.28.4
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index f487838e20b51..433f25ffe8e11 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.1.1
-revision=5
+revision=6
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
From 9990c7fbec68bd9360df0fcf33c5e0f79fa61256 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 05/13] hiawatha: revbump for mbedtls-2.28.4
---
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 a57467ab8806920d18d285d7dc30bcaa0542fbe7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 06/13] imhex: revbump for mbedtls-2.28.4
---
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 07f7ba0062094e4bcc4c6da0f9ecadf1987edd0c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 07/13] librist: revbump for mbedtls-2.28.4
---
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 d321e96f90aba108d731890d85682b243ec2d565 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 08/13] obs: revbump for mbedtls-2.28.4
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..b43b10ef935e9 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=29.1.3
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From ca3daffe41a6cba0da8c20f9c73dbe70277feecd Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 09/13] openrgb: revbump for mbedtls-2.28.4
---
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 843d3f28fa3d6b5003f5c72366c76b2e8d522bf3 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 10/13] retroarch: revbump for mbedtls-2.28.4
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 45b02597de41a..507805ea8d819 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.15.0
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
From 222213fc87ec88d69952ce730f4d4459cc78c954 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 11/13] rvault: revbump for mbedtls-2.28.4
---
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 4d3dd1877433b5daf8b314feb9905aaad1783b9c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 12/13] shadowsocks-libev: revbump for mbedtls-2.28.4
---
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 528b70aaa8310be0d37679811e0099df861d8781 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 13/13] tpm2-tss: revbump for mbedtls-2.28.4
---
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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.4.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
@ 2023-09-19 14:42 ` Bnyro
2023-09-19 14:49 ` Bnyro
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-09-19 14:42 UTC (permalink / raw)
To: ml
[-- 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.4.
#### 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: 10014 bytes --]
From 7aad76bcfad6c94c7acfa1cb8933798d8dc98a43 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/13] mbedtls: update to 2.28.4.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c9d59ef3b97ca..c50086c0b19ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2203,9 +2203,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..5496f752e7664 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
# Template file for 'mbedtls'
pkgname=mbedtls
reverts="2.17.0_1"
-version=2.16.12
+version=2.28.4
revision=1
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
@@ -12,7 +12,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=578c4dcd15bbff3f5cd56aa07cd4f850fc733634e3d5947be4f7157d5bfd81ac
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
From 4e65dbf28ab3d8724bc3d229a366cdcc529a4edc Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 02/13] bctoolbox: revbump for mbedtls-2.28.4
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 3beea9e1f7216..c4b51dd43358d 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.2.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
-DCMAKE_MODULE_PATH=/usr/lib/cmake"
From f801c6b808ba57db74799207a07b579487352afc Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 03/13] dislocker: revbump for mbedtls-2.28.4
---
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 340e346887dce2be1e461785bc3632ee2fa73ede Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 04/13] godot: revbump for mbedtls-2.28.4
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index f487838e20b51..433f25ffe8e11 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.1.1
-revision=5
+revision=6
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
From baf4e17a9c2b10ea01f639ccfbc2014d67912660 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 05/13] hiawatha: revbump for mbedtls-2.28.4
---
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 6b6afef053d157472142998daf3d8d35267bcb6f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 06/13] imhex: revbump for mbedtls-2.28.4
---
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 7fd17f93663593378de9fdbd350fbc96503f2e8d Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 07/13] librist: revbump for mbedtls-2.28.4
---
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 032a12eefa082bfe86a942c155ede1567814a74a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 08/13] obs: revbump for mbedtls-2.28.4
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..b43b10ef935e9 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=29.1.3
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From 2170a88e5689fb9d855856c125ae651cfcb432e8 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 09/13] openrgb: revbump for mbedtls-2.28.4
---
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 f1fba840b272cb7dbc90798315e576a1559df7fd Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 10/13] retroarch: revbump for mbedtls-2.28.4
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 45b02597de41a..507805ea8d819 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.15.0
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
From c64f368b8eb1bcef9a282833ca579f91a73c2ae6 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 11/13] rvault: revbump for mbedtls-2.28.4
---
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 251508950fc51c690bdde4af713defa5b655f451 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 12/13] shadowsocks-libev: revbump for mbedtls-2.28.4
---
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 c6fbf5a201ee74d7f508a71a4835bdef4eaa6197 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 13/13] tpm2-tss: revbump for mbedtls-2.28.4
---
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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.4.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
2023-09-19 14:42 ` [PR PATCH] [Updated] mbedtls: update to 2.28.4 Bnyro
@ 2023-09-19 14:49 ` Bnyro
2023-09-20 8:14 ` Bnyro
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-09-19 14:49 UTC (permalink / raw)
To: ml
[-- 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.4.
#### 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: 10015 bytes --]
From 8676fba2bbddc8a8760d1cb0a6504af86d36e7ab Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/13] mbedtls: update to 2.28.4.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c9d59ef3b97ca..c50086c0b19ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2203,9 +2203,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..ff62a89e9c76f 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.4
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=578c4dcd15bbff3f5cd56aa07cd4f850fc733634e3d5947be4f7157d5bfd81ac
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
From 1fe4f8efc0e1f61351bf01e9e5567286b73889c8 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 02/13] bctoolbox: revbump for mbedtls-2.28.4
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 3beea9e1f7216..c4b51dd43358d 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.2.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
-DCMAKE_MODULE_PATH=/usr/lib/cmake"
From f4480cf5e61086df3196981fbe7301356d3c4a3f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 03/13] dislocker: revbump for mbedtls-2.28.4
---
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 00d0a0b2e69e763719551d3e88f7704c88fccba4 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 04/13] godot: revbump for mbedtls-2.28.4
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index f487838e20b51..433f25ffe8e11 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.1.1
-revision=5
+revision=6
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
From ba2ce5c8ecd9a8361598cbadb87322f1c6e241e3 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 05/13] hiawatha: revbump for mbedtls-2.28.4
---
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 813dc7e806b0d7683d1716988845fe565fc4c535 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 06/13] imhex: revbump for mbedtls-2.28.4
---
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 3f584dac1d66b620049e857dd5ad235c4816b190 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 07/13] librist: revbump for mbedtls-2.28.4
---
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 43baedef03048a71bfe655247d73de330329e753 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 08/13] obs: revbump for mbedtls-2.28.4
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..b43b10ef935e9 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=29.1.3
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From c3d5d9db710633f661c76c6cb62df71e83effbe7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 09/13] openrgb: revbump for mbedtls-2.28.4
---
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 354b21a95a0534783c040e3b9bfbecba3967543c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 10/13] retroarch: revbump for mbedtls-2.28.4
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 45b02597de41a..507805ea8d819 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.15.0
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
From 38b39a4916456d328c145ac3b6b2cc4bb8f98eee Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 11/13] rvault: revbump for mbedtls-2.28.4
---
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 c8664140f939cae8e013af1613372c040479fc1f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 12/13] shadowsocks-libev: revbump for mbedtls-2.28.4
---
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 9e813d600753e8f999facd03fa9ab613e27d119b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 13/13] tpm2-tss: revbump for mbedtls-2.28.4
---
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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.4.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
2023-09-19 14:42 ` [PR PATCH] [Updated] mbedtls: update to 2.28.4 Bnyro
2023-09-19 14:49 ` Bnyro
@ 2023-09-20 8:14 ` Bnyro
2023-09-20 8:23 ` Bnyro
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-09-20 8:14 UTC (permalink / raw)
To: ml
[-- 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.4.
#### 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: 10785 bytes --]
From 8676fba2bbddc8a8760d1cb0a6504af86d36e7ab Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/14] mbedtls: update to 2.28.4.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c9d59ef3b97ca..c50086c0b19ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2203,9 +2203,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..ff62a89e9c76f 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.4
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=578c4dcd15bbff3f5cd56aa07cd4f850fc733634e3d5947be4f7157d5bfd81ac
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
From 1fe4f8efc0e1f61351bf01e9e5567286b73889c8 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 02/14] bctoolbox: revbump for mbedtls-2.28.4
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 3beea9e1f7216..c4b51dd43358d 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.2.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
-DCMAKE_MODULE_PATH=/usr/lib/cmake"
From f4480cf5e61086df3196981fbe7301356d3c4a3f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 03/14] dislocker: revbump for mbedtls-2.28.4
---
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 00d0a0b2e69e763719551d3e88f7704c88fccba4 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 04/14] godot: revbump for mbedtls-2.28.4
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index f487838e20b51..433f25ffe8e11 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.1.1
-revision=5
+revision=6
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
From ba2ce5c8ecd9a8361598cbadb87322f1c6e241e3 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 05/14] hiawatha: revbump for mbedtls-2.28.4
---
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 813dc7e806b0d7683d1716988845fe565fc4c535 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 06/14] imhex: revbump for mbedtls-2.28.4
---
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 3f584dac1d66b620049e857dd5ad235c4816b190 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 07/14] librist: revbump for mbedtls-2.28.4
---
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 43baedef03048a71bfe655247d73de330329e753 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 08/14] obs: revbump for mbedtls-2.28.4
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..b43b10ef935e9 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=29.1.3
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From c3d5d9db710633f661c76c6cb62df71e83effbe7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 09/14] openrgb: revbump for mbedtls-2.28.4
---
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 354b21a95a0534783c040e3b9bfbecba3967543c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 10/14] retroarch: revbump for mbedtls-2.28.4
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 45b02597de41a..507805ea8d819 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.15.0
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
From 38b39a4916456d328c145ac3b6b2cc4bb8f98eee Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 11/14] rvault: revbump for mbedtls-2.28.4
---
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 c8664140f939cae8e013af1613372c040479fc1f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 12/14] shadowsocks-libev: revbump for mbedtls-2.28.4
---
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 9e813d600753e8f999facd03fa9ab613e27d119b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 13/14] tpm2-tss: revbump for mbedtls-2.28.4
---
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"
From 3948fb804dfb26ad2656589227b3ed689c6e2b41 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 20 Sep 2023 10:15:16 +0200
Subject: [PATCH 14/14] dolphin-emu: revbump for mbedtls-2.28.4
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index b4c8b64368a4b..070993aac31d2 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.19368
-revision=1
+revision=2
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.4.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
` (2 preceding siblings ...)
2023-09-20 8:14 ` Bnyro
@ 2023-09-20 8:23 ` Bnyro
2023-09-20 8:30 ` Bnyro
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-09-20 8:23 UTC (permalink / raw)
To: ml
[-- 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.4.
#### 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: 11043 bytes --]
From 49109ee2d31197a3b61891efe059031bdefecbae Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/14] mbedtls: update to 2.28.4.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c9d59ef3b97ca..c50086c0b19ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2203,9 +2203,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..50dfcf3b61eb2 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.4
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=578c4dcd15bbff3f5cd56aa07cd4f850fc733634e3d5947be4f7157d5bfd81ac
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 9ccd03c2b3c8a855fca1cd494226deaa14830ff4 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 02/14] bctoolbox: revbump for mbedtls-2.28.4
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 3beea9e1f7216..c4b51dd43358d 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.2.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
-DCMAKE_MODULE_PATH=/usr/lib/cmake"
From 160da05c42322b9ac97f7a570c48a0bc04e041c4 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 03/14] dislocker: revbump for mbedtls-2.28.4
---
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 518fff874b1c5549386e690fb69088ece1d079e6 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 04/14] godot: revbump for mbedtls-2.28.4
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index f487838e20b51..433f25ffe8e11 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.1.1
-revision=5
+revision=6
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
From 52dfad0b15d726d131b00a3f8773fcffe9402884 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 05/14] hiawatha: revbump for mbedtls-2.28.4
---
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 59986382e4e7f9f0493b7356e9b992c953de4a89 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 06/14] imhex: revbump for mbedtls-2.28.4
---
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 bb44e4a826a262b3f823f43f30f05684d2fd4746 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 07/14] librist: revbump for mbedtls-2.28.4
---
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 c68f6c95d061b0108df1fcee19a9aec009c1932b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 08/14] obs: revbump for mbedtls-2.28.4
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..b43b10ef935e9 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=29.1.3
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From b14a71630a85ffbc94a4f5ae390dceec577133e2 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 09/14] openrgb: revbump for mbedtls-2.28.4
---
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 0263a8d5399bdb666dbce7fb7b4eeb1d382d2b89 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 10/14] retroarch: revbump for mbedtls-2.28.4
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 45b02597de41a..507805ea8d819 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.15.0
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
From debc77ebbc55e5a74c4c2db0f5932ad35880173c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 11/14] rvault: revbump for mbedtls-2.28.4
---
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 ff6ab4936de118bfef14a2a57d5033d0c5a3857a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 12/14] shadowsocks-libev: revbump for mbedtls-2.28.4
---
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 b2002f77bd0fa1a27b51592f2f8c94b24871bc9b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 13/14] tpm2-tss: revbump for mbedtls-2.28.4
---
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"
From 5c5ebada65c587ea1111bc3213a032de14cac2bb Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 20 Sep 2023 10:15:16 +0200
Subject: [PATCH 14/14] dolphin-emu: revbump for mbedtls-2.28.4
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index b4c8b64368a4b..070993aac31d2 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.19368
-revision=1
+revision=2
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.4.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
` (3 preceding siblings ...)
2023-09-20 8:23 ` Bnyro
@ 2023-09-20 8:30 ` Bnyro
2023-10-31 16:35 ` Bnyro
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-09-20 8:30 UTC (permalink / raw)
To: ml
[-- 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.4.
#### 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: 11043 bytes --]
From 20be072bb7be76f3f875a794a287c8efb7645906 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/14] mbedtls: update to 2.28.4.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c9d59ef3b97ca..c50086c0b19ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2203,9 +2203,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..50dfcf3b61eb2 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.4
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=578c4dcd15bbff3f5cd56aa07cd4f850fc733634e3d5947be4f7157d5bfd81ac
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 db16d29a3b778734642f74880dce213411058f54 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 02/14] bctoolbox: revbump for mbedtls-2.28.4
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 3beea9e1f7216..c4b51dd43358d 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.2.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
-DCMAKE_MODULE_PATH=/usr/lib/cmake"
From c139c46da4b18eb7b7850e0498dee4eb9ddb88fb Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 03/14] dislocker: revbump for mbedtls-2.28.4
---
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 da41fa54e3e54505b8f15639808501b75abcaacb Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 04/14] godot: revbump for mbedtls-2.28.4
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index f487838e20b51..433f25ffe8e11 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.1.1
-revision=5
+revision=6
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
From 3628e851e154b6c73079505239953c1fc68135a4 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 05/14] hiawatha: revbump for mbedtls-2.28.4
---
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 1e12f5445f1a46a28c8b3fe0ad1352b164b1ccb6 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 06/14] imhex: revbump for mbedtls-2.28.4
---
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 95bcb77f14699570002f45c22a977fe4f0d0fe24 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 07/14] librist: revbump for mbedtls-2.28.4
---
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 b42b75ddbbdb8f6ebf1fc6540e51ad536869ab24 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 08/14] obs: revbump for mbedtls-2.28.4
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..b43b10ef935e9 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=29.1.3
-revision=1
+revision=2
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From 8fafbaadaf1cd60b69e894e4613fa410ff54a5cb Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 09/14] openrgb: revbump for mbedtls-2.28.4
---
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 223b2a1b9eff461ea12bad57414e0be4e8f8571c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 10/14] retroarch: revbump for mbedtls-2.28.4
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 45b02597de41a..507805ea8d819 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.15.0
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
From 9fa64ce29599be9dc7dd3252bb33d6f9f5dcdcda Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 11/14] rvault: revbump for mbedtls-2.28.4
---
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 7294c469864a8a16582e063606f1f4fe73be4d17 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 12/14] shadowsocks-libev: revbump for mbedtls-2.28.4
---
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 69fca2d58ae603cc8fcfe0b8b2c227dc6ec017fd Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 13/14] tpm2-tss: revbump for mbedtls-2.28.4
---
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"
From 824d11b497225f6371fece4fedd048967281bd49 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 20 Sep 2023 10:15:16 +0200
Subject: [PATCH 14/14] dolphin-emu: revbump for mbedtls-2.28.4
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index b4c8b64368a4b..070993aac31d2 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.19368
-revision=1
+revision=2
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.4.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
` (4 preceding siblings ...)
2023-09-20 8:30 ` Bnyro
@ 2023-10-31 16:35 ` Bnyro
2023-10-31 16:36 ` [PR PATCH] [Updated] mbedtls: update to 2.28.5 Bnyro
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-10-31 16:35 UTC (permalink / raw)
To: ml
[-- 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.4.
#### 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: 10438 bytes --]
From 3e2e35ae92703276c2451588386d8d58225add3c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/13] mbedtls: update to 2.28.4.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae51..8f5dde42fe6bd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2178,9 +2178,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 ac910923171c52..50dfcf3b61eb21 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.4
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=578c4dcd15bbff3f5cd56aa07cd4f850fc733634e3d5947be4f7157d5bfd81ac
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 25e5997b3569c61e6f484ae50811df818919365b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 02/13] bctoolbox: revbump for mbedtls-2.28.4
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 1819e487d08086..30c48b691ba492 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 a52ac71ab8469a6347e2b7842113bae84f5b1b69 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 03/13] dislocker: revbump for mbedtls-2.28.4
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index bd92028fe168e0..539f0a718f8bb6 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 e4bad40a397d45a9ea5be040d20c043efd623075 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 04/13] godot: revbump for mbedtls-2.28.4
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index e57051ab29d35a..ffa69fc1860b37 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 5119c9679f9bca42a7952e51eaa196a606ea4bd2 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 05/13] hiawatha: revbump for mbedtls-2.28.4
---
srcpkgs/hiawatha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index 9c2500430dcb8f..0f89bb96d49ddb 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 c1daa6477c1cf195ac4c31a03bf1094ed79e3338 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 06/13] imhex: revbump for mbedtls-2.28.4
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 94a058c2b16398..ea1c58b78a8703 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 4a1fc9362fe7f02f64272398799c8908fcf03323 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 07/13] librist: revbump for mbedtls-2.28.4
---
srcpkgs/librist/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/librist/template b/srcpkgs/librist/template
index f075679388de88..7d7197c6da4d9c 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 dff6823aeb6ae3cfdb9e99a19552ea735145bb89 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 08/13] openrgb: revbump for mbedtls-2.28.4
---
srcpkgs/openrgb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openrgb/template b/srcpkgs/openrgb/template
index cff1fe115070b8..1cfa541d2a23e3 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 a44caaf05756ccd262670496dbd65c715ed1fe0b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 09/13] retroarch: revbump for mbedtls-2.28.4
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 45b02597de41a3..507805ea8d819a 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.15.0
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
From 1bd58550c561fa244f729766e71ea68c42e8be66 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 10/13] rvault: revbump for mbedtls-2.28.4
---
srcpkgs/rvault/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..53d170711c116f 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 1ebdb976a5dfc5b054b883b18dda4fec04172678 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 11/13] shadowsocks-libev: revbump for mbedtls-2.28.4
---
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 ed1c93cf4e06d1..49b4737e399fd9 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 85481a5d69391401abe03c7214fe5ec13ca024c6 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 12/13] tpm2-tss: revbump for mbedtls-2.28.4
---
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 0b9b4b28e69339..683fc6e5068050 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"
From dd9e1b25d956a3d83232413a31daf4bfc91193f1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 20 Sep 2023 10:15:16 +0200
Subject: [PATCH 13/13] dolphin-emu: revbump for mbedtls-2.28.4
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index b4c8b64368a4be..070993aac31d2b 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.19368
-revision=1
+revision=2
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.5.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
` (5 preceding siblings ...)
2023-10-31 16:35 ` Bnyro
@ 2023-10-31 16:36 ` Bnyro
2023-10-31 16:45 ` Bnyro
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-10-31 16:36 UTC (permalink / raw)
To: ml
[-- 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: 10438 bytes --]
From d0b9b8717b9dd41633591ac0d6e9d25609543d2a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/13] 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 9036a675c1ae51..8f5dde42fe6bd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2178,9 +2178,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 ac910923171c52..0d3ffaf9412fc5 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 090cfaf7f7646836a8688336b15eb70cacf1a52f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 02/13] bctoolbox: revbump for mbedtls-2.28.4
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 1819e487d08086..30c48b691ba492 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 b307399647aef9e47212d2f6ba35b17a6f3e4ebe Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 03/13] dislocker: revbump for mbedtls-2.28.4
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index bd92028fe168e0..539f0a718f8bb6 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 a822b704142f66856bbacab586af97cc4e3b35b7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:02 +0200
Subject: [PATCH 04/13] godot: revbump for mbedtls-2.28.4
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index e57051ab29d35a..ffa69fc1860b37 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 62bc001cdf575eb438048f3fd7d05f93081e696a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 05/13] hiawatha: revbump for mbedtls-2.28.4
---
srcpkgs/hiawatha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index 9c2500430dcb8f..0f89bb96d49ddb 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 c8cbce6a2e9cf976db77152489513dbeaf82fd68 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 06/13] imhex: revbump for mbedtls-2.28.4
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 94a058c2b16398..ea1c58b78a8703 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 7fb7811be189fb91c5f17884a3d8e0f171d5c188 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 07/13] librist: revbump for mbedtls-2.28.4
---
srcpkgs/librist/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/librist/template b/srcpkgs/librist/template
index f075679388de88..7d7197c6da4d9c 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 aa620f1a0b55495949597b0cf111f4e7a38b3642 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 08/13] openrgb: revbump for mbedtls-2.28.4
---
srcpkgs/openrgb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openrgb/template b/srcpkgs/openrgb/template
index cff1fe115070b8..1cfa541d2a23e3 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 ddd4063ee7a78b981b030d59681501dc7abb0350 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:03 +0200
Subject: [PATCH 09/13] retroarch: revbump for mbedtls-2.28.4
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 45b02597de41a3..507805ea8d819a 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.15.0
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
From 664dcf75dc819bda762cebdd02f9d371d16063fd Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 10/13] rvault: revbump for mbedtls-2.28.4
---
srcpkgs/rvault/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..53d170711c116f 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 b0ca17e176e184b2f4eb7842424de92127a6c632 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 11/13] shadowsocks-libev: revbump for mbedtls-2.28.4
---
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 ed1c93cf4e06d1..49b4737e399fd9 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 087b13749db580de79594901d45b6a1eeb7862d0 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:04:04 +0200
Subject: [PATCH 12/13] tpm2-tss: revbump for mbedtls-2.28.4
---
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 0b9b4b28e69339..683fc6e5068050 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"
From 6bc2912708bd7c6feebf92cc62f75f21ecda842f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 20 Sep 2023 10:15:16 +0200
Subject: [PATCH 13/13] dolphin-emu: revbump for mbedtls-2.28.4
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index b4c8b64368a4be..070993aac31d2b 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.19368
-revision=1
+revision=2
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.5.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
` (6 preceding siblings ...)
2023-10-31 16:36 ` [PR PATCH] [Updated] mbedtls: update to 2.28.5 Bnyro
@ 2023-10-31 16:45 ` Bnyro
2023-11-09 10:19 ` Bnyro
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-10-31 16:45 UTC (permalink / raw)
To: ml
[-- 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: 10325 bytes --]
From d0b9b8717b9dd41633591ac0d6e9d25609543d2a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/13] 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 9036a675c1ae51..8f5dde42fe6bd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2178,9 +2178,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 ac910923171c52..0d3ffaf9412fc5 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 797aa2f8e79aeff87a7b9831993f33400ceeb9b6 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:32 +0100
Subject: [PATCH 02/13] 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 1819e487d08086..30c48b691ba492 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 fe5c5e8c915c15f3763b19bd5773f0d49f515f7c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 03/13] 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 bd92028fe168e0..539f0a718f8bb6 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 e06ce67e2f47acc3c0e2e4283467b6b9f3cf0d6a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 04/13] 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 e57051ab29d35a..ffa69fc1860b37 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 00db48d21a23f4b58d69a937ab51f392c9c9fded Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 05/13] 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 9c2500430dcb8f..0f89bb96d49ddb 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 caed2650d85acab8937644828eff745a858ce10c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 06/13] 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 94a058c2b16398..ea1c58b78a8703 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 565fd59a318fdf0c5add08f83a315cdf26431750 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 07/13] 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 f075679388de88..7d7197c6da4d9c 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 cc3dc346865647dc8fb1456e9b40db506bc15b05 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 08/13] obs: revbump for mbedtls-2.28.5
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index b43b10ef935e95..5d1d5e887409e5 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=29.1.3
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From f7a003b3d0325fa8aa9da7e9581b5c10db8ed04d Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 09/13] 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 cff1fe115070b8..1cfa541d2a23e3 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 59de8b6444121f9aef1509db4d299fa476451166 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 10/13] 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 45b02597de41a3..507805ea8d819a 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.15.0
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
From c7c125ec6f9c80656673cdc2f818f6b061be2bef Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 11/13] 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 fa778501ce6b71..53d170711c116f 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 b3ea175a3fc36484b3d672f3958d370b099cba09 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 12/13] 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 ed1c93cf4e06d1..49b4737e399fd9 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 2a58528314e805f10a05bc9cc85112527c7854f0 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 13/13] 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 0b9b4b28e69339..683fc6e5068050 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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.5.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
` (7 preceding siblings ...)
2023-10-31 16:45 ` Bnyro
@ 2023-11-09 10:19 ` Bnyro
2023-11-09 10:20 ` Bnyro
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-11-09 10:19 UTC (permalink / raw)
To: ml
[-- 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: 11066 bytes --]
From d0b9b8717b9dd41633591ac0d6e9d25609543d2a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Sep 2023 16:03:25 +0200
Subject: [PATCH 01/14] 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 9036a675c1ae5..8f5dde42fe6bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2178,9 +2178,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 797aa2f8e79aeff87a7b9831993f33400ceeb9b6 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:32 +0100
Subject: [PATCH 02/14] 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 fe5c5e8c915c15f3763b19bd5773f0d49f515f7c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 03/14] 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 e06ce67e2f47acc3c0e2e4283467b6b9f3cf0d6a Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 04/14] 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 00db48d21a23f4b58d69a937ab51f392c9c9fded Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 05/14] 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 caed2650d85acab8937644828eff745a858ce10c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 06/14] 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 565fd59a318fdf0c5add08f83a315cdf26431750 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 07/14] 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 cc3dc346865647dc8fb1456e9b40db506bc15b05 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:33 +0100
Subject: [PATCH 08/14] obs: revbump for mbedtls-2.28.5
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index b43b10ef935e9..5d1d5e887409e 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=29.1.3
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From f7a003b3d0325fa8aa9da7e9581b5c10db8ed04d Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 09/14] 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 59de8b6444121f9aef1509db4d299fa476451166 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 10/14] 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 45b02597de41a..507805ea8d819 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.15.0
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
From c7c125ec6f9c80656673cdc2f818f6b061be2bef Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 11/14] 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 b3ea175a3fc36484b3d672f3958d370b099cba09 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 12/14] 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 2a58528314e805f10a05bc9cc85112527c7854f0 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 31 Oct 2023 17:45:34 +0100
Subject: [PATCH 13/14] 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"
From baa373e4723f566410dcaffb97e4315f0d8a7d17 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 9 Nov 2023 11:19:22 +0100
Subject: [PATCH 14/14] dolphin-emu: revbump for mbedtls-2.28.5
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index b4c8b64368a4b..070993aac31d2 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.19368
-revision=1
+revision=2
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.5.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
` (8 preceding siblings ...)
2023-11-09 10:19 ` Bnyro
@ 2023-11-09 10:20 ` Bnyro
2023-11-09 10:21 ` Bnyro
2023-11-13 17:00 ` [PR PATCH] [Closed]: " Bnyro
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-11-09 10:20 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 2.28.5.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
` (9 preceding siblings ...)
2023-11-09 10:20 ` Bnyro
@ 2023-11-09 10:21 ` Bnyro
2023-11-13 17:00 ` [PR PATCH] [Closed]: " Bnyro
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-11-09 10:21 UTC (permalink / raw)
To: ml
[-- 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: 10411 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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"
From a5486578353acf3e475dde1bd9b0c1db10dae003 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 9 Nov 2023 11:21:16 +0100
Subject: [PATCH 13/13] dolphin-emu: revbump for mbedtls-2.28.5
---
srcpkgs/dolphin-emu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 070993aac31d2..96edf50d3e4a1 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,7 +1,7 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
version=5.0.19368
-revision=2
+revision=3
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Closed]: mbedtls: update to 2.28.5.
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
` (10 preceding siblings ...)
2023-11-09 10:21 ` Bnyro
@ 2023-11-13 17:00 ` Bnyro
11 siblings, 0 replies; 13+ messages in thread
From: Bnyro @ 2023-11-13 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There's a closed pull request on the void-packages repository
mbedtls: update to 2.28.5.
https://github.com/void-linux/void-packages/pull/46137
Description:
#### 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
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-11-13 17:00 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-19 14:31 [PR PATCH] tpm2-tss: revbump for mbedtls-2.28.4 Bnyro
2023-09-19 14:42 ` [PR PATCH] [Updated] mbedtls: update to 2.28.4 Bnyro
2023-09-19 14:49 ` Bnyro
2023-09-20 8:14 ` Bnyro
2023-09-20 8:23 ` Bnyro
2023-09-20 8:30 ` Bnyro
2023-10-31 16:35 ` Bnyro
2023-10-31 16:36 ` [PR PATCH] [Updated] mbedtls: update to 2.28.5 Bnyro
2023-10-31 16:45 ` Bnyro
2023-11-09 10:19 ` Bnyro
2023-11-09 10:20 ` Bnyro
2023-11-09 10:21 ` Bnyro
2023-11-13 17:00 ` [PR PATCH] [Closed]: " Bnyro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).