From 20be072bb7be76f3f875a794a287c8efb7645906 Mon Sep 17 00:00:00 2001 From: Bnyro 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 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 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 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 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 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 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 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 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 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 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 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 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 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