tjh.dev
1diff --git a/Makefile b/Makefile
2index df7ed196..3a3b393d 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -57,11 +57,7 @@ endif
6
7 export MAKEOPT=-j ${NPROCS}
8
9-ifeq ($(wildcard /usr/lib/systemd/system), /usr/lib/systemd/system)
10- SYSTEMD=1
11-else
12- SYSTEMD=0
13-endif
14+SYSTEMD=1
15 USERCHECK := $(shell getent passwd proxysql)
16 GROUPCHECK := $(shell getent group proxysql)
17
18@@ -784,16 +780,10 @@ cleanbuild:
19
20 .PHONY: install
21 install: src/proxysql
22- install -m 0755 src/proxysql /usr/bin
23- install -m 0600 etc/proxysql.cnf /etc
24- if [ ! -d /var/lib/proxysql ]; then mkdir /var/lib/proxysql ; fi
25-ifeq ($(findstring proxysql,$(USERCHECK)),)
26- @echo "Creating proxysql user and group"
27- useradd -r -U -s /bin/false proxysql
28-endif
29+ install -m 0755 src/proxysql $(out)/bin
30+ install -m 0600 etc/proxysql.cnf $(out)/etc
31 ifeq ($(SYSTEMD), 1)
32- install -m 0644 systemd/system/proxysql.service /usr/lib/systemd/system/
33- systemctl enable proxysql.service
34+ install -m 0644 systemd/system/proxysql.service $(out)/lib/systemd/system/
35 else
36 install -m 0755 etc/init.d/proxysql /etc/init.d
37 ifeq ($(DISTRO),"CentOS Linux")
38diff --git a/deps/Makefile b/deps/Makefile
39index 47c0f3c3..80d33d11 100644
40--- a/deps/Makefile
41+++ b/deps/Makefile
42@@ -66,10 +66,7 @@ endif
43
44
45 libinjection/libinjection/src/libinjection.a:
46- cd libinjection && rm -rf libinjection-*/ || true
47- cd libinjection && tar -zxf libinjection-3.10.0.tar.gz
48 ifneq ($(CENTOSVER),6)
49- cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff
50 cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch
51 endif
52 ifeq ($(UNAME_S),Darwin)
53@@ -83,8 +80,6 @@ libinjection: libinjection/libinjection/src/libinjection.a
54
55
56 libssl/openssl/libssl.a:
57- cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true
58- cd libssl && tar -zxf openssl-*.tar.gz
59 # cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch
60 # cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch
61 cd libssl/openssl && ./config no-ssl3 no-tests
62@@ -103,8 +98,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS)))
63 endif
64
65 libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a
66- cd libhttpserver && rm -rf libhttpserver-*/ || true
67- cd libhttpserver && tar -zxf libhttpserver-*.tar.gz
68 #ifeq ($(REQUIRE_PATCH), true)
69 cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch
70 cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch
71@@ -122,8 +115,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
72
73
74 libev/libev/.libs/libev.a:
75- cd libev && rm -rf libev-*/ || true
76- cd libev && tar -zxf libev-*.tar.gz
77 cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch
78 cd libev/libev && ./configure
79 cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE}
80@@ -132,8 +123,6 @@ ev: libev/libev/.libs/libev.a
81
82
83 curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a
84- cd curl && rm -rf curl-*/ || true
85- cd curl && tar -zxf curl-*.tar.gz
86 # 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}
87 # cd curl/curl && patch configure < ../configure.patch
88 cd curl/curl && autoreconf -fi
89@@ -143,16 +132,6 @@ curl: curl/curl/lib/.libs/libcurl.a
90
91
92 libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a:
93- cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true
94- cd libmicrohttpd && rm -f libmicrohttpd || true
95-ifeq ($(CENTOSVER),6)
96- cd libmicrohttpd && ln -s libmicrohttpd-0.9.55 libmicrohttpd
97- cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.55.tar.gz
98-else
99- cd libmicrohttpd && ln -s libmicrohttpd-0.9.75 libmicrohttpd
100- cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.75.tar.gz
101-# cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch
102-endif
103 ifeq ($(UNAME_S),Darwin)
104 cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/mhd_sockets.c < ../mhd_sockets.c-issue-5977.patch
105 endif
106@@ -171,8 +150,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a
107
108
109 lz4/lz4/lib/liblz4.a:
110- cd lz4 && rm -rf lz4-*/ || true
111- cd lz4 && tar -zxf lz4-*.tar.gz
112 cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
113
114 lz4: lz4/lz4/lib/liblz4.a
115@@ -197,8 +174,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
116
117
118 libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
119- cd libdaemon && rm -rf libdaemon-*/ || true
120- cd libdaemon && tar -zxf libdaemon-0.14.tar.gz
121 cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples
122 cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
123
124@@ -282,8 +257,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o
125
126
127 libconfig/libconfig/lib/.libs/libconfig++.a:
128- cd libconfig && rm -rf libconfig-*/ || true
129- cd libconfig && tar -zxf libconfig-*.tar.gz
130 cd libconfig/libconfig && ./configure --disable-examples
131 cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE}
132
133@@ -291,9 +264,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
134
135
136 prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
137- cd prometheus-cpp && rm -rf prometheus-cpp-*/ || true
138- cd prometheus-cpp && tar -zxf prometheus-cpp-*.tar.gz
139- cd prometheus-cpp && tar --strip-components=1 -zxf civetweb-*.tar.gz -C prometheus-cpp/3rdparty/civetweb
140 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch
141 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch
142 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch
143@@ -304,10 +274,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a
144
145
146 re2/re2/obj/libre2.a:
147- cd re2 && rm -rf re2-*/ || true
148- cd re2 && tar -zxf re2-*.tar.gz
149-# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile
150-# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch
151 cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch
152 ifeq ($(UNAME_S),Darwin)
153 cd re2/re2 && sed -i '' -e 's/-O3 -g/-O3 -g -std=c++11 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile
154@@ -322,8 +288,6 @@ re2: re2/re2/obj/libre2.a
155
156
157 pcre/pcre/.libs/libpcre.a:
158- cd pcre && rm -rf pcre-*/ || true
159- cd pcre && tar -zxf pcre-*.tar.gz
160 cd pcre/pcre && patch pcretest.c < ../pcretest.c-multiplication-overflow.patch
161 cd pcre/pcre && ./configure
162 cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE}