CVS commit: src/sys/arch/evbppc/wii/dev

2024-02-05 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Feb  5 23:48:35 UTC 2024

Modified Files:
src/sys/arch/evbppc/wii/dev: wiifb.c

Log Message:
wiifb: Misc fixes.

Add a 16-pixel border on the top and bottom of the FB, and fix an error
path to properly blink the slot LED when the current video mode is not
supported.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/wii/dev/wiifb.c

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

Modified files:

Index: src/sys/arch/evbppc/wii/dev/wiifb.c
diff -u src/sys/arch/evbppc/wii/dev/wiifb.c:1.5 src/sys/arch/evbppc/wii/dev/wiifb.c:1.6
--- src/sys/arch/evbppc/wii/dev/wiifb.c:1.5	Sat Jan 27 17:44:37 2024
+++ src/sys/arch/evbppc/wii/dev/wiifb.c	Mon Feb  5 23:48:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wiifb.c,v 1.5 2024/01/27 17:44:37 hgutch Exp $ */
+/* $NetBSD: wiifb.c,v 1.6 2024/02/05 23:48:35 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2024 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wiifb.c,v 1.5 2024/01/27 17:44:37 hgutch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wiifb.c,v 1.6 2024/02/05 23:48:35 jmcneill Exp $");
 
 #include 
 #include 
@@ -43,7 +43,14 @@ __KERNEL_RCSID(0, "$NetBSD: wiifb.c,v 1.
 #include "vireg.h"
 #include "viio.h"
 
-#define	WIIFB_ERROR_BLINK_INTERVAL	100
+#define WIIFB_ERROR_BLINK_INTERVAL	100
+
+#define WIIFB_TOP_BOTTOM_BORDER		16
+#define WIIFB_EFFECTIVE_START(p, w)	\
+	((uintptr_t)(p) + WIIFB_TOP_BOTTOM_BORDER * (w) * 2)
+#define WIIFB_EFFECTIVE_HEIGHT(h)	\
+	((h) - WIIFB_TOP_BOTTOM_BORDER * 2)
+
 
 struct wiifb_mode {
 	const char *		name;
@@ -151,6 +158,8 @@ wiifb_attach(device_t parent, device_t s
 	struct wiifb_softc *sc = device_private(self);
 	prop_dictionary_t dict = device_properties(self);
 	struct mainbus_attach_args *maa = aux;
+	u_int offset;
+	uint32_t *p;
 	int error;
 
 	sc->sc_gen.sc_dev = self;
@@ -162,15 +171,26 @@ wiifb_attach(device_t parent, device_t s
 	}
 	sc->sc_bits = mapiodev(XFB_START, XFB_SIZE, true);
 
+	/*
+	 * Paint the entire FB black. Use 4-byte accesses as the Wii will
+	 * ignore 1- and 2- byte writes to uncached memory.
+	 */
+	for (p = sc->sc_bits, offset = 0;
+	 offset < XFB_SIZE;
+	 offset += 4, p++) {
+		*p = 0x00800080;
+	}
+
 	wiifb_init(sc);
 	wiifb_set_mode(sc, sc->sc_format, sc->sc_interlaced);
 
 	prop_dictionary_set_uint32(dict, "width", sc->sc_curmode->width);
-	prop_dictionary_set_uint32(dict, "height", sc->sc_curmode->height);
+	prop_dictionary_set_uint32(dict, "height",
+	WIIFB_EFFECTIVE_HEIGHT(sc->sc_curmode->height));
 	prop_dictionary_set_uint8(dict, "depth", 16);
 	prop_dictionary_set_uint32(dict, "address", XFB_START);
 	prop_dictionary_set_uint32(dict, "virtual_address",
-	(uintptr_t)sc->sc_bits);
+	WIIFB_EFFECTIVE_START(sc->sc_bits, sc->sc_curmode->width));
 	prop_dictionary_set_uint64(dict, "devcmap", (uintptr_t)wiifb_devcmap);
 
 	genfb_init(>sc_gen);
