chore(deps): bump openresty from 1.21.4.1 to 1.21.4.2

### Summary See: https://openresty.org/en/ann-1021004002.html Signed-off-by: Aapo Talvensaari <aapo.talvensaari@gmail.com>
Kong · Aug 10, 2023 · 6fc0902 · 6fc0902
1 parent 794b452
commit 6fc0902
Show file tree

Hide file tree

Showing 26 changed files with 188 additions and 2,980 deletions.
diff --git a/.requirements b/.requirements
@@ -1,6 +1,6 @@
 KONG_PACKAGE_NAME=kong
 
-OPENRESTY=1.21.4.1
+OPENRESTY=1.21.4.2
 LUAROCKS=3.9.2
 OPENSSL=3.1.2
 PCRE=8.45

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -165,6 +165,8 @@
 
 ### Dependencies
 
+- Bumped OpenResty from 1.21.4.1 to 1.21.4.2
+  [#11360](https://github.com/Kong/kong/pull/11360)
 - Bumped lua-resty-openssl from 0.8.20 to 0.8.23
   [#10837](https://github.com/Kong/kong/pull/10837)
   [#11099](https://github.com/Kong/kong/pull/11099)

diff --git a/build/openresty/patches/LuaJIT-2.1-20220411_02.patch b/build/openresty/patches/LuaJIT-2.1-20220411_02.patch
diff --git a/...20411_01_patch_macro_luajit_version.patch → ...30410_01_patch_macro_luajit_version.patch b/...20411_01_patch_macro_luajit_version.patch → ...30410_01_patch_macro_luajit_version.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Patch macro `LUAJIT_VERSION`
  src/luajit.h | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/bundle/LuaJIT-2.1-20220411/src/luajit.h b/bundle/LuaJIT-2.1-20220411/src/luajit.h
+diff --git a/bundle/LuaJIT-2.1-20230410/src/luajit.h b/bundle/LuaJIT-2.1-20230410/src/luajit.h
 index a4d33001..e35f4e7e 100644
---- a/bundle/LuaJIT-2.1-20220411/src/luajit.h
-+++ b/bundle/LuaJIT-2.1-20220411/src/luajit.h
+--- a/bundle/LuaJIT-2.1-20230410/src/luajit.h
++++ b/bundle/LuaJIT-2.1-20230410/src/luajit.h
 @@ -32,7 +32,9 @@
 
  #define OPENRESTY_LUAJIT

diff --git a/.../LuaJIT-2.1-20220411_03_pass_cc_env.patch → .../LuaJIT-2.1-20230410_02_pass_cc_env.patch b/.../LuaJIT-2.1-20220411_03_pass_cc_env.patch → .../LuaJIT-2.1-20230410_02_pass_cc_env.patch
@@ -1,7 +1,7 @@
-diff --git a/bundle/LuaJIT-2.1-20220411/src/Makefile b/bundle/LuaJIT-2.1-20220411/src/Makefile
+diff --git a/bundle/LuaJIT-2.1-20230410/src/Makefile b/bundle/LuaJIT-2.1-20230410/src/Makefile
 index 68a9a7c..8d2de33 100644
---- a/bundle/LuaJIT-2.1-20220411/src/Makefile
-+++ b/bundle/LuaJIT-2.1-20220411/src/Makefile
+--- a/bundle/LuaJIT-2.1-20230410/src/Makefile
++++ b/bundle/LuaJIT-2.1-20230410/src/Makefile
 @@ -27,7 +27,8 @@ NODOTABIVER= 51
  DEFAULT_CC = gcc
  #
@@ -37,4 +37,4 @@ index 68a9a7c..8d2de33 100644
 +  TARGET_DYNXLDOPTS= -Wl,-rpath,$(TARGET_LIBPATH)
  endif
  endif
- ifneq (,$(MULTILIB))
+ ifneq (,$(MULTILIB))
diff --git a/...LuaJIT-2.1-20220411_05_arm64_sigill.patch → ...LuaJIT-2.1-20230410_03_arm64_sigill.patch b/...LuaJIT-2.1-20220411_05_arm64_sigill.patch → ...LuaJIT-2.1-20230410_03_arm64_sigill.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Fix fuse case for LDP instuction on Arm64 when offset is
  src/lj_emit_arm64.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/bundle/LuaJIT-2.1-20220411/src/lj_emit_arm64.h b/bundle/LuaJIT-2.1-20220411/src/lj_emit_arm64.h
+diff --git a/bundle/LuaJIT-2.1-20230410/src/lj_emit_arm64.h b/bundle/LuaJIT-2.1-20230410/src/lj_emit_arm64.h
 index 0ddba4a3..e19a8e4a 100644
---- a/bundle/LuaJIT-2.1-20220411/src/lj_emit_arm64.h
-+++ b/bundle/LuaJIT-2.1-20220411/src/lj_emit_arm64.h
+--- a/bundle/LuaJIT-2.1-20230410/src/lj_emit_arm64.h
++++ b/bundle/LuaJIT-2.1-20230410/src/lj_emit_arm64.h
 @@ -143,7 +143,7 @@ static void emit_lso(ASMState *as, A64Ins ai, Reg rd, Reg rn, int64_t ofs)
        goto nopair;
      }

diff --git a/...JIT-2.1-20220411_06_arm64_fix_HREFK.patch → ...JIT-2.1-20230410_04_arm64_fix_HREFK.patch b/...JIT-2.1-20220411_06_arm64_fix_HREFK.patch → ...JIT-2.1-20230410_04_arm64_fix_HREFK.patch
@@ -9,10 +9,10 @@ Fix contributed by Peter Cawley.
  src/lj_asm_arm64.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/bundle/LuaJIT-2.1-20220411/src/lj_asm_arm64.h b/bundle/LuaJIT-2.1-20220411/src/lj_asm_arm64.h
+diff --git a/bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h b/bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
 index 805ea54b..95138fe9 100644
---- a/bundle/LuaJIT-2.1-20220411/src/lj_asm_arm64.h
-+++ b/bundle/LuaJIT-2.1-20220411/src/lj_asm_arm64.h
+--- a/bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
++++ b/bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
 @@ -938,7 +938,7 @@ static void asm_hrefk(ASMState *as, IRIns *ir)
    IRIns *irkey = IR(kslot->op1);
    int32_t ofs = (int32_t)(kslot->op2 * sizeof(Node));

diff --git a/build/openresty/patches/lua-cjson-2.1.0.10_01-empty_array.patch b/build/openresty/patches/lua-cjson-2.1.0.10_01-empty_array.patch
diff --git a/...10_02-handle-large-string-correctly.patch → ...11_01-handle-large-string-correctly.patch b/...10_02-handle-large-string-correctly.patch → ...11_01-handle-large-string-correctly.patch
@@ -1,7 +1,7 @@
-diff --git a/bundle/lua-cjson-2.1.0.10/lua_cjson.c b/bundle/lua-cjson-2.1.0.10/lua_cjson.c
+diff --git a/bundle/lua-cjson-2.1.0.11/lua_cjson.c b/bundle/lua-cjson-2.1.0.11/lua_cjson.c
 index ff61c47..3b055c4 100644
---- a/bundle/lua-cjson-2.1.0.10/lua_cjson.c
-+++ b/bundle/lua-cjson-2.1.0.10/lua_cjson.c
+--- a/bundle/lua-cjson-2.1.0.11/lua_cjson.c
++++ b/bundle/lua-cjson-2.1.0.11/lua_cjson.c
 @@ -40,6 +40,7 @@
  #include <stdint.h>
  #include <string.h>
@@ -44,10 +44,10 @@ index ff61c47..3b055c4 100644
 
      luaL_argcheck(l, lua_gettop(l) == 1, 1, "expected 1 argument");
 
-diff --git a/bundle/lua-cjson-2.1.0.10/strbuf.c b/bundle/lua-cjson-2.1.0.10/strbuf.c
+diff --git a/bundle/lua-cjson-2.1.0.11/strbuf.c b/bundle/lua-cjson-2.1.0.11/strbuf.c
 index ed13367..2dc30be 100644
---- a/bundle/lua-cjson-2.1.0.10/strbuf.c
-+++ b/bundle/lua-cjson-2.1.0.10/strbuf.c
+--- a/bundle/lua-cjson-2.1.0.11/strbuf.c
++++ b/bundle/lua-cjson-2.1.0.11/strbuf.c
 @@ -26,6 +26,7 @@
  #include <stdlib.h>
  #include <stdarg.h>
@@ -258,10 +258,10 @@ index ed13367..2dc30be 100644
 
  /* vi:ai et sw=4 ts=4:
   */
-diff --git a/bundle/lua-cjson-2.1.0.10/strbuf.h b/bundle/lua-cjson-2.1.0.10/strbuf.h
+diff --git a/bundle/lua-cjson-2.1.0.11/strbuf.h b/bundle/lua-cjson-2.1.0.11/strbuf.h
 index 5df0b7b..d77e0f4 100644
---- a/bundle/lua-cjson-2.1.0.10/strbuf.h
-+++ b/bundle/lua-cjson-2.1.0.10/strbuf.h
+--- a/bundle/lua-cjson-2.1.0.11/strbuf.h
++++ b/bundle/lua-cjson-2.1.0.11/strbuf.h
 @@ -32,15 +32,13 @@
 
  /* Size: Total bytes allocated to *buf
@@ -384,4 +384,4 @@ index 5df0b7b..d77e0f4 100644
 +static inline char *strbuf_string(strbuf_t *s, size_t *len)
  {
      if (len)
-         *len = s->length;
+         *len = s->length;