From f710640be5869bb3716e254916ae614f79002f2f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 8 Oct 2025 17:16:57 +0200 Subject: [PATCH] package/libopenssl: bump version to 3.6.0 Release notes: https://openssl-library.org/post/2025-10-01-3.6-release-announcement/ Removed patch 0004 which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- ...l-process-to-avoid-multiple-make-dep.patch | 44 ------------------- package/libopenssl/libopenssl.hash | 4 +- package/libopenssl/libopenssl.mk | 2 +- 3 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 package/libopenssl/0004-Serialize-install-process-to-avoid-multiple-make-dep.patch diff --git a/package/libopenssl/0004-Serialize-install-process-to-avoid-multiple-make-dep.patch b/package/libopenssl/0004-Serialize-install-process-to-avoid-multiple-make-dep.patch deleted file mode 100644 index 344b8d07b7..0000000000 --- a/package/libopenssl/0004-Serialize-install-process-to-avoid-multiple-make-dep.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4562b002366535b3d387fae7fa1dbd8e315ae142 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Mon, 14 Apr 2025 12:23:15 -0400 -Subject: [PATCH] Serialize install process to avoid multiple make depend - operations - -If make install is run with a large -j value (make install -j N , where -N > 1) - -We can run into a situation in which the install fails because multiple -make depend operations are running in parallel, which will fail due to -makefile rewriting. - -Serialize the install process to guarantee that those operations don't -step on one another - -Fixes # 27074 - -Upstream: https://github.com/openssl/openssl/pull/27388 -Signed-off-by: Peter Korsgaard ---- - Configurations/unix-Makefile.tmpl | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index e85763ccf8..b671723813 100644 ---- a/Configurations/unix-Makefile.tmpl -+++ b/Configurations/unix-Makefile.tmpl -@@ -661,7 +661,11 @@ depend: Makefile - # Install helper targets ############################################# - ##@ Installation - --install: install_sw install_ssldirs {- "install_docs" if !$disabled{docs}; -} {- $disabled{fips} ? "" : "install_fips" -} ## Install software and documentation, create OpenSSL directories -+install: Makefile ## Install software and documentation, create OpenSSL directories -+ $(MAKE) install_sw -+ $(MAKE) install_ssldirs -+ {- "\$(MAKE) install_docs" if !$disabled{docs} -} -+ {- "\$(MAKE) install_fips" if !$disabled{fips} -} - - uninstall: {- "uninstall_docs" if !$disabled{docs}; -} uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} ## Uninstall software and documentation - --- -2.39.5 - diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index e78b664aa5..9322a56e76 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://github.com/openssl/openssl/releases/download/openssl-3.5.4/openssl-3.5.4.tar.gz.sha256 -sha256 967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99 openssl-3.5.4.tar.gz +# From https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz.sha256 +sha256 b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9 openssl-3.6.0.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 2f844fd44a..28dcb9dfc2 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.5.4 +LIBOPENSSL_VERSION = 3.6.0 LIBOPENSSL_SITE = https://github.com/openssl/openssl/releases/download/openssl-$(LIBOPENSSL_VERSION) LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0