proxysql: 2.4.6 -> 2.5.0
This commit is contained in:
parent
f87cac221f
commit
2e6581f905
|
@ -32,13 +32,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proxysql";
|
||||
version = "2.4.6";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sysown";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-EquQCmXXspCpbyi1apoCcrICZAYq9BXlZsvy3KfHPJc=";
|
||||
hash = "sha256-psQzKycavS9xr24wGiRkr255IXW79AoG9fUEBkvPMZk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index ecbe04a9..4b5031a3 100644
|
||||
index e7dae058..09c28859 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -57,11 +57,7 @@ endif
|
||||
|
@ -15,7 +15,7 @@ index ecbe04a9..4b5031a3 100644
|
|||
USERCHECK := $(shell getent passwd proxysql)
|
||||
GROUPCHECK := $(shell getent group proxysql)
|
||||
|
||||
@@ -754,16 +750,10 @@ cleanbuild:
|
||||
@@ -784,16 +780,10 @@ cleanbuild:
|
||||
|
||||
.PHONY: install
|
||||
install: src/proxysql
|
||||
|
@ -36,22 +36,21 @@ index ecbe04a9..4b5031a3 100644
|
|||
install -m 0755 etc/init.d/proxysql /etc/init.d
|
||||
ifeq ($(DISTRO),"CentOS Linux")
|
||||
diff --git a/deps/Makefile b/deps/Makefile
|
||||
index b25e31b7..7196e493 100644
|
||||
index 23ef204c..3fbcc4a7 100644
|
||||
--- a/deps/Makefile
|
||||
+++ b/deps/Makefile
|
||||
@@ -65,11 +65,6 @@ endif
|
||||
@@ -65,10 +65,7 @@ endif
|
||||
|
||||
|
||||
libinjection/libinjection/src/libinjection.a:
|
||||
- cd libinjection && rm -rf libinjection-*/ || true
|
||||
- cd libinjection && tar -zxf libinjection-3.10.0.tar.gz
|
||||
-ifneq ($(CENTOSVER),6)
|
||||
ifneq ($(CENTOSVER),6)
|
||||
- cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff
|
||||
-endif
|
||||
cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch
|
||||
endif
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
sed -i '' 's/CC=/CC?=/' libinjection/libinjection/src/Makefile
|
||||
else
|
||||
@@ -79,8 +74,6 @@ endif
|
||||
@@ -80,8 +77,6 @@ endif
|
||||
libinjection: libinjection/libinjection/src/libinjection.a
|
||||
|
||||
libssl/openssl/libssl.a:
|
||||
|
@ -60,16 +59,25 @@ index b25e31b7..7196e493 100644
|
|||
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
|
||||
@@ -97,8 +90,6 @@ ifeq ($(MIN_VERSION),$(lastword $(sort $(GCC_VERSION) $(MIN_VERSION))))
|
||||
@@ -99,9 +94,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS)))
|
||||
endif
|
||||
|
||||
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-0.18.1.tar.gz
|
||||
ifeq ($(REQUIRE_PATCH), true)
|
||||
-#ifeq ($(REQUIRE_PATCH), true)
|
||||
cd libhttpserver/libhttpserver && patch src/httpserver/basic_auth_fail_response.hpp < ../basic_auth_fail_response.hpp.patch
|
||||
cd libhttpserver/libhttpserver && patch src/httpserver/create_webserver.hpp < ../create_webserver.hpp.patch
|
||||
@@ -121,35 +112,17 @@ endif
|
||||
cd libhttpserver/libhttpserver && patch src/httpserver/deferred_response.hpp < ../deferred_response.hpp.patch
|
||||
@@ -112,7 +104,6 @@ libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmi
|
||||
cd libhttpserver/libhttpserver && patch src/httpserver/http_response.hpp < ../http_response.hpp.patch
|
||||
cd libhttpserver/libhttpserver && patch src/httpserver/string_response.hpp < ../string_response.hpp.patch
|
||||
cd libhttpserver/libhttpserver && patch -p0 < ../re2_regex.patch
|
||||
-#endif
|
||||
cd libhttpserver/libhttpserver && patch -p0 < ../final_val_post_process.patch
|
||||
cd libhttpserver/libhttpserver && patch -p0 < ../empty_uri_log_crash.patch
|
||||
ifeq ($(UNAME_S),FreeBSD)
|
||||
@@ -124,35 +115,17 @@ endif
|
||||
libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
|
||||
|
||||
libev/libev/.libs/libev.a:
|
||||
|
@ -105,7 +113,7 @@ index b25e31b7..7196e493 100644
|
|||
cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a
|
||||
|
||||
@@ -160,8 +133,6 @@ cityhash/cityhash/src/.libs/libcityhash.a:
|
||||
@@ -163,8 +136,6 @@ cityhash/cityhash/src/.libs/libcityhash.a:
|
||||
cityhash: cityhash/cityhash/src/.libs/libcityhash.a
|
||||
|
||||
lz4/lz4/liblz4.a:
|
||||
|
@ -114,7 +122,7 @@ index b25e31b7..7196e493 100644
|
|||
cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
lz4: lz4/lz4/liblz4.a
|
||||
|
||||
@@ -186,8 +157,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
|
||||
@@ -189,8 +160,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
|
||||
|
||||
|
||||
libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
|
||||
|
@ -123,7 +131,7 @@ index b25e31b7..7196e493 100644
|
|||
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}
|
||||
|
||||
@@ -261,17 +230,12 @@ sqlite3/sqlite3/sqlite3.o:
|
||||
@@ -264,17 +233,12 @@ sqlite3/sqlite3/sqlite3.o:
|
||||
sqlite3: sqlite3/sqlite3/sqlite3.o
|
||||
|
||||
libconfig/libconfig/lib/.libs/libconfig++.a:
|
||||
|
@ -141,7 +149,7 @@ index b25e31b7..7196e493 100644
|
|||
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 && patch -p0 < ../include_limits.patch
|
||||
@@ -281,10 +245,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
|
||||
@@ -284,10 +248,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
|
||||
prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a
|
||||
|
||||
re2/re2/obj/libre2.a:
|
||||
|
@ -152,7 +160,7 @@ index b25e31b7..7196e493 100644
|
|||
cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
cd re2/re2 && sed -i '' -e 's/-O3 /-O3 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile
|
||||
@@ -298,8 +258,6 @@ endif
|
||||
@@ -301,8 +261,6 @@ endif
|
||||
re2: re2/re2/obj/libre2.a
|
||||
|
||||
pcre/pcre/.libs/libpcre.a:
|
||||
|
|
Loading…
Reference in a new issue