The package rpms/proxysql.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/proxysql.git/commit/?id=07656d3801de....
Change: +ExcludeArch: %{power64} s390x %{ix86}
Thanks.
Full change: ============
commit 07656d3801de81712796a5e76c47cc2b60768df3 Author: Igor Raits igor@gooddata.com Date: Sat May 18 20:25:59 2024 +0200
Disable i686 builds
Builds are failing and we do not have 32bit as a real architecture anyway.
diff --git a/proxysql.spec b/proxysql.spec index def1b2e..3c7cb4c 100644 --- a/proxysql.spec +++ b/proxysql.spec @@ -44,7 +44,7 @@ Suggests: mariadb, community-mysql
# Update 8/2021 # Support for arm64 has been added. -ExcludeArch: %{power64} s390x +ExcludeArch: %{power64} s390x %{ix86}
Provides: bundled(jemalloc) = 5.2.0 Provides: bundled(mariadb-connector-c) = 3.3.8
commit 3e6e0608e658c7298930566e1291d129ccc54cc9 Author: Igor Raits igor@gooddata.com Date: Sat May 18 19:48:17 2024 +0200
Fix build on i686/aarch64
diff --git a/0001-Unbundle-libconfig-libdaemon-sqlite3-pcre-lz3-curl-e.patch b/0001-Unbundle-libconfig-libdaemon-sqlite3-pcre-lz3-curl-e.patch index 092cc41..239bd8b 100644 --- a/0001-Unbundle-libconfig-libdaemon-sqlite3-pcre-lz3-curl-e.patch +++ b/0001-Unbundle-libconfig-libdaemon-sqlite3-pcre-lz3-curl-e.patch @@ -1,7 +1,7 @@ From dc0e4b61bcb023162fd6a47d238052ffe3f91bb4 Mon Sep 17 00:00:00 2001 From: Igor Raits igor.raits@gmail.com Date: Sat, 18 May 2024 17:10:10 +0200 -Subject: [PATCH 1/4] Unbundle libconfig, libdaemon, sqlite3, pcre, lz3, curl, +Subject: [PATCH 1/6] Unbundle libconfig, libdaemon, sqlite3, pcre, lz3, curl, ev and libssl
--- diff --git a/0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch b/0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch index 4548b2b..ed6b968 100644 --- a/0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch +++ b/0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch @@ -1,7 +1,7 @@ From 82ec7ef1bae92649090e38e9132eef8ae432cc59 Mon Sep 17 00:00:00 2001 From: Igor Raits igor.raits@gmail.com Date: Sat, 18 May 2024 17:12:43 +0200 -Subject: [PATCH 2/4] Enable tcp_fastopen in bundled libhttpserver +Subject: [PATCH 2/6] Enable tcp_fastopen in bundled libhttpserver
We have kernel 3.6+ for years and the condition is wrong. --- diff --git a/0003-Simplify-systemd-services.patch b/0003-Simplify-systemd-services.patch index 0356814..abeefb3 100644 --- a/0003-Simplify-systemd-services.patch +++ b/0003-Simplify-systemd-services.patch @@ -1,7 +1,7 @@ From 7d8c8e212df56fb4027e6a08063a6fec196dbfa8 Mon Sep 17 00:00:00 2001 From: Igor Raits igor.raits@gmail.com Date: Sat, 18 May 2024 17:17:50 +0200 -Subject: [PATCH 3/4] Simplify systemd services +Subject: [PATCH 3/6] Simplify systemd services
--- systemd/system/proxysql-initial.service | 6 +++--- diff --git a/0004-Apply-fPIC-properly-in-re2-build.patch b/0004-Apply-fPIC-properly-in-re2-build.patch index 53c6b3e..520c2f9 100644 --- a/0004-Apply-fPIC-properly-in-re2-build.patch +++ b/0004-Apply-fPIC-properly-in-re2-build.patch @@ -1,7 +1,7 @@ From 7a7487f3d913c9c0e902e1f22a93e63e15753968 Mon Sep 17 00:00:00 2001 From: Igor Raits igor.raits@gmail.com Date: Sat, 18 May 2024 17:46:37 +0200 -Subject: [PATCH 4/4] Apply -fPIC properly in re2 build +Subject: [PATCH 4/6] Apply -fPIC properly in re2 build
Otherwise %configure overrides CXXFLAGS that does NOT include -fPIC and the compilation fails. diff --git a/0005-Fix-clickhouse-cpp-build-on-i686-aarch64.patch b/0005-Fix-clickhouse-cpp-build-on-i686-aarch64.patch new file mode 100644 index 0000000..82035b5 --- /dev/null +++ b/0005-Fix-clickhouse-cpp-build-on-i686-aarch64.patch @@ -0,0 +1,61 @@ +From b785e95c5619da6a9a8f8c533e1cd6da4275a98c Mon Sep 17 00:00:00 2001 +From: Igor Raits igor.raits@gmail.com +Date: Sat, 18 May 2024 19:47:23 +0200 +Subject: [PATCH 5/6] Fix clickhouse-cpp build on i686/aarch64 + +--- + deps/Makefile | 1 + + ...eout-and-send_timeout-initialization.patch | 29 +++++++++++++++++++ + 2 files changed, 30 insertions(+) + create mode 100644 deps/clickhouse-cpp/0001-fix-recv_timeout-and-send_timeout-initialization.patch + +diff --git a/deps/Makefile b/deps/Makefile +index 05144023..703b3edd 100644 +--- a/deps/Makefile ++++ b/deps/Makefile +@@ -121,6 +121,7 @@ clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a: + cd clickhouse-cpp && ln -fsT 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 ++ patch -d clickhouse-cpp/clickhouse-cpp -p1 -i ../0001-fix-recv_timeout-and-send_timeout-initialization.patch + cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . + cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE} + +diff --git a/deps/clickhouse-cpp/0001-fix-recv_timeout-and-send_timeout-initialization.patch b/deps/clickhouse-cpp/0001-fix-recv_timeout-and-send_timeout-initialization.patch +new file mode 100644 +index 00000000..f1dc8359 +--- /dev/null ++++ b/deps/clickhouse-cpp/0001-fix-recv_timeout-and-send_timeout-initialization.patch +@@ -0,0 +1,29 @@ ++From cfb12800e698a0e7273a9cb007d0d1658c1689f2 Mon Sep 17 00:00:00 2001 ++From: Jia Yue Hua 3423893+jiayuehua@users.noreply.github.com ++Date: Tue, 3 Oct 2023 15:24:35 +0800 ++Subject: [PATCH] fix recv_timeout and send_timeout initialization ++ ++--- ++ clickhouse/base/socket.cpp | 4 ++-- ++ 1 file changed, 2 insertions(+), 2 deletions(-) ++ ++diff --git a/clickhouse/base/socket.cpp b/clickhouse/base/socket.cpp ++index 28be7b6..3c86629 100644 ++--- a/clickhouse/base/socket.cpp +++++ b/clickhouse/base/socket.cpp ++@@ -129,10 +129,10 @@ void SetNonBlock(SOCKET fd, bool value) { ++ ++ void SetTimeout(SOCKET fd, const SocketTimeoutParams& timeout_params) { ++ #if defined(_unix_) ++- timeval recv_timeout{ timeout_params.recv_timeout.count() / 1000, static_cast<int>(timeout_params.recv_timeout.count() % 1000 * 1000) }; +++ timeval recv_timeout{ static_cast<time_t>(timeout_params.recv_timeout.count() / 1000), static_cast<suseconds_t>(timeout_params.recv_timeout.count() % 1000 * 1000) }; ++ auto recv_ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &recv_timeout, sizeof(recv_timeout)); ++ ++- timeval send_timeout{ timeout_params.send_timeout.count() / 1000, static_cast<int>(timeout_params.send_timeout.count() % 1000 * 1000) }; +++ timeval send_timeout{ static_cast<time_t>(timeout_params.send_timeout.count() / 1000), static_cast<suseconds_t>(timeout_params.send_timeout.count() % 1000 * 1000) }; ++ auto send_ret = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &send_timeout, sizeof(send_timeout)); ++ ++ if (recv_ret == -1 || send_ret == -1) { ++-- ++2.45.0 ++ +-- +2.45.0 + diff --git a/0006-Fix-coredumper-build.patch b/0006-Fix-coredumper-build.patch new file mode 100644 index 0000000..c98d7af --- /dev/null +++ b/0006-Fix-coredumper-build.patch @@ -0,0 +1,56 @@ +From c9f4bbee05cdcb920e69428017993ffbabab6039 Mon Sep 17 00:00:00 2001 +From: Igor Raits igor.raits@gmail.com +Date: Sat, 18 May 2024 19:59:16 +0200 +Subject: [PATCH 6/6] Fix coredumper build + +--- + deps/Makefile | 1 + + .../0001-Include-unistd.h-for-getpid.patch | 24 +++++++++++++++++++ + 2 files changed, 25 insertions(+) + create mode 100644 deps/coredumper/0001-Include-unistd.h-for-getpid.patch + +diff --git a/deps/Makefile b/deps/Makefile +index 703b3edd..b83008d7 100644 +--- a/deps/Makefile ++++ b/deps/Makefile +@@ -93,6 +93,7 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a + coredumper/coredumper/src/libcoredumper.a: + cd coredumper && rm -rf coredumper-*/ || true + cd coredumper && tar -zxf coredumper-*.tar.gz ++ patch -d coredumper/coredumper -p1 -i ../0001-Include-unistd.h-for-getpid.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 +diff --git a/deps/coredumper/0001-Include-unistd.h-for-getpid.patch b/deps/coredumper/0001-Include-unistd.h-for-getpid.patch +new file mode 100644 +index 00000000..386bf4be +--- /dev/null ++++ b/deps/coredumper/0001-Include-unistd.h-for-getpid.patch +@@ -0,0 +1,24 @@ ++From cb0b6bcde64b3d108f5f9adb429af57890e0bcee Mon Sep 17 00:00:00 2001 ++From: Igor Raits igor.raits@gmail.com ++Date: Sat, 18 May 2024 19:57:19 +0200 ++Subject: [PATCH] Include unistd.h for getpid() ++ ++--- ++ src/thread_lister.c | 1 + ++ 1 file changed, 1 insertion(+) ++ ++diff --git a/src/thread_lister.c b/src/thread_lister.c ++index 15fedac..48cb4e4 100644 ++--- a/src/thread_lister.c +++++ b/src/thread_lister.c ++@@ -34,6 +34,7 @@ ++ #include "thread_lister.h" ++ ++ #include <stdio.h> /* needed for NULL on some powerpc platforms (?!) */ +++#include <unistd.h> /* getpid() */ ++ #include <sys/prctl.h> ++ ++ #include "linuxthreads.h" ++-- ++2.45.0 ++ +-- +2.45.0 + diff --git a/proxysql.spec b/proxysql.spec index 3ceb0ed..def1b2e 100644 --- a/proxysql.spec +++ b/proxysql.spec @@ -5,11 +5,11 @@ Release: 1%{?dist} # Proxysql Google group for free community support: https://groups.google.com/g/proxysql URL: https://proxysql.com/ # GPL-3.0-or-later +# deps/coredumper: BSD-3-Clause # deps/jemalloc: BSD-2-Clause # deps/mariadb-connector-c: LGPL-2.1-or-later # deps/prometheus-cpp: MIT # deps/re2: BSD-3-Clause -# deps/coredumper: BSD-3-Clause License: GPL-3.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause AND BSD-2-Clause AND MIT
BuildRequires: make, automake @@ -85,6 +85,8 @@ MySQL and forks (like Percona Server and MariaDB). 0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch 0003-Simplify-systemd-services.patch 0004-Apply-fPIC-properly-in-re2-build.patch +0005-Fix-clickhouse-cpp-build-on-i686-aarch64.patch +0006-Fix-coredumper-build.patch
%prep %autosetup -p1
commit 15babf3d485a1e2a5d1ad23327389189b5ce71ed Author: Igor Raits igor@gooddata.com Date: Sat May 18 18:17:14 2024 +0200
fixup! Update to 2.6.2
diff --git a/proxysql.spec b/proxysql.spec index 79247b5..3ceb0ed 100644 --- a/proxysql.spec +++ b/proxysql.spec @@ -85,7 +85,6 @@ MySQL and forks (like Percona Server and MariaDB). 0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch 0003-Simplify-systemd-services.patch 0004-Apply-fPIC-properly-in-re2-build.patch -0005-fixup-Unbundle-libconfig-libdaemon-sqlite3-pcre-lz3-.patch
%prep %autosetup -p1
commit f01e23939ba2d9073d0f8ab1458d6b7f236dafaf Author: Igor Raits igor@gooddata.com Date: Sat May 18 17:19:22 2024 +0200
fixup! Update to 2.6.2
diff --git a/0004-Apply-fPIC-properly-in-re2-build.patch b/0004-Apply-fPIC-properly-in-re2-build.patch new file mode 100644 index 0000000..53c6b3e --- /dev/null +++ b/0004-Apply-fPIC-properly-in-re2-build.patch @@ -0,0 +1,29 @@ +From 7a7487f3d913c9c0e902e1f22a93e63e15753968 Mon Sep 17 00:00:00 2001 +From: Igor Raits igor.raits@gmail.com +Date: Sat, 18 May 2024 17:46:37 +0200 +Subject: [PATCH 4/4] Apply -fPIC properly in re2 build + +Otherwise %configure overrides CXXFLAGS that does NOT include -fPIC and +the compilation fails. +--- + deps/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/deps/Makefile b/deps/Makefile +index 23c4f894..05144023 100644 +--- a/deps/Makefile ++++ b/deps/Makefile +@@ -211,8 +211,9 @@ ifeq ($(SYS_KERN),Darwin) + cd re2/re2 && sed -i '' -e 's/-O3 -g/-O3 -g -${STDCPP} -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile + # cd re2/re2 && sed -i '' -e 's/RE2_CXXFLAGS?=-std=c++11 /RE2_CXXFLAGS?=-std=c++11 -fPIC /' Makefile + else +- cd re2/re2 && sed -i -e 's/-O3 -g/-O3 -g ${STDCPP} -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile ++# cd re2/re2 && sed -i -e 's/-O3 -g/-O3 -g ${STDCPP} -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile + # cd re2/re2 && sed -i -e 's/RE2_CXXFLAGS?=-std=c++11 /RE2_CXXFLAGS?=-std=c++11 -fPIC /' Makefile ++ sed -i -e '/^RE2_CXXFLAGS?=/ s/$$/ -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' re2/re2/Makefile + endif + cd re2/re2 && CC=${CC} CXX=${CXX} ${MAKE} + +-- +2.45.0 +
commit a5182eb2b48441fc4c76b76b42d3badbac1c58f1 Author: Igor Raits igor@gooddata.com Date: Sat May 18 17:19:22 2024 +0200
Update to 2.6.2
diff --git a/0001-Unbundle-libconfig-libdaemon-sqlite3-pcre-lz3-curl-e.patch b/0001-Unbundle-libconfig-libdaemon-sqlite3-pcre-lz3-curl-e.patch new file mode 100644 index 0000000..092cc41 --- /dev/null +++ b/0001-Unbundle-libconfig-libdaemon-sqlite3-pcre-lz3-curl-e.patch @@ -0,0 +1,375 @@ +From dc0e4b61bcb023162fd6a47d238052ffe3f91bb4 Mon Sep 17 00:00:00 2001 +From: Igor Raits igor.raits@gmail.com +Date: Sat, 18 May 2024 17:10:10 +0200 +Subject: [PATCH 1/4] Unbundle libconfig, libdaemon, sqlite3, pcre, lz3, curl, + ev and libssl + +--- + deps/Makefile | 100 ++------------------------------------------------ + lib/Makefile | 22 ++--------- + src/Makefile | 47 +++--------------------- + 3 files changed, 12 insertions(+), 157 deletions(-) + +diff --git a/deps/Makefile b/deps/Makefile +index 7e4235dc..7d1a76fe 100644 +--- a/deps/Makefile ++++ b/deps/Makefile +@@ -38,7 +38,7 @@ endif + STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPLUSPLUS) | cut -c3-4) + + +-targets := libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre lz4 cityhash microhttpd curl ev libssl libhttpserver libinjection prometheus-cpp ++targets := jemalloc mariadb_client re2 cityhash microhttpd libhttpserver libinjection prometheus-cpp + ifeq ($(SYS_KERN),Linux) + targets += coredumper + endif +@@ -70,19 +70,6 @@ endif + libinjection: libinjection/libinjection/src/libinjection.a + + +-libssl/openssl/libssl.a: +- cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true +- cd libssl && tar -zxf openssl-*.tar.gz +- cd libssl && ./verify-bio_st-match.sh +-# cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch +-# cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch +- cd libssl/openssl && ./config no-ssl3 no-tests +- cd libssl/openssl && CC=${CC} CXX=${CXX} ${MAKE} +- cd libssl/openssl && ln -fsT . lib # curl wants this path +- +-libssl: libssl/openssl/libssl.a +- +- + 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 + cd libhttpserver && tar -zxf libhttpserver-*.tar.gz +@@ -102,16 +89,6 @@ endif + libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a + + +-libev/libev/.libs/libev.a: +- cd libev && rm -rf libev-*/ || true +- cd libev && tar -zxf libev-*.tar.gz +- cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch +- cd libev/libev && ./configure +- cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE} +- +-ev: libev/libev/.libs/libev.a +- +- + coredumper/coredumper/src/libcoredumper.a: + cd coredumper && rm -rf coredumper-*/ || true + cd coredumper && tar -zxf coredumper-*.tar.gz +@@ -119,18 +96,6 @@ coredumper/coredumper/src/libcoredumper.a: + cd coredumper/coredumper && CC=${CC} CXX=${CXX} ${MAKE} + coredumper: coredumper/coredumper/src/libcoredumper.a + +-curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a +- cd curl && rm -rf curl-*/ || true +- cd curl && tar -zxf curl-*.tar.gz +-# cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} +- cd curl/curl && autoreconf -fi +-ifeq ($(SYS_KERN),Darwin) +- cd curl/curl && patch configure < ../configure.patch +-endif +- cd curl/curl && CFLAGS=-fPIC ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=yes && LD_LIBRARY_PATH=$(shell pwd)/libssl/openssl CC=${CC} CXX=${CXX} ${MAKE} +- +-curl: curl/curl/lib/.libs/libcurl.a +- + + libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: + cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true +@@ -150,14 +115,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: + cityhash: cityhash/cityhash/src/.libs/libcityhash.a + + +-lz4/lz4/lib/liblz4.a: +- cd lz4 && rm -rf lz4-*/ || true +- cd lz4 && tar -zxf lz4-*.tar.gz +- cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} +- +-lz4: lz4/lz4/lib/liblz4.a +- +- + clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a: + cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true + cd clickhouse-cpp && ln -fsT clickhouse-cpp-2.3.0 clickhouse-cpp +@@ -169,16 +126,6 @@ clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a: + clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a + + +-libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: +- cd libdaemon && rm -rf libdaemon-*/ || true +- cd libdaemon && tar -zxf libdaemon-0.14.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} +- +-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 +@@ -191,11 +138,11 @@ jemalloc/jemalloc/lib/libjemalloc.a: + jemalloc: jemalloc/jemalloc/lib/libjemalloc.a + + +-mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: libssl/openssl/libssl.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/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch +- cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DOPENSSL_ROOT_DIR=$(shell pwd)/libssl/openssl/ -DOPENSSL_LIBRARIES=$(shell pwd)/libssl/openssl/ -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . ++ cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DOPENSSL_ROOT_DIR=/usr/include/openssl -DOPENSSL_LIBRARIES=/usr/bin + ifeq ($(PROXYDEBUG),1) + cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch + else ifeq ($(USEVALGRIND),1) +@@ -240,27 +187,6 @@ endif + mariadb_client: mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a + + +-sqlite3/sqlite3/sqlite3.o: +- cd sqlite3 && rm -rf sqlite-amalgamation-*/ || true +- cd sqlite3 && tar -zxf sqlite-amalgamation-*.tar.gz +- cd sqlite3/sqlite3 && patch -p1 < ../from_unixtime.patch +- cd sqlite3/sqlite3 && patch sqlite3.c < ../sqlite3.c-multiplication-overflow.patch +- cd sqlite3/sqlite3 && patch -p0 < ../sqlite3_pass_exts.patch +- cd sqlite3/sqlite3 && ${CC} ${MYCFLAGS} -fPIC -c -o sqlite3.o sqlite3.c -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_JSON1 -DSQLITE_DLL=1 +- cd sqlite3/sqlite3 && ${CC} -shared -o libsqlite3.so sqlite3.o +- +-sqlite3: sqlite3/sqlite3/sqlite3.o +- +- +-libconfig/libconfig/lib/.libs/libconfig++.a: +- cd libconfig && rm -rf libconfig-*/ || true +- cd libconfig && tar -zxf libconfig-*.tar.gz +- cd libconfig/libconfig && ./configure --disable-examples +- cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE} +- +-libconfig: libconfig/libconfig/lib/.libs/libconfig++.a +- +- + prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: + cd prometheus-cpp && rm -rf prometheus-cpp-*/ || true + cd prometheus-cpp && tar -zxf prometheus-cpp-*.tar.gz +@@ -292,41 +218,21 @@ endif + re2: re2/re2/obj/libre2.a + + +-pcre/pcre/.libs/libpcre.a: +- cd pcre && rm -rf pcre-*/ || true +- cd pcre && tar -zxf pcre-*.tar.gz +- cd pcre/pcre && patch pcretest.c < ../pcretest.c-multiplication-overflow.patch +- cd pcre/pcre && ./configure +- cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE} +- +-pcre: pcre/pcre/.libs/libpcre.a +- +- + ### clean targets + + cleanpart: + cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true + cd jemalloc && rm -rf jemalloc-*/ || true +- cd sqlite3 && rm -rf sqlite-amalgamation-*/ || true + .PHONY: cleanpart + + cleanall: + cd libinjection && rm -rf libinjection-*/ || true + cd libhttpserver && rm -rf libhttpserver-*/ || true +- cd libdaemon && rm -rf libdaemon-*/ || true + cd jemalloc && rm -rf jemalloc-*/ || true + cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true +- cd libconfig && rm -rf libconfig-*/ || true + 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 lz4 && rm -rf lz4-*/ || true + cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true +- cd curl && rm -rf curl-*/ || true +- cd libev && rm -rf libev-*/ || true +- cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true +- cd libconfig && rm -rf libconfig-*/ || true + cd prometheus-cpp && rm -rf prometheus-cpp-*/ || true + cd cityhash && rm -rf cityhash-*/ || true + cd coredumper && rm -rf coredumper-*/ || true +diff --git a/lib/Makefile b/lib/Makefile +index b94dd2fc..65973de8 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -17,19 +17,12 @@ MARIADB_IDIR := $(MARIADB_PATH)/include + JEMALLOC_PATH := $(DEPS_PATH)/jemalloc/jemalloc + JEMALLOC_IDIR := $(JEMALLOC_PATH)/include/jemalloc + +-LIBCONFIG_PATH := $(DEPS_PATH)/libconfig/libconfig +-LIBCONFIG_IDIR := -I$(LIBCONFIG_PATH)/lib +- + #INJECTION_PATH := $(DEPS_PATH)/libinjection + #INJECTION_IDIR := $(INJECTION_PATH) + + RE2_PATH := $(DEPS_PATH)/re2/re2 + RE2_IDIR := $(RE2_PATH) + +-PCRE_PATH := $(DEPS_PATH)/pcre/pcre +- +-SQLITE3_DIR := $(DEPS_PATH)/sqlite3/sqlite3 +- + CLICKHOUSE_CPP_DIR := $(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp + + LIBINJECTION_DIR := $(DEPS_PATH)/libinjection/libinjection +@@ -44,15 +37,6 @@ MICROHTTPD_IDIR := -I$(MICROHTTPD_DIR) -I$(MICROHTTPD_DIR)/src/include + COREDUMPER_DIR := $(DEPS_PATH)/coredumper/coredumper + COREDUMPER_IDIR := $(COREDUMPER_DIR)/include + +-CURL_DIR := $(DEPS_PATH)/curl/curl +-CURL_IDIR := $(CURL_DIR)/include +- +-SSL_DIR := $(DEPS_PATH)/libssl/openssl/ +-SSL_IDIR := $(SSL_DIR)/include +- +-EV_DIR := $(DEPS_PATH)/libev/libev/ +-EV_IDIR := $(EV_DIR) +- + PROMETHEUS_PATH := $(DEPS_PATH)/prometheus-cpp/prometheus-cpp + PROMETHEUS_IDIR := $(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include + PROMETHEUS_LDIR := $(PROMETHEUS_PATH)/lib +@@ -60,7 +44,7 @@ PROMETHEUS_LDIR := $(PROMETHEUS_PATH)/lib + + IDIR := ../include + +-IDIRS := -I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(RE2_IDIR) -I$(SQLITE3_DIR) -I$(PCRE_PATH) -I/usr/local/include -I$(CLICKHOUSE_CPP_DIR) -I$(CLICKHOUSE_CPP_DIR)/contrib/ $(MICROHTTPD_IDIR) $(LIBHTTPSERVER_IDIR) $(LIBINJECTION_IDIR) -I$(CURL_IDIR) -I$(EV_DIR) -I$(SSL_IDIR) -I$(PROMETHEUS_IDIR) ++IDIRS := -I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) -I$(RE2_IDIR) -I/usr/local/include -I$(CLICKHOUSE_CPP_DIR) -I$(CLICKHOUSE_CPP_DIR)/contrib/ $(MICROHTTPD_IDIR) $(LIBHTTPSERVER_IDIR) $(LIBINJECTION_IDIR) -I$(PROMETHEUS_IDIR) + ifeq ($(UNAME_S),Linux) + IDIRS += -I$(COREDUMPER_IDIR) + endif +@@ -137,8 +121,8 @@ HEADERS := ../include/*.h ../include/*.hpp + $(ODIR)/%.oo: %.cpp $(HEADERS) + $(CXX) -fPIC -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS) + +-libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CXX) $(SQLITE3_DIR)/sqlite3.o +- ar rcs $@ $(OBJ) $(OBJ_CXX) $(SQLITE3_DIR)/sqlite3.o ++libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CXX) ++ ar rcs $@ $(OBJ) $(OBJ_CXX) + + $(ODIR): + mkdir $(ODIR) +diff --git a/src/Makefile b/src/Makefile +index 0d2e577c..bff22a1f 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -22,18 +22,10 @@ MARIADB_PATH := $(DEPS_PATH)/mariadb-client-library/mariadb_client + MARIADB_IDIR := $(MARIADB_PATH)/include + MARIADB_LDIR := $(MARIADB_PATH)/libmariadb + +-LIBDAEMON_PATH := $(DEPS_PATH)/libdaemon/libdaemon +-LIBDAEMON_IDIR := $(LIBDAEMON_PATH) +-LIBDAEMON_LDIR := $(LIBDAEMON_PATH)/libdaemon/.libs +- + JEMALLOC_PATH := $(DEPS_PATH)/jemalloc/jemalloc + JEMALLOC_IDIR := $(JEMALLOC_PATH)/include/jemalloc + JEMALLOC_LDIR := $(JEMALLOC_PATH)/lib + +-LIBCONFIG_PATH := $(DEPS_PATH)/libconfig/libconfig +-LIBCONFIG_IDIR := $(LIBCONFIG_PATH)/lib +-LIBCONFIG_LDIR := $(LIBCONFIG_PATH)/lib/.libs +- + PROMETHEUS_PATH := $(DEPS_PATH)/prometheus-cpp/prometheus-cpp + PROMETHEUS_IDIR := $(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include + PROMETHEUS_LDIR := $(PROMETHEUS_PATH)/lib +@@ -42,20 +34,9 @@ RE2_PATH := $(DEPS_PATH)/re2/re2 + RE2_IDIR := $(RE2_PATH) + RE2_LDIR := $(RE2_PATH)/obj + +-PCRE_PATH := $(DEPS_PATH)/pcre/pcre +-PCRE_IDIR := $(PCRE_PATH) +-PCRE_LDIR := $(PCRE_PATH)/.libs +- +-SQLITE3_PATH := $(DEPS_PATH)/sqlite3/sqlite3 +-SQLITE3_IDIR := $(SQLITE3_PATH) +-SQLITE3_LDIR := $(SQLITE3_PATH) +- + CITYHASH_PATH := $(DEPS_PATH)/cityhash/cityhash + CITYHASH_LDIR := $(CITYHASH_PATH)/src/.libs + +-LZ4_PATH := $(DEPS_PATH)/lz4/lz4 +-LZ4_LDIR := $(LZ4_PATH)/lib +- + CLICKHOUSE_CPP_PATH := $(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp + CLICKHOUSE_CPP_CDIR := $(CLICKHOUSE_CPP_PATH)/contrib + CLICKHOUSE_CPP_IDIR := $(CLICKHOUSE_CPP_PATH) +@@ -77,21 +58,9 @@ COREDUMPER_PATH := $(DEPS_PATH)/coredumper/coredumper + COREDUMPER_IDIR := $(COREDUMPER_PATH)/include + COREDUMPER_LDIR := $(COREDUMPER_PATH)/src + +-CURL_PATH := $(DEPS_PATH)/curl/curl +-CURL_IDIR := $(CURL_PATH)/include +-CURL_LDIR := $(CURL_PATH)/lib/.libs +- +-SSL_PATH := $(DEPS_PATH)/libssl/openssl/ +-SSL_IDIR := $(SSL_PATH)/include +-SSL_LDIR := $(SSL_PATH) +- +-EV_PATH := $(DEPS_PATH)/libev/libev/ +-EV_IDIR := $(EV_PATH) +-EV_LDIR := $(EV_PATH)/.libs +- + +-IDIRS := -I$(PROXYSQL_IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) -I$(LIBCONFIG_IDIR) -I$(LIBDAEMON_IDIR) -I$(RE2_IDIR) -L$(PCRE_IDIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(LIBINJECTION_IDIR) -I$(CURL_IDIR) -I$(EV_IDIR) -I$(SSL_IDIR) -I$(PROMETHEUS_IDIR) -I$(SQLITE3_IDIR) -I$(CLICKHOUSE_CPP_IDIR) -I$(CLICKHOUSE_CPP_CDIR) -I$(0) +-LDIRS := -L$(PROXYSQL_LDIR) -L$(JEMALLOC_LDIR) -L$(MARIADB_LDIR) -L$(LIBCONFIG_LDIR) -L$(LIBDAEMON_LDIR) -L$(RE2_LDIR) -L$(PCRE_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(LIBINJECTION_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR) -L$(SSL_LDIR) -L$(PROMETHEUS_LDIR) ++IDIRS := -I$(PROXYSQL_IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) -I$(RE2_IDIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(LIBINJECTION_IDIR) -I$(PROMETHEUS_IDIR) -I$(CLICKHOUSE_CPP_IDIR) -I$(CLICKHOUSE_CPP_CDIR) -I$(0) ++LDIRS := -L$(PROXYSQL_LDIR) -L$(JEMALLOC_LDIR) -L$(MARIADB_LDIR) -L$(RE2_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(LIBINJECTION_LDIR) -L$(PROMETHEUS_LDIR) + + + UNAME_S := $(shell uname -s) +@@ -156,7 +125,7 @@ endif + MYCXXFLAGS += $(IDIRS) $(OPTZ) $(DEBUG) $(PSQLCH) -DGITVERSION="$(GIT_VERSION)" $(WGCOV) $(WASAN) + + +-STATICMYLIBS := -Wl,-Bstatic -lconfig -lproxysql -ldaemon -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lhttpserver -lmicrohttpd -linjection -lcurl -lssl -lcrypto -lev ++STATICMYLIBS := -Wl,-Bstatic -lproxysql -lre2 -lmariadbclient -lhttpserver -lmicrohttpd -linjection + ifneq ($(NOJEMALLOC),1) + STATICMYLIBS += -ljemalloc + endif +@@ -168,9 +137,7 @@ MYLIBS := -Wl,--export-dynamic $(STATICMYLIBS) -Wl,-Bdynamic -lgnutls -lpthread + ifeq ($(UNAME_S),Darwin) + MYLIBS :=-lre2 -lmariadbclient -lpthread -lm -lz -liconv -lgnutls -lprometheus-cpp-pull -lprometheus-cpp-core -luuid + else +- CURL_DIR := $(DEPS_PATH)/curl/curl +- IDIRS += -L$(CURL_DIR)/include +- LDIRS += -L$(CURL_DIR)/lib/.libs ++ MYLIBS += -lconfig -ldaemon -lconfig++ -lpcrecpp -lpcre -lcurl -lssl -lcrypto -lev + endif + ifeq ($(UNAME_S),Linux) + MYLIBS += -ldl +@@ -182,7 +149,7 @@ ifeq ($(CENTOSVER),6) + MYLIBS += -lgcrypt + endif + +-LIBPROXYSQLAR := $(PROXYSQL_LDIR)/libproxysql.a ++LIBPROXYSQLAR := $(PROXYSQL_LDIR)/libproxysql.a -lsqlite3 + ifeq ($(UNAME_S),Darwin) + LIBPROXYSQLAR += $(JEMALLOC_LDIR)/libjemalloc.a + LIBPROXYSQLAR += $(MICROHTTPD_LDIR)/libmicrohttpd.a +@@ -197,8 +164,6 @@ ifeq ($(UNAME_S),Darwin) + LIBPROXYSQLAR += $(LIBINJECTION_LDIR)/libinjection.a + LIBPROXYSQLAR += $(EV_LDIR)/libev.a + endif +-LIBPROXYSQLAR += $(SSL_LDIR)/libssl.a +-LIBPROXYSQLAR += $(SSL_LDIR)/libcrypto.a + LIBPROXYSQLAR += $(CITYHASH_LDIR)/libcityhash.a + + ODIR := obj +@@ -213,7 +178,7 @@ $(ODIR)/%.o: %.cpp + + $(EXECUTABLE): $(ODIR) $(OBJ) $(LIBPROXYSQLAR) + ifeq ($(PROXYSQLCLICKHOUSE),1) +- $(CXX) -o $@ $(OBJ) $(CLANGFIX) $(LIBPROXYSQLAR) $(CLICKHOUSE_CPP_LDIR)/libclickhouse-cpp-lib-static.a $(LZ4_LDIR)/liblz4.a $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(MYLIBS) ++ $(CXX) -o $@ $(OBJ) $(CLANGFIX) $(LIBPROXYSQLAR) $(CLICKHOUSE_CPP_LDIR)/libclickhouse-cpp-lib-static.a -llz4 $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(MYLIBS) + else + $(CXX) -o $@ $(OBJ) $(CLANGFIX) $(LIBPROXYSQLAR) $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(MYLIBS) + endif +-- +2.45.0 + diff --git a/0001-Unbundle-system-deps.patch b/0001-Unbundle-system-deps.patch deleted file mode 100644 index 8dab0b0..0000000 --- a/0001-Unbundle-system-deps.patch +++ /dev/null @@ -1,333 +0,0 @@ -From cb885f178e1b18109f9ce1de20f5f59cd6c6e4e5 Mon Sep 17 00:00:00 2001 -From: Igor Raits igor.raits@gmail.com -Date: Sat, 26 Nov 2022 08:25:04 +0100 -Subject: [PATCH 1/3] Unbundle system deps - ---- - deps/Makefile | 77 +++------------------------------------------------ - lib/Makefile | 30 ++------------------ - src/Makefile | 44 ++++------------------------- - 3 files changed, 13 insertions(+), 138 deletions(-) - -diff --git a/deps/Makefile b/deps/Makefile -index 38191244..88b2eadf 100644 ---- a/deps/Makefile -+++ b/deps/Makefile -@@ -57,9 +57,9 @@ endif - - PROXYSQLCLICKHOUSE := $(shell echo $(PROXYSQLCLICKHOUSE)) - ifeq ($(PROXYSQLCLICKHOUSE),1) --default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre clickhouse-cpp lz4 cityhash microhttpd curl ev libssl libhttpserver libinjection prometheus-cpp -+default: jemalloc mariadb_client re2 clickhouse-cpp cityhash microhttpd libhttpserver libinjection prometheus-cpp - else --default: libconfig libdaemon jemalloc mariadb_client re2 sqlite3 pcre cityhash microhttpd curl ev libssl libhttpserver libinjection prometheus-cpp -+default: jemalloc mariadb_client re2 cityhash microhttpd libhttpserver libinjection prometheus-cpp - endif - .PHONY: default - -@@ -79,16 +79,6 @@ endif - cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE} - libinjection: libinjection/libinjection/src/libinjection.a - --libssl/openssl/libssl.a: -- cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true -- cd libssl && tar -zxf openssl-*.tar.gz --# cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch --# cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch -- cd libssl/openssl && ./config no-ssl3 no-tests -- cd libssl/openssl && CC=${CC} CXX=${CXX} ${MAKE} -- cd libssl/openssl && ln -s . lib # curl wants this path --libssl: libssl/openssl/libssl.a -- - MIN_VERSION := 4.9.0 - GCC_VERSION := $(shell gcc -dumpversion) - SORTED_VERSIONS := $(shell echo -e "$(GCC_VERSION)\n$(MIN_VERSION)" | sort -V) -@@ -123,22 +113,6 @@ endif - cd libhttpserver/libhttpserver/build && CC=${CC} CXX=${CXX} ${MAKE} - libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a - --libev/libev/.libs/libev.a: -- cd libev && rm -rf libev-*/ || true -- cd libev && tar -zxf libev-4.24.tar.gz -- cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch -- cd libev/libev && ./configure -- cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE} --ev: libev/libev/.libs/libev.a -- --curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a -- cd curl && rm -rf curl-*/ || true -- cd curl && tar -zxf curl-*.tar.gz -- #cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} -- cd curl/curl && patch configure < ../configure.patch -- cd curl/curl && CFLAGS=-fPIC ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE} --curl: curl/curl/lib/.libs/libcurl.a -- - libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: - cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true - cd libmicrohttpd && rm -f libmicrohttpd || true -@@ -162,13 +136,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: - cd cityhash/cityhash && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure && CC=${CC} CXX=${CXX} ${MAKE} - cityhash: cityhash/cityhash/src/.libs/libcityhash.a - --lz4/lz4/liblz4.a: -- cd lz4 && rm -rf lz4-*/ || true -- cd lz4 && tar -zxf lz4-1.7.5.tar.gz -- cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} --lz4: lz4/lz4/liblz4.a -- -- - clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a: - ifeq ($(IS_CXX17), 1) - echo ">>> Clickhouse CXX17" -@@ -187,15 +154,6 @@ endif - - clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a - -- --libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: -- cd libdaemon && rm -rf libdaemon-*/ || true -- cd libdaemon && tar -zxf libdaemon-0.14.tar.gz -- 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} -- --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 -@@ -209,12 +167,12 @@ jemalloc: jemalloc/jemalloc/lib/libjemalloc.a - - WITHASAN := $(shell echo $(WITHASAN)) - --mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: libssl/openssl/libssl.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.1.9-src.tar.gz - cd mariadb-client-library/mariadb_client && patch ./plugins/auth/CMakeLists.txt < ../plugin_auth_CMakeLists.txt.patch - cd mariadb-client-library/mariadb_client && patch -p0 < ../ConnectorName.patch -- cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DOPENSSL_ROOT_DIR=$(shell pwd)/libssl/openssl/ -DOPENSSL_LIBRARIES=$(shell pwd)/libssl/openssl/ -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . -+ cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DOPENSSL_ROOT_DIR=/usr/include/openssl -DOPENSSL_LIBRARIES=/usr/bin . - ifeq ($(PROXYDEBUG),1) - cd mariadb-client-library/mariadb_client && patch include/ma_context.h < ../ma_context.h.patch - else ifeq ($(USEVALGRIND),1) -@@ -252,25 +210,6 @@ endif - - mariadb_client: mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a - -- --sqlite3/sqlite3/sqlite3.o: -- cd sqlite3 && rm -rf sqlite-amalgamation-*/ || true -- cd sqlite3 && tar -zxf sqlite-amalgamation-3190200.tar.gz -- cd sqlite3/sqlite3 && patch sqlite3.c < ../from_unixtime.patch -- cd sqlite3/sqlite3 && patch sqlite3.c < ../sqlite3.c-multiplication-overflow.patch -- cd sqlite3/sqlite3 && ${CC} ${MYCFLAGS} -fPIC -c -o sqlite3.o sqlite3.c -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_JSON1 -DSQLITE_DLL=1 -- cd sqlite3/sqlite3 && ${CC} -shared -o libsqlite3.so sqlite3.o -- --sqlite3: sqlite3/sqlite3/sqlite3.o -- --libconfig/libconfig/lib/.libs/libconfig++.a: -- cd libconfig && rm -rf libconfig-*/ || true -- cd libconfig && tar -zxf libconfig-1.7.2.tar.gz -- cd libconfig/libconfig && ./configure --disable-examples -- cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE} -- --libconfig: libconfig/libconfig/lib/.libs/libconfig++.a -- - prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: - cd prometheus-cpp && rm -rf prometheus-cpp-*/ || true - cd prometheus-cpp && tar -zxf v0.9.0.tar.gz -@@ -300,14 +239,6 @@ endif - - re2: re2/re2/obj/libre2.a - --pcre/pcre/.libs/libpcre.a: -- cd pcre && rm -rf pcre-*/ || true -- cd pcre && tar -zxf pcre-8.44.tar.gz -- cd pcre/pcre && patch pcretest.c < ../pcretest.c-multiplication-overflow.patch -- cd pcre/pcre && ./configure -- cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE} --pcre: pcre/pcre/.libs/libpcre.a -- - cleanpart: - cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true - cd jemalloc && rm -rf jemalloc-*/ || true -diff --git a/lib/Makefile b/lib/Makefile -index fa820d8a..76220924 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -1,13 +1,6 @@ - #!/bin/make -f - - --ifndef GIT_VERSION -- GIT_VERSION := $(shell git describe --long --abbrev=7) --ifndef GIT_VERSION -- $(error GIT_VERSION is not set) --endif --endif -- - DEPS_PATH=../deps - - -@@ -17,19 +10,12 @@ MARIADB_IDIR=$(MARIADB_PATH)/include - JEMALLOC_PATH=$(DEPS_PATH)/jemalloc/jemalloc - JEMALLOC_IDIR=$(JEMALLOC_PATH)/include/jemalloc - --LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig --LIBCONFIG_IDIR=-I$(LIBCONFIG_PATH)/lib -- - #INJECTION_PATH=$(DEPS_PATH)/libinjection - #INJECTION_IDIR=$(INJECTION_PATH) - - RE2_PATH=$(DEPS_PATH)/re2/re2 - RE2_IDIR=$(RE2_PATH) - --PCRE_PATH=$(DEPS_PATH)/pcre/pcre -- --SQLITE3_DIR=$(DEPS_PATH)/sqlite3/sqlite3 -- - CLICKHOUSE_CPP_DIR=$(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp - - LIBINJECTION_DIR=$(DEPS_PATH)/libinjection/libinjection -@@ -41,23 +27,13 @@ LIBHTTPSERVER_IDIR=-I$(LIBHTTPSERVER_DIR)/src - MICROHTTPD_DIR=$(DEPS_PATH)/libmicrohttpd/libmicrohttpd - MICROHTTPD_IDIR=-I$(MICROHTTPD_DIR) -I$(MICROHTTPD_DIR)/src/include - --CURL_DIR=$(DEPS_PATH)/curl/curl --CURL_IDIR=-I$(CURL_DIR)/include -- --SSL_DIR=$(DEPS_PATH)/libssl/openssl/ --SSL_IDIR=$(SSL_DIR)/include -- -- --EV_DIR=$(DEPS_PATH)/libev/libev/ --EV_IDIR=$(EV_DIR) -- - PROMETHEUS_PATH=$(DEPS_PATH)/prometheus-cpp/prometheus-cpp - PROMETHEUS_IDIR=$(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include - PROMETHEUS_LDIR=$(PROMETHEUS_PATH)/lib - - IDIR=../include - --IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(RE2_IDIR) -I$(SQLITE3_DIR) -I$(PCRE_PATH) -I/usr/local/include -I$(CLICKHOUSE_CPP_DIR) -I$(CLICKHOUSE_CPP_DIR)/contrib/ $(MICROHTTPD_IDIR) $(LIBHTTPSERVER_IDIR) $(LIBINJECTION_IDIR) $(CURL_IDIR) -I$(EV_DIR) -I$(SSL_IDIR) -I$(PROMETHEUS_IDIR) -+IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) -I$(RE2_IDIR) -I/usr/local/include -I$(CLICKHOUSE_CPP_DIR) -I$(CLICKHOUSE_CPP_DIR)/contrib/ $(MICROHTTPD_IDIR) $(LIBHTTPSERVER_IDIR) $(LIBINJECTION_IDIR) -I$(PROMETHEUS_IDIR) - - LDIRS=-L$(JEMALLOC_PATH)/lib -L$(RE2_PATH)/obj -L$(INJECTION_PATH) -L$(PROMETHEUS_LDIR) - -@@ -150,8 +126,8 @@ HEADERS = ../include/*.h ../include/*.hpp - $(ODIR)/%.oo: %.cpp $(HEADERS) - $(CXX) -fPIC -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS) - --libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CXX) $(SQLITE3_DIR)/sqlite3.o -- ar rcs $@ $(OBJ) $(OBJ_CXX) $(SQLITE3_DIR)/sqlite3.o -+libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CXX) $(RE2_PATH)/obj/libre2.a -+ ar rcs $@ $(OBJ) $(OBJ_CXX) $(RE2_PATH)/obj/libre2.a - - $(ODIR): - mkdir $(ODIR) -diff --git a/src/Makefile b/src/Makefile -index b4161590..9fca775f 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -21,18 +21,10 @@ MARIADB_IDIR=$(MARIADB_PATH)/include - MARIADB_LDIR=$(MARIADB_PATH)/libmariadb - - --DAEMONPATH=$(DEPS_PATH)/libdaemon/libdaemon --DAEMONPATH_IDIR=$(DAEMONPATH) --DAEMONPATH_LDIR=$(DAEMONPATH)/libdaemon/.libs -- - JEMALLOC_PATH=$(DEPS_PATH)/jemalloc/jemalloc - JEMALLOC_IDIR=$(JEMALLOC_PATH)/include/jemalloc - JEMALLOC_LDIR=$(JEMALLOC_PATH)/lib - --LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig --LIBCONFIG_IDIR=-I$(LIBCONFIG_PATH)/lib --LIBCONFIG_LDIR=-L$(LIBCONFIG_PATH)/lib/.libs -- - PROMETHEUS_PATH=$(DEPS_PATH)/prometheus-cpp/prometheus-cpp - PROMETHEUS_IDIR=$(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include - PROMETHEUS_LDIR=$(PROMETHEUS_PATH)/lib -@@ -40,15 +32,8 @@ PROMETHEUS_LDIR=$(PROMETHEUS_PATH)/lib - RE2_PATH=$(DEPS_PATH)/re2/re2 - RE2_IDIR=$(RE2_PATH) - --PCRE_PATH=$(DEPS_PATH)/pcre/pcre --PCRE_LDIR=$(PCRE_PATH)/.libs -- --SQLITE3_DIR=$(DEPS_PATH)/sqlite3/sqlite3 -- -- - CLICKHOUSE_CPP_DIR=$(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp - CITYHASH_DIR=$(DEPS_PATH)/cityhash/cityhash/src/.libs --LZ4_DIR=$(DEPS_PATH)/lz4/lz4 - - CLICKHOUSE_CPP_DIR=$(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp - -@@ -64,23 +49,10 @@ MICROHTTPD_DIR=$(DEPS_PATH)/libmicrohttpd/libmicrohttpd/src - MICROHTTPD_IDIR=$(MICROHTTPD_DIR)/include - MICROHTTPD_LDIR=$(MICROHTTPD_DIR)/microhttpd/.libs - --CURL_DIR=$(DEPS_PATH)/curl/curl --CURL_IDIR=$(CURL_DIR)/include --CURL_LDIR=$(CURL_DIR)/lib/.libs -- --SSL_DIR=$(DEPS_PATH)/libssl/openssl/ --SSL_IDIR=$(SSL_DIR)/include --SSL_LDIR=$(SSL_DIR) -- -- --EV_DIR=$(DEPS_PATH)/libev/libev/ --EV_IDIR=$(EV_DIR) --EV_LDIR=$(EV_DIR)/.libs -- - IDIR=../include - LDIR=../lib --IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(DAEMONPATH_IDIR) -I$(SQLITE3_DIR) -I$(CLICKHOUSE_CPP_DIR) -I$(CLICKHOUSE_CPP_DIR)/contrib/ -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(LIBINJECTION_IDIR) -I$(CURL_IDIR) -I$(EV_IDIR) -I$(SSL_IDIR) -I$(RE2_IDIR) -I$(PROMETHEUS_IDIR) --LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(MARIADB_LDIR) -L$(DAEMONPATH_LDIR) -L$(PCRE_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(LIBINJECTION_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR) -L$(SSL_LDIR) -L$(PROMETHEUS_LDIR) -+IDIRS=-I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) -I$(CLICKHOUSE_CPP_DIR) -I$(CLICKHOUSE_CPP_DIR)/contrib/ -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(LIBINJECTION_IDIR) -I$(RE2_IDIR) -I$(PROMETHEUS_IDIR) -+LDIRS=-L$(LDIR) -L$(JEMALLOC_LDIR) -L$(RE2_PATH)/obj -L$(MARIADB_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(LIBINJECTION_LDIR) -L$(PROMETHEUS_LDIR) - - UNAME_S := $(shell uname -s) - -@@ -154,17 +126,13 @@ endif - - NOJEMALLOC := $(shell echo $(NOJEMALLOC)) - ifeq ($(NOJEMALLOC),1) --MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lhttpserver -lmicrohttpd -linjection -lcurl -lssl -lcrypto -lev -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lrt -lprometheus-cpp-pull -lprometheus-cpp-core -luuid $(EXTRALINK) -+MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lproxysql -lre2 -lmariadbclient -lhttpserver -lmicrohttpd -linjection -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lconfig -ldaemon -lconfig++ -lpcrecpp -lpcre -lcurl -lssl -lcrypto -lev -lsqlite3 -lrt -lprometheus-cpp-pull -lprometheus-cpp-core -luuid $(EXTRALINK) - else --MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lhttpserver -lmicrohttpd -linjection -lcurl -lssl -lcrypto -lev -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lrt -lprometheus-cpp-pull -lprometheus-cpp-core -luuid $(EXTRALINK) -+MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lproxysql -ljemalloc -lre2 -lmariadbclient -lhttpserver -lmicrohttpd -linjection -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lconfig -ldaemon -lconfig++ -lpcrecpp -lpcre -lcurl -lssl -lcrypto -lev -lsqlite3 -lrt -lprometheus-cpp-pull -lprometheus-cpp-core -luuid $(EXTRALINK) - endif - - ifeq ($(UNAME_S),Darwin) - MYLIBS=-lre2 -lmariadbclient -lpthread -lm -lz -liconv -lgnutls -lprometheus-cpp-pull -lprometheus-cpp-core -luuid --else -- CURL_DIR=$(DEPS_PATH)/curl/curl -- IDIRS+= -L$(CURL_DIR)/include -- LDIRS+= -L$(CURL_DIR)/lib/.libs - endif - ifeq ($(UNAME_S),Linux) - MYLIBS+= -ldl -@@ -181,7 +149,7 @@ ifeq ($(UNAME_S),Darwin) - LIBPROXYSQLAR=$(LDIR)/libproxysql.a ../deps/jemalloc/jemalloc/lib/libjemalloc.a ../deps/libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a ../deps/libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a ../deps/pcre/pcre/.libs/libpcre.a ../deps/pcre/pcre/.libs/libpcrecpp.a ../deps/libdaemon/libdaemon/libdaemon/.libs/libdaemon.a ../deps/libconfig/libconfig/lib/.libs/libconfig++.a ../deps/libconfig/libconfig/lib/.libs/libconfig.a ../deps/curl/curl/lib/.libs/libcurl.a ../deps/sqlite3/sqlite3/sqlite3.o ../deps/libinjection/libinjection/src/libinjection.a ../deps/libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a ../deps/libev/libev-4.24/.libs/libev.a - endif - --LIBPROXYSQLAR+= $(SSL_LDIR)/libssl.a $(SSL_LDIR)/libcrypto.a $(CITYHASH_DIR)/libcityhash.a -+LIBPROXYSQLAR+= $(CITYHASH_DIR)/libcityhash.a - ODIR= obj - - EXECUTABLE=proxysql -@@ -194,7 +162,7 @@ $(ODIR)/%.o: %.cpp - - $(EXECUTABLE): $(ODIR) $(OBJ) $(LIBPROXYSQLAR) - ifeq ($(PROXYSQLCLICKHOUSE),1) -- $(CXX) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(CLICKHOUSE_CPP_DIR)/clickhouse/libclickhouse-cpp-lib-static.a $(LZ4_DIR)/liblz4.a $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(LDFLAGS) $(MYLIBS) -+ $(CXX) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(CLICKHOUSE_CPP_DIR)/clickhouse/libclickhouse-cpp-lib-static.a $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(LDFLAGS) $(MYLIBS) - else - $(CXX) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(LDFLAGS) $(MYLIBS) - endif --- -2.39.2 - diff --git a/0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch b/0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch index cf0e55b..4548b2b 100644 --- a/0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch +++ b/0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch @@ -1,7 +1,7 @@ -From aa367adb5a2d8daba278596bc227d9a338979d71 Mon Sep 17 00:00:00 2001 +From 82ec7ef1bae92649090e38e9132eef8ae432cc59 Mon Sep 17 00:00:00 2001 From: Igor Raits igor.raits@gmail.com -Date: Sat, 26 Nov 2022 08:49:11 +0100 -Subject: [PATCH 2/3] Enable tcp_fastopen in bundled libhttpserver +Date: Sat, 18 May 2024 17:12:43 +0200 +Subject: [PATCH 2/4] Enable tcp_fastopen in bundled libhttpserver
We have kernel 3.6+ for years and the condition is wrong. --- @@ -9,17 +9,17 @@ We have kernel 3.6+ for years and the condition is wrong. 1 file changed, 1 insertion(+)
diff --git a/deps/Makefile b/deps/Makefile -index 88b2eadf..5373ce11 100644 +index 7d1a76fe..23c4f894 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -105,6 +105,7 @@ libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmi - #endif - cd libhttpserver/libhttpserver && patch -p0 < ../final_val_post_process.patch - cd libhttpserver/libhttpserver && patch -p0 < ../empty_uri_log_crash.patch +@@ -79,6 +79,7 @@ libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmi + cd libhttpserver/libhttpserver && patch -p1 < ../empty_uri_log_crash.patch + cd libhttpserver/libhttpserver && patch -p0 < ../expose_raw_url.patch + cd libhttpserver/libhttpserver && patch -p0 < ../replace_static_global_strings.patch + sed -i -e 's|is_fastopen_supported=no|is_fastopen_supported=yes|' libhttpserver/libhttpserver/configure.ac ifeq ($(UNAME_S),FreeBSD) sed -i -e 's//bin/bash//usr/local/bin/bash/' libhttpserver/libhttpserver/bootstrap endif -- -2.39.2 +2.45.0
diff --git a/0003-Simplify-proxysql.service.patch b/0003-Simplify-systemd-services.patch similarity index 91% rename from 0003-Simplify-proxysql.service.patch rename to 0003-Simplify-systemd-services.patch index 83e64f1..0356814 100644 --- a/0003-Simplify-proxysql.service.patch +++ b/0003-Simplify-systemd-services.patch @@ -1,7 +1,7 @@ -From 2a98a81492ebf058162585770e93b13c8cc493c8 Mon Sep 17 00:00:00 2001 +From 7d8c8e212df56fb4027e6a08063a6fec196dbfa8 Mon Sep 17 00:00:00 2001 From: Igor Raits igor.raits@gmail.com -Date: Sat, 26 Nov 2022 17:24:42 +0100 -Subject: [PATCH 3/3] Simplify proxysql.service +Date: Sat, 18 May 2024 17:17:50 +0200 +Subject: [PATCH 3/4] Simplify systemd services
--- systemd/system/proxysql-initial.service | 6 +++--- @@ -49,5 +49,5 @@ index 6506a57b..5154b1e6 100644 Group=proxysql PermissionsStartOnly=true -- -2.39.2 +2.45.0
diff --git a/proxysql.spec b/proxysql.spec index 6aba218..79247b5 100644 --- a/proxysql.spec +++ b/proxysql.spec @@ -1,7 +1,7 @@ Summary: A high-performance MySQL proxy Name: proxysql -Version: 2.4.8 -Release: 4%{?dist} +Version: 2.6.2 +Release: 1%{?dist} # Proxysql Google group for free community support: https://groups.google.com/g/proxysql URL: https://proxysql.com/ # GPL-3.0-or-later @@ -9,6 +9,7 @@ URL: https://proxysql.com/ # deps/mariadb-connector-c: LGPL-2.1-or-later # deps/prometheus-cpp: MIT # deps/re2: BSD-3-Clause +# deps/coredumper: BSD-3-Clause License: GPL-3.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause AND BSD-2-Clause AND MIT
BuildRequires: make, automake @@ -46,13 +47,15 @@ Suggests: mariadb, community-mysql ExcludeArch: %{power64} s390x
Provides: bundled(jemalloc) = 5.2.0 -Provides: bundled(mariadb-connector-c) = 3.1.9 -Provides: bundled(re2) = 20200706 -Provides: bundled(clickhouse-cpp) = 2.1.0 -Provides: bundled(prometheus-cpp) = 0.9.0 +Provides: bundled(mariadb-connector-c) = 3.3.8 +Provides: bundled(re2) = 20221201 +Provides: bundled(clickhouse-cpp) = 2.3.0 +Provides: bundled(prometheus-cpp) = 1.1.0 +# The hash looks weird but it is still 1.1.1 Provides: bundled(cityhash) = 1.1.1 -Provides: bundled(libhttpserver) = 0.18.1 -Provides: bundled(libmicrohttpd) = 0.9.68 +Provides: bundled(libhttpserver) = 0.18.2 +Provides: bundled(libmicrohttpd) = 0.9.77 +Provides: bundled(coredumper) = 0^cb6cead
# There is inconsistency between name and URL of file and main unpacked source folder Source0: https://github.com/sysown/proxysql/archive/refs/tags/v%%7Bversion%7D.tar.gz#... @@ -61,6 +64,10 @@ Source0: https://github.com/sysown/proxysql/archive/refs/tags/v%%7Bversion%7D. # https://github.com/sysown/proxysql/issues/3564 Source1: proxysql.1
+%description +ProxySQL is a high performance, high availability, protocol aware proxy for +MySQL and forks (like Percona Server and MariaDB). + # The upstream code bundles multiple libraries: libconfig, libdaemon, sqlite3, re2, # mariadb-connector-c, pcre, clickhouse-cpp, prometheus-cpp, lz4, cityhash, microhttpd, curl # ev, coredumper, libssl and jemalloc. @@ -70,14 +77,15 @@ Source1: proxysql.1 # being patched, more info here: https://bugzilla.redhat.com/show_bug.cgi?id=1457929). # Other remaining libraries are not maintained in Fedora (clickhouse-cpp, # cityhash, prometheus-cpp) - -Patch0001: 0001-Unbundle-system-deps.patch -Patch0002: 0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch -Patch0003: 0003-Simplify-proxysql.service.patch - -%description -ProxySQL is a high performance, high availability, protocol aware proxy for -MySQL and forks (like Percona Server and MariaDB). +# +# NOTE: libdaemon contains custom patch (since https://github.com/sysown/proxysql/pull/4291) +# but I don't believe it is worth to bundle it just because of that. +%patchlist +0001-Unbundle-libconfig-libdaemon-sqlite3-pcre-lz3-curl-e.patch +0002-Enable-tcp_fastopen-in-bundled-libhttpserver.patch +0003-Simplify-systemd-services.patch +0004-Apply-fPIC-properly-in-re2-build.patch +0005-fixup-Unbundle-libconfig-libdaemon-sqlite3-pcre-lz3-.patch
%prep %autosetup -p1 @@ -132,6 +140,9 @@ install -d -m 0755 %{buildroot}%{_sharedstatedir}/proxysql %attr(-,proxysql,root) %config(noreplace) %{_sysconfdir}/proxysql.cnf
%changelog +* Sat May 18 2024 Igor Raits igor@gooddata.com - 2.6.2-1 +- Update to 2.6.2 + * Fri Jan 26 2024 Fedora Release Engineering releng@fedoraproject.org - 2.4.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources index 3425849..a4ece72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (proxysql-2.4.8.tar.gz) = d7a523d09ec9982b72caa66a1d814c64fb516e66c2ec3cba8f76663e3d989de2d6979015b40aeb46c14aef9b36ed05d4cdec86a1187a7f9fe550725b4c667249 +SHA512 (proxysql-2.6.2.tar.gz) = e9053e2aa72eec2a59b03bb5deb550efbd3b94dd75e32fec16d448614b4bae306d44be0e8844aa069d6a95eb94040a7704c4a33498be3da86d48a8da328a0aa0