diff --git a/proxysql-gcc11.patch b/proxysql-gcc11.patch index afa8707..94e502f 100644 --- a/proxysql-gcc11.patch +++ b/proxysql-gcc11.patch @@ -15,7 +15,7 @@ diff --git a/deps/Makefile b/deps/Makefile index 6f049c8..6b0b6ea 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -149,6 +149,8 @@ +@@ -143,6 +143,8 @@ # cd mariadb-client-library/mariadb_client && patch libmariadb/ma_pvio.c < ../ma_pvio.c.patch cd mariadb-client-library/mariadb_client && patch unittest/libmariadb/basic-t.c < ../unittest_basic-t.c.patch cd mariadb-client-library/mariadb_client && patch unittest/libmariadb/charset.c < ../unittest_charset.c.patch diff --git a/proxysql.spec b/proxysql.spec index 8b7cb3a..4b0a643 100644 --- a/proxysql.spec +++ b/proxysql.spec @@ -1,6 +1,6 @@ Summary: A high-performance MySQL proxy Name: proxysql -Version: 2.2.2 +Version: 2.3.0 Release: 1%{?dist} # Proxysql Google group for free community support: https://groups.google.com/g/proxysql URL: http://www.proxysql.com/ @@ -137,6 +137,9 @@ install -d -m 0755 %{buildroot}%{_sharedstatedir}/proxysql %attr(-,proxysql,root) %config(noreplace) %{_sysconfdir}/%{name}.cnf %changelog +* Wed Sep 15 2021 Marek Kulik - 2.3.0-1 +- Updated to ProxySQL 2.3.0 + * Wed Sep 15 2021 Marek Kulik - 2.2.2-1 - Updated to ProxySQL 2.2.2 diff --git a/proxysql_debundle.patch b/proxysql_debundle.patch index 266d0fa..2ee0fb1 100644 --- a/proxysql_debundle.patch +++ b/proxysql_debundle.patch @@ -51,7 +51,7 @@ diff -ur proxysql-2.2.0/deps/Makefile test1/deps/Makefile GCC_VERSION := $(shell gcc -dumpversion) MIN_VERSION := 4.9.0 REQUIRE_PATCH = false -@@ -93,20 +78,6 @@ +@@ -93,21 +78,6 @@ cd libhttpserver/libhttpserver/build && CC=${CC} CXX=${CXX} ${MAKE} libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a @@ -64,15 +64,16 @@ diff -ur proxysql-2.2.0/deps/Makefile test1/deps/Makefile - -curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a - cd curl && rm -rf curl-7.57.0 || true -- cd curl && tar -zxf curl-7.57.0.tar.gz +- cd curl && rm -rf curl-7.77.0 || true +- cd curl && tar -zxf curl-7.77.0.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 && ./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 --without-librtmp --without-libpsl --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE} +- 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-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --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-0.9.55 || true cd libmicrohttpd && rm -rf libmicrohttpd-0.9.68 || true -@@ -130,12 +101,6 @@ +@@ -131,12 +101,6 @@ cd cityhash/cityhash && cp ../config.guess . && chmod +x config.guess && ./configure && CC=${CC} CXX=${CXX} ${MAKE} cityhash: cityhash/cityhash/src/.libs/libcityhash.a @@ -85,7 +86,7 @@ diff -ur proxysql-2.2.0/deps/Makefile test1/deps/Makefile clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a: cd clickhouse-cpp && rm -rf clickhouse-cpp || true cd clickhouse-cpp && tar -zxf clickhouse-cpp.tar.gz -@@ -144,15 +109,6 @@ +@@ -146,15 +110,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a @@ -101,7 +102,7 @@ diff -ur proxysql-2.2.0/deps/Makefile test1/deps/Makefile jemalloc/jemalloc/lib/libjemalloc.a: cd jemalloc && rm -rf jemalloc-5.2.0 cd jemalloc && tar -jxf jemalloc-5.2.0.tar.bz2 -@@ -166,11 +122,11 @@ +@@ -168,11 +123,11 @@ WITHASAN := $(shell echo $(WITHASAN)) @@ -115,7 +116,7 @@ diff -ur proxysql-2.2.0/deps/Makefile test1/deps/Makefile # cd mariadb-client-library/mariadb_client && cmake . -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl # this is needed on MacOSX cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_stmt.c < ../mariadb_stmt.c.patch cd mariadb-client-library/mariadb_client && patch libmariadb/mariadb_lib.c < ../mariadb_lib.c.patch -@@ -197,28 +153,11 @@ +@@ -199,28 +154,11 @@ mariadb_client: mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a @@ -145,7 +146,7 @@ diff -ur proxysql-2.2.0/deps/Makefile test1/deps/Makefile cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p0 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && cmake . -DBUILD_SHARED_LIBS=OFF -DENABLE_TESTING=OFF -DENABLE_PUSH=OFF -@@ -239,14 +178,6 @@ +@@ -241,14 +179,6 @@ re2: re2/re2/obj/libre2.a @@ -224,7 +225,7 @@ diff -ur proxysql-2.0.13/lib/Makefile test1/lib/Makefile LDIRS=-L$(JEMALLOC_PATH)/lib -L$(RE2_PATH)/obj -L$(INJECTION_PATH) -L$(PROMETHEUS_LDIR) -@@ -123,8 +102,8 @@ +@@ -138,8 +117,8 @@ $(ODIR)/%.oo: %.cpp $(HEADERS) $(CXX) -fPIC -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS) @@ -332,7 +333,7 @@ diff -ur proxysql-2.0.13/src/Makefile test1/src/Makefile UNAME_S := $(shell uname -s) -@@ -114,9 +78,9 @@ +@@ -121,9 +85,9 @@ NOJEMALLOC := $(shell echo $(NOJEMALLOC)) ifeq ($(NOJEMALLOC),1) @@ -344,7 +345,7 @@ diff -ur proxysql-2.0.13/src/Makefile test1/src/Makefile endif ifeq ($(UNAME_S),Darwin) -@@ -141,7 +105,6 @@ +@@ -148,7 +112,6 @@ LIBPROXYSQLAR=$(LDIR)/libproxysql.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 @@ -352,7 +353,7 @@ diff -ur proxysql-2.0.13/src/Makefile test1/src/Makefile ODIR= obj EXECUTABLE=proxysql -@@ -154,7 +117,7 @@ +@@ -161,7 +124,7 @@ proxysql: $(ODIR) $(OBJ) $(LIBPROXYSQLAR) ifeq ($(PROXYSQLCLICKHOUSE),1) diff --git a/proxysql_mariadb_cmake.patch b/proxysql_mariadb_cmake.patch index e379bf0..e407dd1 100644 --- a/proxysql_mariadb_cmake.patch +++ b/proxysql_mariadb_cmake.patch @@ -20,7 +20,7 @@ This patch fixes: diff --git a/deps/Makefile b/deps/Makefile --- a/deps/Makefile +++ b/deps/Makefile -@@ -134,4 +134,5 @@ +@@ -128,4 +128,5 @@ 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 cmake/ConnectorName.cmake < ../connector_cmake.patch diff --git a/sources b/sources index f492a31..5c9650b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.2.2.tar.gz) = 2eadef0274695558bb526b9346f8d588be4d2c7a621037f242fbd5472cc0dc5620aba64c5e42b2a791e4ff9ba2ea69d2cae3509b0e06603981caf918d540becd +SHA512 (v2.3.0.tar.gz) = 365917d0243ae49e28491d73c2791e4178de183b1323f5b502f56361d401be958958da843b292736c9faa438f888366ef2f2258a89fd1fc5b1f90ba6a12a8861