Merge pull request #1501 from craigcomstock/3.21.x-deps-2024-10-08_09…

…_23_29_459273 3.21.x deps 2024 10 08 09 23 29 459273
cfengine · Oct 9, 2024 · 95d0591 · 95d0591
2 parents 1e06e91 + 02ac18b
commit 95d0591
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 14 deletions.
diff --git a/deps-packaging/apr/cfbuild-apr.spec b/deps-packaging/apr/cfbuild-apr.spec
@@ -1,4 +1,4 @@
-%define apr_version 1.7.4
+%define apr_version 1.7.5
 
 Summary: CFEngine Build Automation -- apr
 Name: cfbuild-apr

diff --git a/deps-packaging/apr/distfiles b/deps-packaging/apr/distfiles
@@ -1 +1 @@
-a4137dd82a185076fa50ba54232d920a17c6469c30b0876569e1c2a05ff311d9  apr-1.7.4.tar.gz
+3375fa365d67bcf945e52b52cba07abea57ef530f40b281ffbe977a9251361db  apr-1.7.5.tar.gz
diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec
@@ -1,10 +1,11 @@
-%define git_version 2.46.0
+%define git_version 2.47.0
 
 Summary: CFEngine Build Automation -- git
 Name: cfbuild-git
 Version: %{version}
 Release: 1
 Source0: git-%{git_version}.tar.gz
+Patch0: clar-stop-passing-timezone-to-gettimeofday.patch
 License: MIT
 Group: Other
 Url: http://example.com/
@@ -18,6 +19,8 @@ AutoReqProv: no
 mkdir -p %{_builddir}
 %setup -q -n git-%{git_version}
 
+%patch0 -p0
+
 ./configure --prefix=%{prefix} --with-openssl=%{prefix} --without-iconv --with-gitconfig=%{prefix}/config/gitconfig --with-gitattributes=%{prefix}/config/gitattributes --with-zlib=%{prefix} --with-curl=%{prefix}  --libexecdir=%{prefix}/lib --with-python=%{prefix}/bin/python
 
 %build

diff --git a/deps-packaging/git/clar-stop-passing-timezone-to-gettimeofday.patch b/deps-packaging/git/clar-stop-passing-timezone-to-gettimeofday.patch
@@ -0,0 +1,28 @@
+commit ca41a29b8bb19f0240eac0f872a7b958fb1f5f19
+Author: Patrick Steinhardt <[email protected]>
+Date:   Thu Sep 5 08:04:37 2024 +0200
+
+    clar: stop passing a timezone to gettimeofday(3P)
+
+    According to gettimeofday(3P), passing a non-NULL timezone pointer to
+    the function is unspecified behaviour. This is also being warned about
+    by compilers when compiling with strict C90 standard and without most of
+    the extensions.
+
+    Adapt the code accordingly.
+
+diff --git t/unit-tests/clar.c t/unit-tests/clar.c
+index cef0f02..e593bb1 100644
+--- t/unit-tests/clar/clar.c
++++ t/unit-tests/clar/clar.c
+@@ -271,9 +271,7 @@ static double clar_time_diff(clar_time *start, clar_time *end)
+
+ static void clar_time_now(clar_time *out)
+ {
+-	struct timezone tz;
+-
+-	gettimeofday(out, &tz);
++	gettimeofday(out, NULL);
+ }
+
+ static double clar_time_diff(clar_time *start, clar_time *end)
diff --git a/deps-packaging/git/debian/rules b/deps-packaging/git/debian/rules
@@ -12,6 +12,8 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
+	patch -p0 -i clar-stop-passing-timezone-to-gettimeofday.patch
+
 	./configure --prefix=$(PREFIX) --with-openssl=$(PREFIX) --without-iconv --with-gitconfig=$(PREFIX)/config/gitconfig --with-gitattributes=$(PREFIX)/config/gitattributes --with-zlib=$(PREFIX) --with-curl=$(PREFIX) --libexecdir=$(PREFIX)/lib
 	make CURL_LDFLAGS="-lcurl"
 

diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles
@@ -1 +1 @@
-b138811e16838f669a2516e40f09d50500e1c7fc541b5ab50ce84b98585e5230  git-2.46.0.tar.gz
+a84a7917e0ab608312834413f01fc01edc7844f9f9002ba69f3b4f4bcb8d937a  git-2.47.0.tar.gz
diff --git a/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec b/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec
@@ -1,4 +1,4 @@
-%define curl_version 8.9.1
+%define curl_version 8.10.1
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl-hub
@@ -38,6 +38,7 @@ mkdir -p %{_builddir}
     --without-gnutls \
     --without-gssapi \
     --without-libidn \
