From 7b95f59eca16938ad919b6ebd274c927378d4de1 Mon Sep 17 00:00:00 2001 From: Aapo Talvensaari Date: Wed, 28 Feb 2024 16:37:21 +0200 Subject: [PATCH] chore(deps): bump luarocks from 3.9.2 to 3.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Summary What's new in LuaRocks 3.10.0: * Features: * Introduce file-based locking for concurrent access control. Previously, LuaRocks would produce undefined behavior when running two instances at the same time. * Rockspec quality-of-life improvements: * Using an unknown `build.type` now automatically implies a build dependency for `luarocks-build-`. * Improve `rockspec.source.dir` autodetection. * `builtin` build mode now automatically inherits include and libdirs from `external_dependencies` if not set explicitly. * improved and simplified Lua interpreter search. * `lua_interpreter` config value is deprecated in favor of `variables.LUA` which contains the full interpreter path. * `luarocks-admin remove` now supports the `file://` protocol for managing local rocks servers. * Bundled dkjson library, so that `luarocks upload` does not require an external JSON library. * New flags for `luarocks init`: `--no-gitignore`, `--no-wrapper-scripts`, `--wrapper-dir`. * `luarocks config` now attempts updating the system config by default when `local_by_default` is `false`. * New flag for `luarocks path`: `--full`, for use with `--lr-path` and `--lr-cpath`. * Fixes: * various Windows-specific fixes: * `build.install_command` now works correctly on Windows. * do not attempt to set "executable" permissions for folders on Windows. * better handling of Windows backslash paths. * fix program search when using absolute paths and `.exe` files. * improved lookup order for library dependencies. * `LUALIB` filename detection is now done dynamically at runtime and not hardcoded by the Windows installer. * prevent LuaRocks from blocking `luafilesystem` from being removed on Windows. * `luarocks build` no longer looks for Lua headers when installing pure-Lua rocks. * `luarocks build` table in rockspecs now gets some additional validation to prevent crashes on malformed rockspecs. * `build.builtin` now compiles C modules in a temporary directory, avoiding name clashes * `build_dependencies` now correctly installs dependencies for the Lua version that LuaRocks is running on, and not the one it is building for with `--lua-version`. * `build_dependencies` can now use a dependency available in any rocks tree (system, user, project). * `luarocks config` now prints boolean values correctly on Lua 5.1. * `luarocks config` now ensures the target directory exists when saving a configuration. * `luarocks init` now injects the project's `package.(c)path` in the Lua wrapper. * `luarocks lint` no longer crashes if a rockspec misses a `description` field. * `luarocks test` now handles malformed `command` entries gracefully. * if `--lua-*` flags are given in the CLI, the hardcoded values are never used. * the "no downloader" error is now shown only once, and not once per failed mirror. * project dir is always presented normalized * catch the failure to setup `LUA_BINDIR` early. * when using `--pack-binary-rock` and a `zip` program is unavailable, report that instead of failing cryptically. * More graceful handling when failing to create a local cache. * Avoid confusion with macOS multiarch binaries on system detection. * Add `--tree` to the rocks trees list. * Better support for LuaJIT versions with extra suffixes in their version numbers. * Don't use floats to parse Lua version number. * Various fixes related to path normalization. LuaRocks 3.10.0 contains new commits by Roman Orekhov, Michael Savage, Pavel Balaev, Aleksei Volkov, Pierre Chapuis, Sebastian Hübner, and Hisham Muhammad. You can find detailed credits in the Git history. You can find all links for installation at https://luarocks.org — source packages for all supported platforms and binaries for Windows (32 and 64 bit) as well as Linux x86-64 are available. Special thanks go to Kong and itch.io for their continued commitment to open source, sponsoring the maintenance of the LuaRocks in various ways. Signed-off-by: Aapo Talvensaari --- .requirements | 2 +- build/luarocks/luarocks_repositories.bzl | 2 +- build/luarocks/luarocks_wrap_script.lua | 2 +- build/templates/venv-commons | 2 +- changelog/unreleased/kong/bump-luarocks.yml | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/kong/bump-luarocks.yml diff --git a/.requirements b/.requirements index 286634dc112..d002fb23a4b 100644 --- a/.requirements +++ b/.requirements @@ -1,7 +1,7 @@ KONG_PACKAGE_NAME=kong OPENRESTY=1.25.3.1 -LUAROCKS=3.9.2 +LUAROCKS=3.10.0 OPENSSL=3.2.1 PCRE=10.43 LIBEXPAT=2.5.0 diff --git a/build/luarocks/luarocks_repositories.bzl b/build/luarocks/luarocks_repositories.bzl index 588595faf3d..7741e138b45 100644 --- a/build/luarocks/luarocks_repositories.bzl +++ b/build/luarocks/luarocks_repositories.bzl @@ -10,7 +10,7 @@ def luarocks_repositories(): name = "luarocks", build_file = "//build/luarocks:BUILD.luarocks.bazel", strip_prefix = "luarocks-" + version, - sha256 = "bca6e4ecc02c203e070acdb5f586045d45c078896f6236eb46aa33ccd9b94edb", + sha256 = "e9bf06d5ec6b8ecc6dbd1530d2d77bdb3377d814a197c46388e9f148548c1c89", urls = [ "https://luarocks.org/releases/luarocks-" + version + ".tar.gz", ], diff --git a/build/luarocks/luarocks_wrap_script.lua b/build/luarocks/luarocks_wrap_script.lua index 44e03cbaceb..18999e11a22 100644 --- a/build/luarocks/luarocks_wrap_script.lua +++ b/build/luarocks/luarocks_wrap_script.lua @@ -20,8 +20,8 @@ if install_dest:sub(-1) ~= "/" then install_dest = install_dest .. "/" end -- HACK -cfg.lua_interpreter = "luajit" cfg.sysconfdir = install_dest .. "etc/luarocks" +cfg.variables["LUA"] = install_dest .. "openresty/luajit/bin/luajit" cfg.variables["LUA_DIR"] = install_dest .. "openresty/luajit" cfg.variables["LUA_INCDIR"] = install_dest .. "openresty/luajit/include/luajit-2.1" cfg.variables["LUA_BINDIR"] = install_dest .. "openresty/luajit/bin" diff --git a/build/templates/venv-commons b/build/templates/venv-commons index f13613ca71d..f16a5aadbde 100644 --- a/build/templates/venv-commons +++ b/build/templates/venv-commons @@ -42,7 +42,7 @@ $KONG_VENV/openresty/site/lualib/?.lua;$KONG_VENV/openresty/site/lualib/?.ljbc;\ $KONG_VENV/openresty/site/lualib/?/init.lua;$KONG_VENV/openresty/site/lualib/?/init.ljbc;\ $KONG_VENV/openresty/lualib/?.lua;$KONG_VENV/openresty/lualib/?.ljbc;\ $KONG_VENV/openresty/lualib/?/init.lua;$KONG_VENV/openresty/lualib/?/init.ljbc;\ -$KONG_VENV/openresty/luajit/share/luajit-2.1.0-beta3/?.lua" +$KONG_VENV/openresty/luajit/share/luajit-2.1/?.lua" # support custom plugin development if [ -n $KONG_PLUGIN_PATH ] ; then diff --git a/changelog/unreleased/kong/bump-luarocks.yml b/changelog/unreleased/kong/bump-luarocks.yml new file mode 100644 index 00000000000..843bfaf358d --- /dev/null +++ b/changelog/unreleased/kong/bump-luarocks.yml @@ -0,0 +1,2 @@ +message: "Bumped LuaRocks from 3.9.2 to 3.10.0" +type: dependency