V3.0 add fedora42 builds

Makefile

@@ -318,7 +318,7 @@ amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensu
 amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg
 amd64-centos: centos9 centos9-clang centos9-dbg
 amd64-debian: debian12 debian12-clang debian12-dbg
-amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg
+amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg fedora42 fedora42-clang fedora42-dbg
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
 amd64-ubuntu: ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
 amd64-pkglist:
@@ -329,7 +329,7 @@ arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensu
 arm64-almalinux: almalinux8 almalinux9
 arm64-centos: centos9
 arm64-debian: debian12
-arm64-fedora: fedora40 fedora41
+arm64-fedora: fedora40 fedora41 fedora42
 arm64-opensuse: opensuse15
 arm64-ubuntu: ubuntu22 ubuntu24
 arm64-pkglist:

deps/Makefile

@@ -60,9 +60,13 @@ default: $(targets)
 
 ### deps targets
 
+include ../common_mk/openssl_flags.mk
+include ../common_mk/openssl_version_check.mk
+
+
 libinjection/libinjection/src/libinjection.a:
 	cd libinjection && rm -rf libinjection-*/ || true
-	cd libinjection && tar -zxf libinjection-3.10.0.tar.gz
+	cd libinjection && tar -zxf libinjection-*.tar.gz
 ifneq ($(CENTOSVER),6)
 	cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff
 	cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch
@@ -76,8 +80,6 @@ endif
 
 libinjection: libinjection/libinjection/src/libinjection.a
 
-include ../common_mk/openssl_flags.mk
-include ../common_mk/openssl_version_check.mk
 
 libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a
 	cd libhttpserver && rm -rf libhttpserver-*/ || true
@@ -114,8 +116,10 @@ coredumper/coredumper/src/libcoredumper.a:
 	cd coredumper/coredumper && patch -p1 < ../includes.patch
 	cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug
 	cd coredumper/coredumper && CC=${CC} CXX=${CXX} ${MAKE}
+
 coredumper: coredumper/coredumper/src/libcoredumper.a
 
+
 curl/curl/lib/.libs/libcurl.a:
 	cd curl && rm -rf curl-*/ || true
 	cd curl && tar -zxf curl-*.tar.gz
@@ -156,20 +160,20 @@ lz4/lz4/lib/liblz4.a:
 lz4: lz4/lz4/lib/liblz4.a
 
 
-clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a:
+clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a:
 	cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true
-	cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz
-	cd clickhouse-cpp && ln -fs clickhouse-cpp-*/ clickhouse-cpp
-	cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch
+	cd clickhouse-cpp && tar -zxf clickhouse-cpp-*.tar.gz
+	cd clickhouse-cpp && ln -fsT clickhouse-cpp-*/ clickhouse-cpp
+	cd clickhouse-cpp/clickhouse-cpp && patch -p0 < ../fix_ciso646.patch
 	cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
 	cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE}
 
-clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a
+clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a
 
 
 libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
 	cd libdaemon && rm -rf libdaemon-*/ || true
-	cd libdaemon && tar -zxf libdaemon-0.14.tar.gz
+	cd libdaemon && tar -zxf libdaemon-*.tar.gz
 	cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch
 	cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples
 	cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
@@ -179,7 +183,7 @@ libdaemon: libdaemon/libdaemon/libdaemon/.libs/libdaemon.a
 
 jemalloc/jemalloc/lib/libjemalloc.a:
 	cd jemalloc && rm -rf jemalloc-*/ || true
-	cd jemalloc && tar --no-same-owner -jxf jemalloc-5.2.0.tar.bz2
+	cd jemalloc && tar --no-same-owner -jxf jemalloc-*.tar.bz2
 	cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue823.520.patch
 	cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue2358.patch
 	cd jemalloc/jemalloc && patch -p0 < ../nothrow.patch
@@ -192,7 +196,7 @@ jemalloc: jemalloc/jemalloc/lib/libjemalloc.a
 
 mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a:
 	cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true