@@ -212,12 +232,6 @@ wiifb_set_mode(struct wiifb_softc *sc, u
 	u_int strides, reads;
 
 	modeidx = WIIFB_MODE_INDEX(format, interlaced);
-	if (modeidx >= WIIFB_NMODES || wiifb_modes[modeidx].name == NULL) {
-		panic("Unsupported format (0x%x) / interlaced (%d) settings",
-		sc->sc_format, sc->sc_interlaced);
-	}
-	sc->sc_curmode = _modes[modeidx];
-
 	if (modeidx == WIIFB_MODE_INDEX(VI_DCR_FMT_NTSC, 1)) {
 		/* NTSC 480i Magic numbers from YAGCD. */
 		WR2(sc, VI_VTR, 0x0f06);
@@ -253,6 +267,12 @@ wiifb_set_mode(struct wiifb_softc *sc, u
 		wii_slot_led_blink(WIIFB_ERROR_BLINK_INTERVAL);
 	}
 
+	if (modeidx >= WIIFB_NMODES || wiifb_modes[modeidx].name == NULL) {
+		panic("Unsupported format (0x%x) / interlaced (%d) settings",
+		sc->sc_format, sc->sc_interlaced);
+	}
+	sc->sc_curmode = _modes[modeidx];
+
 	/* Picture configuration */
 	strides = (sc->sc_curmode->width * 2) / (interlaced ? 16 : 32);
 	reads = (sc->sc_curmode->width * 2) / 32;
@@ -322,11 +342,12 @@ wiifb_ioctl(void *v, void *vs, u_long cm
 		 * devcmap, so fill out fbinfo manually instead of relying
 		 * on wsdisplayio_get_fbinfo.
 		 */
-		fbi->fbi_fbsize = XFB_SIZE;
 		fbi->fbi_fboffset = 0;
 		fbi->fbi_width = sc->sc_curmode->width;
-		fbi->fbi_height = sc->sc_curmode->height;
+		fbi->fbi_height =
+		WIIFB_EFFECTIVE_HEIGHT(sc->sc_curmode->height);
 		fbi->fbi_stride = fbi->fbi_width * 2;
+		fbi->fbi_fbsize = fbi->fbi_height * fbi->fbi_stride;
 		fbi->fbi_bitsperpixel = 16;
 		fbi->fbi_pixeltype = WSFB_YUY2;
 		fbi->fbi_flags = WSFB_VRAM_IS_RAM;
@@ -384,11 +405,17 @@ static paddr_t
 wiifb_mmap(void *v, void *vs, off_t off, int prot)
 {
 	struct wiifb_softc *sc = v;
+	bus_addr_t start;
+	bus_size_t size;
+
+	start = WIIFB_EFFECTIVE_START(XFB_START, sc->sc_curmode->width);
+	size = WIIFB_EFFECTIVE_HEIGHT(sc->sc_curmode->height) *
+	   sc->sc_curmode->width * 2;
 
-	if (off < 0 || off >= XFB_SIZE) {
+	if (off < 0 || off >= size) {
 		return -1;
 	}
 
-	return 

CVS commit: src/sys/arch/evbppc/wii/dev

2024-02-05 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Feb  5 23:48:35 UTC 2024

Modified Files:
src/sys/arch/evbppc/wii/dev: wiifb.c

Log Message:
wiifb: Misc fixes.

Add a 16-pixel border on the top and bottom of the FB, and fix an error
path to properly blink the slot LED when the current video mode is not
supported.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/wii/dev/wiifb.c

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



CVS commit: src/usr.bin/xlint/lint1

2024-02-05 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Mon Feb  5 23:11:23 UTC 2024

Modified Files:
src/usr.bin/xlint/lint1: README.md cgram.y ckctype.c ckgetopt.c debug.c
emit1.c externs1.h lint1.h op.h oper.c tree.c

Log Message:
lint: make function call arguments directly accessible

Previously, the arguments of a function call expression were arranged in
a linear tree structure, from right to left.  To allow easier access to
the arguments, store them in an array instead.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/xlint/lint1/README.md \
src/usr.bin/xlint/lint1/oper.c
cvs rdiff -u -r1.486 -r1.487 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/xlint/lint1/ckctype.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/xlint/lint1/ckgetopt.c
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/xlint/lint1/debug.c
cvs rdiff -u -r1.85 -r1.86 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.215 -r1.216 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.213 -r1.214 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/xlint/lint1/op.h
cvs rdiff -u -r1.602 -r1.603 src/usr.bin/xlint/lint1/tree.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.bin/xlint/lint1/README.md
diff -u src/usr.bin/xlint/lint1/README.md:1.14 src/usr.bin/xlint/lint1/README.md:1.15
--- src/usr.bin/xlint/lint1/README.md:1.14	Thu Sep 14 21:08:12 2023
+++ src/usr.bin/xlint/lint1/README.md	Mon Feb  5 23:11:22 2024
@@ -1,4 +1,4 @@
-[//]: # ($NetBSD: README.md,v 1.14 2023/09/14 21:08:12 rillig Exp $)
+[//]: # ($NetBSD: README.md,v 1.15 2024/02/05 23:11:22 rillig Exp $)
 
 # Introduction
 
@@ -123,34 +123,31 @@ structure:
 
 ~~~text
  1: 'call' type 'int'
- 2:  '&' type 'pointer to function(pointer to const char, pointer to const char) returning int'
- 3:'name' 'strcmp' with extern 'function(pointer to const char, pointer to const char) returning int'
- 4:  'push' type 'pointer to const char'
- 5:'convert' type 'pointer to const char'
- 6:  '&' type 'pointer to char'
- 7:'string' type 'array[5] of char', lvalue, length 4, "name"
- 8:'push' type 'pointer to const char'
- 9:  'load' type 'pointer to const char'
-10:'*' type 'pointer to const char', lvalue
-11:  '+' type 'pointer to pointer to const char'
-12:'load' type 'pointer to pointer to const char'
-13:  'name' 'names' with auto 'pointer to pointer to const char', lvalue
-14:'*' type 'long'
-15:  'convert' type 'long'
-16:'load' type 'int'
-17:  'name' 'i' with auto 'int', lvalue
-18:  'constant' type 'long', value 8
+ 2:   '&' type 'pointer to function(pointer to const char, pointer to const char) returning int'
+ 3: 'name' 'strcmp' with extern 'function(pointer to const char, pointer to const char) returning int'
+ 4:   'load' type 'pointer to const char'
+ 5: '*' type 'pointer to const char', lvalue
+ 6:   '+' type 'pointer to pointer to const char'
+ 7: 'load' type 'pointer to pointer to const char'
+ 8:   'name' 'names' with auto 'pointer to pointer to const char', lvalue
+ 9: '*' type 'long'
+10:   'convert' type 'long'
+11: 'load' type 'int'
+12:   'name' 'i' with auto 'int', lvalue
+13:   'constant' type 'long', value 8
+14:   'convert' type 'pointer to const char'
+15: '&' type 'pointer to char'
+16:   'string' type 'array[5] of char', lvalue, "name"
 ~~~
 
-| Lines  | Notes|
-||--|
-| 4, 8   | Each argument of the function call corresponds to a `PUSH` node. |
-| 5, 9   | The left operand of a `PUSH` node is the actual argument.|
-| 8  | The right operand is the `PUSH` node of the previous argument.   |
-| 5, 9   | The arguments of a call are ordered from right to left.  |
-| 10, 11 | Array access is represented as `*(left + right)`.|
-| 14, 18 | Array and struct offsets are in premultiplied form.  |
-| 18 | The size of a pointer on this platform is 8 bytes.   |
+| Lines  | Notes   |
+||-|
+| 1, 2, 4, 7 | A function call consists of the function and its arguments. |
+| 4, 14  | The arguments of a call are ordered from left to right. |
+| 5, 6   | Array access is represented as `*(left + right)`.   |
+| 9, 13  | Array and struct offsets are in premultiplied form. |
+| 9  | The type `ptrdiff_t` on this platform is `long`, not `int`. |
+| 13 | The size of a pointer on this platform is 8 bytes.  |
 
 See `debug_node` for how to 

CVS commit: src/usr.bin/xlint/lint1

2024-02-05 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Mon Feb  5 23:11:23 UTC 2024

Modified Files:
src/usr.bin/xlint/lint1: README.md cgram.y ckctype.c ckgetopt.c debug.c
emit1.c externs1.h lint1.h op.h oper.c tree.c

Log Message:
lint: make function call arguments directly accessible

Previously, the arguments of a function call expression were arranged in
a linear tree structure, from right to left.  To allow easier access to
the arguments, store them in an array instead.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/xlint/lint1/README.md \
src/usr.bin/xlint/lint1/oper.c
cvs rdiff -u -r1.486 -r1.487 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/xlint/lint1/ckctype.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/xlint/lint1/ckgetopt.c
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/xlint/lint1/debug.c
cvs rdiff -u -r1.85 -r1.86 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.215 -r1.216 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.213 -r1.214 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/xlint/lint1/op.h
cvs rdiff -u -r1.602 -r1.603 src/usr.bin/xlint/lint1/tree.c

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



CVS commit: src/sys/dev/usb

2024-02-05 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Feb  5 23:07:42 UTC 2024

Modified Files:
src/sys/dev/usb: ehcireg.h

Log Message:
Ensure proper alignment/padding of EHCI hardware descriptors.

These descriptor structs are embedded in structs that contain additional
context for software. With a non cache coherent device and non-padded
descriptors, the device may issue a read/modify/write past the end of
the descriptor, clobbering software state in the process. This was the
root cause of multiple crashes on evbppc with a non cache coherent EHCI.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/usb/ehcireg.h

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



CVS commit: src/sys/dev/usb

2024-02-05 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Feb  5 23:07:42 UTC 2024

Modified Files:
src/sys/dev/usb: ehcireg.h

Log Message:
Ensure proper alignment/padding of EHCI hardware descriptors.

These descriptor structs are embedded in structs that contain additional
context for software. With a non cache coherent device and non-padded
descriptors, the device may issue a read/modify/write past the end of
the descriptor, clobbering software state in the process. This was the
root cause of multiple crashes on evbppc with a non cache coherent EHCI.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/usb/ehcireg.h

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

Modified files:

Index: src/sys/dev/usb/ehcireg.h
diff -u src/sys/dev/usb/ehcireg.h:1.37 src/sys/dev/usb/ehcireg.h:1.38
--- src/sys/dev/usb/ehcireg.h:1.37	Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/ehcireg.h	Mon Feb  5 23:07:42 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehcireg.h,v 1.37 2016/04/23 10:15:31 skrll Exp $	*/
+/*	$NetBSD: ehcireg.h,v 1.38 2024/02/05 23:07:42 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -203,6 +203,7 @@ typedef uint32_t ehci_isoc_trans_t;
 typedef uint32_t ehci_isoc_bufr_ptr_t;
 
 /* Isochronous Transfer Descriptor */
+#define EHCI_ITD_ALIGN 32
 #define EHCI_ITD_NUFRAMES USB_UFRAMES_PER_FRAME
 #define EHCI_ITD_NBUFFERS 7
 typedef struct {
@@ -247,10 +248,10 @@ typedef struct {
 #define EHCI_ITD_GET_MULTI(x)	__SHIFTOUT((x), EHCI_ITD_MULTI_MASK)
 #define EHCI_ITD_SET_MULTI(x)	__SHIFTIN((x), EHCI_ITD_MULTI_MASK)
 	volatile ehci_isoc_bufr_ptr_t	itd_bufr_hi[EHCI_ITD_NBUFFERS];
-} ehci_itd_t;
-#define EHCI_ITD_ALIGN 32
+} __aligned(EHCI_ITD_ALIGN) ehci_itd_t;
 
 /* Split Transaction Isochronous Transfer Descriptor */
+#define EHCI_SITD_ALIGN 32
 typedef struct {
 	volatile ehci_link_t	sitd_next;
 	volatile uint32_t	sitd_endp;
@@ -294,12 +295,12 @@ typedef struct {
 
 	volatile ehci_link_t	sitd_back;
 	volatile uint32_t	sitd_buffer_hi[EHCI_SITD_BUFFERS];
-} ehci_sitd_t;
-#define EHCI_SITD_ALIGN 32
+} __aligned(EHCI_SITD_ALIGN) ehci_sitd_t;
 
 /* Queue Element Transfer Descriptor */
 #define EHCI_QTD_NBUFFERS	5
 #define EHCI_QTD_MAXTRANSFER	(EHCI_QTD_NBUFFERS * EHCI_PAGE_SIZE)
+#define EHCI_QTD_ALIGN 32
 typedef struct {
 	volatile ehci_link_t	qtd_next;
 	volatile ehci_link_t	qtd_altnext;
@@ -338,10 +339,10 @@ typedef struct {
 #define	EHCI_QTD_SET_TOGGLE(x)	__SHIFTIN((x), EHCI_QTD_TOGGLE_MASK)
 	volatile ehci_physaddr_t qtd_buffer[EHCI_QTD_NBUFFERS];
 	volatile ehci_physaddr_t qtd_buffer_hi[EHCI_QTD_NBUFFERS];
-} ehci_qtd_t;
-#define EHCI_QTD_ALIGN 32
+} __aligned(EHCI_QTD_ALIGN) ehci_qtd_t;
 
 /* Queue Head */
+#define EHCI_QH_ALIGN 32
 typedef struct {
 	volatile ehci_link_t	qh_link;
 	volatile uint32_t	qh_endp;
@@ -388,16 +389,26 @@ typedef struct {
 #define EHCI_QH_GET_MULT(x)	__SHIFTOUT((x), EHCI_QH_MULTI_MASK)
 #define EHCI_QH_SET_MULT(x)	__SHIFTIN((x), EHCI_QH_MULTI_MASK)
 	volatile ehci_link_t	qh_curqtd;
-	ehci_qtd_t		qh_qtd;
-} ehci_qh_t;
-#define EHCI_QH_ALIGN 32
+	/*
+	 * The QH descriptor contains a TD overlay, but it is not
+	 * 32-byte aligned, so declare the fields instead of embedding
+	 * a ehci_qtd_t directly.
+	 */
+	struct {
+		volatile ehci_link_t	qtd_next;
+		volatile ehci_link_t	qtd_altnext;
+		volatile uint32_t	qtd_status;
+		volatile ehci_physaddr_t qtd_buffer[EHCI_QTD_NBUFFERS];
+		volatile ehci_physaddr_t qtd_buffer_hi[EHCI_QTD_NBUFFERS];
+	} qh_qtd;
+} __aligned(EHCI_QH_ALIGN) ehci_qh_t;
 
 /* Periodic Frame Span Traversal Node */
+#define EHCI_FSTN_ALIGN 32
 typedef struct {
 	volatile ehci_link_t	fstn_link;
 	volatile ehci_link_t	fstn_back;
-} ehci_fstn_t;
-#define EHCI_FSTN_ALIGN 32
+} __aligned(EHCI_FSTN_ALIGN) ehci_fstn_t;
 
 /* Debug Port */
 #define PCI_CAP_DEBUGPORT_OFFSET __BITS(28,16)



CVS commit: src/sys/dev/usb

2024-02-05 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Feb  5 23:04:18 UTC 2024

Modified Files:
src/sys/dev/usb: ehci.c

Log Message:
Fix DMA sync flags in ehci_append_sqtd


To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 src/sys/dev/usb/ehci.c

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



CVS commit: src/sys/dev/usb

2024-02-05 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Feb  5 23:04:18 UTC 2024

Modified Files:
src/sys/dev/usb: ehci.c

Log Message:
Fix DMA sync flags in ehci_append_sqtd


To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 src/sys/dev/usb/ehci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.320 src/sys/dev/usb/ehci.c:1.321
--- src/sys/dev/usb/ehci.c:1.320	Sun Feb  4 05:43:06 2024
+++ src/sys/dev/usb/ehci.c	Mon Feb  5 23:04:18 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.320 2024/02/04 05:43:06 mrg Exp $ */
+/*	$NetBSD: ehci.c,v 1.321 2024/02/05 23:04:18 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.320 2024/02/04 05:43:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.321 2024/02/05 23:04:18 jmcneill Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -3065,7 +3065,7 @@ ehci_append_sqtd(ehci_soft_qtd_t *sqtd, 
 		prev->qtd.qtd_next = htole32(sqtd->physaddr);
 		prev->qtd.qtd_altnext = prev->qtd.qtd_next;
 		usb_syncmem(>dma, prev->offs, sizeof(prev->qtd),
-		BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
+		BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	}
 }
 



CVS commit: src/sys

2024-02-05 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Feb  5 22:18:18 UTC 2024

Modified Files:
src/sys/arch/next68k/stand/boot: scsi.c
src/sys/arch/pmax/pmax: locore_machdep.S
src/sys/dev/pci: twareg.h
src/sys/dev/qbus: tsreg.h

Log Message:
s/bufffer/buffer/ in comments and log message.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/next68k/stand/boot/scsi.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/pmax/pmax/locore_machdep.S
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/twareg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/qbus/tsreg.h

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

Modified files:

Index: src/sys/arch/next68k/stand/boot/scsi.c
diff -u src/sys/arch/next68k/stand/boot/scsi.c:1.14 src/sys/arch/next68k/stand/boot/scsi.c:1.15
--- src/sys/arch/next68k/stand/boot/scsi.c:1.14	Sun Feb 12 10:04:56 2023
+++ src/sys/arch/next68k/stand/boot/scsi.c	Mon Feb  5 22:18:17 2024
@@ -1,4 +1,4 @@
-/*  $NetBSD: scsi.c,v 1.14 2023/02/12 10:04:56 tsutsui Exp $*/
+/*  $NetBSD: scsi.c,v 1.15 2024/02/05 22:18:17 andvar Exp $*/
 /*
  * Copyright (c) 1994, 1997 Rolf Grossmann
  * All rights reserved.
@@ -357,7 +357,7 @@ dma_start(char *addr, int len)
 
 PRINTF(("DMA start: %lx, %d byte.\n", (long)addr, len));
 
-DPRINTF(("dma_bufffer: start: 0x%lx end: 0x%lx \n",
+DPRINTF(("dma_buffer: start: 0x%lx end: 0x%lx \n",
 (long)dma_buffer,(long)DMA_ENDALIGN(char *, dma_buffer+len)));
 
 sc->dma_addr = addr;

Index: src/sys/arch/pmax/pmax/locore_machdep.S
diff -u src/sys/arch/pmax/pmax/locore_machdep.S:1.25 src/sys/arch/pmax/pmax/locore_machdep.S:1.26
--- src/sys/arch/pmax/pmax/locore_machdep.S:1.25	Mon Mar 28 14:40:00 2011
+++ src/sys/arch/pmax/pmax/locore_machdep.S	Mon Feb  5 22:18:17 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_machdep.S,v 1.25 2011/03/28 14:40:00 tsutsui Exp $	*/
+/*	$NetBSD: locore_machdep.S,v 1.26 2024/02/05 22:18:17 andvar Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -68,7 +68,7 @@
  * Copy data to a DMA buffer padded with 16 bits of data, 16
  * bits of padding per 32bit word (e.g., for pmin/pmax sii DMA).
  *
- * The DMA bufffer can only be written one short at a time
+ * The DMA buffer can only be written one short at a time
  * (and takes ~14 cycles).
  *
  *	CopyToBuffer(src, dst, length)
@@ -93,7 +93,7 @@ END(CopyToBuffer)
 
 /*
  * Copy data from the DMA buffer.
- * The DMA bufffer can only be read one short at a time
+ * The DMA buffer can only be read one short at a time
  * (and takes ~12 cycles).
  *
  *	CopyFromBuffer(src, dst, length)

Index: src/sys/dev/pci/twareg.h
diff -u src/sys/dev/pci/twareg.h:1.11 src/sys/dev/pci/twareg.h:1.12
--- src/sys/dev/pci/twareg.h:1.11	Mon Nov 22 23:02:16 2010
+++ src/sys/dev/pci/twareg.h	Mon Feb  5 22:18:17 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: twareg.h,v 1.11 2010/11/22 23:02:16 dholland Exp $ */
+/*	$NetBSD: twareg.h,v 1.12 2024/02/05 22:18:17 andvar Exp $ */
 /*	$wasabi: twareg.h,v 1.14 2006/07/28 18:29:51 wrstuden Exp $ */
 
 /*-
@@ -226,7 +226,7 @@
 #define TWA_MAX_ATA_SG_ELEMENTS		60
 #define TWA_Q_LENGTH			TWA_INIT_MESSAGE_CREDITS
 #define TWA_MAX_RESET_TRIES		3
-#define TWA_SECTOR_SIZE			0x200	/* generic I/O bufffer */
+#define TWA_SECTOR_SIZE			0x200	/* generic I/O buffer */
 #define TWA_SENSE_DATA_LENGTH		18
 #define TWA_MICROSECOND 100
 #define TWA_ERROR_LOGICAL_UNIT_NOT_SUPPORTED	0x010a

Index: src/sys/dev/qbus/tsreg.h
diff -u src/sys/dev/qbus/tsreg.h:1.5 src/sys/dev/qbus/tsreg.h:1.6
--- src/sys/dev/qbus/tsreg.h:1.5	Mon May 22 17:22:29 2017
+++ src/sys/dev/qbus/tsreg.h	Mon Feb  5 22:18:18 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsreg.h,v 1.5 2017/05/22 17:22:29 ragge Exp $ */
+/*	$NetBSD: tsreg.h,v 1.6 2024/02/05 22:18:18 andvar Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -33,7 +33,7 @@
  * The TSV05 Subsystem has four device registers that occupy only two
  * LSI-11 Bus word locations: a Data Buffer (TSDB), a Bus Address
  * Register (TSBA), a Status Register (TSSR), and an Extended Data
- * Bufffer (TSDBX). The TSDB is an 18-bit register that is ...
+ * Buffer (TSDBX). The TSDB is an 18-bit register that is ...
  */
 
 #ifdef notdef



CVS commit: src/sys

2024-02-05 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Feb  5 22:18:18 UTC 2024

Modified Files:
src/sys/arch/next68k/stand/boot: scsi.c
src/sys/arch/pmax/pmax: locore_machdep.S
src/sys/dev/pci: twareg.h
src/sys/dev/qbus: tsreg.h

Log Message:
s/bufffer/buffer/ in comments and log message.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/next68k/stand/boot/scsi.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/pmax/pmax/locore_machdep.S
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/twareg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/qbus/tsreg.h

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



CVS commit: src

2024-02-05 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Feb  5 22:08:05 UTC 2024

Modified Files:
src/sbin/restore: tape.c
src/sys/arch/acorn32/podulebus: if_ie.c
src/sys/arch/alpha/alpha: db_interface.c genassym.cf
src/sys/arch/dreamcast/dreamcast: machdep.c
src/sys/arch/evbarm/dev: plcomreg.h
src/sys/arch/evbsh3/evbsh3: machdep.c
src/sys/arch/hpcsh/hpcsh: machdep.c
src/sys/arch/mmeye/mmeye: machdep.c
src/sys/arch/pmax/pmax: dec_3maxplus.c
src/sys/dev/ic: interwave.c tulipreg.h
src/sys/dev/pci: if_bnxreg.h

Log Message:
triple "r" typos, mainly s/interrrupt/interrupt/ in comments and one definition.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sbin/restore/tape.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/alpha/alpha/db_interface.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/alpha/genassym.cf
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/dreamcast/dreamcast/machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/dev/plcomreg.h
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/evbsh3/evbsh3/machdep.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/hpcsh/hpcsh/machdep.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/mmeye/mmeye/machdep.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/pmax/pmax/dec_3maxplus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/ic/interwave.c \
src/sys/dev/ic/tulipreg.h
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/if_bnxreg.h

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

Modified files:

Index: src/sbin/restore/tape.c
diff -u src/sbin/restore/tape.c:1.74 src/sbin/restore/tape.c:1.75
--- src/sbin/restore/tape.c:1.74	Mon Dec 12 16:53:30 2022
+++ src/sbin/restore/tape.c	Mon Feb  5 22:08:04 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: tape.c,v 1.74 2022/12/12 16:53:30 chs Exp $	*/
+/*	$NetBSD: tape.c,v 1.75 2024/02/05 22:08:04 andvar Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: tape.c,v 1.74 2022/12/12 16:53:30 chs Exp $");
+__RCSID("$NetBSD: tape.c,v 1.75 2024/02/05 22:08:04 andvar Exp $");
 #endif
 #endif /* not lint */
 
@@ -377,7 +377,7 @@ setup(void)
  * Prompt user to load a new dump volume.
  * "Nextvol" is the next suggested volume to use.
  * This suggested volume is enforced when doing full
- * or incremental restores, but can be overrridden by
+ * or incremental restores, but can be overridden by
  * the user when only extracting a subset of the files.
  */
 void

Index: src/sys/arch/acorn32/podulebus/if_ie.c
diff -u src/sys/arch/acorn32/podulebus/if_ie.c:1.54 src/sys/arch/acorn32/podulebus/if_ie.c:1.55
--- src/sys/arch/acorn32/podulebus/if_ie.c:1.54	Wed Dec 20 06:13:59 2023
+++ src/sys/arch/acorn32/podulebus/if_ie.c	Mon Feb  5 22:08:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.54 2023/12/20 06:13:59 thorpej Exp $ */
+/* $NetBSD: if_ie.c,v 1.55 2024/02/05 22:08:04 andvar Exp $ */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.54 2023/12/20 06:13:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.55 2024/02/05 22:08:04 andvar Exp $");
 
 #define IGNORE_ETHER1_IDROM_CHECKSUM
 
@@ -1345,7 +1345,7 @@ ieintr(void *arg)
 if (in_intr == 1)
 	panic ( "ie: INTERRUPT REENTERED\n" );
 
-/* Clear the interrrupt */
+/* Clear the interrupt */
 ie_cli (sc);
 
 setpage(sc, IE_IBASE + IE_SCB_OFF );

Index: src/sys/arch/alpha/alpha/db_interface.c
diff -u src/sys/arch/alpha/alpha/db_interface.c:1.42 src/sys/arch/alpha/alpha/db_interface.c:1.43
--- src/sys/arch/alpha/alpha/db_interface.c:1.42	Wed Nov 22 01:58:02 2023
+++ src/sys/arch/alpha/alpha/db_interface.c	Mon Feb  5 22:08:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.42 2023/11/22 01:58:02 thorpej Exp $ */
+/* $NetBSD: db_interface.c,v 1.43 2024/02/05 22:08:04 andvar Exp $ */
 
 /*
  * Mach Operating System
@@ -54,7 +54,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.42 2023/11/22 01:58:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.43 2024/02/05 22:08:04 andvar Exp $");
 
 #include 
 #include 
@@ -220,7 +220,7 @@ ddb_trap(unsigned long a0, unsigned long
 
 	/*
 	 * Use SWPIPL directly; we want to avoid processing
-	 * software interrrupts when we go back.  Soft ints
+	 * software interrupts when we go back.  Soft ints
 	 * will be caught later, so not to worry.
 	 */
 	psl = alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH);

Index: src/sys/arch/alpha/alpha/genassym.cf
diff -u src/sys/arch/alpha/alpha/genassym.cf:1.30 src/sys/arch/alpha/alpha/genassym.cf:1.31
--- src/sys/arch/alpha/alpha/genassym.cf:1.30	Mon Jul 12 15:21:51 2021
+++ src/sys/arch/alpha/alpha/genassym.cf	Mon Feb  5 22:08:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.30 

CVS commit: src

2024-02-05 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Feb  5 22:08:05 UTC 2024

Modified Files:
src/sbin/restore: tape.c
src/sys/arch/acorn32/podulebus: if_ie.c
src/sys/arch/alpha/alpha: db_interface.c genassym.cf
src/sys/arch/dreamcast/dreamcast: machdep.c
src/sys/arch/evbarm/dev: plcomreg.h
src/sys/arch/evbsh3/evbsh3: machdep.c
src/sys/arch/hpcsh/hpcsh: machdep.c
src/sys/arch/mmeye/mmeye: machdep.c
src/sys/arch/pmax/pmax: dec_3maxplus.c
src/sys/dev/ic: interwave.c tulipreg.h
src/sys/dev/pci: if_bnxreg.h

Log Message:
triple "r" typos, mainly s/interrrupt/interrupt/ in comments and one definition.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sbin/restore/tape.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/alpha/alpha/db_interface.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/alpha/genassym.cf
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/dreamcast/dreamcast/machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/dev/plcomreg.h
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/evbsh3/evbsh3/machdep.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/hpcsh/hpcsh/machdep.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/mmeye/mmeye/machdep.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/pmax/pmax/dec_3maxplus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/ic/interwave.c \
src/sys/dev/ic/tulipreg.h
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/if_bnxreg.h

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



CVS commit: src/doc

2024-02-05 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Mon Feb  5 21:57:00 UTC 2024

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Notre tzdata update to 2024a


To generate a diff of this commit:
cvs rdiff -u -r1.1982 -r1.1983 src/doc/3RDPARTY
cvs rdiff -u -r1.3033 -r1.3034 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1982 src/doc/3RDPARTY:1.1983
--- src/doc/3RDPARTY:1.1982	Thu Feb  1 10:06:08 2024
+++ src/doc/3RDPARTY	Mon Feb  5 21:57:00 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1982 2024/02/01 10:06:08 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1983 2024/02/05 21:57:00 kre Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1429,8 +1429,8 @@ Location:	external/bsd/tradcpp
 Notes:
 
 Package:	tz
-Version:	tzcode2023d / tzdata2023dgtz
-Current Vers:	tzcode2023d / tzdata2023d
+Version:	tzcode2023d / tzdata2024agtz
+Current Vers:	tzcode2024a / tzdata2024a
 Maintainer:	Paul Eggert 
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.3033 src/doc/CHANGES:1.3034
--- src/doc/CHANGES:1.3033	Sat Feb  3 20:38:49 2024
+++ src/doc/CHANGES	Mon Feb  5 21:57:00 2024
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3033 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3034 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -256,3 +256,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0:
 	libm: Import more long double functions from FreeBSD.
 		[christos 20240121]
 	terminfo: Import 20231209 [christos 20240127]
+	tzdata: Updated to 2024a (using 2024agtz) [kre 20240205]



CVS commit: src/doc

2024-02-05 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Mon Feb  5 21:57:00 UTC 2024

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Notre tzdata update to 2024a


To generate a diff of this commit:
cvs rdiff -u -r1.1982 -r1.1983 src/doc/3RDPARTY
cvs rdiff -u -r1.3033 -r1.3034 src/doc/CHANGES

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



CVS commit: src/external/public-domain/tz

2024-02-05 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Mon Feb  5 21:52:39 UTC 2024

Modified Files:
src/external/public-domain/tz: tzdata2netbsd
src/external/public-domain/tz/dist: TZDATA_VERSION asia australasia
leap-seconds.list leapseconds version

Log Message:
Complete tzdata2024a update (using tzdata2024agtz) by fixing files that
the script manages to forget to handle.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/public-domain/tz/tzdata2netbsd
cvs rdiff -u -r1.36 -r1.37 src/external/public-domain/tz/dist/TZDATA_VERSION
cvs rdiff -u -r1.11 -r1.12 src/external/public-domain/tz/dist/asia \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/tz/dist/australasia
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/tz/dist/leap-seconds.list \
src/external/public-domain/tz/dist/leapseconds

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

Modified files:

Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.15 src/external/public-domain/tz/tzdata2netbsd:1.16
--- src/external/public-domain/tz/tzdata2netbsd:1.15	Wed Aug 17 14:32:34 2022
+++ src/external/public-domain/tz/tzdata2netbsd	Mon Feb  5 21:52:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.15 2022/08/17 14:32:34 kre Exp $
+# $NetBSD: tzdata2netbsd,v 1.16 2024/02/05 21:52:38 kre Exp $
 
 # For use by NetBSD developers when updating to new versions of tzdata.
 #
@@ -22,7 +22,7 @@ VERS_PATTERN='2[0-9][0-9][0-9][a-z]'
 # First in the late xx90's sometime, allow the new one by changing the leading
 # digit from a specific value to the class containing the current and
 # following values (eg: in 2098 or so, change '2' to be '[23]').
-# Tnen in the following early xx00's sometime, delete the class, and insert
+# Then in the following early xx00's sometime, delete the class, and
 # leave only the current value as valid (eg: in 3001 or 3002,
 # change '[23]' to be just '3'
 # Doing it this way helps guard against invalid specifications.
@@ -42,13 +42,20 @@ VERS_PATTERN='2[0-9][0-9][0-9][a-z]'
 # need to match those.
 # If that convention changes (as of date of writing, it has never been
 # exercised) then code changes below will be required.
+# Note it doesn't matter (here) if z is followed by aa or za
 
 DIST_HOST=ftp.iana.org
 DIST_PATH=tz
 DIST_FILES=releases
 
+GTZURL=https://github.com/JodaOrg/global-tz/releases/download
+
 EDITOR=${EDITOR:-vi}
-WORK_PFX=$(pwd)/update-work || fail "Cannot obtain PWD"
+
+TZBASE=$(pwd)	|| fail 'Cannot find myself ($PWD)'
+cd -P "$TZBASE"	|| fail "Cannot return home: ${TZBASE}"
+
+WORK_PFX=${TZBASE}/update-work
 UPDATE_FROM=${WORK_PFX}/updating.from.version
 
 usage()
@@ -58,7 +65,11 @@ usage()
 		" where a version-id is of the form x (eg: 2018c)" \
 		" or '' for new-version-id (to specify only the old)"  \
 		" and where new-version-id can have =fetch-version-id" \
-		" appended to specify fetching that version instead"
+		" appended to specify fetching that version instead" \
+		" where the 'fetch-version-id' can be omitted if it" \
+		" is \${new-version-id}gtz  - and simply using '=' means" \
+		" to work out the new-version-id but then use the gtz fork"
+
 	exit 2
 }
 
@@ -138,15 +149,29 @@ argparse()
 	case "$#" in
 	0|1)
 		# once we have obtained OLDVER once, never guess it again.
-		test -f "${UPDATE_FROM}" && OLDVER=$(cat "${UPDATE_FROM}") ||
+		if  [ -f "${UPDATE_FROM}" ]
+		then
+			OLDVER=$(cat "${UPDATE_FROM}")
+		elif [ -f dist/TZDATA_VERSION ]
+		then
+			OLDVER=$(cat dist/TZDATA_VERSION)
+		elif [ -f dist/version ]
+		then
+			OLDVER=$(cat dist/version)
+		fi
+		OLDVER=${OLDVER#tzdata}		# TZDATA_VERS is tzdata-X
+		OLDVER=${OLDVER#-}		# but the '-' is optional
+		OLDVERGTZ=${OLDVER}		# This would have been the cvs tag
+		OLDVER=${OLDVER%gtz}		# want the base version elsewhere
 
-		OLDVER=$(cat dist/version) || {
+		if [ -z "${OLDVER}" ]
+		then
 			printf >&2 '%s\n'  \
-			"Cannot determine current installed version"  \
-			"Specify it on the command line."  \
-			""
+			'Cannot determine current installed version'  \
+			'Specify it on the command line.'  \
+			''
 			usage
-		}
+		fi
 
 		valid_vers old "${OLDVER}" ||
 			fail "Calculated bad OLDVER, give as 2nd arg"
@@ -159,9 +184,12 @@ argparse()
 		;;
 	esac
 
+	GLOBAL=false
 	case "$#:$1" in
 	0: | 1: | 2: )
 		;;
+	1:=|2:=)
+		GLOBAL=true;;
 	1:=?*|2:=?*)	
 		valid_vers fetch "${1#=}" && FETCHVER="${1#=}" || usage
 		;;
@@ -179,19 +207,27 @@ argparse()
 
 	test -z "${NEWVER}" && get_curvers
 
-	test -z "${FETCHVER}" && FETCHVER=${NEWVER}
+	if [ -z "${FETCHVER}" ]
+	then
+		if $GLOBAL
+		then
+			FETCHVER=${NEWVER}gtz
+		else
+			FETCHVER=${NEWVER}
+		fi
+	fi
 
 	case "${FETCHVER}" in
 	*gtz)	GLOBAL=true;;
 	*)	GLOBAL=false;;
 	esac
 
