bunkerweb 1.4.0

2022-06-03 17:24:14 +02:00
parent 3a078326c5
commit a9f886804a
5245 changed files with 1432051 additions and 27894 deletions
--- a/deps/misc/ipmatcher.patch
+++ b/deps/misc/ipmatcher.patch
@@ -0,0 +1,11 @@
+--- ipmatcher.lua       2022-04-13 17:16:05.731322800 +0200
+++ ipmatcher.lua2      2022-04-13 17:17:15.801322800 +0200
+@@ -123,7 +123,7 @@
+
+
+ local ngx_log = ngx.log
+-local ngx_INFO = ngx.INFO
+local ngx_INFO = ngx.DEBUG
+ local function log_info(...)
+     if cur_level and ngx_INFO > cur_level then
+         return
--- a/deps/misc/lua.patch1
+++ b/deps/misc/lua.patch1
@@ -0,0 +1,9 @@
+@@ -43,7 +43,7 @@
+ # What to install.
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
+-TO_LIB= liblua.a
+TO_LIB= liblua.a liblua.so
+ TO_MAN= lua.1 luac.1
+
+ # Lua version and release.
--- a/deps/misc/lua.patch2
+++ b/deps/misc/lua.patch2
@@ -0,0 +1,35 @@
+@@ -8,7 +8,7 @@
+ PLAT= none
+
+ CC= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
+CFLAGS= -O2 -Wall $(MYCFLAGS) -fPIC
+ AR= ar rcu
+ RANLIB= ranlib
+ RM= rm -f
+@@ -23,6 +23,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+
+ LUA_A=	liblua.a
+LUA_SO= liblua.so
+ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+        lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+        lundump.o lvm.o lzio.o
+@@ -36,7 +37,7 @@
+ LUAC_O= luac.o print.o
+
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+
+ default: $(PLAT)
+@@ -54,6 +55,9 @@
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
+$(LUA_SO): $(CORE_O) $(LIB_O)
+	$(CC) -o $@ -shared -fPIC $? -ldl -lm
+
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
--- a/deps/misc/mmdb.patch
+++ b/deps/misc/mmdb.patch
@@ -0,0 +1,11 @@
+--- mmdb.lua	2022-04-04 09:32:41.456286600 +0200
+++ mmdb2.lua	2022-04-04 09:33:25.016286600 +0200
+@@ -166,7 +166,7 @@
+                             MMDB_entry_data_s *const entry_data,
+                             ...);
+ ]])
+-local lib = ffi.load("libmaxminddb")
+local lib = ffi.load("/opt/bunkerweb/deps/lib/libmaxminddb.so")
+ local consume_map, consume_array
+ local consume_value
+ consume_value = function(current)
--- a/deps/misc/modsecurity-nginx.patch
+++ b/deps/misc/modsecurity-nginx.patch
@@ -0,0 +1,11 @@
+--- ngx_http_modsecurity_log.c	2022-04-25 14:30:34.444469100 +0200
+++ ngx_http_modsecurity_log.c2	2022-04-25 14:31:25.714469100 +0200
+@@ -30,7 +30,7 @@
+     }
+     msg = (const char *) data;
+ 
+-    ngx_log_error(NGX_LOG_INFO, (ngx_log_t *)log, 0, "%s", msg);
+    ngx_log_error(NGX_LOG_WARN, (ngx_log_t *)log, 0, "%s", msg);
+ }
+ 
+ 
--- a/deps/misc/modsecurity.patch
+++ b/deps/misc/modsecurity.patch
@@ -0,0 +1,21 @@
+--- before/configure.ac  2022-05-19 17:06:36.921274500 +0200
+++ after/configure.ac   2022-05-17 11:51:17.319667600 +0200
+@@ -308,14 +308,14 @@
+
+
+ # Decide if we want to build the tests or not.
+-buildTestUtilities=false
+-if test "x$YAJL_FOUND" = "x1"; then
+# buildTestUtilities=false
+# if test "x$YAJL_FOUND" = "x1"; then
+     # Regression tests will not be able to run without the logging support.
+     # But we still have the unit tests.
+     # if test "$debugLogs" = "true"; then
+-        buildTestUtilities=true
+#        buildTestUtilities=true
+     # fi
+-fi
+# fi
+
+
+ AM_CONDITIONAL([TEST_UTILITIES], [test $buildTestUtilities = true])