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