-	test 

CVS commit: src/external/public-domain/tz

2024-02-05 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Mon Feb  5 21:52:39 UTC 2024

Modified Files:
src/external/public-domain/tz: tzdata2netbsd
src/external/public-domain/tz/dist: TZDATA_VERSION asia australasia
leap-seconds.list leapseconds version

Log Message:
Complete tzdata2024a update (using tzdata2024agtz) by fixing files that
the script manages to forget to handle.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/public-domain/tz/tzdata2netbsd
cvs rdiff -u -r1.36 -r1.37 src/external/public-domain/tz/dist/TZDATA_VERSION
cvs rdiff -u -r1.11 -r1.12 src/external/public-domain/tz/dist/asia \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/tz/dist/australasia
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/tz/dist/leap-seconds.list \
src/external/public-domain/tz/dist/leapseconds

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



CVS commit: src

2024-02-05 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Feb  5 21:46:07 UTC 2024

Modified Files:
src/common/include/rpc: xdr.h
src/include/arpa: nameser_compat.h
src/lib/libc/inet: inet_net_pton.c
src/lib/libresolv: dst_api.c
src/sbin/newfs_udf: udf_core.c
src/sys/arch/amiga/dev: zz9k_if.c
src/sys/arch/m68k/fpsp: decbin.sa
src/sys/arch/mac68k/mac68k: macrom.c
src/sys/arch/riscv/include: sysreg.h
src/sys/crypto/blowfish: bf_enc.c
src/sys/dev/ata: wd.c
src/sys/dev/ic: cd1190reg.h dp8390var.h hmereg.h
src/sys/dev/pci: if_ixl.c
src/sys/fs/nfs/common: nfs_commonsubs.c
src/sys/fs/nfs/server: nfs_nfsdserv.c
src/sys/net: if_ether.h
src/sys/nfs: nfs_socket.c
src/sys/uvm: uvm_object.h
src/usr.bin/crunch/crunchgen: crunchgen.c
src/usr.bin/find: function.c
src/usr.sbin/sdpd: service.c

