From d0b9b8717b9dd41633591ac0d6e9d25609543d2a 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.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 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 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 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 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 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 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 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 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 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 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 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 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"