Merge pull request #1491 from cfengine/3.21.x-deps-2024-08-23_09_24_4…

…8_174551 ENT-12140: deps upgrades (3.21)
cfengine · Sep 6, 2024 · ed7a674 · ed7a674
2 parents 532ec30 + 0205cc5
commit ed7a674
Show file tree

Hide file tree

Showing 40 changed files with 50 additions and 176 deletions.
diff --git a/build-scripts/compile-options b/build-scripts/compile-options
@@ -100,7 +100,6 @@ EMBEDDED_DB="lmdb"
 ############### Fill in build dependencies in DEPS variable ################
 
 DEPS=
-[ $OS_FAMILY = linux ]  &&  var_append DEPS "lcov"
 [ $OS_FAMILY = mingw ]  &&  var_append DEPS "pthreads-w32 libgnurx"
 
 # libgcc_s.so is needed before we compile any other dependency

diff --git 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
@@ -1 +1 @@
-e4ec4ce12c6c8f5a794dc2263d126cb1d6ef667f034c4678ec945d61286e8b0f  httpd-2.4.59.tar.gz
+3e2404d762a2da03560d7ada379ba1599d32f04a0d70ad6ff86f44325f2f062d  httpd-2.4.62.tar.gz
diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec
@@ -1,4 +1,4 @@
-%define git_version 2.45.1
+%define git_version 2.46.0
 
 Summary: CFEngine Build Automation -- git
 Name: cfbuild-git

diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles
@@ -1 +1 @@
-10acb581993061e616be9c5674469335922025a666318e0748cb8306079fef24  git-2.45.1.tar.gz
+b138811e16838f669a2516e40f09d50500e1c7fc541b5ab50ce84b98585e5230  git-2.46.0.tar.gz
diff --git a/deps-packaging/lcov/cfbuild-lcov.spec b/deps-packaging/lcov/cfbuild-lcov.spec
diff --git a/deps-packaging/lcov/debian/cfbuild-lcov.install b/deps-packaging/lcov/debian/cfbuild-lcov.install
diff --git a/deps-packaging/lcov/debian/compat b/deps-packaging/lcov/debian/compat
diff --git a/deps-packaging/lcov/debian/control b/deps-packaging/lcov/debian/control
diff --git a/deps-packaging/lcov/debian/copyright b/deps-packaging/lcov/debian/copyright
diff --git a/deps-packaging/lcov/debian/rules b/deps-packaging/lcov/debian/rules
diff --git a/deps-packaging/lcov/distfiles b/deps-packaging/lcov/distfiles
diff --git a/deps-packaging/lcov/hpux/build b/deps-packaging/lcov/hpux/build
diff --git a/deps-packaging/lcov/hpux/packages b/deps-packaging/lcov/hpux/packages
diff --git a/deps-packaging/lcov/solaris/build b/deps-packaging/lcov/solaris/build
diff --git a/deps-packaging/lcov/solaris/packages b/deps-packaging/lcov/solaris/packages
diff --git a/deps-packaging/lcov/source b/deps-packaging/lcov/source
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.7.1
+%define curl_version 8.9.1
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl-hub

diff --git a/deps-packaging/libcurl-hub/distfiles b/deps-packaging/libcurl-hub/distfiles
@@ -1 +1 @@
-f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495  curl-8.7.1.tar.gz
+291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5  curl-8.9.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.7.1
+%define curl_version 8.9.1
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl

diff --git a/deps-packaging/libcurl/distfiles b/deps-packaging/libcurl/distfiles
@@ -1 +1 @@
-f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495  curl-8.7.1.tar.gz
+291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5  curl-8.9.1.tar.gz
diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec
@@ -1,4 +1,4 @@
-%define libxml_version 2.12.6
+%define libxml_version 2.13.3
 
 Summary: CFEngine Build Automation -- libxml2
 Name: cfbuild-libxml2

diff --git a/deps-packaging/libxml2/distfiles b/deps-packaging/libxml2/distfiles
@@ -1 +1 @@
-889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb  libxml2-2.12.6.tar.xz
+0805d7c180cf09caad71666c7a458a74f041561a532902454da5047d83948138  libxml2-2.13.3.tar.xz
diff --git a/deps-packaging/libxml2/source b/deps-packaging/libxml2/source
@@ -1 +1 @@
-https://download.gnome.org/sources/libxml2/2.12/
+https://download.gnome.org/sources/libxml2/2.13/
diff --git a/deps-packaging/lmdb/cfbuild-lmdb.spec b/deps-packaging/lmdb/cfbuild-lmdb.spec
@@ -1,4 +1,4 @@
-%define lmdb_version 0.9.32
+%define lmdb_version 0.9.33
 
 Summary: CFEngine Build Automation -- lmdb
 Name: cfbuild-lmdb

diff --git a/deps-packaging/lmdb/distfiles b/deps-packaging/lmdb/distfiles
@@ -1 +1 @@
-c0937223bba3c37c896809883a3c9b43049354578b239d6ed2476236a87f40c9  openldap-LMDB_0.9.32.tar.gz
+476801f5239c88c7de61c3390502a5d13965ecedef80105b5fb0fcb8373d1e53  openldap-LMDB_0.9.33.tar.gz
diff --git a/deps-packaging/lmdb/source b/deps-packaging/lmdb/source
@@ -1 +1 @@
-https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.32/
+https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.33/
diff --git a/deps-packaging/openldap/cfbuild-openldap-aix.spec b/deps-packaging/openldap/cfbuild-openldap-aix.spec
@@ -1,4 +1,4 @@
-%define openldap_version 2.6.7
+%define openldap_version 2.6.8
 
 Summary: CFEngine Build Automation -- openldap
 Name: cfbuild-openldap

diff --git a/deps-packaging/openldap/cfbuild-openldap.spec b/deps-packaging/openldap/cfbuild-openldap.spec
@@ -1,4 +1,4 @@
-%define openldap_version 2.6.7
+%define openldap_version 2.6.8
 
 Summary: CFEngine Build Automation -- openldap
 Name: cfbuild-openldap

diff --git a/deps-packaging/openldap/distfiles b/deps-packaging/openldap/distfiles
@@ -1 +1 @@
-cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930  openldap-2.6.7.tgz
+48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e  openldap-2.6.8.tgz
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.13
+%define openssl_version 3.0.14
 
 Summary: CFEngine Build Automation -- openssl
 Name: cfbuild-openssl

diff --git a/deps-packaging/openssl/distfiles b/deps-packaging/openssl/distfiles
@@ -1 +1 @@
-88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313  openssl-3.0.13.tar.gz
+eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca  openssl-3.0.14.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.2.19
+%define php_version 8.3.10
 
 Summary: CFEngine Build Automation -- php
 Name: cfbuild-php
@@ -34,7 +34,7 @@ fi
   --with-iconv \
   --with-zlib=%{prefix} \
   --with-libmbfl=%{prefix} \
-  --enable-mbstring \
+  --enable-mbstring=shared,%{prefix} \
   --enable-sockets \
   --disable-mbregex \
   --without-fpm-user \
