CVS import: src/external/mit/lua/dist

2024-06-26 Thread nikita
Module Name:src
Committed By:   nikita
Date:   Wed Jun 26 21:35:32 UTC 2024

Update of /cvsroot/src/external/mit/lua/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28085

Log Message:
initial import of lua 5.4.7

Status:

Vendor Tag: LUA
Release Tags:   LUA_5_4_7

C src/external/mit/lua/dist/Makefile
C src/external/mit/lua/dist/README
U src/external/mit/lua/dist/doc/luac.1
C src/external/mit/lua/dist/doc/manual.html
U src/external/mit/lua/dist/doc/manual.css
N src/external/mit/lua/dist/doc/OSIApproved_100X125.png
C src/external/mit/lua/dist/doc/contents.html
C src/external/mit/lua/dist/doc/lua.css
U src/external/mit/lua/dist/doc/logo.gif
C src/external/mit/lua/dist/doc/lua.1
U src/external/mit/lua/dist/doc/index.css
C src/external/mit/lua/dist/doc/readme.html
U src/external/mit/lua/dist/src/ldblib.c
C src/external/mit/lua/dist/src/lmathlib.c
C src/external/mit/lua/dist/src/loslib.c
C src/external/mit/lua/dist/src/lvm.c
C src/external/mit/lua/dist/src/ldo.h
C src/external/mit/lua/dist/src/lua.h
U src/external/mit/lua/dist/src/lgc.h
C src/external/mit/lua/dist/src/ltm.h
C src/external/mit/lua/dist/src/loadlib.c
U src/external/mit/lua/dist/src/lmem.c
C src/external/mit/lua/dist/src/lstate.h
U src/external/mit/lua/dist/src/Makefile
U src/external/mit/lua/dist/src/lzio.h
C src/external/mit/lua/dist/src/luaconf.h
U src/external/mit/lua/dist/src/lopcodes.c
C src/external/mit/lua/dist/src/lua.c
C src/external/mit/lua/dist/src/lundump.h
U src/external/mit/lua/dist/src/ljumptab.h
U src/external/mit/lua/dist/src/lbaselib.c
C src/external/mit/lua/dist/src/ltable.c
U src/external/mit/lua/dist/src/ldump.c
C src/external/mit/lua/dist/src/liolib.c
U src/external/mit/lua/dist/src/llimits.h
U src/external/mit/lua/dist/src/lfunc.h
U src/external/mit/lua/dist/src/lualib.h
U src/external/mit/lua/dist/src/lzio.c
U src/external/mit/lua/dist/src/lopnames.h
U src/external/mit/lua/dist/src/lctype.c
U src/external/mit/lua/dist/src/lmem.h
U src/external/mit/lua/dist/src/llex.h
C src/external/mit/lua/dist/src/ltable.h
C src/external/mit/lua/dist/src/lstring.c
C src/external/mit/lua/dist/src/ldebug.h
U src/external/mit/lua/dist/src/lprefix.h
U src/external/mit/lua/dist/src/llex.c
U src/external/mit/lua/dist/src/linit.c
C src/external/mit/lua/dist/src/lobject.h
U src/external/mit/lua/dist/src/lapi.h
C src/external/mit/lua/dist/src/ldebug.c
C src/external/mit/lua/dist/src/ldo.c
U src/external/mit/lua/dist/src/lvm.h
C src/external/mit/lua/dist/src/lauxlib.c
U src/external/mit/lua/dist/src/luac.c
U src/external/mit/lua/dist/src/lctype.h
U src/external/mit/lua/dist/src/lstring.h
U src/external/mit/lua/dist/src/lcorolib.c
U src/external/mit/lua/dist/src/lutf8lib.c
C src/external/mit/lua/dist/src/lgc.c
C src/external/mit/lua/dist/src/lstate.c
C src/external/mit/lua/dist/src/lundump.c
U src/external/mit/lua/dist/src/ltablib.c
U src/external/mit/lua/dist/src/lauxlib.h
U src/external/mit/lua/dist/src/ltm.c
C src/external/mit/lua/dist/src/lparser.c
C src/external/mit/lua/dist/src/lcode.h
C src/external/mit/lua/dist/src/lobject.c
C src/external/mit/lua/dist/src/lcode.c
C src/external/mit/lua/dist/src/lopcodes.h
U src/external/mit/lua/dist/src/lfunc.c
C src/external/mit/lua/dist/src/lapi.c
U src/external/mit/lua/dist/src/lparser.h
U src/external/mit/lua/dist/src/lua.hpp
U src/external/mit/lua/dist/src/lstrlib.c