Log Message:
fix various typos in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/include/rpc/xdr.h
cvs rdiff -u -r1.9 -r1.10 src/include/arpa/nameser_compat.h
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/inet/inet_net_pton.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libresolv/dst_api.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/newfs_udf/udf_core.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/zz9k_if.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/fpsp/decbin.sa
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/mac68k/mac68k/macrom.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/riscv/include/sysreg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/crypto/blowfish/bf_enc.c
cvs rdiff -u -r1.468 -r1.469 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/cd1190reg.h
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/dp8390var.h
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ic/hmereg.h
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/pci/if_ixl.c
cvs rdiff -u -r1.5 -r1.6 src/sys/fs/nfs/common/nfs_commonsubs.c
cvs rdiff -u -r1.4 -r1.5 src/sys/fs/nfs/server/nfs_nfsdserv.c
cvs rdiff -u -r1.90 -r1.91 src/sys/net/if_ether.h
cvs rdiff -u -r1.201 -r1.202 src/sys/nfs/nfs_socket.c
cvs rdiff -u -r1.39 -r1.40 src/sys/uvm/uvm_object.h
cvs rdiff -u -r1.95 -r1.96 src/usr.bin/crunch/crunchgen/crunchgen.c
cvs rdiff -u -r1.80 -r1.81 src/usr.bin/find/function.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sdpd/service.c

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

