Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/cfbuild-libxml2.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define libxml_version 2.15.2
%define libxml_version 2.15.3

Summary: CFEngine Build Automation -- libxml2
Name: cfbuild-libxml2
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c8b9bc81f8b590c33af8cc6c336dbff2f53409973588a351c95f1c621b13d09d libxml2-2.15.2.tar.xz
78262a6e7ac170d6528ebfe2efccdf220191a5af6a6cd61ea4a9a9a5042c7a07 libxml2-2.15.3.tar.xz
2 changes: 1 addition & 1 deletion deps-packaging/nghttp2/cfbuild-nghttp2.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define nghttp2_version 1.68.1
%define nghttp2_version 1.69.0

Summary: CFEngine Build Automation -- nghttp2
Name: cfbuild-nghttp2
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/nghttp2/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6abd7ab0a7f1580d5914457cb3c85eb80455657ee5119206edbd7f848c14f0b2 nghttp2-1.68.1.tar.xz
1fb324b6ec2c56f6bde0658f4139ffd8209fa9e77ce98fd7a5f63af8d0e508ad nghttp2-1.69.0.tar.xz
2 changes: 1 addition & 1 deletion deps-packaging/nghttp2/source
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/nghttp2/nghttp2/releases/download/v1.68.1/
https://github.com/nghttp2/nghttp2/releases/download/v1.69.0/

This file was deleted.

19 changes: 19 additions & 0 deletions deps-packaging/openssl/0010-Provide-timespec-for-centos-7.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/crypto/thread/arch/thread_posix.c b/crypto/thread/arch/thread_posix.c
index 1b285a6..b3cc67a 100644
--- a/crypto/thread/arch/thread_posix.c
+++ b/crypto/thread/arch/thread_posix.c
@@ -9,6 +9,14 @@

#include <internal/thread_arch.h>

+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC
+struct timespec {
+ time_t tv_sec; /* seconds */
+ long tv_nsec; /* nanoseconds */
+};
+#endif
+
#if defined(OPENSSL_THREADS_POSIX)
#define _GNU_SOURCE
#include <errno.h>
17 changes: 16 additions & 1 deletion deps-packaging/openssl/cfbuild-openssl.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define openssl_version 3.6.1
%define openssl_version 4.0.0

Summary: CFEngine Build Automation -- openssl
Name: cfbuild-openssl
Expand All @@ -7,6 +7,7 @@ Release: 1
Source0: openssl-%{openssl_version}.tar.gz
Patch0: 0006-Add-latomic-on-AIX-7.patch
Patch1: 0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch
Patch2: 0010-Provide-timespec-for-centos-7.patch
License: MIT
Group: Other
Url: https://cfengine.com
Expand All @@ -23,6 +24,12 @@ mkdir -p %{_builddir}
%patch0 -p1
%patch1 -p1

# for some reason linux/time.h is not included and timespec struct is not defined which causes an error in crypto/thread/arch/thread_posix.c
if [ "$OS_VERSION_MAJOR" = "7" ]
then
%patch2 -p1
fi

%build

if [ -z "$MAKE" ]
Expand Down Expand Up @@ -59,6 +66,14 @@ then
then
HACK_FLAGS=-D_GNU_SOURCE # CentOS 4 issue
fi
if [ "$OS_VERSION_MAJOR" = "7" ]
then
# https://github.com/openssl/openssl/commit/232f17f065e089cab931d2babbed548e5958e6b2 introduced a skip of new b64 encoder which uses avx2, centos-7 gcc 4.8.2 lacks full support for the avx2 related code so we leverage _M_ARM64EC macro
# also, gcc 4.8.2 does not support some c99 constructs like in loop variable initialization so explicitly choose c99.
# as described in crypto/sleep.c if nanosleep is unavailable, define OPENSSL_USE_USLEEP
# in crypto/thread/arch/thread_posix.c deadline_ts is unused so skip that warning as error
HACK_FLAGS="-D_M_ARM64EC -std=c99 -DOPENSSL_USE_USLEEP -Wno-unused-variable"
fi
fi

if [ x$SYS = "xAIX" ]; then
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/openssl/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e openssl-3.6.1.tar.gz
c32cf49a959c4f345f9606982dd36e7d28f7c58b19c2e25d75624d2b3d2f79ac openssl-4.0.0.tar.gz
1 change: 0 additions & 1 deletion deps-packaging/openssl/mingw/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ endif
build: build-stamp
build-stamp:
dh_testdir
patch -p1 < $(CURDIR)/0001-Explicitly-define-SIO_UDP_NETRESET-for-MinGW-builds.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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/openssl/openssl/releases/download/openssl-3.6.1/
https://github.com/openssl/openssl/releases/download/openssl-4.0.0/
2 changes: 1 addition & 1 deletion deps-packaging/php/cfbuild-php.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define php_version 8.5.4
%define php_version 8.5.5

Summary: CFEngine Build Automation -- php
Name: cfbuild-php
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/php/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4fef7f44eff3c18e329504cb0d3eb30b41cf54e2db05cb4ebe8b78fc37d38ce1 php-8.5.4.tar.gz
276279f637a875a514346b332bba6d8b06c036cf7979a858e5c55f72c4874884 php-8.5.5.tar.gz
Loading