From 57c95586dfceb0abb42b9d2117bded0bc7cfa866 Mon Sep 17 00:00:00 2001 From: xJayMorex Date: Sun, 4 Oct 2026 22:52:54 +0200 Subject: [PATCH 1/9] openssl: update to 4.0.3. --- common/shlibs | 4 ++-- srcpkgs/{libcrypto3 => libcrypto4} | 0 srcpkgs/{libssl3 => libssl4} | 0 srcpkgs/openssl-c_rehash | 1 - srcpkgs/openssl/template | 38 +++++++----------------------- 5 files changed, 11 insertions(+), 32 deletions(-) rename srcpkgs/{libcrypto3 => libcrypto4} (100%) rename srcpkgs/{libssl3 => libssl4} (100%) delete mode 120000 srcpkgs/openssl-c_rehash diff --git a/common/shlibs b/common/shlibs index 5e8cc3b39f7ce7..045b26590635af 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1680,8 +1680,8 @@ libid3.so id3lib-3.8.3_7 libid3-3.8.so.3 id3lib-3.8.3_7 libgirara.so.5 girara-2026.02.04_1 libjq.so.1 jq-1.6_2 -libcrypto.so.3 libcrypto3-3.5.4_1 -libssl.so.3 libssl3-3.5.4_1 +libcrypto.so.4 libcrypto4-4.0.3_1 +libssl.so.4 libssl4-4.0.3_1 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6 libportmidi.so.2 portmidi-2.0.6_1 libWildMidi.so.2 libwildmidi-0.4.3_1 diff --git a/srcpkgs/libcrypto3 b/srcpkgs/libcrypto4 similarity index 100% rename from srcpkgs/libcrypto3 rename to srcpkgs/libcrypto4 diff --git a/srcpkgs/libssl3 b/srcpkgs/libssl4 similarity index 100% rename from srcpkgs/libssl3 rename to srcpkgs/libssl4 diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash deleted file mode 120000 index fc538edfef4a65..00000000000000 --- a/srcpkgs/openssl-c_rehash +++ /dev/null @@ -1 +0,0 @@ -openssl \ No newline at end of file diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template index 8d95f55356ac7f..958aad2ef6160e 100644 --- a/srcpkgs/openssl/template +++ b/srcpkgs/openssl/template @@ -1,6 +1,6 @@ # Template file for 'openssl' pkgname=openssl -version=3.6.5 +version=4.0.3 revision=1 bootstrap=yes build_style=configure @@ -12,26 +12,20 @@ make_cmd=make make_build_args='MAKEDEPPROG="$(CC)' make_check_target=test make_install_args="MANSUFFIX=ssl" +hostmakedepends="perl" short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security" maintainer="classabbyamp " license="Apache-2.0" homepage="https://openssl-library.org" distfiles="https://github.com/openssl/openssl/releases/download/openssl-${version}/openssl-${version}.tar.gz" -checksum=a2157c2830efdec3788939b00c9b0638306d3f0bbb76dc4832ee503bb397df98 +checksum=325b5c806167c13b40b1ffeadfe0248197c00eccc4cf123ec1e28d2d2fd216d9 conf_files="/etc/ssl/openssl.cnf" replaces="libressl>=0" CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" build_options=asm - -if [ "$CHROOT_READY" ]; then - hostmakedepends="perl" - build_options_default="asm" -else - # openssl-c_rehash depends on perl, ignore on bootstrap - subpackages="libcrypto3 libssl3 openssl-devel" -fi +build_options_default="asm" case $XBPS_TARGET_MACHINE in x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";; @@ -55,38 +49,24 @@ pre_build() { make ${makejobs} depend } -post_install() { - if [ ! "$CHROOT_READY" ]; then - rm -f "${DESTDIR}/usr/bin/c_rehash" "${DESTDIR}/usr/share/man/man1/c_rehash.1ssl" - fi -} - -libcrypto3_package() { +libcrypto4_package() { + replaces="libcrypto3>=0" short_desc+=" - crypto library" pkg_install() { vmove "usr/lib/libcrypto.so.*" - vmove usr/lib/engines-3 } } -libssl3_package() { +libssl4_package() { + replaces="libssl3>=0" short_desc+=" - SSL/TLS library" pkg_install() { vmove "usr/lib/libssl.so.*" } } -openssl-c_rehash_package() { - short_desc+=" - c_rehash utility" - depends="openssl perl" - pkg_install() { - vmove usr/bin/c_rehash - vmove usr/share/man/man1/c_rehash.1ssl - } -} - openssl-devel_package() { - depends="${sourcepkg}>=${version}_${revision} libssl3>=${version}_${revision} libcrypto3>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} libssl4>=${version}_${revision} libcrypto4>=${version}_${revision}" replaces="libressl-devel>=0" short_desc+=" - development files" pkg_install() { From 0d46d1dad5e91a3093a6d2fc902889a6ff993c27 Mon Sep 17 00:00:00 2001 From: xJayMorex Date: Sun, 4 Oct 2026 22:54:16 +0200 Subject: [PATCH 2/9] openssl-c_rehash: remove package --- srcpkgs/removed-packages/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 94a29c89f5e367..d90f5c19b6cf9f 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -659,6 +659,7 @@ replaces=" openbazaar<=1.1.13_2 opencl-clhpp<=2.0.15_1 openlierox<=0.58.rc5_2 + openssl-c_rehash<=3.6.5_1 opentmpfiles<=0.3.1_1 orage<=4.12.1_7 orion<=1.6.7_2 From 7fb116ec9d409ad196f77f71a6650b954593c44f Mon Sep 17 00:00:00 2001 From: xJayMorex Date: Sun, 4 Oct 2026 22:56:14 +0200 Subject: [PATCH 3/9] libarchive: revbump for openssl-4.0.3 --- srcpkgs/libarchive/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 3768ee93143cbb..40f6a38546cfb1 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,7 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive version=3.8.9 -revision=1 +revision=2 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) From 5f726762487f368610329168443c557c30b286c3 Mon Sep 17 00:00:00 2001 From: xJayMorex Date: Sun, 4 Oct 2026 22:56:14 +0200 Subject: [PATCH 4/9] libarchive: revbump for openssl-4.0.3 --- srcpkgs/libarchive/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 40f6a38546cfb1..ffa300c1f43ed8 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,7 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive version=3.8.9 -revision=2 +revision=3 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) From 0c3dde83ff9642dd537603f74556a130bfd90bbf Mon Sep 17 00:00:00 2001 From: xJayMorex Date: Sun, 4 Oct 2026 22:56:14 +0200 Subject: [PATCH 5/9] curl: revbump for openssl-4.0.3 --- srcpkgs/curl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index fbff1281669385..ec3edb8e0affd9 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,7 +1,7 @@ # Template file for 'curl' pkgname=curl version=8.22.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 --with-random=/dev/urandom From 758be3fce71c711abd33346db9f58904b77f2381 Mon Sep 17 00:00:00 2001 From: xJayMorex Date: Sun, 4 Oct 2026 22:56:14 +0200 Subject: [PATCH 6/9] libssh2: revbump for openssl-4.0.3 --- srcpkgs/libssh2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template index 9d450256e92918..2c0ef968c5aac9 100644 --- a/srcpkgs/libssh2/template +++ b/srcpkgs/libssh2/template @@ -1,7 +1,7 @@ # Template file for 'libssh2' pkgname=libssh2 version=1.11.1 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_ZLIB_COMPRESSION=ON -DRUN_DOCKER_TESTS=OFF" makedepends="zlib-devel openssl-devel" From 57770268fc7f1b723b2ffa8ab0c4b82151ec0ea2 Mon Sep 17 00:00:00 2001 From: xJayMorex Date: Sun, 4 Oct 2026 22:56:15 +0200 Subject: [PATCH 7/9] xbps: revbump for openssl-4.0.3 --- srcpkgs/xbps/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 219d39e7da6a13..ae1ba096ee6a0b 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.60.7 -revision=1 +revision=2 bootstrap=yes build_style=configure short_desc="XBPS package system utilities" From aa7cfec12691fb6c2da20009bcfb362476c063cc Mon Sep 17 00:00:00 2001 From: xJayMorex Date: Sun, 4 Oct 2026 22:56:15 +0200 Subject: [PATCH 8/9] nghttp2: revbump for openssl-4.0.3 --- srcpkgs/nghttp2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template index 8de170829adc95..081cb15d5d490e 100644 --- a/srcpkgs/nghttp2/template +++ b/srcpkgs/nghttp2/template @@ -1,7 +1,7 @@ # Template file for 'nghttp2' pkgname=nghttp2 version=1.70.0 -revision=1 +revision=2 build_style=gnu-configure # build system errors out if python isn't available configure_args="--disable-python-bindings --enable-http3" From 805932f889a3143b997c3356078209a7f9e7b295 Mon Sep 17 00:00:00 2001 From: xJayMorex Date: Sun, 4 Oct 2026 22:56:15 +0200 Subject: [PATCH 9/9] ngtcp2: revbump for openssl-4.0.3 --- srcpkgs/ngtcp2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ngtcp2/template b/srcpkgs/ngtcp2/template index b9a5dccc3eae3a..f397254f5734a3 100644 --- a/srcpkgs/ngtcp2/template +++ b/srcpkgs/ngtcp2/template @@ -1,7 +1,7 @@ # Template file for 'ngtcp2' pkgname=ngtcp2 version=1.25.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config automake libtool" makedepends="openssl-devel"