* [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
@ 2024-08-12 18:45 classabbyamp
2024-08-12 20:01 ` [PR PATCH] [Updated] " classabbyamp
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: classabbyamp @ 2024-08-12 18:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 437 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages mbedtls
https://github.com/void-linux/void-packages/pull/51806
mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/51806.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mbedtls-51806.patch --]
[-- Type: text/x-diff, Size: 22737 bytes --]
From ff95600eae81c53482f350793c2e7c4eed406bd6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 13:00:36 -0400
Subject: [PATCH 01/21] mbedtls: update to 3.6.0.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 17 +++++++++++++----
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0178ef9ecc32f1..3e852749da2d2e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2295,9 +2295,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.21 mbedtls-3.6.0_1
+libmbedcrypto.so.16 mbedtls-3.6.0_1
+libmbedx509.so.7 mbedtls-3.6.0_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..275ea6a45b1b43 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,8 @@
# Template file for 'mbedtls'
pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=3.6.0
revision=1
+_framework_ver=750634d3a51eb9d61b59fd5d801546927c946588
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
hostmakedepends="python3 perl"
@@ -11,8 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
+checksum="32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff
+ 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f"
+skip_extraction="framework-${_framework_ver}.tar.gz"
+
+post_extract() {
+ vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
+}
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
@@ -35,5 +42,7 @@ mbedtls-devel_package() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From 5faabbd613c3a2b7e5f5d136af281a99c8f1b506 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:42:21 -0400
Subject: [PATCH 02/21] New package: mbedtls2-2.28.8
2.28 LTS branch for packages that don't support mbedtls 3 yet
---
common/shlibs | 3 +++
srcpkgs/mbedtls2-devel | 1 +
srcpkgs/mbedtls2/template | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/mbedtls2-devel
create mode 100644 srcpkgs/mbedtls2/template
diff --git a/common/shlibs b/common/shlibs
index 3e852749da2d2e..e2ec076a28cd8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2298,6 +2298,9 @@ libmpv.so.2 mpv-0.35.0_1
libmbedtls.so.21 mbedtls-3.6.0_1
libmbedcrypto.so.16 mbedtls-3.6.0_1
libmbedx509.so.7 mbedtls-3.6.0_1
+libmbedtls.so.14 mbedtls2-2.28.8_1
+libmbedcrypto.so.7 mbedtls2-2.28.8_1
+libmbedx509.so.1 mbedtls2-2.28.8_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/mbedtls2-devel b/srcpkgs/mbedtls2-devel
new file mode 120000
index 00000000000000..0800d76a46405f
--- /dev/null
+++ b/srcpkgs/mbedtls2-devel
@@ -0,0 +1 @@
+mbedtls2
\ No newline at end of file
diff --git a/srcpkgs/mbedtls2/template b/srcpkgs/mbedtls2/template
new file mode 100644
index 00000000000000..2c2ff4f5fe0aa2
--- /dev/null
+++ b/srcpkgs/mbedtls2/template
@@ -0,0 +1,36 @@
+# Template file for 'mbedtls2'
+pkgname=mbedtls2
+version=2.28.8
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
+hostmakedepends="python3 perl"
+short_desc="Portable cryptographic TLS library (version 2)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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="4fef7de0d8d542510d726d643350acb3cdb9dc76ad45611b59c9aa08372b4213"
+
+pre_configure() {
+ ./scripts/config.pl set MBEDTLS_THREADING_C
+ ./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
+}
+
+post_install() {
+ rm -r "$DESTDIR"/usr/bin
+}
+
+mbedtls2-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls-devel>=0"
+ replaces="mbedtls-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From ef54038b8f1c65602edd4297289c3f3a5dc5ceaa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:24:55 -0400
Subject: [PATCH 03/21] hiawatha: update to 11.6, fix distfiles site
---
srcpkgs/hiawatha/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index ca3c57ef56587d..4ad8118298020b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,7 +1,7 @@
# Template file for 'hiawatha'
pkgname=hiawatha
-version=10.12
-revision=5
+version=11.6
+revision=1
build_style=cmake
configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
-DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha
@@ -11,9 +11,9 @@ makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
short_desc="Advanced and secure webserver for Unix"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://hiawatha-webserver.org"
-distfiles="https://hiawatha-webserver.org/files/${pkgname}-${version}.tar.gz"
-checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
+homepage="https://hiawatha.leisink.net"
+distfiles="https://hiawatha.leisink.net/files/hiawatha-${version}.tar.gz"
+checksum=b3c5eb7be007509b7e1f3d88cc03a99904d3b6e5e05d980f9d5bdaa424864dd6
conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
make_dirs="/var/log/hiawatha 0755 root root"
@@ -21,7 +21,7 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-XBPS_DISTFILES_MIRROR+=" https://hiawatha-webserver.org/files/hiawatha-${version%%.*}/"
+XBPS_DISTFILES_MIRROR+=" https://hiawatha.leisink.net/files/hiawatha-${version%%.*}/"
post_install() {
vsv hiawatha
From ae248002e11a14bee9a9718daaff7994a0a28004 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:32 -0400
Subject: [PATCH 04/21] dislocker: build with mbedtls2
---
srcpkgs/dislocker/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index bd92028fe168e0..5c45f09619e701 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,10 +1,10 @@
# 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"
+makedepends="mbedtls2-devel fuse-devel"
short_desc="FUSE driver to read/write Windows Bitlocker-ed volumes under Linux"
maintainer="Samsky <samsky72@gmail.com>"
license="GPL-2.0-or-later"
From a096978d845ed3d4f2a52beaf15da4bbbd83ce56 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:33 -0400
Subject: [PATCH 05/21] dolphin-emu: build with mbedtls2
---
srcpkgs/dolphin-emu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index c4a6ad40162834..7992e3ab44b0e1 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=4
+revision=5
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
@@ -26,7 +26,7 @@ makedepends="
zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg6-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
- mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
+ mbedtls2-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Henry Naguski <henry@nilsu.org>"
From 70860a9a8c2f7194cfecdacdb77863ca1b2ecb67 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 06/21] godot: build with mbedtls2
---
srcpkgs/godot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 06e61e3439d68c..ea8fa95beeece7 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.2.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
@@ -16,7 +16,7 @@ hostmakedepends="pkg-config clang"
makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
- libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-devel
pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
speech-dispatcher-devel brotli-devel icu-devel"
depends="speech-dispatcher"
From 41cf6982a39682954b68f8c7fa960eb05ef0e1de Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 07/21] rvault: build with mbedtls2
---
srcpkgs/rvault/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..ae4430ec7362c6 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,14 +1,14 @@
# Template file for 'rvault'
pkgname=rvault
version=0.4
-revision=4
+revision=5
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
make_build_args="USE_SQLITE=1 USE_MBEDTLS=1 USE_OPENSSL=0 USE_SODIUM=0"
make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
hostmakedepends="pkgconf"
-makedepends="libscrypt-devel mbedtls-devel fuse-devel libcurl-devel
+makedepends="libscrypt-devel mbedtls2-devel fuse-devel libcurl-devel
libedit-devel sqlite-devel"
short_desc="Secure and authenticated store for secrets and small documents"
maintainer="Orphaned <orphan@voidlinux.org>"
From 3c0c5ca4b7d15e2243600d2fec4ba16b581ddb10 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 08/21] shadowsocks-libev: build with mbedtls2
---
srcpkgs/shadowsocks-libev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template
index 49b4737e399fd9..518c2ddb789f7f 100644
--- a/srcpkgs/shadowsocks-libev/template
+++ b/srcpkgs/shadowsocks-libev/template
@@ -1,11 +1,11 @@
# Template file for 'shadowsocks-libev'
pkgname=shadowsocks-libev
version=3.3.4
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config asciidoc xmlto"
-makedepends="pcre-devel mbedtls-devel libsodium-devel c-ares-devel libev-devel"
+makedepends="pcre-devel mbedtls2-devel libsodium-devel c-ares-devel libev-devel"
short_desc="Lightweight secured socks5 proxy for embedded devices and low end boxes"
maintainer="whoami <whoami@systemli.org>"
license="GPL-3.0-or-later"
From e1a98df7188fbb227b7efd38d18619812fc21720 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 09/21] tpm2-tss: build with mbedtls2
---
srcpkgs/tpm2-tss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index 0b9b4b28e69339..1784e084db1424 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="libltdl-devel mbedtls-devel"
+makedepends="libltdl-devel mbedtls2-devel"
short_desc="OSS implementation of the TCG TPM2 Software Stack"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From fb07e26cc790fdcbfd70f2ddf1c63f1affa3043d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:36 -0400
Subject: [PATCH 10/21] monkey: build with mbedtls2
---
srcpkgs/monkey/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index c673d65d5ca9ca..08f57ec9451176 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,7 +1,7 @@
# Template file for 'monkey'
pkgname=monkey
version=1.6.9
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sbindir=/usr/bin
--libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname
@@ -9,13 +9,13 @@ configure_args="--prefix=/usr --sbindir=/usr/bin
--webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
hostmakedepends="cmake"
-makedepends="mbedtls-devel"
+makedepends="mbedtls2-devel"
short_desc="Cross-arch embeddable lightweight HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
-homepage="http://monkey-project.com"
-distfiles="${homepage}/releases/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb
+homepage="https://github.com/monkey/monkey"
+distfiles="https://github.com/monkey/monkey/archive/refs/tags/v${version}.tar.gz"
+checksum=8b795f605bfa544d3a57afd580bf6970aac72fb6b7aba338bd3012768b30e587
conf_files="
/etc/monkey/plugins/*/*.conf
From 467c67dca2f7433b056b25a5fb0cceeb2f516a00 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:56 -0400
Subject: [PATCH 11/21] bcg729: rebuild for mbedtls-3.6.0
---
srcpkgs/bcg729/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcg729/template b/srcpkgs/bcg729/template
index e472a4c48451b4..fbc120cd82b2ca 100644
--- a/srcpkgs/bcg729/template
+++ b/srcpkgs/bcg729/template
@@ -1,7 +1,7 @@
# Template file for 'bcg729'
pkgname=bcg729
version=1.1.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_STATIC=OFF"
makedepends="bcunit-devel mbedtls-devel"
From 8ed6f33f4d262f51866cd2ea62221c3dc82ebffb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 12/21] bctoolbox: rebuild for mbedtls-3.6.0
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 4c7f1238dde217..48f4932462aad0 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.3.74
-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 10d68a7ef453c8963b66c6753d10a29536f65efc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 13/21] belle-sip: rebuild for mbedtls-3.6.0
---
srcpkgs/belle-sip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index 98b1156fd3c4d0..5493247e60dcee 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,7 +1,7 @@
# Template file for 'belle-sip'
pkgname=belle-sip
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=OFF -DENABLE_UNIT_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON
-DCMAKE_MODULE_PATH=/usr/lib/cmake -DBUILD_SHARED_LIBS=TRUE"
From 2449a914913b8c9ec34b2fd361ff02f8df37a866 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 14/21] bzrtp: rebuild for mbedtls-3.6.0
---
srcpkgs/bzrtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index bcfb237ecbea68..d1caeb3686b9f2 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,7 +1,7 @@
# Template file for 'bzrtp'
pkgname=bzrtp
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=FALSE -DBUILD_SHARED_LIBS=TRUE"
makedepends="bctoolbox-devel mbedtls-devel libxml2-devel bctoolbox-devel sqlite-devel"
From 5e8ca475269f8bbc3ffbec59f74b4ce87e0f8262 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 15/21] imhex: rebuild for mbedtls-3.6.0
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 9e8cd7184a1520..b10c948af3d79f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=1
+revision=2
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From cf5a9267fc29825ecc035a30349c6b9be7912212 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 16/21] librist: rebuild for mbedtls-3.6.0
---
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 96f5473cafff93c9fbee15a2555ba84984438020 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 17/21] mediastreamer: rebuild for mbedtls-3.6.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 22aa27ec874292..e4bb509b63f3fe 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.3.75
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0 -DBUILD_SHARED_LIBS=TRUE"
hostmakedepends="python3"
From bee6a08d286ab4522852f570ee0495bd5b454b31 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 18/21] obs: rebuild for mbedtls-3.6.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 4860878805e0cc..d0793fbd784882 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.1
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From 52466f4cf687a0460e447f6bfbe3361c92f3840b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 19/21] openrgb: rebuild for mbedtls-3.6.0
---
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 40a4f621765a3a4b4adfc27f3763409f3a43a772 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 20/21] openvpn: rebuild for mbedtls-3.6.0
---
srcpkgs/openvpn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 0ea6c45a6ed439..08c9f38587c820 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,7 +1,7 @@
# Template file for 'openvpn'
pkgname=openvpn
version=2.6.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
From ba1488613d3225a92b2fb76b91a6f2b0b24940ea Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 21/21] retroarch: rebuild for mbedtls-3.6.0
---
srcpkgs/retroarch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 072d719ce28059..114b37d0b28d92 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.19.1
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
2024-08-12 18:45 [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8 classabbyamp
@ 2024-08-12 20:01 ` classabbyamp
2024-08-12 20:05 ` classabbyamp
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2024-08-12 20:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages mbedtls
https://github.com/void-linux/void-packages/pull/51806
mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/51806.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mbedtls-51806.patch --]
[-- Type: text/x-diff, Size: 27799 bytes --]
From ff95600eae81c53482f350793c2e7c4eed406bd6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 13:00:36 -0400
Subject: [PATCH 01/21] mbedtls: update to 3.6.0.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 17 +++++++++++++----
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0178ef9ecc32f1..3e852749da2d2e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2295,9 +2295,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.21 mbedtls-3.6.0_1
+libmbedcrypto.so.16 mbedtls-3.6.0_1
+libmbedx509.so.7 mbedtls-3.6.0_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..275ea6a45b1b43 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,8 @@
# Template file for 'mbedtls'
pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=3.6.0
revision=1
+_framework_ver=750634d3a51eb9d61b59fd5d801546927c946588
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
hostmakedepends="python3 perl"
@@ -11,8 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
+checksum="32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff
+ 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f"
+skip_extraction="framework-${_framework_ver}.tar.gz"
+
+post_extract() {
+ vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
+}
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
@@ -35,5 +42,7 @@ mbedtls-devel_package() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From 5faabbd613c3a2b7e5f5d136af281a99c8f1b506 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:42:21 -0400
Subject: [PATCH 02/21] New package: mbedtls2-2.28.8
2.28 LTS branch for packages that don't support mbedtls 3 yet
---
common/shlibs | 3 +++
srcpkgs/mbedtls2-devel | 1 +
srcpkgs/mbedtls2/template | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/mbedtls2-devel
create mode 100644 srcpkgs/mbedtls2/template
diff --git a/common/shlibs b/common/shlibs
index 3e852749da2d2e..e2ec076a28cd8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2298,6 +2298,9 @@ libmpv.so.2 mpv-0.35.0_1
libmbedtls.so.21 mbedtls-3.6.0_1
libmbedcrypto.so.16 mbedtls-3.6.0_1
libmbedx509.so.7 mbedtls-3.6.0_1
+libmbedtls.so.14 mbedtls2-2.28.8_1
+libmbedcrypto.so.7 mbedtls2-2.28.8_1
+libmbedx509.so.1 mbedtls2-2.28.8_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/mbedtls2-devel b/srcpkgs/mbedtls2-devel
new file mode 120000
index 00000000000000..0800d76a46405f
--- /dev/null
+++ b/srcpkgs/mbedtls2-devel
@@ -0,0 +1 @@
+mbedtls2
\ No newline at end of file
diff --git a/srcpkgs/mbedtls2/template b/srcpkgs/mbedtls2/template
new file mode 100644
index 00000000000000..2c2ff4f5fe0aa2
--- /dev/null
+++ b/srcpkgs/mbedtls2/template
@@ -0,0 +1,36 @@
+# Template file for 'mbedtls2'
+pkgname=mbedtls2
+version=2.28.8
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
+hostmakedepends="python3 perl"
+short_desc="Portable cryptographic TLS library (version 2)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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="4fef7de0d8d542510d726d643350acb3cdb9dc76ad45611b59c9aa08372b4213"
+
+pre_configure() {
+ ./scripts/config.pl set MBEDTLS_THREADING_C
+ ./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
+}
+
+post_install() {
+ rm -r "$DESTDIR"/usr/bin
+}
+
+mbedtls2-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls-devel>=0"
+ replaces="mbedtls-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From ef54038b8f1c65602edd4297289c3f3a5dc5ceaa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:24:55 -0400
Subject: [PATCH 03/21] hiawatha: update to 11.6, fix distfiles site
---
srcpkgs/hiawatha/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index ca3c57ef56587d..4ad8118298020b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,7 +1,7 @@
# Template file for 'hiawatha'
pkgname=hiawatha
-version=10.12
-revision=5
+version=11.6
+revision=1
build_style=cmake
configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
-DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha
@@ -11,9 +11,9 @@ makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
short_desc="Advanced and secure webserver for Unix"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://hiawatha-webserver.org"
-distfiles="https://hiawatha-webserver.org/files/${pkgname}-${version}.tar.gz"
-checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
+homepage="https://hiawatha.leisink.net"
+distfiles="https://hiawatha.leisink.net/files/hiawatha-${version}.tar.gz"
+checksum=b3c5eb7be007509b7e1f3d88cc03a99904d3b6e5e05d980f9d5bdaa424864dd6
conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
make_dirs="/var/log/hiawatha 0755 root root"
@@ -21,7 +21,7 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-XBPS_DISTFILES_MIRROR+=" https://hiawatha-webserver.org/files/hiawatha-${version%%.*}/"
+XBPS_DISTFILES_MIRROR+=" https://hiawatha.leisink.net/files/hiawatha-${version%%.*}/"
post_install() {
vsv hiawatha
From 0879d31461a41acb600f40a53d20341f39348446 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:33 -0400
Subject: [PATCH 04/21] dolphin-emu: build with mbedtls2
---
srcpkgs/dolphin-emu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index c4a6ad40162834..7992e3ab44b0e1 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=4
+revision=5
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
@@ -26,7 +26,7 @@ makedepends="
zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg6-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
- mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
+ mbedtls2-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Henry Naguski <henry@nilsu.org>"
From 9f97fe7d9a387eeb4f967919c1a24539650cad97 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 05/21] godot: build with mbedtls2
---
srcpkgs/godot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 06e61e3439d68c..ea8fa95beeece7 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.2.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
@@ -16,7 +16,7 @@ hostmakedepends="pkg-config clang"
makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
- libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-devel
pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
speech-dispatcher-devel brotli-devel icu-devel"
depends="speech-dispatcher"
From bc2a0bd5ebb0b1912b106d6523d2aca649616664 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 06/21] rvault: build with mbedtls2
---
srcpkgs/rvault/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..ae4430ec7362c6 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,14 +1,14 @@
# Template file for 'rvault'
pkgname=rvault
version=0.4
-revision=4
+revision=5
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
make_build_args="USE_SQLITE=1 USE_MBEDTLS=1 USE_OPENSSL=0 USE_SODIUM=0"
make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
hostmakedepends="pkgconf"
-makedepends="libscrypt-devel mbedtls-devel fuse-devel libcurl-devel
+makedepends="libscrypt-devel mbedtls2-devel fuse-devel libcurl-devel
libedit-devel sqlite-devel"
short_desc="Secure and authenticated store for secrets and small documents"
maintainer="Orphaned <orphan@voidlinux.org>"
From d7f89e8386ae8f1a943740e70fbb5df58321cb6c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 07/21] shadowsocks-libev: build with mbedtls2
---
srcpkgs/shadowsocks-libev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template
index 49b4737e399fd9..518c2ddb789f7f 100644
--- a/srcpkgs/shadowsocks-libev/template
+++ b/srcpkgs/shadowsocks-libev/template
@@ -1,11 +1,11 @@
# Template file for 'shadowsocks-libev'
pkgname=shadowsocks-libev
version=3.3.4
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config asciidoc xmlto"
-makedepends="pcre-devel mbedtls-devel libsodium-devel c-ares-devel libev-devel"
+makedepends="pcre-devel mbedtls2-devel libsodium-devel c-ares-devel libev-devel"
short_desc="Lightweight secured socks5 proxy for embedded devices and low end boxes"
maintainer="whoami <whoami@systemli.org>"
license="GPL-3.0-or-later"
From a35f9e107d11cd1e2e643970c5c960bade721102 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 08/21] tpm2-tss: build with mbedtls2
---
srcpkgs/tpm2-tss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index 0b9b4b28e69339..1784e084db1424 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="libltdl-devel mbedtls-devel"
+makedepends="libltdl-devel mbedtls2-devel"
short_desc="OSS implementation of the TCG TPM2 Software Stack"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 186d4fd1245fcd6266ba60e6290b3cb4136a09eb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:36 -0400
Subject: [PATCH 09/21] monkey: build with mbedtls2
---
srcpkgs/monkey/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index c673d65d5ca9ca..08f57ec9451176 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,7 +1,7 @@
# Template file for 'monkey'
pkgname=monkey
version=1.6.9
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sbindir=/usr/bin
--libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname
@@ -9,13 +9,13 @@ configure_args="--prefix=/usr --sbindir=/usr/bin
--webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
hostmakedepends="cmake"
-makedepends="mbedtls-devel"
+makedepends="mbedtls2-devel"
short_desc="Cross-arch embeddable lightweight HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
-homepage="http://monkey-project.com"
-distfiles="${homepage}/releases/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb
+homepage="https://github.com/monkey/monkey"
+distfiles="https://github.com/monkey/monkey/archive/refs/tags/v${version}.tar.gz"
+checksum=8b795f605bfa544d3a57afd580bf6970aac72fb6b7aba338bd3012768b30e587
conf_files="
/etc/monkey/plugins/*/*.conf
From 4b4799919b3632745f9774bc14051a2c1a289fda Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:56 -0400
Subject: [PATCH 10/21] bcg729: rebuild for mbedtls-3.6.0
---
srcpkgs/bcg729/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcg729/template b/srcpkgs/bcg729/template
index e472a4c48451b4..fbc120cd82b2ca 100644
--- a/srcpkgs/bcg729/template
+++ b/srcpkgs/bcg729/template
@@ -1,7 +1,7 @@
# Template file for 'bcg729'
pkgname=bcg729
version=1.1.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_STATIC=OFF"
makedepends="bcunit-devel mbedtls-devel"
From 4612942dc589a1e23e036db3266d08c8d45eea28 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 11/21] bctoolbox: rebuild for mbedtls-3.6.0
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 4c7f1238dde217..48f4932462aad0 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.3.74
-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 963349f43e601bed8872bf7bbde01ec2451541b0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 12/21] belle-sip: rebuild for mbedtls-3.6.0
---
srcpkgs/belle-sip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index 98b1156fd3c4d0..5493247e60dcee 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,7 +1,7 @@
# Template file for 'belle-sip'
pkgname=belle-sip
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=OFF -DENABLE_UNIT_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON
-DCMAKE_MODULE_PATH=/usr/lib/cmake -DBUILD_SHARED_LIBS=TRUE"
From 052b442326f4ddd242c8f388f6fa777b009bcbd1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 13/21] bzrtp: rebuild for mbedtls-3.6.0
---
srcpkgs/bzrtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index bcfb237ecbea68..d1caeb3686b9f2 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,7 +1,7 @@
# Template file for 'bzrtp'
pkgname=bzrtp
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=FALSE -DBUILD_SHARED_LIBS=TRUE"
makedepends="bctoolbox-devel mbedtls-devel libxml2-devel bctoolbox-devel sqlite-devel"
From e9e3c51183091f0c7a51877b151b5e8d864fb829 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:32 -0400
Subject: [PATCH 14/21] dislocker: rebuild for mbedtls-3.6.0
---
srcpkgs/dislocker/patches/mbedtls3.patch | 28 ++++++++++++++++++++++++
srcpkgs/dislocker/template | 2 +-
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dislocker/patches/mbedtls3.patch
diff --git a/srcpkgs/dislocker/patches/mbedtls3.patch b/srcpkgs/dislocker/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..2f31a168585d6f
--- /dev/null
+++ b/srcpkgs/dislocker/patches/mbedtls3.patch
@@ -0,0 +1,28 @@
+From 2cfbba2c8cc07e529622ba134d0a6982815d2b30 Mon Sep 17 00:00:00 2001
+From: "Julio C. Rocha" <dev@rocha.red>
+Date: Wed, 13 Sep 2023 19:07:27 -0700
+Subject: [PATCH] Support mbedtls 3
+
+---
+ include/dislocker/ssl_bindings.h.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/include/dislocker/ssl_bindings.h.in b/include/dislocker/ssl_bindings.h.in
+index c1990b2..34e05df 100644
+--- a/include/dislocker/ssl_bindings.h.in
++++ b/include/dislocker/ssl_bindings.h.in
+@@ -26,8 +26,13 @@
+ /*
+ * Here stand the bindings for polarssl SHA256/SHA2/SHA-2 function for dislocker
+ */
+-#include "@POLARSSL_INC_FOLDER@/config.h"
+ #include "@POLARSSL_INC_FOLDER@/version.h"
++#if MBEDTLS_VERSION_MAJOR >= 3
++#include "@POLARSSL_INC_FOLDER@/mbedtls_config.h"
++#include "@POLARSSL_INC_FOLDER@/compat-2.x.h"
++#else
++#include "@POLARSSL_INC_FOLDER@/config.h"
++#endif
+ #include "@POLARSSL_INC_FOLDER@/aes.h"
+
+ // Function's name changed
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 f5124f5aa31944d145000c1bdd6fd66618c71014 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 15/21] imhex: rebuild for mbedtls-3.6.0
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 9e8cd7184a1520..b10c948af3d79f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=1
+revision=2
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 171ea2123d617f9e127aa18936551ca612a8bdcb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 16/21] librist: rebuild for mbedtls-3.6.0
---
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 d0c1ca2dc24eb33c945a1eb94a4f995b18151592 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 17/21] mediastreamer: rebuild for mbedtls-3.6.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 22aa27ec874292..e4bb509b63f3fe 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.3.75
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0 -DBUILD_SHARED_LIBS=TRUE"
hostmakedepends="python3"
From 50b188ff97de8b295d27e62f2a90549514c3bbca Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 18/21] obs: rebuild for mbedtls-3.6.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 4860878805e0cc..d0793fbd784882 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.1
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From 0a35cb30f85b8533cc4ac98971ebf6e5320aaac3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 19/21] openrgb: rebuild for mbedtls-3.6.0
---
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 e2c50ee11f73d592bfd3bb04bacffcba78c0298e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 20/21] openvpn: rebuild for mbedtls-3.6.0
---
srcpkgs/openvpn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 0ea6c45a6ed439..08c9f38587c820 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,7 +1,7 @@
# Template file for 'openvpn'
pkgname=openvpn
version=2.6.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
From 091bdc0e9c62da03941fc292dcf59232ec922aa3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 21/21] retroarch: rebuild for mbedtls-3.6.0
---
srcpkgs/retroarch/patches/mbedtls3.patch | 76 ++++++++++++++++++++++++
srcpkgs/retroarch/template | 4 +-
2 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/mbedtls3.patch
diff --git a/srcpkgs/retroarch/patches/mbedtls3.patch b/srcpkgs/retroarch/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..17d4b75fed988f
--- /dev/null
+++ b/srcpkgs/retroarch/patches/mbedtls3.patch
@@ -0,0 +1,76 @@
+From 4683e83d9a51c0229fff23400a6a19542aa523b7 Mon Sep 17 00:00:00 2001
+From: Keith Bowes <keithbowes@users.noreply.github.com>
+Date: Thu, 18 Jul 2024 09:25:29 -0400
+Subject: [PATCH] Add support for mbedtls v3 (#16763)
+
+v2 is not going to receive security fixes after 2024
+
+Fixes #16672
+---
+ Makefile.common | 3 ++-
+ libretro-common/net/net_socket_ssl_mbed.c | 5 +++++
+ qb/config.libs.sh | 19 +++++++++----------
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index a550c791462..ee4fa1c4ccc 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -753,7 +753,8 @@ else ifeq ($(HAVE_BUILTINMBEDTLS), 1)
+ OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
+ else ifeq ($(HAVE_SSL), 1)
+ DEFINES += -DHAVE_SSL
+- LIBS += $(SYSTEMMBEDTLS_LIBS)
++ LIBS += $(SYSTEMMBEDTLS_LIBS) $(SYSTEMMBEDX509_LIBS) $(SYSTEMMBEDCRYPTO_LIBS)
++ DEF_FLAGS += $(SYSTEMMBEDTLS_CFLAGS) $(SYSTEMMBEDX509_CFLAGS) $(SYSTEMMBEDCRYPTO_CFLAGS)
+ endif
+
+ # Miscellaneous
+diff --git a/libretro-common/net/net_socket_ssl_mbed.c b/libretro-common/net/net_socket_ssl_mbed.c
+index a0a524f3559..69c2239002e 100644
+--- a/libretro-common/net/net_socket_ssl_mbed.c
++++ b/libretro-common/net/net_socket_ssl_mbed.c
+@@ -35,8 +35,13 @@
+ #include "../../deps/mbedtls/mbedtls/ctr_drbg.h"
+ #include "../../deps/mbedtls/mbedtls/entropy.h"
+ #else
++#include <mbedtls/version.h>
++#if MBEDTLS_VERSION_MAJOR < 3
+ #include <mbedtls/config.h>
+ #include <mbedtls/certs.h>
++#else
++#include <mbedtls/build_info.h>
++#endif
+ #include <mbedtls/debug.h>
+ #include <mbedtls/platform.h>
+ #include <mbedtls/net_sockets.h>
+diff --git a/qb/config.libs.sh b/qb/config.libs.sh
+index 1c845375186..06ca062f0cc 100644
+--- a/qb/config.libs.sh
++++ b/qb/config.libs.sh
+@@ -316,16 +316,15 @@ check_enabled SSL BUILTINMBEDTLS 'builtin mbedtls' 'ssl is' false
+ check_enabled SSL BUILTINBEARSSL 'builtin bearssl' 'ssl is' false
+
+ if [ "$HAVE_SYSTEMMBEDTLS" = "auto" ]; then SYSTEMMBEDTLS_IS_AUTO=yes; else SYSTEMMBEDTLS_IS_AUTO=no; fi
+-check_lib '' SYSTEMMBEDTLS '-lmbedtls -lmbedx509 -lmbedcrypto'
+-check_header '' SYSTEMMBEDTLS \
+- mbedtls/config.h \
+- mbedtls/certs.h \
+- mbedtls/debug.h \
+- mbedtls/platform.h \
+- mbedtls/net_sockets.h \
+- mbedtls/ssl.h \
+- mbedtls/ctr_drbg.h \
+- mbedtls/entropy.h
++check_val '' SYSTEMMBEDTLS '-lmbedtls' 'mbedtls' mbedtls 2.5.1 '' true
++check_val '' SYSTEMMBEDX509 '-lmbedx509' 'mbedtls' mbedx509 2.5.1 '' true
++check_val '' SYSTEMMBEDCRYPTO '-lmbedcrypto' 'mbedtls' mbedcrypto 2.5.1 '' true
++if [ "$HAVE_SYSTEMMBEDTLS" = 'yes' ] && [ -z "$SYSTEMMBEDTLS_VERSION" ]; then
++ # Ancient versions (such as the one included in the Ubuntu version used for
++ # build checks) don't have this header
++ check_header '' SYSTEMMBEDTLS mbedtls/net_sockets.h
++fi
++if [ "$HAVE_SYSTEMMBEDX509" = 'no' ] || [ "$HAVE_SYSTEMMBEDCRYPTO" = 'no' ]; then HAVE_SYSTEMMBEDTLS=no; fi
+ if [ "$SYSTEMMBEDTLS_IS_AUTO" = "yes" ] && [ "$HAVE_SYSTEMMBEDTLS" = "yes" ]; then HAVE_SYSTEMMBEDTLS=auto; fi
+
+ SSL_BACKEND_CHOSEN=no
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 072d719ce28059..7292681e4e32fd 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,11 +1,11 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.19.1
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
- --disable-builtinmbedtls --disable-builtinzlib
+ --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib
$(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
$(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
$(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
2024-08-12 18:45 [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8 classabbyamp
2024-08-12 20:01 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-08-12 20:05 ` classabbyamp
2024-08-13 4:26 ` classabbyamp
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2024-08-12 20:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages mbedtls
https://github.com/void-linux/void-packages/pull/51806
mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/51806.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mbedtls-51806.patch --]
[-- Type: text/x-diff, Size: 27995 bytes --]
From 6a2fc534bc207f9483d063e028b9c6aa6c939102 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 13:00:36 -0400
Subject: [PATCH 01/21] mbedtls: update to 3.6.0.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 19 +++++++++++++++----
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0178ef9ecc32f1..3e852749da2d2e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2295,9 +2295,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.21 mbedtls-3.6.0_1
+libmbedcrypto.so.16 mbedtls-3.6.0_1
+libmbedx509.so.7 mbedtls-3.6.0_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..4d10d74b887c97 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,8 @@
# Template file for 'mbedtls'
pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=3.6.0
revision=1
+_framework_ver=750634d3a51eb9d61b59fd5d801546927c946588
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
hostmakedepends="python3 perl"
@@ -11,8 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
+checksum="32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff
+ 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f"
+skip_extraction="framework-${_framework_ver}.tar.gz"
+
+post_extract() {
+ vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
+}
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
@@ -31,9 +38,13 @@ mbedtls-utils_package() {
mbedtls-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls2-devel>=0"
+ replaces="mbedtls2-devel>=0"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From 548dd81d936d9f54e93c7ca0dc8bde146ee2efeb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:42:21 -0400
Subject: [PATCH 02/21] New package: mbedtls2-2.28.8
2.28 LTS branch for packages that don't support mbedtls 3 yet
---
common/shlibs | 3 +++
srcpkgs/mbedtls2-devel | 1 +
srcpkgs/mbedtls2/template | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/mbedtls2-devel
create mode 100644 srcpkgs/mbedtls2/template
diff --git a/common/shlibs b/common/shlibs
index 3e852749da2d2e..e2ec076a28cd8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2298,6 +2298,9 @@ libmpv.so.2 mpv-0.35.0_1
libmbedtls.so.21 mbedtls-3.6.0_1
libmbedcrypto.so.16 mbedtls-3.6.0_1
libmbedx509.so.7 mbedtls-3.6.0_1
+libmbedtls.so.14 mbedtls2-2.28.8_1
+libmbedcrypto.so.7 mbedtls2-2.28.8_1
+libmbedx509.so.1 mbedtls2-2.28.8_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/mbedtls2-devel b/srcpkgs/mbedtls2-devel
new file mode 120000
index 00000000000000..0800d76a46405f
--- /dev/null
+++ b/srcpkgs/mbedtls2-devel
@@ -0,0 +1 @@
+mbedtls2
\ No newline at end of file
diff --git a/srcpkgs/mbedtls2/template b/srcpkgs/mbedtls2/template
new file mode 100644
index 00000000000000..2c2ff4f5fe0aa2
--- /dev/null
+++ b/srcpkgs/mbedtls2/template
@@ -0,0 +1,36 @@
+# Template file for 'mbedtls2'
+pkgname=mbedtls2
+version=2.28.8
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
+hostmakedepends="python3 perl"
+short_desc="Portable cryptographic TLS library (version 2)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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="4fef7de0d8d542510d726d643350acb3cdb9dc76ad45611b59c9aa08372b4213"
+
+pre_configure() {
+ ./scripts/config.pl set MBEDTLS_THREADING_C
+ ./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
+}
+
+post_install() {
+ rm -r "$DESTDIR"/usr/bin
+}
+
+mbedtls2-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls-devel>=0"
+ replaces="mbedtls-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From dc212509d61f0b03f3502fbfc33ed3329c7a82fb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:24:55 -0400
Subject: [PATCH 03/21] hiawatha: update to 11.6, fix distfiles site
---
srcpkgs/hiawatha/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index ca3c57ef56587d..4ad8118298020b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,7 +1,7 @@
# Template file for 'hiawatha'
pkgname=hiawatha
-version=10.12
-revision=5
+version=11.6
+revision=1
build_style=cmake
configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
-DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha
@@ -11,9 +11,9 @@ makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
short_desc="Advanced and secure webserver for Unix"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://hiawatha-webserver.org"
-distfiles="https://hiawatha-webserver.org/files/${pkgname}-${version}.tar.gz"
-checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
+homepage="https://hiawatha.leisink.net"
+distfiles="https://hiawatha.leisink.net/files/hiawatha-${version}.tar.gz"
+checksum=b3c5eb7be007509b7e1f3d88cc03a99904d3b6e5e05d980f9d5bdaa424864dd6
conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
make_dirs="/var/log/hiawatha 0755 root root"
@@ -21,7 +21,7 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-XBPS_DISTFILES_MIRROR+=" https://hiawatha-webserver.org/files/hiawatha-${version%%.*}/"
+XBPS_DISTFILES_MIRROR+=" https://hiawatha.leisink.net/files/hiawatha-${version%%.*}/"
post_install() {
vsv hiawatha
From 5cee076233999c8d4fd81be737d30ec65c0911a9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:33 -0400
Subject: [PATCH 04/21] dolphin-emu: build with mbedtls2
---
srcpkgs/dolphin-emu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index c4a6ad40162834..7992e3ab44b0e1 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=4
+revision=5
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
@@ -26,7 +26,7 @@ makedepends="
zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg6-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
- mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
+ mbedtls2-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Henry Naguski <henry@nilsu.org>"
From 9522cbe4a4bd9944b85e522ea609924fc024f94b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 05/21] godot: build with mbedtls2
---
srcpkgs/godot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 06e61e3439d68c..ea8fa95beeece7 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.2.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
@@ -16,7 +16,7 @@ hostmakedepends="pkg-config clang"
makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
- libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-devel
pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
speech-dispatcher-devel brotli-devel icu-devel"
depends="speech-dispatcher"
From be15e8b0a25193613d3747732dcc6ea03d8c71b7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 06/21] rvault: build with mbedtls2
---
srcpkgs/rvault/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..ae4430ec7362c6 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,14 +1,14 @@
# Template file for 'rvault'
pkgname=rvault
version=0.4
-revision=4
+revision=5
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
make_build_args="USE_SQLITE=1 USE_MBEDTLS=1 USE_OPENSSL=0 USE_SODIUM=0"
make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
hostmakedepends="pkgconf"
-makedepends="libscrypt-devel mbedtls-devel fuse-devel libcurl-devel
+makedepends="libscrypt-devel mbedtls2-devel fuse-devel libcurl-devel
libedit-devel sqlite-devel"
short_desc="Secure and authenticated store for secrets and small documents"
maintainer="Orphaned <orphan@voidlinux.org>"
From 7814463cb3aa9f9e2ec341d19d6072e685ab097b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 07/21] shadowsocks-libev: build with mbedtls2
---
srcpkgs/shadowsocks-libev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template
index 49b4737e399fd9..518c2ddb789f7f 100644
--- a/srcpkgs/shadowsocks-libev/template
+++ b/srcpkgs/shadowsocks-libev/template
@@ -1,11 +1,11 @@
# Template file for 'shadowsocks-libev'
pkgname=shadowsocks-libev
version=3.3.4
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config asciidoc xmlto"
-makedepends="pcre-devel mbedtls-devel libsodium-devel c-ares-devel libev-devel"
+makedepends="pcre-devel mbedtls2-devel libsodium-devel c-ares-devel libev-devel"
short_desc="Lightweight secured socks5 proxy for embedded devices and low end boxes"
maintainer="whoami <whoami@systemli.org>"
license="GPL-3.0-or-later"
From 72b14b250a6c8f74c10e4866eb300be91c743905 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 08/21] tpm2-tss: build with mbedtls2
---
srcpkgs/tpm2-tss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index 0b9b4b28e69339..1784e084db1424 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="libltdl-devel mbedtls-devel"
+makedepends="libltdl-devel mbedtls2-devel"
short_desc="OSS implementation of the TCG TPM2 Software Stack"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From bd5e54c7588143aeccfdef75a6a86cc789b48fd8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:36 -0400
Subject: [PATCH 09/21] monkey: build with mbedtls2
---
srcpkgs/monkey/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index c673d65d5ca9ca..08f57ec9451176 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,7 +1,7 @@
# Template file for 'monkey'
pkgname=monkey
version=1.6.9
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sbindir=/usr/bin
--libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname
@@ -9,13 +9,13 @@ configure_args="--prefix=/usr --sbindir=/usr/bin
--webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
hostmakedepends="cmake"
-makedepends="mbedtls-devel"
+makedepends="mbedtls2-devel"
short_desc="Cross-arch embeddable lightweight HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
-homepage="http://monkey-project.com"
-distfiles="${homepage}/releases/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb
+homepage="https://github.com/monkey/monkey"
+distfiles="https://github.com/monkey/monkey/archive/refs/tags/v${version}.tar.gz"
+checksum=8b795f605bfa544d3a57afd580bf6970aac72fb6b7aba338bd3012768b30e587
conf_files="
/etc/monkey/plugins/*/*.conf
From a82cef8ef55203649818ea368c51b49d2a3e6be4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:56 -0400
Subject: [PATCH 10/21] bcg729: rebuild for mbedtls-3.6.0
---
srcpkgs/bcg729/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcg729/template b/srcpkgs/bcg729/template
index e472a4c48451b4..fbc120cd82b2ca 100644
--- a/srcpkgs/bcg729/template
+++ b/srcpkgs/bcg729/template
@@ -1,7 +1,7 @@
# Template file for 'bcg729'
pkgname=bcg729
version=1.1.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_STATIC=OFF"
makedepends="bcunit-devel mbedtls-devel"
From 4b2922946c6f7be887d507db137feae60a8553e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 11/21] bctoolbox: rebuild for mbedtls-3.6.0
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 4c7f1238dde217..48f4932462aad0 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.3.74
-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 106c7efb4f8022f1396c96ef5dfcdf8ff63805f0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 12/21] belle-sip: rebuild for mbedtls-3.6.0
---
srcpkgs/belle-sip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index 98b1156fd3c4d0..5493247e60dcee 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,7 +1,7 @@
# Template file for 'belle-sip'
pkgname=belle-sip
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=OFF -DENABLE_UNIT_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON
-DCMAKE_MODULE_PATH=/usr/lib/cmake -DBUILD_SHARED_LIBS=TRUE"
From 9fec87b605f8f3a7994b6c64ededec16c7490cba Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 13/21] bzrtp: rebuild for mbedtls-3.6.0
---
srcpkgs/bzrtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index bcfb237ecbea68..d1caeb3686b9f2 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,7 +1,7 @@
# Template file for 'bzrtp'
pkgname=bzrtp
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=FALSE -DBUILD_SHARED_LIBS=TRUE"
makedepends="bctoolbox-devel mbedtls-devel libxml2-devel bctoolbox-devel sqlite-devel"
From b7dd2dcaf7bc770a135384f8754021ad72638d3c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:32 -0400
Subject: [PATCH 14/21] dislocker: rebuild for mbedtls-3.6.0
---
srcpkgs/dislocker/patches/mbedtls3.patch | 28 ++++++++++++++++++++++++
srcpkgs/dislocker/template | 2 +-
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dislocker/patches/mbedtls3.patch
diff --git a/srcpkgs/dislocker/patches/mbedtls3.patch b/srcpkgs/dislocker/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..2f31a168585d6f
--- /dev/null
+++ b/srcpkgs/dislocker/patches/mbedtls3.patch
@@ -0,0 +1,28 @@
+From 2cfbba2c8cc07e529622ba134d0a6982815d2b30 Mon Sep 17 00:00:00 2001
+From: "Julio C. Rocha" <dev@rocha.red>
+Date: Wed, 13 Sep 2023 19:07:27 -0700
+Subject: [PATCH] Support mbedtls 3
+
+---
+ include/dislocker/ssl_bindings.h.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/include/dislocker/ssl_bindings.h.in b/include/dislocker/ssl_bindings.h.in
+index c1990b2..34e05df 100644
+--- a/include/dislocker/ssl_bindings.h.in
++++ b/include/dislocker/ssl_bindings.h.in
+@@ -26,8 +26,13 @@
+ /*
+ * Here stand the bindings for polarssl SHA256/SHA2/SHA-2 function for dislocker
+ */
+-#include "@POLARSSL_INC_FOLDER@/config.h"
+ #include "@POLARSSL_INC_FOLDER@/version.h"
++#if MBEDTLS_VERSION_MAJOR >= 3
++#include "@POLARSSL_INC_FOLDER@/mbedtls_config.h"
++#include "@POLARSSL_INC_FOLDER@/compat-2.x.h"
++#else
++#include "@POLARSSL_INC_FOLDER@/config.h"
++#endif
+ #include "@POLARSSL_INC_FOLDER@/aes.h"
+
+ // Function's name changed
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 fb97284ad28b7356bca68f593725d2df36d3636b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 15/21] imhex: rebuild for mbedtls-3.6.0
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 9e8cd7184a1520..b10c948af3d79f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=1
+revision=2
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From baa691e79262280dee7e4c54abf8d2ea8b8130e9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 16/21] librist: rebuild for mbedtls-3.6.0
---
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 d545db4af860f31f6d32dcbbbafe2ffd005c93bb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 17/21] mediastreamer: rebuild for mbedtls-3.6.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 22aa27ec874292..e4bb509b63f3fe 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.3.75
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0 -DBUILD_SHARED_LIBS=TRUE"
hostmakedepends="python3"
From 97ea516bd9a8d3738a6b348fbc9418350286a564 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 18/21] obs: rebuild for mbedtls-3.6.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 4860878805e0cc..d0793fbd784882 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.1
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From e7bfd52a0d41525e01bb6d622273912a49666284 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 19/21] openrgb: rebuild for mbedtls-3.6.0
---
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 9beaf31b261ac9e3bad782880ab21083da473e9e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 20/21] openvpn: rebuild for mbedtls-3.6.0
---
srcpkgs/openvpn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 0ea6c45a6ed439..08c9f38587c820 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,7 +1,7 @@
# Template file for 'openvpn'
pkgname=openvpn
version=2.6.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
From 94a7db9de220d410073527880b582dd4a2c14f17 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 21/21] retroarch: rebuild for mbedtls-3.6.0
---
srcpkgs/retroarch/patches/mbedtls3.patch | 76 ++++++++++++++++++++++++
srcpkgs/retroarch/template | 4 +-
2 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/mbedtls3.patch
diff --git a/srcpkgs/retroarch/patches/mbedtls3.patch b/srcpkgs/retroarch/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..17d4b75fed988f
--- /dev/null
+++ b/srcpkgs/retroarch/patches/mbedtls3.patch
@@ -0,0 +1,76 @@
+From 4683e83d9a51c0229fff23400a6a19542aa523b7 Mon Sep 17 00:00:00 2001
+From: Keith Bowes <keithbowes@users.noreply.github.com>
+Date: Thu, 18 Jul 2024 09:25:29 -0400
+Subject: [PATCH] Add support for mbedtls v3 (#16763)
+
+v2 is not going to receive security fixes after 2024
+
+Fixes #16672
+---
+ Makefile.common | 3 ++-
+ libretro-common/net/net_socket_ssl_mbed.c | 5 +++++
+ qb/config.libs.sh | 19 +++++++++----------
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index a550c791462..ee4fa1c4ccc 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -753,7 +753,8 @@ else ifeq ($(HAVE_BUILTINMBEDTLS), 1)
+ OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
+ else ifeq ($(HAVE_SSL), 1)
+ DEFINES += -DHAVE_SSL
+- LIBS += $(SYSTEMMBEDTLS_LIBS)
++ LIBS += $(SYSTEMMBEDTLS_LIBS) $(SYSTEMMBEDX509_LIBS) $(SYSTEMMBEDCRYPTO_LIBS)
++ DEF_FLAGS += $(SYSTEMMBEDTLS_CFLAGS) $(SYSTEMMBEDX509_CFLAGS) $(SYSTEMMBEDCRYPTO_CFLAGS)
+ endif
+
+ # Miscellaneous
+diff --git a/libretro-common/net/net_socket_ssl_mbed.c b/libretro-common/net/net_socket_ssl_mbed.c
+index a0a524f3559..69c2239002e 100644
+--- a/libretro-common/net/net_socket_ssl_mbed.c
++++ b/libretro-common/net/net_socket_ssl_mbed.c
+@@ -35,8 +35,13 @@
+ #include "../../deps/mbedtls/mbedtls/ctr_drbg.h"
+ #include "../../deps/mbedtls/mbedtls/entropy.h"
+ #else
++#include <mbedtls/version.h>
++#if MBEDTLS_VERSION_MAJOR < 3
+ #include <mbedtls/config.h>
+ #include <mbedtls/certs.h>
++#else
++#include <mbedtls/build_info.h>
++#endif
+ #include <mbedtls/debug.h>
+ #include <mbedtls/platform.h>
+ #include <mbedtls/net_sockets.h>
+diff --git a/qb/config.libs.sh b/qb/config.libs.sh
+index 1c845375186..06ca062f0cc 100644
+--- a/qb/config.libs.sh
++++ b/qb/config.libs.sh
+@@ -316,16 +316,15 @@ check_enabled SSL BUILTINMBEDTLS 'builtin mbedtls' 'ssl is' false
+ check_enabled SSL BUILTINBEARSSL 'builtin bearssl' 'ssl is' false
+
+ if [ "$HAVE_SYSTEMMBEDTLS" = "auto" ]; then SYSTEMMBEDTLS_IS_AUTO=yes; else SYSTEMMBEDTLS_IS_AUTO=no; fi
+-check_lib '' SYSTEMMBEDTLS '-lmbedtls -lmbedx509 -lmbedcrypto'
+-check_header '' SYSTEMMBEDTLS \
+- mbedtls/config.h \
+- mbedtls/certs.h \
+- mbedtls/debug.h \
+- mbedtls/platform.h \
+- mbedtls/net_sockets.h \
+- mbedtls/ssl.h \
+- mbedtls/ctr_drbg.h \
+- mbedtls/entropy.h
++check_val '' SYSTEMMBEDTLS '-lmbedtls' 'mbedtls' mbedtls 2.5.1 '' true
++check_val '' SYSTEMMBEDX509 '-lmbedx509' 'mbedtls' mbedx509 2.5.1 '' true
++check_val '' SYSTEMMBEDCRYPTO '-lmbedcrypto' 'mbedtls' mbedcrypto 2.5.1 '' true
++if [ "$HAVE_SYSTEMMBEDTLS" = 'yes' ] && [ -z "$SYSTEMMBEDTLS_VERSION" ]; then
++ # Ancient versions (such as the one included in the Ubuntu version used for
++ # build checks) don't have this header
++ check_header '' SYSTEMMBEDTLS mbedtls/net_sockets.h
++fi
++if [ "$HAVE_SYSTEMMBEDX509" = 'no' ] || [ "$HAVE_SYSTEMMBEDCRYPTO" = 'no' ]; then HAVE_SYSTEMMBEDTLS=no; fi
+ if [ "$SYSTEMMBEDTLS_IS_AUTO" = "yes" ] && [ "$HAVE_SYSTEMMBEDTLS" = "yes" ]; then HAVE_SYSTEMMBEDTLS=auto; fi
+
+ SSL_BACKEND_CHOSEN=no
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 072d719ce28059..7292681e4e32fd 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,11 +1,11 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.19.1
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
- --disable-builtinmbedtls --disable-builtinzlib
+ --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib
$(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
$(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
$(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
2024-08-12 18:45 [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8 classabbyamp
2024-08-12 20:01 ` [PR PATCH] [Updated] " classabbyamp
2024-08-12 20:05 ` classabbyamp
@ 2024-08-13 4:26 ` classabbyamp
2024-08-13 5:05 ` classabbyamp
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2024-08-13 4:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages mbedtls
https://github.com/void-linux/void-packages/pull/51806
mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/51806.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mbedtls-51806.patch --]
[-- Type: text/x-diff, Size: 29062 bytes --]
From afca52a30481935cb3e16665de2e525870be1ec3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 13:00:36 -0400
Subject: [PATCH 01/21] mbedtls: update to 3.6.0.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 20 ++++++++++++++++----
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0178ef9ecc32f1..3e852749da2d2e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2295,9 +2295,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.21 mbedtls-3.6.0_1
+libmbedcrypto.so.16 mbedtls-3.6.0_1
+libmbedx509.so.7 mbedtls-3.6.0_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..a9fd561fd78b18 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,8 @@
# Template file for 'mbedtls'
pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=3.6.0
revision=1
+_framework_ver=750634d3a51eb9d61b59fd5d801546927c946588
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
hostmakedepends="python3 perl"
@@ -11,8 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
+checksum="32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff
+ 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f"
+skip_extraction="framework-${_framework_ver}.tar.gz"
+
+post_extract() {
+ vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
+}
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
@@ -24,6 +31,7 @@ mbedtls-utils_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/bin
+ rm "${PKGDESTDIR}"/usr/bin/hello
rm "${PKGDESTDIR}"/usr/bin/query_compile_time_config
}
}
@@ -31,9 +39,13 @@ mbedtls-utils_package() {
mbedtls-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls2-devel>=0"
+ replaces="mbedtls2-devel>=0"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From f2cf06da87d446e9964d2013fe30468d2b939e87 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:42:21 -0400
Subject: [PATCH 02/21] New package: mbedtls2-2.28.8
2.28 LTS branch for packages that don't support mbedtls 3 yet
---
common/shlibs | 3 +++
srcpkgs/mbedtls2-devel | 1 +
srcpkgs/mbedtls2/template | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/mbedtls2-devel
create mode 100644 srcpkgs/mbedtls2/template
diff --git a/common/shlibs b/common/shlibs
index 3e852749da2d2e..e2ec076a28cd8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2298,6 +2298,9 @@ libmpv.so.2 mpv-0.35.0_1
libmbedtls.so.21 mbedtls-3.6.0_1
libmbedcrypto.so.16 mbedtls-3.6.0_1
libmbedx509.so.7 mbedtls-3.6.0_1
+libmbedtls.so.14 mbedtls2-2.28.8_1
+libmbedcrypto.so.7 mbedtls2-2.28.8_1
+libmbedx509.so.1 mbedtls2-2.28.8_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/mbedtls2-devel b/srcpkgs/mbedtls2-devel
new file mode 120000
index 00000000000000..0800d76a46405f
--- /dev/null
+++ b/srcpkgs/mbedtls2-devel
@@ -0,0 +1 @@
+mbedtls2
\ No newline at end of file
diff --git a/srcpkgs/mbedtls2/template b/srcpkgs/mbedtls2/template
new file mode 100644
index 00000000000000..2c2ff4f5fe0aa2
--- /dev/null
+++ b/srcpkgs/mbedtls2/template
@@ -0,0 +1,36 @@
+# Template file for 'mbedtls2'
+pkgname=mbedtls2
+version=2.28.8
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
+hostmakedepends="python3 perl"
+short_desc="Portable cryptographic TLS library (version 2)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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="4fef7de0d8d542510d726d643350acb3cdb9dc76ad45611b59c9aa08372b4213"
+
+pre_configure() {
+ ./scripts/config.pl set MBEDTLS_THREADING_C
+ ./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
+}
+
+post_install() {
+ rm -r "$DESTDIR"/usr/bin
+}
+
+mbedtls2-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls-devel>=0"
+ replaces="mbedtls-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From 4f4351a006cbc7242381d111d448ff6404bbfad8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:24:55 -0400
Subject: [PATCH 03/21] hiawatha: update to 11.6, fix distfiles site
---
srcpkgs/hiawatha/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index ca3c57ef56587d..4ad8118298020b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,7 +1,7 @@
# Template file for 'hiawatha'
pkgname=hiawatha
-version=10.12
-revision=5
+version=11.6
+revision=1
build_style=cmake
configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
-DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha
@@ -11,9 +11,9 @@ makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
short_desc="Advanced and secure webserver for Unix"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://hiawatha-webserver.org"
-distfiles="https://hiawatha-webserver.org/files/${pkgname}-${version}.tar.gz"
-checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
+homepage="https://hiawatha.leisink.net"
+distfiles="https://hiawatha.leisink.net/files/hiawatha-${version}.tar.gz"
+checksum=b3c5eb7be007509b7e1f3d88cc03a99904d3b6e5e05d980f9d5bdaa424864dd6
conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
make_dirs="/var/log/hiawatha 0755 root root"
@@ -21,7 +21,7 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-XBPS_DISTFILES_MIRROR+=" https://hiawatha-webserver.org/files/hiawatha-${version%%.*}/"
+XBPS_DISTFILES_MIRROR+=" https://hiawatha.leisink.net/files/hiawatha-${version%%.*}/"
post_install() {
vsv hiawatha
From 6dcab83a1fb2b1aa2d480b8e2290f7516b2872b9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:33 -0400
Subject: [PATCH 04/21] dolphin-emu: build with mbedtls2
---
srcpkgs/dolphin-emu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index c4a6ad40162834..7992e3ab44b0e1 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=4
+revision=5
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
@@ -26,7 +26,7 @@ makedepends="
zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg6-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
- mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
+ mbedtls2-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Henry Naguski <henry@nilsu.org>"
From 9422feb5efedeb08c892b9d9ea28c1a1499e533a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 05/21] godot: build with mbedtls2
---
srcpkgs/godot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 06e61e3439d68c..ea8fa95beeece7 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.2.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
@@ -16,7 +16,7 @@ hostmakedepends="pkg-config clang"
makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
- libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-devel
pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
speech-dispatcher-devel brotli-devel icu-devel"
depends="speech-dispatcher"
From 47ca5e74284ba0763bc24fa90356db729eb10aa1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 06/21] rvault: build with mbedtls2
---
srcpkgs/rvault/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..ae4430ec7362c6 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,14 +1,14 @@
# Template file for 'rvault'
pkgname=rvault
version=0.4
-revision=4
+revision=5
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
make_build_args="USE_SQLITE=1 USE_MBEDTLS=1 USE_OPENSSL=0 USE_SODIUM=0"
make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
hostmakedepends="pkgconf"
-makedepends="libscrypt-devel mbedtls-devel fuse-devel libcurl-devel
+makedepends="libscrypt-devel mbedtls2-devel fuse-devel libcurl-devel
libedit-devel sqlite-devel"
short_desc="Secure and authenticated store for secrets and small documents"
maintainer="Orphaned <orphan@voidlinux.org>"
From b232e809090e8cfb693602c9a1b03fe0671f30ed Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 07/21] shadowsocks-libev: build with mbedtls2
---
srcpkgs/shadowsocks-libev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template
index 49b4737e399fd9..518c2ddb789f7f 100644
--- a/srcpkgs/shadowsocks-libev/template
+++ b/srcpkgs/shadowsocks-libev/template
@@ -1,11 +1,11 @@
# Template file for 'shadowsocks-libev'
pkgname=shadowsocks-libev
version=3.3.4
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config asciidoc xmlto"
-makedepends="pcre-devel mbedtls-devel libsodium-devel c-ares-devel libev-devel"
+makedepends="pcre-devel mbedtls2-devel libsodium-devel c-ares-devel libev-devel"
short_desc="Lightweight secured socks5 proxy for embedded devices and low end boxes"
maintainer="whoami <whoami@systemli.org>"
license="GPL-3.0-or-later"
From 31c5772ccb8f431d013bf7b9c56640b7a68a33aa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 08/21] tpm2-tss: build with mbedtls2
---
srcpkgs/tpm2-tss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index 0b9b4b28e69339..1784e084db1424 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="libltdl-devel mbedtls-devel"
+makedepends="libltdl-devel mbedtls2-devel"
short_desc="OSS implementation of the TCG TPM2 Software Stack"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From dac9de30712e590999e1a78ddcd78524782d45eb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:36 -0400
Subject: [PATCH 09/21] monkey: build with mbedtls2
---
srcpkgs/monkey/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index c673d65d5ca9ca..08f57ec9451176 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,7 +1,7 @@
# Template file for 'monkey'
pkgname=monkey
version=1.6.9
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sbindir=/usr/bin
--libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname
@@ -9,13 +9,13 @@ configure_args="--prefix=/usr --sbindir=/usr/bin
--webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
hostmakedepends="cmake"
-makedepends="mbedtls-devel"
+makedepends="mbedtls2-devel"
short_desc="Cross-arch embeddable lightweight HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
-homepage="http://monkey-project.com"
-distfiles="${homepage}/releases/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb
+homepage="https://github.com/monkey/monkey"
+distfiles="https://github.com/monkey/monkey/archive/refs/tags/v${version}.tar.gz"
+checksum=8b795f605bfa544d3a57afd580bf6970aac72fb6b7aba338bd3012768b30e587
conf_files="
/etc/monkey/plugins/*/*.conf
From f4ead21aa58d496a53b919f12ee1217bf329a9d1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:56 -0400
Subject: [PATCH 10/21] bcg729: rebuild for mbedtls-3.6.0
---
srcpkgs/bcg729/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcg729/template b/srcpkgs/bcg729/template
index e472a4c48451b4..fbc120cd82b2ca 100644
--- a/srcpkgs/bcg729/template
+++ b/srcpkgs/bcg729/template
@@ -1,7 +1,7 @@
# Template file for 'bcg729'
pkgname=bcg729
version=1.1.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_STATIC=OFF"
makedepends="bcunit-devel mbedtls-devel"
From f45e7b4b268a802dacb7e5e922725a352a3dde7e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 11/21] bctoolbox: rebuild for mbedtls-3.6.0
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 4c7f1238dde217..48f4932462aad0 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.3.74
-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 5ff44372454c4f309f70b091ab956e9797403724 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 12/21] belle-sip: rebuild for mbedtls-3.6.0
---
srcpkgs/belle-sip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index 98b1156fd3c4d0..5493247e60dcee 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,7 +1,7 @@
# Template file for 'belle-sip'
pkgname=belle-sip
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=OFF -DENABLE_UNIT_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON
-DCMAKE_MODULE_PATH=/usr/lib/cmake -DBUILD_SHARED_LIBS=TRUE"
From 405185e9cf9e16d209a824642c3131964527796e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 13/21] bzrtp: rebuild for mbedtls-3.6.0
---
srcpkgs/bzrtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index bcfb237ecbea68..d1caeb3686b9f2 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,7 +1,7 @@
# Template file for 'bzrtp'
pkgname=bzrtp
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=FALSE -DBUILD_SHARED_LIBS=TRUE"
makedepends="bctoolbox-devel mbedtls-devel libxml2-devel bctoolbox-devel sqlite-devel"
From 55e574348c057f0f58a80482800ba98d45a21ab2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:32 -0400
Subject: [PATCH 14/21] dislocker: rebuild for mbedtls-3.6.0
---
srcpkgs/dislocker/patches/cross.patch | 12 ++++++++++
srcpkgs/dislocker/patches/mbedtls3.patch | 28 ++++++++++++++++++++++++
srcpkgs/dislocker/template | 2 +-
3 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dislocker/patches/cross.patch
create mode 100644 srcpkgs/dislocker/patches/mbedtls3.patch
diff --git a/srcpkgs/dislocker/patches/cross.patch b/srcpkgs/dislocker/patches/cross.patch
new file mode 100644
index 00000000000000..d2468dafd96860
--- /dev/null
+++ b/srcpkgs/dislocker/patches/cross.patch
@@ -0,0 +1,12 @@
+--- a/cmake/FindPolarSSL.cmake
++++ b/cmake/FindPolarSSL.cmake
+@@ -67,7 +67,7 @@
+ else()
+ execute_process(
+- COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/version.h
++ COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/build_info.h
+- COMMAND sed -e "s@\s\+@ @g"
++ COMMAND sed -e "s@\\s\\+@ @g"
+ COMMAND cut -d\ -f3
+ COMMAND sed -e "s@\"@@g"
+ OUTPUT_VARIABLE POLARSSL_VERSION_STRING
diff --git a/srcpkgs/dislocker/patches/mbedtls3.patch b/srcpkgs/dislocker/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..2f31a168585d6f
--- /dev/null
+++ b/srcpkgs/dislocker/patches/mbedtls3.patch
@@ -0,0 +1,28 @@
+From 2cfbba2c8cc07e529622ba134d0a6982815d2b30 Mon Sep 17 00:00:00 2001
+From: "Julio C. Rocha" <dev@rocha.red>
+Date: Wed, 13 Sep 2023 19:07:27 -0700
+Subject: [PATCH] Support mbedtls 3
+
+---
+ include/dislocker/ssl_bindings.h.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/include/dislocker/ssl_bindings.h.in b/include/dislocker/ssl_bindings.h.in
+index c1990b2..34e05df 100644
+--- a/include/dislocker/ssl_bindings.h.in
++++ b/include/dislocker/ssl_bindings.h.in
+@@ -26,8 +26,13 @@
+ /*
+ * Here stand the bindings for polarssl SHA256/SHA2/SHA-2 function for dislocker
+ */
+-#include "@POLARSSL_INC_FOLDER@/config.h"
+ #include "@POLARSSL_INC_FOLDER@/version.h"
++#if MBEDTLS_VERSION_MAJOR >= 3
++#include "@POLARSSL_INC_FOLDER@/mbedtls_config.h"
++#include "@POLARSSL_INC_FOLDER@/compat-2.x.h"
++#else
++#include "@POLARSSL_INC_FOLDER@/config.h"
++#endif
+ #include "@POLARSSL_INC_FOLDER@/aes.h"
+
+ // Function's name changed
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 60a9b9cb94954013e7295cf61bb7df7006075cda Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 15/21] imhex: rebuild for mbedtls-3.6.0
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 9e8cd7184a1520..b10c948af3d79f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=1
+revision=2
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 1a9a54df3b55f0bbf94f8f3c7f58abd39a1e8755 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 16/21] librist: rebuild for mbedtls-3.6.0
---
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 a35bdf733916a3edf2dc300c7382c1f2da21a179 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 17/21] mediastreamer: rebuild for mbedtls-3.6.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 22aa27ec874292..e4bb509b63f3fe 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.3.75
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0 -DBUILD_SHARED_LIBS=TRUE"
hostmakedepends="python3"
From 496459b8ae16d8d46a3c3c30e0be9a218ee99cf9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 18/21] obs: rebuild for mbedtls-3.6.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 4860878805e0cc..d0793fbd784882 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.1
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From c938ae93b1ab08cc8fdccfc26ce30a19b14a791f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 19/21] openrgb: rebuild for mbedtls-3.6.0
---
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 715905e63996eb1b58b1684a6bb2217eaa2ce00b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 20/21] openvpn: rebuild for mbedtls-3.6.0
---
srcpkgs/openvpn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 0ea6c45a6ed439..08c9f38587c820 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,7 +1,7 @@
# Template file for 'openvpn'
pkgname=openvpn
version=2.6.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
From 32e874d25256f9bdb01473515254f7b8d40a2c6b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 21/21] retroarch: rebuild for mbedtls-3.6.0
---
srcpkgs/retroarch/patches/mbedtls3.patch | 76 ++++++++++++++++++++++++
srcpkgs/retroarch/template | 4 +-
2 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/mbedtls3.patch
diff --git a/srcpkgs/retroarch/patches/mbedtls3.patch b/srcpkgs/retroarch/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..17d4b75fed988f
--- /dev/null
+++ b/srcpkgs/retroarch/patches/mbedtls3.patch
@@ -0,0 +1,76 @@
+From 4683e83d9a51c0229fff23400a6a19542aa523b7 Mon Sep 17 00:00:00 2001
+From: Keith Bowes <keithbowes@users.noreply.github.com>
+Date: Thu, 18 Jul 2024 09:25:29 -0400
+Subject: [PATCH] Add support for mbedtls v3 (#16763)
+
+v2 is not going to receive security fixes after 2024
+
+Fixes #16672
+---
+ Makefile.common | 3 ++-
+ libretro-common/net/net_socket_ssl_mbed.c | 5 +++++
+ qb/config.libs.sh | 19 +++++++++----------
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index a550c791462..ee4fa1c4ccc 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -753,7 +753,8 @@ else ifeq ($(HAVE_BUILTINMBEDTLS), 1)
+ OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
+ else ifeq ($(HAVE_SSL), 1)
+ DEFINES += -DHAVE_SSL
+- LIBS += $(SYSTEMMBEDTLS_LIBS)
++ LIBS += $(SYSTEMMBEDTLS_LIBS) $(SYSTEMMBEDX509_LIBS) $(SYSTEMMBEDCRYPTO_LIBS)
++ DEF_FLAGS += $(SYSTEMMBEDTLS_CFLAGS) $(SYSTEMMBEDX509_CFLAGS) $(SYSTEMMBEDCRYPTO_CFLAGS)
+ endif
+
+ # Miscellaneous
+diff --git a/libretro-common/net/net_socket_ssl_mbed.c b/libretro-common/net/net_socket_ssl_mbed.c
+index a0a524f3559..69c2239002e 100644
+--- a/libretro-common/net/net_socket_ssl_mbed.c
++++ b/libretro-common/net/net_socket_ssl_mbed.c
+@@ -35,8 +35,13 @@
+ #include "../../deps/mbedtls/mbedtls/ctr_drbg.h"
+ #include "../../deps/mbedtls/mbedtls/entropy.h"
+ #else
++#include <mbedtls/version.h>
++#if MBEDTLS_VERSION_MAJOR < 3
+ #include <mbedtls/config.h>
+ #include <mbedtls/certs.h>
++#else
++#include <mbedtls/build_info.h>
++#endif
+ #include <mbedtls/debug.h>
+ #include <mbedtls/platform.h>
+ #include <mbedtls/net_sockets.h>
+diff --git a/qb/config.libs.sh b/qb/config.libs.sh
+index 1c845375186..06ca062f0cc 100644
+--- a/qb/config.libs.sh
++++ b/qb/config.libs.sh
+@@ -316,16 +316,15 @@ check_enabled SSL BUILTINMBEDTLS 'builtin mbedtls' 'ssl is' false
+ check_enabled SSL BUILTINBEARSSL 'builtin bearssl' 'ssl is' false
+
+ if [ "$HAVE_SYSTEMMBEDTLS" = "auto" ]; then SYSTEMMBEDTLS_IS_AUTO=yes; else SYSTEMMBEDTLS_IS_AUTO=no; fi
+-check_lib '' SYSTEMMBEDTLS '-lmbedtls -lmbedx509 -lmbedcrypto'
+-check_header '' SYSTEMMBEDTLS \
+- mbedtls/config.h \
+- mbedtls/certs.h \
+- mbedtls/debug.h \
+- mbedtls/platform.h \
+- mbedtls/net_sockets.h \
+- mbedtls/ssl.h \
+- mbedtls/ctr_drbg.h \
+- mbedtls/entropy.h
++check_val '' SYSTEMMBEDTLS '-lmbedtls' 'mbedtls' mbedtls 2.5.1 '' true
++check_val '' SYSTEMMBEDX509 '-lmbedx509' 'mbedtls' mbedx509 2.5.1 '' true
++check_val '' SYSTEMMBEDCRYPTO '-lmbedcrypto' 'mbedtls' mbedcrypto 2.5.1 '' true
++if [ "$HAVE_SYSTEMMBEDTLS" = 'yes' ] && [ -z "$SYSTEMMBEDTLS_VERSION" ]; then
++ # Ancient versions (such as the one included in the Ubuntu version used for
++ # build checks) don't have this header
++ check_header '' SYSTEMMBEDTLS mbedtls/net_sockets.h
++fi
++if [ "$HAVE_SYSTEMMBEDX509" = 'no' ] || [ "$HAVE_SYSTEMMBEDCRYPTO" = 'no' ]; then HAVE_SYSTEMMBEDTLS=no; fi
+ if [ "$SYSTEMMBEDTLS_IS_AUTO" = "yes" ] && [ "$HAVE_SYSTEMMBEDTLS" = "yes" ]; then HAVE_SYSTEMMBEDTLS=auto; fi
+
+ SSL_BACKEND_CHOSEN=no
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 072d719ce28059..7292681e4e32fd 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,11 +1,11 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.19.1
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
- --disable-builtinmbedtls --disable-builtinzlib
+ --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib
$(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
$(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
$(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
2024-08-12 18:45 [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8 classabbyamp
` (2 preceding siblings ...)
2024-08-13 4:26 ` classabbyamp
@ 2024-08-13 5:05 ` classabbyamp
2024-08-20 3:21 ` classabbyamp
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2024-08-13 5:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages mbedtls
https://github.com/void-linux/void-packages/pull/51806
mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/51806.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mbedtls-51806.patch --]
[-- Type: text/x-diff, Size: 29452 bytes --]
From f50c53f75d5fd1af4d64492ae64d8134156a3a83 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 13:00:36 -0400
Subject: [PATCH 01/21] mbedtls: update to 3.6.0.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 20 ++++++++++++++++----
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0178ef9ecc32f1..3e852749da2d2e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2295,9 +2295,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.21 mbedtls-3.6.0_1
+libmbedcrypto.so.16 mbedtls-3.6.0_1
+libmbedx509.so.7 mbedtls-3.6.0_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..a9fd561fd78b18 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,8 @@
# Template file for 'mbedtls'
pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=3.6.0
revision=1
+_framework_ver=750634d3a51eb9d61b59fd5d801546927c946588
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
hostmakedepends="python3 perl"
@@ -11,8 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
+checksum="32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff
+ 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f"
+skip_extraction="framework-${_framework_ver}.tar.gz"
+
+post_extract() {
+ vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
+}
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
@@ -24,6 +31,7 @@ mbedtls-utils_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/bin
+ rm "${PKGDESTDIR}"/usr/bin/hello
rm "${PKGDESTDIR}"/usr/bin/query_compile_time_config
}
}
@@ -31,9 +39,13 @@ mbedtls-utils_package() {
mbedtls-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls2-devel>=0"
+ replaces="mbedtls2-devel>=0"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From a2d0630a5ac379ebe7f05254203a29827d33a352 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:42:21 -0400
Subject: [PATCH 02/21] New package: mbedtls2-2.28.8
2.28 LTS branch for packages that don't support mbedtls 3 yet
---
common/shlibs | 3 +++
srcpkgs/mbedtls2-devel | 1 +
srcpkgs/mbedtls2/template | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/mbedtls2-devel
create mode 100644 srcpkgs/mbedtls2/template
diff --git a/common/shlibs b/common/shlibs
index 3e852749da2d2e..e2ec076a28cd8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2298,6 +2298,9 @@ libmpv.so.2 mpv-0.35.0_1
libmbedtls.so.21 mbedtls-3.6.0_1
libmbedcrypto.so.16 mbedtls-3.6.0_1
libmbedx509.so.7 mbedtls-3.6.0_1
+libmbedtls.so.14 mbedtls2-2.28.8_1
+libmbedcrypto.so.7 mbedtls2-2.28.8_1
+libmbedx509.so.1 mbedtls2-2.28.8_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/mbedtls2-devel b/srcpkgs/mbedtls2-devel
new file mode 120000
index 00000000000000..0800d76a46405f
--- /dev/null
+++ b/srcpkgs/mbedtls2-devel
@@ -0,0 +1 @@
+mbedtls2
\ No newline at end of file
diff --git a/srcpkgs/mbedtls2/template b/srcpkgs/mbedtls2/template
new file mode 100644
index 00000000000000..2c2ff4f5fe0aa2
--- /dev/null
+++ b/srcpkgs/mbedtls2/template
@@ -0,0 +1,36 @@
+# Template file for 'mbedtls2'
+pkgname=mbedtls2
+version=2.28.8
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
+hostmakedepends="python3 perl"
+short_desc="Portable cryptographic TLS library (version 2)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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="4fef7de0d8d542510d726d643350acb3cdb9dc76ad45611b59c9aa08372b4213"
+
+pre_configure() {
+ ./scripts/config.pl set MBEDTLS_THREADING_C
+ ./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
+}
+
+post_install() {
+ rm -r "$DESTDIR"/usr/bin
+}
+
+mbedtls2-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls-devel>=0"
+ replaces="mbedtls-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From e1ee138216be07410fb576b2997b54805a5da6b9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:24:55 -0400
Subject: [PATCH 03/21] hiawatha: update to 11.6, fix distfiles site
---
srcpkgs/hiawatha/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index ca3c57ef56587d..4ad8118298020b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,7 +1,7 @@
# Template file for 'hiawatha'
pkgname=hiawatha
-version=10.12
-revision=5
+version=11.6
+revision=1
build_style=cmake
configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
-DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha
@@ -11,9 +11,9 @@ makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
short_desc="Advanced and secure webserver for Unix"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://hiawatha-webserver.org"
-distfiles="https://hiawatha-webserver.org/files/${pkgname}-${version}.tar.gz"
-checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
+homepage="https://hiawatha.leisink.net"
+distfiles="https://hiawatha.leisink.net/files/hiawatha-${version}.tar.gz"
+checksum=b3c5eb7be007509b7e1f3d88cc03a99904d3b6e5e05d980f9d5bdaa424864dd6
conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
make_dirs="/var/log/hiawatha 0755 root root"
@@ -21,7 +21,7 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-XBPS_DISTFILES_MIRROR+=" https://hiawatha-webserver.org/files/hiawatha-${version%%.*}/"
+XBPS_DISTFILES_MIRROR+=" https://hiawatha.leisink.net/files/hiawatha-${version%%.*}/"
post_install() {
vsv hiawatha
From a43d925f8b431b9e110404bc92706d77c147bf34 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:33 -0400
Subject: [PATCH 04/21] dolphin-emu: build with mbedtls2
---
srcpkgs/dolphin-emu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index c4a6ad40162834..7992e3ab44b0e1 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=4
+revision=5
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
@@ -26,7 +26,7 @@ makedepends="
zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg6-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
- mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
+ mbedtls2-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Henry Naguski <henry@nilsu.org>"
From 10b9cae2d0ab7fa902693992166ff98324017bdd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 05/21] godot: build with mbedtls2
---
srcpkgs/godot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 06e61e3439d68c..ea8fa95beeece7 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.2.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
@@ -16,7 +16,7 @@ hostmakedepends="pkg-config clang"
makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
- libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
+ libenet-devel zlib-devel mbedtls2-devel miniupnpc-devel pcre2-devel
pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
speech-dispatcher-devel brotli-devel icu-devel"
depends="speech-dispatcher"
From 99962926a778ee1c69b38aa2ae472a262cf0641d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 06/21] rvault: build with mbedtls2
---
srcpkgs/rvault/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..ae4430ec7362c6 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,14 +1,14 @@
# Template file for 'rvault'
pkgname=rvault
version=0.4
-revision=4
+revision=5
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
make_build_args="USE_SQLITE=1 USE_MBEDTLS=1 USE_OPENSSL=0 USE_SODIUM=0"
make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
hostmakedepends="pkgconf"
-makedepends="libscrypt-devel mbedtls-devel fuse-devel libcurl-devel
+makedepends="libscrypt-devel mbedtls2-devel fuse-devel libcurl-devel
libedit-devel sqlite-devel"
short_desc="Secure and authenticated store for secrets and small documents"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6e8578132a6653cbc468084b974b22ab39fd1ece Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 07/21] shadowsocks-libev: build with mbedtls2
---
srcpkgs/shadowsocks-libev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template
index 49b4737e399fd9..518c2ddb789f7f 100644
--- a/srcpkgs/shadowsocks-libev/template
+++ b/srcpkgs/shadowsocks-libev/template
@@ -1,11 +1,11 @@
# Template file for 'shadowsocks-libev'
pkgname=shadowsocks-libev
version=3.3.4
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config asciidoc xmlto"
-makedepends="pcre-devel mbedtls-devel libsodium-devel c-ares-devel libev-devel"
+makedepends="pcre-devel mbedtls2-devel libsodium-devel c-ares-devel libev-devel"
short_desc="Lightweight secured socks5 proxy for embedded devices and low end boxes"
maintainer="whoami <whoami@systemli.org>"
license="GPL-3.0-or-later"
From 38c7cf61d4c77a3f58c50d14b2a68853ec2948fa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 08/21] tpm2-tss: build with mbedtls2
---
srcpkgs/tpm2-tss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index 0b9b4b28e69339..1784e084db1424 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="libltdl-devel mbedtls-devel"
+makedepends="libltdl-devel mbedtls2-devel"
short_desc="OSS implementation of the TCG TPM2 Software Stack"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From bb767c02561645fe3021422074227c9c0cf3bda9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:36 -0400
Subject: [PATCH 09/21] monkey: build with mbedtls2
---
srcpkgs/monkey/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index c673d65d5ca9ca..08f57ec9451176 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,7 +1,7 @@
# Template file for 'monkey'
pkgname=monkey
version=1.6.9
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sbindir=/usr/bin
--libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname
@@ -9,13 +9,13 @@ configure_args="--prefix=/usr --sbindir=/usr/bin
--webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
hostmakedepends="cmake"
-makedepends="mbedtls-devel"
+makedepends="mbedtls2-devel"
short_desc="Cross-arch embeddable lightweight HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
-homepage="http://monkey-project.com"
-distfiles="${homepage}/releases/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb
+homepage="https://github.com/monkey/monkey"
+distfiles="https://github.com/monkey/monkey/archive/refs/tags/v${version}.tar.gz"
+checksum=8b795f605bfa544d3a57afd580bf6970aac72fb6b7aba338bd3012768b30e587
conf_files="
/etc/monkey/plugins/*/*.conf
From ea501f7ddc35a4d53e0b1779bbfa84a8613edd4e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:56 -0400
Subject: [PATCH 10/21] bcg729: rebuild for mbedtls-3.6.0
---
srcpkgs/bcg729/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcg729/template b/srcpkgs/bcg729/template
index e472a4c48451b4..fbc120cd82b2ca 100644
--- a/srcpkgs/bcg729/template
+++ b/srcpkgs/bcg729/template
@@ -1,7 +1,7 @@
# Template file for 'bcg729'
pkgname=bcg729
version=1.1.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_STATIC=OFF"
makedepends="bcunit-devel mbedtls-devel"
From d48ebba91b7111ec511da9a442179dd40d72c54f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 11/21] bctoolbox: rebuild for mbedtls-3.6.0
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 4c7f1238dde217..48f4932462aad0 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.3.74
-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 6848f2a1ea6467cf4f3c8076fb66f93d24ba5747 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 12/21] belle-sip: rebuild for mbedtls-3.6.0
---
srcpkgs/belle-sip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index 98b1156fd3c4d0..5493247e60dcee 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,7 +1,7 @@
# Template file for 'belle-sip'
pkgname=belle-sip
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=OFF -DENABLE_UNIT_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON
-DCMAKE_MODULE_PATH=/usr/lib/cmake -DBUILD_SHARED_LIBS=TRUE"
From ed2acfa2fc1076aad84401b1f0a045c4c468781c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 13/21] bzrtp: rebuild for mbedtls-3.6.0
---
srcpkgs/bzrtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index bcfb237ecbea68..d1caeb3686b9f2 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,7 +1,7 @@
# Template file for 'bzrtp'
pkgname=bzrtp
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=FALSE -DBUILD_SHARED_LIBS=TRUE"
makedepends="bctoolbox-devel mbedtls-devel libxml2-devel bctoolbox-devel sqlite-devel"
From ab7a3dcd4383d957269e399bc8040d7050892690 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:32 -0400
Subject: [PATCH 14/21] dislocker: rebuild for mbedtls-3.6.0
---
srcpkgs/dislocker/patches/cross.patch | 12 ++++++++++
srcpkgs/dislocker/patches/mbedtls3.patch | 28 ++++++++++++++++++++++++
srcpkgs/dislocker/template | 2 +-
3 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dislocker/patches/cross.patch
create mode 100644 srcpkgs/dislocker/patches/mbedtls3.patch
diff --git a/srcpkgs/dislocker/patches/cross.patch b/srcpkgs/dislocker/patches/cross.patch
new file mode 100644
index 00000000000000..d2468dafd96860
--- /dev/null
+++ b/srcpkgs/dislocker/patches/cross.patch
@@ -0,0 +1,12 @@
+--- a/cmake/FindPolarSSL.cmake
++++ b/cmake/FindPolarSSL.cmake
+@@ -67,7 +67,7 @@
+ else()
+ execute_process(
+- COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/version.h
++ COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/build_info.h
+- COMMAND sed -e "s@\s\+@ @g"
++ COMMAND sed -e "s@\\s\\+@ @g"
+ COMMAND cut -d\ -f3
+ COMMAND sed -e "s@\"@@g"
+ OUTPUT_VARIABLE POLARSSL_VERSION_STRING
diff --git a/srcpkgs/dislocker/patches/mbedtls3.patch b/srcpkgs/dislocker/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..2f31a168585d6f
--- /dev/null
+++ b/srcpkgs/dislocker/patches/mbedtls3.patch
@@ -0,0 +1,28 @@
+From 2cfbba2c8cc07e529622ba134d0a6982815d2b30 Mon Sep 17 00:00:00 2001
+From: "Julio C. Rocha" <dev@rocha.red>
+Date: Wed, 13 Sep 2023 19:07:27 -0700
+Subject: [PATCH] Support mbedtls 3
+
+---
+ include/dislocker/ssl_bindings.h.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/include/dislocker/ssl_bindings.h.in b/include/dislocker/ssl_bindings.h.in
+index c1990b2..34e05df 100644
+--- a/include/dislocker/ssl_bindings.h.in
++++ b/include/dislocker/ssl_bindings.h.in
+@@ -26,8 +26,13 @@
+ /*
+ * Here stand the bindings for polarssl SHA256/SHA2/SHA-2 function for dislocker
+ */
+-#include "@POLARSSL_INC_FOLDER@/config.h"
+ #include "@POLARSSL_INC_FOLDER@/version.h"
++#if MBEDTLS_VERSION_MAJOR >= 3
++#include "@POLARSSL_INC_FOLDER@/mbedtls_config.h"
++#include "@POLARSSL_INC_FOLDER@/compat-2.x.h"
++#else
++#include "@POLARSSL_INC_FOLDER@/config.h"
++#endif
+ #include "@POLARSSL_INC_FOLDER@/aes.h"
+
+ // Function's name changed
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 35a8db5734acd09b1ab1530c0b894dc4b67bb388 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 15/21] imhex: rebuild for mbedtls-3.6.0
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 9e8cd7184a1520..b10c948af3d79f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=1
+revision=2
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 70c50d267fc8384497c595964c609f6cc44e992d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 16/21] librist: rebuild for mbedtls-3.6.0
---
srcpkgs/librist/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/librist/template b/srcpkgs/librist/template
index f075679388de88..e547fead43f340 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)"
@@ -11,6 +11,10 @@ homepage="https://code.videolan.org/rist/librist"
distfiles="https://code.videolan.org/rist/librist/-/archive/v${version}/librist-v${version}.tar.gz"
checksum=7e2507fdef7b57c87b461d0f2515771b70699a02c8675b51785a73400b3c53a1
+if [ "$XBPS_TARGET_MACHINE" = x86_64-musl ]; then
+ make_check=extended # tests are flaky
+fi
+
post_install() {
vlicense COPYING
}
From 7d7068d0df5d7270d254c1aaf24268793df9ea19 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 17/21] mediastreamer: rebuild for mbedtls-3.6.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 22aa27ec874292..e4bb509b63f3fe 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.3.75
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0 -DBUILD_SHARED_LIBS=TRUE"
hostmakedepends="python3"
From 33ff8dd8038ec6918f93286daaba6c86cc57d4c5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 18/21] obs: rebuild for mbedtls-3.6.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 4860878805e0cc..d0793fbd784882 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.1
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From 95a33f266186704fa32f9f63b7fd724357a58f0c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 19/21] openrgb: rebuild for mbedtls-3.6.0
---
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 5164ffa697ff34fbce3cc3771f030a5faa7169d0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 20/21] openvpn: rebuild for mbedtls-3.6.0
---
srcpkgs/openvpn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 0ea6c45a6ed439..08c9f38587c820 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,7 +1,7 @@
# Template file for 'openvpn'
pkgname=openvpn
version=2.6.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
From 544a04d156be41334fb65e8fd0ff5ec8a7ab25c6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 21/21] retroarch: rebuild for mbedtls-3.6.0
---
srcpkgs/retroarch/patches/mbedtls3.patch | 76 ++++++++++++++++++++++++
srcpkgs/retroarch/template | 4 +-
2 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/mbedtls3.patch
diff --git a/srcpkgs/retroarch/patches/mbedtls3.patch b/srcpkgs/retroarch/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..17d4b75fed988f
--- /dev/null
+++ b/srcpkgs/retroarch/patches/mbedtls3.patch
@@ -0,0 +1,76 @@
+From 4683e83d9a51c0229fff23400a6a19542aa523b7 Mon Sep 17 00:00:00 2001
+From: Keith Bowes <keithbowes@users.noreply.github.com>
+Date: Thu, 18 Jul 2024 09:25:29 -0400
+Subject: [PATCH] Add support for mbedtls v3 (#16763)
+
+v2 is not going to receive security fixes after 2024
+
+Fixes #16672
+---
+ Makefile.common | 3 ++-
+ libretro-common/net/net_socket_ssl_mbed.c | 5 +++++
+ qb/config.libs.sh | 19 +++++++++----------
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index a550c791462..ee4fa1c4ccc 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -753,7 +753,8 @@ else ifeq ($(HAVE_BUILTINMBEDTLS), 1)
+ OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
+ else ifeq ($(HAVE_SSL), 1)
+ DEFINES += -DHAVE_SSL
+- LIBS += $(SYSTEMMBEDTLS_LIBS)
++ LIBS += $(SYSTEMMBEDTLS_LIBS) $(SYSTEMMBEDX509_LIBS) $(SYSTEMMBEDCRYPTO_LIBS)
++ DEF_FLAGS += $(SYSTEMMBEDTLS_CFLAGS) $(SYSTEMMBEDX509_CFLAGS) $(SYSTEMMBEDCRYPTO_CFLAGS)
+ endif
+
+ # Miscellaneous
+diff --git a/libretro-common/net/net_socket_ssl_mbed.c b/libretro-common/net/net_socket_ssl_mbed.c
+index a0a524f3559..69c2239002e 100644
+--- a/libretro-common/net/net_socket_ssl_mbed.c
++++ b/libretro-common/net/net_socket_ssl_mbed.c
+@@ -35,8 +35,13 @@
+ #include "../../deps/mbedtls/mbedtls/ctr_drbg.h"
+ #include "../../deps/mbedtls/mbedtls/entropy.h"
+ #else
++#include <mbedtls/version.h>
++#if MBEDTLS_VERSION_MAJOR < 3
+ #include <mbedtls/config.h>
+ #include <mbedtls/certs.h>
++#else
++#include <mbedtls/build_info.h>
++#endif
+ #include <mbedtls/debug.h>
+ #include <mbedtls/platform.h>
+ #include <mbedtls/net_sockets.h>
+diff --git a/qb/config.libs.sh b/qb/config.libs.sh
+index 1c845375186..06ca062f0cc 100644
+--- a/qb/config.libs.sh
++++ b/qb/config.libs.sh
+@@ -316,16 +316,15 @@ check_enabled SSL BUILTINMBEDTLS 'builtin mbedtls' 'ssl is' false
+ check_enabled SSL BUILTINBEARSSL 'builtin bearssl' 'ssl is' false
+
+ if [ "$HAVE_SYSTEMMBEDTLS" = "auto" ]; then SYSTEMMBEDTLS_IS_AUTO=yes; else SYSTEMMBEDTLS_IS_AUTO=no; fi
+-check_lib '' SYSTEMMBEDTLS '-lmbedtls -lmbedx509 -lmbedcrypto'
+-check_header '' SYSTEMMBEDTLS \
+- mbedtls/config.h \
+- mbedtls/certs.h \
+- mbedtls/debug.h \
+- mbedtls/platform.h \
+- mbedtls/net_sockets.h \
+- mbedtls/ssl.h \
+- mbedtls/ctr_drbg.h \
+- mbedtls/entropy.h
++check_val '' SYSTEMMBEDTLS '-lmbedtls' 'mbedtls' mbedtls 2.5.1 '' true
++check_val '' SYSTEMMBEDX509 '-lmbedx509' 'mbedtls' mbedx509 2.5.1 '' true
++check_val '' SYSTEMMBEDCRYPTO '-lmbedcrypto' 'mbedtls' mbedcrypto 2.5.1 '' true
++if [ "$HAVE_SYSTEMMBEDTLS" = 'yes' ] && [ -z "$SYSTEMMBEDTLS_VERSION" ]; then
++ # Ancient versions (such as the one included in the Ubuntu version used for
++ # build checks) don't have this header
++ check_header '' SYSTEMMBEDTLS mbedtls/net_sockets.h
++fi
++if [ "$HAVE_SYSTEMMBEDX509" = 'no' ] || [ "$HAVE_SYSTEMMBEDCRYPTO" = 'no' ]; then HAVE_SYSTEMMBEDTLS=no; fi
+ if [ "$SYSTEMMBEDTLS_IS_AUTO" = "yes" ] && [ "$HAVE_SYSTEMMBEDTLS" = "yes" ]; then HAVE_SYSTEMMBEDTLS=auto; fi
+
+ SSL_BACKEND_CHOSEN=no
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 072d719ce28059..7292681e4e32fd 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,11 +1,11 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.19.1
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
- --disable-builtinmbedtls --disable-builtinzlib
+ --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib
$(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
$(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
$(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
2024-08-12 18:45 [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8 classabbyamp
` (3 preceding siblings ...)
2024-08-13 5:05 ` classabbyamp
@ 2024-08-20 3:21 ` classabbyamp
2024-09-07 11:36 ` classabbyamp
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2024-08-20 3:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages mbedtls
https://github.com/void-linux/void-packages/pull/51806
mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/51806.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mbedtls-51806.patch --]
[-- Type: text/x-diff, Size: 28890 bytes --]
From 0a9787b62a96da43b95cec7e5c30b27f2bb93db3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 13:00:36 -0400
Subject: [PATCH 01/21] mbedtls: update to 3.6.0.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 20 ++++++++++++++++----
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 20dd99be076ba4..75500c9169f18f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2295,9 +2295,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.21 mbedtls-3.6.0_1
+libmbedcrypto.so.16 mbedtls-3.6.0_1
+libmbedx509.so.7 mbedtls-3.6.0_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..a9fd561fd78b18 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,8 @@
# Template file for 'mbedtls'
pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=3.6.0
revision=1
+_framework_ver=750634d3a51eb9d61b59fd5d801546927c946588
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
hostmakedepends="python3 perl"
@@ -11,8 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
+checksum="32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff
+ 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f"
+skip_extraction="framework-${_framework_ver}.tar.gz"
+
+post_extract() {
+ vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
+}
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
@@ -24,6 +31,7 @@ mbedtls-utils_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/bin
+ rm "${PKGDESTDIR}"/usr/bin/hello
rm "${PKGDESTDIR}"/usr/bin/query_compile_time_config
}
}
@@ -31,9 +39,13 @@ mbedtls-utils_package() {
mbedtls-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls2-devel>=0"
+ replaces="mbedtls2-devel>=0"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From 309cde2598c73af0149c343d97e4afd60e66cdad Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:42:21 -0400
Subject: [PATCH 02/21] New package: mbedtls2-2.28.8
2.28 LTS branch for packages that don't support mbedtls 3 yet
---
common/shlibs | 3 +++
srcpkgs/mbedtls2-devel | 1 +
srcpkgs/mbedtls2/template | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/mbedtls2-devel
create mode 100644 srcpkgs/mbedtls2/template
diff --git a/common/shlibs b/common/shlibs
index 75500c9169f18f..2ad2b9a20aaf66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2298,6 +2298,9 @@ libmpv.so.2 mpv-0.35.0_1
libmbedtls.so.21 mbedtls-3.6.0_1
libmbedcrypto.so.16 mbedtls-3.6.0_1
libmbedx509.so.7 mbedtls-3.6.0_1
+libmbedtls.so.14 mbedtls2-2.28.8_1
+libmbedcrypto.so.7 mbedtls2-2.28.8_1
+libmbedx509.so.1 mbedtls2-2.28.8_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/mbedtls2-devel b/srcpkgs/mbedtls2-devel
new file mode 120000
index 00000000000000..0800d76a46405f
--- /dev/null
+++ b/srcpkgs/mbedtls2-devel
@@ -0,0 +1 @@
+mbedtls2
\ No newline at end of file
diff --git a/srcpkgs/mbedtls2/template b/srcpkgs/mbedtls2/template
new file mode 100644
index 00000000000000..2c2ff4f5fe0aa2
--- /dev/null
+++ b/srcpkgs/mbedtls2/template
@@ -0,0 +1,36 @@
+# Template file for 'mbedtls2'
+pkgname=mbedtls2
+version=2.28.8
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
+hostmakedepends="python3 perl"
+short_desc="Portable cryptographic TLS library (version 2)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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="4fef7de0d8d542510d726d643350acb3cdb9dc76ad45611b59c9aa08372b4213"
+
+pre_configure() {
+ ./scripts/config.pl set MBEDTLS_THREADING_C
+ ./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
+}
+
+post_install() {
+ rm -r "$DESTDIR"/usr/bin
+}
+
+mbedtls2-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls-devel>=0"
+ replaces="mbedtls-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From 3b04d4db135ed375c813d73d30fe3875a8767a53 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:24:55 -0400
Subject: [PATCH 03/21] hiawatha: update to 11.6, fix distfiles site
---
srcpkgs/hiawatha/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index ca3c57ef56587d..4ad8118298020b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,7 +1,7 @@
# Template file for 'hiawatha'
pkgname=hiawatha
-version=10.12
-revision=5
+version=11.6
+revision=1
build_style=cmake
configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
-DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha
@@ -11,9 +11,9 @@ makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
short_desc="Advanced and secure webserver for Unix"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://hiawatha-webserver.org"
-distfiles="https://hiawatha-webserver.org/files/${pkgname}-${version}.tar.gz"
-checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
+homepage="https://hiawatha.leisink.net"
+distfiles="https://hiawatha.leisink.net/files/hiawatha-${version}.tar.gz"
+checksum=b3c5eb7be007509b7e1f3d88cc03a99904d3b6e5e05d980f9d5bdaa424864dd6
conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
make_dirs="/var/log/hiawatha 0755 root root"
@@ -21,7 +21,7 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-XBPS_DISTFILES_MIRROR+=" https://hiawatha-webserver.org/files/hiawatha-${version%%.*}/"
+XBPS_DISTFILES_MIRROR+=" https://hiawatha.leisink.net/files/hiawatha-${version%%.*}/"
post_install() {
vsv hiawatha
From fb8c2707801547c8bf8852ba0da2d989f1c1a6f6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:33 -0400
Subject: [PATCH 04/21] dolphin-emu: build with mbedtls2
---
srcpkgs/dolphin-emu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index c4a6ad40162834..7992e3ab44b0e1 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=4
+revision=5
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
@@ -26,7 +26,7 @@ makedepends="
zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg6-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
- mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
+ mbedtls2-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Henry Naguski <henry@nilsu.org>"
From 7edb5953cf36d598c10ae01ac81f07843f317959 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 05/21] rvault: build with mbedtls2
---
srcpkgs/rvault/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..ae4430ec7362c6 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,14 +1,14 @@
# Template file for 'rvault'
pkgname=rvault
version=0.4
-revision=4
+revision=5
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
make_build_args="USE_SQLITE=1 USE_MBEDTLS=1 USE_OPENSSL=0 USE_SODIUM=0"
make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
hostmakedepends="pkgconf"
-makedepends="libscrypt-devel mbedtls-devel fuse-devel libcurl-devel
+makedepends="libscrypt-devel mbedtls2-devel fuse-devel libcurl-devel
libedit-devel sqlite-devel"
short_desc="Secure and authenticated store for secrets and small documents"
maintainer="Orphaned <orphan@voidlinux.org>"
From 09cd3862221cd520347d1eba05ce3810f4720cfe Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 06/21] shadowsocks-libev: build with mbedtls2
---
srcpkgs/shadowsocks-libev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template
index 49b4737e399fd9..518c2ddb789f7f 100644
--- a/srcpkgs/shadowsocks-libev/template
+++ b/srcpkgs/shadowsocks-libev/template
@@ -1,11 +1,11 @@
# Template file for 'shadowsocks-libev'
pkgname=shadowsocks-libev
version=3.3.4
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config asciidoc xmlto"
-makedepends="pcre-devel mbedtls-devel libsodium-devel c-ares-devel libev-devel"
+makedepends="pcre-devel mbedtls2-devel libsodium-devel c-ares-devel libev-devel"
short_desc="Lightweight secured socks5 proxy for embedded devices and low end boxes"
maintainer="whoami <whoami@systemli.org>"
license="GPL-3.0-or-later"
From 8d6099c459cc3d2c91e48eaf8bbf45ca71a08982 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 07/21] tpm2-tss: build with mbedtls2
---
srcpkgs/tpm2-tss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index 0b9b4b28e69339..1784e084db1424 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="libltdl-devel mbedtls-devel"
+makedepends="libltdl-devel mbedtls2-devel"
short_desc="OSS implementation of the TCG TPM2 Software Stack"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 803de14fb8b8b29aec8441e1064d7922dec03a69 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:36 -0400
Subject: [PATCH 08/21] monkey: build with mbedtls2
---
srcpkgs/monkey/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index c673d65d5ca9ca..08f57ec9451176 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,7 +1,7 @@
# Template file for 'monkey'
pkgname=monkey
version=1.6.9
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sbindir=/usr/bin
--libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname
@@ -9,13 +9,13 @@ configure_args="--prefix=/usr --sbindir=/usr/bin
--webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
hostmakedepends="cmake"
-makedepends="mbedtls-devel"
+makedepends="mbedtls2-devel"
short_desc="Cross-arch embeddable lightweight HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
-homepage="http://monkey-project.com"
-distfiles="${homepage}/releases/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb
+homepage="https://github.com/monkey/monkey"
+distfiles="https://github.com/monkey/monkey/archive/refs/tags/v${version}.tar.gz"
+checksum=8b795f605bfa544d3a57afd580bf6970aac72fb6b7aba338bd3012768b30e587
conf_files="
/etc/monkey/plugins/*/*.conf
From 98f0d81ca89a2afc34d4b59114ee869a9bfb540e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:56 -0400
Subject: [PATCH 09/21] bcg729: rebuild for mbedtls-3.6.0
---
srcpkgs/bcg729/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcg729/template b/srcpkgs/bcg729/template
index e472a4c48451b4..fbc120cd82b2ca 100644
--- a/srcpkgs/bcg729/template
+++ b/srcpkgs/bcg729/template
@@ -1,7 +1,7 @@
# Template file for 'bcg729'
pkgname=bcg729
version=1.1.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_STATIC=OFF"
makedepends="bcunit-devel mbedtls-devel"
From e38cab3f98bcc3212d6a3063561f7d557a0c8553 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 10/21] bctoolbox: rebuild for mbedtls-3.6.0
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 4c7f1238dde217..48f4932462aad0 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.3.74
-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 d73650703ac68ce6e9347efa00cddb55510b58da Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 11/21] belle-sip: rebuild for mbedtls-3.6.0
---
srcpkgs/belle-sip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index 98b1156fd3c4d0..5493247e60dcee 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,7 +1,7 @@
# Template file for 'belle-sip'
pkgname=belle-sip
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=OFF -DENABLE_UNIT_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON
-DCMAKE_MODULE_PATH=/usr/lib/cmake -DBUILD_SHARED_LIBS=TRUE"
From 8dfb09291f8b7aaff22edae384a622a09d5c28b2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 12/21] bzrtp: rebuild for mbedtls-3.6.0
---
srcpkgs/bzrtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index bcfb237ecbea68..d1caeb3686b9f2 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,7 +1,7 @@
# Template file for 'bzrtp'
pkgname=bzrtp
version=5.3.74
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=FALSE -DBUILD_SHARED_LIBS=TRUE"
makedepends="bctoolbox-devel mbedtls-devel libxml2-devel bctoolbox-devel sqlite-devel"
From 7c022dfc0a6cc693d64f87faa517cb7f29325058 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:32 -0400
Subject: [PATCH 13/21] dislocker: rebuild for mbedtls-3.6.0
---
srcpkgs/dislocker/patches/cross.patch | 12 ++++++++++
srcpkgs/dislocker/patches/mbedtls3.patch | 28 ++++++++++++++++++++++++
srcpkgs/dislocker/template | 2 +-
3 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dislocker/patches/cross.patch
create mode 100644 srcpkgs/dislocker/patches/mbedtls3.patch
diff --git a/srcpkgs/dislocker/patches/cross.patch b/srcpkgs/dislocker/patches/cross.patch
new file mode 100644
index 00000000000000..d2468dafd96860
--- /dev/null
+++ b/srcpkgs/dislocker/patches/cross.patch
@@ -0,0 +1,12 @@
+--- a/cmake/FindPolarSSL.cmake
++++ b/cmake/FindPolarSSL.cmake
+@@ -67,7 +67,7 @@
+ else()
+ execute_process(
+- COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/version.h
++ COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/build_info.h
+- COMMAND sed -e "s@\s\+@ @g"
++ COMMAND sed -e "s@\\s\\+@ @g"
+ COMMAND cut -d\ -f3
+ COMMAND sed -e "s@\"@@g"
+ OUTPUT_VARIABLE POLARSSL_VERSION_STRING
diff --git a/srcpkgs/dislocker/patches/mbedtls3.patch b/srcpkgs/dislocker/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..2f31a168585d6f
--- /dev/null
+++ b/srcpkgs/dislocker/patches/mbedtls3.patch
@@ -0,0 +1,28 @@
+From 2cfbba2c8cc07e529622ba134d0a6982815d2b30 Mon Sep 17 00:00:00 2001
+From: "Julio C. Rocha" <dev@rocha.red>
+Date: Wed, 13 Sep 2023 19:07:27 -0700
+Subject: [PATCH] Support mbedtls 3
+
+---
+ include/dislocker/ssl_bindings.h.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/include/dislocker/ssl_bindings.h.in b/include/dislocker/ssl_bindings.h.in
+index c1990b2..34e05df 100644
+--- a/include/dislocker/ssl_bindings.h.in
++++ b/include/dislocker/ssl_bindings.h.in
+@@ -26,8 +26,13 @@
+ /*
+ * Here stand the bindings for polarssl SHA256/SHA2/SHA-2 function for dislocker
+ */
+-#include "@POLARSSL_INC_FOLDER@/config.h"
+ #include "@POLARSSL_INC_FOLDER@/version.h"
++#if MBEDTLS_VERSION_MAJOR >= 3
++#include "@POLARSSL_INC_FOLDER@/mbedtls_config.h"
++#include "@POLARSSL_INC_FOLDER@/compat-2.x.h"
++#else
++#include "@POLARSSL_INC_FOLDER@/config.h"
++#endif
+ #include "@POLARSSL_INC_FOLDER@/aes.h"
+
+ // Function's name changed
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 fa3c1d0cfeb35f3ce9d858234172b803cebce8ae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 14/21] godot: rebuild for mbedtls-3.6.0
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 12c9f937cfc59f..f6abcd291a1355 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.3
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
# Build currently fails with embree-4.X
From fc024d0589ae396baa33c7dd9824edca2c71d45e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 15/21] imhex: rebuild for mbedtls-3.6.0
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 9e8cd7184a1520..b10c948af3d79f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=1
+revision=2
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 278b53ae61ea6c100c15437e5e7c2592f49fd0cb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 16/21] librist: rebuild for mbedtls-3.6.0
---
srcpkgs/librist/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/librist/template b/srcpkgs/librist/template
index f075679388de88..e547fead43f340 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)"
@@ -11,6 +11,10 @@ homepage="https://code.videolan.org/rist/librist"
distfiles="https://code.videolan.org/rist/librist/-/archive/v${version}/librist-v${version}.tar.gz"
checksum=7e2507fdef7b57c87b461d0f2515771b70699a02c8675b51785a73400b3c53a1
+if [ "$XBPS_TARGET_MACHINE" = x86_64-musl ]; then
+ make_check=extended # tests are flaky
+fi
+
post_install() {
vlicense COPYING
}
From ca2f2f7faf7362c7408ccb76015a02f135f86fa7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 17/21] mediastreamer: rebuild for mbedtls-3.6.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 22aa27ec874292..e4bb509b63f3fe 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.3.75
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0 -DBUILD_SHARED_LIBS=TRUE"
hostmakedepends="python3"
From 155efabea87b6c756a04b206c916ceaa944f8e24 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 18/21] obs: rebuild for mbedtls-3.6.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 4860878805e0cc..d0793fbd784882 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.1
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From 3e9bea269eb73e72bf652f3fd48a99ebde051890 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 19/21] openrgb: rebuild for mbedtls-3.6.0
---
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 86edc7742a00dbfe6c2ce32a66fca314d7d1e2c7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 20/21] openvpn: rebuild for mbedtls-3.6.0
---
srcpkgs/openvpn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 0ea6c45a6ed439..08c9f38587c820 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,7 +1,7 @@
# Template file for 'openvpn'
pkgname=openvpn
version=2.6.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
From bb8455bdcb7cbdc3e82e4891c84a92b32f7d4b0a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 21/21] retroarch: rebuild for mbedtls-3.6.0
---
srcpkgs/retroarch/patches/mbedtls3.patch | 76 ++++++++++++++++++++++++
srcpkgs/retroarch/template | 4 +-
2 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/mbedtls3.patch
diff --git a/srcpkgs/retroarch/patches/mbedtls3.patch b/srcpkgs/retroarch/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..17d4b75fed988f
--- /dev/null
+++ b/srcpkgs/retroarch/patches/mbedtls3.patch
@@ -0,0 +1,76 @@
+From 4683e83d9a51c0229fff23400a6a19542aa523b7 Mon Sep 17 00:00:00 2001
+From: Keith Bowes <keithbowes@users.noreply.github.com>
+Date: Thu, 18 Jul 2024 09:25:29 -0400
+Subject: [PATCH] Add support for mbedtls v3 (#16763)
+
+v2 is not going to receive security fixes after 2024
+
+Fixes #16672
+---
+ Makefile.common | 3 ++-
+ libretro-common/net/net_socket_ssl_mbed.c | 5 +++++
+ qb/config.libs.sh | 19 +++++++++----------
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index a550c791462..ee4fa1c4ccc 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -753,7 +753,8 @@ else ifeq ($(HAVE_BUILTINMBEDTLS), 1)
+ OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
+ else ifeq ($(HAVE_SSL), 1)
+ DEFINES += -DHAVE_SSL
+- LIBS += $(SYSTEMMBEDTLS_LIBS)
++ LIBS += $(SYSTEMMBEDTLS_LIBS) $(SYSTEMMBEDX509_LIBS) $(SYSTEMMBEDCRYPTO_LIBS)
++ DEF_FLAGS += $(SYSTEMMBEDTLS_CFLAGS) $(SYSTEMMBEDX509_CFLAGS) $(SYSTEMMBEDCRYPTO_CFLAGS)
+ endif
+
+ # Miscellaneous
+diff --git a/libretro-common/net/net_socket_ssl_mbed.c b/libretro-common/net/net_socket_ssl_mbed.c
+index a0a524f3559..69c2239002e 100644
+--- a/libretro-common/net/net_socket_ssl_mbed.c
++++ b/libretro-common/net/net_socket_ssl_mbed.c
+@@ -35,8 +35,13 @@
+ #include "../../deps/mbedtls/mbedtls/ctr_drbg.h"
+ #include "../../deps/mbedtls/mbedtls/entropy.h"
+ #else
++#include <mbedtls/version.h>
++#if MBEDTLS_VERSION_MAJOR < 3
+ #include <mbedtls/config.h>
+ #include <mbedtls/certs.h>
++#else
++#include <mbedtls/build_info.h>
++#endif
+ #include <mbedtls/debug.h>
+ #include <mbedtls/platform.h>
+ #include <mbedtls/net_sockets.h>
+diff --git a/qb/config.libs.sh b/qb/config.libs.sh
+index 1c845375186..06ca062f0cc 100644
+--- a/qb/config.libs.sh
++++ b/qb/config.libs.sh
+@@ -316,16 +316,15 @@ check_enabled SSL BUILTINMBEDTLS 'builtin mbedtls' 'ssl is' false
+ check_enabled SSL BUILTINBEARSSL 'builtin bearssl' 'ssl is' false
+
+ if [ "$HAVE_SYSTEMMBEDTLS" = "auto" ]; then SYSTEMMBEDTLS_IS_AUTO=yes; else SYSTEMMBEDTLS_IS_AUTO=no; fi
+-check_lib '' SYSTEMMBEDTLS '-lmbedtls -lmbedx509 -lmbedcrypto'
+-check_header '' SYSTEMMBEDTLS \
+- mbedtls/config.h \
+- mbedtls/certs.h \
+- mbedtls/debug.h \
+- mbedtls/platform.h \
+- mbedtls/net_sockets.h \
+- mbedtls/ssl.h \
+- mbedtls/ctr_drbg.h \
+- mbedtls/entropy.h
++check_val '' SYSTEMMBEDTLS '-lmbedtls' 'mbedtls' mbedtls 2.5.1 '' true
++check_val '' SYSTEMMBEDX509 '-lmbedx509' 'mbedtls' mbedx509 2.5.1 '' true
++check_val '' SYSTEMMBEDCRYPTO '-lmbedcrypto' 'mbedtls' mbedcrypto 2.5.1 '' true
++if [ "$HAVE_SYSTEMMBEDTLS" = 'yes' ] && [ -z "$SYSTEMMBEDTLS_VERSION" ]; then
++ # Ancient versions (such as the one included in the Ubuntu version used for
++ # build checks) don't have this header
++ check_header '' SYSTEMMBEDTLS mbedtls/net_sockets.h
++fi
++if [ "$HAVE_SYSTEMMBEDX509" = 'no' ] || [ "$HAVE_SYSTEMMBEDCRYPTO" = 'no' ]; then HAVE_SYSTEMMBEDTLS=no; fi
+ if [ "$SYSTEMMBEDTLS_IS_AUTO" = "yes" ] && [ "$HAVE_SYSTEMMBEDTLS" = "yes" ]; then HAVE_SYSTEMMBEDTLS=auto; fi
+
+ SSL_BACKEND_CHOSEN=no
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 072d719ce28059..7292681e4e32fd 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,11 +1,11 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.19.1
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
- --disable-builtinmbedtls --disable-builtinzlib
+ --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib
$(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
$(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
$(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
2024-08-12 18:45 [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8 classabbyamp
` (4 preceding siblings ...)
2024-08-20 3:21 ` classabbyamp
@ 2024-09-07 11:36 ` classabbyamp
2024-09-09 21:27 ` classabbyamp
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2024-09-07 11:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages mbedtls
https://github.com/void-linux/void-packages/pull/51806
mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/51806.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mbedtls-51806.patch --]
[-- Type: text/x-diff, Size: 28926 bytes --]
From aabe179c428fb40485423fdd63cd6bc9d8f26fa2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 13:00:36 -0400
Subject: [PATCH 01/21] mbedtls: update to 3.6.0.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 20 ++++++++++++++++----
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 391ecd3eefd0e5..90bbb113a286d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2294,9 +2294,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.21 mbedtls-3.6.0_1
+libmbedcrypto.so.16 mbedtls-3.6.0_1
+libmbedx509.so.7 mbedtls-3.6.0_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..a9fd561fd78b18 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,8 @@
# Template file for 'mbedtls'
pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=3.6.0
revision=1
+_framework_ver=750634d3a51eb9d61b59fd5d801546927c946588
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
hostmakedepends="python3 perl"
@@ -11,8 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
+checksum="32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff
+ 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f"
+skip_extraction="framework-${_framework_ver}.tar.gz"
+
+post_extract() {
+ vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
+}
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
@@ -24,6 +31,7 @@ mbedtls-utils_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/bin
+ rm "${PKGDESTDIR}"/usr/bin/hello
rm "${PKGDESTDIR}"/usr/bin/query_compile_time_config
}
}
@@ -31,9 +39,13 @@ mbedtls-utils_package() {
mbedtls-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls2-devel>=0"
+ replaces="mbedtls2-devel>=0"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From 944490a277722c4f55664f4631b1496a264408f7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:42:21 -0400
Subject: [PATCH 02/21] New package: mbedtls2-2.28.8
2.28 LTS branch for packages that don't support mbedtls 3 yet
---
common/shlibs | 3 +++
srcpkgs/mbedtls2-devel | 1 +
srcpkgs/mbedtls2/template | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/mbedtls2-devel
create mode 100644 srcpkgs/mbedtls2/template
diff --git a/common/shlibs b/common/shlibs
index 90bbb113a286d9..17199195bd815f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2297,6 +2297,9 @@ libmpv.so.2 mpv-0.35.0_1
libmbedtls.so.21 mbedtls-3.6.0_1
libmbedcrypto.so.16 mbedtls-3.6.0_1
libmbedx509.so.7 mbedtls-3.6.0_1
+libmbedtls.so.14 mbedtls2-2.28.8_1
+libmbedcrypto.so.7 mbedtls2-2.28.8_1
+libmbedx509.so.1 mbedtls2-2.28.8_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/mbedtls2-devel b/srcpkgs/mbedtls2-devel
new file mode 120000
index 00000000000000..0800d76a46405f
--- /dev/null
+++ b/srcpkgs/mbedtls2-devel
@@ -0,0 +1 @@
+mbedtls2
\ No newline at end of file
diff --git a/srcpkgs/mbedtls2/template b/srcpkgs/mbedtls2/template
new file mode 100644
index 00000000000000..2c2ff4f5fe0aa2
--- /dev/null
+++ b/srcpkgs/mbedtls2/template
@@ -0,0 +1,36 @@
+# Template file for 'mbedtls2'
+pkgname=mbedtls2
+version=2.28.8
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
+hostmakedepends="python3 perl"
+short_desc="Portable cryptographic TLS library (version 2)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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="4fef7de0d8d542510d726d643350acb3cdb9dc76ad45611b59c9aa08372b4213"
+
+pre_configure() {
+ ./scripts/config.pl set MBEDTLS_THREADING_C
+ ./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
+}
+
+post_install() {
+ rm -r "$DESTDIR"/usr/bin
+}
+
+mbedtls2-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls-devel>=0"
+ replaces="mbedtls-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From 25d3eca66cadf9fe39180613549085e8a985b72e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:24:55 -0400
Subject: [PATCH 03/21] hiawatha: update to 11.6, fix distfiles site
---
srcpkgs/hiawatha/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index ca3c57ef56587d..4ad8118298020b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,7 +1,7 @@
# Template file for 'hiawatha'
pkgname=hiawatha
-version=10.12
-revision=5
+version=11.6
+revision=1
build_style=cmake
configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
-DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha
@@ -11,9 +11,9 @@ makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
short_desc="Advanced and secure webserver for Unix"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://hiawatha-webserver.org"
-distfiles="https://hiawatha-webserver.org/files/${pkgname}-${version}.tar.gz"
-checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
+homepage="https://hiawatha.leisink.net"
+distfiles="https://hiawatha.leisink.net/files/hiawatha-${version}.tar.gz"
+checksum=b3c5eb7be007509b7e1f3d88cc03a99904d3b6e5e05d980f9d5bdaa424864dd6
conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
make_dirs="/var/log/hiawatha 0755 root root"
@@ -21,7 +21,7 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-XBPS_DISTFILES_MIRROR+=" https://hiawatha-webserver.org/files/hiawatha-${version%%.*}/"
+XBPS_DISTFILES_MIRROR+=" https://hiawatha.leisink.net/files/hiawatha-${version%%.*}/"
post_install() {
vsv hiawatha
From b555bd044fc2e7569dba63c44cdce380a349a0f2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:33 -0400
Subject: [PATCH 04/21] dolphin-emu: build with mbedtls2
---
srcpkgs/dolphin-emu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index c4a6ad40162834..7992e3ab44b0e1 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=4
+revision=5
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
@@ -26,7 +26,7 @@ makedepends="
zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg6-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
- mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
+ mbedtls2-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Henry Naguski <henry@nilsu.org>"
From 9dc51def102b88124ab370465da04abcc7a1c1de Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 05/21] rvault: build with mbedtls2
---
srcpkgs/rvault/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..ae4430ec7362c6 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,14 +1,14 @@
# Template file for 'rvault'
pkgname=rvault
version=0.4
-revision=4
+revision=5
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
make_build_args="USE_SQLITE=1 USE_MBEDTLS=1 USE_OPENSSL=0 USE_SODIUM=0"
make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
hostmakedepends="pkgconf"
-makedepends="libscrypt-devel mbedtls-devel fuse-devel libcurl-devel
+makedepends="libscrypt-devel mbedtls2-devel fuse-devel libcurl-devel
libedit-devel sqlite-devel"
short_desc="Secure and authenticated store for secrets and small documents"
maintainer="Orphaned <orphan@voidlinux.org>"
From ee47a98e73633fe82b58b84c7b65d5bfeda615fb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 06/21] shadowsocks-libev: build with mbedtls2
---
srcpkgs/shadowsocks-libev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template
index 49b4737e399fd9..518c2ddb789f7f 100644
--- a/srcpkgs/shadowsocks-libev/template
+++ b/srcpkgs/shadowsocks-libev/template
@@ -1,11 +1,11 @@
# Template file for 'shadowsocks-libev'
pkgname=shadowsocks-libev
version=3.3.4
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config asciidoc xmlto"
-makedepends="pcre-devel mbedtls-devel libsodium-devel c-ares-devel libev-devel"
+makedepends="pcre-devel mbedtls2-devel libsodium-devel c-ares-devel libev-devel"
short_desc="Lightweight secured socks5 proxy for embedded devices and low end boxes"
maintainer="whoami <whoami@systemli.org>"
license="GPL-3.0-or-later"
From 6c2dfeb43f08de0e14ae7435091ba94b3665a141 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 07/21] tpm2-tss: build with mbedtls2
---
srcpkgs/tpm2-tss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index 0b9b4b28e69339..1784e084db1424 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="libltdl-devel mbedtls-devel"
+makedepends="libltdl-devel mbedtls2-devel"
short_desc="OSS implementation of the TCG TPM2 Software Stack"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 04c39e4a0a51ec5b8d09b1debffc6bdb50d25614 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:36 -0400
Subject: [PATCH 08/21] monkey: build with mbedtls2
---
srcpkgs/monkey/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index c673d65d5ca9ca..08f57ec9451176 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,7 +1,7 @@
# Template file for 'monkey'
pkgname=monkey
version=1.6.9
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sbindir=/usr/bin
--libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname
@@ -9,13 +9,13 @@ configure_args="--prefix=/usr --sbindir=/usr/bin
--webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
hostmakedepends="cmake"
-makedepends="mbedtls-devel"
+makedepends="mbedtls2-devel"
short_desc="Cross-arch embeddable lightweight HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
-homepage="http://monkey-project.com"
-distfiles="${homepage}/releases/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb
+homepage="https://github.com/monkey/monkey"
+distfiles="https://github.com/monkey/monkey/archive/refs/tags/v${version}.tar.gz"
+checksum=8b795f605bfa544d3a57afd580bf6970aac72fb6b7aba338bd3012768b30e587
conf_files="
/etc/monkey/plugins/*/*.conf
From 760cd1d0f76ea0c6108c54fefe8acf414ded4aab Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:56 -0400
Subject: [PATCH 09/21] bcg729: rebuild for mbedtls-3.6.0
---
srcpkgs/bcg729/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcg729/template b/srcpkgs/bcg729/template
index e472a4c48451b4..fbc120cd82b2ca 100644
--- a/srcpkgs/bcg729/template
+++ b/srcpkgs/bcg729/template
@@ -1,7 +1,7 @@
# Template file for 'bcg729'
pkgname=bcg729
version=1.1.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_STATIC=OFF"
makedepends="bcunit-devel mbedtls-devel"
From be2641d3236d0b2c7228bf682ce369daf6c64238 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 10/21] bctoolbox: rebuild for mbedtls-3.6.0
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 2cc4b059daaa87..3a8715c70e1909 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.3.77
-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 4024e9e9516ba00e0d03a235dfd4cfb9a0d67769 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 11/21] belle-sip: rebuild for mbedtls-3.6.0
---
srcpkgs/belle-sip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index 871afdf902186a..d2df23c70f4384 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,7 +1,7 @@
# Template file for 'belle-sip'
pkgname=belle-sip
version=5.3.77
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=OFF -DENABLE_UNIT_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON
-DCMAKE_MODULE_PATH=/usr/lib/cmake -DBUILD_SHARED_LIBS=TRUE"
From c30e3b40804c88f4769a40cdf5d03fe6b4ce50b7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 12/21] bzrtp: rebuild for mbedtls-3.6.0
---
srcpkgs/bzrtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index 5b039075a618be..c73190861c2fc9 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,7 +1,7 @@
# Template file for 'bzrtp'
pkgname=bzrtp
version=5.3.77
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=FALSE -DBUILD_SHARED_LIBS=TRUE"
makedepends="bctoolbox-devel mbedtls-devel libxml2-devel bctoolbox-devel sqlite-devel"
From 7e73b892b4ed8889e603448f0ff95f0d9f476f50 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:32 -0400
Subject: [PATCH 13/21] dislocker: rebuild for mbedtls-3.6.0
---
srcpkgs/dislocker/patches/cross.patch | 12 ++++++++++
srcpkgs/dislocker/patches/mbedtls3.patch | 28 ++++++++++++++++++++++++
srcpkgs/dislocker/template | 2 +-
3 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dislocker/patches/cross.patch
create mode 100644 srcpkgs/dislocker/patches/mbedtls3.patch
diff --git a/srcpkgs/dislocker/patches/cross.patch b/srcpkgs/dislocker/patches/cross.patch
new file mode 100644
index 00000000000000..d2468dafd96860
--- /dev/null
+++ b/srcpkgs/dislocker/patches/cross.patch
@@ -0,0 +1,12 @@
+--- a/cmake/FindPolarSSL.cmake
++++ b/cmake/FindPolarSSL.cmake
+@@ -67,7 +67,7 @@
+ else()
+ execute_process(
+- COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/version.h
++ COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/build_info.h
+- COMMAND sed -e "s@\s\+@ @g"
++ COMMAND sed -e "s@\\s\\+@ @g"
+ COMMAND cut -d\ -f3
+ COMMAND sed -e "s@\"@@g"
+ OUTPUT_VARIABLE POLARSSL_VERSION_STRING
diff --git a/srcpkgs/dislocker/patches/mbedtls3.patch b/srcpkgs/dislocker/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..2f31a168585d6f
--- /dev/null
+++ b/srcpkgs/dislocker/patches/mbedtls3.patch
@@ -0,0 +1,28 @@
+From 2cfbba2c8cc07e529622ba134d0a6982815d2b30 Mon Sep 17 00:00:00 2001
+From: "Julio C. Rocha" <dev@rocha.red>
+Date: Wed, 13 Sep 2023 19:07:27 -0700
+Subject: [PATCH] Support mbedtls 3
+
+---
+ include/dislocker/ssl_bindings.h.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/include/dislocker/ssl_bindings.h.in b/include/dislocker/ssl_bindings.h.in
+index c1990b2..34e05df 100644
+--- a/include/dislocker/ssl_bindings.h.in
++++ b/include/dislocker/ssl_bindings.h.in
+@@ -26,8 +26,13 @@
+ /*
+ * Here stand the bindings for polarssl SHA256/SHA2/SHA-2 function for dislocker
+ */
+-#include "@POLARSSL_INC_FOLDER@/config.h"
+ #include "@POLARSSL_INC_FOLDER@/version.h"
++#if MBEDTLS_VERSION_MAJOR >= 3
++#include "@POLARSSL_INC_FOLDER@/mbedtls_config.h"
++#include "@POLARSSL_INC_FOLDER@/compat-2.x.h"
++#else
++#include "@POLARSSL_INC_FOLDER@/config.h"
++#endif
+ #include "@POLARSSL_INC_FOLDER@/aes.h"
+
+ // Function's name changed
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 be559cb94aa47c4c71ad9049871662566e095b08 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 14/21] godot: rebuild for mbedtls-3.6.0
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 2113965d834787..870a8b78475d86 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.3
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
make_build_args="platform=linuxbsd target=editor progress=no production=yes
From 5cb51865d2364e84c160a5aa698bd64d060a5a55 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 15/21] imhex: rebuild for mbedtls-3.6.0
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 9e8cd7184a1520..b10c948af3d79f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=1
+revision=2
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 04d95aee77105a9fd5d7cddca4c6c6597f14ae49 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 16/21] librist: rebuild for mbedtls-3.6.0
---
srcpkgs/librist/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/librist/template b/srcpkgs/librist/template
index f075679388de88..e547fead43f340 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)"
@@ -11,6 +11,10 @@ homepage="https://code.videolan.org/rist/librist"
distfiles="https://code.videolan.org/rist/librist/-/archive/v${version}/librist-v${version}.tar.gz"
checksum=7e2507fdef7b57c87b461d0f2515771b70699a02c8675b51785a73400b3c53a1
+if [ "$XBPS_TARGET_MACHINE" = x86_64-musl ]; then
+ make_check=extended # tests are flaky
+fi
+
post_install() {
vlicense COPYING
}
From ad511f81efb64ec8c649f41754bbf1d4839275bf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 17/21] mediastreamer: rebuild for mbedtls-3.6.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 8b1ab8ee04df63..bbabd8a148f2a9 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.3.78
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0 -DBUILD_SHARED_LIBS=TRUE"
hostmakedepends="python3"
From 8ab0e52bce19644fafa40b45391520df5e721c73 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 18/21] obs: rebuild for mbedtls-3.6.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 4860878805e0cc..d0793fbd784882 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.1
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From eb4ae2d8ef6f95573510c998a91ed2e1425907ee Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 19/21] openrgb: rebuild for mbedtls-3.6.0
---
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 4faaa4743f33ce9b62673572fb5c68a343f7072d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 20/21] openvpn: rebuild for mbedtls-3.6.0
---
srcpkgs/openvpn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 0ea6c45a6ed439..08c9f38587c820 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,7 +1,7 @@
# Template file for 'openvpn'
pkgname=openvpn
version=2.6.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
From e1e9e9d5ebc10e438bd47ffa4b1385c88e9c6f4f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 21/21] retroarch: rebuild for mbedtls-3.6.0
---
srcpkgs/retroarch/patches/mbedtls3.patch | 76 ++++++++++++++++++++++++
srcpkgs/retroarch/template | 4 +-
2 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/mbedtls3.patch
diff --git a/srcpkgs/retroarch/patches/mbedtls3.patch b/srcpkgs/retroarch/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..17d4b75fed988f
--- /dev/null
+++ b/srcpkgs/retroarch/patches/mbedtls3.patch
@@ -0,0 +1,76 @@
+From 4683e83d9a51c0229fff23400a6a19542aa523b7 Mon Sep 17 00:00:00 2001
+From: Keith Bowes <keithbowes@users.noreply.github.com>
+Date: Thu, 18 Jul 2024 09:25:29 -0400
+Subject: [PATCH] Add support for mbedtls v3 (#16763)
+
+v2 is not going to receive security fixes after 2024
+
+Fixes #16672
+---
+ Makefile.common | 3 ++-
+ libretro-common/net/net_socket_ssl_mbed.c | 5 +++++
+ qb/config.libs.sh | 19 +++++++++----------
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index a550c791462..ee4fa1c4ccc 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -753,7 +753,8 @@ else ifeq ($(HAVE_BUILTINMBEDTLS), 1)
+ OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
+ else ifeq ($(HAVE_SSL), 1)
+ DEFINES += -DHAVE_SSL
+- LIBS += $(SYSTEMMBEDTLS_LIBS)
++ LIBS += $(SYSTEMMBEDTLS_LIBS) $(SYSTEMMBEDX509_LIBS) $(SYSTEMMBEDCRYPTO_LIBS)
++ DEF_FLAGS += $(SYSTEMMBEDTLS_CFLAGS) $(SYSTEMMBEDX509_CFLAGS) $(SYSTEMMBEDCRYPTO_CFLAGS)
+ endif
+
+ # Miscellaneous
+diff --git a/libretro-common/net/net_socket_ssl_mbed.c b/libretro-common/net/net_socket_ssl_mbed.c
+index a0a524f3559..69c2239002e 100644
+--- a/libretro-common/net/net_socket_ssl_mbed.c
++++ b/libretro-common/net/net_socket_ssl_mbed.c
+@@ -35,8 +35,13 @@
+ #include "../../deps/mbedtls/mbedtls/ctr_drbg.h"
+ #include "../../deps/mbedtls/mbedtls/entropy.h"
+ #else
++#include <mbedtls/version.h>
++#if MBEDTLS_VERSION_MAJOR < 3
+ #include <mbedtls/config.h>
+ #include <mbedtls/certs.h>
++#else
++#include <mbedtls/build_info.h>
++#endif
+ #include <mbedtls/debug.h>
+ #include <mbedtls/platform.h>
+ #include <mbedtls/net_sockets.h>
+diff --git a/qb/config.libs.sh b/qb/config.libs.sh
+index 1c845375186..06ca062f0cc 100644
+--- a/qb/config.libs.sh
++++ b/qb/config.libs.sh
+@@ -316,16 +316,15 @@ check_enabled SSL BUILTINMBEDTLS 'builtin mbedtls' 'ssl is' false
+ check_enabled SSL BUILTINBEARSSL 'builtin bearssl' 'ssl is' false
+
+ if [ "$HAVE_SYSTEMMBEDTLS" = "auto" ]; then SYSTEMMBEDTLS_IS_AUTO=yes; else SYSTEMMBEDTLS_IS_AUTO=no; fi
+-check_lib '' SYSTEMMBEDTLS '-lmbedtls -lmbedx509 -lmbedcrypto'
+-check_header '' SYSTEMMBEDTLS \
+- mbedtls/config.h \
+- mbedtls/certs.h \
+- mbedtls/debug.h \
+- mbedtls/platform.h \
+- mbedtls/net_sockets.h \
+- mbedtls/ssl.h \
+- mbedtls/ctr_drbg.h \
+- mbedtls/entropy.h
++check_val '' SYSTEMMBEDTLS '-lmbedtls' 'mbedtls' mbedtls 2.5.1 '' true
++check_val '' SYSTEMMBEDX509 '-lmbedx509' 'mbedtls' mbedx509 2.5.1 '' true
++check_val '' SYSTEMMBEDCRYPTO '-lmbedcrypto' 'mbedtls' mbedcrypto 2.5.1 '' true
++if [ "$HAVE_SYSTEMMBEDTLS" = 'yes' ] && [ -z "$SYSTEMMBEDTLS_VERSION" ]; then
++ # Ancient versions (such as the one included in the Ubuntu version used for
++ # build checks) don't have this header
++ check_header '' SYSTEMMBEDTLS mbedtls/net_sockets.h
++fi
++if [ "$HAVE_SYSTEMMBEDX509" = 'no' ] || [ "$HAVE_SYSTEMMBEDCRYPTO" = 'no' ]; then HAVE_SYSTEMMBEDTLS=no; fi
+ if [ "$SYSTEMMBEDTLS_IS_AUTO" = "yes" ] && [ "$HAVE_SYSTEMMBEDTLS" = "yes" ]; then HAVE_SYSTEMMBEDTLS=auto; fi
+
+ SSL_BACKEND_CHOSEN=no
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 072d719ce28059..7292681e4e32fd 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,11 +1,11 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.19.1
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
- --disable-builtinmbedtls --disable-builtinzlib
+ --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib
$(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
$(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
$(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
2024-08-12 18:45 [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8 classabbyamp
` (5 preceding siblings ...)
2024-09-07 11:36 ` classabbyamp
@ 2024-09-09 21:27 ` classabbyamp
2024-09-09 22:56 ` classabbyamp
2024-09-10 1:09 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2024-09-09 21:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages mbedtls
https://github.com/void-linux/void-packages/pull/51806
mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/51806.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mbedtls-51806.patch --]
[-- Type: text/x-diff, Size: 28921 bytes --]
From 912fa083fa616b50745500bb17ff0683aaeac9e0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 13:00:36 -0400
Subject: [PATCH 01/21] mbedtls: update to 3.6.0.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 20 ++++++++++++++++----
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 916b7abbd481f7..a64705c6705d73 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2294,9 +2294,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.21 mbedtls-3.6.0_1
+libmbedcrypto.so.16 mbedtls-3.6.0_1
+libmbedx509.so.7 mbedtls-3.6.0_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..a9fd561fd78b18 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,8 @@
# Template file for 'mbedtls'
pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=3.6.0
revision=1
+_framework_ver=750634d3a51eb9d61b59fd5d801546927c946588
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
hostmakedepends="python3 perl"
@@ -11,8 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
+checksum="32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff
+ 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f"
+skip_extraction="framework-${_framework_ver}.tar.gz"
+
+post_extract() {
+ vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
+}
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
@@ -24,6 +31,7 @@ mbedtls-utils_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/bin
+ rm "${PKGDESTDIR}"/usr/bin/hello
rm "${PKGDESTDIR}"/usr/bin/query_compile_time_config
}
}
@@ -31,9 +39,13 @@ mbedtls-utils_package() {
mbedtls-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls2-devel>=0"
+ replaces="mbedtls2-devel>=0"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From c0c06b5a2c84f7d0c3d042ef0b199569c4bac272 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:42:21 -0400
Subject: [PATCH 02/21] New package: mbedtls2-2.28.8
2.28 LTS branch for packages that don't support mbedtls 3 yet
---
common/shlibs | 3 +++
srcpkgs/mbedtls2-devel | 1 +
srcpkgs/mbedtls2/template | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/mbedtls2-devel
create mode 100644 srcpkgs/mbedtls2/template
diff --git a/common/shlibs b/common/shlibs
index a64705c6705d73..3b14b7a9668279 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2297,6 +2297,9 @@ libmpv.so.2 mpv-0.35.0_1
libmbedtls.so.21 mbedtls-3.6.0_1
libmbedcrypto.so.16 mbedtls-3.6.0_1
libmbedx509.so.7 mbedtls-3.6.0_1
+libmbedtls.so.14 mbedtls2-2.28.8_1
+libmbedcrypto.so.7 mbedtls2-2.28.8_1
+libmbedx509.so.1 mbedtls2-2.28.8_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/mbedtls2-devel b/srcpkgs/mbedtls2-devel
new file mode 120000
index 00000000000000..0800d76a46405f
--- /dev/null
+++ b/srcpkgs/mbedtls2-devel
@@ -0,0 +1 @@
+mbedtls2
\ No newline at end of file
diff --git a/srcpkgs/mbedtls2/template b/srcpkgs/mbedtls2/template
new file mode 100644
index 00000000000000..2c2ff4f5fe0aa2
--- /dev/null
+++ b/srcpkgs/mbedtls2/template
@@ -0,0 +1,36 @@
+# Template file for 'mbedtls2'
+pkgname=mbedtls2
+version=2.28.8
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
+hostmakedepends="python3 perl"
+short_desc="Portable cryptographic TLS library (version 2)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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="4fef7de0d8d542510d726d643350acb3cdb9dc76ad45611b59c9aa08372b4213"
+
+pre_configure() {
+ ./scripts/config.pl set MBEDTLS_THREADING_C
+ ./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
+}
+
+post_install() {
+ rm -r "$DESTDIR"/usr/bin
+}
+
+mbedtls2-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls-devel>=0"
+ replaces="mbedtls-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From 4f84982ea433923dbcf34810c0bb10b1a7fafa00 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:24:55 -0400
Subject: [PATCH 03/21] hiawatha: update to 11.6, fix distfiles site
---
srcpkgs/hiawatha/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index ca3c57ef56587d..4ad8118298020b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,7 +1,7 @@
# Template file for 'hiawatha'
pkgname=hiawatha
-version=10.12
-revision=5
+version=11.6
+revision=1
build_style=cmake
configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
-DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha
@@ -11,9 +11,9 @@ makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
short_desc="Advanced and secure webserver for Unix"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://hiawatha-webserver.org"
-distfiles="https://hiawatha-webserver.org/files/${pkgname}-${version}.tar.gz"
-checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
+homepage="https://hiawatha.leisink.net"
+distfiles="https://hiawatha.leisink.net/files/hiawatha-${version}.tar.gz"
+checksum=b3c5eb7be007509b7e1f3d88cc03a99904d3b6e5e05d980f9d5bdaa424864dd6
conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
make_dirs="/var/log/hiawatha 0755 root root"
@@ -21,7 +21,7 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-XBPS_DISTFILES_MIRROR+=" https://hiawatha-webserver.org/files/hiawatha-${version%%.*}/"
+XBPS_DISTFILES_MIRROR+=" https://hiawatha.leisink.net/files/hiawatha-${version%%.*}/"
post_install() {
vsv hiawatha
From 845d299456f276f03d3a177e028dc8128e14e489 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:33 -0400
Subject: [PATCH 04/21] dolphin-emu: build with mbedtls2
---
srcpkgs/dolphin-emu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index c4a6ad40162834..7992e3ab44b0e1 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=4
+revision=5
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
@@ -26,7 +26,7 @@ makedepends="
zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg6-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
- mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
+ mbedtls2-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Henry Naguski <henry@nilsu.org>"
From b7890d8d2acc7750c7a1e503eeb237c798eceec6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 05/21] rvault: build with mbedtls2
---
srcpkgs/rvault/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..ae4430ec7362c6 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,14 +1,14 @@
# Template file for 'rvault'
pkgname=rvault
version=0.4
-revision=4
+revision=5
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
make_build_args="USE_SQLITE=1 USE_MBEDTLS=1 USE_OPENSSL=0 USE_SODIUM=0"
make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
hostmakedepends="pkgconf"
-makedepends="libscrypt-devel mbedtls-devel fuse-devel libcurl-devel
+makedepends="libscrypt-devel mbedtls2-devel fuse-devel libcurl-devel
libedit-devel sqlite-devel"
short_desc="Secure and authenticated store for secrets and small documents"
maintainer="Orphaned <orphan@voidlinux.org>"
From 5cd5e33751c9a47a095f2da86749c1ff29314324 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 06/21] shadowsocks-libev: build with mbedtls2
---
srcpkgs/shadowsocks-libev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template
index 49b4737e399fd9..518c2ddb789f7f 100644
--- a/srcpkgs/shadowsocks-libev/template
+++ b/srcpkgs/shadowsocks-libev/template
@@ -1,11 +1,11 @@
# Template file for 'shadowsocks-libev'
pkgname=shadowsocks-libev
version=3.3.4
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config asciidoc xmlto"
-makedepends="pcre-devel mbedtls-devel libsodium-devel c-ares-devel libev-devel"
+makedepends="pcre-devel mbedtls2-devel libsodium-devel c-ares-devel libev-devel"
short_desc="Lightweight secured socks5 proxy for embedded devices and low end boxes"
maintainer="whoami <whoami@systemli.org>"
license="GPL-3.0-or-later"
From e8b8b288e97f9892761b7a33e8d8eb86d31db5b3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 07/21] tpm2-tss: build with mbedtls2
---
srcpkgs/tpm2-tss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index 0b9b4b28e69339..1784e084db1424 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="libltdl-devel mbedtls-devel"
+makedepends="libltdl-devel mbedtls2-devel"
short_desc="OSS implementation of the TCG TPM2 Software Stack"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 3f354c4cac4caefc3b30aa238778f55ecd04d1f5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:36 -0400
Subject: [PATCH 08/21] monkey: build with mbedtls2
---
srcpkgs/monkey/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index c673d65d5ca9ca..08f57ec9451176 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,7 +1,7 @@
# Template file for 'monkey'
pkgname=monkey
version=1.6.9
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sbindir=/usr/bin
--libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname
@@ -9,13 +9,13 @@ configure_args="--prefix=/usr --sbindir=/usr/bin
--webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
hostmakedepends="cmake"
-makedepends="mbedtls-devel"
+makedepends="mbedtls2-devel"
short_desc="Cross-arch embeddable lightweight HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
-homepage="http://monkey-project.com"
-distfiles="${homepage}/releases/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb
+homepage="https://github.com/monkey/monkey"
+distfiles="https://github.com/monkey/monkey/archive/refs/tags/v${version}.tar.gz"
+checksum=8b795f605bfa544d3a57afd580bf6970aac72fb6b7aba338bd3012768b30e587
conf_files="
/etc/monkey/plugins/*/*.conf
From 34e83d53148ec2ca2abe5d92c45b841ea295c07a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:56 -0400
Subject: [PATCH 09/21] bcg729: rebuild for mbedtls-3.6.0
---
srcpkgs/bcg729/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcg729/template b/srcpkgs/bcg729/template
index e472a4c48451b4..fbc120cd82b2ca 100644
--- a/srcpkgs/bcg729/template
+++ b/srcpkgs/bcg729/template
@@ -1,7 +1,7 @@
# Template file for 'bcg729'
pkgname=bcg729
version=1.1.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_STATIC=OFF"
makedepends="bcunit-devel mbedtls-devel"
From e2305ddfc585bd9b8f04fe8153e1f4c772e92025 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 10/21] bctoolbox: rebuild for mbedtls-3.6.0
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 66bc5d7bc6c16f..b55d02d1b17350 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.3.79
-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 6e168b469ec77fe7c7038816e1af44786fbfa893 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 11/21] belle-sip: rebuild for mbedtls-3.6.0
---
srcpkgs/belle-sip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index 50e141c5f2bb3d..33a77a529612ce 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,7 +1,7 @@
# Template file for 'belle-sip'
pkgname=belle-sip
version=5.3.79
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=OFF -DENABLE_UNIT_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON
-DCMAKE_MODULE_PATH=/usr/lib/cmake -DBUILD_SHARED_LIBS=TRUE"
From b179195a276dee95ac446e2bc6ed7ef2e7c2155b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 12/21] bzrtp: rebuild for mbedtls-3.6.0
---
srcpkgs/bzrtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index ed09b3363feb16..4ec28cf1f7e47c 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,7 +1,7 @@
# Template file for 'bzrtp'
pkgname=bzrtp
version=5.3.79
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=FALSE -DBUILD_SHARED_LIBS=TRUE"
makedepends="bctoolbox-devel mbedtls-devel libxml2-devel bctoolbox-devel sqlite-devel"
From 0bfb31292d34e2dc6e5b2cbd5d3f4db51990386d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:32 -0400
Subject: [PATCH 13/21] dislocker: rebuild for mbedtls-3.6.0
---
srcpkgs/dislocker/patches/cross.patch | 12 ++++++++++
srcpkgs/dislocker/patches/mbedtls3.patch | 28 ++++++++++++++++++++++++
srcpkgs/dislocker/template | 2 +-
3 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dislocker/patches/cross.patch
create mode 100644 srcpkgs/dislocker/patches/mbedtls3.patch
diff --git a/srcpkgs/dislocker/patches/cross.patch b/srcpkgs/dislocker/patches/cross.patch
new file mode 100644
index 00000000000000..d2468dafd96860
--- /dev/null
+++ b/srcpkgs/dislocker/patches/cross.patch
@@ -0,0 +1,12 @@
+--- a/cmake/FindPolarSSL.cmake
++++ b/cmake/FindPolarSSL.cmake
+@@ -67,7 +67,7 @@
+ else()
+ execute_process(
+- COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/version.h
++ COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/build_info.h
+- COMMAND sed -e "s@\s\+@ @g"
++ COMMAND sed -e "s@\\s\\+@ @g"
+ COMMAND cut -d\ -f3
+ COMMAND sed -e "s@\"@@g"
+ OUTPUT_VARIABLE POLARSSL_VERSION_STRING
diff --git a/srcpkgs/dislocker/patches/mbedtls3.patch b/srcpkgs/dislocker/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..2f31a168585d6f
--- /dev/null
+++ b/srcpkgs/dislocker/patches/mbedtls3.patch
@@ -0,0 +1,28 @@
+From 2cfbba2c8cc07e529622ba134d0a6982815d2b30 Mon Sep 17 00:00:00 2001
+From: "Julio C. Rocha" <dev@rocha.red>
+Date: Wed, 13 Sep 2023 19:07:27 -0700
+Subject: [PATCH] Support mbedtls 3
+
+---
+ include/dislocker/ssl_bindings.h.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/include/dislocker/ssl_bindings.h.in b/include/dislocker/ssl_bindings.h.in
+index c1990b2..34e05df 100644
+--- a/include/dislocker/ssl_bindings.h.in
++++ b/include/dislocker/ssl_bindings.h.in
+@@ -26,8 +26,13 @@
+ /*
+ * Here stand the bindings for polarssl SHA256/SHA2/SHA-2 function for dislocker
+ */
+-#include "@POLARSSL_INC_FOLDER@/config.h"
+ #include "@POLARSSL_INC_FOLDER@/version.h"
++#if MBEDTLS_VERSION_MAJOR >= 3
++#include "@POLARSSL_INC_FOLDER@/mbedtls_config.h"
++#include "@POLARSSL_INC_FOLDER@/compat-2.x.h"
++#else
++#include "@POLARSSL_INC_FOLDER@/config.h"
++#endif
+ #include "@POLARSSL_INC_FOLDER@/aes.h"
+
+ // Function's name changed
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 708b21cc72d69954e665679906e341d1d69c0e62 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 14/21] godot: rebuild for mbedtls-3.6.0
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 2113965d834787..870a8b78475d86 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
# Template file for 'godot'
pkgname=godot
version=4.3
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
make_build_args="platform=linuxbsd target=editor progress=no production=yes
From 3f425fc1171d876311ff50ed89d0c1ea48f4a707 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 15/21] imhex: rebuild for mbedtls-3.6.0
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 9e8cd7184a1520..b10c948af3d79f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=1
+revision=2
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From c51a4ecd11c9038b8b02a91c9fdc38aec6273ebf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 16/21] librist: rebuild for mbedtls-3.6.0
---
srcpkgs/librist/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/librist/template b/srcpkgs/librist/template
index f075679388de88..e547fead43f340 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)"
@@ -11,6 +11,10 @@ homepage="https://code.videolan.org/rist/librist"
distfiles="https://code.videolan.org/rist/librist/-/archive/v${version}/librist-v${version}.tar.gz"
checksum=7e2507fdef7b57c87b461d0f2515771b70699a02c8675b51785a73400b3c53a1
+if [ "$XBPS_TARGET_MACHINE" = x86_64-musl ]; then
+ make_check=extended # tests are flaky
+fi
+
post_install() {
vlicense COPYING
}
From 9c2ba5b84909e74a6f5e191abbfae3f691d12c9c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 17/21] mediastreamer: rebuild for mbedtls-3.6.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 368e7822e88507..dffe773db4f2fd 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.3.79
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0 -DBUILD_SHARED_LIBS=TRUE
-DENABLE_QT_GL=TRUE"
From 1ff61b42a0e48232e494b289cc04ce1210599c0b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 18/21] obs: rebuild for mbedtls-3.6.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 4860878805e0cc..d0793fbd784882 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.1
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From 0e906fbd47011b85b825eb82f4f69476978f1ea9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 19/21] openrgb: rebuild for mbedtls-3.6.0
---
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 9cf770528d2ef05fa061cb10f526b1ec7bdac0cf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 20/21] openvpn: rebuild for mbedtls-3.6.0
---
srcpkgs/openvpn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 0ea6c45a6ed439..08c9f38587c820 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,7 +1,7 @@
# Template file for 'openvpn'
pkgname=openvpn
version=2.6.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
From 335917a2983fdc6147fbe642fb52e7b282acd442 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 21/21] retroarch: rebuild for mbedtls-3.6.0
---
srcpkgs/retroarch/patches/mbedtls3.patch | 76 ++++++++++++++++++++++++
srcpkgs/retroarch/template | 4 +-
2 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/mbedtls3.patch
diff --git a/srcpkgs/retroarch/patches/mbedtls3.patch b/srcpkgs/retroarch/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..17d4b75fed988f
--- /dev/null
+++ b/srcpkgs/retroarch/patches/mbedtls3.patch
@@ -0,0 +1,76 @@
+From 4683e83d9a51c0229fff23400a6a19542aa523b7 Mon Sep 17 00:00:00 2001
+From: Keith Bowes <keithbowes@users.noreply.github.com>
+Date: Thu, 18 Jul 2024 09:25:29 -0400
+Subject: [PATCH] Add support for mbedtls v3 (#16763)
+
+v2 is not going to receive security fixes after 2024
+
+Fixes #16672
+---
+ Makefile.common | 3 ++-
+ libretro-common/net/net_socket_ssl_mbed.c | 5 +++++
+ qb/config.libs.sh | 19 +++++++++----------
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index a550c791462..ee4fa1c4ccc 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -753,7 +753,8 @@ else ifeq ($(HAVE_BUILTINMBEDTLS), 1)
+ OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
+ else ifeq ($(HAVE_SSL), 1)
+ DEFINES += -DHAVE_SSL
+- LIBS += $(SYSTEMMBEDTLS_LIBS)
++ LIBS += $(SYSTEMMBEDTLS_LIBS) $(SYSTEMMBEDX509_LIBS) $(SYSTEMMBEDCRYPTO_LIBS)
++ DEF_FLAGS += $(SYSTEMMBEDTLS_CFLAGS) $(SYSTEMMBEDX509_CFLAGS) $(SYSTEMMBEDCRYPTO_CFLAGS)
+ endif
+
+ # Miscellaneous
+diff --git a/libretro-common/net/net_socket_ssl_mbed.c b/libretro-common/net/net_socket_ssl_mbed.c
+index a0a524f3559..69c2239002e 100644
+--- a/libretro-common/net/net_socket_ssl_mbed.c
++++ b/libretro-common/net/net_socket_ssl_mbed.c
+@@ -35,8 +35,13 @@
+ #include "../../deps/mbedtls/mbedtls/ctr_drbg.h"
+ #include "../../deps/mbedtls/mbedtls/entropy.h"
+ #else
++#include <mbedtls/version.h>
++#if MBEDTLS_VERSION_MAJOR < 3
+ #include <mbedtls/config.h>
+ #include <mbedtls/certs.h>
++#else
++#include <mbedtls/build_info.h>
++#endif
+ #include <mbedtls/debug.h>
+ #include <mbedtls/platform.h>
+ #include <mbedtls/net_sockets.h>
+diff --git a/qb/config.libs.sh b/qb/config.libs.sh
+index 1c845375186..06ca062f0cc 100644
+--- a/qb/config.libs.sh
++++ b/qb/config.libs.sh
+@@ -316,16 +316,15 @@ check_enabled SSL BUILTINMBEDTLS 'builtin mbedtls' 'ssl is' false
+ check_enabled SSL BUILTINBEARSSL 'builtin bearssl' 'ssl is' false
+
+ if [ "$HAVE_SYSTEMMBEDTLS" = "auto" ]; then SYSTEMMBEDTLS_IS_AUTO=yes; else SYSTEMMBEDTLS_IS_AUTO=no; fi
+-check_lib '' SYSTEMMBEDTLS '-lmbedtls -lmbedx509 -lmbedcrypto'
+-check_header '' SYSTEMMBEDTLS \
+- mbedtls/config.h \
+- mbedtls/certs.h \
+- mbedtls/debug.h \
+- mbedtls/platform.h \
+- mbedtls/net_sockets.h \
+- mbedtls/ssl.h \
+- mbedtls/ctr_drbg.h \
+- mbedtls/entropy.h
++check_val '' SYSTEMMBEDTLS '-lmbedtls' 'mbedtls' mbedtls 2.5.1 '' true
++check_val '' SYSTEMMBEDX509 '-lmbedx509' 'mbedtls' mbedx509 2.5.1 '' true
++check_val '' SYSTEMMBEDCRYPTO '-lmbedcrypto' 'mbedtls' mbedcrypto 2.5.1 '' true
++if [ "$HAVE_SYSTEMMBEDTLS" = 'yes' ] && [ -z "$SYSTEMMBEDTLS_VERSION" ]; then
++ # Ancient versions (such as the one included in the Ubuntu version used for
++ # build checks) don't have this header
++ check_header '' SYSTEMMBEDTLS mbedtls/net_sockets.h
++fi
++if [ "$HAVE_SYSTEMMBEDX509" = 'no' ] || [ "$HAVE_SYSTEMMBEDCRYPTO" = 'no' ]; then HAVE_SYSTEMMBEDTLS=no; fi
+ if [ "$SYSTEMMBEDTLS_IS_AUTO" = "yes" ] && [ "$HAVE_SYSTEMMBEDTLS" = "yes" ]; then HAVE_SYSTEMMBEDTLS=auto; fi
+
+ SSL_BACKEND_CHOSEN=no
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 072d719ce28059..7292681e4e32fd 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,11 +1,11 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.19.1
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
- --disable-builtinmbedtls --disable-builtinzlib
+ --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib
$(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
$(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
$(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
2024-08-12 18:45 [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8 classabbyamp
` (6 preceding siblings ...)
2024-09-09 21:27 ` classabbyamp
@ 2024-09-09 22:56 ` classabbyamp
2024-09-10 1:09 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2024-09-09 22:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages mbedtls
https://github.com/void-linux/void-packages/pull/51806
mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/51806.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mbedtls-51806.patch --]
[-- Type: text/x-diff, Size: 30251 bytes --]
From 912fa083fa616b50745500bb17ff0683aaeac9e0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 13:00:36 -0400
Subject: [PATCH 01/21] mbedtls: update to 3.6.0.
---
common/shlibs | 6 +++---
srcpkgs/mbedtls/template | 20 ++++++++++++++++----
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 916b7abbd481f7..a64705c6705d73 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2294,9 +2294,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.21 mbedtls-3.6.0_1
+libmbedcrypto.so.16 mbedtls-3.6.0_1
+libmbedx509.so.7 mbedtls-3.6.0_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..a9fd561fd78b18 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,8 @@
# Template file for 'mbedtls'
pkgname=mbedtls
-reverts="2.17.0_1"
-version=2.16.12
+version=3.6.0
revision=1
+_framework_ver=750634d3a51eb9d61b59fd5d801546927c946588
build_style=cmake
configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
hostmakedepends="python3 perl"
@@ -11,8 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
+checksum="32c500e73ee878e193e7d66bf5e4c34fb42bb968a6c9f9488aa466b16f6f3bff
+ 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f"
+skip_extraction="framework-${_framework_ver}.tar.gz"
+
+post_extract() {
+ vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
+}
pre_configure() {
./scripts/config.pl set MBEDTLS_THREADING_C
@@ -24,6 +31,7 @@ mbedtls-utils_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/bin
+ rm "${PKGDESTDIR}"/usr/bin/hello
rm "${PKGDESTDIR}"/usr/bin/query_compile_time_config
}
}
@@ -31,9 +39,13 @@ mbedtls-utils_package() {
mbedtls-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls2-devel>=0"
+ replaces="mbedtls2-devel>=0"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From c0c06b5a2c84f7d0c3d042ef0b199569c4bac272 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:42:21 -0400
Subject: [PATCH 02/21] New package: mbedtls2-2.28.8
2.28 LTS branch for packages that don't support mbedtls 3 yet
---
common/shlibs | 3 +++
srcpkgs/mbedtls2-devel | 1 +
srcpkgs/mbedtls2/template | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 120000 srcpkgs/mbedtls2-devel
create mode 100644 srcpkgs/mbedtls2/template
diff --git a/common/shlibs b/common/shlibs
index a64705c6705d73..3b14b7a9668279 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2297,6 +2297,9 @@ libmpv.so.2 mpv-0.35.0_1
libmbedtls.so.21 mbedtls-3.6.0_1
libmbedcrypto.so.16 mbedtls-3.6.0_1
libmbedx509.so.7 mbedtls-3.6.0_1
+libmbedtls.so.14 mbedtls2-2.28.8_1
+libmbedcrypto.so.7 mbedtls2-2.28.8_1
+libmbedx509.so.1 mbedtls2-2.28.8_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/mbedtls2-devel b/srcpkgs/mbedtls2-devel
new file mode 120000
index 00000000000000..0800d76a46405f
--- /dev/null
+++ b/srcpkgs/mbedtls2-devel
@@ -0,0 +1 @@
+mbedtls2
\ No newline at end of file
diff --git a/srcpkgs/mbedtls2/template b/srcpkgs/mbedtls2/template
new file mode 100644
index 00000000000000..2c2ff4f5fe0aa2
--- /dev/null
+++ b/srcpkgs/mbedtls2/template
@@ -0,0 +1,36 @@
+# Template file for 'mbedtls2'
+pkgname=mbedtls2
+version=2.28.8
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
+hostmakedepends="python3 perl"
+short_desc="Portable cryptographic TLS library (version 2)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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="4fef7de0d8d542510d726d643350acb3cdb9dc76ad45611b59c9aa08372b4213"
+
+pre_configure() {
+ ./scripts/config.pl set MBEDTLS_THREADING_C
+ ./scripts/config.pl set MBEDTLS_THREADING_PTHREAD
+}
+
+post_install() {
+ rm -r "$DESTDIR"/usr/bin
+}
+
+mbedtls2-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}-${version}_${revision}"
+ conflicts="mbedtls-devel>=0"
+ replaces="mbedtls-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
From 4f84982ea433923dbcf34810c0bb10b1a7fafa00 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:24:55 -0400
Subject: [PATCH 03/21] hiawatha: update to 11.6, fix distfiles site
---
srcpkgs/hiawatha/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index ca3c57ef56587d..4ad8118298020b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,7 +1,7 @@
# Template file for 'hiawatha'
pkgname=hiawatha
-version=10.12
-revision=5
+version=11.6
+revision=1
build_style=cmake
configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
-DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha
@@ -11,9 +11,9 @@ makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
short_desc="Advanced and secure webserver for Unix"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://hiawatha-webserver.org"
-distfiles="https://hiawatha-webserver.org/files/${pkgname}-${version}.tar.gz"
-checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
+homepage="https://hiawatha.leisink.net"
+distfiles="https://hiawatha.leisink.net/files/hiawatha-${version}.tar.gz"
+checksum=b3c5eb7be007509b7e1f3d88cc03a99904d3b6e5e05d980f9d5bdaa424864dd6
conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
make_dirs="/var/log/hiawatha 0755 root root"
@@ -21,7 +21,7 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-XBPS_DISTFILES_MIRROR+=" https://hiawatha-webserver.org/files/hiawatha-${version%%.*}/"
+XBPS_DISTFILES_MIRROR+=" https://hiawatha.leisink.net/files/hiawatha-${version%%.*}/"
post_install() {
vsv hiawatha
From 845d299456f276f03d3a177e028dc8128e14e489 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:33 -0400
Subject: [PATCH 04/21] dolphin-emu: build with mbedtls2
---
srcpkgs/dolphin-emu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index c4a6ad40162834..7992e3ab44b0e1 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=4
+revision=5
_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
@@ -26,7 +26,7 @@ makedepends="
zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg6-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
- mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
+ mbedtls2-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Henry Naguski <henry@nilsu.org>"
From b7890d8d2acc7750c7a1e503eeb237c798eceec6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 05/21] rvault: build with mbedtls2
---
srcpkgs/rvault/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rvault/template b/srcpkgs/rvault/template
index fa778501ce6b71..ae4430ec7362c6 100644
--- a/srcpkgs/rvault/template
+++ b/srcpkgs/rvault/template
@@ -1,14 +1,14 @@
# Template file for 'rvault'
pkgname=rvault
version=0.4
-revision=4
+revision=5
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
make_build_args="USE_SQLITE=1 USE_MBEDTLS=1 USE_OPENSSL=0 USE_SODIUM=0"
make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
hostmakedepends="pkgconf"
-makedepends="libscrypt-devel mbedtls-devel fuse-devel libcurl-devel
+makedepends="libscrypt-devel mbedtls2-devel fuse-devel libcurl-devel
libedit-devel sqlite-devel"
short_desc="Secure and authenticated store for secrets and small documents"
maintainer="Orphaned <orphan@voidlinux.org>"
From 5cd5e33751c9a47a095f2da86749c1ff29314324 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 06/21] shadowsocks-libev: build with mbedtls2
---
srcpkgs/shadowsocks-libev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template
index 49b4737e399fd9..518c2ddb789f7f 100644
--- a/srcpkgs/shadowsocks-libev/template
+++ b/srcpkgs/shadowsocks-libev/template
@@ -1,11 +1,11 @@
# Template file for 'shadowsocks-libev'
pkgname=shadowsocks-libev
version=3.3.4
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config asciidoc xmlto"
-makedepends="pcre-devel mbedtls-devel libsodium-devel c-ares-devel libev-devel"
+makedepends="pcre-devel mbedtls2-devel libsodium-devel c-ares-devel libev-devel"
short_desc="Lightweight secured socks5 proxy for embedded devices and low end boxes"
maintainer="whoami <whoami@systemli.org>"
license="GPL-3.0-or-later"
From e8b8b288e97f9892761b7a33e8d8eb86d31db5b3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:35 -0400
Subject: [PATCH 07/21] tpm2-tss: build with mbedtls2
---
srcpkgs/tpm2-tss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index 0b9b4b28e69339..1784e084db1424 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="libltdl-devel mbedtls-devel"
+makedepends="libltdl-devel mbedtls2-devel"
short_desc="OSS implementation of the TCG TPM2 Software Stack"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 3f354c4cac4caefc3b30aa238778f55ecd04d1f5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:36 -0400
Subject: [PATCH 08/21] monkey: build with mbedtls2
---
srcpkgs/monkey/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index c673d65d5ca9ca..08f57ec9451176 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,7 +1,7 @@
# Template file for 'monkey'
pkgname=monkey
version=1.6.9
-revision=4
+revision=5
build_style=configure
configure_args="--prefix=/usr --sbindir=/usr/bin
--libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname
@@ -9,13 +9,13 @@ configure_args="--prefix=/usr --sbindir=/usr/bin
--webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
hostmakedepends="cmake"
-makedepends="mbedtls-devel"
+makedepends="mbedtls2-devel"
short_desc="Cross-arch embeddable lightweight HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
-homepage="http://monkey-project.com"
-distfiles="${homepage}/releases/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb
+homepage="https://github.com/monkey/monkey"
+distfiles="https://github.com/monkey/monkey/archive/refs/tags/v${version}.tar.gz"
+checksum=8b795f605bfa544d3a57afd580bf6970aac72fb6b7aba338bd3012768b30e587
conf_files="
/etc/monkey/plugins/*/*.conf
From 34e83d53148ec2ca2abe5d92c45b841ea295c07a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:56 -0400
Subject: [PATCH 09/21] bcg729: rebuild for mbedtls-3.6.0
---
srcpkgs/bcg729/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcg729/template b/srcpkgs/bcg729/template
index e472a4c48451b4..fbc120cd82b2ca 100644
--- a/srcpkgs/bcg729/template
+++ b/srcpkgs/bcg729/template
@@ -1,7 +1,7 @@
# Template file for 'bcg729'
pkgname=bcg729
version=1.1.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_STATIC=OFF"
makedepends="bcunit-devel mbedtls-devel"
From e2305ddfc585bd9b8f04fe8153e1f4c772e92025 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 10/21] bctoolbox: rebuild for mbedtls-3.6.0
---
srcpkgs/bctoolbox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 66bc5d7bc6c16f..b55d02d1b17350 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,7 +1,7 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=5.3.79
-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 6e168b469ec77fe7c7038816e1af44786fbfa893 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:58 -0400
Subject: [PATCH 11/21] belle-sip: rebuild for mbedtls-3.6.0
---
srcpkgs/belle-sip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index 50e141c5f2bb3d..33a77a529612ce 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,7 +1,7 @@
# Template file for 'belle-sip'
pkgname=belle-sip
version=5.3.79
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=OFF -DENABLE_UNIT_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON
-DCMAKE_MODULE_PATH=/usr/lib/cmake -DBUILD_SHARED_LIBS=TRUE"
From b179195a276dee95ac446e2bc6ed7ef2e7c2155b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 12/21] bzrtp: rebuild for mbedtls-3.6.0
---
srcpkgs/bzrtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index ed09b3363feb16..4ec28cf1f7e47c 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,7 +1,7 @@
# Template file for 'bzrtp'
pkgname=bzrtp
version=5.3.79
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=FALSE -DBUILD_SHARED_LIBS=TRUE"
makedepends="bctoolbox-devel mbedtls-devel libxml2-devel bctoolbox-devel sqlite-devel"
From 0bfb31292d34e2dc6e5b2cbd5d3f4db51990386d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:32 -0400
Subject: [PATCH 13/21] dislocker: rebuild for mbedtls-3.6.0
---
srcpkgs/dislocker/patches/cross.patch | 12 ++++++++++
srcpkgs/dislocker/patches/mbedtls3.patch | 28 ++++++++++++++++++++++++
srcpkgs/dislocker/template | 2 +-
3 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dislocker/patches/cross.patch
create mode 100644 srcpkgs/dislocker/patches/mbedtls3.patch
diff --git a/srcpkgs/dislocker/patches/cross.patch b/srcpkgs/dislocker/patches/cross.patch
new file mode 100644
index 00000000000000..d2468dafd96860
--- /dev/null
+++ b/srcpkgs/dislocker/patches/cross.patch
@@ -0,0 +1,12 @@
+--- a/cmake/FindPolarSSL.cmake
++++ b/cmake/FindPolarSSL.cmake
+@@ -67,7 +67,7 @@
+ else()
+ execute_process(
+- COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/version.h
++ COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/build_info.h
+- COMMAND sed -e "s@\s\+@ @g"
++ COMMAND sed -e "s@\\s\\+@ @g"
+ COMMAND cut -d\ -f3
+ COMMAND sed -e "s@\"@@g"
+ OUTPUT_VARIABLE POLARSSL_VERSION_STRING
diff --git a/srcpkgs/dislocker/patches/mbedtls3.patch b/srcpkgs/dislocker/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..2f31a168585d6f
--- /dev/null
+++ b/srcpkgs/dislocker/patches/mbedtls3.patch
@@ -0,0 +1,28 @@
+From 2cfbba2c8cc07e529622ba134d0a6982815d2b30 Mon Sep 17 00:00:00 2001
+From: "Julio C. Rocha" <dev@rocha.red>
+Date: Wed, 13 Sep 2023 19:07:27 -0700
+Subject: [PATCH] Support mbedtls 3
+
+---
+ include/dislocker/ssl_bindings.h.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/include/dislocker/ssl_bindings.h.in b/include/dislocker/ssl_bindings.h.in
+index c1990b2..34e05df 100644
+--- a/include/dislocker/ssl_bindings.h.in
++++ b/include/dislocker/ssl_bindings.h.in
+@@ -26,8 +26,13 @@
+ /*
+ * Here stand the bindings for polarssl SHA256/SHA2/SHA-2 function for dislocker
+ */
+-#include "@POLARSSL_INC_FOLDER@/config.h"
+ #include "@POLARSSL_INC_FOLDER@/version.h"
++#if MBEDTLS_VERSION_MAJOR >= 3
++#include "@POLARSSL_INC_FOLDER@/mbedtls_config.h"
++#include "@POLARSSL_INC_FOLDER@/compat-2.x.h"
++#else
++#include "@POLARSSL_INC_FOLDER@/config.h"
++#endif
+ #include "@POLARSSL_INC_FOLDER@/aes.h"
+
+ // Function's name changed
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 094e9a01b7b3282d7754cc395af1d68aff109a2b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:34 -0400
Subject: [PATCH 14/21] godot: rebuild for mbedtls-3.6.0
fixes d40828514a73a6db619a8e3f9f25becf1fb0a6bb (broke build for
non-x86_64* aarch64*, where embree is not available)
---
srcpkgs/godot/template | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 2113965d834787..18e37f9d48a777 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,11 +1,11 @@
# Template file for 'godot'
pkgname=godot
version=4.3
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=scons
make_build_args="platform=linuxbsd target=editor progress=no production=yes
- lto=auto builtin_brotli=false builtin_embree=false builtin_enet=false
+ lto=auto builtin_brotli=false builtin_enet=false
builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
builtin_icu4c=false builtin_libogg=false builtin_libpng=false
builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false
@@ -17,7 +17,7 @@ makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
- speech-dispatcher-devel brotli-devel icu-devel embree-devel"
+ speech-dispatcher-devel brotli-devel icu-devel"
depends="speech-dispatcher"
short_desc="Multiplatform 2D and 3D engine"
maintainer="dataCobra <datacobra@thinkbot.de>"
@@ -43,6 +43,16 @@ case "$XBPS_TARGET_MACHINE" in
ppc64*) arch="ppc64" ;;
esac
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|aarch64*)
+ make_build_args+=" builtin_embree=false"
+ makedepends+=" embree-devel"
+ ;;
+ *)
+ make_build_args+=" builtin_embree=true"
+ ;;
+esac
+
make_build_args+=" arch=$arch"
pre_build() {
From 152e73f8729bb7fc7e34832edd6b2cea66bb02b7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:44:59 -0400
Subject: [PATCH 15/21] imhex: rebuild for mbedtls-3.6.0
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 9e8cd7184a1520..b10c948af3d79f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=1
+revision=2
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 1fb499bfb7b77206c2dc1f24db9322c79d0ed83a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 16/21] librist: rebuild for mbedtls-3.6.0
---
srcpkgs/librist/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/librist/template b/srcpkgs/librist/template
index f075679388de88..e547fead43f340 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)"
@@ -11,6 +11,10 @@ homepage="https://code.videolan.org/rist/librist"
distfiles="https://code.videolan.org/rist/librist/-/archive/v${version}/librist-v${version}.tar.gz"
checksum=7e2507fdef7b57c87b461d0f2515771b70699a02c8675b51785a73400b3c53a1
+if [ "$XBPS_TARGET_MACHINE" = x86_64-musl ]; then
+ make_check=extended # tests are flaky
+fi
+
post_install() {
vlicense COPYING
}
From c9188258844a79db194d90250b5a674f7fc74435 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:00 -0400
Subject: [PATCH 17/21] mediastreamer: rebuild for mbedtls-3.6.0
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 368e7822e88507..dffe773db4f2fd 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=5.3.79
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0 -DBUILD_SHARED_LIBS=TRUE
-DENABLE_QT_GL=TRUE"
From a31134253e75f03b5b3af30b660b2862139156e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 18/21] obs: rebuild for mbedtls-3.6.0
---
srcpkgs/obs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 4860878805e0cc..d0793fbd784882 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
version=30.2.1
-revision=2
+revision=3
archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
From 9caed6ff8fd067acb04a0a471337e125d4cc2065 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:01 -0400
Subject: [PATCH 19/21] openrgb: rebuild for mbedtls-3.6.0
---
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 fd73e455942297ea66bda27adb5b1a3128dbf147 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 20/21] openvpn: rebuild for mbedtls-3.6.0
---
srcpkgs/openvpn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 0ea6c45a6ed439..08c9f38587c820 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,7 +1,7 @@
# Template file for 'openvpn'
pkgname=openvpn
version=2.6.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
From 59c94ea5fb36366f86f17da62460f81e899fc687 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:45:02 -0400
Subject: [PATCH 21/21] retroarch: rebuild for mbedtls-3.6.0
---
srcpkgs/retroarch/patches/mbedtls3.patch | 76 ++++++++++++++++++++++++
srcpkgs/retroarch/template | 4 +-
2 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/mbedtls3.patch
diff --git a/srcpkgs/retroarch/patches/mbedtls3.patch b/srcpkgs/retroarch/patches/mbedtls3.patch
new file mode 100644
index 00000000000000..17d4b75fed988f
--- /dev/null
+++ b/srcpkgs/retroarch/patches/mbedtls3.patch
@@ -0,0 +1,76 @@
+From 4683e83d9a51c0229fff23400a6a19542aa523b7 Mon Sep 17 00:00:00 2001
+From: Keith Bowes <keithbowes@users.noreply.github.com>
+Date: Thu, 18 Jul 2024 09:25:29 -0400
+Subject: [PATCH] Add support for mbedtls v3 (#16763)
+
+v2 is not going to receive security fixes after 2024
+
+Fixes #16672
+---
+ Makefile.common | 3 ++-
+ libretro-common/net/net_socket_ssl_mbed.c | 5 +++++
+ qb/config.libs.sh | 19 +++++++++----------
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index a550c791462..ee4fa1c4ccc 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -753,7 +753,8 @@ else ifeq ($(HAVE_BUILTINMBEDTLS), 1)
+ OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
+ else ifeq ($(HAVE_SSL), 1)
+ DEFINES += -DHAVE_SSL
+- LIBS += $(SYSTEMMBEDTLS_LIBS)
++ LIBS += $(SYSTEMMBEDTLS_LIBS) $(SYSTEMMBEDX509_LIBS) $(SYSTEMMBEDCRYPTO_LIBS)
++ DEF_FLAGS += $(SYSTEMMBEDTLS_CFLAGS) $(SYSTEMMBEDX509_CFLAGS) $(SYSTEMMBEDCRYPTO_CFLAGS)
+ endif
+
+ # Miscellaneous
+diff --git a/libretro-common/net/net_socket_ssl_mbed.c b/libretro-common/net/net_socket_ssl_mbed.c
+index a0a524f3559..69c2239002e 100644
+--- a/libretro-common/net/net_socket_ssl_mbed.c
++++ b/libretro-common/net/net_socket_ssl_mbed.c
+@@ -35,8 +35,13 @@
+ #include "../../deps/mbedtls/mbedtls/ctr_drbg.h"
+ #include "../../deps/mbedtls/mbedtls/entropy.h"
+ #else
++#include <mbedtls/version.h>
++#if MBEDTLS_VERSION_MAJOR < 3
+ #include <mbedtls/config.h>
+ #include <mbedtls/certs.h>
++#else
++#include <mbedtls/build_info.h>
++#endif
+ #include <mbedtls/debug.h>
+ #include <mbedtls/platform.h>
+ #include <mbedtls/net_sockets.h>
+diff --git a/qb/config.libs.sh b/qb/config.libs.sh
+index 1c845375186..06ca062f0cc 100644
+--- a/qb/config.libs.sh
++++ b/qb/config.libs.sh
+@@ -316,16 +316,15 @@ check_enabled SSL BUILTINMBEDTLS 'builtin mbedtls' 'ssl is' false
+ check_enabled SSL BUILTINBEARSSL 'builtin bearssl' 'ssl is' false
+
+ if [ "$HAVE_SYSTEMMBEDTLS" = "auto" ]; then SYSTEMMBEDTLS_IS_AUTO=yes; else SYSTEMMBEDTLS_IS_AUTO=no; fi
+-check_lib '' SYSTEMMBEDTLS '-lmbedtls -lmbedx509 -lmbedcrypto'
+-check_header '' SYSTEMMBEDTLS \
+- mbedtls/config.h \
+- mbedtls/certs.h \
+- mbedtls/debug.h \
+- mbedtls/platform.h \
+- mbedtls/net_sockets.h \
+- mbedtls/ssl.h \
+- mbedtls/ctr_drbg.h \
+- mbedtls/entropy.h
++check_val '' SYSTEMMBEDTLS '-lmbedtls' 'mbedtls' mbedtls 2.5.1 '' true
++check_val '' SYSTEMMBEDX509 '-lmbedx509' 'mbedtls' mbedx509 2.5.1 '' true
++check_val '' SYSTEMMBEDCRYPTO '-lmbedcrypto' 'mbedtls' mbedcrypto 2.5.1 '' true
++if [ "$HAVE_SYSTEMMBEDTLS" = 'yes' ] && [ -z "$SYSTEMMBEDTLS_VERSION" ]; then
++ # Ancient versions (such as the one included in the Ubuntu version used for
++ # build checks) don't have this header
++ check_header '' SYSTEMMBEDTLS mbedtls/net_sockets.h
++fi
++if [ "$HAVE_SYSTEMMBEDX509" = 'no' ] || [ "$HAVE_SYSTEMMBEDCRYPTO" = 'no' ]; then HAVE_SYSTEMMBEDTLS=no; fi
+ if [ "$SYSTEMMBEDTLS_IS_AUTO" = "yes" ] && [ "$HAVE_SYSTEMMBEDTLS" = "yes" ]; then HAVE_SYSTEMMBEDTLS=auto; fi
+
+ SSL_BACKEND_CHOSEN=no
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 072d719ce28059..7292681e4e32fd 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,11 +1,11 @@
# Template file for 'retroarch'
pkgname=retroarch
version=1.19.1
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
--enable-udev --disable-builtinflac --disable-builtinglslang
- --disable-builtinmbedtls --disable-builtinzlib
+ --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib
$(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
$(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
$(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
2024-08-12 18:45 [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8 classabbyamp
` (7 preceding siblings ...)
2024-09-09 22:56 ` classabbyamp
@ 2024-09-10 1:09 ` classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2024-09-10 1:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
There's a merged pull request on the void-packages repository
mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8
https://github.com/void-linux/void-packages/pull/51806
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-09-10 1:09 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-12 18:45 [PR PATCH] mbedtls: update to 3.6.0, new package: mbedtls2-2.28.8 classabbyamp
2024-08-12 20:01 ` [PR PATCH] [Updated] " classabbyamp
2024-08-12 20:05 ` classabbyamp
2024-08-13 4:26 ` classabbyamp
2024-08-13 5:05 ` classabbyamp
2024-08-20 3:21 ` classabbyamp
2024-09-07 11:36 ` classabbyamp
2024-09-09 21:27 ` classabbyamp
2024-09-09 22:56 ` classabbyamp
2024-09-10 1:09 ` [PR PATCH] [Merged]: " classabbyamp
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).