summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authornikita <nikita@NetBSD.org>2023-04-16 20:46:16 +0000
committernikita <nikita@NetBSD.org>2023-04-16 20:46:16 +0000
commit5d7f68298a269c6bcf3c1983f0b9b44e52c5c2bf (patch)
tree3da439acfeacea2d18f0ea1f8ebe5635d1a28fab /doc
parent3381fb4f9d31004c79eeada1ad64b7e367e1c452 (diff)
Resolve conflicts for lua 5.4.4 import.
Adjust various files for lua 5.4.4.
Diffstat (limited to 'doc')
-rw-r--r--doc/3RDPARTY8
-rw-r--r--doc/CHANGES5
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/3RDPARTY b/doc/3RDPARTY
index 4c3456076db..17f657340e5 100644
--- a/doc/3RDPARTY
+++ b/doc/3RDPARTY
@@ -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; that functionality is built
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 --git a/doc/CHANGES b/doc/CHANGES
index ac9b33475e5..53aeca6c637 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -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]