From 6fa3a3419615423fd076a195fb5e4c27305a79bd Mon Sep 17 00:00:00 2001 From: Filip Januš Date: Nov 19 2019 16:00:25 +0000 Subject: Upstream released new version Rebase onto 2.0.9 proxysql_debundle.patch was modified according to changes in lib/Makefile --- diff --git a/.gitignore b/.gitignore index 5b44a36..8eb8363 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /v1.3.7.tar.gz /proxysql-2.0.7.tar.gz /proxysql-2.0.8.tar.gz +/proxysql-2.0.9.tar.gz diff --git a/proxysql.spec b/proxysql.spec index 3120dd4..b2cc307 100644 --- a/proxysql.spec +++ b/proxysql.spec @@ -1,6 +1,6 @@ Summary: A high-performance MySQL proxy Name: proxysql -Version: 2.0.8 +Version: 2.0.9 Release: 1%{?dist} URL: http://www.proxysql.com/ # The entire source code is GPLv3+ except deps/re2 and deps/jemalloc which is BSD @@ -106,6 +106,10 @@ install -d -m 0755 %{buildroot}%{_sharedstatedir}/proxysql %config(noreplace) %{_sysconfdir}/%{name}.cnf %changelog +* Tue Nov 19 2019 Filip Januš - 2.0.9-1 +- Upstream released ProxySQL 2.0.9 +- Patch0 was modified - lib/Makefile was modified + * Tue Oct 15 2019 Filip Januš - 2.0.8-1 - Upstream released ProxySQL 2.0.8 diff --git a/proxysql_debundle.patch b/proxysql_debundle.patch index 5711081..ba7db27 100644 --- a/proxysql_debundle.patch +++ b/proxysql_debundle.patch @@ -1,11 +1,9 @@ Patch provides debundling libraries: pcre, curl, sqlite3, lz4, libssl libconfig, libdeamon, ev -Only in proxysql-2.0.7_patch/deps/google-coredumper: google-coredumper -Only in proxysql-2.0.7_patch/deps/jemalloc: jemalloc-5.2.0 -Only in proxysql-2.0.7_patch/deps/libmicrohttpd: libmicrohttpd-0.9.55 -diff -ur proxysql-2.0.7/deps/Makefile proxysql-2.0.7_patch/deps/Makefile ---- proxysql-2.0.7/deps/Makefile 2019-09-26 16:56:58.171674311 +0200 -+++ proxysql-2.0.7_patch/deps/Makefile 2019-09-30 15:48:26.029501639 +0200 + +diff -ur proxysql-2.0.9/deps/Makefile 209/deps/Makefile +--- proxysql-2.0.9/deps/Makefile 2019-11-07 06:48:56.000000000 +0100 ++++ 209/deps/Makefile 2019-11-19 16:42:58.653140972 +0100 @@ -11,21 +11,12 @@ PROXYSQLCLICKHOUSE := $(shell echo $(PROXYSQLCLICKHOUSE)) @@ -75,7 +73,7 @@ diff -ur proxysql-2.0.7/deps/Makefile proxysql-2.0.7_patch/deps/Makefile jemalloc/jemalloc/lib/libjemalloc.a: cd jemalloc && rm -rf jemalloc-5.2.0 -@@ -93,10 +67,10 @@ +@@ -94,10 +68,10 @@ jemalloc: jemalloc/jemalloc/lib/libjemalloc.a @@ -88,7 +86,7 @@ diff -ur proxysql-2.0.7/deps/Makefile proxysql-2.0.7_patch/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 -@@ -116,40 +90,18 @@ +@@ -118,40 +92,18 @@ mariadb_client: mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a @@ -130,12 +128,10 @@ diff -ur proxysql-2.0.7/deps/Makefile proxysql-2.0.7_patch/deps/Makefile cleanpart: cd mariadb-client-library && rm -rf mariadb-connector-c-2.3.1 -Only in proxysql-2.0.7_patch/deps/mariadb-client-library: mariadb-connector-c-3.0.2-src -Only in proxysql-2.0.7_patch/deps/re2: re2-2018-07-01 -Only in proxysql-2.0.7_patch/lib: libproxysql.a -diff -ur proxysql-2.0.7/lib/Makefile proxysql-2.0.7_patch/lib/Makefile ---- proxysql-2.0.7/lib/Makefile 2019-09-26 16:56:58.148674091 +0200 -+++ proxysql-2.0.7_patch/lib/Makefile 2019-09-30 15:47:02.620574157 +0200 +Only in 209/deps: Makefile.orig +diff -ur proxysql-2.0.9/lib/Makefile 209/lib/Makefile +--- proxysql-2.0.9/lib/Makefile 2019-11-07 06:48:56.000000000 +0100 ++++ 209/lib/Makefile 2019-11-19 16:43:22.536324712 +0100 @@ -11,8 +11,6 @@ JEMALLOC_PATH=$(DEPS_PATH)/jemalloc/jemalloc JEMALLOC_IDIR=$(JEMALLOC_PATH)/include/jemalloc @@ -177,20 +173,9 @@ diff -ur proxysql-2.0.7/lib/Makefile proxysql-2.0.7_patch/lib/Makefile LDIRS=-L$(JEMALLOC_PATH)/lib -L$(RE2_PATH)/obj -L$(INJECTION_PATH) -@@ -96,16 +85,16 @@ - OBJ_CXX = $(patsubst %,$(ODIR)/%,$(_OBJ_CXX)) - - %.ko: %.cpp -- $(CXX) -fPIC -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS) -+ $(CXX) -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS) - - $(ODIR)/%.o: %.c -- $(CC) -fPIC -c -o $@ $< $(MYCFLAGS) $(CFLAGS) -+ $(CC) -c -o $@ $< $(MYCFLAGS) $(CFLAGS) - - $(ODIR)/%.oo: %.cpp -- $(CXX) -fPIC -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS) -+ $(CXX) -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS) +@@ -105,8 +94,8 @@ + $(ODIR)/%.oo: %.cpp $(HEADERS) + $(CXX) -fPIC -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS) -libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CXX) $(RE2_PATH)/obj/libre2.a $(SQLITE3_DIR)/sqlite3.o - ar rcs $@ $(OBJ) $(OBJ_CXX) $(RE2_PATH)/obj/libre2.a $(SQLITE3_DIR)/sqlite3.o @@ -199,10 +184,11 @@ diff -ur proxysql-2.0.7/lib/Makefile proxysql-2.0.7_patch/lib/Makefile $(ODIR): mkdir $(ODIR) -Only in proxysql-2.0.7_patch/lib: obj -diff -ur proxysql-2.0.7/src/Makefile proxysql-2.0.7_patch/src/Makefile ---- proxysql-2.0.7/src/Makefile 2019-09-26 16:56:58.151674120 +0200 -+++ proxysql-2.0.7_patch/src/Makefile 2019-09-30 15:47:36.203964087 +0200 +Only in 209/lib: Makefile.orig +Only in 209/lib: Makefile.rej +diff -ur proxysql-2.0.9/src/Makefile 209/src/Makefile +--- proxysql-2.0.9/src/Makefile 2019-11-07 06:48:56.000000000 +0100 ++++ 209/src/Makefile 2019-11-19 16:42:58.654140980 +0100 @@ -9,30 +9,18 @@ MARIADB_LDIR=$(MARIADB_PATH)/libmariadb @@ -293,5 +279,3 @@ diff -ur proxysql-2.0.7/src/Makefile proxysql-2.0.7_patch/src/Makefile else $(CXX) -o $@ $(OBJ) $(LIBPROXYSQLAR) $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(LDFLAGS) $(MYLIBS) endif -Only in proxysql-2.0.7_patch/src: obj -Only in proxysql-2.0.7_patch/src: proxysql diff --git a/sources b/sources index 418dbd4..2b23e5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (proxysql-2.0.8.tar.gz) = 9943b8595a3bfa828310fbab90aa439d81a09c4bbf94b86ad71cac95d1b23c5ca5e04c567a767b69f78d4a1a0c84cff9c4789836838d08757db945ec54b1a7cd +SHA512 (proxysql-2.0.9.tar.gz) = 9cebe14d26562da7557ed25b302f284297320963f56664a501e937748b3c8ace5c946421d9d42b93dedbb0cd29647ae8072408acece708c0df029515d5b71a7a