36 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jLUA:yesterday -jLUA src/external/mit/lua/dist



CVS import: src/external/mit/lua/dist

2024-06-26 Thread nikita
Module Name:src
Committed By:   nikita
Date:   Wed Jun 26 21:35:32 UTC 2024

Update of /cvsroot/src/external/mit/lua/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28085

Log Message:
initial import of lua 5.4.7

Status:

Vendor Tag: LUA
Release Tags:   LUA_5_4_7

C src/external/mit/lua/dist/Makefile
C src/external/mit/lua/dist/README
U src/external/mit/lua/dist/doc/luac.1
C src/external/mit/lua/dist/doc/manual.html
U src/external/mit/lua/dist/doc/manual.css
N src/external/mit/lua/dist/doc/OSIApproved_100X125.png
C src/external/mit/lua/dist/doc/contents.html
C src/external/mit/lua/dist/doc/lua.css
U src/external/mit/lua/dist/doc/logo.gif
C src/external/mit/lua/dist/doc/lua.1
U src/external/mit/lua/dist/doc/index.css
C src/external/mit/lua/dist/doc/readme.html
U src/external/mit/lua/dist/src/ldblib.c
C src/external/mit/lua/dist/src/lmathlib.c
C src/external/mit/lua/dist/src/loslib.c
C src/external/mit/lua/dist/src/lvm.c
C src/external/mit/lua/dist/src/ldo.h
C src/external/mit/lua/dist/src/lua.h
U src/external/mit/lua/dist/src/lgc.h
C src/external/mit/lua/dist/src/ltm.h
C src/external/mit/lua/dist/src/loadlib.c
U src/external/mit/lua/dist/src/lmem.c
C src/external/mit/lua/dist/src/lstate.h
U src/external/mit/lua/dist/src/Makefile
U src/external/mit/lua/dist/src/lzio.h
C src/external/mit/lua/dist/src/luaconf.h
U src/external/mit/lua/dist/src/lopcodes.c
C src/external/mit/lua/dist/src/lua.c
C src/external/mit/lua/dist/src/lundump.h
U src/external/mit/lua/dist/src/ljumptab.h
U src/external/mit/lua/dist/src/lbaselib.c
C src/external/mit/lua/dist/src/ltable.c
U src/external/mit/lua/dist/src/ldump.c
C src/external/mit/lua/dist/src/liolib.c
U src/external/mit/lua/dist/src/llimits.h
U src/external/mit/lua/dist/src/lfunc.h
U src/external/mit/lua/dist/src/lualib.h
U src/external/mit/lua/dist/src/lzio.c
U src/external/mit/lua/dist/src/lopnames.h
U src/external/mit/lua/dist/src/lctype.c
U src/external/mit/lua/dist/src/lmem.h
U src/external/mit/lua/dist/src/llex.h
C src/external/mit/lua/dist/src/ltable.h
C src/external/mit/lua/dist/src/lstring.c
C src/external/mit/lua/dist/src/ldebug.h
U src/external/mit/lua/dist/src/lprefix.h
U src/external/mit/lua/dist/src/llex.c
U src/external/mit/lua/dist/src/linit.c
C src/external/mit/lua/dist/src/lobject.h
U src/external/mit/lua/dist/src/lapi.h
C src/external/mit/lua/dist/src/ldebug.c
C src/external/mit/lua/dist/src/ldo.c
U src/external/mit/lua/dist/src/lvm.h
C src/external/mit/lua/dist/src/lauxlib.c
U src/external/mit/lua/dist/src/luac.c
U src/external/mit/lua/dist/src/lctype.h
U src/external/mit/lua/dist/src/lstring.h
U src/external/mit/lua/dist/src/lcorolib.c
U src/external/mit/lua/dist/src/lutf8lib.c
C src/external/mit/lua/dist/src/lgc.c
C src/external/mit/lua/dist/src/lstate.c
C src/external/mit/lua/dist/src/lundump.c
U src/external/mit/lua/dist/src/ltablib.c
U src/external/mit/lua/dist/src/lauxlib.h
U src/external/mit/lua/dist/src/ltm.c
C src/external/mit/lua/dist/src/lparser.c
C src/external/mit/lua/dist/src/lcode.h
C src/external/mit/lua/dist/src/lobject.c
C src/external/mit/lua/dist/src/lcode.c
C src/external/mit/lua/dist/src/lopcodes.h
U src/external/mit/lua/dist/src/lfunc.c
C src/external/mit/lua/dist/src/lapi.c
U src/external/mit/lua/dist/src/lparser.h
U src/external/mit/lua/dist/src/lua.hpp
U src/external/mit/lua/dist/src/lstrlib.c

