From b0f911bd6a17af38c979e77e47fc1651a8e478f0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Jun 2025 07:05:44 +0000 Subject: [PATCH 1/5] Updated dependency 'git' from version 2.49.0 to 2.50.0 --- deps-packaging/git/cfbuild-git.spec | 2 +- deps-packaging/git/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec index 3156968dd..3cad26569 100644 --- a/deps-packaging/git/cfbuild-git.spec +++ b/deps-packaging/git/cfbuild-git.spec @@ -1,4 +1,4 @@ -%define git_version 2.49.0 +%define git_version 2.50.0 Summary: CFEngine Build Automation -- git Name: cfbuild-git diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles index 1a8455f21..b277396ae 100644 --- a/deps-packaging/git/distfiles +++ b/deps-packaging/git/distfiles @@ -1 +1 @@ -f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c git-2.49.0.tar.gz +920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da git-2.50.0.tar.gz From f07a6467af85dad5a2e325174f7937e095c906c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Jun 2025 07:05:45 +0000 Subject: [PATCH 2/5] Updated dependency 'libxml2' from version 2.14.3 to 2.14.4 --- deps-packaging/libxml2/cfbuild-libxml2.spec | 2 +- deps-packaging/libxml2/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec index aa635bd3d..9726d14ed 100644 --- a/deps-packaging/libxml2/cfbuild-libxml2.spec +++ b/deps-packaging/libxml2/cfbuild-libxml2.spec @@ -1,4 +1,4 @@ -%define libxml_version 2.14.3 +%define libxml_version 2.14.4 Summary: CFEngine Build Automation -- libxml2 Name: cfbuild-libxml2 diff --git a/deps-packaging/libxml2/distfiles b/deps-packaging/libxml2/distfiles index a3a9b6332..eb3d3c491 100644 --- a/deps-packaging/libxml2/distfiles +++ b/deps-packaging/libxml2/distfiles @@ -1 +1 @@ -6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833 libxml2-2.14.3.tar.xz +24175ec30a97cfa86bdf9befb7ccf4613f8f4b2713c5103e0dd0bc9c711a2773 libxml2-2.14.4.tar.xz From 02af011ec6a9570b4854cbc78f3be9326e86c567 Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Mon, 23 Jun 2025 16:54:18 +0200 Subject: [PATCH 3/5] Fixed fatal error: sys/random.h: No such file or directory When building git dependency on redhat 7 with git v2.50 we get a compilation error due to the include of a missing file. ``` 15:05:27 + make CURL_LDFLAGS=-lcurl 15:05:28 GIT_VERSION=2.50.0 15:05:28 * new build flags 15:05:28 CC daemon.o 15:05:28 In file included from git-compat-util.h:26:0, 15:05:28 from daemon.c:3: 15:05:28 compat/posix.h:159:24: fatal error: sys/random.h: No such file or directory 15:05:28 #include 15:05:28 ^ 15:05:28 compilation terminated. ``` Signed-off-by: Lars Erik Wik (cherry picked from commit 16fc9aa1b339211d63f5988c6366319649a38bd6) --- deps-packaging/git/cfbuild-git.spec | 19 +++++++-- deps-packaging/git/fix_git_on_rhel7.patch | 48 +++++++++++++++++++++++ 2 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 deps-packaging/git/fix_git_on_rhel7.patch diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec index 3cad26569..cead252d8 100644 --- a/deps-packaging/git/cfbuild-git.spec +++ b/deps-packaging/git/cfbuild-git.spec @@ -22,6 +22,20 @@ mkdir -p %{_builddir} %build +case "$OS" in + rhel|centos) + if [ $(echo $OS_VERSION | cut -d. -f1) = 7 ] + then + # Fixes the following compilation error on rhel 7: + # 15:05:28 compat/posix.h:159:24: fatal error: sys/random.h: No such file or directory + # 15:05:28 #include + # 15:05:28 ^ + # 15:05:28 compilation terminated. + patch -p1 < %{_topdir}/SOURCES/fix_git_on_rhel7.patch + fi + ;; +esac + make CURL_LDFLAGS="-lcurl" %install @@ -36,6 +50,7 @@ rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/python* rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib64 rm -rf ${RPM_BUILD_ROOT}%{prefix}/perl5 rm -rf ${RPM_BUILD_ROOT}%{prefix}/share/perl5 +rm -rf ${RPM_BUILD_ROOT}%{prefix}/share/bash-completion rm -rf ${RPM_BUILD_ROOT}%{prefix}/bin/scalar %clean @@ -67,7 +82,3 @@ CFEngine Build Automation -- git %{prefix}/lib/git-core %changelog - - - - diff --git a/deps-packaging/git/fix_git_on_rhel7.patch b/deps-packaging/git/fix_git_on_rhel7.patch new file mode 100644 index 000000000..c57fa492d --- /dev/null +++ b/deps-packaging/git/fix_git_on_rhel7.patch @@ -0,0 +1,48 @@ +diff -ruN git-2.50.0/compat/posix.h git-2.50.0-modified/compat/posix.h +--- git-2.50.0/compat/posix.h 2025-06-24 15:50:16.431161905 +0200 ++++ git-2.50.0-modified/compat/posix.h 2025-06-24 15:56:12.823192406 +0200 +@@ -155,9 +155,9 @@ + #ifdef HAVE_ARC4RANDOM_LIBBSD + #include + #endif +-#ifdef HAVE_GETRANDOM +-#include +-#endif ++// #ifdef HAVE_GETRANDOM ++// #include ++// #endif + #ifdef NO_INTPTR_T + /* + * On I16LP32, ILP32 and LP64 "long" is the safe bet, however +diff -ruN git-2.50.0/wrapper.c git-2.50.0-modified/wrapper.c +--- git-2.50.0/wrapper.c 2025-06-16 07:42:57.000000000 +0200 ++++ git-2.50.0-modified/wrapper.c 2025-06-24 15:56:09.560108133 +0200 +@@ -775,17 +775,17 @@ + /* This function never returns an error. */ + arc4random_buf(buf, len); + return 0; +-#elif defined(HAVE_GETRANDOM) +- ssize_t res; +- char *p = buf; +- while (len) { +- res = getrandom(p, len, 0); +- if (res < 0) +- return -1; +- len -= res; +- p += res; +- } +- return 0; ++// #elif defined(HAVE_GETRANDOM) ++// ssize_t res; ++// char *p = buf; ++// while (len) { ++// res = getrandom(p, len, 0); ++// if (res < 0) ++// return -1; ++// len -= res; ++// p += res; ++// } ++// return 0; + #elif defined(HAVE_GETENTROPY) + int res; + char *p = buf; From 5b1fb36504e5852fd8fa7d0cfe3eddf1c9a5067b Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Thu, 26 Jun 2025 12:29:12 +0200 Subject: [PATCH 4/5] Fixed implicit declaration of GNU extension gettid Fixes current compilation error (found on Ubuntu 24): ``` 23:16:48 log.c:637:21: error: implicit declaration of function 'gettid'; did you mean 'getgid'? [-Wimplicit-function-declaration] 23:16:48 637 | pid_t tid = gettid(); 23:16:48 | ^~~~~~ 23:16:48 | getgid ``` Ticket: ENT-13084 Signed-off-by: Lars Erik Wik (cherry picked from commit 6e0eaed1fa0015d9c783d688789cbbdee8389ab4) --- deps-packaging/apache/debian/rules | 4 +++ .../apache/fixed-implicit-decl-gettid.patch | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 deps-packaging/apache/fixed-implicit-decl-gettid.patch diff --git a/deps-packaging/apache/debian/rules b/deps-packaging/apache/debian/rules index 0f8cf53e1..e9c05cd9f 100755 --- a/deps-packaging/apache/debian/rules +++ b/deps-packaging/apache/debian/rules @@ -14,6 +14,10 @@ build-stamp: dh_testdir patch -p0 < $(CURDIR)/apachectl.patch + + # Fixed implicit declaration of GNU extension gettid() (See ENT-13084) + patch -p1 < $(CURDIR)/fixed-implicit-decl-gettid.patch + ./configure \ --prefix=$(PREFIX)/httpd \ --enable-so \ diff --git a/deps-packaging/apache/fixed-implicit-decl-gettid.patch b/deps-packaging/apache/fixed-implicit-decl-gettid.patch new file mode 100644 index 000000000..83478bdb9 --- /dev/null +++ b/deps-packaging/apache/fixed-implicit-decl-gettid.patch @@ -0,0 +1,30 @@ +diff -ruN httpd-2.4.63/server/log.c httpd-2.4.63-modified/server/log.c +--- httpd-2.4.63/server/log.c 2024-06-21 16:31:54.000000000 +0200 ++++ httpd-2.4.63-modified/server/log.c 2025-06-30 16:51:30.836217481 +0200 +@@ -21,6 +21,8 @@ + * + */ + ++#define _GNU_SOURCE /* gettid() */ ++ + #include "apr.h" + #include "apr_general.h" /* for signal stuff */ + #include "apr_strings.h" +@@ -1461,7 +1463,7 @@ + + memset(buf, ' ', LOG_BYTES_BUFFER_SIZE - 1); + buf[LOG_BYTES_BUFFER_SIZE - 1] = '\0'; +- ++ + chars = buf; /* start character dump here */ + hex = buf + BYTES_LOGGED_PER_LINE + 1; /* start hex dump here */ + while (*off < len && this_time < BYTES_LOGGED_PER_LINE) { +@@ -1533,7 +1535,7 @@ + } + } + +-AP_DECLARE(void) ap_log_data_(const char *file, int line, ++AP_DECLARE(void) ap_log_data_(const char *file, int line, + int module_index, int level, + const server_rec *s, const char *label, + const void *data, apr_size_t len, From 692a0a523a9c07dd18031a030781b6e70e5394d7 Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Wed, 2 Jul 2025 11:24:37 +0200 Subject: [PATCH 5/5] Apply missing sys/random.h fix on Debian 9 and Ubuntu 16 Signed-off-by: Lars Erik Wik --- deps-packaging/git/cfbuild-git.spec | 2 +- deps-packaging/git/debian/rules | 9 +++++++++ ...git_on_rhel7.patch => fix_git_on_old_platforms.patch} | 0 3 files changed, 10 insertions(+), 1 deletion(-) rename deps-packaging/git/{fix_git_on_rhel7.patch => fix_git_on_old_platforms.patch} (100%) diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec index cead252d8..f0cf0206b 100644 --- a/deps-packaging/git/cfbuild-git.spec +++ b/deps-packaging/git/cfbuild-git.spec @@ -31,7 +31,7 @@ case "$OS" in # 15:05:28 #include # 15:05:28 ^ # 15:05:28 compilation terminated. - patch -p1 < %{_topdir}/SOURCES/fix_git_on_rhel7.patch + patch -p1 < %{_topdir}/SOURCES/fix_git_on_old_platforms.patch fi ;; esac diff --git a/deps-packaging/git/debian/rules b/deps-packaging/git/debian/rules index a69615d76..c79313644 100755 --- a/deps-packaging/git/debian/rules +++ b/deps-packaging/git/debian/rules @@ -23,6 +23,15 @@ install: build dh_clean -k dh_installdirs + case "$(OS)-$(OS_VERSION)" in + ubuntu-16*) + patch -p1 < $(CURDIR)/fix_git_on_old_platforms.patch + ;; + debian-9*) + patch -p1 < $(CURDIR)/fix_git_on_old_platforms.patch + ;; + esac + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/perl* diff --git a/deps-packaging/git/fix_git_on_rhel7.patch b/deps-packaging/git/fix_git_on_old_platforms.patch similarity index 100% rename from deps-packaging/git/fix_git_on_rhel7.patch rename to deps-packaging/git/fix_git_on_old_platforms.patch