Message ID | 20240715130940.470769-1-francois.perrad@gadz.org |
---|---|
State | Accepted |
Headers | show |
Series | [v2,1/3] package/lua: bump to version 5.4.7 | expand |
On 15/07/2024 15:09, Francois Perrad wrote: > Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Applied all three to master, thanks. Regards, Arnout > --- > .checkpackageignore | 6 +++--- > package/lua/5.4.6/lua.hash | 5 ----- > package/lua/{5.4.6 => 5.4.7}/0001-root-path.patch | 0 > package/lua/{5.4.6 => 5.4.7}/0002-shared-libs-for-lua.patch | 0 > .../0011-linenoise.patch => 5.4.7/0003-linenoise.patch} | 2 +- > package/lua/5.4.7/lua.hash | 5 +++++ > package/lua/lua.mk | 2 +- > 7 files changed, 10 insertions(+), 10 deletions(-) > delete mode 100644 package/lua/5.4.6/lua.hash > rename package/lua/{5.4.6 => 5.4.7}/0001-root-path.patch (100%) > rename package/lua/{5.4.6 => 5.4.7}/0002-shared-libs-for-lua.patch (100%) > rename package/lua/{5.4.6/0011-linenoise.patch => 5.4.7/0003-linenoise.patch} (97%) > create mode 100644 package/lua/5.4.7/lua.hash > > diff --git a/.checkpackageignore b/.checkpackageignore > index 72ebab6d8..497cac8d4 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -985,9 +985,9 @@ package/lua/5.1.5/0012-fix-reader-at-eoz.patch lib_patch.Upstream > package/lua/5.3.6/0001-root-path.patch lib_patch.Upstream > package/lua/5.3.6/0002-shared-libs-for-lua.patch lib_patch.Upstream > package/lua/5.3.6/0003-linenoise.patch lib_patch.Upstream > -package/lua/5.4.6/0001-root-path.patch lib_patch.Upstream > -package/lua/5.4.6/0002-shared-libs-for-lua.patch lib_patch.Upstream > -package/lua/5.4.6/0011-linenoise.patch lib_patch.Upstream > +package/lua/5.4.7/0001-root-path.patch lib_patch.Upstream > +package/lua/5.4.7/0002-shared-libs-for-lua.patch lib_patch.Upstream > +package/lua/5.4.7/0003-linenoise.patch lib_patch.Upstream > package/luajit/0001-no-bin-symlink.patch lib_patch.Upstream > package/luajit/0002-install-inc.patch lib_patch.Upstream > package/luasyslog/0001-remove-AX_LUA_LIBS.patch lib_patch.Upstream > diff --git a/package/lua/5.4.6/lua.hash b/package/lua/5.4.6/lua.hash > deleted file mode 100644 > index 0b03fd563..000000000 > --- a/package/lua/5.4.6/lua.hash > +++ /dev/null > @@ -1,5 +0,0 @@ > -# Hashes from: https://www.lua.org/ftp/ > -sha256 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 lua-5.4.6.tar.gz > - > -# Locally computed > -sha256 8f1bff27c5b0585ab679dbe4e37e75a1014af0f79732f42a79f86728321a0c6d doc/readme.html > diff --git a/package/lua/5.4.6/0001-root-path.patch b/package/lua/5.4.7/0001-root-path.patch > similarity index 100% > rename from package/lua/5.4.6/0001-root-path.patch > rename to package/lua/5.4.7/0001-root-path.patch > diff --git a/package/lua/5.4.6/0002-shared-libs-for-lua.patch b/package/lua/5.4.7/0002-shared-libs-for-lua.patch > similarity index 100% > rename from package/lua/5.4.6/0002-shared-libs-for-lua.patch > rename to package/lua/5.4.7/0002-shared-libs-for-lua.patch > diff --git a/package/lua/5.4.6/0011-linenoise.patch b/package/lua/5.4.7/0003-linenoise.patch > similarity index 97% > rename from package/lua/5.4.6/0011-linenoise.patch > rename to package/lua/5.4.7/0003-linenoise.patch > index 5054ae19e..2fcbc49f6 100644 > --- a/package/lua/5.4.6/0011-linenoise.patch > +++ b/package/lua/5.4.7/0003-linenoise.patch > @@ -8,7 +8,7 @@ Index: b/src/lua.c > =================================================================== > --- a/src/lua.c > +++ b/src/lua.c > -@@ -438,6 +438,14 @@ > +@@ -447,6 +447,14 @@ > #define lua_saveline(L,line) ((void)L, add_history(line)) > #define lua_freeline(L,b) ((void)L, free(b)) > > diff --git a/package/lua/5.4.7/lua.hash b/package/lua/5.4.7/lua.hash > new file mode 100644 > index 000000000..d67fdcf6c > --- /dev/null > +++ b/package/lua/5.4.7/lua.hash > @@ -0,0 +1,5 @@ > +# Hashes from: https://www.lua.org/ftp/ > +sha256 9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30 lua-5.4.7.tar.gz > + > +# Locally computed > +sha256 33a975a766520bc54de2d71e45442e504effa0519e331e31ee3fc46eca4f98bd doc/readme.html > diff --git a/package/lua/lua.mk b/package/lua/lua.mk > index 93d480381..15772dbdf 100644 > --- a/package/lua/lua.mk > +++ b/package/lua/lua.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > ifeq ($(BR2_PACKAGE_LUA_5_4),y) > -LUA_VERSION = 5.4.6 > +LUA_VERSION = 5.4.7 > else ifeq ($(BR2_PACKAGE_LUA_5_3),y) > LUA_VERSION = 5.3.6 > else
diff --git a/.checkpackageignore b/.checkpackageignore index 72ebab6d8..497cac8d4 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -985,9 +985,9 @@ package/lua/5.1.5/0012-fix-reader-at-eoz.patch lib_patch.Upstream package/lua/5.3.6/0001-root-path.patch lib_patch.Upstream package/lua/5.3.6/0002-shared-libs-for-lua.patch lib_patch.Upstream package/lua/5.3.6/0003-linenoise.patch lib_patch.Upstream -package/lua/5.4.6/0001-root-path.patch lib_patch.Upstream -package/lua/5.4.6/0002-shared-libs-for-lua.patch lib_patch.Upstream -package/lua/5.4.6/0011-linenoise.patch lib_patch.Upstream +package/lua/5.4.7/0001-root-path.patch lib_patch.Upstream +package/lua/5.4.7/0002-shared-libs-for-lua.patch lib_patch.Upstream +package/lua/5.4.7/0003-linenoise.patch lib_patch.Upstream package/luajit/0001-no-bin-symlink.patch lib_patch.Upstream package/luajit/0002-install-inc.patch lib_patch.Upstream package/luasyslog/0001-remove-AX_LUA_LIBS.patch lib_patch.Upstream diff --git a/package/lua/5.4.6/lua.hash b/package/lua/5.4.6/lua.hash deleted file mode 100644 index 0b03fd563..000000000 --- a/package/lua/5.4.6/lua.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hashes from: https://www.lua.org/ftp/ -sha256 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 lua-5.4.6.tar.gz - -# Locally computed -sha256 8f1bff27c5b0585ab679dbe4e37e75a1014af0f79732f42a79f86728321a0c6d doc/readme.html diff --git a/package/lua/5.4.6/0001-root-path.patch b/package/lua/5.4.7/0001-root-path.patch similarity index 100% rename from package/lua/5.4.6/0001-root-path.patch rename to package/lua/5.4.7/0001-root-path.patch diff --git a/package/lua/5.4.6/0002-shared-libs-for-lua.patch b/package/lua/5.4.7/0002-shared-libs-for-lua.patch similarity index 100% rename from package/lua/5.4.6/0002-shared-libs-for-lua.patch rename to package/lua/5.4.7/0002-shared-libs-for-lua.patch diff --git a/package/lua/5.4.6/0011-linenoise.patch b/package/lua/5.4.7/0003-linenoise.patch similarity index 97% rename from package/lua/5.4.6/0011-linenoise.patch rename to package/lua/5.4.7/0003-linenoise.patch index 5054ae19e..2fcbc49f6 100644 --- a/package/lua/5.4.6/0011-linenoise.patch +++ b/package/lua/5.4.7/0003-linenoise.patch @@ -8,7 +8,7 @@ Index: b/src/lua.c =================================================================== --- a/src/lua.c +++ b/src/lua.c -@@ -438,6 +438,14 @@ +@@ -447,6 +447,14 @@ #define lua_saveline(L,line) ((void)L, add_history(line)) #define lua_freeline(L,b) ((void)L, free(b)) diff --git a/package/lua/5.4.7/lua.hash b/package/lua/5.4.7/lua.hash new file mode 100644 index 000000000..d67fdcf6c --- /dev/null +++ b/package/lua/5.4.7/lua.hash @@ -0,0 +1,5 @@ +# Hashes from: https://www.lua.org/ftp/ +sha256 9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30 lua-5.4.7.tar.gz + +# Locally computed +sha256 33a975a766520bc54de2d71e45442e504effa0519e331e31ee3fc46eca4f98bd doc/readme.html diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 93d480381..15772dbdf 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.6 +LUA_VERSION = 5.4.7 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> --- .checkpackageignore | 6 +++--- package/lua/5.4.6/lua.hash | 5 ----- package/lua/{5.4.6 => 5.4.7}/0001-root-path.patch | 0 package/lua/{5.4.6 => 5.4.7}/0002-shared-libs-for-lua.patch | 0 .../0011-linenoise.patch => 5.4.7/0003-linenoise.patch} | 2 +- package/lua/5.4.7/lua.hash | 5 +++++ package/lua/lua.mk | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 package/lua/5.4.6/lua.hash rename package/lua/{5.4.6 => 5.4.7}/0001-root-path.patch (100%) rename package/lua/{5.4.6 => 5.4.7}/0002-shared-libs-for-lua.patch (100%) rename package/lua/{5.4.6/0011-linenoise.patch => 5.4.7/0003-linenoise.patch} (97%) create mode 100644 package/lua/5.4.7/lua.hash