git: d3007511d7e1 - main - lang/lua55: Update to 5.5.1
Hiroki Tagato <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <6a759621.4551c.7750e0f0__49944.5094073721$1786091059$gmane$org@gitrepo.freebsd.org> |
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3007511d7e121a59ef61a7c5d76b97873fb160a commit d3007511d7e121a59ef61a7c5d76b97873fb160a Author: Hiroki Tagato <[email protected]> AuthorDate: 2026-08-07 08:23:05 +0000 Commit: Hiroki Tagato <[email protected]> CommitDate: 2026-08-07 08:23:55 +0000 lang/lua55: Update to 5.5.1 Changelog: https://www.lua.org/bugs.html#5.5.1 Reported by: portscout --- lang/lua55/Makefile | 2 +- lang/lua55/distinfo | 6 ++--- lang/lua55/files/extra-patch-dlopen | 47 +++++++++++++++++++------------------ 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/lang/lua55/Makefile b/lang/lua55/Makefile index 271eb1477e3c..113f0d82468a 100644 --- a/lang/lua55/Makefile +++ b/lang/lua55/Makefile @@ -1,5 +1,5 @@ PORTNAME= lua -DISTVERSION= 5.5.0 +DISTVERSION= 5.5.1 CATEGORIES= lang MASTER_SITES= https://www.lua.org/ftp/ PKGNAMESUFFIX= ${LUA_VER_STR} diff --git a/lang/lua55/distinfo b/lang/lua55/distinfo index 3413a4a73796..0f920adb9ad5 100644 --- a/lang/lua55/distinfo +++ b/lang/lua55/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1778587320 -SHA256 (lua-5.5.0.tar.gz) = 57ccc32bbbd005cab75bcc52444052535af691789dba2b9016d5c50640d68b3d -SIZE (lua-5.5.0.tar.gz) = 396950 +TIMESTAMP = 1786089486 +SHA256 (lua-5.5.1.tar.gz) = 1c4b4068d67061f2a2231ad2b5422e77acea1487ea9890f6320af614f4373dce +SIZE (lua-5.5.1.tar.gz) = 398643 diff --git a/lang/lua55/files/extra-patch-dlopen b/lang/lua55/files/extra-patch-dlopen index edfbfce1e868..6a4bcc428ef7 100644 --- a/lang/lua55/files/extra-patch-dlopen +++ b/lang/lua55/files/extra-patch-dlopen @@ -1,6 +1,6 @@ ---- src/lua.c.orig 2025-12-15 10:44:40 UTC +--- src/lua.c.orig 2026-08-07 07:59:17 UTC +++ src/lua.c -@@ -498,18 +498,30 @@ static void lua_initreadline (lua_State *L) { +@@ -513,18 +513,29 @@ static void lua_initreadline (lua_State *L) { #include <dlfcn.h> static void lua_initreadline (lua_State *L) { @@ -12,31 +12,32 @@ + int *icompvar; + } u; + - void *lib = dlopen(LUA_READLINELIB, RTLD_NOW | RTLD_LOCAL); -- if (lib == NULL) -+ if (lib == NULL) { - lua_warning(L, "library '" LUA_READLINELIB "' not found", 0); -- else { + const char *rllib = l_getenv(LUA_RLLIB_VAR); /* name of readline library */ + void *lib; /* library handle */ + if (rllib == NULL) /* no environment variable? */ + rllib = LUA_READLINELIB; /* use default name */ + lib = dlopen(rllib, RTLD_NOW | RTLD_LOCAL); + if (lib != NULL) { - const char **name = cast(const char**, dlsym(lib, "rl_readline_name")); - if (name != NULL) - *name = "lua"; - l_readline = cast(l_readlineT, cast_func(dlsym(lib, "readline"))); - l_addhist = cast(l_addhistT, cast_func(dlsym(lib, "add_history"))); -- if (l_readline == NULL) -- lua_warning(L, "unable to load 'readline'", 0); -+ return; +- if (l_readline != NULL) /* could load readline function? */ ++ u.ptr = dlsym(lib, "readline"); ++ l_readline = u.rlfunc; ++ u.ptr = dlsym(lib, "add_history"); ++ l_addhist = u.ahfunc; ++ if ((u.ptr = dlsym(lib, "rl_readline_name"))) ++ *u.rlnamevar = "lua"; ++ if ((u.ptr = dlsym(lib, "rl_inhibit_completion"))) ++ *u.icompvar = 1; ++ if (l_readline != NULL) + return; /* everything ok */ + /* else emit a warning */ } -+ -+ u.ptr = dlsym(lib, "readline"); -+ l_readline = u.rlfunc; -+ u.ptr = dlsym(lib, "add_history"); -+ l_addhist = u.ahfunc; -+ if ((u.ptr = dlsym(lib, "rl_readline_name"))) -+ *u.rlnamevar = "lua"; -+ if ((u.ptr = dlsym(lib, "rl_inhibit_completion"))) -+ *u.icompvar = 1; -+ if (l_readline == NULL) -+ lua_warning(L, "unable to load 'readline' from dynamic library", 0); +@@ -791,4 +802,3 @@ int main (int argc, char **argv) { + lua_close(L); + return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE; } - - #else /* }{ */ +-