V2.x fedora38

Makefile

@@ -231,7 +231,7 @@ amd64-ubuntu: ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg
 amd64-debian: debian8 debian8-dbg debian9 debian9-dbg debian10 debian10-dbg debian11 debian11-clang debian11-dbg
 .PHONY: amd64-debian
 
-amd64-fedora: fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg fedora36 fedora36-clang fedora36-dbg fedora37 fedora37-clang fedora37-dbg
+amd64-fedora: fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg fedora36 fedora36-clang fedora36-dbg fedora37 fedora37-clang fedora37-dbg fedora38 fedora38-clang fedora38-dbg
 .PHONY: amd64-fedora
 
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
@@ -255,7 +255,7 @@ arm64-debian: debian9-arm64 debian10-arm64 debian11-arm64
 arm64-ubuntu: ubuntu16-arm64 ubuntu18-arm64 ubuntu20-arm64 ubuntu22-arm64
 .PHONY: arm64-ubuntu
 
-arm64-fedora: fedora33-arm64 fedora34-arm64 fedora36-arm64 fedora37-arm64
+arm64-fedora: fedora33-arm64 fedora34-arm64 fedora36-arm64 fedora37-arm64 fedora38-arm64
 .PHONY: arm64-fedora
 
 arm64-opensuse: opensuse15-arm64
@@ -349,16 +349,29 @@ fedora36-dbg: binaries/proxysql-${CURVER}-1-dbg-fedora36.x86_64.rpm
 
 
 fedora37: binaries/proxysql-${CURVER}-1-fedora37.x86_64.rpm
-.PHONY: fedora36
+.PHONY: fedora37
 
 fedora37-arm64: binaries/proxysql-${CURVER}-1-fedora37.aarch64.rpm
-.PHONY: fedora36-arm64
+.PHONY: fedora37-arm64
 
 fedora37-clang: binaries/proxysql-${CURVER}-1-fedora37-clang.x86_64.rpm
-.PHONY: fedora36-clang
+.PHONY: fedora37-clang
 
 fedora37-dbg: binaries/proxysql-${CURVER}-1-dbg-fedora37.x86_64.rpm
-.PHONY: fedora36-dbg
+.PHONY: fedora37-dbg
+
+
+fedora38: binaries/proxysql-${CURVER}-1-fedora38.x86_64.rpm
+.PHONY: fedora38
+
+fedora38-arm64: binaries/proxysql-${CURVER}-1-fedora38.aarch64.rpm
+.PHONY: fedora38-arm64
+
+fedora38-clang: binaries/proxysql-${CURVER}-1-fedora38-clang.x86_64.rpm
+.PHONY: fedora38-clang
+
+fedora38-dbg: binaries/proxysql-${CURVER}-1-dbg-fedora38.x86_64.rpm
+.PHONY: fedora38-dbg
 
 
 ubuntu14: binaries/proxysql_${CURVER}-ubuntu14_amd64.deb
@@ -615,6 +628,23 @@ binaries/proxysql-${CURVER}-1-dbg-fedora37.x86_64.rpm:
 	docker-compose rm -f
 
 
+binaries/proxysql-${CURVER}-1-fedora38.x86_64.rpm:
+	docker-compose up fedora38_build
+	docker-compose rm -f
+
+binaries/proxysql-${CURVER}-1-fedora38.aarch64.rpm:
+	docker-compose up fedora38_build
+	docker-compose rm -f
+
+binaries/proxysql-${CURVER}-1-fedora38-clang.x86_64.rpm:
+	docker-compose up fedora38_clang_build
+	docker-compose rm -f
+
+binaries/proxysql-${CURVER}-1-dbg-fedora38.x86_64.rpm:
+	docker-compose up fedora38_dbg_build
+	docker-compose rm -f
+
+
 binaries/proxysql_${CURVER}-ubuntu14_amd64.deb:
 	docker-compose up ubuntu14_build
 	docker-compose rm -f

deps/Makefile

@@ -199,6 +199,7 @@ ifeq ($(IS_CXX17), 1)
 	echo ">>> Clickhouse CXX17"
 	cd clickhouse-cpp && ln -fs clickhouse-cpp-2.3.0 clickhouse-cpp
 	cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz && sync
+	cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch
 else
 	echo ">>> Clickhouse CXX11"
 	cd clickhouse-cpp && ln -fs clickhouse-cpp-1.0.0 clickhouse-cpp

deps/clickhouse-cpp/wire_format.patch

@@ -0,0 +1,10 @@
+--- clickhouse-cpp/clickhouse/base/wire_format.h	2022-11-23 09:33:15.000000000 +0000
++++ clickhouse-cpp/clickhouse/base/wire_format.h	2023-05-02 19:17:50.000000000 +0000
+@@ -1,6 +1,7 @@
+ #pragma once
+
+ #include <string>
++#include <stdint.h>
+
+ namespace clickhouse {
+

deps/mariadb-client-library/mysql.h.patch

@@ -24,3 +24,12 @@
  int STDCALL mysql_set_character_set_cont(int *ret, MYSQL *mysql,
                                                    int status);
  int STDCALL mysql_change_user_start(my_bool *ret, MYSQL *mysql,
+@@ -752,7 +752,7 @@
+   unsigned long (STDCALL *mysql_thread_id)(MYSQL *mysql);
+   const char * (STDCALL *mysql_character_set_name)(MYSQL *mysql);
+   void (STDCALL *mysql_get_character_set_info)(MYSQL *mysql, MY_CHARSET_INFO *cs);
+-  int (STDCALL *mysql_set_character_set)(MYSQL *mysql, const char *csname);
++  int (STDCALL *mysql_set_character_set)(MYSQL *mysql, const char *csname, uint charsetnr);
+   my_bool (*mariadb_get_infov)(MYSQL *mysql, enum mariadb_value value, void *arg, ...);
+   my_bool (STDCALL *mariadb_get_info)(MYSQL *mysql, enum mariadb_value value, void *arg);
+   MYSQL * (STDCALL *mysql_init)(MYSQL *mysql);

docker-compose.yml

@@ -243,6 +243,37 @@ services:
       - PKG_RELEASE=dbg-fedora37
       - PROXYSQL_BUILD_TYPE=debug
 
+####################################################################################################
+  fedora38_build:
+    image: proxysql/packaging:build-fedora37
+    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:
+      - MAKE
+      - MAKEOPT
+      - CURVER
+      - PKG_RELEASE=fedora38
+      - PROXYSQL_BUILD_TYPE=clickhouse
+    command: bash -l -c /opt/entrypoint/entrypoint.bash
+
+  fedora38_clang_build:
+    extends:
+      service: fedora38_build
+    image: proxysql/packaging:build-clang-fedora38
+    environment:
+      - PKG_RELEASE=fedora38-clang
+      - PROXYSQL_BUILD_TYPE=clickhouse
+
+  fedora38_dbg_build:
+    extends:
+      service: fedora38_build
+    environment:
+      - PKG_RELEASE=dbg-fedora38
+      - PROXYSQL_BUILD_TYPE=debug
+
 ####################################################################################################
 ####################################################################################################
   debian8_build: