23 files changed, 204 insertions, 64 deletions

diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index ea132a3e..b9954cf4 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -27,11 +27,6 @@ function cmake.run(rockspec, no_install)
    local build = rockspec.build
    local variables = build.variables or {}
 
-
-   variables.CMAKE_MODULE_PATH = os.getenv("CMAKE_MODULE_PATH")
-   variables.CMAKE_LIBRARY_PATH = os.getenv("CMAKE_LIBRARY_PATH")
-   variables.CMAKE_INCLUDE_PATH = os.getenv("CMAKE_INCLUDE_PATH")
-
    util.variable_substitutions(variables, rockspec.variables)
 
    local ok, err_msg = fs.is_tool_available(rockspec.variables.CMAKE, "CMake")
diff --git a/src/luarocks/build/cmake.tl b/src/luarocks/build/cmake.tl
index 9a512d1e..35e64bd6 100644
--- a/src/luarocks/build/cmake.tl
+++ b/src/luarocks/build/cmake.tl
@@ -27,11 +27,6 @@ function cmake.run(rockspec: Rockspec, no_install: boolean): boolean, string, st
    local build = rockspec.build as cmake.CMakeBuild
    local variables = build.variables or {}
 
-   -- Pass Env variables
-   variables.CMAKE_MODULE_PATH=os.getenv("CMAKE_MODULE_PATH")
-   variables.CMAKE_LIBRARY_PATH=os.getenv("CMAKE_LIBRARY_PATH")
-   variables.CMAKE_INCLUDE_PATH=os.getenv("CMAKE_INCLUDE_PATH")
-
    util.variable_substitutions(variables, rockspec.variables)
 
    local ok, err_msg = fs.is_tool_available(rockspec.variables.CMAKE, "CMake")
diff --git a/src/luarocks/cmd/upload.lua b/src/luarocks/cmd/upload.lua
index 755dd4e7..e4319bb1 100644
--- a/src/luarocks/cmd/upload.lua
+++ b/src/luarocks/cmd/upload.lua
@@ -1,4 +1,4 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local string = _tl_compat and _tl_compat.string or string
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local math = _tl_compat and _tl_compat.math or math; local string = _tl_compat and _tl_compat.string or string
 local upload = { Response = { version = {} } }
 
 
@@ -132,7 +132,8 @@ function upload.command(args)
          return nil, "Invalid response from server."
       end
       util.printout(("Sending " .. tostring(rock_fname) .. " ..."))
