Merge pull request #1517 from craigcomstock/3.24.x-deps-2024-10-29_13…

…_20_11_025954 Minor dependency updates (3.24)
cfengine · Nov 7, 2024 · 34b41b2 · 34b41b2
2 parents 204963e + ad6651c
commit 34b41b2
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 201 deletions.
diff --git a/deps-packaging/openssl/0007-Avoid-using-Interlocked-64-Windows-functions.patch b/deps-packaging/openssl/0007-Avoid-using-Interlocked-64-Windows-functions.patch
diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec
@@ -1,4 +1,4 @@
-%define openssl_version 3.3.2
+%define openssl_version 3.4.0
 
 Summary: CFEngine Build Automation -- openssl
 Name: cfbuild-openssl

diff --git a/deps-packaging/openssl/distfiles b/deps-packaging/openssl/distfiles
@@ -1 +1 @@
-2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281  openssl-3.3.2.tar.gz
+e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf  openssl-3.4.0.tar.gz
diff --git a/deps-packaging/openssl/mingw/debian/rules b/deps-packaging/openssl/mingw/debian/rules
@@ -23,8 +23,6 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	patch -p1 < 0007-Avoid-using-Interlocked-64-Windows-functions.patch
-
 	# Removed "no-psk" from the options, mingw builds breaks with it
 	CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- ./Configure \
 		$(TARGET) $$(<config_flags_$$ROLE.txt) \

diff --git a/deps-packaging/openssl/source b/deps-packaging/openssl/source
@@ -1 +1 @@
-https://github.com/openssl/openssl/releases/download/openssl-3.3.2/
+https://github.com/openssl/openssl/releases/download/openssl-3.4.0/
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.12
+%define php_version 8.3.13
 
 Summary: CFEngine Build Automation -- php
 Name: cfbuild-php

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