From c670af5f7b34a09abe1ce4ec5a6d9dbb4058e35c8e4ded1b345216911d57057f Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Sat, 18 Mar 2023 12:14:39 +0000
Subject: [PATCH] Accepting request 1072835 from home:gmbr3:Active

- Added more numbered patches from upstream:
  * luabugs10.patch

OBS-URL: https://build.opensuse.org/request/show/1072835
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua54?expand=0&rev=68
---
 lua54.changes   |  6 +++++
 lua54.spec      |  1 +
 luabugs10.patch | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 luabugs10.patch

diff --git a/lua54.changes b/lua54.changes
index a33ad39..8eda317 100644
--- a/lua54.changes
+++ b/lua54.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Mar 18 12:11:40 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>
+
+- Added more numbered patches from upstream:
+  * luabugs10.patch
+
 -------------------------------------------------------------------
 Tue Jan 24 10:53:04 UTC 2023 - Michal Suchanek <msuchanek@suse.com>
 
diff --git a/lua54.spec b/lua54.spec
index 52cd94b..daffba1 100644
--- a/lua54.spec
+++ b/lua54.spec
@@ -53,6 +53,7 @@ Patch12:        luabugs6.patch
 Patch13:        luabugs7.patch
 Patch14:        luabugs8.patch
 Patch15:        luabugs9.patch
+Patch16:        luabugs10.patch
 #
 %if "%{flavor}" == "test"
 BuildRequires:  lua54
diff --git a/luabugs10.patch b/luabugs10.patch
new file mode 100644
index 0000000..64324f8
--- /dev/null
+++ b/luabugs10.patch
@@ -0,0 +1,67 @@
+From 02bab9fc258fe1cbc6088b1bd61193499d058eff Mon Sep 17 00:00:00 2001
+From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
+Date: Wed, 8 Feb 2023 14:15:41 -0300
+Subject: [PATCH] Bug: Wrong line in error message for arith. errors
+
+It also causes 'L->top' to be wrong when the error happens,
+triggering an 'assert'.
+---
+ lvm.c             | 4 ++++
+ testes/errors.lua | 8 ++++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/lvm.c b/lvm.c
+index 2e84dc63c..8493a770c 100644
+--- a/src/lvm.c
++++ b/src/lvm.c
+@@ -1410,6 +1410,7 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
+         vmbreak;
+       }
+       vmcase(OP_MODK) {
++        savestate(L, ci);  /* in case of division by 0 */
+         op_arithK(L, luaV_mod, luaV_modf);
+         vmbreak;
+       }
+@@ -1422,6 +1423,7 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
+         vmbreak;
+       }
+       vmcase(OP_IDIVK) {
++        savestate(L, ci);  /* in case of division by 0 */
+         op_arithK(L, luaV_idiv, luai_numidiv);
+         vmbreak;
+       }
+@@ -1470,6 +1472,7 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
+         vmbreak;
+       }
+       vmcase(OP_MOD) {
++        savestate(L, ci);  /* in case of division by 0 */
+         op_arith(L, luaV_mod, luaV_modf);
+         vmbreak;
+       }
+@@ -1482,6 +1485,7 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
+         vmbreak;
+       }
+       vmcase(OP_IDIV) {  /* floor division */
++        savestate(L, ci);  /* in case of division by 0 */
+         op_arith(L, luaV_idiv, luai_numidiv);
+         vmbreak;
+       }
+diff --git a/testes/errors.lua b/testes/errors.lua
+index cf0ab5265..bf6f389d2 100644
+--- a/testes/errors.lua
++++ b/testes/errors.lua
+@@ -444,6 +444,14 @@ if not b then
+   end
+ end]], 5)
+ 
++
++-- bug in 5.4.0
++lineerror([[
++  local a = 0
++  local b = 1
++  local c = b % a
++]], 3)
++
+ do
+   -- Force a negative estimate for base line. Error in instruction 2
+   -- (after VARARGPREP, GETGLOBAL), with first absolute line information