+    --without-libpsl \
     --without-librtmp \
     --without-libssh2 \
     --without-nghttp2 \

diff --git a/deps-packaging/libcurl-hub/debian/rules b/deps-packaging/libcurl-hub/debian/rules
@@ -33,6 +33,7 @@ build-stamp:
 				--without-gnutls \
 				--without-gssapi \
 				--without-libidn \
+				--without-libpsl \
 				--without-librtmp \
 				--without-libssh2 \
 				--without-nghttp2 \

diff --git a/deps-packaging/libcurl-hub/distfiles b/deps-packaging/libcurl-hub/distfiles
@@ -1 +1 @@
-291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5  curl-8.9.1.tar.gz
+d15ebab765d793e2e96db090f0e172d127859d78ca6f6391d7eafecfd894bbc0  curl-8.10.1.tar.gz
diff --git a/deps-packaging/libcurl/cfbuild-libcurl.spec b/deps-packaging/libcurl/cfbuild-libcurl.spec
@@ -1,4 +1,4 @@
-%define curl_version 8.9.1
+%define curl_version 8.10.1
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl
@@ -38,6 +38,7 @@ mkdir -p %{_builddir}
     --without-gnutls \
     --without-gssapi \
     --without-libidn \
+    --without-libpsl \
     --without-librtmp \
     --without-libssh2 \
     --without-nghttp2 \

diff --git a/deps-packaging/libcurl/debian/rules b/deps-packaging/libcurl/debian/rules
@@ -41,6 +41,7 @@ build-stamp:
 				--without-gnutls \
 				--without-gssapi \
 				--without-libidn \
+				--without-libpsl \
 				--without-librtmp \
 				--without-libssh2 \
 				--without-nghttp2 \

diff --git a/deps-packaging/libcurl/distfiles b/deps-packaging/libcurl/distfiles
@@ -1 +1 @@
-291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5  curl-8.9.1.tar.gz
+d15ebab765d793e2e96db090f0e172d127859d78ca6f6391d7eafecfd894bbc0  curl-8.10.1.tar.gz
diff --git a/deps-packaging/libcurl/hpux/build b/deps-packaging/libcurl/hpux/build
@@ -21,6 +21,7 @@ TTD=${BUILD_ROOT}/cfbuild-libcurl-devel${PREFIX}
     --without-gnutls \
     --without-gssapi \
     --without-libidn \
+    --without-libpsl \
     --without-librtmp \
     --without-libssh2 \
     --without-nghttp2 \

diff --git a/deps-packaging/libcurl/solaris/build b/deps-packaging/libcurl/solaris/build
@@ -21,6 +21,7 @@ TTD=${BUILD_ROOT}/cfbuild-libcurl-devel${PREFIX}
     --without-gnutls \
     --without-gssapi \
     --without-libidn \
+    --without-libpsl \
     --without-librtmp \
     --without-libssh2 \
     --without-nghttp2 \

diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec
@@ -1,4 +1,4 @@
-%define libxml_version 2.13.3
+%define libxml_version 2.13.4
 
 Summary: CFEngine Build Automation -- libxml2
 Name: cfbuild-libxml2

diff --git a/deps-packaging/libxml2/distfiles b/deps-packaging/libxml2/distfiles
@@ -1 +1 @@
-0805d7c180cf09caad71666c7a458a74f041561a532902454da5047d83948138  libxml2-2.13.3.tar.xz
+65d042e1c8010243e617efb02afda20b85c2160acdbfbcb5b26b80cec6515650  libxml2-2.13.4.tar.xz
diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec
@@ -1,4 +1,4 @@
-%define openssl_version 3.0.14
+%define openssl_version 3.0.15
 
 Summary: CFEngine Build Automation -- openssl
 Name: cfbuild-openssl

diff --git a/deps-packaging/openssl/distfiles b/deps-packaging/openssl/distfiles
@@ -1 +1 @@
-eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca  openssl-3.0.14.tar.gz
+23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533  openssl-3.0.15.tar.gz
diff --git a/deps-packaging/php/cfbuild-php.spec b/deps-packaging/php/cfbuild-php.spec
@@ -1,4 +1,4 @@
-%define php_version 8.3.10
+%define php_version 8.3.12
 
 Summary: CFEngine Build Automation -- php
 Name: cfbuild-php

diff --git a/deps-packaging/php/distfiles b/deps-packaging/php/distfiles
@@ -1 +1 @@
-d0b4dd5ff465053248fd28dacf2fe0bed79deaaef657890cecb6bfcb73996dcd  php-8.3.10.tar.gz
+7090e551e05b26384546345d6a162c71b74550febf75bdfd16dfd1f0cfa8647c  php-8.3.12.tar.gz