Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): bump openresty from 1.21.4.1 to 1.21.4.2 #11360

Merged
merged 2 commits into from
Sep 6, 2023
Merged

chore(deps): bump openresty from 1.21.4.1 to 1.21.4.2 #11360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9912c84
chore(deps): bump lua-resty-healthcheck from 1.6.2 to 1.6.3
bungle Sep 6, 2023
975b8b7
chore(deps): bump openresty from 1.21.4.1 to 1.21.4.2
bungle Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .requirements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG/unreleased/kong/11360-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
message: "Bumped lua-resty-healthcheck from 1.6.2 to 1.6.3"
type: dependency
prs:
- 11360
jiras:
- "KAG-2140"
6 changes: 6 additions & 0 deletions CHANGELOG/unreleased/kong/11360-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
message: "Bumped OpenResty from 1.21.4.1 to 1.21.4.2"
type: dependency
prs:
- 11360
jiras:
- "KAG-2140"
24 changes: 0 additions & 24 deletions build/openresty/patches/LuaJIT-2.1-20220411_02.patch
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...20411_01_patch_macro_luajit_version.patch → ...30410_01_patch_macro_luajit_version.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .../LuaJIT-2.1-20220411_03_pass_cc_env.patch → .../LuaJIT-2.1-20230410_02_pass_cc_env.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
#
Expand Down Expand Up @@ -37,4 +37,4 @@ index 68a9a7c..8d2de33 100644
+ TARGET_DYNXLDOPTS= -Wl,-rpath,$(TARGET_LIBPATH)
endif
endif
ifneq (,$(MULTILIB))
ifneq (,$(MULTILIB))
6 changes: 3 additions & 3 deletions ...LuaJIT-2.1-20220411_05_arm64_sigill.patch → ...LuaJIT-2.1-20230410_03_arm64_sigill.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions ...JIT-2.1-20220411_06_arm64_fix_HREFK.patch → ...JIT-2.1-20230410_04_arm64_fix_HREFK.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
12 changes: 0 additions & 12 deletions build/openresty/patches/lua-cjson-2.1.0.10_01-empty_array.patch
View file
Open in desktop

This file was deleted.

20 changes: 10 additions & 10 deletions ...10_02-handle-large-string-correctly.patch → ...11_01-handle-large-string-correctly.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;