Modified files:

Index: src/common/include/rpc/xdr.h
diff -u src/common/include/rpc/xdr.h:1.2 src/common/include/rpc/xdr.h:1.3
--- src/common/include/rpc/xdr.h:1.2	Sun Jun 16 16:01:44 2019
+++ src/common/include/rpc/xdr.h	Mon Feb  5 21:46:04 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: xdr.h,v 1.2 2019/06/16 16:01:44 christos Exp $	*/
+/*	$NetBSD: xdr.h,v 1.3 2024/02/05 21:46:04 andvar Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -93,8 +93,8 @@ enum xdr_op {
 /*
  * The XDR handle.
  * Contains operation which is being applied to the stream,
- * an operations vector for the paticular implementation (e.g. see xdr_mem.c),
- * and two private fields for the use of the particular impelementation.
+ * an operations vector for the particular implementation (e.g. see xdr_mem.c),
+ * and two private fields for the use of the particular implementation.
  */
 typedef struct __rpc_xdr {
 	enum xdr_op	x_op;		/* operation; fast additional param */

Index: src/include/arpa/nameser_compat.h
diff -u src/include/arpa/nameser_compat.h:1.9 src/include/arpa/nameser_compat.h:1.10
--- src/include/arpa/nameser_compat.h:1.9	Thu Apr 21 04:03:54 2022
+++ src/include/arpa/nameser_compat.h	Mon Feb  5 21:46:05 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: nameser_compat.h,v 1.9 2022/04/21 04:03:54 gutteridge Exp $	*/
+/*	$NetBSD: nameser_compat.h,v 1.10 2024/02/05 21:46:05 andvar Exp $	*/
 
 /* Copyright (c) 1983, 1989
  *The Regents of the University of California.  All rights reserved.
@@ -64,7 +64,7 @@ typedef struct {
 			/* fields in third byte */
 	unsigned	qr: 1;		/*%< response flag */
 	unsigned	opcode: 4;	/*%< purpose of message */
-	unsigned	aa: 1;		/*%< authoritive answer */
+	unsigned	aa: 1;		/*%< authoritative answer */
 	unsigned	tc: 1;		/*%< truncated message */
 	unsigned	rd: 1;		/*%< recursion desired */
 			/* fields in fourth byte */
@@ -78,7 +78,7 @@ typedef struct {
 			/* fields in third byte */
 	unsigned	rd :1;		/*%< recursion desired */
 	unsigned	tc :1;		/*%< truncated message */
-	unsigned	aa :1;		/*%< authoritive answer */
+	unsigned	aa :1;		/*%< authoritative answer */
 	unsigned	opcode :4;	/*%< purpose of message */
 	unsigned	qr :1;		/*%< response flag */
 			/* fields in fourth byte */

Index: src/lib/libc/inet/inet_net_pton.c
diff -u src/lib/libc/inet/inet_net_pton.c:1.5 src/lib/libc/inet/inet_net_pton.c:1.6
--- src/lib/libc/inet/inet_net_pton.c:1.5	Thu Dec 13 08:44:11 2018
+++ src/lib/libc/inet/inet_net_pton.c	Mon Feb  5 21:46:05 2024
@@ -20,7 +20,7 @@
 #if 0
 

CVS commit: src

2024-02-05 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Feb  5 21:46:07 UTC 2024

Modified Files:
src/common/include/rpc: xdr.h
src/include/arpa: nameser_compat.h
src/lib/libc/inet: inet_net_pton.c
src/lib/libresolv: dst_api.c
src/sbin/newfs_udf: udf_core.c
src/sys/arch/amiga/dev: zz9k_if.c
src/sys/arch/m68k/fpsp: decbin.sa
src/sys/arch/mac68k/mac68k: macrom.c
src/sys/arch/riscv/include: sysreg.h
src/sys/crypto/blowfish: bf_enc.c
src/sys/dev/ata: wd.c
src/sys/dev/ic: cd1190reg.h dp8390var.h hmereg.h
src/sys/dev/pci: if_ixl.c
src/sys/fs/nfs/common: nfs_commonsubs.c
src/sys/fs/nfs/server: nfs_nfsdserv.c
src/sys/net: if_ether.h
src/sys/nfs: nfs_socket.c
src/sys/uvm: uvm_object.h
src/usr.bin/crunch/crunchgen: crunchgen.c
src/usr.bin/find: function.c
src/usr.sbin/sdpd: service.c

Log Message:
fix various typos in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/include/rpc/xdr.h
cvs rdiff -u -r1.9 -r1.10 src/include/arpa/nameser_compat.h
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/inet/inet_net_pton.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libresolv/dst_api.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/newfs_udf/udf_core.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/zz9k_if.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/fpsp/decbin.sa
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/mac68k/mac68k/macrom.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/riscv/include/sysreg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/crypto/blowfish/bf_enc.c
cvs rdiff -u -r1.468 -r1.469 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/cd1190reg.h
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/dp8390var.h
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ic/hmereg.h
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/pci/if_ixl.c
cvs rdiff -u -r1.5 -r1.6 src/sys/fs/nfs/common/nfs_commonsubs.c
cvs rdiff -u -r1.4 -r1.5 src/sys/fs/nfs/server/nfs_nfsdserv.c
cvs rdiff -u -r1.90 -r1.91 src/sys/net/if_ether.h
cvs rdiff -u -r1.201 -r1.202 src/sys/nfs/nfs_socket.c
cvs rdiff -u -r1.39 -r1.40 src/sys/uvm/uvm_object.h
cvs rdiff -u -r1.95 -r1.96 src/usr.bin/crunch/crunchgen/crunchgen.c
cvs rdiff -u -r1.80 -r1.81 src/usr.bin/find/function.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sdpd/service.c

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



CVS commit: src

2024-02-05 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Feb  5 21:39:52 UTC 2024

Modified Files:
src/distrib/notes/common: macros
src/sbin/rcorder: rcorder.c
src/sys/arch/acorn32/include: vidc_machdep.h
src/sys/arch/arm/iomd: vidc.h
src/sys/fs/udf: udf_osta.h
src/usr.sbin/fstyp: hammer_disk.h

Log Message:
s/dependancies/dependencies/ and s/independantly/independently/ in comments and
distrib notes.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/notes/common/macros
cvs rdiff -u -r1.18 -r1.19 src/sbin/rcorder/rcorder.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/acorn32/include/vidc_machdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/iomd/vidc.h
cvs rdiff -u -r1.4 -r1.5 src/sys/fs/udf/udf_osta.h
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/fstyp/hammer_disk.h

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

Modified files:

Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.54 src/distrib/notes/common/macros:1.55
--- src/distrib/notes/common/macros:1.54	Sat Nov 30 00:28:27 2019
+++ src/distrib/notes/common/macros	Mon Feb  5 21:39:51 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: macros,v 1.54 2019/11/30 00:28:27 uwe Exp $
+.\"	$NetBSD: macros,v 1.55 2024/02/05 21:39:51 andvar Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -169,7 +169,7 @@
 .\" support for more than two pages, nor for right-margins.
 .\" Usage:
 .\"   .Bc [ncol]
-.\" Dependancies:
+.\" Dependencies:
 .\"  macro CF   page trap macro for bottom of column
 .\"  macro CZ   code duplication; handling of diversion interpolation.
 .\"  macro CC   diversion trap macro for subdividing into pages.

Index: src/sbin/rcorder/rcorder.c
diff -u src/sbin/rcorder/rcorder.c:1.18 src/sbin/rcorder/rcorder.c:1.19
--- src/sbin/rcorder/rcorder.c:1.18	Mon Sep  5 01:09:57 2016
+++ src/sbin/rcorder/rcorder.c	Mon Feb  5 21:39:51 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: rcorder.c,v 1.18 2016/09/05 01:09:57 sevan Exp $	*/
+/*	$NetBSD: rcorder.c,v 1.19 2024/02/05 21:39:51 andvar Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Matthew R. Green
@@ -232,7 +232,7 @@ strnode_add(strnodelist **listp, char *s
 
 /*
  * below are the functions that deal with creating the lists
- * from the filename's given and the dependancies and provisions
+ * from the filename's given and the dependencies and provisions
  * in each of these files.  no ordering or checking is done here.
  */
 
@@ -662,7 +662,7 @@ keep_ok(filenode *fnode)
  *
  * NOTE: do_file() is called recursively from several places and cannot
  * safely free() anything related to items that may be recursed on.
- * Circular dependancies will cause problems if we do.
+ * Circular dependencies will cause problems if we do.
  */
 void
 do_file(filenode *fnode)

Index: src/sys/arch/acorn32/include/vidc_machdep.h
diff -u src/sys/arch/acorn32/include/vidc_machdep.h:1.1 src/sys/arch/acorn32/include/vidc_machdep.h:1.2
--- src/sys/arch/acorn32/include/vidc_machdep.h:1.1	Fri Oct  5 22:27:53 2001
+++ src/sys/arch/acorn32/include/vidc_machdep.h	Mon Feb  5 21:39:52 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc_machdep.h,v 1.1 2001/10/05 22:27:53 reinoud Exp $	*/
+/*	$NetBSD: vidc_machdep.h,v 1.2 2024/02/05 21:39:52 andvar Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -41,7 +41,7 @@
  */
 
 /*
- * This should be private to the vidc directory but there are still dependancies
+ * This should be private to the vidc directory but there are still dependencies
  * between the vidc and the riscpc virtual console (struct vidc_mode) that
  * means this file must be exported to userland.
  * With the import of the new console code this will go away.

Index: src/sys/arch/arm/iomd/vidc.h
diff -u src/sys/arch/arm/iomd/vidc.h:1.13 src/sys/arch/arm/iomd/vidc.h:1.14
--- src/sys/arch/arm/iomd/vidc.h:1.13	Fri Aug 18 23:25:10 2006
+++ src/sys/arch/arm/iomd/vidc.h	Mon Feb  5 21:39:52 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc.h,v 1.13 2006/08/18 23:25:10 bjh21 Exp $	*/
+/*	$NetBSD: vidc.h,v 1.14 2024/02/05 21:39:52 andvar Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
  */
 
 /*
- * This should be private to the vidc directory but there are still dependancies
+ * This should be private to the vidc directory but there are still dependencies
  * between the vidc and the riscpc virtual console (struct vidc_mode) that
  * means this file must be exported to userland.
  * With the import of the new console code this will go away.

Index: src/sys/fs/udf/udf_osta.h
diff -u src/sys/fs/udf/udf_osta.h:1.4 src/sys/fs/udf/udf_osta.h:1.5
--- src/sys/fs/udf/udf_osta.h:1.4	Wed May 14 16:49:48 2008
+++ src/sys/fs/udf/udf_osta.h	Mon Feb  5 21:39:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_osta.h,v 1.4 2008/05/14 16:49:48 reinoud Exp $ */
+/* $NetBSD: udf_osta.h,v 1.5 2024/02/05 21:39:52 andvar Exp $ */
 
 /*
  * Prototypes for the OSTA functions
@@ 

CVS commit: src

2024-02-05 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Feb  5 21:39:52 UTC 2024

Modified Files:
src/distrib/notes/common: macros
src/sbin/rcorder: rcorder.c
src/sys/arch/acorn32/include: vidc_machdep.h
src/sys/arch/arm/iomd: vidc.h
src/sys/fs/udf: udf_osta.h
src/usr.sbin/fstyp: hammer_disk.h

Log Message:
s/dependancies/dependencies/ and s/independantly/independently/ in comments and
distrib notes.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/notes/common/macros
cvs rdiff -u -r1.18 -r1.19 src/sbin/rcorder/rcorder.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/acorn32/include/vidc_machdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/iomd/vidc.h
cvs rdiff -u -r1.4 -r1.5 src/sys/fs/udf/udf_osta.h
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/fstyp/hammer_disk.h

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



CVS import: src/external/public-domain/tz/dist

2024-02-05 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Mon Feb  5 21:34:47 UTC 2024

Update of /cvsroot/src/external/public-domain/tz/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12946

Log Message:
Import tzdata2024a from 
https://github.com/JodaOrg/global-tz/releases/download/2024agtz/tzdata2024agtz.tar.gz

Summary of changes in tzdata2024a (2024-02-01 09:28:56 -0800):
  * Kazakhstan unifies on UTC+5.
  * Palestine summer time begins a week later than previously predicted
in 2024 and 2025.
  * Historic corrections for Asia/Ho_Chi_Minh (1955) America/Toronto (1947-9)
and America/Miquelon (1911).

Status:

Vendor Tag: TZDATA
Release Tags:   TZDATA2024AGTZ

U src/external/public-domain/tz/dist/calendars
U src/external/public-domain/tz/dist/CONTRIBUTING
U src/external/public-domain/tz/dist/LICENSE
U src/external/public-domain/tz/dist/Makefile
U src/external/public-domain/tz/dist/NEWS
U src/external/public-domain/tz/dist/README
U src/external/public-domain/tz/dist/SECURITY
U src/external/public-domain/tz/dist/theory.html
C src/external/public-domain/tz/dist/version
U src/external/public-domain/tz/dist/africa
U src/external/public-domain/tz/dist/antarctica
C src/external/public-domain/tz/dist/asia
C src/external/public-domain/tz/dist/australasia
U src/external/public-domain/tz/dist/europe
U src/external/public-domain/tz/dist/northamerica
U src/external/public-domain/tz/dist/southamerica
U src/external/public-domain/tz/dist/etcetera
U src/external/public-domain/tz/dist/factory
U src/external/public-domain/tz/dist/backward
U src/external/public-domain/tz/dist/backzone
U src/external/public-domain/tz/dist/iso3166.tab
C src/external/public-domain/tz/dist/leap-seconds.list
C src/external/public-domain/tz/dist/leapseconds
U src/external/public-domain/tz/dist/zone.tab
U src/external/public-domain/tz/dist/zonenow.tab
U src/external/public-domain/tz/dist/zone1970.tab
U src/external/public-domain/tz/dist/checklinks.awk
U src/external/public-domain/tz/dist/checknow.awk
U src/external/public-domain/tz/dist/checktab.awk
U src/external/public-domain/tz/dist/leapseconds.awk
U src/external/public-domain/tz/dist/ziguard.awk
U src/external/public-domain/tz/dist/zishrink.awk

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

cvs checkout -jTZDATA:yesterday -jTZDATA 
src/external/public-domain/tz/dist



CVS import: src/external/public-domain/tz/dist

2024-02-05 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Mon Feb  5 21:34:47 UTC 2024

Update of /cvsroot/src/external/public-domain/tz/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12946

Log Message:
Import tzdata2024a from 
https://github.com/JodaOrg/global-tz/releases/download/2024agtz/tzdata2024agtz.tar.gz

Summary of changes in tzdata2024a (2024-02-01 09:28:56 -0800):
  * Kazakhstan unifies on UTC+5.
  * Palestine summer time begins a week later than previously predicted
in 2024 and 2025.
  * Historic corrections for Asia/Ho_Chi_Minh (1955) America/Toronto (1947-9)
and America/Miquelon (1911).

Status:

Vendor Tag: TZDATA
Release Tags:   TZDATA2024AGTZ

U src/external/public-domain/tz/dist/calendars
U src/external/public-domain/tz/dist/CONTRIBUTING
U src/external/public-domain/tz/dist/LICENSE
U src/external/public-domain/tz/dist/Makefile
U src/external/public-domain/tz/dist/NEWS
U src/external/public-domain/tz/dist/README
U src/external/public-domain/tz/dist/SECURITY
U src/external/public-domain/tz/dist/theory.html
C src/external/public-domain/tz/dist/version
U src/external/public-domain/tz/dist/africa
U src/external/public-domain/tz/dist/antarctica
C src/external/public-domain/tz/dist/asia
C src/external/public-domain/tz/dist/australasia
U src/external/public-domain/tz/dist/europe
U src/external/public-domain/tz/dist/northamerica
U src/external/public-domain/tz/dist/southamerica
U src/external/public-domain/tz/dist/etcetera
U src/external/public-domain/tz/dist/factory
U src/external/public-domain/tz/dist/backward
U src/external/public-domain/tz/dist/backzone
U src/external/public-domain/tz/dist/iso3166.tab
C src/external/public-domain/tz/dist/leap-seconds.list
C src/external/public-domain/tz/dist/leapseconds
U src/external/public-domain/tz/dist/zone.tab
U src/external/public-domain/tz/dist/zonenow.tab
U src/external/public-domain/tz/dist/zone1970.tab
U src/external/public-domain/tz/dist/checklinks.awk
U src/external/public-domain/tz/dist/checknow.awk
U src/external/public-domain/tz/dist/checktab.awk
U src/external/public-domain/tz/dist/leapseconds.awk
U src/external/public-domain/tz/dist/ziguard.awk
U src/external/public-domain/tz/dist/zishrink.awk

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

cvs checkout -jTZDATA:yesterday -jTZDATA 
src/external/public-domain/tz/dist



CVS commit: src

2024-02-05 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Feb  5 21:20:09 UTC 2024

Modified Files:
src/bin/ksh: shf.c
src/distrib/sets: descrs

Log Message:
s/formated/formatted/ in comment and distrib sets descriptions.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/bin/ksh/shf.c
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/descrs

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

Modified files:

Index: src/bin/ksh/shf.c
diff -u src/bin/ksh/shf.c:1.15 src/bin/ksh/shf.c:1.16
--- src/bin/ksh/shf.c:1.15	Sat Nov  6 06:40:33 2021
+++ src/bin/ksh/shf.c	Mon Feb  5 21:20:09 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: shf.c,v 1.15 2021/11/06 06:40:33 msaitoh Exp $	*/
+/*	$NetBSD: shf.c,v 1.16 2024/02/05 21:20:09 andvar Exp $	*/
 
 /*
  *  Shell file I/O routines
@@ -6,7 +6,7 @@
 #include 
 
 #ifndef lint
-__RCSID("$NetBSD: shf.c,v 1.15 2021/11/06 06:40:33 msaitoh Exp $");
+__RCSID("$NetBSD: shf.c,v 1.16 2024/02/05 21:20:09 andvar Exp $");
 #endif
 
 #include 
@@ -843,7 +843,7 @@ shf_smprintf(const char *fmt, ...)
 #define FL_ZERO		0x040	/* `0' seen */
 #define FL_DOT		0x080	/* '.' seen */
 #define FL_UPPER	0x100	/* format character was uppercase */
-#define FL_NUMBER	0x200	/* a number was formated %[douxefg] */
+#define FL_NUMBER	0x200	/* a number was formatted %[douxefg] */
 
 
 #ifdef FP

Index: src/distrib/sets/descrs
diff -u src/distrib/sets/descrs:1.31 src/distrib/sets/descrs:1.32
--- src/distrib/sets/descrs:1.31	Tue Sep  5 04:19:04 2023
+++ src/distrib/sets/descrs	Mon Feb  5 21:20:09 2024
@@ -491,7 +491,7 @@ comp-sysutil-catman	formatted manual pag
 comp-sysutil-man	manual pages source for system utilities
 comp-sysutil-root	manual pages source for system utilities
 comp-sysutil-sbin	system utilities 
-comp-tpm-catman		formated manual pages for the Trusted Platform Module libraries
+comp-tpm-catman		formatted manual pages for the Trusted Platform Module libraries
 comp-tpm-debug		debugging symbols for the Trusted Platfor Module utilities and libraries
 comp-tpm-htmlman	HTML documentation for the Trusted Platform Module libraries
 comp-tpm-lib		libraries for the Trusted Platform Module
@@ -690,7 +690,7 @@ man-timed-catman	formatted manual pages 
 man-timed-man	manual pages source for the timed(8) network time daemon
 man-tn3270-catman	formatted manual pages for utilities for connecting to IBM VM/CMS systems
 man-tn3270-man	manual pages source for utilities for connecting to IBM VM/CMS systems
-man-tpm-catman		formated manual pages for the Trusted Platform Module utilities
+man-tpm-catman		formatted manual pages for the Trusted Platform Module utilities
 man-tpm-htmlman		HTML documentation for the Trusted Platform Module utilities
 man-tpm-man		documentation for the Trusted Platform Module utilities
 man-util-catman	formatted manual pages for basic user utilities 



CVS commit: src

2024-02-05 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Feb  5 21:20:09 UTC 2024

Modified Files:
src/bin/ksh: shf.c
src/distrib/sets: descrs

Log Message:
s/formated/formatted/ in comment and distrib sets descriptions.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/bin/ksh/shf.c
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/descrs

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