From 6aef919b5c4e74ec7fd69abfcbd613877de2b661 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Sep 2024 13:39:20 -0500 Subject: [PATCH 01/13] Updated libxml2 from 2.13.1 to 2.13.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 63d07b40e..c2af0262b 100644 --- a/deps-packaging/libxml2/cfbuild-libxml2.spec +++ b/deps-packaging/libxml2/cfbuild-libxml2.spec @@ -1,4 +1,4 @@ -%define libxml_version 2.13.1 +%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 index 6ab163e02..3652aa490 100644 --- a/deps-packaging/libxml2/distfiles +++ b/deps-packaging/libxml2/distfiles @@ -1 +1 @@ -25239263dc37f5f55a5393eff27b35f0b7d9ea4b2a7653310598ea8299e3b741 libxml2-2.13.1.tar.xz +65d042e1c8010243e617efb02afda20b85c2160acdbfbcb5b26b80cec6515650 libxml2-2.13.4.tar.xz From b333f101eb557338f6cc9230bd65e8edc415e01d Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Sep 2024 13:39:25 -0500 Subject: [PATCH 02/13] Updated libcurl-hub from 8.8.0 to 8.10.1 Adjusted for libcurl 8.10.0 change: configure: fail if PSL is not disabled but not found. added --without-psl per information at: https://github.com/curl/curl/issues/14373 https://github.com/curl/curl/pull/14379 --- deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec | 3 ++- deps-packaging/libcurl-hub/debian/rules | 1 + deps-packaging/libcurl-hub/distfiles | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec b/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec index 18ba32de7..1cf808649 100644 --- 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.8.0 +%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 index 946666807..770855841 100755 --- 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 index fe0ec3d15..804afe139 100644 --- a/deps-packaging/libcurl-hub/distfiles +++ b/deps-packaging/libcurl-hub/distfiles @@ -1 +1 @@ -77c0e1cd35ab5b45b659645a93b46d660224d0024f1185e8a95cdb27ae3d787d curl-8.8.0.tar.gz +d15ebab765d793e2e96db090f0e172d127859d78ca6f6391d7eafecfd894bbc0 curl-8.10.1.tar.gz From 66d7b6c32e358bfea3bcdb4d07782e25bb3ecb2d Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Sep 2024 13:39:28 -0500 Subject: [PATCH 03/13] Updated apr from 1.7.4 to 1.7.5 --- deps-packaging/apr/cfbuild-apr.spec | 2 +- deps-packaging/apr/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/apr/cfbuild-apr.spec b/deps-packaging/apr/cfbuild-apr.spec index e10060e2a..20eac404d 100644 --- 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 index 0e8006a85..8c8a5b9a4 100644 --- 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 From e9be5233cf5253054d6409b665d0b9539afb9777 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Sep 2024 13:39:31 -0500 Subject: [PATCH 04/13] Updated apache from 2.4.59 to 2.4.62 --- deps-packaging/apache/cfbuild-apache.spec | 2 +- deps-packaging/apache/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/apache/cfbuild-apache.spec b/deps-packaging/apache/cfbuild-apache.spec index 8fd727d13..be143048e 100644 --- a/deps-packaging/apache/cfbuild-apache.spec +++ b/deps-packaging/apache/cfbuild-apache.spec @@ -1,4 +1,4 @@ -%define apache_version 2.4.59 +%define apache_version 2.4.62 %global __os_install_post %{nil} Summary: CFEngine Build Automation -- apache diff --git a/deps-packaging/apache/distfiles b/deps-packaging/apache/distfiles index d6e0cca05..e70cb4427 100644 --- a/deps-packaging/apache/distfiles +++ b/deps-packaging/apache/distfiles @@ -1 +1 @@ -e4ec4ce12c6c8f5a794dc2263d126cb1d6ef667f034c4678ec945d61286e8b0f httpd-2.4.59.tar.gz +3e2404d762a2da03560d7ada379ba1599d32f04a0d70ad6ff86f44325f2f062d httpd-2.4.62.tar.gz From 5d6cf30f244cf2a3c4a0ce707118b978261408c8 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Sep 2024 13:39:35 -0500 Subject: [PATCH 05/13] Updated git from 2.45.2 to 2.46.2 --- 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 745f6c430..b54ec3058 100644 --- a/deps-packaging/git/cfbuild-git.spec +++ b/deps-packaging/git/cfbuild-git.spec @@ -1,4 +1,4 @@ -%define git_version 2.45.2 +%define git_version 2.46.2 Summary: CFEngine Build Automation -- git Name: cfbuild-git diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles index ea9513f0e..6df853df1 100644 --- a/deps-packaging/git/distfiles +++ b/deps-packaging/git/distfiles @@ -1 +1 @@ -98b26090ed667099a3691b93698d1e213e1ded73d36a2fde7e9125fce28ba234 git-2.45.2.tar.gz +65c5689fd44f1d09de7fd8c44de7fef074ddd69dda8b8503d44afb91495ecbce git-2.46.2.tar.gz From a8ecb2ff5af1b0da59176ed240b9617d2b1602fa Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Sep 2024 13:39:40 -0500 Subject: [PATCH 06/13] Updated php from 8.3.8 to 8.3.12 --- deps-packaging/php/cfbuild-php.spec | 2 +- deps-packaging/php/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/php/cfbuild-php.spec b/deps-packaging/php/cfbuild-php.spec index 25d0bcedd..4761e0fe6 100644 --- a/deps-packaging/php/cfbuild-php.spec +++ b/deps-packaging/php/cfbuild-php.spec @@ -1,4 +1,4 @@ -%define php_version 8.3.8 +%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 index ac31da4cc..b3a5a9626 100644 --- a/deps-packaging/php/distfiles +++ b/deps-packaging/php/distfiles @@ -1 +1 @@ -0ebed9f1471871cf131e504629f3947f2acd38a655cc31b036f99efd0e3dbdeb php-8.3.8.tar.gz +7090e551e05b26384546345d6a162c71b74550febf75bdfd16dfd1f0cfa8647c php-8.3.12.tar.gz From e0b8bf3e7c2cf01874e56c8a98d3b66a81f1af76 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Sep 2024 13:39:41 -0500 Subject: [PATCH 07/13] Updated libcurl from 8.8.0 to 8.10.1 added --without-psl per information at: Adjusted for libcurl 8.10.0 change: configure: fail if PSL is not disabled but not found. https://github.com/curl/curl/issues/14373 https://github.com/curl/curl/pull/14379 --- deps-packaging/libcurl/cfbuild-libcurl.spec | 3 ++- deps-packaging/libcurl/debian/rules | 1 + deps-packaging/libcurl/distfiles | 2 +- deps-packaging/libcurl/hpux/build | 1 + deps-packaging/libcurl/solaris/build | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libcurl/cfbuild-libcurl.spec b/deps-packaging/libcurl/cfbuild-libcurl.spec index 4053d4442..e378e8b2f 100644 --- a/deps-packaging/libcurl/cfbuild-libcurl.spec +++ b/deps-packaging/libcurl/cfbuild-libcurl.spec @@ -1,4 +1,4 @@ -%define curl_version 8.8.0 +%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 index 19fea40c6..2edf98d80 100755 --- 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 index fe0ec3d15..804afe139 100644 --- a/deps-packaging/libcurl/distfiles +++ b/deps-packaging/libcurl/distfiles @@ -1 +1 @@ -77c0e1cd35ab5b45b659645a93b46d660224d0024f1185e8a95cdb27ae3d787d curl-8.8.0.tar.gz +d15ebab765d793e2e96db090f0e172d127859d78ca6f6391d7eafecfd894bbc0 curl-8.10.1.tar.gz diff --git a/deps-packaging/libcurl/hpux/build b/deps-packaging/libcurl/hpux/build index d5e21d401..6ddcfcc7c 100755 --- a/deps-packaging/libcurl/hpux/build +++ b/deps-packaging/libcurl/hpux/build @@ -24,6 +24,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 index 834ddce6b..bcf5cb2e8 100755 --- 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 \ From 435947edcdebf4e7f61e1c3ce25578f5cc574475 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Sep 2024 13:43:14 -0500 Subject: [PATCH 08/13] Updated libexpat from 2.5.0 to 2.6.3 --- deps-packaging/libexpat/cfbuild-libexpat.spec | 2 +- deps-packaging/libexpat/distfiles | 2 +- deps-packaging/libexpat/source | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps-packaging/libexpat/cfbuild-libexpat.spec b/deps-packaging/libexpat/cfbuild-libexpat.spec index 642798338..16d28f7ee 100644 --- a/deps-packaging/libexpat/cfbuild-libexpat.spec +++ b/deps-packaging/libexpat/cfbuild-libexpat.spec @@ -1,4 +1,4 @@ -%define expat_version 2.5.0 +%define expat_version 2.6.3 Summary: CFEngine Build Automation -- libexpat Name: cfbuild-libexpat diff --git a/deps-packaging/libexpat/distfiles b/deps-packaging/libexpat/distfiles index e79b10501..964db7d6b 100644 --- a/deps-packaging/libexpat/distfiles +++ b/deps-packaging/libexpat/distfiles @@ -1 +1 @@ -ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc expat-2.6.3.tar.xz diff --git a/deps-packaging/libexpat/source b/deps-packaging/libexpat/source index 5889d1c58..095f933a4 100644 --- a/deps-packaging/libexpat/source +++ b/deps-packaging/libexpat/source @@ -1 +1 @@ -https://github.com/libexpat/libexpat/releases/download/R_2_5_0/ +https://github.com/libexpat/libexpat/releases/download/R_2_6_3/ From ac88b5cc4dca4f0cacbe0c06f8b554a055572328 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Sep 2024 13:43:39 -0500 Subject: [PATCH 09/13] Updated openssl from 3.3.1 to 3.3.2 Note that the old source URL, openssl.org, is still present but all links there lead to github.com/openssl/openssl/releases/download fixup perl on centos-7, needs newer List::Utils module so build from source. fixup openssl windows patch, 0007 for openssl 3.3.2 Fixed openssl patch 0010 for openssl 3.3.2 Ticket: ENT-12140 Changelog: none --- build-scripts/install-dependencies | 13 ++++++-- ...ing-Interlocked-64-Windows-functions.patch | 30 +++++++++---------- ...-Add-exemplar-use-case-for-rcu-locks.patch | 9 +++--- deps-packaging/openssl/cfbuild-openssl.spec | 2 +- deps-packaging/openssl/distfiles | 2 +- deps-packaging/openssl/source | 2 +- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/build-scripts/install-dependencies b/build-scripts/install-dependencies index cbc7a8a70..8f97d8970 100755 --- a/build-scripts/install-dependencies +++ b/build-scripts/install-dependencies @@ -40,13 +40,20 @@ check_and_install_perl() && PERL="$HOME/perl-my/bin/perl" \ || PERL=`func_whereis perl` + PERL_OK=yes PERL_MINOR_VERSION=`$PERL -e 'print "$]"."\n"' | cut -d. -f2` if [ "$PERL_MINOR_VERSION" -lt 013004 ] then echo "$PERL version is $PERL_MINOR_VERSION," \ - "too old, installing new one from source" - - ### BUILD PERL + "too old" + PERL_OK="no" + fi + if ! perl -e 'use List::Util qw(pairs);'; then + echo "$PERL has List::Util that does not export pairs. Needs to be at least version 1.29 for OpenSSL version 3.3.2." + PERL_OK="no" + fi + if [ "$PERL_OK" != "yes" ]; then + echo "$PERL is too old or modules are missing, building new one from source..." # -fno-stack-protector: Ensure built perl will not depend on libssp.so if echo | gcc -E -fno-stack-protector - >/dev/null 2>&1 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 index 14481be8e..fc1ac18e3 100644 --- a/deps-packaging/openssl/0007-Avoid-using-Interlocked-64-Windows-functions.patch +++ b/deps-packaging/openssl/0007-Avoid-using-Interlocked-64-Windows-functions.patch @@ -9,7 +9,7 @@ x86. There are already implementations of replacements for other functions, such as InterlockedOr64(). Apply the same approach to fix the errors. -Inspired by openssl/openssl#24326. +Inspired by https://github.com/openssl/openssl/pull/24326. (cherry picked from commit 03111c77b640febbfaefc9ab6519e85f8b595100) --- @@ -17,7 +17,7 @@ Inspired by openssl/openssl#24326. 1 file changed, 71 insertions(+), 10 deletions(-) diff --git a/crypto/threads_win.c b/crypto/threads_win.c -index 64354dc42f..62b63a4aad 100644 +index bc430ef..30ca914 100644 --- a/crypto/threads_win.c +++ b/crypto/threads_win.c @@ -23,7 +23,7 @@ @@ -29,7 +29,7 @@ index 64354dc42f..62b63a4aad 100644 # define NO_INTERLOCKEDOR64 #endif -@@ -104,8 +104,15 @@ struct rcu_lock_st { +@@ -103,8 +103,15 @@ CRYPTO_CONDVAR *alloc_signal; CRYPTO_MUTEX *prior_lock; CRYPTO_CONDVAR *prior_signal; @@ -42,18 +42,18 @@ index 64354dc42f..62b63a4aad 100644 +static int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret, + CRYPTO_RWLOCK *lock); + - /* - * Called on thread exit to free the pthread key - * associated with this thread, if any -@@ -154,6 +161,7 @@ CRYPTO_RCU_LOCK *ossl_rcu_lock_new(int num_writers) - return NULL; + static struct rcu_qp *allocate_new_qp_group(struct rcu_lock_st *lock, + int count) + { +@@ -133,6 +140,7 @@ + new->ctx = ctx; new->write_lock = ossl_crypto_mutex_new(); + new->rw_lock = CRYPTO_THREAD_lock_new(); new->alloc_signal = ossl_crypto_condvar_new(); new->prior_signal = ossl_crypto_condvar_new(); new->alloc_lock = ossl_crypto_mutex_new(); -@@ -164,13 +172,15 @@ CRYPTO_RCU_LOCK *ossl_rcu_lock_new(int num_writers) +@@ -143,13 +151,15 @@ || new->prior_signal == NULL || new->write_lock == NULL || new->alloc_lock == NULL @@ -70,7 +70,7 @@ index 64354dc42f..62b63a4aad 100644 OPENSSL_free(new); new = NULL; } -@@ -186,20 +196,27 @@ void ossl_rcu_lock_free(CRYPTO_RCU_LOCK *lock) +@@ -165,20 +175,27 @@ ossl_crypto_mutex_free(&lock->alloc_lock); ossl_crypto_mutex_free(&lock->prior_lock); ossl_crypto_mutex_free(&lock->write_lock); @@ -102,7 +102,7 @@ index 64354dc42f..62b63a4aad 100644 } return &lock->qp_group[qp_idx]; -@@ -263,7 +280,9 @@ void ossl_rcu_read_unlock(CRYPTO_RCU_LOCK *lock) +@@ -254,7 +271,9 @@ if (data->thread_qps[i].lock == lock) { data->thread_qps[i].depth--; if (data->thread_qps[i].depth == 0) { @@ -113,7 +113,7 @@ index 64354dc42f..62b63a4aad 100644 OPENSSL_assert(ret >= 0); data->thread_qps[i].qp = NULL; data->thread_qps[i].lock = NULL; -@@ -278,6 +297,7 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock) +@@ -269,6 +288,7 @@ uint64_t new_id; uint32_t current_idx; uint32_t tmp; @@ -121,7 +121,7 @@ index 64354dc42f..62b63a4aad 100644 ossl_crypto_mutex_lock(lock->alloc_lock); /* -@@ -301,8 +321,10 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock) +@@ -292,8 +312,10 @@ lock->id_ctr++; new_id = VAL_ID(new_id); @@ -134,7 +134,7 @@ index 64354dc42f..62b63a4aad 100644 /* update the reader index to be the prior qp */ tmp = lock->current_alloc_idx; -@@ -337,7 +359,7 @@ void ossl_synchronize_rcu(CRYPTO_RCU_LOCK *lock) +@@ -328,7 +350,7 @@ /* wait for the reader count to reach zero */ do { @@ -143,7 +143,7 @@ index 64354dc42f..62b63a4aad 100644 } while (READER_COUNT(count) != 0); /* retire in order */ -@@ -565,6 +587,45 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b) +@@ -556,6 +578,45 @@ return (a == b); } diff --git a/deps-packaging/openssl/0010-Revert-Add-exemplar-use-case-for-rcu-locks.patch b/deps-packaging/openssl/0010-Revert-Add-exemplar-use-case-for-rcu-locks.patch index f199eff09..830d4b2ca 100644 --- a/deps-packaging/openssl/0010-Revert-Add-exemplar-use-case-for-rcu-locks.patch +++ b/deps-packaging/openssl/0010-Revert-Add-exemplar-use-case-for-rcu-locks.patch @@ -46,7 +46,7 @@ index a19575af37..4f339f4175 100644 DEFINE_RUN_ONCE_STATIC(do_init_module_list_lock) { -- module_list_lock = ossl_rcu_lock_new(1); +- module_list_lock = ossl_rcu_lock_new(1, NULL); + module_list_lock = CRYPTO_THREAD_lock_new(); if (module_list_lock == NULL) { ERR_raise(ERR_LIB_CONF, ERR_R_CRYPTO_LIB); @@ -199,7 +199,7 @@ index a19575af37..4f339f4175 100644 return ret; err: -@@ -507,46 +482,30 @@ void CONF_modules_unload(int all) +@@ -507,47 +482,31 @@ void CONF_modules_unload(int all) { int i; CONF_MODULE *md; @@ -214,7 +214,6 @@ index a19575af37..4f339f4175 100644 - - old_modules = ossl_rcu_deref(&supported_modules); - new_modules = sk_CONF_MODULE_dup(old_modules); -- to_delete = sk_CONF_MODULE_new_null(); - - if (new_modules == NULL) { - ossl_rcu_write_unlock(module_list_lock); @@ -222,6 +221,8 @@ index a19575af37..4f339f4175 100644 return; - } +- to_delete = sk_CONF_MODULE_new_null(); + /* unload modules in reverse order */ - for (i = sk_CONF_MODULE_num(new_modules) - 1; i >= 0; i--) { - md = sk_CONF_MODULE_value(new_modules, i); @@ -255,7 +256,7 @@ index a19575af37..4f339f4175 100644 } /* unload a single module */ -@@ -562,27 +521,23 @@ static void module_free(CONF_MODULE *md) +@@ -563,27 +522,23 @@ static void module_free(CONF_MODULE *md) static int conf_modules_finish_int(void) { CONF_IMODULE *imod; diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec index 01b660c95..42e21411d 100644 --- a/deps-packaging/openssl/cfbuild-openssl.spec +++ b/deps-packaging/openssl/cfbuild-openssl.spec @@ -1,4 +1,4 @@ -%define openssl_version 3.3.1 +%define openssl_version 3.3.2 Summary: CFEngine Build Automation -- openssl Name: cfbuild-openssl diff --git a/deps-packaging/openssl/distfiles b/deps-packaging/openssl/distfiles index 1fdc84437..7b4d50570 100644 --- a/deps-packaging/openssl/distfiles +++ b/deps-packaging/openssl/distfiles @@ -1 +1 @@ -777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e openssl-3.3.1.tar.gz +2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 openssl-3.3.2.tar.gz diff --git a/deps-packaging/openssl/source b/deps-packaging/openssl/source index c68bf3030..13676b6f2 100644 --- a/deps-packaging/openssl/source +++ b/deps-packaging/openssl/source @@ -1 +1 @@ -https://www.openssl.org/source/ +https://github.com/openssl/openssl/releases/download/openssl-3.3.2/ From 432682773bd84cea801a4d35ffaf40e8dc673ae8 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Wed, 2 Oct 2024 10:27:49 -0500 Subject: [PATCH 10/13] Sort postgresql binaries in cfengine-nova-hub package configs Preparation for changes needed in bumping postgresql from 16.3 to 17.0 Ticket: ENT-12140 --- .../cfengine-nova-hub.spec.in | 29 +++++++++--------- .../debian/cfengine-nova-hub.install | 30 +++++++++---------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in index d72ee91ee..29acde02d 100644 --- a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in +++ b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in @@ -256,35 +256,34 @@ exit 0 %{prefix}/bin/createuser %{prefix}/bin/dropdb %{prefix}/bin/dropuser +%{prefix}/bin/initdb +%{prefix}/bin/oid2name +%{prefix}/bin/pg_amcheck +%{prefix}/bin/pg_archivecleanup %{prefix}/bin/pg_basebackup +%{prefix}/bin/pgbench +%{prefix}/bin/pg_checksums %{prefix}/bin/pg_config +%{prefix}/bin/pg_controldata +%{prefix}/bin/pg_ctl %{prefix}/bin/pg_dump %{prefix}/bin/pg_dumpall %{prefix}/bin/pg_isready %{prefix}/bin/pg_receivewal %{prefix}/bin/pg_recvlogical +%{prefix}/bin/pg_resetwal %{prefix}/bin/pg_restore %{prefix}/bin/pg_rewind +%{prefix}/bin/pg_test_fsync +%{prefix}/bin/pg_test_timing +%{prefix}/bin/pg_upgrade %{prefix}/bin/pg_verifybackup +%{prefix}/bin/pg_waldump +%{prefix}/bin/postgres %{prefix}/bin/psql %{prefix}/bin/reindexdb %{prefix}/bin/vacuumdb -#postgresql server -%{prefix}/bin/initdb -%{prefix}/bin/pg_controldata -%{prefix}/bin/pg_ctl -%{prefix}/bin/pg_resetwal -%{prefix}/bin/postgres -%{prefix}/bin/pg_test_timing -%{prefix}/bin/pg_archivecleanup -%{prefix}/bin/pg_amcheck -%{prefix}/bin/oid2name -%{prefix}/bin/pg_upgrade -%{prefix}/bin/pg_checksums -%{prefix}/bin/pg_waldump -%{prefix}/bin/pgbench %{prefix}/bin/vacuumlo -%{prefix}/bin/pg_test_fsync # LMDB %prefix/bin/lmdump %prefix/bin/lmmgr diff --git a/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install b/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install index 99e204845..57e160f22 100644 --- a/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install +++ b/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install @@ -70,34 +70,34 @@ /var/cfengine/bin/createuser /var/cfengine/bin/dropdb /var/cfengine/bin/dropuser +/var/cfengine/bin/initdb +/var/cfengine/bin/oid2name +/var/cfengine/bin/pg_amcheck +/var/cfengine/bin/pg_archivecleanup /var/cfengine/bin/pg_basebackup +/var/cfengine/bin/pgbench +/var/cfengine/bin/pg_checksums /var/cfengine/bin/pg_config +/var/cfengine/bin/pg_controldata +/var/cfengine/bin/pg_ctl /var/cfengine/bin/pg_dump /var/cfengine/bin/pg_dumpall /var/cfengine/bin/pg_isready /var/cfengine/bin/pg_receivewal -/var/cfengine/bin/pg_restore -/var/cfengine/bin/pg_verifybackup -/var/cfengine/bin/psql -/var/cfengine/bin/reindexdb -/var/cfengine/bin/vacuumdb -/var/cfengine/bin/initdb -/var/cfengine/bin/pg_controldata -/var/cfengine/bin/pg_ctl /var/cfengine/bin/pg_recvlogical /var/cfengine/bin/pg_resetwal +/var/cfengine/bin/pg_restore /var/cfengine/bin/pg_rewind -/var/cfengine/bin/postgres +/var/cfengine/bin/pg_test_fsync /var/cfengine/bin/pg_test_timing -/var/cfengine/bin/pg_archivecleanup -/var/cfengine/bin/pg_amcheck -/var/cfengine/bin/oid2name /var/cfengine/bin/pg_upgrade -/var/cfengine/bin/pg_checksums +/var/cfengine/bin/pg_verifybackup /var/cfengine/bin/pg_waldump -/var/cfengine/bin/pgbench +/var/cfengine/bin/postgres +/var/cfengine/bin/psql +/var/cfengine/bin/reindexdb +/var/cfengine/bin/vacuumdb /var/cfengine/bin/vacuumlo -/var/cfengine/bin/pg_test_fsync /var/cfengine/lib/postgresql/* /var/cfengine/share/postgresql/* /var/cfengine/share/doc/postgresql/extension/* From fd6d251b5d22a7dced1175cfec5cbd870a0c3e40 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 12 Sep 2024 08:12:51 -0500 Subject: [PATCH 11/13] Upgrade Perl version to latest for platforms like centos-7 that have insufficient version available Changed check for List::Util module version is OK with $PERL instead of just `perl`. --- build-scripts/install-dependencies | 13 ++++--- build-scripts/perl-488307ffa6.patch | 57 ----------------------------- 2 files changed, 7 insertions(+), 63 deletions(-) delete mode 100644 build-scripts/perl-488307ffa6.patch diff --git a/build-scripts/install-dependencies b/build-scripts/install-dependencies index 8f97d8970..39a7c68f3 100755 --- a/build-scripts/install-dependencies +++ b/build-scripts/install-dependencies @@ -48,7 +48,7 @@ check_and_install_perl() "too old" PERL_OK="no" fi - if ! perl -e 'use List::Util qw(pairs);'; then + if ! $PERL -e 'use List::Util qw(pairs);'; then echo "$PERL has List::Util that does not export pairs. Needs to be at least version 1.29 for OpenSSL version 3.3.2." PERL_OK="no" fi @@ -78,12 +78,13 @@ check_and_install_perl() PERL_EXTRA_FLAGS='-Ud_nexttoward' fi - wget http://www.cpan.org/src/5.0/perl-5.26.1.tar.gz - [ `func_md5 perl-5.26.1.tar.gz` != "a7e5c531ee1719c53ec086656582ea86" ] \ + PERL_VERSION=5.40.0 + PERL_MD5=8da78b1f54b99e97954066d0aaad88bc + wget http://www.cpan.org/src/5.0/perl-${PERL_VERSION}.tar.gz + [ `func_md5 perl-${PERL_VERSION}.tar.gz` != "${PERL_MD5}" ] \ && fatal "perl checksum error" - gzip -dc perl-5.26.1.tar.gz | tar xf - - cd perl-5.26.1 - $PATCH -p1 < $BASEDIR/buildscripts/build-scripts/perl-488307ffa6.patch + gzip -dc perl-${PERL_VERSION}.tar.gz | tar xf - + cd perl-${PERL_VERSION} ./Configure -des -Dprefix=$HOME/perl-my -Dcc=gcc -Dmake=$MAKE \ $PERL_EXTRA_FLAGS $PERL_CFLAGS $PERL_LDFLAGS $PERL_LDDLFLAGS $MAKE diff --git a/build-scripts/perl-488307ffa6.patch b/build-scripts/perl-488307ffa6.patch deleted file mode 100644 index bbb38ca07..000000000 --- a/build-scripts/perl-488307ffa6.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 488307ffa67ce70fc9755e560a74dac04bdcb0e4 Mon Sep 17 00:00:00 2001 -From: Sawyer X -Date: Thu, 28 Sep 2017 22:34:39 +0200 -Subject: [PATCH] Revert "Revert "Fallbacks for Perl_fp_class_denorm()."" - -This reverts commit 2749d0395cc1e21d69af38cde41490699fc6e3ab. - -The original commit: - - commit e77299d3416e7e737523afdc0642734205e46d59 - Author: Jarkko Hietaniemi - Date: Mon May 29 09:28:30 2017 +0300 - - Fallbacks for Perl_fp_class_denorm(). - - These may be needed if the compiler doesn't expose the C99 math - without some special switches. - -This provides a fix for CentOS 5. ---- - perl.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/perl.h b/perl.h -index 504caa911c..6ac9390384 100644 ---- a/perl.h -+++ b/perl.h -@@ -6892,6 +6892,26 @@ extern void moncontrol(int); - # endif - #endif - -+/* We have somehow managed not to define the denormal/subnormal -+ * detection. -+ * -+ * This may happen if the compiler doesn't expose the C99 math like -+ * the fpclassify() without some special switches. Perl tries to -+ * stay C89, so for example -std=c99 is not an option. -+ * -+ * The Perl_isinf() and Perl_isnan() should have been defined even if -+ * the C99 isinf() and isnan() are unavailable, and the NV_MIN becomes -+ * from the C89 DBL_MIN or moral equivalent. */ -+#if !defined(Perl_fp_class_denorm) && defined(Perl_isinf) && defined(Perl_isnan) && defined(NV_MIN) -+# define Perl_fp_class_denorm(x) ((x) != 0.0 && !Perl_isinf(x) && !Perl_isnan(x) && PERL_ABS(x) < NV_MIN) -+#endif -+ -+/* This is not a great fallback: subnormals tests will fail, -+ * but at least Perl will link and 99.999% of tests will work. */ -+#if !defined(Perl_fp_class_denorm) -+# define Perl_fp_class_denorm(x) FALSE -+#endif -+ - #ifdef DOUBLE_IS_IEEE_FORMAT - # define DOUBLE_HAS_INF - # define DOUBLE_HAS_NAN --- -2.15.0-rc1-301-g0bcaefb - From ac07fb1644564680a0778941ae34d0d18db83804 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 17 Sep 2024 10:20:06 -0500 Subject: [PATCH 12/13] Removed dependency tables in 3.24.x LTS branch Added note to refer to master README.md and individual files instead of README.md in LTS branches. Ticket: ENT-12140 Changelog: none --- README.md | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/README.md b/README.md index aab9e2da3..f743c8297 100644 --- a/README.md +++ b/README.md @@ -121,47 +121,9 @@ avoid accidentally regenerating files transferred from buildslave: ## Dependencies -File `install-dependencies` and the relevant subdirectories in `deps-packaging` are the source of this information. - -### Agent Dependencies - -| CFEngine version | 3.18.x | 3.21.x | master | Notes | -| -------------------------------------------------------------------------------- | ------ | ------ | ------ | ------------------------ | -| [diffutils](https://ftpmirror.gnu.org/diffutils/) | 3.10 | 3.10 | 3.10 | | -| [libacl](http://download.savannah.gnu.org/releases/acl/) | 2.3.2 | 2.3.2 | 2.3.2 | | -| [libattr](http://download.savannah.gnu.org/releases/attr/) | 2.5.2 | 2.5.2 | 2.5.2 | | -| [libcurl](http://curl.haxx.se/download.html) | 8.7.1 | 8.7.1 | 8.8.0 | | -| [libgnurx](http://www.gnu.org/software/rx/rx.html) | 2.5.1 | 2.5.1 | 2.5.1 | Windows Enterprise agent | -| [libiconv](http://ftp.gnu.org/gnu/libiconv/) | 1.17 | 1.17 | 1.17 | Needed by libxml2 | -| [libxml2](http://xmlsoft.org/sources/) | 2.12.6 | 2.12.6 | 2.13.1 | | -| [libyaml](http://pyyaml.org/wiki/LibYAML) | 0.2.5 | 0.2.5 | 0.2.5 | | -| [LMDB](https://github.com/LMDB/lmdb/) | 0.9.32 | 0.9.32 | 0.9.33 | | -| [OpenLDAP](http://www.openldap.org/software/download/OpenLDAP/openldap-release/) | 2.6.7 | 2.6.7 | 2.6.8 | Enterprise agent only | -| [OpenSSL](http://openssl.org/) | 1.1.1w | 3.0.13 | 3.3.1 | | -| [PCRE](http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) | 8.45 | 8.45 | - | | -| [PCRE2](https://github.com/PCRE2Project/pcre2/releases/) | - | - | 10.44 | | -| [pthreads-w32](ftp://sourceware.org/pub/pthreads-win32/) | 2-9-1 | 2-9-1 | 2-9-1 | Windows Enterprise agent | -| [SASL2](https://cyrusimap.org/mediawiki/index.php/Downloads) | 2.1.28 | 2.1.28 | 2.1.28 | Solaris Enterprise agent | -| [zlib](http://www.zlib.net/) | 1.3.1 | 1.3.1 | 1.3.1 | | -| libgcc | | | | AIX and Solaris only | - -### Enterprise Hub dependencies: - -| CFEngine version | 3.18.x | 3.21.x | master | -| --------------------------------------------------- | ------ | ------ | ------ | -| [Apache](http://httpd.apache.org/) | 2.4.59 | 2.4.59 | 2.4.59 | -| [APR](https://apr.apache.org/) | 1.7.4 | 1.7.4 | 1.7.4 | -| [apr-util](https://apr.apache.org/) | 1.6.3 | 1.6.3 | 1.6.3 | -| [Git](https://www.kernel.org/pub/software/scm/git/) | 2.45.1 | 2.45.1 | 2.45.2 | -| [libexpat](https://libexpat.github.io/) | - | - | 2.5.0 | -| [PHP](http://php.net/) | 8.0.30 | 8.2.19 | 8.3.8 | -| [PostgreSQL](http://www.postgresql.org/) | 13.14 | 15.6 | 16.3 | -| [rsync](https://download.samba.org/pub/rsync/) | 3.3.0 | 3.3.0 | 3.3.0 | +For LTS branches, https://github.com/cfengine/buildscripts?tab=readme-ov-file#dependencies is the source of truth for latest versions and is based on information in `build-scripts/install-dependencies` and relevant subdirectories in `deps-packaging`. * [MinGW-w64](http://sourceforge.net/projects/mingw-w64/) **OUTDATED** needed for [redmine#2932](https://dev.cfengine.com/issues/2932) * Requires change of buildslaves (autobuild) -Other dependencies (**find out why they are needed!**) - -* autoconf 2.69 From d183e1521d0563d91422c6da57b1794b114bd54a Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Mon, 7 Oct 2024 09:29:41 -0500 Subject: [PATCH 13/13] Updated postgresql from 16.3 to 16.4 --- deps-packaging/postgresql/cfbuild-postgresql.spec | 2 +- deps-packaging/postgresql/distfiles | 2 +- deps-packaging/postgresql/source | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps-packaging/postgresql/cfbuild-postgresql.spec b/deps-packaging/postgresql/cfbuild-postgresql.spec index f7dce4ae2..d79ff369d 100644 --- a/deps-packaging/postgresql/cfbuild-postgresql.spec +++ b/deps-packaging/postgresql/cfbuild-postgresql.spec @@ -1,4 +1,4 @@ -%define postgresql_version 16.3 +%define postgresql_version 16.4 Summary: CFEngine Build Automation -- postgresql Name: cfbuild-postgresql diff --git a/deps-packaging/postgresql/distfiles b/deps-packaging/postgresql/distfiles index d0b5e1762..404385185 100644 --- a/deps-packaging/postgresql/distfiles +++ b/deps-packaging/postgresql/distfiles @@ -1 +1 @@ -331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585 postgresql-16.3.tar.bz2 +971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f postgresql-16.4.tar.bz2 diff --git a/deps-packaging/postgresql/source b/deps-packaging/postgresql/source index 5b1c60e6f..3cfda5297 100644 --- a/deps-packaging/postgresql/source +++ b/deps-packaging/postgresql/source @@ -1 +1 @@ -https://ftp.postgresql.org/pub/source/v16.3/ +https://ftp.postgresql.org/pub/source/v16.4/