Skip to content

V3.0.2 add new distros #5017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 12 commits into
base: v3.0
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -315,21 +315,21 @@ pkglist: $(REL_ARCH)-pkglist

amd64-%: SYS_ARCH := x86_64
amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensuse amd64-almalinux
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-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg almalinux10 almalinux10-clang almalinux10-dbg
amd64-centos: centos9 centos9-clang centos9-dbg centos10 centos10-clang centos10-dbg
amd64-debian: debian12 debian12-clang debian12-dbg debian13 debian13-clang debian13-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:
@${MAKE} -nk amd64-packages 2>/dev/null | grep -Po '(?<=binaries/)proxysql\S+$$'

arm64-%: SYS_ARCH := aarch64
arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux
arm64-almalinux: almalinux8 almalinux9
arm64-centos: centos9
arm64-debian: debian12
arm64-fedora: fedora40 fedora41
arm64-almalinux: almalinux8 almalinux9 almalinux10
arm64-centos: centos9 centos10
arm64-debian: debian12 debian13
arm64-fedora: fedora40 fedora41 fedora42
arm64-opensuse: opensuse15
arm64-ubuntu: ubuntu22 ubuntu24
arm64-pkglist:
Expand Down
43 changes: 28 additions & 15 deletions deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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

Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps/clickhouse-cpp/clickhouse-cpp
Binary file added deps/clickhouse-cpp/clickhouse-cpp-2.5.1.tar.gz
Binary file not shown.
16 changes: 16 additions & 0 deletions deps/clickhouse-cpp/fix_ciso646.patch
Original file line number Diff line number Diff line change
@@ -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

// -----------------------------------------------------------------------------
Binary file removed deps/clickhouse-cpp/v2.3.0.tar.gz
Binary file not shown.
10 changes: 0 additions & 10 deletions deps/clickhouse-cpp/wire_format.patch

This file was deleted.

2 changes: 1 addition & 1 deletion deps/libconfig/libconfig
Binary file removed deps/libconfig/libconfig-1.7.3.tar.gz
Binary file not shown.
Binary file added deps/libconfig/libconfig-1.8.tar.gz
Binary file not shown.
43 changes: 43 additions & 0 deletions deps/mariadb-client-library/fix_bool.patch
Original file line number Diff line number Diff line change
@@ -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 */
Comment on lines +7 to +8

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The patch renames the bool type to bbool to avoid conflicts. This change should be reflected consistently throughout the codebase where the original bool type was used.

-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)
2 changes: 1 addition & 1 deletion deps/postgresql/postgresql
Binary file not shown.
Loading
Loading