@@ -125,6 +125,7 @@ sed -ri 's/^(\s|;)phar.readonly = On/phar.readonly = Off/' ${RPM_BUILD_ROOT}%{pr
 
 echo "extension=curl.so" >> ${RPM_BUILD_ROOT}%{prefix}/httpd/php/lib/curl.ini
 echo "extension=openssl.so" >>${RPM_BUILD_ROOT}%{prefix}/httpd/php/lib/openssl.ini
+echo "extension=mbstring.so" >>${RPM_BUILD_ROOT}%{prefix}/httpd/php/lib/mbstring.ini
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/httpd/conf
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/httpd/php/lib/php/.channels
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/httpd/php/lib/php/.depdb

diff --git a/deps-packaging/php/debian/rules b/deps-packaging/php/debian/rules
@@ -12,6 +12,7 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
+	patch -p0 < $(CURDIR)/old-gcc-check-avx512-better.patch
 	./configure --prefix=$(PREFIX)/httpd/php \
 --with-config-file-scan-dir=$(PREFIX)/httpd/php/lib \
 --with-apxs2=$(PREFIX)/httpd/bin/apxs \
@@ -22,7 +23,7 @@ build-stamp:
 --with-iconv \
 --with-zlib=$(PREFIX) \
 --with-libmbfl=$(PREFIX) \
---enable-mbstring \
+--enable-mbstring=shared,$(PREFIX) \
 --enable-sockets \
 --disable-mbregex \
 --without-fpm-user \
@@ -116,6 +117,7 @@ install: build
 
 	echo "extension=curl.so" >> $(CURDIR)/debian/tmp$(PREFIX)/httpd/php/lib/curl.ini
 	echo "extension=openssl.so" >> $(CURDIR)/debian/tmp$(PREFIX)/httpd/php/lib/openssl.ini
+	echo "extension=mbstring.so" >> $(CURDIR)/debian/tmp$(PREFIX)/httpd/php/lib/mbstring.ini
 
 	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/httpd/conf
 

diff --git a/deps-packaging/php/distfiles b/deps-packaging/php/distfiles
@@ -1 +1 @@
-8bfdd20662b41a238a5acd84fab3e05c36a685fcb56e6d8ac18eeb87057ab2bc  php-8.2.19.tar.gz
+d0b4dd5ff465053248fd28dacf2fe0bed79deaaef657890cecb6bfcb73996dcd  php-8.3.10.tar.gz
diff --git a/deps-packaging/php/old-gcc-check-avx512-better.patch b/deps-packaging/php/old-gcc-check-avx512-better.patch
@@ -0,0 +1,21 @@
+--- configure.old
++++ configure
+@@ -18114,6 +18114,10 @@ printf %s "checking for avx512 supports in compiler... " >&6; }
+     #include <immintrin.h>
+       int main(void) {
+         __m512i mask = _mm512_set1_epi32(0x1);
++        __builtin_cpu_supports("avx512dq");
++        __builtin_cpu_supports("avx512cd");
++        __builtin_cpu_supports("avx512bw");
++        __builtin_cpu_supports("avx512vl");
+         char out[32];
+         _mm512_storeu_si512(out, _mm512_shuffle_epi8(mask, mask));
+         return 0;
+@@ -18152,6 +18156,7 @@ printf %s "checking for avx512 vbmi supports in compiler... " >&6; }
+
+     #include <immintrin.h>
+       int main(void) {
++        __builtin_cpu_supports("avx512vbmi");
+         __m512i mask = _mm512_set1_epi32(0x1);
+         char out[32];
+         _mm512_storeu_si512(out, _mm512_permutexvar_epi8(mask, mask));
diff --git a/deps-packaging/postgresql/cfbuild-postgresql.spec b/deps-packaging/postgresql/cfbuild-postgresql.spec
@@ -1,4 +1,4 @@
-%define postgresql_version 15.6
+%define postgresql_version 15.8
 
 Summary: CFEngine Build Automation -- postgresql
 Name: cfbuild-postgresql

diff --git a/deps-packaging/postgresql/distfiles b/deps-packaging/postgresql/distfiles
@@ -1 +1 @@
-8455146ed9c69c93a57de954aead0302cafad035c2b242175d6aa1e17ebcb2fb  postgresql-15.6.tar.bz2
+4403515f9a69eeb3efebc98f30b8c696122bfdf895e92b3b23f5b8e769edcb6a  postgresql-15.8.tar.bz2
diff --git a/deps-packaging/postgresql/source b/deps-packaging/postgresql/source
@@ -1 +1 @@
-https://ftp.postgresql.org/pub/source/v15.6/
+https://ftp.postgresql.org/pub/source/v15.8/
diff --git a/deps-packaging/release-monitoring.json b/deps-packaging/release-monitoring.json
@@ -4,7 +4,6 @@
         "apr-util":"96",
         "diffutils":"436",
         "git":"20450",
-        "lcov":"346328",
         "libacl":"16",
         "libattr":"137",
         "libcurl":"381",