Skip to content

Commit db0998c

Browse files
larsewilarsewi
authored
Merge pull request #1771 from cfengine/update-dependencies-action-3.24.x-1750662347
Updated dependencies (3.24.x)
2 parents d46ea16 + 48d4a4d commit db0998c

File tree

7 files changed

+101
-8
lines changed

7 files changed

+101
-8
lines changed

‎deps-packaging/apache/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ build-stamp:
1414
dh_testdir
1515

1616
patch -p0 < $(CURDIR)/apachectl.patch
17+
18+
# Fixed implicit declaration of GNU extension gettid() (See ENT-13084)
19+
patch -p1 < $(CURDIR)/fixed-implicit-decl-gettid.patch
20+
1721
./configure \
1822
--prefix=$(PREFIX)/httpd \
1923
--enable-so \

‎deps-packaging/apache/fixed-implicit-decl-gettid.patch‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff -ruN httpd-2.4.63/server/log.c httpd-2.4.63-modified/server/log.c
2+
--- httpd-2.4.63/server/log.c 2024-06-21 16:31:54.000000000 +0200
3+
+++ httpd-2.4.63-modified/server/log.c 2025-06-30 16:51:30.836217481 +0200
4+
@@ -21,6 +21,8 @@
5+
*
6+
*/
7+
8+
+#define _GNU_SOURCE /* gettid() */
9+
+
10+
#include "apr.h"
11+
#include "apr_general.h" /* for signal stuff */
12+
#include "apr_strings.h"
13+
@@ -1461,7 +1463,7 @@
14+
15+
memset(buf, ' ', LOG_BYTES_BUFFER_SIZE - 1);
16+
buf[LOG_BYTES_BUFFER_SIZE - 1] = '\0';
17+
-
18+
+
19+
chars = buf; /* start character dump here */
20+
hex = buf + BYTES_LOGGED_PER_LINE + 1; /* start hex dump here */
21+
while (*off < len && this_time < BYTES_LOGGED_PER_LINE) {
22+
@@ -1533,7 +1535,7 @@
23+
}
24+
}
25+
26+
-AP_DECLARE(void) ap_log_data_(const char *file, int line,
27+
+AP_DECLARE(void) ap_log_data_(const char *file, int line,
28+
int module_index, int level,
29+
const server_rec *s, const char *label,
30+
const void *data, apr_size_t len,

‎deps-packaging/git/cfbuild-git.spec‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%define git_version 2.49.0
1+
%define git_version 2.50.0
22

33
Summary: CFEngine Build Automation -- git
44
Name: cfbuild-git
@@ -22,6 +22,20 @@ mkdir -p %{_builddir}
2222

2323
%build
2424

25+
case "$OS" in
26+
rhel|centos)
27+
if [ $(echo $OS_VERSION | cut -d. -f1) = 7 ]
28+
then
29+
# Fixes the following compilation error on rhel 7:
30+
# 15:05:28 compat/posix.h:159:24: fatal error: sys/random.h: No such file or directory
31+
# 15:05:28 #include <sys/random.h>
32+
# 15:05:28 ^
33+
# 15:05:28 compilation terminated.
34+
patch -p1 < %{_topdir}/SOURCES/fix_git_on_rhel7.patch
35+
fi
36+
;;
37+
esac
38+
2539
make CURL_LDFLAGS="-lcurl"
2640

2741
%install
@@ -36,6 +50,7 @@ rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/python*
3650
rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib64
3751
rm -rf ${RPM_BUILD_ROOT}%{prefix}/perl5
3852
rm -rf ${RPM_BUILD_ROOT}%{prefix}/share/perl5
53+
rm -rf ${RPM_BUILD_ROOT}%{prefix}/share/bash-completion
3954
rm -rf ${RPM_BUILD_ROOT}%{prefix}/bin/scalar
4055

4156
%clean
@@ -67,7 +82,3 @@ CFEngine Build Automation -- git
6782
%{prefix}/lib/git-core
6883

6984
%changelog
70-
71-
72-
73-

‎deps-packaging/git/distfiles‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c git-2.49.0.tar.gz
1+
920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da git-2.50.0.tar.gz

‎deps-packaging/git/fix_git_on_rhel7.patch‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
diff -ruN git-2.50.0/compat/posix.h git-2.50.0-modified/compat/posix.h
2+
--- git-2.50.0/compat/posix.h 2025-06-24 15:50:16.431161905 +0200
3+
+++ git-2.50.0-modified/compat/posix.h 2025-06-24 15:56:12.823192406 +0200
4+
@@ -155,9 +155,9 @@
5+
#ifdef HAVE_ARC4RANDOM_LIBBSD
6+
#include <bsd/stdlib.h>
7+
#endif
8+
-#ifdef HAVE_GETRANDOM
9+
-#include <sys/random.h>
10+
-#endif
11+
+// #ifdef HAVE_GETRANDOM
12+
+// #include <sys/random.h>
13+
+// #endif
14+
#ifdef NO_INTPTR_T
15+
/*
16+
* On I16LP32, ILP32 and LP64 "long" is the safe bet, however
17+
diff -ruN git-2.50.0/wrapper.c git-2.50.0-modified/wrapper.c
18+
--- git-2.50.0/wrapper.c 2025-06-16 07:42:57.000000000 +0200
19+
+++ git-2.50.0-modified/wrapper.c 2025-06-24 15:56:09.560108133 +0200
20+
@@ -775,17 +775,17 @@
21+
/* This function never returns an error. */
22+
arc4random_buf(buf, len);
23+
return 0;
24+
-#elif defined(HAVE_GETRANDOM)
25+
- ssize_t res;
26+
- char *p = buf;
27+
- while (len) {
28+
- res = getrandom(p, len, 0);
29+
- if (res < 0)
30+
- return -1;
31+
- len -= res;
32+
- p += res;
33+
- }
34+
- return 0;
35+
+// #elif defined(HAVE_GETRANDOM)
36+
+// ssize_t res;
37+
+// char *p = buf;
38+
+// while (len) {
39+
+// res = getrandom(p, len, 0);
40+
+// if (res < 0)
41+
+// return -1;
42+
+// len -= res;
43+
+// p += res;
44+
+// }
45+
+// return 0;
46+
#elif defined(HAVE_GETENTROPY)
47+
int res;
48+
char *p = buf;

‎deps-packaging/libxml2/cfbuild-libxml2.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%define libxml_version 2.14.3
1+
%define libxml_version 2.14.4
22

33
Summary: CFEngine Build Automation -- libxml2
44
Name: cfbuild-libxml2

‎deps-packaging/libxml2/distfiles‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833 libxml2-2.14.3.tar.xz
1+
24175ec30a97cfa86bdf9befb7ccf4613f8f4b2713c5103e0dd0bc9c711a2773 libxml2-2.14.4.tar.xz

0 commit comments

Comments
 (0)