From 7e3dabc5fd7c439a468528ffe7bdb683f42bbee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Fri, 13 Oct 2023 09:43:33 +0200 Subject: [PATCH] Update patch commands in deps.json to skip Reversed warning --- src/deps/deps.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/deps/deps.json b/src/deps/deps.json index 89f77e36..75275131 100644 --- a/src/deps/deps.json +++ b/src/deps/deps.json @@ -18,14 +18,14 @@ "name": "ModSecurity v3.0.10", "url": "https://github.com/SpiderLabs/ModSecurity.git", "commit": "ccc2d9b53632fb5088673bbaafedf0d8d4b5f1d8", - "post_install": "patch src/deps/src/modsecurity/configure.ac src/deps/misc/modsecurity.patch && rm -rf src/deps/src/modsecurity/others/libinjection" + "post_install": "patch --forward src/deps/src/modsecurity/configure.ac src/deps/misc/modsecurity.patch && rm -rf src/deps/src/modsecurity/others/libinjection" }, { "id": "modsecurity-nginx", "name": "ModSecurity-nginx v1.0.3", "url": "https://github.com/SpiderLabs/ModSecurity-nginx.git", "commit": "d59e4ad121df702751940fd66bcc0b3ecb51a079", - "post_install": "patch src/deps/src/modsecurity-nginx/src/ngx_http_modsecurity_log.c src/deps/misc/modsecurity-nginx.patch && patch src/deps/src/modsecurity-nginx/config src/deps/misc/config.patch && patch src/deps/src/modsecurity-nginx/src/ngx_http_modsecurity_common.h src/deps/misc/ngx_http_modsecurity_common.h.patch && patch src/deps/src/modsecurity-nginx/src/ngx_http_modsecurity_module.c src/deps/misc/ngx_http_modsecurity_module.c.patch" + "post_install": "patch --forward src/deps/src/modsecurity-nginx/src/ngx_http_modsecurity_log.c src/deps/misc/modsecurity-nginx.patch && patch --forward src/deps/src/modsecurity-nginx/config src/deps/misc/config.patch && patch --forward src/deps/src/modsecurity-nginx/src/ngx_http_modsecurity_common.h src/deps/misc/ngx_http_modsecurity_common.h.patch && patch --forward src/deps/src/modsecurity-nginx/src/ngx_http_modsecurity_module.c src/deps/misc/ngx_http_modsecurity_module.c.patch" }, { "id": "nginx", @@ -86,7 +86,7 @@ "name": "lua-ffi-zlib v0.6", "url": "https://github.com/hamishforbes/lua-ffi-zlib.git", "commit": "61e95cb434e4047c8bc65a180c293a05bf754416", - "post_install": "patch src/deps/src/lua-ffi-zlib/lib/ffi-zlib.lua src/deps/misc/lua-ffi-zlib.patch" + "post_install": "patch --forward src/deps/src/lua-ffi-zlib/lib/ffi-zlib.lua src/deps/misc/lua-ffi-zlib.patch" }, { "id": "lua-gd", @@ -129,7 +129,7 @@ "name": "lua-resty-ipmatcher v0.6.1 (3 commits after just in case)", "url": "https://github.com/api7/lua-resty-ipmatcher.git", "commit": "7fbb618f7221b1af1451027d3c64e51f3182761c", - "post_install": "patch src/deps/src/lua-resty-ipmatcher/resty/ipmatcher.lua src/deps/misc/ipmatcher.patch" + "post_install": "patch --forward src/deps/src/lua-resty-ipmatcher/resty/ipmatcher.lua src/deps/misc/ipmatcher.patch" }, { "id": "lua-resty-lock", @@ -203,7 +203,7 @@ "name": "luajit-geoip v2.1.0", "url": "https://github.com/leafo/luajit-geoip.git", "commit": "fde33e045083522d73665a6894d78dbf995b9e12", - "post_install": "patch src/deps/src/luajit-geoip/geoip/mmdb.lua src/deps/misc/mmdb.patch" + "post_install": "patch --forward src/deps/src/luajit-geoip/geoip/mmdb.lua src/deps/misc/mmdb.patch" }, { "id": "lualogging",