nginx: bump to 1.21.1 and improve makefile

- Bump to 1.21.1
- Rework makefile to fix bad make refresh
- Refresh patch

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

1 files changed, 0 insertions, 195 deletions

diff --git a/net/nginx/patches-lua-nginx/100-no_by_lua_block.patch b/net/nginx/patches-lua-nginx/100-no_by_lua_block.patch
deleted file mode 100644
index 968e12d58..000000000
--- a/net/nginx/patches-lua-nginx/100-no_by_lua_block.patch
+++ /dev/null
@@ -1,195 +0,0 @@
---- a/lua-nginx/src/ngx_http_lua_module.c
-+++ b/lua-nginx/src/ngx_http_lua_module.c
-@@ -165,14 +165,14 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       offsetof(ngx_http_lua_loc_conf_t, log_socket_errors),
-       NULL },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     { ngx_string("init_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-       ngx_http_lua_init_by_lua_block,
-       NGX_HTTP_MAIN_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_init_by_inline },
--
-+#endif
-     { ngx_string("init_by_lua"),
-       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-       ngx_http_lua_init_by_lua,
-@@ -186,14 +186,14 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_MAIN_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_init_by_file },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     { ngx_string("init_worker_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-       ngx_http_lua_init_worker_by_lua_block,
-       NGX_HTTP_MAIN_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_init_worker_by_inline },
--
-+#endif
-     { ngx_string("init_worker_by_lua"),
-       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-       ngx_http_lua_init_worker_by_lua,
-@@ -209,6 +209,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       (void *) ngx_http_lua_init_worker_by_file },
- 
- #if defined(NDK) && NDK
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* set_by_lua $res { inline Lua code } [$arg1 [$arg2 [...]]] */
-     { ngx_string("set_by_lua_block"),
-       NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -217,7 +218,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_filter_set_by_lua_inline },
--
-+#endif
-     /* set_by_lua $res <inline script> [$arg1 [$arg2 [...]]] */
-     { ngx_string("set_by_lua"),
-       NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -245,7 +246,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_rewrite_handler_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* rewrite_by_lua_block { <inline script> } */
-     { ngx_string("rewrite_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -254,7 +255,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_rewrite_handler_inline },
--
-+#endif
-     /* access_by_lua "<inline script>" */
-     { ngx_string("access_by_lua"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -263,7 +264,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_access_handler_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* access_by_lua_block { <inline script> } */
-     { ngx_string("access_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -272,7 +273,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_access_handler_inline },
--
-+#endif
-     /* content_by_lua "<inline script>" */
-     { ngx_string("content_by_lua"),
-       NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-@@ -280,7 +281,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_content_handler_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* content_by_lua_block { <inline script> } */
-     { ngx_string("content_by_lua_block"),
-       NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-@@ -288,7 +289,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_content_handler_inline },
--
-+#endif
-     /* log_by_lua <inline script> */
-     { ngx_string("log_by_lua"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -297,7 +298,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_log_handler_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* log_by_lua_block { <inline script> } */
-     { ngx_string("log_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -306,7 +307,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_log_handler_inline },
--
-+#endif
-     { ngx_string("rewrite_by_lua_file"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                         |NGX_CONF_TAKE1,
-@@ -361,7 +362,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_header_filter_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* header_filter_by_lua_block { <inline script> } */
-     { ngx_string("header_filter_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -370,7 +371,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_header_filter_inline },
--
-+#endif
-     { ngx_string("header_filter_by_lua_file"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                         |NGX_CONF_TAKE1,
-@@ -386,7 +387,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_body_filter_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* body_filter_by_lua_block { <inline script> } */
-     { ngx_string("body_filter_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -395,7 +396,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_body_filter_inline },
--
-+#endif
-     { ngx_string("body_filter_by_lua_file"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                         |NGX_CONF_TAKE1,
-@@ -403,14 +404,14 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_body_filter_file },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     { ngx_string("balancer_by_lua_block"),
-       NGX_HTTP_UPS_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-       ngx_http_lua_balancer_by_lua_block,
-       NGX_HTTP_SRV_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_balancer_handler_inline },
--
-+#endif
-     { ngx_string("balancer_by_lua_file"),
-       NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-       ngx_http_lua_balancer_by_lua,
-@@ -517,14 +518,14 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       offsetof(ngx_http_lua_loc_conf_t, ssl_ciphers),
-       NULL },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     { ngx_string("ssl_certificate_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-       ngx_http_lua_ssl_cert_by_lua_block,
-       NGX_HTTP_SRV_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_ssl_cert_handler_inline },
--
-+#endif
-     { ngx_string("ssl_certificate_by_lua_file"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-       ngx_http_lua_ssl_cert_by_lua,