-	cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz
+	cd mariadb-client-library && tar -zxf mariadb-connector-c-*-src.tar.gz
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch
 	cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
 ifeq ($(PROXYDEBUG),1)
@@ -234,6 +238,8 @@ endif
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_rpl.patch
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../cmakelists.txt.patch
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_lib.c.metadata_column_check.patch
+	cd mariadb-client-library/mariadb_client && patch -p0 < ../fix_bool.patch
+
 	cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE} mariadbclient
 #	cd mariadb-client-library/mariadb_client/include && make my_config.h
 
@@ -252,13 +258,15 @@ sqlite3/sqlite3/sqlite3.o:
 
 sqlite3: sqlite3/sqlite3/sqlite3.o
 
-libconfig/libconfig/lib/.libs/libconfig++.a:
+
+libconfig/libconfig/out/libconfig++.a:
 	cd libconfig && rm -rf libconfig-*/ || true
 	cd libconfig && tar -zxf libconfig-*.tar.gz
-	cd libconfig/libconfig && ./configure --disable-examples
+	cd libconfig && ln -fsT libconfig-*/ libconfig
+	cd libconfig/libconfig && cmake -DBUILD_SHARED_LIBS=0 -DBUILD_EXAMPLES=0 -DBUILD_TESTS=0 -DBUILD_FUZZERS=0 .
 	cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE}
 
-libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
+libconfig: libconfig/libconfig/out/libconfig++.a
 
 
 prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
@@ -301,9 +309,11 @@ pcre/pcre/.libs/libpcre.a:
 
 pcre: pcre/pcre/.libs/libpcre.a
 
+
 postgresql/postgresql/src/interfaces/libpq/libpq.a:
 	cd postgresql && rm -rf postgresql-*/ || true
 	cd postgresql && tar -zxf postgresql-*.tar.gz
+	cd postgresql && ln -fsT postgresql-*/ postgresql
 	cd postgresql/postgresql && patch -p0 < ../get_result_from_pgconn.patch
 	cd postgresql/postgresql && patch -p0 < ../handle_row_data.patch
 	cd postgresql/postgresql && patch -p0 < ../fmt_err_msg.patch
@@ -314,6 +324,7 @@ postgresql/postgresql/src/interfaces/libpq/libpq.a:
 
 postgresql: postgresql/postgresql/src/interfaces/libpq/libpq.a
 
+
 libusual/libusual/.libs/libusual.a:
 	cd libusual && rm -rf libusual-*/ || true
 	cd libusual && tar -zxf libusual-*.tar.gz
@@ -323,12 +334,14 @@ libusual/libusual/.libs/libusual.a:
 
 libusual: libusual/libusual/.libs/libusual.a
 
+
 libscram/lib/libscram.a:postgresql/postgresql/src/interfaces/libpq/libpq.a 
 	cd libscram && rm -rf lib/* || true
 	cd libscram && CC=${CC} CXX=${CXX} ${MAKE} LIBOPENSSL_DIR="$(SSL_IDIR)" POSTGRESQL_DIR="$(shell pwd)/postgresql/postgresql/"
 
 libscram: libscram/lib/libscram.a
 
+
 ### clean targets
 
 cleanpart:
@@ -348,7 +361,7 @@ cleanall:
 	cd re2 && rm -rf re2-*/ || true
 	cd pcre && rm -rf pcre-*/ || true
 	cd sqlite3 && rm -rf sqlite-amalgamation-*/ || true
-	cd clickhouse-cpp/ && rm -rf clickhouse-cpp-* || true
+	cd clickhouse-cpp/ && rm -rf clickhouse-cpp-*/ || true
 	cd lz4 && rm -rf lz4-*/ || true
 	cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true
 	cd curl && rm -rf curl-*/ || true

deps/clickhouse-cpp/clickhouse-cpp

@@ -1 +1 @@
-clickhouse-cpp-2.3.0
+clickhouse-cpp-2.5.1/

deps/clickhouse-cpp/fix_ciso646.patch

