Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/modules/lua Resolve conflicts for lua 5.4.4 import.
details: https://anonhg.NetBSD.org/src/rev/9de2437320fc
branches: trunk
changeset: 374281:9de2437320fc
user: nikita <nikita%NetBSD.org@localhost>
date: Sun Apr 16 20:46:16 2023 +0000
description:
Resolve conflicts for lua 5.4.4 import.
Adjust various files for lua 5.4.4.
diffstat:
distrib/sets/lists/base/ad.aarch64 | 8 +-
distrib/sets/lists/base/mi | 8 +-
distrib/sets/lists/base/shl.mi | 24 +-
distrib/sets/lists/debug/shl.mi | 4 +-
doc/3RDPARTY | 8 +-
doc/CHANGES | 5 +-
etc/mtree/NetBSD.dist.base | 6 +-
etc/mtree/NetBSD.dist.compat.in | 4 +-
external/mit/lua/dist/Makefile | 28 +-
external/mit/lua/dist/README | 2 +-
external/mit/lua/dist/README.import | 2 +-
external/mit/lua/dist/doc/contents.html | 109 +-
external/mit/lua/dist/doc/lua.1 | 95 +-
external/mit/lua/dist/doc/manual.html | 3739 +++++++++++++++++----------
external/mit/lua/dist/doc/readme.html | 117 +-
external/mit/lua/dist/src/Makefile | 85 +-
external/mit/lua/dist/src/lapi.c | 771 +++--
external/mit/lua/dist/src/lapi.h | 31 +-
external/mit/lua/dist/src/lauxlib.c | 445 +-
external/mit/lua/dist/src/lauxlib.h | 82 +-
external/mit/lua/dist/src/lbaselib.c | 177 +-
external/mit/lua/dist/src/lbitlib.c | 235 -
external/mit/lua/dist/src/lcode.c | 1216 ++++++--
external/mit/lua/dist/src/lcode.h | 33 +-
external/mit/lua/dist/src/lcorolib.c | 102 +-
external/mit/lua/dist/src/lctype.c | 45 +-
external/mit/lua/dist/src/lctype.h | 20 +-
external/mit/lua/dist/src/ldblib.c | 107 +-
external/mit/lua/dist/src/ldebug.c | 589 +++-
external/mit/lua/dist/src/ldebug.h | 34 +-
external/mit/lua/dist/src/ldo.c | 833 +++--
external/mit/lua/dist/src/ldo.h | 43 +-
external/mit/lua/dist/src/ldump.c | 203 +-
external/mit/lua/dist/src/lfunc.c | 225 +-
external/mit/lua/dist/src/lfunc.h | 51 +-
external/mit/lua/dist/src/lgc.c | 1445 +++++++---
external/mit/lua/dist/src/lgc.h | 140 +-
external/mit/lua/dist/src/linit.c | 9 +-
external/mit/lua/dist/src/liolib.c | 144 +-
external/mit/lua/dist/src/ljumptab.h | 8 +-
external/mit/lua/dist/src/llex.c | 118 +-
external/mit/lua/dist/src/llex.h | 16 +-
external/mit/lua/dist/src/llimits.h | 126 +-
external/mit/lua/dist/src/lmathlib.c | 444 ++-
external/mit/lua/dist/src/lmem.c | 179 +-
external/mit/lua/dist/src/lmem.h | 74 +-
external/mit/lua/dist/src/loadlib.c | 282 +-
external/mit/lua/dist/src/lobject.c | 362 +-
external/mit/lua/dist/src/lobject.h | 829 ++++--
external/mit/lua/dist/src/lopcodes.c | 202 +-
external/mit/lua/dist/src/lopcodes.h | 396 +-
external/mit/lua/dist/src/loslib.c | 93 +-
external/mit/lua/dist/src/lparser.c | 1004 ++++--
external/mit/lua/dist/src/lparser.h | 82 +-
external/mit/lua/dist/src/lprefix.h | 6 +-
external/mit/lua/dist/src/lstate.c | 247 +-
external/mit/lua/dist/src/lstate.h | 247 +-
external/mit/lua/dist/src/lstring.c | 137 +-
external/mit/lua/dist/src/lstring.h | 24 +-
external/mit/lua/dist/src/lstrlib.c | 740 +++-
external/mit/lua/dist/src/ltable.c | 778 ++++-
external/mit/lua/dist/src/ltable.h | 32 +-
external/mit/lua/dist/src/ltablib.c | 70 +-
external/mit/lua/dist/src/ltm.c | 178 +-
external/mit/lua/dist/src/ltm.h | 39 +-
external/mit/lua/dist/src/lua.c | 500 ++-
external/mit/lua/dist/src/lua.h | 68 +-
external/mit/lua/dist/src/luac.c | 473 ++-
external/mit/lua/dist/src/luaconf.h | 320 +-
external/mit/lua/dist/src/lualib.h | 13 +-
external/mit/lua/dist/src/lundump.c | 280 +-
external/mit/lua/dist/src/lundump.h | 10 +-
external/mit/lua/dist/src/lutf8lib.c | 130 +-
external/mit/lua/dist/src/lvm.c | 1940 +++++++++-----
external/mit/lua/dist/src/lvm.h | 99 +-
external/mit/lua/dist/src/lzio.c | 4 +-
external/mit/lua/dist/src/lzio.h | 4 +-
external/mit/lua/lib/liblua/Makefile | 6 +-
external/mit/lua/lib/liblua/shlib_version | 6 +-
share/mk/bsd.lua.mk | 8 +-
sys/modules/examples/luahello/luahello.lua | 90 +-
sys/modules/lua/Makefile | 4 +-
82 files changed, 14171 insertions(+), 7721 deletions(-)
diffs (truncated from 35747 to 300 lines):
diff -r 0002e877d198 -r 9de2437320fc distrib/sets/lists/base/ad.aarch64
--- a/distrib/sets/lists/base/ad.aarch64 Sun Apr 16 20:37:59 2023 +0000
+++ b/distrib/sets/lists/base/ad.aarch64 Sun Apr 16 20:46:16 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.36 2021/06/07 17:11:16 christos Exp $
+# $NetBSD: ad.aarch64,v 1.37 2023/04/16 20:46:16 nikita Exp $
./lib/eabi base-compat-lib compat,llvm
./lib/eabi/npf base-compat-lib compat,llvm
./lib/eabihf base-compat-lib compat,llvm
@@ -15,14 +15,16 @@
./usr/lib/eabi/libc_vfp.so.0 base-compat-shlib compat,pic,llvm
./usr/lib/eabi/libc_vfp.so.0.0 base-compat-shlib compat,pic,llvm
./usr/lib/eabi/lua base-compat-lib compat,llvm
-./usr/lib/eabi/lua/5.3 base-compat-lib compat,llvm
+./usr/lib/eabi/lua/5.3 base-obsolete obsolete
+./usr/lib/eabi/lua/5.4 base-compat-lib compat,llvm
./usr/lib/eabi/security base-compat-lib compat,llvm
./usr/lib/eabihf base-compat-lib compat,llvm
./usr/lib/eabihf/i18n base-compat-lib compat,llvm
./usr/lib/eabihf/libarm.so.0 base-compat-shlib compat,pic,llvm
./usr/lib/eabihf/libarm.so.0.0 base-compat-shlib compat,pic,llvm
./usr/lib/eabihf/lua base-compat-lib compat,llvm
-./usr/lib/eabihf/lua/5.3 base-compat-lib compat,llvm
+./usr/lib/eabihf/lua/5.3 base-obsolete obsolete
+./usr/lib/eabihf/lua/5.4 base-compat-lib compat,llvm
./usr/lib/eabihf/security base-compat-lib compat,llvm
./usr/lib/oabi base-obsolete obsolete
./usr/lib/oabi/i18n base-obsolete obsolete
diff -r 0002e877d198 -r 9de2437320fc distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Sun Apr 16 20:37:59 2023 +0000
+++ b/distrib/sets/lists/base/mi Sun Apr 16 20:46:16 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1314 2022/12/11 06:59:36 kre Exp $
+# $NetBSD: mi,v 1.1315 2023/04/16 20:46:16 nikita Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1206,7 +1206,8 @@
./usr/lib/libusb.so base-obsolete obsolete
./usr/lib/lua base-sys-usr compatfile
./usr/lib/lua/5.1 base-obsolete obsolete
-./usr/lib/lua/5.3 base-sys-usr compatfile
+./usr/lib/lua/5.3 base-obsolete obsolete
+./usr/lib/lua/5.4 base-sys-usr compatfile
./usr/lib/named base-sys-usr
./usr/lib/npf base-obsolete obsolete
./usr/lib/postfix base-postfix-usr
@@ -4173,7 +4174,8 @@
./usr/share/locale/zh_TW/LC_MESSAGES/texinfo.mo base-texinfo_locale-zh nls
./usr/share/lua base-sys-root
./usr/share/lua/5.1 base-obsolete obsolete
-./usr/share/lua/5.3 base-sys-root
+./usr/share/lua/5.3 base-obsolete obsolete
+./usr/share/lua/5.4 base-sys-root
./usr/share/man base-man-share
./usr/share/man/COPYRIGHT base-obsolete obsolete
./usr/share/man/cat1 base-man-share
diff -r 0002e877d198 -r 9de2437320fc distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Sun Apr 16 20:37:59 2023 +0000
+++ b/distrib/sets/lists/base/shl.mi Sun Apr 16 20:46:16 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.946 2023/03/23 12:38:13 riastradh Exp $
+# $NetBSD: shl.mi,v 1.947 2023/04/16 20:46:16 nikita Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -436,8 +436,8 @@
./usr/lib/liblsan.so.2 base-sys-shlib compatfile,cxx,gcc
./usr/lib/liblsan.so.2.0 base-sys-shlib compatfile,cxx,gcc
./usr/lib/liblua.so base-sys-shlib compatfile
-./usr/lib/liblua.so.5 base-sys-shlib compatfile
-./usr/lib/liblua.so.5.3 base-sys-shlib compatfile
+./usr/lib/liblua.so.6 base-sys-shlib compatfile
+./usr/lib/liblua.so.6.0 base-sys-shlib compatfile
./usr/lib/liblutok.so base-sys-shlib kyua,compatfile
./usr/lib/liblutok.so.1 base-obsolete obsolete
./usr/lib/liblutok.so.1.0 base-obsolete obsolete
@@ -966,12 +966,18 @@
./usr/lib/lua/5.1/gpio.so base-obsolete obsolete
./usr/lib/lua/5.1/sqlite.so base-obsolete obsolete
./usr/lib/lua/5.1/syslog.so base-obsolete obsolete
-./usr/lib/lua/5.3/bozohttpd.so base-sys-shlib compatfile
-./usr/lib/lua/5.3/gpio.so base-sys-shlib compatfile
-./usr/lib/lua/5.3/libm.so base-sys-shlib compatfile
-./usr/lib/lua/5.3/netpgp.so base-sys-shlib compatfile
-./usr/lib/lua/5.3/sqlite.so base-sys-shlib compatfile
-./usr/lib/lua/5.3/syslog.so base-sys-shlib compatfile
+./usr/lib/lua/5.3/bozohttpd.so base-obsolete obsolete
+./usr/lib/lua/5.3/gpio.so base-obsolete obsolete
+./usr/lib/lua/5.3/libm.so base-obsolete obsolete
+./usr/lib/lua/5.3/netpgp.so base-obsolete obsolete
+./usr/lib/lua/5.3/sqlite.so base-obsolete obsolete
+./usr/lib/lua/5.3/syslog.so base-obsolete obsolete
+./usr/lib/lua/5.4/bozohttpd.so base-sys-shlib compatfile
+./usr/lib/lua/5.4/gpio.so base-sys-shlib compatfile
+./usr/lib/lua/5.4/libm.so base-sys-shlib compatfile
+./usr/lib/lua/5.4/netpgp.so base-sys-shlib compatfile
+./usr/lib/lua/5.4/sqlite.so base-sys-shlib compatfile
+./usr/lib/lua/5.4/syslog.so base-sys-shlib compatfile
./usr/lib/named/filter-aaaa.so.0 base-sys-shlib
./usr/lib/npf/ext_log.so base-obsolete obsolete
./usr/lib/npf/ext_log.so.0 base-obsolete obsolete
diff -r 0002e877d198 -r 9de2437320fc distrib/sets/lists/debug/shl.mi
--- a/distrib/sets/lists/debug/shl.mi Sun Apr 16 20:37:59 2023 +0000
+++ b/distrib/sets/lists/debug/shl.mi Sun Apr 16 20:46:16 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.303 2023/03/23 12:38:13 riastradh Exp $
+# $NetBSD: shl.mi,v 1.304 2023/04/16 20:46:16 nikita Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
@@ -157,7 +157,7 @@
./usr/libdata/debug/usr/lib/libldap_r.so.5.0.debug comp-ldap-debug debug,compatfile,ldap
./usr/libdata/debug/usr/lib/liblsan.so.1.0.debug comp-sys-debug debug,compatfile,obsolete
./usr/libdata/debug/usr/lib/liblsan.so.2.0.debug comp-sys-debug debug,compatfile,cxx,gcc
-./usr/libdata/debug/usr/lib/liblua.so.5.3.debug comp-sys-debug debug,compatfile
+./usr/libdata/debug/usr/lib/liblua.so.6.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/liblutok.so.1.0.debug comp-obsolete debug,compatfile,obsolete
./usr/libdata/debug/usr/lib/liblutok.so.2.0.debug comp-kyua-debug debug,compatfile,kyua
./usr/libdata/debug/usr/lib/liblwres.so.6.0.debug comp-obsolete debug,compatfile,obsolete
diff -r 0002e877d198 -r 9de2437320fc doc/3RDPARTY
--- a/doc/3RDPARTY Sun Apr 16 20:37:59 2023 +0000
+++ b/doc/3RDPARTY Sun Apr 16 20:46:16 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1919 2023/03/31 19:09:08 kre Exp $
+# $NetBSD: 3RDPARTY,v 1.1920 2023/04/16 20:46:16 nikita Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -831,11 +831,11 @@ under src/usr.sbin). We don't use tcpd;
into inetd. The provided libwrap2netbsd script handles just libwrap.
Package: Lua
-Version: Lua 5.3.5
-Current Vers: Lua 5.3.6/5.4.1
+Version: Lua 5.4.4
+Current Vers: Lua 5.4.4
Maintainer: PUC Rio
Home Page: https://www.lua.org/
-Date: 2020-06-30
+Date: 2023-04-16
Mailing List:
Responsible: mbalmer, lneto, salazar, alnsn
License: MIT
diff -r 0002e877d198 -r 9de2437320fc doc/CHANGES
--- a/doc/CHANGES Sun Apr 16 20:37:59 2023 +0000
+++ b/doc/CHANGES Sun Apr 16 20:46:16 2023 +0000
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2958 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2959 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -65,3 +65,6 @@ Changes from NetBSD 10.0 to NetBSD 11.0:
tzdata: updated to 2023a (using the 2023agtz fork) [kre 20230323]
tzdata: updated to 2023b (using the 2023bgtz fork) [kre 20230324]
tzdata: updated to 2023c (using the 2023cgtz fork) [kre 20230331]
+ lua: Import version 5.4.4.
+ Bumped shlib major because of incompatible API/ABI changes.
+ [nikita 20230416]
diff -r 0002e877d198 -r 9de2437320fc etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base Sun Apr 16 20:37:59 2023 +0000
+++ b/etc/mtree/NetBSD.dist.base Sun Apr 16 20:46:16 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.246 2022/06/12 03:51:13 tsutsui Exp $
+# $NetBSD: NetBSD.dist.base,v 1.247 2023/04/16 20:46:17 nikita Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -353,7 +353,7 @@
./usr/lib/clang/13.0.0/share
./usr/lib/i18n
./usr/lib/lua
-./usr/lib/lua/5.3
+./usr/lib/lua/5.4
./usr/lib/named
./usr/lib/pkgconfig
./usr/lib/postfix
@@ -971,7 +971,7 @@
./usr/share/locale/zh_TW.eucTW/LC_MESSAGES
./usr/share/locale/zh_TW/LC_MESSAGES
./usr/share/lua
-./usr/share/lua/5.3
+./usr/share/lua/5.4
./usr/share/man
./usr/share/man/cat1
./usr/share/man/cat1/atari
diff -r 0002e877d198 -r 9de2437320fc etc/mtree/NetBSD.dist.compat.in
--- a/etc/mtree/NetBSD.dist.compat.in Sun Apr 16 20:37:59 2023 +0000
+++ b/etc/mtree/NetBSD.dist.compat.in Sun Apr 16 20:46:16 2023 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: NetBSD.dist.compat.in,v 1.1 2015/06/19 18:16:06 matt Exp $
+# $NetBSD: NetBSD.dist.compat.in,v 1.2 2023/04/16 20:46:17 nikita Exp $
./lib/@ARCH_SUBDIR@
./lib/@ARCH_SUBDIR@/npf
./usr/lib/@ARCH_SUBDIR@
./usr/lib/@ARCH_SUBDIR@/i18n
./usr/lib/@ARCH_SUBDIR@/lua
-./usr/lib/@ARCH_SUBDIR@/lua/5.3
+./usr/lib/@ARCH_SUBDIR@/lua/5.4
./usr/lib/@ARCH_SUBDIR@/security
./usr/libdata/debug/lib/@ARCH_SUBDIR@
./usr/libdata/debug/lib/@ARCH_SUBDIR@/npf
diff -r 0002e877d198 -r 9de2437320fc external/mit/lua/dist/Makefile
--- a/external/mit/lua/dist/Makefile Sun Apr 16 20:37:59 2023 +0000
+++ b/external/mit/lua/dist/Makefile Sun Apr 16 20:46:16 2023 +0000
@@ -4,7 +4,7 @@
# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
# Your platform. See PLATS for possible values.
-PLAT= none
+PLAT= guess
# Where to install. The installation starts in the src and doc directories,
# so take care if INSTALL_TOP is not an absolute path. See the local target.
@@ -36,7 +36,7 @@ RM= rm -f
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
# Convenience platforms targets.
-PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
+PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
# What to install.
TO_BIN= lua luac
@@ -45,17 +45,14 @@ TO_LIB= liblua.a
TO_MAN= lua.1 luac.1
# Lua version and release.
-V= 5.3
+V= 5.4
R= $V.4
# Targets start here.
all: $(PLAT)
-$(PLATS) clean:
- cd src && $(MAKE) $@
-
-test: dummy
- src/lua -v
+$(PLATS) help test clean:
+ @cd src && $(MAKE) $@
install: dummy
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
@@ -73,15 +70,10 @@ uninstall:
local:
$(MAKE) install INSTALL_TOP=../install
-none:
- @echo "Please do 'make PLATFORM' where PLATFORM is one of these:"
- @echo " $(PLATS)"
- @echo "See doc/readme.html for complete instructions."
-
-# make may get confused with test/ and install/
+# make may get confused with install/ if it does not support .PHONY.
dummy:
-# echo config parameters
+# Echo config parameters.
echo:
@cd src && $(MAKE) -s echo
@echo "PLAT= $(PLAT)"
@@ -101,14 +93,14 @@ echo:
@echo "INSTALL_EXEC= $(INSTALL_EXEC)"
@echo "INSTALL_DATA= $(INSTALL_DATA)"
-# echo pkg-config data
+# Echo pkg-config data.
pc:
@echo "version=$R"
@echo "prefix=$(INSTALL_TOP)"
@echo "libdir=$(INSTALL_LIB)"
@echo "includedir=$(INSTALL_INC)"
-# list targets that do not create files (but not all makes understand .PHONY)
-.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
+# Targets that do not create files (not all makes understand .PHONY).
+.PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc
# (end of Makefile)
diff -r 0002e877d198 -r 9de2437320fc external/mit/lua/dist/README
--- a/external/mit/lua/dist/README Sun Apr 16 20:37:59 2023 +0000
+++ b/external/mit/lua/dist/README Sun Apr 16 20:46:16 2023 +0000
@@ -1,5 +1,5 @@
-This is Lua 5.3.5, released on 26 Jun 2018.
+This is Lua 5.4.4, released on 13 Jan 2022.
For installation instructions, license details, and
further information about Lua, see doc/readme.html.
diff -r 0002e877d198 -r 9de2437320fc external/mit/lua/dist/README.import
--- a/external/mit/lua/dist/README.import Sun Apr 16 20:37:59 2023 +0000
+++ b/external/mit/lua/dist/README.import Sun Apr 16 20:46:16 2023 +0000
@@ -17,4 +17,4 @@ 8. Commit your changes.
Vendor branches are usually named LUA_<<x_y_z>> but if there was a problem
with cvs import, they can be named differently.
-The last imported vendor branch is called LUA_5_3_5_try2.
Home |
Main Index |
Thread Index |
Old Index