From 52b67f8167d5c3b60d81bea94d1880483af31f1b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 6 Oct 2025 07:05:17 +0000 Subject: [PATCH 1/3] Updated dependency 'openssl' from version 3.5.3 to 3.6.0 --- deps-packaging/openssl/cfbuild-openssl.spec | 2 +- deps-packaging/openssl/distfiles | 2 +- deps-packaging/openssl/source | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec index 91fe2667e..2cce6d7ab 100644 --- a/deps-packaging/openssl/cfbuild-openssl.spec +++ b/deps-packaging/openssl/cfbuild-openssl.spec @@ -1,4 +1,4 @@ -%define openssl_version 3.5.3 +%define openssl_version 3.6.0 Summary: CFEngine Build Automation -- openssl Name: cfbuild-openssl diff --git a/deps-packaging/openssl/distfiles b/deps-packaging/openssl/distfiles index 7fa6ab9fa..b8dcfac59 100644 --- a/deps-packaging/openssl/distfiles +++ b/deps-packaging/openssl/distfiles @@ -1 +1 @@ -c9489d2abcf943cdc8329a57092331c598a402938054dc3a22218aea8a8ec3bf openssl-3.5.3.tar.gz +b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9 openssl-3.6.0.tar.gz diff --git a/deps-packaging/openssl/source b/deps-packaging/openssl/source index 4abfc3e57..686c04774 100644 --- a/deps-packaging/openssl/source +++ b/deps-packaging/openssl/source @@ -1 +1 @@ -https://github.com/openssl/openssl/releases/download/openssl-3.5.3/ +https://github.com/openssl/openssl/releases/download/openssl-3.6.0/ From 367edcd83e8dac266131d64bc4fb826cf59f6388 Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Tue, 7 Oct 2025 11:05:48 +0200 Subject: [PATCH 2/3] Fixed undefined reference to _set_printf_count_output on MinGW Ticket: ENT-13259 Signed-off-by: Lars Erik Wik --- .../openssl/_set_printf_count_output.patch | 12 ++++++++++++ deps-packaging/openssl/mingw/debian/rules | 1 + 2 files changed, 13 insertions(+) create mode 100644 deps-packaging/openssl/_set_printf_count_output.patch diff --git a/deps-packaging/openssl/_set_printf_count_output.patch b/deps-packaging/openssl/_set_printf_count_output.patch new file mode 100644 index 000000000..1943b5a76 --- /dev/null +++ b/deps-packaging/openssl/_set_printf_count_output.patch @@ -0,0 +1,12 @@ +diff -ruN openssl-3.6.0/test/bioprinttest.c openssl-3.6.0-modified/test/bioprinttest.c +--- openssl-3.6.0/test/bioprinttest.c 2025-10-01 14:11:48.000000000 +0200 ++++ openssl-3.6.0-modified/test/bioprinttest.c 2025-10-07 10:59:36.919916485 +0200 +@@ -542,7 +542,7 @@ + ptrdiff_t t; + } n = { 0 }, std_n = { 0 }; + +-#if defined(OPENSSL_SYS_WINDOWS) ++#if defined(OPENSSL_SYS_WINDOWS) && !defined(__MINGW32__) /* MinGW doesn't have _set_printf_count_output */ + /* + * MS CRT is special and throws an exception when %n is used even + * in non-*_s versions of printf routines, and there is a special function diff --git a/deps-packaging/openssl/mingw/debian/rules b/deps-packaging/openssl/mingw/debian/rules index 6c3b901fe..c6e940178 100755 --- a/deps-packaging/openssl/mingw/debian/rules +++ b/deps-packaging/openssl/mingw/debian/rules @@ -22,6 +22,7 @@ endif build: build-stamp build-stamp: dh_testdir + patch -p1 < $(CURDIR)/_set_printf_count_output.patch # Removed "no-psk" from the options, mingw builds breaks with it CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- ./Configure \ From 7d2959f4aa7386b8c8bcdf3b243a76b6f7d23140 Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Tue, 7 Oct 2025 12:33:03 +0200 Subject: [PATCH 3/3] Fixed undeclared identifier LLONG_MAX on HP-UX Ticket: ENT-13259 Signed-off-by: Lars Erik Wik --- .../openssl/fixed-undeclared-identifier.patch | 14 ++++++++++++++ deps-packaging/openssl/hpux/build | 1 + 2 files changed, 15 insertions(+) create mode 100644 deps-packaging/openssl/fixed-undeclared-identifier.patch diff --git a/deps-packaging/openssl/fixed-undeclared-identifier.patch b/deps-packaging/openssl/fixed-undeclared-identifier.patch new file mode 100644 index 000000000..3d3546b01 --- /dev/null +++ b/deps-packaging/openssl/fixed-undeclared-identifier.patch @@ -0,0 +1,14 @@ +diff -ruN openssl-3.6.0/include/internal/numbers.h openssl-3.6.0-modified/include/internal/numbers.h +--- openssl-3.6.0/include/internal/numbers.h 2025-10-01 14:11:48.000000000 +0200 ++++ openssl-3.6.0-modified/include/internal/numbers.h 2025-10-07 13:12:00.081227741 +0200 +@@ -106,6 +106,10 @@ + # define OSSL_UINTMAX_MAX __MAXUINT__(ossl_uintmax_t) + # endif + ++# ifndef LLONG_MAX ++# define LLONG_MAX __MAXINT__(long long) ++# endif ++ + /* Fix for cross compiling 64-bit PowerPC on OS X 10.4 */ + # if defined(__APPLE__) && defined(_ARCH_PPC64) + # ifdef SIZE_MAX diff --git a/deps-packaging/openssl/hpux/build b/deps-packaging/openssl/hpux/build index c33a9e0a2..df01666c1 100755 --- a/deps-packaging/openssl/hpux/build +++ b/deps-packaging/openssl/hpux/build @@ -10,6 +10,7 @@ OSD=${BUILD_ROOT}/cfbuild-openssl-devel${PREFIX} # To pick up libgcc_s.so.1, which is apparently not in dyld path. export LD_LIBRARY_PATH=$PREFIX/lib +$PATCH -p1 < fixed-undeclared-identifier.patch # Configure