Skip to content

Updated dependencies (master) #1973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larsewi merged 3 commits into from
Oct 7, 2025
Merged

Updated dependencies (master) #1973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52b67f8
Updated dependency 'openssl' from version 3.5.3 to 3.6.0
github-actions[bot] Oct 6, 2025
367edcd
Fixed undefined reference to _set_printf_count_output on MinGW
larsewi Oct 7, 2025
7d2959f
Fixed undeclared identifier LLONG_MAX on HP-UX
larsewi Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions deps-packaging/openssl/_set_printf_count_output.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion deps-packaging/openssl/cfbuild-openssl.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define openssl_version 3.5.3
%define openssl_version 3.6.0

Summary: CFEngine Build Automation -- openssl
Name: cfbuild-openssl
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/openssl/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c9489d2abcf943cdc8329a57092331c598a402938054dc3a22218aea8a8ec3bf openssl-3.5.3.tar.gz
b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9 openssl-3.6.0.tar.gz
14 changes: 14 additions & 0 deletions deps-packaging/openssl/fixed-undeclared-identifier.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions deps-packaging/openssl/hpux/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions deps-packaging/openssl/mingw/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/openssl/source
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/openssl/openssl/releases/download/openssl-3.5.3/
https://github.com/openssl/openssl/releases/download/openssl-3.6.0/