@@ -0,0 +1,16 @@
+diff -rau clickhouse-cpp-2.5.1.O/contrib/absl/absl/base/options.h clickhouse-cpp-2.5.1/contrib/absl/absl/base/options.h
+--- contrib/absl/absl/base/options.h	2023-09-30 00:53:54.000000000 +0000
++++ contrib/absl/absl/base/options.h	2025-05-27 09:27:52.020638618 +0000
+@@ -70,7 +70,11 @@
+ // Include a standard library header to allow configuration based on the
+ // standard library in use.
+ #ifdef __cplusplus
+-#include <ciso646>
++#if __has_include(<version>)
++#include <version>
++#else
++#include <ciso646>
++#endif
+ #endif
+
+ // -----------------------------------------------------------------------------

deps/libconfig/libconfig

@@ -1 +1 @@
-libconfig-1.7.3
+libconfig-1.8/

deps/mariadb-client-library/fix_bool.patch

@@ -0,0 +1,43 @@
+--- include/ma_global.h	2023-11-01 10:28:04.000000000 +0000
++++ include/ma_global.h	2025-05-27 08:50:58.456939147 +0000
+@@ -684,7 +684,7 @@
+ typedef char		my_bool; /* Small bool */
+ typedef unsigned long long my_ulonglong;
+ #if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
+-typedef char		bool;	/* Ordinary boolean values 0 1 */
++typedef char		bbool;	/* Ordinary boolean values 0 1 */
+ #endif
+ 	/* Macros for converting *constants* to the right type */
+ #define INT8(v)		(int8) (v)
+--- unittest/libmariadb/ssl.c	2023-11-01 10:28:04.000000000 +0000
++++ unittest/libmariadb/ssl.c	2025-05-27 08:50:58.459166509 +0000
+@@ -1238,7 +1238,7 @@
+ static int test_mdev14101(MYSQL *my __attribute__((unused)))
+ {
+   struct {
+-    bool do_yassl;
++    bbool do_yassl;
+     const char *opt_tls_version;
+     const char *expected;
+   } combinations[]= {
+@@ -1251,9 +1251,9 @@
+
+   int i;
+ #ifdef HAVE_SCHANNEL
+-  bool skip_tlsv12= 1;
++  bbool skip_tlsv12= 1;
+ #else
+-  bool skip_tlsv12= !have_openssl;
++  bbool skip_tlsv12= !have_openssl;
+ #endif
+
+ #if defined(HAVE_OPENSSL) && defined(TLS1_3_VERSION)
+@@ -1264,7 +1264,7 @@
+   for (i=0; combinations[i].expected; i++)
+   {
+     MYSQL *mysql;
+-    bool val=1;
++    bbool val=1;
+     char *tls_version;
+
+     if (!combinations[i].do_yassl && skip_tlsv12)

deps/postgresql/postgresql

@@ -1 +1 @@
-postgresql-16.3
+postgresql-16.9/

docker-compose.yml

@@ -104,6 +104,34 @@ services:
       - PKG_RELEASE=dbg-fedora41
       - PROXYSQL_BUILD_TYPE=debug
 
+####################################################################################################
+  fedora42_build:
+    extends:
+      service: _build
+    image: proxysql/packaging:build-fedora42-v3.0.2
+    volumes:
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros
+      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - PKG_RELEASE=fedora42
+      - PROXYSQL_BUILD_TYPE=clickhouse
+
+  fedora42_clang_build:
+    extends:
+      service: fedora42_build
+    image: proxysql/packaging:build-clang-fedora42-v3.0.2
+    environment:
+      - PKG_RELEASE=fedora42-clang
+
+  fedora42_dbg_build:
+    extends:
+      service: fedora42_build
+    environment:
+      - PKG_RELEASE=dbg-fedora42
+      - PROXYSQL_BUILD_TYPE=debug
+
 ####################################################################################################
 ####################################################################################################
   debian12_build:

include/btree.h

@@ -109,6 +109,7 @@
 #include <iostream>
 #include <iterator>
 #include <limits>
+#include <cstdint>
 #include <type_traits>
 #include <new>
 #include <ostream>