Patch luarocks tar to not require 5.3HEADmaster

2 files changed, 19 insertions, 0 deletions

diff --git a/init b/init
index ece283c..89e1790 100755
--- a/init
+++ b/init
@@ -12,6 +12,7 @@ mkdir build-binary
 sed -i 's/local program_version = "dev"/local program_version = "lua4.win"/g' /root/luarocks/src/luarocks/core/cfg.lua
 patch -i /root/luarocks-packaging/all_in_one.patch binary/all_in_one
 patch -i /root/luarocks-packaging/wget.patch src/luarocks/fs/tools.lua
+patch -i /root/luarocks-packaging/tar.lua.patch src/luarocks/tools/tar.lua
 LUAROCKS_CROSS_COMPILING=1 lua5.4 binary/all_in_one "src/bin/luarocks" "" "^src/luarocks/admin/" "/config" "build-binary" "yes" "windows"
 if [ -e "/root/luarocks-packaging/luarocks.exe.c.$LUA_VER.patch" ]; then
         patch -i "/root/luarocks-packaging/luarocks.exe.c.$LUA_VER.patch" build-binary/luarocks.exe.c
diff --git a/tar.lua.patch b/tar.lua.patch
new file mode 100644
index 0000000..a94ee3c
--- /dev/null
+++ b/tar.lua.patch
@@ -0,0 +1,18 @@
+diff --git a/src/luarocks/tools/tar.lua b/src/luarocks/tools/tar.lua
+index 6db1334a..49139615 100644
+--- a/src/luarocks/tools/tar.lua
++++ b/src/luarocks/tools/tar.lua
+@@ -51,11 +51,11 @@ local function octal_to_number(octal)
+    local number = 0
+    octal = octal:gsub("%s", "")
+    for i = #octal, 1, -1 do
+-      local digit = math.tointeger(octal:sub(i, i))
++      local digit = tonumber(octal:sub(i, i))
+       if not digit then
+          break
+       end
+-      number = number + (digit * math.tointeger(8 ^ exp))
++      number = number + (digit * (8 ^ exp))
+       exp = exp + 1
+    end
+    return number