chore: bump NGINX version v1.21.4 (#8889)

* chore: bump NGINX version v1.21.4 Signed-off-by: Jintao Zhang <[email protected]> * chore: bump all others Signed-off-by: Jintao Zhang <[email protected]> * apply all patches Signed-off-by: Jintao Zhang <[email protected]> * fix files hash Signed-off-by: Jintao Zhang <[email protected]> * fix ajp module Signed-off-by: Jintao Zhang <[email protected]> Signed-off-by: Jintao Zhang <[email protected]>
kubernetes · Oct 28, 2022 · bf8362c · bf8362c
1 parent 2488fb0
commit bf8362c
Show file tree

Hide file tree

Showing 21 changed files with 92 additions and 113 deletions.
diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh
@@ -18,13 +18,13 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-export NGINX_VERSION=1.19.10
+export NGINX_VERSION=1.21.4
 
 # Check for recent changes: https://github.com/vision5/ngx_devel_kit/compare/v0.3.1...master
 export NDK_VERSION=0.3.1
 
-# Check for recent changes: https://github.com/openresty/set-misc-nginx-module/compare/v0.32...master
-export SETMISC_VERSION=0.32
+# Check for recent changes: https://github.com/openresty/set-misc-nginx-module/compare/v0.33...master
+export SETMISC_VERSION=0.33
 
 # Check for recent changes: https://github.com/openresty/headers-more-nginx-module/compare/v0.33...master
 export MORE_HEADERS_VERSION=0.33
@@ -65,37 +65,39 @@ export MODSECURITY_LIB_VERSION=v3.0.8
 # Check for recent changes: https://github.com/coreruleset/coreruleset/compare/v3.3.2...v3.3/master
 export OWASP_MODSECURITY_CRS_VERSION=v3.3.4
 
-# Check for recent changes: https://github.com/openresty/lua-nginx-module/compare/v0.10.20...master
-export LUA_NGX_VERSION=b721656a9127255003b696b42ccc871c7ec18d59
+# Check for recent changes: https://github.com/openresty/lua-nginx-module/compare/v0.10.21...master
+export LUA_NGX_VERSION=0.10.21
 
-# Check for recent changes: https://github.com/openresty/stream-lua-nginx-module/compare/v0.0.10...master
-export LUA_STREAM_NGX_VERSION=74f8c8bca5b95cecbf42d4e1a465bc08cd075a9b
+# Check for recent changes: https://github.com/openresty/stream-lua-nginx-module/compare/v0.0.11...master
+export LUA_STREAM_NGX_VERSION=0.0.11
 
-# Check for recent changes: https://github.com/openresty/lua-upstream-nginx-module/compare/v0.07...master
+# Check for recent changes: https://github.com/openresty/lua-upstream-nginx-module/compare/8aa93ead98ba2060d4efd594ae33a35d153589bf...master
 export LUA_UPSTREAM_VERSION=8aa93ead98ba2060d4efd594ae33a35d153589bf
 
-# Check for recent changes: https://github.com/openresty/lua-cjson/compare/2.1.0.8...openresty:master
-export LUA_CJSON_VERSION=4b350c531de3d71008c77ae94e59275b8371b4dc
+# Check for recent changes: https://github.com/openresty/lua-cjson/compare/2.1.0.10...openresty:master
+export LUA_CJSON_VERSION=2.1.0.10
 
 export NGINX_INFLUXDB_VERSION=5b09391cb7b9a889687c0aa67964c06a2d933e8b
 
 # Check for recent changes: https://github.com/leev/ngx_http_geoip2_module/compare/3.3...master
 export GEOIP2_VERSION=a26c6beed77e81553686852dceb6c7fdacc5970d
 
-# Check for recent changes: https://github.com/yaoweibin/nginx_ajp_module/compare/v0.3.0...master
-export NGINX_AJP_VERSION=a964a0bcc6a9f2bfb82a13752d7794a36319ffac
+# Check for recent changes: https://github.com/msva/nginx_ajp_module/compare/fcbb2ccca4901d317ecd7a9dabb3fec9378ff40f...master
+# This is a fork from https://github.com/yaoweibin/nginx_ajp_module
+# Since it has not been updated and is not compatible with NGINX 1.21
+export NGINX_AJP_VERSION=fcbb2ccca4901d317ecd7a9dabb3fec9378ff40f
 
-# Check for recent changes: https://github.com/openresty/luajit2/compare/v2.1-20210510...v2.1-agentzh
-export LUAJIT_VERSION=2.1-20210510
+# Check for recent changes: https://github.com/openresty/luajit2/compare/v2.1-20220411...v2.1-agentzh
+export LUAJIT_VERSION=2.1-20220411
 
 # Check for recent changes: https://github.com/openresty/lua-resty-balancer/compare/v0.04...master
 export LUA_RESTY_BALANCER=0.04
 
 # Check for recent changes: https://github.com/openresty/lua-resty-lrucache/compare/v0.11...master
 export LUA_RESTY_CACHE=0.11
 
-# Check for recent changes: https://github.com/openresty/lua-resty-core/compare/v0.1.22...master
-export LUA_RESTY_CORE=0.1.22
+# Check for recent changes: https://github.com/openresty/lua-resty-core/compare/v0.1.23...master
+export LUA_RESTY_CORE=0.1.23
 
 # Check for recent changes: https://github.com/cloudflare/lua-resty-cookie/compare/v0.1.0...master
 export LUA_RESTY_COOKIE_VERSION=303e32e512defced053a6484bc0745cf9dc0d39e
@@ -112,17 +114,17 @@ export LUA_RESTY_LOCK=0.08
 # Check for recent changes: https://github.com/openresty/lua-resty-upload/compare/v0.10...master
 export LUA_RESTY_UPLOAD_VERSION=0.10
 
-# Check for recent changes: https://github.com/openresty/lua-resty-string/compare/v0.14...master
-export LUA_RESTY_STRING_VERSION=9ace36f2dde09451c377c839117ade45eb02d460
+# Check for recent changes: https://github.com/openresty/lua-resty-string/compare/v0.15...master
+export LUA_RESTY_STRING_VERSION=0.15
 
 # Check for recent changes: https://github.com/openresty/lua-resty-memcached/compare/v0.16...master
 export LUA_RESTY_MEMCACHED_VERSION=0.16
 
-# Check for recent changes: https://github.com/openresty/lua-resty-redis/compare/v0.29...master
-export LUA_RESTY_REDIS_VERSION=0.29
+# Check for recent changes: https://github.com/openresty/lua-resty-redis/compare/v0.30...master
+export LUA_RESTY_REDIS_VERSION=0.30
 
-# Check for recent changes: https://github.com/api7/lua-resty-ipmatcher/compare/v0.6...master
-export LUA_RESTY_IPMATCHER_VERSION=211e0d2eb8bbb558b79368f89948a0bafdc23654
+# Check for recent changes: https://github.com/api7/lua-resty-ipmatcher/compare/v0.6.1...master
+export LUA_RESTY_IPMATCHER_VERSION=0.6.1
 
 # Check for recent changes: https://github.com/ElvinEfendi/lua-resty-global-throttle/compare/v0.2.0...main
 export LUA_RESTY_GLOBAL_THROTTLE_VERSION=0.2.0
@@ -200,13 +202,13 @@ mkdir --verbose -p "$BUILD_PATH"
 cd "$BUILD_PATH"
 
 # download, verify and extract the source files
-get_src e8d0290ff561986ad7cd6c33307e12e11b137186c4403a6a5ccdb4914c082d88 \
+get_src d1f72f474e71bcaaf465dcc7e6f7b6a4705e4b1ed95c581af31df697551f3bfe \
         "https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
 
 get_src 0e971105e210d272a497567fa2e2c256f4e39b845a5ba80d373e26ba1abfbd85 \
         "https://github.com/simpl/ngx_devel_kit/archive/v$NDK_VERSION.tar.gz"
 
-get_src f1ad2459c4ee6a61771aa84f77871f4bfe42943a4aa4c30c62ba3f981f52c201 \
+get_src cd5e2cc834bcfa30149e7511f2b5a2183baf0b70dc091af717a89a64e44a2985 \
         "https://github.com/openresty/set-misc-nginx-module/archive/v$SETMISC_VERSION.tar.gz"
 
 get_src a3dcbab117a9c103bc1ea5200fc00a7b7d2af97ff7fd525f16f8ac2632e30fbf \
@@ -245,11 +247,11 @@ get_src 7d5f3439c8df56046d0564b5857fd8a30296ab1bd6df0f048aed7afb56a0a4c2 \
 get_src 99c47c75c159795c9faf76bbb9fa58e5a50b75286c86565ffcec8514b1c74bf9 \
         "https://github.com/openresty/stream-lua-nginx-module/archive/v$LUA_STREAM_NGX_VERSION.tar.gz"
 else
-get_src 085a9fb2bf9c4466977595a5fe5156d76f3a2d9a2a81be3cacaff2021773393e \
-        "https://github.com/openresty/lua-nginx-module/archive/$LUA_NGX_VERSION.tar.gz"
+get_src 9db756000578efaecb43bea4fc6cf631aaa80988d86ffe5d3afeb9927895ffad \
+        "https://github.com/openresty/lua-nginx-module/archive/v$LUA_NGX_VERSION.tar.gz"
 
-get_src ba38c9f8e4265836ba7f2ac559ddf140693ff2f5ae33ab1e384f51f3992151ab \
-        "https://github.com/openresty/stream-lua-nginx-module/archive/$LUA_STREAM_NGX_VERSION.tar.gz"
+get_src c7924f28cb014a99636e747ea907724dd55f60e180cb92cde6e8ed48d2278f27 \
+        "https://github.com/openresty/stream-lua-nginx-module/archive/v$LUA_STREAM_NGX_VERSION.tar.gz"
 
 fi
 
@@ -260,7 +262,7 @@ if [[ ${ARCH} == "s390x" ]]; then
 get_src 266ed1abb70a9806d97cb958537a44b67db6afb33d3b32292a2d68a2acedea75 \
         "https://github.com/openresty/luajit2/archive/$LUAJIT_VERSION.tar.gz"
 else
-get_src 1ee6dad809a5bb22efb45e6dac767f7ce544ad652d353a93d7f26b605f69fe3f \
+get_src d3f2c870f8f88477b01726b32accab30f6e5d57ae59c5ec87374ff73d0794316 \
         "https://github.com/openresty/luajit2/archive/v$LUAJIT_VERSION.tar.gz"
 fi
 
@@ -273,14 +275,14 @@ get_src 1af5a5632dc8b00ae103d51b7bf225de3a7f0df82f5c6a401996c080106e600e \
 get_src 4c1933434572226942c65b2f2b26c8a536ab76aa771a3c7f6c2629faa764976b \
         "https://github.com/leev/ngx_http_geoip2_module/archive/$GEOIP2_VERSION.tar.gz"
 
-get_src 94d1512bf0e5e6ffa4eca0489db1279d51f45386fffcb8a1d2d9f7fe93518465 \
-        "https://github.com/yaoweibin/nginx_ajp_module/archive/$NGINX_AJP_VERSION.tar.gz"
+get_src 778fcca851bd69dabfb382dc827d2ee07662f7eca36b5e66e67d5512bad75ef8 \
+        "https://github.com/msva/nginx_ajp_module/archive/$NGINX_AJP_VERSION.tar.gz"
 
 get_src 5d16e623d17d4f42cc64ea9cfb69ca960d313e12f5d828f785dd227cc483fcbd \
         "https://github.com/openresty/lua-resty-upload/archive/v$LUA_RESTY_UPLOAD_VERSION.tar.gz"
 
-get_src 462c6b38792bab4ca8212bdfd3f2e38f6883bb45c8fb8a03474ea813e0fab853 \
-        "https://github.com/openresty/lua-resty-string/archive/$LUA_RESTY_STRING_VERSION.tar.gz"
+get_src bdbf271003d95aa91cab0a92f24dca129e99b33f79c13ebfcdbbcbb558129491 \
+        "https://github.com/openresty/lua-resty-string/archive/v$LUA_RESTY_STRING_VERSION.tar.gz"
 
 get_src 16d72ed133f0c6df376a327386c3ef4e9406cf51003a700737c3805770ade7c5 \
         "https://github.com/openresty/lua-resty-balancer/archive/v$LUA_RESTY_BALANCER.tar.gz"
@@ -289,11 +291,11 @@ if [[ ${ARCH} == "s390x" ]]; then
 get_src 8f5f76d2689a3f6b0782f0a009c56a65e4c7a4382be86422c9b3549fe95b0dc4 \
         "https://github.com/openresty/lua-resty-core/archive/v$LUA_RESTY_CORE.tar.gz"
 else
-get_src 4d971f711fad48c097070457c128ca36053835d8a3ba25a937e9991547d55d4d \
+get_src efd6b51520429e64b1bcc10f477d370ebed1631c190f7e4dc270d959a743ad7d \
         "https://github.com/openresty/lua-resty-core/archive/v$LUA_RESTY_CORE.tar.gz"
 fi
 
-get_src 8d602af2669fb386931760916a39f6c9034f2363c4965f215042c086b8215238 \
+get_src 0c551d6898f89f876e48730f9b55790d0ba07d5bc0aa6c76153277f63c19489f \
         "https://github.com/openresty/lua-cjson/archive/$LUA_CJSON_VERSION.tar.gz"
 
 get_src 5ed48c36231e2622b001308622d46a0077525ac2f751e8cc0c9905914254baa4 \
@@ -314,11 +316,11 @@ get_src 9fcb6db95bc37b6fce77d3b3dc740d593f9d90dce0369b405eb04844d56ac43f \
 get_src 42893da0e3de4ec180c9bf02f82608d78787290a70c5644b538f29d243147396 \
         "https://github.com/openresty/lua-resty-memcached/archive/v$LUA_RESTY_MEMCACHED_VERSION.tar.gz"
 
-get_src 3f602af507aacd1f7aaeddfe7b77627fcde095fe9f115cb9d6ad8de2a52520e1 \
+get_src c15aed1a01c88a3a6387d9af67a957dff670357f5fdb4ee182beb44635eef3f1 \
         "https://github.com/openresty/lua-resty-redis/archive/v$LUA_RESTY_REDIS_VERSION.tar.gz"
 
-get_src b8dbd502751140993a852381bcd8e98a402454596bd91838c1e51268d42db261 \
-        "https://github.com/api7/lua-resty-ipmatcher/archive/$LUA_RESTY_IPMATCHER_VERSION.tar.gz"
+get_src efb767487ea3f6031577b9b224467ddbda2ad51a41c5867a47582d4ad85d609e \
+        "https://github.com/api7/lua-resty-ipmatcher/archive/v$LUA_RESTY_IPMATCHER_VERSION.tar.gz"
 
 get_src 0fb790e394510e73fdba1492e576aaec0b8ee9ef08e3e821ce253a07719cf7ea \
         "https://github.com/ElvinEfendi/lua-resty-global-throttle/archive/v$LUA_RESTY_GLOBAL_THROTTLE_VERSION.tar.gz"

diff --git a/images/nginx/rootfs/patches/nginx-1.19.9-no_Werror.patch b/images/nginx/rootfs/patches/nginx-1.19.9-no_Werror.patch
diff --git a/...s/nginx-1.19.9-balancer_status_code.patch → ...s/nginx-1.21.4-balancer_status_code.patch b/...s/nginx-1.19.9-balancer_status_code.patch → ...s/nginx-1.21.4-balancer_status_code.patch
diff --git a/...hes/nginx-1.19.9-cache_manager_exit.patch → ...hes/nginx-1.21.4-cache_manager_exit.patch b/...hes/nginx-1.19.9-cache_manager_exit.patch → ...hes/nginx-1.21.4-cache_manager_exit.patch
diff --git a/.../nginx-1.19.9-delayed_posted_events.patch → .../nginx-1.21.4-delayed_posted_events.patch b/.../nginx-1.19.9-delayed_posted_events.patch → .../nginx-1.21.4-delayed_posted_events.patch
diff --git a/.../patches/nginx-1.19.9-hash_overflow.patch → .../patches/nginx-1.21.4-hash_overflow.patch b/.../patches/nginx-1.19.9-hash_overflow.patch → .../patches/nginx-1.21.4-hash_overflow.patch
diff --git a/...ginx-1.19.9-init_cycle_pool_release.patch → ...ginx-1.21.4-init_cycle_pool_release.patch b/...ginx-1.19.9-init_cycle_pool_release.patch → ...ginx-1.21.4-init_cycle_pool_release.patch
@@ -1,6 +1,6 @@
-diff -rup nginx-1.19.9/src/core/nginx.c nginx-1.19.9-patched/src/core/nginx.c
---- nginx-1.19.9/src/core/nginx.c	2017-12-17 00:00:38.136470108 -0800
-+++ nginx-1.19.9-patched/src/core/nginx.c	2017-12-16 23:59:51.680958322 -0800
+diff -rup nginx-1.21.4/src/core/nginx.c nginx-1.21.4-patched/src/core/nginx.c
+--- nginx-1.21.4/src/core/nginx.c	2017-12-17 00:00:38.136470108 -0800
++++ nginx-1.21.4-patched/src/core/nginx.c	2017-12-16 23:59:51.680958322 -0800
 @@ -186,6 +186,7 @@ static u_char      *ngx_prefix;
  static u_char      *ngx_conf_file;
  static u_char      *ngx_conf_params;
@@ -18,19 +18,19 @@ diff -rup nginx-1.19.9/src/core/nginx.c nginx-1.19.9-patched/src/core/nginx.c
      if (ngx_save_argv(&init_cycle, argc, argv) != NGX_OK) {
          return 1;
      }
-diff -rup nginx-1.19.9/src/core/ngx_core.h nginx-1.19.9-patched/src/core/ngx_core.h
---- nginx-1.19.9/src/core/ngx_core.h	2017-10-10 08:22:51.000000000 -0700
-+++ nginx-1.19.9-patched/src/core/ngx_core.h	2017-12-16 23:59:51.679958370 -0800
+diff -rup nginx-1.21.4/src/core/ngx_core.h nginx-1.21.4-patched/src/core/ngx_core.h
+--- nginx-1.21.4/src/core/ngx_core.h	2017-10-10 08:22:51.000000000 -0700
++++ nginx-1.21.4-patched/src/core/ngx_core.h	2017-12-16 23:59:51.679958370 -0800
 @@ -108,4 +108,6 @@ void ngx_cpuinfo(void);
  #define NGX_DISABLE_SYMLINKS_NOTOWNER   2
  #endif
 
 +extern ngx_pool_t        *saved_init_cycle_pool;
 +
  #endif /* _NGX_CORE_H_INCLUDED_ */
-diff -rup nginx-1.19.9/src/core/ngx_cycle.c nginx-1.19.9-patched/src/core/ngx_cycle.c
---- nginx-1.19.9/src/core/ngx_cycle.c	2017-10-10 08:22:51.000000000 -0700
-+++ nginx-1.19.9-patched/src/core/ngx_cycle.c	2017-12-16 23:59:51.678958419 -0800
+diff -rup nginx-1.21.4/src/core/ngx_cycle.c nginx-1.21.4-patched/src/core/ngx_cycle.c
+--- nginx-1.21.4/src/core/ngx_cycle.c	2017-10-10 08:22:51.000000000 -0700
++++ nginx-1.21.4-patched/src/core/ngx_cycle.c	2017-12-16 23:59:51.678958419 -0800
 @@ -748,6 +748,10 @@ old_shm_zone_done:
 
      if (ngx_process == NGX_PROCESS_MASTER || ngx_is_init_cycle(old_cycle)) {
@@ -42,9 +42,9 @@ diff -rup nginx-1.19.9/src/core/ngx_cycle.c nginx-1.19.9-patched/src/core/ngx_cy
          ngx_destroy_pool(old_cycle->pool);
          cycle->old_cycle = NULL;
 
-diff -rup nginx-1.19.9/src/os/unix/ngx_process_cycle.c nginx-1.19.9-patched/src/os/unix/ngx_process_cycle.c
---- nginx-1.19.9/src/os/unix/ngx_process_cycle.c	2017-12-17 00:00:38.142469762 -0800
-+++ nginx-1.19.9-patched/src/os/unix/ngx_process_cycle.c	2017-12-16 23:59:51.691957791 -0800
+diff -rup nginx-1.21.4/src/os/unix/ngx_process_cycle.c nginx-1.21.4-patched/src/os/unix/ngx_process_cycle.c
+--- nginx-1.21.4/src/os/unix/ngx_process_cycle.c	2017-12-17 00:00:38.142469762 -0800
++++ nginx-1.21.4-patched/src/os/unix/ngx_process_cycle.c	2017-12-16 23:59:51.691957791 -0800
 @@ -687,6 +692,11 @@ ngx_master_process_exit(ngx_cycle_t *cyc
      ngx_exit_cycle.files_n = ngx_cycle->files_n;
      ngx_cycle = &ngx_exit_cycle;

diff --git a/...s/nginx-1.19.9-larger_max_error_str.patch → ...s/nginx-1.21.4-larger_max_error_str.patch b/...s/nginx-1.19.9-larger_max_error_str.patch → ...s/nginx-1.21.4-larger_max_error_str.patch
@@ -1,5 +1,5 @@
---- nginx-1.19.9/src/core/ngx_log.h	2013-10-08 05:07:14.000000000 -0700
-+++ nginx-1.19.9-patched/src/core/ngx_log.h	2013-12-05 20:35:35.996236720 -0800
+--- nginx-1.21.4/src/core/ngx_log.h	2013-10-08 05:07:14.000000000 -0700
++++ nginx-1.21.4-patched/src/core/ngx_log.h	2013-12-05 20:35:35.996236720 -0800
 @@ -64,7 +64,9 @@ struct ngx_log_s {
  };
 

diff --git a/images/nginx/rootfs/patches/nginx-1.21.4-no_Werror.patch b/images/nginx/rootfs/patches/nginx-1.21.4-no_Werror.patch
@@ -0,0 +1,36 @@
+diff -urp nginx-1.21.4/auto/cc/clang nginx-1.21.4-patched/auto/cc/clang
+--- nginx-1.21.4/auto/cc/clang	2014-03-04 03:39:24.000000000 -0800
++++ nginx-1.21.4-patched/auto/cc/clang	2014-03-13 20:54:26.241413360 -0700
+@@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -Wconditional-uninitiali
+ CFLAGS="$CFLAGS -Wno-unused-parameter"
+
+ # stop on warning
+-CFLAGS="$CFLAGS -Werror"
++#CFLAGS="$CFLAGS -Werror"
+
+ # debug
+ CFLAGS="$CFLAGS -g"
+diff -urp nginx-1.21.4/auto/cc/gcc nginx-1.21.4-patched/auto/cc/gcc
+--- nginx-1.21.4/auto/cc/gcc	2014-03-04 03:39:24.000000000 -0800
++++ nginx-1.21.4-patched/auto/cc/gcc	2014-03-13 20:54:13.301355329 -0700
+@@ -168,7 +168,7 @@ esac
+
+
+ # stop on warning
+-CFLAGS="$CFLAGS -Werror"
++#CFLAGS="$CFLAGS -Werror"
+
+ # debug
+ CFLAGS="$CFLAGS -g"
+diff -urp nginx-1.21.4/auto/cc/icc nginx-1.21.4-patched/auto/cc/icc
+--- nginx-1.21.4/auto/cc/icc	2014-03-04 03:39:24.000000000 -0800
++++ nginx-1.21.4-patched/auto/cc/icc	2014-03-13 20:54:13.301355329 -0700
+@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in
+ esac
+
+ # stop on warning
+-CFLAGS="$CFLAGS -Werror"
++#CFLAGS="$CFLAGS -Werror"
+
+ # debug
+ CFLAGS="$CFLAGS -g"
diff --git a/...s/nginx-1.19.9-proxy_host_port_vars.patch → ...s/nginx-1.21.4-proxy_host_port_vars.patch b/...s/nginx-1.19.9-proxy_host_port_vars.patch → ...s/nginx-1.21.4-proxy_host_port_vars.patch
@@ -1,5 +1,5 @@
---- nginx-1.19.9/src/http/modules/ngx_http_proxy_module.c	2017-07-16 14:02:51.000000000 +0800
-+++ nginx-1.19.9-patched/src/http/modules/ngx_http_proxy_module.c	2017-07-16 14:02:51.000000000 +0800
+--- nginx-1.21.4/src/http/modules/ngx_http_proxy_module.c	2017-07-16 14:02:51.000000000 +0800
++++ nginx-1.21.4-patched/src/http/modules/ngx_http_proxy_module.c	2017-07-16 14:02:51.000000000 +0800
 @@ -793,13 +793,13 @@ static ngx_keyval_t  ngx_http_proxy_cach
  static ngx_http_variable_t  ngx_http_proxy_vars[] = {
 

diff --git a/.../nginx-1.19.9-resolver_conf_parsing.patch → .../nginx-1.21.4-resolver_conf_parsing.patch b/.../nginx-1.19.9-resolver_conf_parsing.patch → .../nginx-1.21.4-resolver_conf_parsing.patch
diff --git a/...x-1.19.9-reuseport_close_unused_fds.patch → ...x-1.21.4-reuseport_close_unused_fds.patch b/...x-1.19.9-reuseport_close_unused_fds.patch → ...x-1.21.4-reuseport_close_unused_fds.patch
diff --git a/...1.19.9-single_process_graceful_exit.patch → ...1.21.4-single_process_graceful_exit.patch b/...1.19.9-single_process_graceful_exit.patch → ...1.21.4-single_process_graceful_exit.patch
diff --git a/...patches/nginx-1.19.9-socket_cloexec.patch → ...patches/nginx-1.21.4-socket_cloexec.patch b/...patches/nginx-1.19.9-socket_cloexec.patch → ...patches/nginx-1.21.4-socket_cloexec.patch
diff --git a/...ches/nginx-1.19.9-ssl_cert_cb_yield.patch → ...ches/nginx-1.21.4-ssl_cert_cb_yield.patch b/...ches/nginx-1.19.9-ssl_cert_cb_yield.patch → ...ches/nginx-1.21.4-ssl_cert_cb_yield.patch
diff --git a/...ches/nginx-1.19.9-ssl_sess_cb_yield.patch → ...ches/nginx-1.21.4-ssl_sess_cb_yield.patch b/...ches/nginx-1.19.9-ssl_sess_cb_yield.patch → ...ches/nginx-1.21.4-ssl_sess_cb_yield.patch
diff --git a/...tream_proxy_get_next_upstream_tries.patch → ...tream_proxy_get_next_upstream_tries.patch b/...tream_proxy_get_next_upstream_tries.patch → ...tream_proxy_get_next_upstream_tries.patch
diff --git a/...x-1.19.9-stream_ssl_preread_no_skip.patch → ...x-1.21.4-stream_ssl_preread_no_skip.patch b/...x-1.19.9-stream_ssl_preread_no_skip.patch → ...x-1.21.4-stream_ssl_preread_no_skip.patch
diff --git a/...es/nginx-1.19.9-upstream_pipelining.patch → ...es/nginx-1.21.4-upstream_pipelining.patch b/...es/nginx-1.19.9-upstream_pipelining.patch → ...es/nginx-1.21.4-upstream_pipelining.patch
diff --git a/...ginx-1.19.9-upstream_timeout_fields.patch → ...ginx-1.21.4-upstream_timeout_fields.patch b/...ginx-1.19.9-upstream_timeout_fields.patch → ...ginx-1.21.4-upstream_timeout_fields.patch
diff --git a/images/nginx/rootfs/patches/patch.2021.resolver.txt b/images/nginx/rootfs/patches/patch.2021.resolver.txt