36 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jLUA:yesterday -jLUA src/external/mit/lua/dist



CVS commit: [netbsd-9] src/doc

2024-06-26 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Jun 26 17:13:55 UTC 2024

Modified Files:
src/doc [netbsd-9]: CHANGES-9.5

Log Message:
Ticket #1851


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-9.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-9.5
diff -u src/doc/CHANGES-9.5:1.1.2.6 src/doc/CHANGES-9.5:1.1.2.7
--- src/doc/CHANGES-9.5:1.1.2.6	Sat Jun 22 18:23:25 2024
+++ src/doc/CHANGES-9.5	Wed Jun 26 17:13:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.5,v 1.1.2.6 2024/06/22 18:23:25 martin Exp $
+# $NetBSD: CHANGES-9.5,v 1.1.2.7 2024/06/26 17:13:55 martin Exp $
 
 A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5
 release:
@@ -90,3 +90,8 @@ sys/arch/x86/x86/coretemp.c			1.40,1.41
 	coretemp(4): do not accept impossibly low TjMax values.
 	[gutteridge, ticket #1848]
 
+usr.sbin/btpand/btpand.c			1.9
+
+	btpand(8): fix off-by-one bug causing out of bounds memory access.
+	[plunky, ticket #1851]
+



CVS commit: [netbsd-9] src/doc

2024-06-26 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Jun 26 17:13:55 UTC 2024

Modified Files:
src/doc [netbsd-9]: CHANGES-9.5

Log Message:
Ticket #1851


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-9.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-9] src/usr.sbin/btpand

2024-06-26 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Jun 26 17:13:06 UTC 2024

Modified Files:
src/usr.sbin/btpand [netbsd-9]: btpand.c

Log Message:
Pull up following revision(s) (requested by plunky in ticket #1851):

usr.sbin/btpand/btpand.c: revision 1.9

Fix off-by-one bug in btpand

`ul` reaches `__arraycount(services)` before the bound-check happens, causing 
undefined behaviour.
from Dapeng Gao  via FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.26.1 src/usr.sbin/btpand/btpand.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/btpand/btpand.c
diff -u src/usr.sbin/btpand/btpand.c:1.7 src/usr.sbin/btpand/btpand.c:1.7.26.1
--- src/usr.sbin/btpand/btpand.c:1.7	Sat Jun 21 17:50:01 2014
+++ src/usr.sbin/btpand/btpand.c	Wed Jun 26 17:13:06 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: btpand.c,v 1.7 2014/06/21 17:50:01 christos Exp $	*/
+/*	$NetBSD: btpand.c,v 1.7.26.1 2024/06/26 17:13:06 martin Exp $	*/
 
 /*-
  * Copyright (c) 2008-2009 Iain Hibbert
@@ -27,7 +27,7 @@
 
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2008-2009 Iain Hibbert. All rights reserved.");
-__RCSID("$NetBSD: btpand.c,v 1.7 2014/06/21 17:50:01 christos Exp $");
+__RCSID("$NetBSD: btpand.c,v 1.7.26.1 2024/06/26 17:13:06 martin Exp $");
 
 #include 
 
@@ -155,11 +155,14 @@ main(int argc, char *argv[])
 
 		case 's': /* service */
 		case 'S': /* service (no SDP) */
-			for (ul = 0; strcasecmp(optarg, services[ul].type); ul++) {
-if (ul == __arraycount(services))
-	errx(EXIT_FAILURE, "%s: unknown service", optarg);
+			for (ul = 0; ul < __arraycount(services); ul++) {
+if (strcasecmp(optarg, services[ul].type) == 0)
+	break;
 			}
 
+			if (ul == __arraycount(services))
+errx(EXIT_FAILURE, "%s: unknown service", optarg);
+
 			if (ch == 's') {
 service_type = services[ul].type;
 service_name = services[ul].name;



CVS commit: [netbsd-9] src/usr.sbin/btpand

2024-06-26 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Jun 26 17:13:06 UTC 2024

Modified Files:
src/usr.sbin/btpand [netbsd-9]: btpand.c

Log Message:
Pull up following revision(s) (requested by plunky in ticket #1851):

usr.sbin/btpand/btpand.c: revision 1.9

Fix off-by-one bug in btpand

`ul` reaches `__arraycount(services)` before the bound-check happens, causing 
undefined behaviour.
from Dapeng Gao  via FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.26.1 src/usr.sbin/btpand/btpand.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-10] src/doc

2024-06-26 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Jun 26 17:12:36 UTC 2024

Modified Files:
src/doc [netbsd-10]: CHANGES-10.1

Log Message:
Ticket #727


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-10.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-10.1
diff -u src/doc/CHANGES-10.1:1.1.2.13 src/doc/CHANGES-10.1:1.1.2.14
--- src/doc/CHANGES-10.1:1.1.2.13	Sat Jun 22 18:33:21 2024
+++ src/doc/CHANGES-10.1	Wed Jun 26 17:12:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-10.1,v 1.1.2.13 2024/06/22 18:33:21 martin Exp $
+# $NetBSD: CHANGES-10.1,v 1.1.2.14 2024/06/26 17:12:36 martin Exp $
 
 A complete list of changes from the NetBSD 10.0 release on 2024-03-28
 until the 10.1 release:
@@ -569,4 +569,8 @@ sys/arch/xen/xen/xbdback_xenbus.c		upto 
 	This fixes a possible virtual disk corruption with linux domUs.
 	[bouyer, ticket #726]
 
+usr.sbin/btpand/btpand.c			1.9
+
+	btpand(8): fix off-by-one bug causing out of bounds memory access.
+	[plunky, ticket #727]
 



CVS commit: [netbsd-10] src/doc

2024-06-26 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Jun 26 17:12:36 UTC 2024

Modified Files:
src/doc [netbsd-10]: CHANGES-10.1

Log Message:
Ticket #727


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-10.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-10] src/usr.sbin/btpand

2024-06-26 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Jun 26 17:11:51 UTC 2024

Modified Files:
src/usr.sbin/btpand [netbsd-10]: btpand.c

Log Message:
Pull up following revision(s) (requested by plunky in ticket #727):

usr.sbin/btpand/btpand.c: revision 1.9

Fix off-by-one bug in btpand

`ul` reaches `__arraycount(services)` before the bound-check happens, causing 
undefined behaviour.
from Dapeng Gao  via FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 src/usr.sbin/btpand/btpand.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/btpand/btpand.c
diff -u src/usr.sbin/btpand/btpand.c:1.8 src/usr.sbin/btpand/btpand.c:1.8.2.1
--- src/usr.sbin/btpand/btpand.c:1.8	Wed May 18 13:56:32 2022
+++ src/usr.sbin/btpand/btpand.c	Wed Jun 26 17:11:51 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: btpand.c,v 1.8 2022/05/18 13:56:32 andvar Exp $	*/
+/*	$NetBSD: btpand.c,v 1.8.2.1 2024/06/26 17:11:51 martin Exp $	*/
 
 /*-
  * Copyright (c) 2008-2009 Iain Hibbert
@@ -27,7 +27,7 @@
 
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2008-2009 Iain Hibbert. All rights reserved.");
-__RCSID("$NetBSD: btpand.c,v 1.8 2022/05/18 13:56:32 andvar Exp $");
+__RCSID("$NetBSD: btpand.c,v 1.8.2.1 2024/06/26 17:11:51 martin Exp $");
 
 #include 
 
@@ -155,11 +155,14 @@ main(int argc, char *argv[])
 
 		case 's': /* service */
 		case 'S': /* service (no SDP) */
-			for (ul = 0; strcasecmp(optarg, services[ul].type); ul++) {
-if (ul == __arraycount(services))
-	errx(EXIT_FAILURE, "%s: unknown service", optarg);
+			for (ul = 0; ul < __arraycount(services); ul++) {
+if (strcasecmp(optarg, services[ul].type) == 0)
+	break;
 			}
 
+			if (ul == __arraycount(services))
+errx(EXIT_FAILURE, "%s: unknown service", optarg);
+
 			if (ch == 's') {
 service_type = services[ul].type;
 service_name = services[ul].name;



CVS commit: [netbsd-10] src/usr.sbin/btpand

2024-06-26 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Jun 26 17:11:51 UTC 2024

Modified Files:
src/usr.sbin/btpand [netbsd-10]: btpand.c

Log Message:
Pull up following revision(s) (requested by plunky in ticket #727):

usr.sbin/btpand/btpand.c: revision 1.9

Fix off-by-one bug in btpand

`ul` reaches `__arraycount(services)` before the bound-check happens, causing 
undefined behaviour.
from Dapeng Gao  via FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 src/usr.sbin/btpand/btpand.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/common/bootimage

2024-06-26 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Jun 26 09:13:47 UTC 2024

Modified Files:
src/distrib/common/bootimage: Makefile.bootimage

Log Message:
Now that we label GPT partitions, adjust the generated fdisk to match.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/common/bootimage/Makefile.bootimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.40 src/distrib/common/bootimage/Makefile.bootimage:1.41
--- src/distrib/common/bootimage/Makefile.bootimage:1.40	Tue Jun 25 09:07:14 2024
+++ src/distrib/common/bootimage/Makefile.bootimage	Wed Jun 26 09:13:47 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootimage,v 1.40 2024/06/25 09:07:14 martin Exp $
+#	$NetBSD: Makefile.bootimage,v 1.41 2024/06/26 09:13:47 martin Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -330,12 +330,12 @@ ${WORKFSTAB}:
 .if ${USE_GPT} != "no"
 .  if ${SWAPSECTORS} != 0
 	${TOOL_SED}			\
-	-e "s/ROOT.a/NAME=${BOOTDISK_UUID}/"			\
-	-e "s/ROOT.b/NAME=${SWAPDISK_UUID}/"			\
+	-e "s/ROOT.a/NAME=NBImgRoot/"\
+	-e "s/ROOT.b/NAME=NBImgSwap/"\
 	< ${FSTAB_IN} > ${WORKFSTAB}
 .  else
 	${TOOL_SED}			\
-	-e "s/ROOT.a/NAME=${BOOTDISK_UUID}/"			\
+	-e "s/ROOT.a/NAME=NBImgRoot/"\
 	-e "/ROOT.b/d"		\
 	< ${FSTAB_IN} > ${WORKFSTAB}
 .  endif
@@ -550,7 +550,7 @@ ${WORKMBR}:
 	${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${EFISECTORS} -t efi -l "EFI system"
 	${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${FSSECTORS} -t ffs -l "NBImgRoot"
 .  if ${SWAPSECTORS} != 0
-	${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
+	${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap -l "NBImgSwap"
 .  endif
 .elif ${USE_MBR} != "no"
 	@echo creating MBR labels...



CVS commit: src/distrib/common/bootimage

2024-06-26 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Jun 26 09:13:47 UTC 2024

Modified Files:
src/distrib/common/bootimage: Makefile.bootimage

Log Message:
Now that we label GPT partitions, adjust the generated fdisk to match.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/common/bootimage/Makefile.bootimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.