-      res, err = api:method("upload_rock/" .. ("%d"):format(res.version.id), nil, {
+      local id = math.tointeger(res.version.id)
+      res, err = api:method("upload_rock/" .. ("%d"):format(id), nil, {
          rock_file = multipart.new_file(rock_fname),
          rock_sig = rock_sigfname and multipart.new_file(rock_sigfname),
       })
diff --git a/src/luarocks/cmd/upload.tl b/src/luarocks/cmd/upload.tl
index 5b6e3314..a12b30c0 100644
--- a/src/luarocks/cmd/upload.tl
+++ b/src/luarocks/cmd/upload.tl
@@ -132,7 +132,8 @@ function upload.command(args: Args): boolean, string, string
          return nil, "Invalid response from server."
       end
       util.printout(("Sending " .. tostring(rock_fname) .. " ..."))
-      res, err = api:method("upload_rock/" .. ("%d"):format(res.version.id), nil, {
+      local id = math.tointeger(res.version.id)
+      res, err = api:method("upload_rock/" .. ("%d"):format(id), nil, {
          rock_file = multipart.new_file(rock_fname),
          rock_sig = rock_sigfname and multipart.new_file(rock_sigfname),
       }) as (Response, string)
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 8c2d7d79..7e1294cd 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -21,7 +21,7 @@ local vers = require("luarocks.core.vers")
 
 --------------------------------------------------------------------------------
 
-local program_version = "dev"
+local program_version = "3.12.2"
 
 local is_windows = package.config:sub(1,1) == "\\"
 
@@ -413,13 +413,24 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
    end
 
    if platforms.cygwin then
-      defaults.lib_extension = "so" -- can be overridden in the config file for mingw builds
+      defaults.lib_extension = "dll"
       defaults.arch = "cygwin-"..target_cpu
       defaults.cmake_generator = "Unix Makefiles"
       defaults.variables.CC = "echo -llua | xargs " .. (os.getenv("CC") or "gcc")
       defaults.variables.LD = "echo -llua | xargs " .. (os.getenv("CC") or "gcc")
       defaults.variables.LIBFLAG = "-shared"
       defaults.link_lua_explicitly = true
+      defaults.external_deps_patterns = {
+         bin = { "?.exe", "?.bat", "?" },
+         lib = { "cyg?.dll", "lib?.so", "lib?.so.*", "lib?.dll.a", "?.dll.a",
+                 "lib?.a", "lib?.dll", "?.dll" },
+         include = { "?.h" }
+      }
+      defaults.runtime_external_deps_patterns = {
+         bin = { "?.exe", "?.bat" },
+         lib = { "cyg?.dll", "lib?.so", "?.dll", "lib?.dll" },
+         include = { "?.h" }
+      }
    end
 
    if platforms.msys then
diff --git a/src/luarocks/core/manif.lua b/src/luarocks/core/manif.lua
index 4c5e0441..c5ee158e 100644
--- a/src/luarocks/core/manif.lua
+++ b/src/luarocks/core/manif.lua
@@ -1,4 +1,4 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local table = _tl_compat and _tl_compat.table or table; local type = type
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; local type = type
 
 local manif = {}
 
@@ -52,7 +52,14 @@ end
 
 
 function manif.manifest_loader(file, repo_url, lua_version)
-   local manifest, err, errcode = persist.load_into_table(file)
+   local manifest, err, errcode
+
+   if file:match(".*%.json$") then
+      manifest, err, errcode = persist.load_json_into_table(file)
+   else
+      manifest, err, errcode = persist.load_into_table(file)
+   end
+
    if not manifest and type(err) == "string" then
       return nil, "Failed loading manifest for " .. repo_url .. ": " .. err, errcode
    end
diff --git a/src/luarocks/core/manif.tl b/src/luarocks/core/manif.tl
index 1f3b3659..0a96d47e 100644
--- a/src/luarocks/core/manif.tl
+++ b/src/luarocks/core/manif.tl
@@ -52,7 +52,14 @@ end
 -- @return table or (nil, string, string): the manifest or nil,
 -- error message and error code ("open", "load", "run").
 function manif.manifest_loader(file: string, repo_url: string, lua_version: string): Manifest, string | {any: any}, string
-   local manifest, err, errcode = persist.load_into_table(file)
+   local manifest, err, errcode: {string: any}, {string: boolean} | string, string
+
+   if file:match(".*%.json$") then
+      manifest, err, errcode = persist.load_json_into_table(file)
+   else
+      manifest, err, errcode = persist.load_into_table(file)
+   end
+
    if not manifest and err is string then
       return nil, "Failed loading manifest for "..repo_url..": " .. err, errcode
    end
diff --git a/src/luarocks/core/persist.lua b/src/luarocks/core/persist.lua
index 258a42c0..c9ccb4a0 100644
--- a/src/luarocks/core/persist.lua
+++ b/src/luarocks/core/persist.lua
@@ -2,6 +2,8 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 local persist = {}
 
 
+local json = require("luarocks.vendor.dkjson")
+
 
 
 
@@ -67,4 +69,32 @@ function persist.load_into_table(filename, tbl)
    return result, globals
 end
 
+
+
+
+
+
+
+
+
+
+
+function persist.load_json_into_table(filename)
+   local fd, open_err = io.open(filename)
+   if not fd then
+      return nil, open_err, "open"
+   end
+   local str, read_err = fd:read("*a")
+   fd:close()
+   if not str then
+      return nil, read_err, "open"
+   end
+   local manifest, _, err = json.decode(str)
+   if not manifest then
+      return nil, "Failed decode manifest: " .. err, "load"
+   end
+
+   return manifest, {}
+end
+
 return persist
diff --git a/src/luarocks/core/persist.tl b/src/luarocks/core/persist.tl
index 4694afcb..268d2bb6 100644
--- a/src/luarocks/core/persist.tl
+++ b/src/luarocks/core/persist.tl
@@ -2,6 +2,8 @@
 local record persist
 end
 
+local json = require("luarocks.vendor.dkjson")
+
 --------------------------------------------------------------------------------
 
 --- Load and run a Lua file in an environment.
@@ -67,5 +69,33 @@ function persist.load_into_table(filename: string, tbl?: {string:any}) : {string
    return result, globals
 end
 
+--- Load a JSON file containing assignments, storing them in a table.
+-- The global environment is not propagated to the loaded file.
+-- @param filename string: the name of the file.
+-- @param tbl table or nil: if given, this table is used to store
+-- loaded values.
+-- @return (table, table) or (nil, string, string): a table with the file's assignments
+-- as fields and set of undefined globals accessed in file,
+-- or nil, an error message and an error code ("open"; couldn't open the file,
+-- "load"; compile-time error, or "run"; run-time error)
+-- in case of errors.
+function persist.load_json_into_table(filename: string) : {string: any}, {string: boolean} | string, string
+   local fd, open_err = io.open(filename)
+   if not fd then
+      return nil, open_err, "open"
+   end
+   local str, read_err = fd:read("*a")
+   fd:close()
+   if not str then
+      return nil, read_err, "open"
+   end
+   local manifest, _, err = json.decode(str)
+   if not manifest then
+      return nil, "Failed decode manifest: " .. err, "load"
+   end
+
+   return manifest, {}
+end
+
 return persist
 
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index e02d4694..13b531f6 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -1,4 +1,4 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pairs = _tl_compat and _tl_compat.pairs or pairs; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; local type = type
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local math = _tl_compat and _tl_compat.math or math; local pairs = _tl_compat and _tl_compat.pairs or pairs; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; local type = type
 
 local deps = {}
 
@@ -201,7 +201,7 @@ function deps.report_missing_dependencies(name, version, dependencies, deps_mode
             first_missing_dep = false
          end
 
-         util.printout(("   %s (%s)"):format(tostring(depq), rock_status(depq, get_versions)))
+         util.printout(("   %s (%s)"):format(tostring(depq), (rock_status(depq, get_versions))))
       end
    end
 end
@@ -301,7 +301,7 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
          local depq = queries.new(dname, dnamespace, dversion)
 
          util.printout(("%s %s is pinned to %s (%s)"):format(
-         name, version, tostring(depq), rock_status(depq, get_versions)))
+         name, version, tostring(depq), (rock_status(depq, get_versions))))
 
          local okfullfill, errfullfill = deps.fulfill_dependency(depq, "none", rocks_provided, verify, depskey)
          if not okfullfill then
@@ -327,11 +327,14 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
    for _, depq in ipairs((rockspec)[depskey].queries) do
 
       util.printout(("%s %s depends on %s (%s)"):format(
-      name, version, tostring(depq), rock_status(depq, get_versions)))
+      name, version, tostring(depq), (rock_status(depq, get_versions))))
 
-      local okfulfill, found_or_err, _ = deps.fulfill_dependency(depq, deps_mode, rocks_provided, verify, depskey)
+      local okfulfill, version_or_err, tree = deps.fulfill_dependency(depq, deps_mode, rocks_provided, verify, depskey)
       if okfulfill then
-         deplocks.add(depskey, depq.name, found_or_err)
+         deplocks.add(depskey, depq.name, version_or_err)
+         if tree and rockspec:format_is_at_least("3.1") then
+            rockspec.variables[depq.name:upper() .. "_ROCKDIR"] = path.install_dir(depq.name, version_or_err, tree)
+         end
       else
          if depq.constraints and depq.constraints[1] and depq.constraints[1].no_upgrade then
             util.printerr("This version of " .. name .. " is designed for use with")
@@ -341,7 +344,7 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
             util.printerr("or look for a suitable version of " .. name .. " with")
             util.printerr("   luarocks search " .. name)
          end
-         return nil, found_or_err
+         return nil, version_or_err
       end
    end
 
@@ -703,7 +706,7 @@ end
 
 local function lua_h_exists(d, luaver)
    local major, minor = luaver:match("(%d+)%.(%d+)")
-   local luanum = ("%s%02d"):format(major, tonumber(minor))
+   local luanum = ("%s%02d"):format(major, math.tointeger(minor))
 
    local lua_h = dir.path(d, "lua.h")
    local fd = io.open(lua_h)
@@ -808,7 +811,7 @@ function deps.check_lua_libdir(vars)
    local err
    if ok then
       local filename = dir.path(vars.LUA_LIBDIR, vars.LUA_LIBDIR_FILE)
-      local fd = io.open(filename, "r")
+      local fd = io.open(filename, "rb")
       if fd then
          if not vars.LUA_LIBDIR_FILE:match((cfg.lua_version:gsub("%.", "%%.?"))) then
 
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index 5ca9c879..98fad54d 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -201,7 +201,7 @@ function deps.report_missing_dependencies(name: string, version: string, depende
             first_missing_dep = false
          end
 
-         util.printout(("   %s (%s)"):format(tostring(depq), rock_status(depq, get_versions)))
+         util.printout(("   %s (%s)"):format(tostring(depq), (rock_status(depq, get_versions))))
       end
    end
 end
@@ -301,7 +301,7 @@ function deps.fulfill_dependencies(rockspec: Rockspec, depskey: DepsKey, deps_mo
          local depq = queries.new(dname, dnamespace, dversion)
 
          util.printout(("%s %s is pinned to %s (%s)"):format(
-            name, version, tostring(depq), rock_status(depq, get_versions)))
+            name, version, tostring(depq), (rock_status(depq, get_versions))))
 
          local okfullfill, errfullfill = deps.fulfill_dependency(depq, "none", rocks_provided, verify, depskey)
          if not okfullfill then
@@ -327,11 +327,14 @@ function deps.fulfill_dependencies(rockspec: Rockspec, depskey: DepsKey, deps_mo
    for _, depq in ipairs((rockspec as {string: Dependencies})[depskey].queries) do
 
       util.printout(("%s %s depends on %s (%s)"):format(
-         name, version, tostring(depq), rock_status(depq, get_versions)))
+         name, version, tostring(depq), (rock_status(depq, get_versions))))
 
-      local okfulfill, found_or_err, _ = deps.fulfill_dependency(depq, deps_mode, rocks_provided, verify, depskey)
+      local okfulfill, version_or_err, tree = deps.fulfill_dependency(depq, deps_mode, rocks_provided, verify, depskey)
       if okfulfill then
-         deplocks.add(depskey, depq.name, found_or_err)
+         deplocks.add(depskey, depq.name, version_or_err)
+         if tree and rockspec:format_is_at_least("3.1") then
+            rockspec.variables[depq.name:upper() .. "_ROCKDIR"] = path.install_dir(depq.name, version_or_err, tree)
+         end
       else
          if depq.constraints and depq.constraints[1] and depq.constraints[1].no_upgrade then
             util.printerr("This version of "..name.." is designed for use with")
@@ -341,7 +344,7 @@ function deps.fulfill_dependencies(rockspec: Rockspec, depskey: DepsKey, deps_mo
             util.printerr("or look for a suitable version of "..name.." with")
             util.printerr("   luarocks search "..name)
          end
-         return nil, found_or_err
+         return nil, version_or_err
       end
    end
 
@@ -703,7 +706,7 @@ end
 
 local function lua_h_exists(d: string, luaver: string): boolean, string, string, integer
    local major, minor = luaver:match("(%d+)%.(%d+)")
-   local luanum = ("%s%02d"):format(major, tonumber(minor))
+   local luanum = ("%s%02d"):format(major, math.tointeger(minor))
 
    local lua_h = dir.path(d, "lua.h")
    local fd = io.open(lua_h)
@@ -749,7 +752,7 @@ local function find_lua_incdir(prefix: string, luaver: string, luajitver: string
 end
 
 function deps.check_lua_incdir(vars: {string: string}): boolean, string, string
-   if vars.LUA_INCDIR_OK == "ok" 
+   if vars.LUA_INCDIR_OK == "ok"
       then return true
    end
 
@@ -777,7 +780,7 @@ function deps.check_lua_incdir(vars: {string: string}): boolean, string, string
 end
 
 function deps.check_lua_libdir(vars: {string: string}): boolean, string, string, {string : {string}}
-   if vars.LUA_LIBDIR_OK == "ok" 
+   if vars.LUA_LIBDIR_OK == "ok"
       then return true
    end
 
@@ -808,13 +811,13 @@ function deps.check_lua_libdir(vars: {string: string}): boolean, string, string,
    local err: string
    if ok then
       local filename = dir.path(vars.LUA_LIBDIR, vars.LUA_LIBDIR_FILE)
-      local fd = io.open(filename, "r")
+      local fd = io.open(filename, "rb")
       if fd then
          if not vars.LUA_LIBDIR_FILE:match((cfg.lua_version:gsub("%.", "%%.?"))) then
             -- if filename isn't versioned, check file contents
             local txt = fd:read("*a")
             ok = txt:find("Lua " .. cfg.lua_version, 1, true)
-                 or txt:find("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true) 
+                 or txt:find("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true)
                  and true
             if not ok then
                err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location."
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 07c4bf94..50363cc0 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -49,12 +49,15 @@ function fetch.fetch_caching(url, mirroring)
    local repo_url, filename = url:match("^(.*)/([^/]+)$")
    local name = repo_url:gsub("[/:]", "_")
    local cache_dir = dir.path(cfg.local_cache, name)
-   local ok = fs.make_dir(cache_dir)
+   local ok = fs.exists(cfg.local_cache)
+   if ok then
+      ok = fs.make_dir(cache_dir)
+   end
 
    local cachefile = dir.path(cache_dir, filename)
    local checkfile = cachefile .. ".check"
 
-   if (fs.file_age(checkfile) < 10 or
+   if (fs.exists(checkfile) and fs.file_age(checkfile) < 10 or
       cfg.aggressive_cache and (not name:match("^manifest"))) and fs.exists(cachefile) then
 
       return cachefile, nil, nil, true
@@ -75,6 +78,8 @@ function fetch.fetch_caching(url, mirroring)
       if not ok then
          return nil, "Failed creating temporary cache directory " .. cache_dir
       end
+      cachefile = dir.path(cache_dir, filename)
+      checkfile = cachefile .. ".check"
       lock = fs.lock_access(cache_dir)
    end
 
diff --git a/src/luarocks/fetch.tl b/src/luarocks/fetch.tl
index 2f81ac0c..75f0a157 100644
--- a/src/luarocks/fetch.tl
+++ b/src/luarocks/fetch.tl
@@ -49,12 +49,15 @@ function fetch.fetch_caching(url: string, mirroring?: string): string, string, s
    local repo_url, filename = url:match("^(.*)/([^/]+)$")
    local name = repo_url:gsub("[/:]","_")
    local cache_dir = dir.path(cfg.local_cache, name)
-   local ok = fs.make_dir(cache_dir)
+   local ok = fs.exists(cfg.local_cache)
+   if ok then
+      ok = fs.make_dir(cache_dir)
+   end
 
    local cachefile = dir.path(cache_dir, filename)
    local checkfile = cachefile .. ".check"
 
-   if (fs.file_age(checkfile) < 10 or
+   if (fs.exists(checkfile) and fs.file_age(checkfile) < 10 or
       cfg.aggressive_cache and (not name:match("^manifest"))) and fs.exists(cachefile)
    then
       return cachefile, nil, nil, true
@@ -75,6 +78,8 @@ function fetch.fetch_caching(url: string, mirroring?: string): string, string, s
       if not ok then
          return nil, "Failed creating temporary cache directory "..cache_dir
       end
+      cachefile = dir.path(cache_dir, filename)
+      checkfile = cachefile .. ".check"
       lock = fs.lock_access(cache_dir)
    end
 
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 41a9ba8b..2c99ff0d 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -145,13 +145,14 @@ function unix.is_actual_binary(filename)
    if not file then
       return true
    end
-   local first = file:read(2)
+   local first = file:read()
    file:close()
    if not first then
       util.warning("could not read "..filename)
       return true
    end
-   return first ~= "#!"
+   -- only create wrapper for lua scripts with `#!/usr/bin/env lua` or `#!/usr/bin/lua`
+   return first:match('^#!.*[ /]lua.*') == first
 end
 
 function unix.copy_binary(filename, dest)
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index 809b823d..b608d363 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -1,4 +1,4 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pairs = _tl_compat and _tl_compat.pairs or pairs; local string = _tl_compat and _tl_compat.string or string; local type = type
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pairs = _tl_compat and _tl_compat.pairs or pairs; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; local type = type
 
 
 
@@ -103,6 +103,10 @@ function manif.load_manifest(repo_url, lua_version, versioned_only)
       not versioned_only and "manifest" or nil,
    }
 
+   if util.get_luajit_version() then
+      table.insert(filenames, 1, "manifest-" .. lua_version .. ".json")
+   end
+
    local protocol, repodir = dir.split_url(repo_url)
    local pathname, from_cache
    if protocol == "file" then
diff --git a/src/luarocks/manif.tl b/src/luarocks/manif.tl
index 6a62a73f..da9b7d4c 100644
--- a/src/luarocks/manif.tl
+++ b/src/luarocks/manif.tl
@@ -103,6 +103,10 @@ function manif.load_manifest(repo_url: string, lua_version?: string, versioned_o
       not versioned_only and "manifest" or nil,
    }
 
+   if util.get_luajit_version() then
+      table.insert(filenames, 1, "manifest-" .. lua_version .. ".json")
+   end
+
    local protocol, repodir = dir.split_url(repo_url)
    local pathname, from_cache: string, boolean
    if protocol == "file" then
diff --git a/src/luarocks/rockspecs.lua b/src/luarocks/rockspecs.lua
index 6a9a376c..7f137b87 100644
--- a/src/luarocks/rockspecs.lua
+++ b/src/luarocks/rockspecs.lua
@@ -24,6 +24,19 @@ local vendored_build_type_set = {
    ["none"] = true,
 }
 
+local rockspec_mt_funcs = {}
+
+local rockspec_mt = {}
+rockspec_mt.__index = rockspec_mt_funcs
+
+function rockspec_mt_funcs.type()
+   util.warning("The function rockspec.type() is no longer " ..
+   "necessary and is now deprecated. Please update your " ..
+   "plugin to remove calls to this function.")
+
+   return "rockspec"
+end
+
 
 
 
@@ -83,6 +96,9 @@ local function configure_paths(rockspec)
    vars.CONFDIR = path.conf_dir(name, version)
    vars.BINDIR = path.bin_dir(name, version)
    vars.DOCDIR = path.doc_dir(name, version)
+   if rockspec:format_is_at_least("3.1") then
+      vars.LUA_VERSION = cfg.lua_version
+   end
    rockspec.variables = vars
 end
 
@@ -178,7 +194,8 @@ function rockspecs.from_persisted_table(filename, rockspec, globals, quick)
       configure_paths(rockspec)
    end
 
-   return rockspec
+
+   return setmetatable(rockspec, rockspec_mt)
 end
 
 return rockspecs
diff --git a/src/luarocks/rockspecs.tl b/src/luarocks/rockspecs.tl
index a34c0dbf..7f31f786 100644
--- a/src/luarocks/rockspecs.tl
+++ b/src/luarocks/rockspecs.tl
@@ -24,6 +24,19 @@ local vendored_build_type_set: {string: boolean} = {
    ["none"] = true,
 }
 
+local rockspec_mt_funcs = {}
+
+local rockspec_mt: metatable<Rockspec> = {}
+rockspec_mt.__index = rockspec_mt_funcs
+
+function rockspec_mt_funcs.type(): string
+   util.warning("The function rockspec.type() is no longer " ..
+      "necessary and is now deprecated. Please update your " ..
+      "plugin to remove calls to this function.")
+
+   return "rockspec"
+end
+
 --- Perform platform-specific overrides on a table.
 -- Overrides values of table with the contents of the appropriate
 -- subset of its "platforms" field. The "platforms" field should
@@ -83,6 +96,9 @@ local function configure_paths(rockspec: Rockspec)
    vars.CONFDIR = path.conf_dir(name, version)
    vars.BINDIR = path.bin_dir(name, version)
    vars.DOCDIR = path.doc_dir(name, version)
+   if rockspec:format_is_at_least("3.1") then
+      vars.LUA_VERSION = cfg.lua_version
+   end
    rockspec.variables = vars
 end
 
@@ -178,7 +194,8 @@ function rockspecs.from_persisted_table(filename: string, rockspec: Rockspec, gl
       configure_paths(rockspec)
    end
 
-   return rockspec
+   -- TODO remove this on LuaRocks 4.0
+   return setmetatable(rockspec, rockspec_mt)
 end
 
 return rockspecs
diff --git a/src/luarocks/tools/patch.lua b/src/luarocks/tools/patch.lua
index 8dc188a6..d1575cb0 100644
--- a/src/luarocks/tools/patch.lua
+++ b/src/luarocks/tools/patch.lua
@@ -129,14 +129,13 @@ local function file_lines(f)
             end
          end
       end
-      local posi = math.tointeger(pos)
-      if not posi then
-         posi = #buffer
+      if not pos then
+         pos = #buffer
       elseif chars == '\r\n' then
-         posi = posi + 1
+         pos = pos + 1
       end
-      local line = buffer:sub(pos_beg, posi)
-      pos_beg = posi + 1
+      local line = buffer:sub(pos_beg, pos)
+      pos_beg = pos + 1
       if #line > 0 then
          return line
       end
diff --git a/src/luarocks/tools/patch.tl b/src/luarocks/tools/patch.tl
index 83c16ab7..553964e3 100644
--- a/src/luarocks/tools/patch.tl
+++ b/src/luarocks/tools/patch.tl
@@ -114,7 +114,7 @@ local function file_lines(f: FILE): function(): string
   local buffer = ""
   local pos_beg = 1
   return function(): string
-    local pos, chars: string, string
+    local pos, chars: integer, string
     while 1 do
       pos, chars = buffer:match('()([\r\n].)', pos_beg)
       if pos or not f then
@@ -129,14 +129,13 @@ local function file_lines(f: FILE): function(): string
         end
       end
     end
-    local posi = math.tointeger(pos)
-    if not posi then
-      posi = #buffer
+    if not pos then
+      pos = #buffer
     elseif chars == '\r\n' then
-      posi = posi + 1
+      pos = pos + 1
     end
-    local line = buffer:sub(pos_beg, posi)
-    pos_beg = posi + 1
+    local line = buffer:sub(pos_beg, pos)
+    pos_beg = pos + 1
     if #line > 0 then
       return line
     end
diff --git a/src/luarocks/type/rockspec.lua b/src/luarocks/type/rockspec.lua
index cd4044f6..10b06690 100644
--- a/src/luarocks/type/rockspec.lua
+++ b/src/luarocks/type/rockspec.lua
@@ -11,7 +11,7 @@ local type_check = require("luarocks.type_check")
 
 
 
-type_rockspec.rockspec_format = "3.0"
+type_rockspec.rockspec_format = "3.1"
 
 
 
@@ -174,6 +174,9 @@ local rockspec_formats, versions = type_check.declare_schemas({
          },
       },
    },
+
+   ["3.1"] = {},
+
 })
 
 
diff --git a/src/luarocks/type/rockspec.tl b/src/luarocks/type/rockspec.tl
index 599c13ce..52ad7909 100644
--- a/src/luarocks/type/rockspec.tl
+++ b/src/luarocks/type/rockspec.tl
@@ -11,7 +11,7 @@ local type_check = require("luarocks.type_check")
 
 -- local type TableSchema = type_check.TableSchema
 
-type_rockspec.rockspec_format = "3.0"
+type_rockspec.rockspec_format = "3.1"
 
 -- Syntax for type-checking tables:
 --
@@ -173,7 +173,10 @@ local rockspec_formats, versions = type_check.declare_schemas({
             _more = true,
          },
       }
-   }
+   },
+
+   ["3.1"] = {},
+
 })
 
 -- type_rockspec.order = {"rockspec_format", "package", "version",
diff --git a/src/luarocks/vendor/dkjson.d.tl b/src/luarocks/vendor/dkjson.d.tl
index a7c76389..4245e8aa 100644
--- a/src/luarocks/vendor/dkjson.d.tl
+++ b/src/luarocks/vendor/dkjson.d.tl
@@ -15,7 +15,7 @@ local record dkjson
    end
    encode: function({string:any}, ?JsonState): string
 
-   decode: function(string, ?number, ?any, ?table): {string:any}
+   decode: function(string, ?number, ?any, ?table): {string:any}, integer, string
 
    null: table