CVS commit: src/lib/libterminfo
Module Name:src
Committed By: martin
Date: Mon May 20 09:48:42 UTC 2024
Modified Files:
src/lib/libterminfo: Makefile
Log Message:
Use double quotes to include the local ./Makefile.hash
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libterminfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/Makefile
diff -u src/lib/libterminfo/Makefile:1.23 src/lib/libterminfo/Makefile:1.24
--- src/lib/libterminfo/Makefile:1.23 Sun Apr 5 12:31:02 2020
+++ src/lib/libterminfo/Makefile Mon May 20 09:48:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/04/05 12:31:02 roy Exp $
+# $NetBSD: Makefile,v 1.24 2024/05/20 09:48:42 martin Exp $
.include
@@ -47,7 +47,7 @@ MLINKS+= termcap.3 tgetent.3 termcap.3 t
CPPFLAGS+= -I${.OBJDIR}
-.include
+.include "Makefile.hash"
# Generate our man pages
terminfo.5: genman terminfo.5.in term.h termcap_map.c
CVS commit: src/lib/libterminfo
Module Name:src Committed By: martin Date: Mon May 20 09:48:42 UTC 2024 Modified Files: src/lib/libterminfo: Makefile Log Message: Use double quotes to include the local ./Makefile.hash To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/libterminfo/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: martin
Date: Mon May 20 09:37:34 UTC 2024
Modified Files:
src/sys/compat/common: sys_descrip_100.c
src/sys/kern: sys_descrip.c
Log Message:
Fix a few oversights from the renaming of dup3110 to dup3100
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/common/sys_descrip_100.c
cvs rdiff -u -r1.50 -r1.51 src/sys/kern/sys_descrip.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/compat/common/sys_descrip_100.c
diff -u src/sys/compat/common/sys_descrip_100.c:1.1 src/sys/compat/common/sys_descrip_100.c:1.2
--- src/sys/compat/common/sys_descrip_100.c:1.1 Mon May 20 01:30:34 2024
+++ src/sys/compat/common/sys_descrip_100.c Mon May 20 09:37:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_descrip_100.c,v 1.1 2024/05/20 01:30:34 christos Exp $ */
+/* $NetBSD: sys_descrip_100.c,v 1.2 2024/05/20 09:37:34 martin Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_descrip_100.c,v 1.1 2024/05/20 01:30:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_descrip_100.c,v 1.2 2024/05/20 09:37:34 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -40,28 +40,28 @@ __KERNEL_RCSID(0, "$NetBSD: sys_descrip_
#include
-static const struct syscall_package sys_descrip_110_syscalls[] = {
- { SYS_compat_110_dup3, 0,
- (sy_call_t *)compat_110_sys_dup3 },
+static const struct syscall_package sys_descrip_100_syscalls[] = {
+ { SYS_compat_100_dup3, 0,
+ (sy_call_t *)compat_100_sys_dup3 },
{ 0, 0, NULL },
};
int
-sys_descrip_110_init(void)
+sys_descrip_100_init(void)
{
- return syscall_establish(NULL, sys_descrip_110_syscalls);
+ return syscall_establish(NULL, sys_descrip_100_syscalls);
}
int
-sys_descrip_110_fini(void)
+sys_descrip_100_fini(void)
{
- return syscall_disestablish(NULL, sys_descrip_110_syscalls);
+ return syscall_disestablish(NULL, sys_descrip_100_syscalls);
}
int
-compat_110_sys_dup3(struct lwp *l, const struct compat_110_sys_dup3_args *uap,
+compat_100_sys_dup3(struct lwp *l, const struct compat_100_sys_dup3_args *uap,
register_t *retval)
{
/* {
Index: src/sys/kern/sys_descrip.c
diff -u src/sys/kern/sys_descrip.c:1.50 src/sys/kern/sys_descrip.c:1.51
--- src/sys/kern/sys_descrip.c:1.50 Sun May 19 22:25:48 2024
+++ src/sys/kern/sys_descrip.c Mon May 20 09:37:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_descrip.c,v 1.50 2024/05/19 22:25:48 christos Exp $ */
+/* $NetBSD: sys_descrip.c,v 1.51 2024/05/20 09:37:34 martin Exp $ */
/*-
* Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.50 2024/05/19 22:25:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.51 2024/05/20 09:37:34 martin Exp $");
#include
#include
@@ -149,7 +149,7 @@ dodup(struct lwp *l, int from, int to, i
}
int
-sys___dup3110(struct lwp *l, const struct sys___dup3110_args *uap, register_t *retval)
+sys___dup3100(struct lwp *l, const struct sys___dup3100_args *uap, register_t *retval)
{
/* {
syscallarg(int) from;
CVS commit: src/sys
Module Name:src Committed By: martin Date: Mon May 20 09:37:34 UTC 2024 Modified Files: src/sys/compat/common: sys_descrip_100.c src/sys/kern: sys_descrip.c Log Message: Fix a few oversights from the renaming of dup3110 to dup3100 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/common/sys_descrip_100.c cvs rdiff -u -r1.50 -r1.51 src/sys/kern/sys_descrip.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
Module Name:src Committed By: martin Date: Thu May 16 12:32:00 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #688 - #691 To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 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.10 src/doc/CHANGES-10.1:1.1.2.11 --- src/doc/CHANGES-10.1:1.1.2.10 Sat May 11 14:51:14 2024 +++ src/doc/CHANGES-10.1 Thu May 16 12:32:00 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.1,v 1.1.2.10 2024/05/11 14:51:14 martin Exp $ +# $NetBSD: CHANGES-10.1,v 1.1.2.11 2024/05/16 12:32:00 martin Exp $ A complete list of changes from the NetBSD 10.0 release on 2024-03-28 until the 10.1 release: @@ -262,3 +262,30 @@ sys/dev/pci/if_vmx.c1.13 vmx(4): set IFM_FDX flag if the link is up. [msaitoh, ticket #687] +usr.bin/tic/tic.c1.41 + + tic(1): PR 58034: only mark the terminfo entry promoted if + it actually was. + [wiz, ticket #688] + +sys/dev/hil/hil.c1.8 + + hp300: fix "stray level 1 interrupt" panic by pressing keys + during autoconf(9). + [tsutsui, ticket #689] + +distrib/notes/hp300/hardware 1.28 +share/man/man4/man4.hp300/topcat.4 1.8 +sys/arch/hp300/dev/diofb.c 1.8-1.10 +sys/arch/hp300/dev/diofbvar.h 1.5 +sys/arch/hp300/dev/topcat.c 1.7-1.12 +sys/arch/hp300/dev/topcatreg.h 1.5 + + hp300: topcat(4) framebuffer fixes. + [tsutsui, ticket #690] + +sys/arch/i386/conf/LEGACY 1.4 + + Exclude DRM_LEGACY from the ISA kernel. + [nia, ticket #691] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Thu May 16 12:32:00 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #688 - #691 To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 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/sys/arch/i386/conf
Module Name:src Committed By: martin Date: Thu May 16 12:29:12 UTC 2024 Modified Files: src/sys/arch/i386/conf [netbsd-10]: LEGACY Log Message: Pull up following revision(s) (requested by nia in ticket #691): sys/arch/i386/conf/LEGACY: revision 1.4 also exclude DRM_LEGACY from the ISA kernel To generate a diff of this commit: cvs rdiff -u -r1.1.54.1 -r1.1.54.2 src/sys/arch/i386/conf/LEGACY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/i386/conf
Module Name:src Committed By: martin Date: Thu May 16 12:29:12 UTC 2024 Modified Files: src/sys/arch/i386/conf [netbsd-10]: LEGACY Log Message: Pull up following revision(s) (requested by nia in ticket #691): sys/arch/i386/conf/LEGACY: revision 1.4 also exclude DRM_LEGACY from the ISA kernel To generate a diff of this commit: cvs rdiff -u -r1.1.54.1 -r1.1.54.2 src/sys/arch/i386/conf/LEGACY 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/i386/conf/LEGACY diff -u src/sys/arch/i386/conf/LEGACY:1.1.54.1 src/sys/arch/i386/conf/LEGACY:1.1.54.2 --- src/sys/arch/i386/conf/LEGACY:1.1.54.1 Sat May 11 14:31:56 2024 +++ src/sys/arch/i386/conf/LEGACY Thu May 16 12:29:11 2024 @@ -1,4 +1,4 @@ -# $NetBSD: LEGACY,v 1.1.54.1 2024/05/11 14:31:56 martin Exp $ +# $NetBSD: LEGACY,v 1.1.54.2 2024/05/16 12:29:11 martin Exp $ # LEGACY kernel -- includes vga@isa and pcdisplay@isa for pre-PCI # systems, due to significant pain making them fail to attach when @@ -21,3 +21,5 @@ no radeondrmkmsfb* at radeonfbbus? no nouveau* at pci? no nouveaufb* at nouveaufbbus? + +no options DRM_LEGACY
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Thu May 16 12:27:50 UTC 2024 Modified Files: src/distrib/notes/hp300 [netbsd-10]: hardware src/share/man/man4/man4.hp300 [netbsd-10]: topcat.4 src/sys/arch/hp300/dev [netbsd-10]: diofb.c diofbvar.h topcat.c topcatreg.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #690): sys/arch/hp300/dev/topcat.c: revision 1.7 sys/arch/hp300/dev/topcat.c: revision 1.8 sys/arch/hp300/dev/topcat.c: revision 1.9 sys/arch/hp300/dev/diofb.c: revision 1.8 sys/arch/hp300/dev/diofb.c: revision 1.9 sys/arch/hp300/dev/diofb.c: revision 1.10 sys/arch/hp300/dev/topcat.c: revision 1.10 sys/arch/hp300/dev/topcat.c: revision 1.11 sys/arch/hp300/dev/topcat.c: revision 1.12 sys/arch/hp300/dev/topcatreg.h: revision 1.5 distrib/notes/hp300/hardware: revision 1.28 sys/arch/hp300/dev/diofbvar.h: revision 1.5 share/man/man4/man4.hp300/topcat.4: revision 1.8 Increase DELAY() for waitbusy macroes as pre-wscons and 4.4BSD did. It looks necessary for sane palette ops at least on HP98543 topcat on 68030 HP 9000/360. Move a check of topcat(4) specific fb width quirks to topcat.c. We need to check fb->planes but it's propbed in topcat.c after common diofb_fbinquire() is called. Also add a comment that it looks these 1 bpp and 4 bpp boards have VRAM with sparse address layout and we have to handle 512 pixels per line with 1024 bytes per line. Fix MD allocattr to return proper attributes what MI rasops(9) expects. Use proper planemask per a vaild number of planes. Check tc_waitbusy() before writing palette registers in topcat_setcolor(). This seems to make palette operations more stable on my HP360 with HP98543. Add DELAY(9) to make palette register settings stable on 98543 in HP360. Note 98547 (6 bpp variant) on HP370 (68030 33MHz) doesn't need these DELAYs so maybe only some old variants (98543 and 98545?) on 020/030 have such restriction (actually only one nop seems enough.) Fix topcat(4) problems on some models that cause garbages on screen. - Make sure that windowmove (hardware BITBLT) ops complete by checking tc_busywait() before calling putchar functions by MI rasops(9). It looks CPU accesses against VRAM during windowmove (copy, erase, and cursor) ops causes unexpected garbages at least on 98543 on HP360, 98547 on HP370, and also on 98543 on 040 HP380 (but not on 98549). - Handle 'sparse VRAM' on 98543 (and probably 98542) properly: - Prepare and use own topcat_putchar1_4() function for sparse VRAM. - Pass proper 'VRAM width' rather than actuall font width to all windowmove (copycols, erasecols, copyrows, eraserows, and do_cursor) operation functions. Now all topcat(4) consoles on 98543 on HP360/HP380 and 98547 on HP370 work fine, and no visible regression on 98549 on HP380 and 98544 on HP360. Note that 98542 and 98543 variants are also supported by topcat(4). Add 98542 and 98543 framebuffers to supported "Graphics Devices" section. I hope someone will sync a list of supported devices in port wiki pages with one in this installation notes. Add comments about quirks of 98542/98543 framebuffers with 1024x400 pixels. To generate a diff of this commit: cvs rdiff -u -r1.26.2.1 -r1.26.2.2 src/distrib/notes/hp300/hardware cvs rdiff -u -r1.7 -r1.7.54.1 src/share/man/man4/man4.hp300/topcat.4 cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/hp300/dev/diofb.c cvs rdiff -u -r1.3 -r1.3.90.1 src/sys/arch/hp300/dev/diofbvar.h cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/hp300/dev/topcat.c cvs rdiff -u -r1.2 -r1.2.90.1 src/sys/arch/hp300/dev/topcatreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Thu May 16 12:27:50 UTC 2024 Modified Files: src/distrib/notes/hp300 [netbsd-10]: hardware src/share/man/man4/man4.hp300 [netbsd-10]: topcat.4 src/sys/arch/hp300/dev [netbsd-10]: diofb.c diofbvar.h topcat.c topcatreg.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #690): sys/arch/hp300/dev/topcat.c: revision 1.7 sys/arch/hp300/dev/topcat.c: revision 1.8 sys/arch/hp300/dev/topcat.c: revision 1.9 sys/arch/hp300/dev/diofb.c: revision 1.8 sys/arch/hp300/dev/diofb.c: revision 1.9 sys/arch/hp300/dev/diofb.c: revision 1.10 sys/arch/hp300/dev/topcat.c: revision 1.10 sys/arch/hp300/dev/topcat.c: revision 1.11 sys/arch/hp300/dev/topcat.c: revision 1.12 sys/arch/hp300/dev/topcatreg.h: revision 1.5 distrib/notes/hp300/hardware: revision 1.28 sys/arch/hp300/dev/diofbvar.h: revision 1.5 share/man/man4/man4.hp300/topcat.4: revision 1.8 Increase DELAY() for waitbusy macroes as pre-wscons and 4.4BSD did. It looks necessary for sane palette ops at least on HP98543 topcat on 68030 HP 9000/360. Move a check of topcat(4) specific fb width quirks to topcat.c. We need to check fb->planes but it's propbed in topcat.c after common diofb_fbinquire() is called. Also add a comment that it looks these 1 bpp and 4 bpp boards have VRAM with sparse address layout and we have to handle 512 pixels per line with 1024 bytes per line. Fix MD allocattr to return proper attributes what MI rasops(9) expects. Use proper planemask per a vaild number of planes. Check tc_waitbusy() before writing palette registers in topcat_setcolor(). This seems to make palette operations more stable on my HP360 with HP98543. Add DELAY(9) to make palette register settings stable on 98543 in HP360. Note 98547 (6 bpp variant) on HP370 (68030 33MHz) doesn't need these DELAYs so maybe only some old variants (98543 and 98545?) on 020/030 have such restriction (actually only one nop seems enough.) Fix topcat(4) problems on some models that cause garbages on screen. - Make sure that windowmove (hardware BITBLT) ops complete by checking tc_busywait() before calling putchar functions by MI rasops(9). It looks CPU accesses against VRAM during windowmove (copy, erase, and cursor) ops causes unexpected garbages at least on 98543 on HP360, 98547 on HP370, and also on 98543 on 040 HP380 (but not on 98549). - Handle 'sparse VRAM' on 98543 (and probably 98542) properly: - Prepare and use own topcat_putchar1_4() function for sparse VRAM. - Pass proper 'VRAM width' rather than actuall font width to all windowmove (copycols, erasecols, copyrows, eraserows, and do_cursor) operation functions. Now all topcat(4) consoles on 98543 on HP360/HP380 and 98547 on HP370 work fine, and no visible regression on 98549 on HP380 and 98544 on HP360. Note that 98542 and 98543 variants are also supported by topcat(4). Add 98542 and 98543 framebuffers to supported "Graphics Devices" section. I hope someone will sync a list of supported devices in port wiki pages with one in this installation notes. Add comments about quirks of 98542/98543 framebuffers with 1024x400 pixels. To generate a diff of this commit: cvs rdiff -u -r1.26.2.1 -r1.26.2.2 src/distrib/notes/hp300/hardware cvs rdiff -u -r1.7 -r1.7.54.1 src/share/man/man4/man4.hp300/topcat.4 cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/hp300/dev/diofb.c cvs rdiff -u -r1.3 -r1.3.90.1 src/sys/arch/hp300/dev/diofbvar.h cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/hp300/dev/topcat.c cvs rdiff -u -r1.2 -r1.2.90.1 src/sys/arch/hp300/dev/topcatreg.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/hp300/hardware diff -u src/distrib/notes/hp300/hardware:1.26.2.1 src/distrib/notes/hp300/hardware:1.26.2.2 --- src/distrib/notes/hp300/hardware:1.26.2.1 Sun Jan 14 16:00:09 2024 +++ src/distrib/notes/hp300/hardware Thu May 16 12:27:50 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.26.2.1 2024/01/14 16:00:09 martin Exp $ +.\" $NetBSD: hardware,v 1.26.2.2 2024/05/16 12:27:50 martin Exp $ . .Nx*M \*V will run on most HP 9000/300- and 400-series machines. @@ -155,6 +155,10 @@ Network interfaces .It Graphics Devices .(bullet -compact +98542 monochrome Topcat (512x400, 1 bit, DIO-II) +.It +98543 color Topcat (512x400, 4 bits, DIO-II) +.It 98544 monochrome Topcat (1024x768, 1 bit, DIO-II) .It 98545A color Topcat (1024x768, 4 bits, DIO-II) Index: src/share/man/man4/man4.hp300/topcat.4 diff -u src/share/man/man4/man4.hp300/topcat.4:1.7 src/share/man/man4/man4.hp300/topcat.4:1.7.54.1 --- src/share/man/man4/man4.hp300/topcat.4:1.7 Wed Feb 9 14:37:56 2011 +++ src/share/man/man4/man4.hp300/topcat.4 Thu May 16 12:27:50 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: topcat.4,v 1.7 2011/02/09 14:37:56 wiz Exp $ +.\" $NetBSD:
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu May 16 12:24:02 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Ticket #1840 To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 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.3 src/doc/CHANGES-9.5:1.1.2.4 --- src/doc/CHANGES-9.5:1.1.2.3 Sat May 11 14:48:38 2024 +++ src/doc/CHANGES-9.5 Thu May 16 12:24:02 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.5,v 1.1.2.3 2024/05/11 14:48:38 martin Exp $ +# $NetBSD: CHANGES-9.5,v 1.1.2.4 2024/05/16 12:24:02 martin Exp $ A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5 release: @@ -36,3 +36,9 @@ sys/arch/mac68k/dev/pm_direct.c 1.31 when using mouse or keyboard. [nat, ticket #1839] +sys/dev/hil/hil.c1.8 + + hp300: fix "stray level 1 interrupt" panic by pressing keys + during autoconf(9). + [tsutsui, ticket #1840] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu May 16 12:24:02 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Ticket #1840 To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 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/sys/dev/hil
Module Name:src Committed By: martin Date: Thu May 16 12:23:13 UTC 2024 Modified Files: src/sys/dev/hil [netbsd-9]: hil.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1840): sys/dev/hil/hil.c: revision 1.8 Fix "stray level 1 interrupt" panic by pressing keys during autoconf(9). Also explicitly initialize sc->sc_status = HIL_STATUS_BUSY in hil_attach(). Previously hil_intr(9) returned immediately during 'cold', but all interrupts are enabled at the end of configure() (actually in MD cpu_configure()) and cold is cleared in confiugre2() after configure(), so there is a small window when hil interrupts can be triggered during cold. It looks there is no problem to process hil_intr() before hil_attach_deferre() is called via configure2() because we already check 'sc->sc_status != HIL_STATUS_BUSY' on processing a kthread. Note this seems also to appease the similar panic on mame's hp9k370 emulation (though mame's emulation around DMAC looks still incomplete). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/dev/hil/hil.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/hil/hil.c diff -u src/sys/dev/hil/hil.c:1.3 src/sys/dev/hil/hil.c:1.3.4.1 --- src/sys/dev/hil/hil.c:1.3 Mon Sep 3 16:29:31 2018 +++ src/sys/dev/hil/hil.c Thu May 16 12:23:13 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: hil.c,v 1.3 2018/09/03 16:29:31 riastradh Exp $ */ +/* $NetBSD: hil.c,v 1.3.4.1 2024/05/16 12:23:13 martin Exp $ */ /* $OpenBSD: hil.c,v 1.24 2010/11/20 16:45:46 miod Exp $ */ /* * Copyright (c) 2003, 2004, Miodrag Vallat. @@ -150,6 +150,7 @@ hil_attach(struct hil_softc *sc, int *hi sc->sc_cmdbp = sc->sc_cmdbuf; sc->sc_pollbp = sc->sc_pollbuf; sc->sc_console = hil_is_console; + sc->sc_status = HIL_STATUS_BUSY; } /* @@ -269,9 +270,6 @@ hil_intr(void *v) struct hil_softc *sc = v; uint8_t c, stat; - if (cold) - return 0; - stat = bus_space_read_1(sc->sc_bst, sc->sc_bsh, HILP_STAT); /*
CVS commit: [netbsd-9] src/sys/dev/hil
Module Name:src Committed By: martin Date: Thu May 16 12:23:13 UTC 2024 Modified Files: src/sys/dev/hil [netbsd-9]: hil.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1840): sys/dev/hil/hil.c: revision 1.8 Fix "stray level 1 interrupt" panic by pressing keys during autoconf(9). Also explicitly initialize sc->sc_status = HIL_STATUS_BUSY in hil_attach(). Previously hil_intr(9) returned immediately during 'cold', but all interrupts are enabled at the end of configure() (actually in MD cpu_configure()) and cold is cleared in confiugre2() after configure(), so there is a small window when hil interrupts can be triggered during cold. It looks there is no problem to process hil_intr() before hil_attach_deferre() is called via configure2() because we already check 'sc->sc_status != HIL_STATUS_BUSY' on processing a kthread. Note this seems also to appease the similar panic on mame's hp9k370 emulation (though mame's emulation around DMAC looks still incomplete). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/dev/hil/hil.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/sys/dev/hil
Module Name:src Committed By: martin Date: Thu May 16 12:22:07 UTC 2024 Modified Files: src/sys/dev/hil [netbsd-10]: hil.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #689): sys/dev/hil/hil.c: revision 1.8 Fix "stray level 1 interrupt" panic by pressing keys during autoconf(9). Also explicitly initialize sc->sc_status = HIL_STATUS_BUSY in hil_attach(). Previously hil_intr(9) returned immediately during 'cold', but all interrupts are enabled at the end of configure() (actually in MD cpu_configure()) and cold is cleared in confiugre2() after configure(), so there is a small window when hil interrupts can be triggered during cold. It looks there is no problem to process hil_intr() before hil_attach_deferre() is called via configure2() because we already check 'sc->sc_status != HIL_STATUS_BUSY' on processing a kthread. Note this seems also to appease the similar panic on mame's hp9k370 emulation (though mame's emulation around DMAC looks still incomplete). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/dev/hil/hil.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/hil/hil.c diff -u src/sys/dev/hil/hil.c:1.7 src/sys/dev/hil/hil.c:1.7.4.1 --- src/sys/dev/hil/hil.c:1.7 Sat Jun 25 02:36:27 2022 +++ src/sys/dev/hil/hil.c Thu May 16 12:22:06 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: hil.c,v 1.7 2022/06/25 02:36:27 tsutsui Exp $ */ +/* $NetBSD: hil.c,v 1.7.4.1 2024/05/16 12:22:06 martin Exp $ */ /* $OpenBSD: hil.c,v 1.24 2010/11/20 16:45:46 miod Exp $ */ /* * Copyright (c) 2003, 2004, Miodrag Vallat. @@ -153,6 +153,7 @@ hil_attach(struct hil_softc *sc, int *hi sc->sc_cmdbp = sc->sc_cmdbuf; sc->sc_pollbp = sc->sc_pollbuf; sc->sc_console = hil_is_console; + sc->sc_status = HIL_STATUS_BUSY; } /* @@ -272,9 +273,6 @@ hil_intr(void *v) struct hil_softc *sc = v; uint8_t c, stat; - if (cold) - return 0; - stat = bus_space_read_1(sc->sc_bst, sc->sc_bsh, HILP_STAT); /*
CVS commit: [netbsd-10] src/sys/dev/hil
Module Name:src Committed By: martin Date: Thu May 16 12:22:07 UTC 2024 Modified Files: src/sys/dev/hil [netbsd-10]: hil.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #689): sys/dev/hil/hil.c: revision 1.8 Fix "stray level 1 interrupt" panic by pressing keys during autoconf(9). Also explicitly initialize sc->sc_status = HIL_STATUS_BUSY in hil_attach(). Previously hil_intr(9) returned immediately during 'cold', but all interrupts are enabled at the end of configure() (actually in MD cpu_configure()) and cold is cleared in confiugre2() after configure(), so there is a small window when hil interrupts can be triggered during cold. It looks there is no problem to process hil_intr() before hil_attach_deferre() is called via configure2() because we already check 'sc->sc_status != HIL_STATUS_BUSY' on processing a kthread. Note this seems also to appease the similar panic on mame's hp9k370 emulation (though mame's emulation around DMAC looks still incomplete). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/dev/hil/hil.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/usr.bin/tic
Module Name:src Committed By: martin Date: Thu May 16 12:19:49 UTC 2024 Modified Files: src/usr.bin/tic [netbsd-10]: tic.c Log Message: Pull up following revision(s) (requested by wiz in ticket #688): usr.bin/tic/tic.c: revision 1.41 Only mark the terminfo entry promoted if actually was. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.6.1 src/usr.bin/tic/tic.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/usr.bin/tic
Module Name:src
Committed By: martin
Date: Thu May 16 12:19:49 UTC 2024
Modified Files:
src/usr.bin/tic [netbsd-10]: tic.c
Log Message:
Pull up following revision(s) (requested by wiz in ticket #688):
usr.bin/tic/tic.c: revision 1.41
Only mark the terminfo entry promoted if actually was.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.6.1 src/usr.bin/tic/tic.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/tic/tic.c
diff -u src/usr.bin/tic/tic.c:1.40 src/usr.bin/tic/tic.c:1.40.6.1
--- src/usr.bin/tic/tic.c:1.40 Mon Mar 30 00:09:06 2020
+++ src/usr.bin/tic/tic.c Thu May 16 12:19:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tic.c,v 1.40 2020/03/30 00:09:06 roy Exp $ */
+/* $NetBSD: tic.c,v 1.40.6.1 2024/05/16 12:19:48 martin Exp $ */
/*
* Copyright (c) 2009, 2010, 2020 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#endif
#include
-__RCSID("$NetBSD: tic.c,v 1.40 2020/03/30 00:09:06 roy Exp $");
+__RCSID("$NetBSD: tic.c,v 1.40.6.1 2024/05/16 12:19:48 martin Exp $");
#include
#include
@@ -468,7 +468,7 @@ merge_use(int flags)
if (!promoted && rtic->rtype != TERMINFO_RTYPE) {
if (promote(rtic, utic) == -1)
err(EXIT_FAILURE, "promote");
-promoted = true;
+promoted = rtic->rtype == TERMINFO_RTYPE;
}
merge(rtic, utic, flags);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat May 11 15:25:24 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Document final 8.3 changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.229 -r1.1.2.230 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat May 11 15:25:24 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Document final 8.3 changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.229 -r1.1.2.230 src/doc/CHANGES-8.3 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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.229 src/doc/CHANGES-8.3:1.1.2.230 --- src/doc/CHANGES-8.3:1.1.2.229 Sun Apr 28 10:17:03 2024 +++ src/doc/CHANGES-8.3 Sat May 11 15:25:24 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.229 2024/04/28 10:17:03 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.230 2024/05/11 15:25:24 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4435,3 +4435,9 @@ sys/netinet6/frag6.c1.78 inet6: fix calculation of fragment length. [ozaki-r, ticket #1960] +distrib/notes/common/main (manually edited) +external/gpl2/groff/tmac/mdoc.local (manually edited) +sys/sys/param.h (manually edited) +doc/LAST_MINUTE (manually edited) + + Welcome to 8.3
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sat May 11 14:51:15 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #682 - #687 To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 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/doc
Module Name:src Committed By: martin Date: Sat May 11 14:51:15 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #682 - #687 To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 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.9 src/doc/CHANGES-10.1:1.1.2.10 --- src/doc/CHANGES-10.1:1.1.2.9 Sat May 11 14:09:50 2024 +++ src/doc/CHANGES-10.1 Sat May 11 14:51:14 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.1,v 1.1.2.9 2024/05/11 14:09:50 martin Exp $ +# $NetBSD: CHANGES-10.1,v 1.1.2.10 2024/05/11 14:51:14 martin Exp $ A complete list of changes from the NetBSD 10.0 release on 2024-03-28 until the 10.1 release: @@ -222,3 +222,43 @@ etc/Makefile 1.470 PR/58200: change "makeobsolete" to use the tool version of sed. [christos, ticket #681] +distrib/common/Makefile.bootcd 1.48 +distrib/common/bootimage/Makefile.installimage 1.11 +distrib/i386/cdroms/installcd/Makefile 1.12 +share/mk/bsd.own.mk1.1373 +sys/arch/i386/conf/LEGACY 1.3 + + i386: reduce size of ISO image: + - remove redundant kernels and floppy images + - do not build AMD GPU firmware + - remove DRM support from the LEGACY kernel (targetting ISA machines) + [nia, ticket #682] + +external/mit/xf86-input-ws/dist/src/ws.c 1.17,1.18 + + xf86-input-ws: print log message about touchpad scrolling only once. + [nia, ticket #683] + +sys/arch/hp300/stand/inst/Makefile 1.11 +sys/arch/hp300/stand/uboot/Makefile 1.11 + + hp300: PR 58211: fix hardlinks in /usr/mdec. + [tsutsui, ticket #684] + +sys/arch/hp300/stand/common/if_le.c 1.15,1.16 + + hp300: do not panic on fatal errors on receiving packets with invalid + length. + [tsutsui, ticket #685] + +sys/arch/mac68k/dev/pm_direct.c 1.31 + + mac68k: avoid random crashes on some Powerbook models + when using mouse or keyboard. + [nat, ticket #686] + +sys/dev/pci/if_vmx.c1.13 + + vmx(4): set IFM_FDX flag if the link is up. + [msaitoh, ticket #687] +
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat May 11 14:49:51 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: if_vmx.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #687): sys/dev/pci/if_vmx.c: revision 1.13 Set IFM_FDX flag if the link is up. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/dev/pci/if_vmx.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/sys/dev/pci
Module Name:src Committed By: martin Date: Sat May 11 14:49:51 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: if_vmx.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #687): sys/dev/pci/if_vmx.c: revision 1.13 Set IFM_FDX flag if the link is up. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/dev/pci/if_vmx.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/pci/if_vmx.c diff -u src/sys/dev/pci/if_vmx.c:1.11 src/sys/dev/pci/if_vmx.c:1.11.4.1 --- src/sys/dev/pci/if_vmx.c:1.11 Fri Sep 16 07:55:34 2022 +++ src/sys/dev/pci/if_vmx.c Sat May 11 14:49:51 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vmx.c,v 1.11 2022/09/16 07:55:34 knakahara Exp $ */ +/* $NetBSD: if_vmx.c,v 1.11.4.1 2024/05/11 14:49:51 martin Exp $ */ /* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */ /* @@ -19,7 +19,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.11 2022/09/16 07:55:34 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.11.4.1 2024/05/11 14:49:51 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_if_vmx.h" @@ -3544,7 +3544,7 @@ vmxnet3_ifmedia_status(struct ifnet *ifp ifmr->ifm_status |= IFM_ACTIVE; if (ifp->if_baudrate >= IF_Gbps(10ULL)) - ifmr->ifm_active |= IFM_10G_T; + ifmr->ifm_active |= IFM_10G_T | IFM_FDX; } static int
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat May 11 14:48:38 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Tickets #1838 and #1839 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 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/doc
Module Name:src Committed By: martin Date: Sat May 11 14:48:38 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Tickets #1838 and #1839 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 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.2 src/doc/CHANGES-9.5:1.1.2.3 --- src/doc/CHANGES-9.5:1.1.2.2 Sun Apr 28 13:32:07 2024 +++ src/doc/CHANGES-9.5 Sat May 11 14:48:38 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.5,v 1.1.2.2 2024/04/28 13:32:07 martin Exp $ +# $NetBSD: CHANGES-9.5,v 1.1.2.3 2024/05/11 14:48:38 martin Exp $ A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5 release: @@ -24,3 +24,15 @@ sys/dev/usb/usbdevs_data.h (regen) uftdi(4): PR 58127: add some USB serial adapters. [maya, ticket #1837] +sys/arch/hp300/stand/inst/Makefile 1.11 +sys/arch/hp300/stand/uboot/Makefile 1.11 + + hp300: PR 58211: fix hardlinks in /usr/mdec. + [tsutsui, ticket #1838] + +sys/arch/mac68k/dev/pm_direct.c 1.31 + + mac68k: avoid random crashes on some Powerbook models + when using mouse or keyboard. + [nat, ticket #1839] +
CVS commit: [netbsd-9] src/sys/arch/mac68k/dev
Module Name:src
Committed By: martin
Date: Sat May 11 14:47:31 UTC 2024
Modified Files:
src/sys/arch/mac68k/dev [netbsd-9]: pm_direct.c
Log Message:
Pull up following revision(s) (requested by nat in ticket #1839):
sys/arch/mac68k/dev/pm_direct.c: revision 1.31
Return early if PM data is not available.
This avoids random crashes on my Powerbook when using the mouse or keyboard.
The same was needed for the Powerbook 5xx/Duos (compile tested only).
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.34.1 src/sys/arch/mac68k/dev/pm_direct.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/mac68k/dev/pm_direct.c
diff -u src/sys/arch/mac68k/dev/pm_direct.c:1.29 src/sys/arch/mac68k/dev/pm_direct.c:1.29.34.1
--- src/sys/arch/mac68k/dev/pm_direct.c:1.29 Fri Oct 25 20:49:38 2013
+++ src/sys/arch/mac68k/dev/pm_direct.c Sat May 11 14:47:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_direct.c,v 1.29 2013/10/25 20:49:38 martin Exp $ */
+/* $NetBSD: pm_direct.c,v 1.29.34.1 2024/05/11 14:47:31 martin Exp $ */
/*
* Copyright (C) 1997 Takashi Hamada
@@ -32,7 +32,7 @@
/* From: pm_direct.c 1.3 03/18/98 Takashi Hamada */
#include
-__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.29 2013/10/25 20:49:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.29.34.1 2024/05/11 14:47:31 martin Exp $");
#include "opt_adb.h"
@@ -562,6 +562,7 @@ pm_intr_pm1(void *arg)
printf("pm: PM is not ready. error code=%08x\n", rval);
#endif
splx(s);
+ return;
}
if ((pmdata.data[2] & 0x10) == 0x10) {
@@ -821,6 +822,7 @@ pm_intr_pm2(void *arg)
printf("pm: PM is not ready. error code: %08x\n", rval);
#endif
splx(s);
+ return;
}
switch ((u_int)(pmdata.data[2] & 0xff)) {
CVS commit: [netbsd-9] src/sys/arch/mac68k/dev
Module Name:src Committed By: martin Date: Sat May 11 14:47:31 UTC 2024 Modified Files: src/sys/arch/mac68k/dev [netbsd-9]: pm_direct.c Log Message: Pull up following revision(s) (requested by nat in ticket #1839): sys/arch/mac68k/dev/pm_direct.c: revision 1.31 Return early if PM data is not available. This avoids random crashes on my Powerbook when using the mouse or keyboard. The same was needed for the Powerbook 5xx/Duos (compile tested only). To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.29.34.1 src/sys/arch/mac68k/dev/pm_direct.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/sys/arch/mac68k/dev
Module Name:src
Committed By: martin
Date: Sat May 11 14:46:26 UTC 2024
Modified Files:
src/sys/arch/mac68k/dev [netbsd-10]: pm_direct.c
Log Message:
Pull up following revision(s) (requested by nat in ticket #686):
sys/arch/mac68k/dev/pm_direct.c: revision 1.31
Return early if PM data is not available.
This avoids random crashes on my Powerbook when using the mouse or keyboard.
The same was needed for the Powerbook 5xx/Duos (compile tested only).
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.4.1 src/sys/arch/mac68k/dev/pm_direct.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/mac68k/dev/pm_direct.c
diff -u src/sys/arch/mac68k/dev/pm_direct.c:1.30 src/sys/arch/mac68k/dev/pm_direct.c:1.30.4.1
--- src/sys/arch/mac68k/dev/pm_direct.c:1.30 Sat Aug 21 11:55:24 2021
+++ src/sys/arch/mac68k/dev/pm_direct.c Sat May 11 14:46:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_direct.c,v 1.30 2021/08/21 11:55:24 andvar Exp $ */
+/* $NetBSD: pm_direct.c,v 1.30.4.1 2024/05/11 14:46:26 martin Exp $ */
/*
* Copyright (C) 1997 Takashi Hamada
@@ -32,7 +32,7 @@
/* From: pm_direct.c 1.3 03/18/98 Takashi Hamada */
#include
-__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.30 2021/08/21 11:55:24 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.30.4.1 2024/05/11 14:46:26 martin Exp $");
#include "opt_adb.h"
@@ -562,6 +562,7 @@ pm_intr_pm1(void *arg)
printf("pm: PM is not ready. error code=%08x\n", rval);
#endif
splx(s);
+ return;
}
if ((pmdata.data[2] & 0x10) == 0x10) {
@@ -821,6 +822,7 @@ pm_intr_pm2(void *arg)
printf("pm: PM is not ready. error code: %08x\n", rval);
#endif
splx(s);
+ return;
}
switch ((u_int)(pmdata.data[2] & 0xff)) {
CVS commit: [netbsd-10] src/sys/arch/mac68k/dev
Module Name:src Committed By: martin Date: Sat May 11 14:46:26 UTC 2024 Modified Files: src/sys/arch/mac68k/dev [netbsd-10]: pm_direct.c Log Message: Pull up following revision(s) (requested by nat in ticket #686): sys/arch/mac68k/dev/pm_direct.c: revision 1.31 Return early if PM data is not available. This avoids random crashes on my Powerbook when using the mouse or keyboard. The same was needed for the Powerbook 5xx/Duos (compile tested only). To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.30.4.1 src/sys/arch/mac68k/dev/pm_direct.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/sys/arch/hp300/stand/common
Module Name:src Committed By: martin Date: Sat May 11 14:43:00 UTC 2024 Modified Files: src/sys/arch/hp300/stand/common [netbsd-10]: if_le.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #685): sys/arch/hp300/stand/common/if_le.c: revision 1.15 sys/arch/hp300/stand/common/if_le.c: revision 1.16 Avoid an extern declaration in .c file. Just declare it as static. Suggested on tech-userlevel@. Don't panic as a fatal error on receiving packets with invalid length. Such errors could happen on aged and fragile 10BASE-2 hub etc. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/hp300/stand/common/if_le.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/sys/arch/hp300/stand/common
Module Name:src
Committed By: martin
Date: Sat May 11 14:43:00 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/common [netbsd-10]: if_le.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #685):
sys/arch/hp300/stand/common/if_le.c: revision 1.15
sys/arch/hp300/stand/common/if_le.c: revision 1.16
Avoid an extern declaration in .c file. Just declare it as static.
Suggested on tech-userlevel@.
Don't panic as a fatal error on receiving packets with invalid length.
Such errors could happen on aged and fragile 10BASE-2 hub etc.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/hp300/stand/common/if_le.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/hp300/stand/common/if_le.c
diff -u src/sys/arch/hp300/stand/common/if_le.c:1.14 src/sys/arch/hp300/stand/common/if_le.c:1.14.2.1
--- src/sys/arch/hp300/stand/common/if_le.c:1.14 Mon Nov 21 15:36:29 2022
+++ src/sys/arch/hp300/stand/common/if_le.c Sat May 11 14:43:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.14 2022/11/21 15:36:29 tsutsui Exp $ */
+/* $NetBSD: if_le.c,v 1.14.2.1 2024/05/11 14:43:00 martin Exp $ */
/*
* Copyright (c) 1993 Adam Glass
@@ -98,7 +98,7 @@ static struct le_sel le0conf[] = {
};
#define NLE0CONF (sizeof(le0conf) / sizeof(le0conf[0]))
-extern struct netif_stats le_stats[];
+static struct netif_stats le_stats[];
static struct netif_dif le_ifs[] = {
/* dif_unit dif_nsel dif_stats dif_private */
@@ -106,7 +106,7 @@ static struct netif_dif le_ifs[] = {
};
#define NLE_IFS (sizeof(le_ifs) / sizeof(le_ifs[0]))
-struct netif_stats le_stats[NLE_IFS];
+static struct netif_stats le_stats[NLE_IFS];
struct netif_driver le_driver = {
"le", /* netif_bname */
@@ -492,8 +492,9 @@ le_poll(struct iodesc *desc, void *pkt,
printf("le_poll: length %d\n", length);
#endif
if (length >= BUFSIZE) {
+ printf("le%d_poll: invalid length %d, status 0x%x\n",
+ unit, length, stat);
length = 0;
- panic("csr0 when bad things happen: %x", stat);
goto cleanup;
}
if (!length)
CVS commit: [netbsd-9] src/sys/arch/hp300/stand
Module Name:src
Committed By: martin
Date: Sat May 11 14:39:57 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/inst [netbsd-9]: Makefile
src/sys/arch/hp300/stand/uboot [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1838):
sys/arch/hp300/stand/uboot/Makefile: revision 1.11
sys/arch/hp300/stand/inst/Makefile: revision 1.11
Use LINKS to create hard links to generate proper METALOG files.
Also use the default ${PROG} variable and "install" target.
Fixes PR port-hp300/58211.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.170.1 src/sys/arch/hp300/stand/inst/Makefile
cvs rdiff -u -r1.8 -r1.8.198.1 src/sys/arch/hp300/stand/uboot/Makefile
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/hp300/stand/inst/Makefile
diff -u src/sys/arch/hp300/stand/inst/Makefile:1.9 src/sys/arch/hp300/stand/inst/Makefile:1.9.170.1
--- src/sys/arch/hp300/stand/inst/Makefile:1.9 Sun Dec 11 12:17:23 2005
+++ src/sys/arch/hp300/stand/inst/Makefile Sat May 11 14:39:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/11 12:17:23 christos Exp $
+# $NetBSD: Makefile,v 1.9.170.1 2024/05/11 14:39:57 martin Exp $
PROGAOUT= inst
PROGSOURCE= inst.c
@@ -6,16 +6,14 @@ NEWVERSWHAT= "Miniroot Installer"
CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
+LINKS= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_INST
+
.include "../Makefile.buildboot"
-install:
+beforeinstall:
${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
${DESTDIR}${BINDIR}/rbootd
- ${INSTALL} ${COPY} -m 444 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
- inst.lif ${DESTDIR}${BINDIR}/inst.lif
- rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_INST
- ln ${DESTDIR}${BINDIR}/inst.lif ${DESTDIR}${BINDIR}/rbootd/SYS_INST
-release: check_RELEASEDIR .WAIT inst.lif
- ${HOST_INSTALL_FILE} -m ${NONBINMODE} inst.lif \
+release: check_RELEASEDIR .WAIT ${PROG}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
${RELEASEDIR}/${MACHINE}/installation/misc/SYS_INST
Index: src/sys/arch/hp300/stand/uboot/Makefile
diff -u src/sys/arch/hp300/stand/uboot/Makefile:1.8 src/sys/arch/hp300/stand/uboot/Makefile:1.8.198.1
--- src/sys/arch/hp300/stand/uboot/Makefile:1.8 Fri Jan 3 15:34:42 2003
+++ src/sys/arch/hp300/stand/uboot/Makefile Sat May 11 14:39:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/01/03 15:34:42 lukem Exp $
+# $NetBSD: Makefile,v 1.8.198.1 2024/05/11 14:39:57 martin Exp $
PROGAOUT= uboot
PROGSOURCE= uboot.c tgets.c
@@ -6,28 +6,20 @@ NEWVERSWHAT= "Primary Boot"
CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
+LINKS= ${BINDIR}/${PROG} ${BINDIR}/rdboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootrd
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/sdboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootsd
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/ctboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootct
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_UBOOT
+
.include "../Makefile.buildboot"
-install:
+beforeinstall:
${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${BINDIR}/rbootd
- ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 444 \
- uboot.lif ${DESTDIR}${BINDIR}/uboot.lif
- rm -f ${DESTDIR}${BINDIR}/rdboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rdboot
- rm -f ${DESTDIR}${BINDIR}/bootrd
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootrd
- rm -f ${DESTDIR}${BINDIR}/sdboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/sdboot
- rm -f ${DESTDIR}${BINDIR}/bootsd
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootsd
- rm -f ${DESTDIR}${BINDIR}/ctboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/ctboot
- rm -f ${DESTDIR}${BINDIR}/bootct
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootct
- rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
-release: check_RELEASEDIR .WAIT uboot.lif
- ${HOST_INSTALL_FILE} -m ${NONBINMODE} uboot.lif \
+release: check_RELEASEDIR .WAIT ${PROG}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
${RELEASEDIR}/${MACHINE}/installation/misc/SYS_UBOOT
CVS commit: [netbsd-9] src/sys/arch/hp300/stand
Module Name:src
Committed By: martin
Date: Sat May 11 14:39:57 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/inst [netbsd-9]: Makefile
src/sys/arch/hp300/stand/uboot [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1838):
sys/arch/hp300/stand/uboot/Makefile: revision 1.11
sys/arch/hp300/stand/inst/Makefile: revision 1.11
Use LINKS to create hard links to generate proper METALOG files.
Also use the default ${PROG} variable and "install" target.
Fixes PR port-hp300/58211.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.170.1 src/sys/arch/hp300/stand/inst/Makefile
cvs rdiff -u -r1.8 -r1.8.198.1 src/sys/arch/hp300/stand/uboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/hp300/stand
Module Name:src
Committed By: martin
Date: Sat May 11 14:38:40 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/inst [netbsd-10]: Makefile
src/sys/arch/hp300/stand/uboot [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #684):
sys/arch/hp300/stand/uboot/Makefile: revision 1.11
sys/arch/hp300/stand/inst/Makefile: revision 1.11
Use LINKS to create hard links to generate proper METALOG files.
Also use the default ${PROG} variable and "install" target.
Fixes PR port-hp300/58211.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.26.1 src/sys/arch/hp300/stand/inst/Makefile
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/arch/hp300/stand/uboot/Makefile
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/hp300/stand/inst/Makefile
diff -u src/sys/arch/hp300/stand/inst/Makefile:1.10 src/sys/arch/hp300/stand/inst/Makefile:1.10.26.1
--- src/sys/arch/hp300/stand/inst/Makefile:1.10 Mon Sep 23 13:42:36 2019
+++ src/sys/arch/hp300/stand/inst/Makefile Sat May 11 14:38:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:36 christos Exp $
+# $NetBSD: Makefile,v 1.10.26.1 2024/05/11 14:38:40 martin Exp $
PROGAOUT= inst
PROGSOURCE= inst.c
@@ -6,16 +6,14 @@ NEWVERSWHAT= "Miniroot Installer"
CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
+LINKS= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_INST
+
.include "../Makefile.buildboot"
-install:
+beforeinstall:
${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
${DESTDIR}${BINDIR}/rbootd
- ${INSTALL} ${COPY} -m 444 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
- inst.lif ${DESTDIR}${BINDIR}/inst.lif
- rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_INST
- ln ${DESTDIR}${BINDIR}/inst.lif ${DESTDIR}${BINDIR}/rbootd/SYS_INST
-release: check_RELEASEDIR .WAIT inst.lif
- ${HOST_INSTALL_FILE} -m ${NONBINMODE} inst.lif \
+release: check_RELEASEDIR .WAIT ${PROG}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_INST
Index: src/sys/arch/hp300/stand/uboot/Makefile
diff -u src/sys/arch/hp300/stand/uboot/Makefile:1.10 src/sys/arch/hp300/stand/uboot/Makefile:1.10.2.1
--- src/sys/arch/hp300/stand/uboot/Makefile:1.10 Sun Dec 11 07:41:37 2022
+++ src/sys/arch/hp300/stand/uboot/Makefile Sat May 11 14:38:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/12/11 07:41:37 tsutsui Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2024/05/11 14:38:40 martin Exp $
PROGAOUT= uboot
PROGSOURCE= uboot.c tgets.c
@@ -7,28 +7,20 @@ NEWVERSWHAT= "Primary Boot"
CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
CPPFLAGS+= -DSUPPORT_UFS2
+LINKS= ${BINDIR}/${PROG} ${BINDIR}/rdboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootrd
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/sdboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootsd
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/ctboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootct
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_UBOOT
+
.include "../Makefile.buildboot"
-install:
+beforeinstall:
${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${BINDIR}/rbootd
- ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 444 \
- uboot.lif ${DESTDIR}${BINDIR}/uboot.lif
- rm -f ${DESTDIR}${BINDIR}/rdboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rdboot
- rm -f ${DESTDIR}${BINDIR}/bootrd
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootrd
- rm -f ${DESTDIR}${BINDIR}/sdboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/sdboot
- rm -f ${DESTDIR}${BINDIR}/bootsd
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootsd
- rm -f ${DESTDIR}${BINDIR}/ctboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/ctboot
- rm -f ${DESTDIR}${BINDIR}/bootct
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootct
- rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
-release: check_RELEASEDIR .WAIT uboot.lif
- ${HOST_INSTALL_FILE} -m ${NONBINMODE} uboot.lif \
+release: check_RELEASEDIR .WAIT ${PROG}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_UBOOT
CVS commit: [netbsd-10] src/sys/arch/hp300/stand
Module Name:src
Committed By: martin
Date: Sat May 11 14:38:40 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/inst [netbsd-10]: Makefile
src/sys/arch/hp300/stand/uboot [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #684):
sys/arch/hp300/stand/uboot/Makefile: revision 1.11
sys/arch/hp300/stand/inst/Makefile: revision 1.11
Use LINKS to create hard links to generate proper METALOG files.
Also use the default ${PROG} variable and "install" target.
Fixes PR port-hp300/58211.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.26.1 src/sys/arch/hp300/stand/inst/Makefile
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/arch/hp300/stand/uboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-10] xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc
Committed By: martin
Date: Sat May 11 14:34:48 UTC 2024
Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src [netbsd-10]: ws.c
Log Message:
Pull up following revision(s) (requested by nia in ticket #683):
xsrc/external/mit/xf86-input-ws/dist/src/ws.c: revision 1.18
xsrc/external/mit/xf86-input-ws/dist/src/ws.c: revision 1.17
xf86-input-ws: print log message about touchpad scrolling only once.
Only limit the scroll warning, but continue to send the scroll events.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.1 xsrc/external/mit/xf86-input-ws/dist/src/ws.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.16 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.16.2.1
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.16 Sat Dec 4 15:21:55 2021
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Sat May 11 14:34:48 2024
@@ -748,8 +748,12 @@ wsReadInput(InputInfoPtr pInfo)
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
if (hscroll || vscroll) {
- xf86Msg(X_WARNING, "%s: hscroll=%d, vscroll=%d\n",
- pInfo->name, hscroll, vscroll);
+ static int warned = 0;
+ if (!warned) {
+warned = 1;
+xf86Msg(X_WARNING, "%s: hscroll=%d, vscroll=%d\n",
+pInfo->name, hscroll, vscroll);
+ }
valuator_mask_zero(priv->scroll_mask);
valuator_mask_set_double(priv->scroll_mask,
HSCROLL_AXIS, (double) hscroll);
CVS commit: [netbsd-10] xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc Committed By: martin Date: Sat May 11 14:34:48 UTC 2024 Modified Files: xsrc/external/mit/xf86-input-ws/dist/src [netbsd-10]: ws.c Log Message: Pull up following revision(s) (requested by nia in ticket #683): xsrc/external/mit/xf86-input-ws/dist/src/ws.c: revision 1.18 xsrc/external/mit/xf86-input-ws/dist/src/ws.c: revision 1.17 xf86-input-ws: print log message about touchpad scrolling only once. Only limit the scroll warning, but continue to send the scroll events. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.2.1 xsrc/external/mit/xf86-input-ws/dist/src/ws.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
Module Name:src
Committed By: martin
Date: Sat May 11 14:31:57 UTC 2024
Modified Files:
src/distrib/common [netbsd-10]: Makefile.bootcd
src/distrib/common/bootimage [netbsd-10]: Makefile.installimage
src/distrib/i386/cdroms/installcd [netbsd-10]: Makefile
src/share/mk [netbsd-10]: bsd.own.mk
src/sys/arch/i386/conf [netbsd-10]: LEGACY
Log Message:
Pull up following revision(s) (requested by nia in ticket #682):
sys/arch/i386/conf/LEGACY: revision 1.3
distrib/common/Makefile.bootcd: revision 1.48
share/mk/bsd.own.mk: revision 1.1373
distrib/i386/cdroms/installcd/Makefile: revision 1.12
distrib/common/bootimage/Makefile.installimage: revision 1.11
remove redundant kernels and floppies from the space-starved i386 ISO
Turn off MKAMDGPUFIRMWARE on i386
It's too big for the i386 install media and not useful on either
pre-2012 hardware or the kinds of embedded systems where i386 still
thrived after 2012.
(The build of the kernel parts of amdgpu on i386 is nevertheless useful
for finding obscure bugs.)
"go for it" riastradh
i386: disable DRMKMS drivers in LEGACY kernel (this is for ISA)
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.44.6.1 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.10 -r1.10.2.1 \
src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.10 -r1.10.8.1 src/distrib/i386/cdroms/installcd/Makefile
cvs rdiff -u -r1.1289.2.3 -r1.1289.2.4 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.1 -r1.1.54.1 src/sys/arch/i386/conf/LEGACY
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/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.44 src/distrib/common/Makefile.bootcd:1.44.6.1
--- src/distrib/common/Makefile.bootcd:1.44 Sun Oct 11 14:10:04 2020
+++ src/distrib/common/Makefile.bootcd Sat May 11 14:31:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.44 2020/10/11 14:10:04 jmcneill Exp $
+# $NetBSD: Makefile.bootcd,v 1.44.6.1 2024/05/11 14:31:56 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -53,7 +53,7 @@ CDROMS_RELEASEDIR?= ${MACHINE}/installat
CDROMS_RELEASEDIR?= images
.endif
.if defined(CDRELEASE_NOISOS)
-CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
+CDRELEASE_EXCLUDE+= -s ',./installation/cdrom.*,,gp'
.endif
.if defined(CDRELEASE_NODEBUG)
CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.tgz,,gp'
Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.10 src/distrib/common/bootimage/Makefile.installimage:1.10.2.1
--- src/distrib/common/bootimage/Makefile.installimage:1.10 Sat Sep 25 21:26:03 2021
+++ src/distrib/common/bootimage/Makefile.installimage Sat May 11 14:31:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.10 2021/09/25 21:26:03 maya Exp $
+# $NetBSD: Makefile.installimage,v 1.10.2.1 2024/05/11 14:31:57 martin Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -46,7 +46,8 @@ DISKPROTO_IN?= ${NETBSDSRCDIR}/distrib/c
# XXX: no permission info for makefs(8)
IMGDIR_EXTRA= ${RELEASEDIR}/${RELEASEMACHINEDIR} ${RELEASEMACHINEDIR}
-IMGDIR_EXCLUDE= -s ',./installation/cdrom.*,,gp'
+IMGDIR_EXCLUDE+= -s ',./installation/floppy/.*,,gp'
+IMGDIR_EXCLUDE+= -s ',./installation/cdrom.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/installimage.*,,gp'
.if defined(MD_IMGDIR_EXCLUDE)
Index: src/distrib/i386/cdroms/installcd/Makefile
diff -u src/distrib/i386/cdroms/installcd/Makefile:1.10 src/distrib/i386/cdroms/installcd/Makefile:1.10.8.1
--- src/distrib/i386/cdroms/installcd/Makefile:1.10 Mon Sep 23 13:42:33 2019
+++ src/distrib/i386/cdroms/installcd/Makefile Sat May 11 14:31:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:33 christos Exp $
+# $NetBSD: Makefile,v 1.10.8.1 2024/05/11 14:31:57 martin Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -13,6 +13,21 @@ CDRELEASE_NODEBUG= true
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
+# already (probably) booting from CD if using this and the floppy images
+# are 20MB+ when combined
+CDRELEASE_EXCLUDE+= -s ',./installation/floppy/.*,,gp'
+
+# MONOLITHIC (i386-only) was originally added to the release build
+# for upgrades from netbsd-5, and now primarily exists so the no-modules
+# build can continue to be tested. this takes up 20MB+ space.
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/kern-INSTALL.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/kern-MONOLITHIC.${sufx},,gp'
+. endfor
+
+CDRELEASE_EXCLUDE+= -s ',./binary/kernel/netbsd-INSTALL.gz,,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/kernel/netbsd-MONOLITHIC.gz,,gp'
+
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
Index:
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sat May 11 14:31:57 UTC 2024 Modified Files: src/distrib/common [netbsd-10]: Makefile.bootcd src/distrib/common/bootimage [netbsd-10]: Makefile.installimage src/distrib/i386/cdroms/installcd [netbsd-10]: Makefile src/share/mk [netbsd-10]: bsd.own.mk src/sys/arch/i386/conf [netbsd-10]: LEGACY Log Message: Pull up following revision(s) (requested by nia in ticket #682): sys/arch/i386/conf/LEGACY: revision 1.3 distrib/common/Makefile.bootcd: revision 1.48 share/mk/bsd.own.mk: revision 1.1373 distrib/i386/cdroms/installcd/Makefile: revision 1.12 distrib/common/bootimage/Makefile.installimage: revision 1.11 remove redundant kernels and floppies from the space-starved i386 ISO Turn off MKAMDGPUFIRMWARE on i386 It's too big for the i386 install media and not useful on either pre-2012 hardware or the kinds of embedded systems where i386 still thrived after 2012. (The build of the kernel parts of amdgpu on i386 is nevertheless useful for finding obscure bugs.) "go for it" riastradh i386: disable DRMKMS drivers in LEGACY kernel (this is for ISA) To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.44.6.1 src/distrib/common/Makefile.bootcd cvs rdiff -u -r1.10 -r1.10.2.1 \ src/distrib/common/bootimage/Makefile.installimage cvs rdiff -u -r1.10 -r1.10.8.1 src/distrib/i386/cdroms/installcd/Makefile cvs rdiff -u -r1.1289.2.3 -r1.1289.2.4 src/share/mk/bsd.own.mk cvs rdiff -u -r1.1 -r1.1.54.1 src/sys/arch/i386/conf/LEGACY 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
Module Name:src Committed By: martin Date: Sat May 11 14:09:50 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Ammend ticket #655 with additional changes. To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 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.8 src/doc/CHANGES-10.1:1.1.2.9 --- src/doc/CHANGES-10.1:1.1.2.8 Sat May 4 12:05:45 2024 +++ src/doc/CHANGES-10.1 Sat May 11 14:09:50 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.1,v 1.1.2.8 2024/05/04 12:05:45 martin Exp $ +# $NetBSD: CHANGES-10.1,v 1.1.2.9 2024/05/11 14:09:50 martin Exp $ A complete list of changes from the NetBSD 10.0 release on 2024-03-28 until the 10.1 release: @@ -46,7 +46,7 @@ share/mk/bsd.lib.mk1.398,1.399,1.152 [riastradh, ticket #654] share/mk/bsd.own.mk1.1365,1.1366 -sys/arch/aarch64/include/sljit_machdep.h 1.4 +sys/arch/aarch64/include/sljit_machdep.h 1.4,1.5 sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c 1.5 sys/modules/Makefile1.285
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sat May 11 14:09:50 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Ammend ticket #655 with additional changes. To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 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/sys/arch/aarch64/include
Module Name:src Committed By: martin Date: Sat May 11 14:08:32 UTC 2024 Modified Files: src/sys/arch/aarch64/include [netbsd-10]: sljit_machdep.h Log Message: Additionally pull up the following, to fix 32bit compat compilation after ticket #655, requested by riastradh: sys/arch/aarch64/include/sljit_machdep.h1.5 aarch64/sljit_machdep.h: Make this work in compat32 context. To generate a diff of this commit: cvs rdiff -u -r1.3.18.1 -r1.3.18.2 \ src/sys/arch/aarch64/include/sljit_machdep.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/aarch64/include/sljit_machdep.h diff -u src/sys/arch/aarch64/include/sljit_machdep.h:1.3.18.1 src/sys/arch/aarch64/include/sljit_machdep.h:1.3.18.2 --- src/sys/arch/aarch64/include/sljit_machdep.h:1.3.18.1 Thu Apr 18 15:21:55 2024 +++ src/sys/arch/aarch64/include/sljit_machdep.h Sat May 11 14:08:32 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: sljit_machdep.h,v 1.3.18.1 2024/04/18 15:21:55 martin Exp $ */ +/* $NetBSD: sljit_machdep.h,v 1.3.18.2 2024/05/11 14:08:32 martin Exp $ */ /*- * Copyright (c) 2014 Alexander Nasonov. @@ -29,6 +29,12 @@ #ifndef _AARCH64_SLJITARCH_H #define _AARCH64_SLJITARCH_H +#ifndef __aarch64__ /* compat32 */ + +#include + +#else /* __aarch64__ */ + #include #ifdef _KERNEL @@ -56,4 +62,6 @@ (void)__builtin___clear_cache((char *)(from), (char *)(to)) #endif -#endif +#endif /* __aarch64__ (vs compat32) */ + +#endif /* _AARCH64_SLJITARCH_H */
CVS commit: [netbsd-10] src/sys/arch/aarch64/include
Module Name:src Committed By: martin Date: Sat May 11 14:08:32 UTC 2024 Modified Files: src/sys/arch/aarch64/include [netbsd-10]: sljit_machdep.h Log Message: Additionally pull up the following, to fix 32bit compat compilation after ticket #655, requested by riastradh: sys/arch/aarch64/include/sljit_machdep.h1.5 aarch64/sljit_machdep.h: Make this work in compat32 context. To generate a diff of this commit: cvs rdiff -u -r1.3.18.1 -r1.3.18.2 \ src/sys/arch/aarch64/include/sljit_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Sat May 11 10:22:17 UTC 2024
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
Log Message:
PR 58235: add support for SIOCGIFDATA and SIOCZIFDATA ioctls.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.79 -r1.80 src/sys/compat/netbsd32/netbsd32_ioctl.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/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.120 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.121
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.120 Wed Dec 22 00:21:32 2021
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Sat May 11 10:22:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.120 2021/12/22 00:21:32 roy Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.121 2024/05/11 10:22:17 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.120 2021/12/22 00:21:32 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.121 2024/05/11 10:22:17 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -151,6 +151,20 @@ netbsd32_to_oifreq(struct netbsd32_oifre
}
static inline void
+netbsd32_to_ifdatareq(struct netbsd32_ifdatareq *s32p, struct ifdatareq *p, u_long cmd)
+{
+
+ memcpy(p, s32p, sizeof *s32p);
+ switch (cmd) {
+ case SIOCGIFDATA:
+ case SIOCZIFDATA:
+ netbsd32_to_timespec(>ifdr_data.ifi_lastchange,
+ >ifdr_data.ifi_lastchange);
+ break;
+ }
+}
+
+static inline void
netbsd32_to_if_addrprefreq(const struct netbsd32_if_addrprefreq *ifap32,
struct if_addrprefreq *ifap, u_long cmd)
{
@@ -693,6 +707,20 @@ netbsd32_from_oifreq(struct oifreq *p,
}
static inline void
+netbsd32_from_ifdatareq(const struct ifdatareq *p, struct netbsd32_ifdatareq *p32, u_long cmd)
+{
+
+ memcpy(p32, p, sizeof *p32);
+ switch (cmd) {
+ case SIOCGIFDATA:
+ case SIOCZIFDATA:
+ netbsd32_from_timespec(>ifdr_data.ifi_lastchange,
+ >ifdr_data.ifi_lastchange);
+ break;
+ }
+}
+
+static inline void
netbsd32_from_if_addrprefreq(const struct if_addrprefreq *ifap,
struct netbsd32_if_addrprefreq *ifap32, u_long cmd)
{
@@ -1537,6 +1565,10 @@ netbsd32_ioctl(struct lwp *l,
case SIOCSIFADDRPREF32:
IOCTL_STRUCT_CONV_TO(SIOCSIFADDRPREF, if_addrprefreq);
+ case SIOCGIFDATA32:
+ IOCTL_STRUCT_CONV_TO(SIOCGIFDATA, ifdatareq);
+ case SIOCZIFDATA32:
+ IOCTL_STRUCT_CONV_TO(SIOCZIFDATA, ifdatareq);
case OSIOCGIFFLAGS32:
IOCTL_STRUCT_CONV_TO(OSIOCGIFFLAGS, oifreq);
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.79 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.80
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.79 Wed Dec 22 00:21:32 2021
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Sat May 11 10:22:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.79 2021/12/22 00:21:32 roy Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.80 2024/05/11 10:22:17 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -316,6 +316,35 @@ struct netbsd32_if_clonereq {
netbsd32_charp ifcr_buffer;
};
+struct netbsd32_if_data {
+ u_char ifi_type;
+ u_char ifi_addrlen;
+ u_char ifi_hdrlen;
+ u_char __pack_dummy;
+ int ifi_link_state;
+ uint64_t ifi_mtu;
+ uint64_t ifi_metric;
+ uint64_t ifi_baudrate;
+ uint64_t ifi_ipackets;
+ uint64_t ifi_ierrors;
+ uint64_t ifi_opackets;
+ uint64_t ifi_oerrors;
+ uint64_t ifi_collisions;
+ uint64_t ifi_ibytes;
+ uint64_t ifi_obytes;
+ uint64_t ifi_imcasts;
+ uint64_t ifi_omcasts;
+ uint64_t ifi_iqdrops;
+ uint64_t ifi_noproto;
+ struct netbsd32_timespec ifi_lastchange;
+} __packed;
+
+struct netbsd32_ifdatareq {
+ char ifdr_name[IFNAMSIZ]; /* if name, e.g. "en0" */
+ struct netbsd32_if_data ifdr_data;
+};
+
+
/* from */
#define SIOCGADDRROM32 _IOW('i', 240, struct netbsd32_ifreq) /* get 128 bytes of ROM */
#define SIOCGCHIPID32 _IOWR('i', 241, struct netbsd32_ifreq) /* get chipid */
@@ -388,6 +417,10 @@ struct netbsd32_if_clonereq {
#define SIOCGIFMTU32 _IOWR('i', 126, struct netbsd32_ifreq) /* get ifnet mtu */
#define OSIOCGIFMTU32 _IOWR('i', 126, struct netbsd32_oifreq) /* get ifnet mtu */
+
+#define SIOCGIFDATA32 _IOWR('i', 133, struct netbsd32_ifdatareq)
+#define SIOCZIFDATA32 _IOWR('i', 134, struct netbsd32_ifdatareq)
+
/* was 125 SIOCSIFASYNCMAP32 */
/* was 124 SIOCGIFASYNCMAP32 */
/* from */
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: martin Date: Sat May 11 10:22:17 UTC 2024 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h Log Message: PR 58235: add support for SIOCGIFDATA and SIOCZIFDATA ioctls. To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.79 -r1.80 src/sys/compat/netbsd32/netbsd32_ioctl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/mtree
Module Name:src Committed By: martin Date: Tue May 7 14:53:59 UTC 2024 Modified Files: src/tests/usr.bin/mtree: t_sets.sh Log Message: Add manhtml set To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/mtree/t_sets.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/mtree/t_sets.sh diff -u src/tests/usr.bin/mtree/t_sets.sh:1.7 src/tests/usr.bin/mtree/t_sets.sh:1.8 --- src/tests/usr.bin/mtree/t_sets.sh:1.7 Mon May 6 14:38:28 2024 +++ src/tests/usr.bin/mtree/t_sets.sh Tue May 7 14:53:59 2024 @@ -1,4 +1,4 @@ -# $NetBSD: t_sets.sh,v 1.7 2024/05/06 14:38:28 riastradh Exp $ +# $NetBSD: t_sets.sh,v 1.8 2024/05/07 14:53:59 martin Exp $ # # Copyright (c) 2024 The NetBSD Foundation, Inc. # All rights reserved. @@ -51,6 +51,7 @@ set_case dtb set_case games set_case gpufw set_case man +set_case manhtml set_case misc set_case modules set_case rescue
CVS commit: src/tests/usr.bin/mtree
Module Name:src Committed By: martin Date: Tue May 7 14:53:59 UTC 2024 Modified Files: src/tests/usr.bin/mtree: t_sets.sh Log Message: Add manhtml set To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/mtree/t_sets.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Sat May 4 18:57:00 UTC 2024 Modified Files: src/doc [netbsd-8]: LAST_MINUTE src/external/gpl2/groff/tmac [netbsd-8]: mdoc.local src/sys/sys [netbsd-8]: param.h Log Message: Welcome to 8.3 To generate a diff of this commit: cvs rdiff -u -r1.2.60.3 -r1.2.60.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.2.4.7 -r1.2.4.8 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.542.2.11 -r1.542.2.12 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.60.3 src/doc/LAST_MINUTE:1.2.60.4 --- src/doc/LAST_MINUTE:1.2.60.3 Tue Mar 31 05:08:40 2020 +++ src/doc/LAST_MINUTE Sat May 4 18:57:00 2024 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.60.3 2020/03/31 05:08:40 martin Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.60.4 2024/05/04 18:57:00 martin Exp $ -This file contains important information on the NetBSD 8.2 release that +This file contains important information on the NetBSD 8.3 release that did not make it into the main documentation. [all] Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.2.4.7 src/external/gpl2/groff/tmac/mdoc.local:1.2.4.8 --- src/external/gpl2/groff/tmac/mdoc.local:1.2.4.7 Tue Apr 14 15:50:27 2020 +++ src/external/gpl2/groff/tmac/mdoc.local Sat May 4 18:56:59 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.2.4.7 2020/04/14 15:50:27 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.2.4.8 2024/05/04 18:56:59 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~8.2_STABLE +.ds doc-operating-system NetBSD\~8.3 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~8.2_STABLE +.ds doc-default-operating-system NetBSD\~8.3 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -65,6 +65,7 @@ .ds doc-operating-system-NetBSD-8.08.0 .ds doc-operating-system-NetBSD-8.18.1 .ds doc-operating-system-NetBSD-8.28.2 +.ds doc-operating-system-NetBSD-8.38.3 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-5.4 5.4 .ds doc-operating-system-FreeBSD-5.5 5.5 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.542.2.11 src/sys/sys/param.h:1.542.2.12 --- src/sys/sys/param.h:1.542.2.11 Sat Feb 6 15:22:19 2021 +++ src/sys/sys/param.h Sat May 4 18:56:59 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.542.2.11 2021/02/06 15:22:19 martin Exp $ */ +/* $NetBSD: param.h,v 1.542.2.12 2024/05/04 18:56:59 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 80200 /* NetBSD 8.2_STABLE */ +#define __NetBSD_Version__ 80300 /* NetBSD 8.3 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Sat May 4 18:57:00 UTC 2024 Modified Files: src/doc [netbsd-8]: LAST_MINUTE src/external/gpl2/groff/tmac [netbsd-8]: mdoc.local src/sys/sys [netbsd-8]: param.h Log Message: Welcome to 8.3 To generate a diff of this commit: cvs rdiff -u -r1.2.60.3 -r1.2.60.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.2.4.7 -r1.2.4.8 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.542.2.11 -r1.542.2.12 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Sat May 4 18:53:21 UTC 2024
Modified Files:
src/distrib/notes/common [netbsd-8]: main
Log Message:
Prepare for 8.3
To generate a diff of this commit:
cvs rdiff -u -r1.535.2.7 -r1.535.2.8 src/distrib/notes/common/main
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/main
diff -u src/distrib/notes/common/main:1.535.2.7 src/distrib/notes/common/main:1.535.2.8
--- src/distrib/notes/common/main:1.535.2.7 Sun Mar 29 11:59:06 2020
+++ src/distrib/notes/common/main Sat May 4 18:53:21 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.535.2.7 2020/03/29 11:59:06 martin Exp $
+.\" $NetBSD: main,v 1.535.2.8 2024/05/04 18:53:21 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -50,7 +50,7 @@
.as MACHINE_LIST " sgimips shark sparc sparc64 sun2 sun3 vax x68k xen zaurus .
.so \*[.CURDIR]/../common/macros
.
-.Dd May 13, 2019
+.Dd May 4, 2024
.Dt INSTALL 8
.Os NetBSD
.Sh NAME
@@ -480,17 +480,17 @@ would not exist.
.
.if \n[FOR_RELEASE] \{\
.Pp
-.Ss Changes Between The NetBSD 8.1 and 8.2 Releases
+.Ss Changes Between The NetBSD 8.2 and 8.3 Releases
.Pp
The
.Nx
\*V release
-is the first security/critical update of the NetBSD 8 release branch.
+is the third security/critical update of the NetBSD 8 release branch.
It represents a selected subset of fixes deemed important for
security or stability reasons.
The complete list of changes can be found in the
-CHANGES-8.2:
-.Lk https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.2/CHANGES-8.2
+CHANGES-8.3:
+.Lk https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.3/CHANGES-8.3
file in the top level directory of the NetBSD
\*V release
tree.
@@ -568,6 +568,8 @@ Changes between the initial 8.0 branch a
Changes between the 8.0 release and the 8.1 release.
.It Li CHANGES-8.2
Changes between the 8.1 release and the 8.2 release.
+.It Li CHANGES-8.3
+Changes between the 8.2 release and the 8.3 release.
.It Li CHANGES.prev
Changes in previous
.Nx
CVS commit: [netbsd-8] src/distrib/notes/common
Module Name:src Committed By: martin Date: Sat May 4 18:53:21 UTC 2024 Modified Files: src/distrib/notes/common [netbsd-8]: main Log Message: Prepare for 8.3 To generate a diff of this commit: cvs rdiff -u -r1.535.2.7 -r1.535.2.8 src/distrib/notes/common/main 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
Module Name:src Committed By: martin Date: Sat May 4 12:05:45 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Ammend ticket #674 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 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/doc
Module Name:src Committed By: martin Date: Sat May 4 12:05:45 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Ammend ticket #674 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 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.7 src/doc/CHANGES-10.1:1.1.2.8 --- src/doc/CHANGES-10.1:1.1.2.7 Sun Apr 28 13:43:59 2024 +++ src/doc/CHANGES-10.1 Sat May 4 12:05:45 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.1,v 1.1.2.7 2024/04/28 13:43:59 martin Exp $ +# $NetBSD: CHANGES-10.1,v 1.1.2.8 2024/05/04 12:05:45 martin Exp $ A complete list of changes from the NetBSD 10.0 release on 2024-03-28 until the 10.1 release: @@ -167,7 +167,7 @@ sbin/raidctl/raidctl.c1.79 sys/dev/raidframe/raidframeio.h 1.12 sys/dev/raidframe/rf_diskqueue.c 1.64 sys/dev/raidframe/rf_diskqueue.h 1.30 -sys/dev/raidframe/rf_disks.c 1.94 +sys/dev/raidframe/rf_disks.c 1.94,1.95 sys/dev/raidframe/rf_disks.h 1.15 sys/dev/raidframe/rf_driver.c 1.141 sys/dev/raidframe/rf_netbsdkintf.c 1.414
CVS commit: [netbsd-10] src/sys/dev/raidframe
Module Name:src Committed By: martin Date: Sat May 4 12:04:56 UTC 2024 Modified Files: src/sys/dev/raidframe [netbsd-10]: rf_disks.c Log Message: Additionally pull up to fix the llvm build after #674: sys/dev/raidframe/rf_disks.c1.95 snprintf() should really include a format. To generate a diff of this commit: cvs rdiff -u -r1.93.4.1 -r1.93.4.2 src/sys/dev/raidframe/rf_disks.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/sys/dev/raidframe
Module Name:src Committed By: martin Date: Sat May 4 12:04:56 UTC 2024 Modified Files: src/sys/dev/raidframe [netbsd-10]: rf_disks.c Log Message: Additionally pull up to fix the llvm build after #674: sys/dev/raidframe/rf_disks.c1.95 snprintf() should really include a format. To generate a diff of this commit: cvs rdiff -u -r1.93.4.1 -r1.93.4.2 src/sys/dev/raidframe/rf_disks.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/raidframe/rf_disks.c diff -u src/sys/dev/raidframe/rf_disks.c:1.93.4.1 src/sys/dev/raidframe/rf_disks.c:1.93.4.2 --- src/sys/dev/raidframe/rf_disks.c:1.93.4.1 Sun Apr 28 12:09:08 2024 +++ src/sys/dev/raidframe/rf_disks.c Sat May 4 12:04:56 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_disks.c,v 1.93.4.1 2024/04/28 12:09:08 martin Exp $ */ +/* $NetBSD: rf_disks.c,v 1.93.4.2 2024/05/04 12:04:56 martin Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -60,7 +60,7 @@ ***/ #include -__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.93.4.1 2024/04/28 12:09:08 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.93.4.2 2024/05/04 12:04:56 martin Exp $"); #include @@ -1269,9 +1269,9 @@ rf_swap_components(RF_Raid_t *raidPtr, i RF_ASSERT(raidPtr->accesses_suspended == 0); /* Swap the component names... */ - snprintf(tmpdevname, sizeof(tmpdevname),raidPtr->Disks[a].devname); - snprintf(raidPtr->Disks[a].devname, sizeof(raidPtr->Disks[a].devname), raidPtr->Disks[b].devname); - snprintf(raidPtr->Disks[b].devname, sizeof(raidPtr->Disks[b].devname), tmpdevname); + snprintf(tmpdevname, sizeof(tmpdevname), "%s", raidPtr->Disks[a].devname); + snprintf(raidPtr->Disks[a].devname, sizeof(raidPtr->Disks[a].devname), "%s", raidPtr->Disks[b].devname); + snprintf(raidPtr->Disks[b].devname, sizeof(raidPtr->Disks[b].devname), "%s", tmpdevname); /* and the vp */ tmp_ci_vp = raidPtr->raid_cinfo[a].ci_vp;
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: martin Date: Tue Apr 30 18:34:19 UTC 2024 Modified Files: src/distrib/sets/lists/base32: md.amd64 src/distrib/sets/lists/debug32: md.amd64 Log Message: Mark ctf libs as depending on MKCTF To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base32/md.amd64 cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug32/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: martin Date: Tue Apr 30 18:34:19 UTC 2024 Modified Files: src/distrib/sets/lists/base32: md.amd64 src/distrib/sets/lists/debug32: md.amd64 Log Message: Mark ctf libs as depending on MKCTF To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base32/md.amd64 cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug32/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base32/md.amd64 diff -u src/distrib/sets/lists/base32/md.amd64:1.6 src/distrib/sets/lists/base32/md.amd64:1.7 --- src/distrib/sets/lists/base32/md.amd64:1.6 Tue Apr 30 01:18:40 2024 +++ src/distrib/sets/lists/base32/md.amd64 Tue Apr 30 18:34:19 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.6 2024/04/30 01:18:40 macallan Exp $ +# $NetBSD: md.amd64,v 1.7 2024/04/30 18:34:19 martin Exp $ ./lib/i386 base-compat-shlib compat ./lib/i386/npf base-compat-shlib compat,npf ./lib/i386/npf/ext_log.so base-compat-shlib compat,npf @@ -142,9 +142,9 @@ ./usr/lib/i386/libcrypto.so base-compat-shlib compat ./usr/lib/i386/libcrypto.so.15 base-compat-shlib compat ./usr/lib/i386/libcrypto.so.15.0 base-compat-shlib compat -./usr/lib/i386/libctf.so base-compat-shlib compat -./usr/lib/i386/libctf.so.3 base-compat-shlib compat -./usr/lib/i386/libctf.so.3.0 base-compat-shlib compat +./usr/lib/i386/libctf.so base-compat-shlib compat,ctf +./usr/lib/i386/libctf.so.3 base-compat-shlib compat,ctf +./usr/lib/i386/libctf.so.3.0 base-compat-shlib compat,ctf ./usr/lib/i386/libcurses.so base-compat-shlib compat ./usr/lib/i386/libcurses.so.9 base-compat-shlib compat ./usr/lib/i386/libcurses.so.9.1 base-compat-shlib compat Index: src/distrib/sets/lists/debug32/md.amd64 diff -u src/distrib/sets/lists/debug32/md.amd64:1.8 src/distrib/sets/lists/debug32/md.amd64:1.9 --- src/distrib/sets/lists/debug32/md.amd64:1.8 Tue Apr 16 19:15:36 2024 +++ src/distrib/sets/lists/debug32/md.amd64 Tue Apr 30 18:34:19 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.8 2024/04/16 19:15:36 christos Exp $ +# $NetBSD: md.amd64,v 1.9 2024/04/30 18:34:19 martin Exp $ ./usr/lib/i386/i18n/libBIG5_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/i18n/libDECHanyu_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/i18n/libEUCTW_g.a comp-c-debuglib debuglib,compat @@ -211,7 +211,7 @@ ./usr/libdata/debug/usr/lib/i386/libcom_err.so.8.0.debug comp-sys-debug debug,compat,kerberos ./usr/libdata/debug/usr/lib/i386/libcrypt.so.1.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/i386/libcrypto.so.15.0.debug comp-sys-debug debug,compat -./usr/libdata/debug/usr/lib/i386/libctf.so.3.0.debug +./usr/libdata/debug/usr/lib/i386/libctf.so.3.0.debug comp-sys-debug debug,compat,ctf ./usr/libdata/debug/usr/lib/i386/libcurses.so.9.1.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/i386/libdes.so.15.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/i386/libdevmapper.so.1.0.debug comp-sys-debug debug,compat,lvm
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Apr 28 13:43:59 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #672 - #681 To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 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.6 src/doc/CHANGES-10.1:1.1.2.7 --- src/doc/CHANGES-10.1:1.1.2.6 Sat Apr 20 13:27:04 2024 +++ src/doc/CHANGES-10.1 Sun Apr 28 13:43:59 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.1,v 1.1.2.6 2024/04/20 13:27:04 martin Exp $ +# $NetBSD: CHANGES-10.1,v 1.1.2.7 2024/04/28 13:43:59 martin Exp $ A complete list of changes from the NetBSD 10.0 release on 2024-03-28 until the 10.1 release: @@ -151,3 +151,74 @@ sys/uvm/pmap/pmap.h1.27 PR 58006: fix kernel hang in pmap_page_clear_attributes(). [skrll, ticket #671] +distrib/sets/lists/xbase/mi 1.175 +external/mit/xorg/bin/xsetwallpaper/Makefile 1.6 + + PR 58172: install xsetwallpaper(1) manual page. + [jakllsch, ticket #672] + +sys/netinet6/frag6.c1.78 + + inet6: fix calculation of fragment length. + [ozaki-r, ticket #673] + +sbin/raidctl/raidctl.81.80 +sbin/raidctl/raidctl.c1.79 +sys/dev/raidframe/raidframeio.h 1.12 +sys/dev/raidframe/rf_diskqueue.c 1.64 +sys/dev/raidframe/rf_diskqueue.h 1.30 +sys/dev/raidframe/rf_disks.c 1.94 +sys/dev/raidframe/rf_disks.h 1.15 +sys/dev/raidframe/rf_driver.c 1.141 +sys/dev/raidframe/rf_netbsdkintf.c 1.414 +sys/dev/raidframe/rf_raid.h 1.52 +sys/dev/raidframe/rf_reconstruct.c 1.129 + + raid(4): implement hot removal of spares and components. + [oster, ticket #674] + +sbin/raidctl/raidctl.81.81 +sbin/raidctl/raidctl.c1.80 + + raidctl(8): implement single command-line configuration of simple + RAID sets. + [oster, ticket #675] + +sys/dev/usb/uftdi.c1.79 + + uftdi(4): add a match quirk to prevent matching any interface + on SiPEED FPGA development boards (e.g. Tang Nano 9K). + The FT2232s on these boards are wired up only for JTAG. + [thorpej, ticket #676] + +external/gpl3/gcc.old/dist/gcc/cp/cfns.h 1.12 +(applied to external/gpl3/gcc/dist/gcc/cp/cfns.h) +usr.sbin/mtree/create.c1.78 + + Fix tool build on FreeBSD 14 (and possibly other systems). + [hgutch, ticket #677] + +lib/libc/gen/usleep.31.20,1.21 +lib/libc/gen/usleep.c1.21 + + usleep(3): PR 58184: allow calls with useconds >= 100. + [jdolecek, ticket #678] + +sys/dev/usb/uftdi.c1.78 +sys/dev/usb/usbdevs1.815 +sys/dev/usb/usbdevs.h(regen) +sys/dev/usb/usbdevs_data.h (regen) + + uftdi(4): PR 58127: add some USB serial adapters. + [maya, ticket #679] + +libexec/httpd/dir-index-bozo.c 1.37 + + httpd(8): PR 57962: create mobile-friendly directory listings. + [maya, ticket #680] + +etc/Makefile 1.470 + + PR/58200: change "makeobsolete" to use the tool version of sed. + [christos, ticket #681] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Apr 28 13:43:59 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #672 - #681 To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 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/etc
Module Name:src
Committed By: martin
Date: Sun Apr 28 13:42:44 UTC 2024
Modified Files:
src/etc [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by christos in ticket #681):
etc/Makefile: revision 1.470
PR/58200: Kouichi Hashikawa: ./makeobsolete uses platform's sed
To generate a diff of this commit:
cvs rdiff -u -r1.466.2.1 -r1.466.2.2 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.466.2.1 src/etc/Makefile:1.466.2.2
--- src/etc/Makefile:1.466.2.1 Mon Sep 4 17:33:28 2023
+++ src/etc/Makefile Sun Apr 28 13:42:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.466.2.1 2023/09/04 17:33:28 martin Exp $
+# $NetBSD: Makefile,v 1.466.2.2 2024/04/28 13:42:44 martin Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -393,10 +393,10 @@ install-obsolete-lists: .PHONY .MAKE
mkdir -p ${OBSOLETE.dir}
.if ${MKX11} != "no"
(cd ${NETBSDSRCDIR}/distrib/sets && \
- AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
+ AWK=${TOOL_AWK:Q} SED=${TOOL_SED:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
.else
(cd ${NETBSDSRCDIR}/distrib/sets && \
- AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir})
+ AWK=${TOOL_AWK:Q} SED=${TOOL_SED:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir})
.endif
.for file in ${OBSOLETE.files}
${_MKMSG_INSTALL} ${DESTDIR}/var/db/obsolete/${file}
CVS commit: [netbsd-10] src/etc
Module Name:src Committed By: martin Date: Sun Apr 28 13:42:44 UTC 2024 Modified Files: src/etc [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by christos in ticket #681): etc/Makefile: revision 1.470 PR/58200: Kouichi Hashikawa: ./makeobsolete uses platform's sed To generate a diff of this commit: cvs rdiff -u -r1.466.2.1 -r1.466.2.2 src/etc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/libexec/httpd
Module Name:src Committed By: martin Date: Sun Apr 28 13:33:52 UTC 2024 Modified Files: src/libexec/httpd [netbsd-10]: dir-index-bozo.c Log Message: Pull up following revision(s) (requested by maya in ticket #680): libexec/httpd/dir-index-bozo.c: revision 1.37 Create mobile-friendly directory listings A typical mobile browser on a smartphone assumes a page without a "viewport" tag is designed for desktop browsers. It displays the page in a virtual window that simulates a wider screen and does not adjust it for the phone's pixel density. The usual result is that the content on the page looks small, and interacting with the page comfortably and precisely requires zoom. This is currently the case with bozohttpd directory listing pages. from D. Bohdan in PR bin/57962 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.2.1 src/libexec/httpd/dir-index-bozo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/dir-index-bozo.c diff -u src/libexec/httpd/dir-index-bozo.c:1.36 src/libexec/httpd/dir-index-bozo.c:1.36.2.1 --- src/libexec/httpd/dir-index-bozo.c:1.36 Wed May 18 00:37:11 2022 +++ src/libexec/httpd/dir-index-bozo.c Sun Apr 28 13:33:52 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: dir-index-bozo.c,v 1.36 2022/05/18 00:37:11 mrg Exp $ */ +/* $NetBSD: dir-index-bozo.c,v 1.36.2.1 2024/04/28 13:33:52 martin Exp $ */ /* $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $ */ @@ -123,6 +123,7 @@ bozo_dir_index(bozo_httpreq_t *request, bozo_printf(httpd, "\r\n" "\r\n" + "\r\n"
CVS commit: [netbsd-10] src/libexec/httpd
Module Name:src Committed By: martin Date: Sun Apr 28 13:33:52 UTC 2024 Modified Files: src/libexec/httpd [netbsd-10]: dir-index-bozo.c Log Message: Pull up following revision(s) (requested by maya in ticket #680): libexec/httpd/dir-index-bozo.c: revision 1.37 Create mobile-friendly directory listings A typical mobile browser on a smartphone assumes a page without a "viewport" tag is designed for desktop browsers. It displays the page in a virtual window that simulates a wider screen and does not adjust it for the phone's pixel density. The usual result is that the content on the page looks small, and interacting with the page comfortably and precisely requires zoom. This is currently the case with bozohttpd directory listing pages. from D. Bohdan in PR bin/57962 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.2.1 src/libexec/httpd/dir-index-bozo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Apr 28 13:32:07 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Tickets #1836 and #1837 To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 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.1 src/doc/CHANGES-9.5:1.1.2.2 --- src/doc/CHANGES-9.5:1.1.2.1 Sun Apr 28 10:11:21 2024 +++ src/doc/CHANGES-9.5 Sun Apr 28 13:32:07 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.5,v 1.1.2.1 2024/04/28 10:11:21 martin Exp $ +# $NetBSD: CHANGES-9.5,v 1.1.2.2 2024/04/28 13:32:07 martin Exp $ A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5 release: @@ -11,4 +11,16 @@ doc/CHANGES-9.5 added Welcome to 9.4_STABLE. [martin] +sys/netinet6/frag6.c1.78 + + inet6: fix calculation of fragment length. + [ozaki-r, ticket #1836] + +sys/dev/usb/uftdi.c1.78 +sys/dev/usb/usbdevs1.815 +sys/dev/usb/usbdevs.h(regen) +sys/dev/usb/usbdevs_data.h (regen) + + uftdi(4): PR 58127: add some USB serial adapters. + [maya, ticket #1837]
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Apr 28 13:32:07 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Tickets #1836 and #1837 To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 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/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Apr 28 13:30:11 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-9]: usbdevs.h usbdevs_data.h Log Message: Regen for ticket #1837 To generate a diff of this commit: cvs rdiff -u -r1.760.4.13 -r1.760.4.14 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sun Apr 28 13:29:40 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-9]: uftdi.c usbdevs
Log Message:
Pull up following revision(s) (requested by maya in ticket #1837):
sys/dev/usb/uftdi.c: revision 1.78
sys/dev/usb/usbdevs: revision 1.815
Add some USB serial adapters
>From Cameron Williams in PR kern/58127
Add support for a range of USB serial adapters
>From Cameron Williams in PR kern/58127
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.70.2.1 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.770.4.13 -r1.770.4.14 src/sys/dev/usb/usbdevs
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/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.70 src/sys/dev/usb/uftdi.c:1.70.2.1
--- src/sys/dev/usb/uftdi.c:1.70 Thu May 9 02:43:35 2019
+++ src/sys/dev/usb/uftdi.c Sun Apr 28 13:29:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.70 2019/05/09 02:43:35 mrg Exp $ */
+/* $NetBSD: uftdi.c,v 1.70.2.1 2024/04/28 13:29:40 martin Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.70 2019/05/09 02:43:35 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.70.2.1 2024/04/28 13:29:40 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -122,6 +122,25 @@ struct ucom_methods uftdi_methods = {
*/
static const struct usb_devno uftdi_devs[] = {
{ USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US101 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US159 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US235 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US257 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_78 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US313 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US320 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US324 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_78 },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X },
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.770.4.13 src/sys/dev/usb/usbdevs:1.770.4.14
--- src/sys/dev/usb/usbdevs:1.770.4.13 Fri Feb 17 17:40:28 2023
+++ src/sys/dev/usb/usbdevs Sun Apr 28 13:29:40 2024
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.770.4.13 2023/02/17 17:40:28 martin Exp $
+$NetBSD: usbdevs,v 1.770.4.14 2024/04/28 13:29:40 martin Exp $
/*-
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1110,6 +1110,27 @@ product BILLIONTON USBEL100 0x0988 USB10
product BILLIONTON USBE100 0x8511 USBE100
product BILLIONTON USB2AR 0x90ff USB2AR Ethernet
+/* Brainboxes Limited products */
+product BRAINBOXES US101 0x1011 US-101 USB2Serial 1xRS232
+product BRAINBOXES US159 0x1021 US-159 USB2Serial 1xRS232
+product BRAINBOXES US235 0x1017 US-235 USB2Serial 1xRS232
+product BRAINBOXES US257 0x5001 US-257 USB2Serial 2xRS232
+product BRAINBOXES US279_12 0x2021 US-279 USB2Serial 8xRS232 (Port 1 and 2)
+product BRAINBOXES US279_34 0x2022 US-279 USB2Serial 8xRS232 (Port 3 and 4)
+product BRAINBOXES US279_56 0x2023 US-279 USB2Serial 8xRS232 (Port 5 and 6)
+product BRAINBOXES US279_78 0x2024 US-279 USB2Serial 8xRS232 (Port 7 and 8)
+product BRAINBOXES US313 0x6001 US-313 USB2Serial 2xRS422/485
+product BRAINBOXES US320 0x1019 US-320 USB2Serial 1xRS422/485
+product BRAINBOXES US324 0x1013 US-324 USB2Serial 1xRS422/485
+product BRAINBOXES US346_12 0x3011 US-346 USB2Serial 4xRS422/485 (Port 1 and 2)
+product BRAINBOXES US346_34 0x3012 US-346 USB2Serial 4xRS422/485 (Port 3 and 4)
+product BRAINBOXES US701_12 0x2011 US-701 USB2Serial 4xRS232 (Port 1 and 2)
+product BRAINBOXES US701_34 0x2012 US-701 USB2Serial 4xRS232 (Port 3 and 4)
+product BRAINBOXES US842_12 0x8001 US-842 USB2Serial 8xRS422/485 (Port 1 and 2)
+product BRAINBOXES US842_34 0x8002 US-842 USB2Serial 8xRS422/485 (Port 3 and 4)
+product BRAINBOXES US842_56 0x8003 US-842 USB2Serial 8xRS422/485 (Port 5 and 6)
+product BRAINBOXES US842_78 0x8004 US-842 USB2Serial 8xRS422/485 (Port 7 and 8)
+
/* Broadcom products */
product BROADCOM BCMFW 0x0bdc BCMFW
product BROADCOM
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Apr 28 13:29:40 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-9]: uftdi.c usbdevs Log Message: Pull up following revision(s) (requested by maya in ticket #1837): sys/dev/usb/uftdi.c: revision 1.78 sys/dev/usb/usbdevs: revision 1.815 Add some USB serial adapters >From Cameron Williams in PR kern/58127 Add support for a range of USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.70.2.1 src/sys/dev/usb/uftdi.c cvs rdiff -u -r1.770.4.13 -r1.770.4.14 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Apr 28 13:27:17 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-10]: usbdevs.h usbdevs_data.h Log Message: Regen for ticket #679 To generate a diff of this commit: cvs rdiff -u -r1.798.4.2 -r1.798.4.3 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sun Apr 28 13:26:36 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-10]: uftdi.c usbdevs
Log Message:
Pull up following revision(s) (requested by maya in ticket #679):
sys/dev/usb/uftdi.c: revision 1.78
sys/dev/usb/usbdevs: revision 1.815
Add some USB serial adapters
>From Cameron Williams in PR kern/58127
Add support for a range of USB serial adapters
>From Cameron Williams in PR kern/58127
To generate a diff of this commit:
cvs rdiff -u -r1.76.6.2 -r1.76.6.3 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.806.4.2 -r1.806.4.3 src/sys/dev/usb/usbdevs
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/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.76.6.2 src/sys/dev/usb/uftdi.c:1.76.6.3
--- src/sys/dev/usb/uftdi.c:1.76.6.2 Sun Apr 28 13:07:17 2024
+++ src/sys/dev/usb/uftdi.c Sun Apr 28 13:26:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.76.6.2 2024/04/28 13:07:17 martin Exp $ */
+/* $NetBSD: uftdi.c,v 1.76.6.3 2024/04/28 13:26:36 martin Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.2 2024/04/28 13:07:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.3 2024/04/28 13:26:36 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -126,6 +126,25 @@ static const struct ucom_methods uftdi_m
*/
static const struct usb_devno uftdi_devs[] = {
{ USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US101 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US159 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US235 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US257 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_78 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US313 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US320 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US324 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_78 },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X },
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.806.4.2 src/sys/dev/usb/usbdevs:1.806.4.3
--- src/sys/dev/usb/usbdevs:1.806.4.2 Sun Jan 14 15:51:05 2024
+++ src/sys/dev/usb/usbdevs Sun Apr 28 13:26:36 2024
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.806.4.2 2024/01/14 15:51:05 martin Exp $
+$NetBSD: usbdevs,v 1.806.4.3 2024/04/28 13:26:36 martin Exp $
/*-
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1116,6 +1116,27 @@ product BILLIONTON USBEL100 0x0988 USB10
product BILLIONTON USBE100 0x8511 USBE100
product BILLIONTON USB2AR 0x90ff USB2AR Ethernet
+/* Brainboxes Limited products */
+product BRAINBOXES US101 0x1011 US-101 USB2Serial 1xRS232
+product BRAINBOXES US159 0x1021 US-159 USB2Serial 1xRS232
+product BRAINBOXES US235 0x1017 US-235 USB2Serial 1xRS232
+product BRAINBOXES US257 0x5001 US-257 USB2Serial 2xRS232
+product BRAINBOXES US279_12 0x2021 US-279 USB2Serial 8xRS232 (Port 1 and 2)
+product BRAINBOXES US279_34 0x2022 US-279 USB2Serial 8xRS232 (Port 3 and 4)
+product BRAINBOXES US279_56 0x2023 US-279 USB2Serial 8xRS232 (Port 5 and 6)
+product BRAINBOXES US279_78 0x2024 US-279 USB2Serial 8xRS232 (Port 7 and 8)
+product BRAINBOXES US313 0x6001 US-313 USB2Serial 2xRS422/485
+product BRAINBOXES US320 0x1019 US-320 USB2Serial 1xRS422/485
+product BRAINBOXES US324 0x1013 US-324 USB2Serial 1xRS422/485
+product BRAINBOXES US346_12 0x3011 US-346 USB2Serial 4xRS422/485 (Port 1 and 2)
+product BRAINBOXES US346_34 0x3012 US-346 USB2Serial 4xRS422/485 (Port 3 and 4)
+product BRAINBOXES US701_12 0x2011 US-701 USB2Serial 4xRS232 (Port 1 and 2)
+product BRAINBOXES US701_34 0x2012 US-701 USB2Serial 4xRS232 (Port 3 and 4)
+product BRAINBOXES US842_12 0x8001 US-842 USB2Serial 8xRS422/485 (Port 1 and 2)
+product BRAINBOXES US842_34 0x8002 US-842 USB2Serial 8xRS422/485 (Port 3 and 4)
+product BRAINBOXES US842_56 0x8003 US-842 USB2Serial 8xRS422/485 (Port 5 and 6)
+product BRAINBOXES US842_78 0x8004 US-842 USB2Serial 8xRS422/485 (Port 7 and 8)
+
/* Broadcom products */
product BROADCOM BCMFW 0x0bdc
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Apr 28 13:26:36 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-10]: uftdi.c usbdevs Log Message: Pull up following revision(s) (requested by maya in ticket #679): sys/dev/usb/uftdi.c: revision 1.78 sys/dev/usb/usbdevs: revision 1.815 Add some USB serial adapters >From Cameron Williams in PR kern/58127 Add support for a range of USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.76.6.2 -r1.76.6.3 src/sys/dev/usb/uftdi.c cvs rdiff -u -r1.806.4.2 -r1.806.4.3 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libc/gen
Module Name:src Committed By: martin Date: Sun Apr 28 13:23:20 UTC 2024 Modified Files: src/lib/libc/gen [netbsd-10]: usleep.3 usleep.c Log Message: Pull up following revision(s) (requested by jdolecek in ticket #678): lib/libc/gen/usleep.c: revision 1.21 lib/libc/gen/usleep.3: revision 1.20 lib/libc/gen/usleep.3: revision 1.21 allow usleep(3) with useconds >= 100 update manpage to mention this interface is obsolete, remove EINVAL from the ERRORS and mention EINTR instead. PR lib/58184 by Taylor R Campbell it's nanosleep(2), not nanosleep(3) To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.19.56.1 src/lib/libc/gen/usleep.3 cvs rdiff -u -r1.20 -r1.20.42.1 src/lib/libc/gen/usleep.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/lib/libc/gen
Module Name:src
Committed By: martin
Date: Sun Apr 28 13:23:20 UTC 2024
Modified Files:
src/lib/libc/gen [netbsd-10]: usleep.3 usleep.c
Log Message:
Pull up following revision(s) (requested by jdolecek in ticket #678):
lib/libc/gen/usleep.c: revision 1.21
lib/libc/gen/usleep.3: revision 1.20
lib/libc/gen/usleep.3: revision 1.21
allow usleep(3) with useconds >= 100
update manpage to mention this interface is obsolete, remove
EINVAL from the ERRORS and mention EINTR instead.
PR lib/58184 by Taylor R Campbell
it's nanosleep(2), not nanosleep(3)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.56.1 src/lib/libc/gen/usleep.3
cvs rdiff -u -r1.20 -r1.20.42.1 src/lib/libc/gen/usleep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/usleep.3
diff -u src/lib/libc/gen/usleep.3:1.19 src/lib/libc/gen/usleep.3:1.19.56.1
--- src/lib/libc/gen/usleep.3:1.19 Thu Apr 29 17:29:56 2010
+++ src/lib/libc/gen/usleep.3 Sun Apr 28 13:23:20 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: usleep.3,v 1.19 2010/04/29 17:29:56 jruoho Exp $
+.\" $NetBSD: usleep.3,v 1.19.56.1 2024/04/28 13:23:20 martin Exp $
.\"
.\" Copyright (c) 1986, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)usleep.3 8.1 (Berkeley) 6/4/93
.\"
-.Dd April 29, 2010
+.Dd April 22, 2024
.Dt USLEEP 3
.Os
.Sh NAME
@@ -42,6 +42,11 @@
.Ft int
.Fn usleep "useconds_t microseconds"
.Sh DESCRIPTION
+.Bf -symbolic
+This interface is obsoleted by
+.Xr nanosleep 2 .
+.Ef
+.Pp
The
.Fn usleep
function
@@ -53,13 +58,6 @@ action is to invoke a signal catching fu
process.
The suspension time may be longer than requested due to the
scheduling of other activity by the system.
-.Pp
-The
-.Fa microseconds
-argument must be less than 1,000,000.
-If the value of
-.Fa microseconds
-is 0, then the call has no effect.
.Sh RETURN VALUES
On successful completion,
.Fn usleep
@@ -72,10 +70,9 @@ The
.Fn usleep
function may fail if:
.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa microseconds
-interval specified 1,000,000 or more microseconds.
+.It Bq Er EINTR
+.Nm
+was interrupted by the delivery of a signal.
.El
.Sh SEE ALSO
.Xr nanosleep 2 ,
Index: src/lib/libc/gen/usleep.c
diff -u src/lib/libc/gen/usleep.c:1.20 src/lib/libc/gen/usleep.c:1.20.42.1
--- src/lib/libc/gen/usleep.c:1.20 Mon Jun 25 22:32:44 2012
+++ src/lib/libc/gen/usleep.c Sun Apr 28 13:23:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: usleep.c,v 1.20 2012/06/25 22:32:44 abs Exp $ */
+/* $NetBSD: usleep.c,v 1.20.42.1 2024/04/28 13:23:20 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: usleep.c,v 1.20 2012/06/25 22:32:44 abs Exp $");
+__RCSID("$NetBSD: usleep.c,v 1.20.42.1 2024/04/28 13:23:20 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -51,13 +51,8 @@ usleep(useconds_t useconds)
if (useconds == 0)
return (0);
- if (useconds >= 100) {
- errno = EINVAL;
- return (-1);
- }
-
- ts.tv_sec = 0;
- ts.tv_nsec = useconds * 1000;
+ ts.tv_sec = (useconds / 100);
+ ts.tv_nsec = (useconds % 100) * 1000;
nanosleep(, NULL);
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Sun Apr 28 13:19:21 UTC 2024
Modified Files:
src/external/gpl3/gcc/dist/gcc/cp [netbsd-10]: cfns.h
src/usr.sbin/mtree [netbsd-10]: create.c
Log Message:
Pull up following revision(s) (requested by hgutch in ticket #677):
usr.sbin/mtree/create.c: revision 1.78
external/gpl3/gcc.old/dist/gcc/cp/cfns.h: revision 1.12
(applied to external/gpl3/gcc/dist/gcc/cp/cfns.h)
For the NetBSD tools build we provide our own fts.h not FreeBSD's so the
comparator should have the NetBSD signature.
Fix gcc build on FreeBSD 14 (and possibly other systems using clang >= 16).
Pointed out by Eirik �verby.
OK mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.6.1 src/external/gpl3/gcc/dist/gcc/cp/cfns.h
cvs rdiff -u -r1.76 -r1.76.10.1 src/usr.sbin/mtree/create.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/cp/cfns.h
diff -u src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.7 src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.7.6.1
--- src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.7 Sun Apr 11 00:02:15 2021
+++ src/external/gpl3/gcc/dist/gcc/cp/cfns.h Sun Apr 28 13:19:21 2024
@@ -60,7 +60,7 @@ public:
};
inline unsigned int
-libc_name::hash (register const char *str, register unsigned int len)
+libc_name::hash (const char *str, unsigned int len)
{
static const unsigned short asso_values[] =
{
@@ -91,7 +91,7 @@ libc_name::hash (register const char *st
1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488,
1488, 1488, 1488, 1488, 1488, 1488, 1488
};
- register int hval = len;
+ int hval = len;
switch (hval)
{
@@ -118,7 +118,7 @@ libc_name::hash (register const char *st
}
const struct libc_name_struct *
-libc_name::libc_name_p (register const char *str, register unsigned int len)
+libc_name::libc_name_p (const char *str, unsigned int len)
{
enum
{
@@ -1116,15 +1116,15 @@ libc_name::libc_name_p (register const c
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
- register int key = hash (str, len);
+ int key = hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
- register int index = lookup[key];
+ int index = lookup[key];
if (index >= 0)
{
- register const char *s = wordlist[index].name;
+ const char *s = wordlist[index].name;
if (*str == *s && !strcmp (str + 1, s + 1))
return [index];
Index: src/usr.sbin/mtree/create.c
diff -u src/usr.sbin/mtree/create.c:1.76 src/usr.sbin/mtree/create.c:1.76.10.1
--- src/usr.sbin/mtree/create.c:1.76 Sun Nov 18 23:03:36 2018
+++ src/usr.sbin/mtree/create.c Sun Apr 28 13:19:21 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: create.c,v 1.76 2018/11/18 23:03:36 sevan Exp $ */
+/* $NetBSD: create.c,v 1.76.10.1 2024/04/28 13:19:21 martin Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: create.c,v 1.76 2018/11/18 23:03:36 sevan Exp $");
+__RCSID("$NetBSD: create.c,v 1.76.10.1 2024/04/28 13:19:21 martin Exp $");
#endif
#endif /* not lint */
@@ -84,7 +84,7 @@ static uid_t uid;
static mode_t mode;
static u_long flags;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && !defined(HAVE_NBTOOL_CONFIG_H)
#define FTS_CONST const
#else
#define FTS_CONST
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sun Apr 28 13:19:21 UTC 2024 Modified Files: src/external/gpl3/gcc/dist/gcc/cp [netbsd-10]: cfns.h src/usr.sbin/mtree [netbsd-10]: create.c Log Message: Pull up following revision(s) (requested by hgutch in ticket #677): usr.sbin/mtree/create.c: revision 1.78 external/gpl3/gcc.old/dist/gcc/cp/cfns.h: revision 1.12 (applied to external/gpl3/gcc/dist/gcc/cp/cfns.h) For the NetBSD tools build we provide our own fts.h not FreeBSD's so the comparator should have the NetBSD signature. Fix gcc build on FreeBSD 14 (and possibly other systems using clang >= 16). Pointed out by Eirik �verby. OK mrg@ To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.6.1 src/external/gpl3/gcc/dist/gcc/cp/cfns.h cvs rdiff -u -r1.76 -r1.76.10.1 src/usr.sbin/mtree/create.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/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sun Apr 28 13:07:17 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-10]: uftdi.c
Log Message:
Pull up following revision(s) (requested by thorpej in ticket #676):
sys/dev/usb/uftdi.c: revision 1.79
Add a match quirk to prevent matching any interface on SiPEED FPGA
development boards (e.g. Tang Nano 9K). The FT2232s on these boards
are wired up only for JTAG.
To generate a diff of this commit:
cvs rdiff -u -r1.76.6.1 -r1.76.6.2 src/sys/dev/usb/uftdi.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/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.76.6.1 src/sys/dev/usb/uftdi.c:1.76.6.2
--- src/sys/dev/usb/uftdi.c:1.76.6.1 Tue Apr 16 18:45:39 2024
+++ src/sys/dev/usb/uftdi.c Sun Apr 28 13:07:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.76.6.1 2024/04/16 18:45:39 martin Exp $ */
+/* $NetBSD: uftdi.c,v 1.76.6.2 2024/04/28 13:07:17 martin Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.1 2024/04/16 18:45:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.2 2024/04/28 13:07:17 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -210,7 +210,19 @@ static const struct uftdi_match_quirk_en
.vendor_str = "SecuringHardware.com",
.product_str = "Tigard V1.1",
.match_ret = UMATCH_NONE,
- }
+ },
+ /*
+ * The SiPEED Tang Nano 9K (and other SiPEED Tang FPGA development
+ * boards) have an FT2232 on-board, wired up only for JTAG.
+ */
+ {
+ .vendor_id = USB_VENDOR_FTDI,
+ .product_id = USB_PRODUCT_FTDI_SERIAL_2232C,
+ .iface_no = -1,
+ .vendor_str = "SIPEED",
+ .product_str = "JTAG Debugger",
+ .match_ret = UMATCH_NONE,
+ },
};
static int
@@ -224,7 +236,7 @@ uftdi_quirk_match(struct usbif_attach_ar
q = _match_quirks[i];
if (uiaa->uiaa_vendor != q->vendor_id ||
uiaa->uiaa_product != q->product_id ||
- uiaa->uiaa_ifaceno != q->iface_no) {
+ (q->iface_no != -1 && uiaa->uiaa_ifaceno != q->iface_no)) {
continue;
}
if (q->vendor_str != NULL &&
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Apr 28 13:07:17 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-10]: uftdi.c Log Message: Pull up following revision(s) (requested by thorpej in ticket #676): sys/dev/usb/uftdi.c: revision 1.79 Add a match quirk to prevent matching any interface on SiPEED FPGA development boards (e.g. Tang Nano 9K). The FT2232s on these boards are wired up only for JTAG. To generate a diff of this commit: cvs rdiff -u -r1.76.6.1 -r1.76.6.2 src/sys/dev/usb/uftdi.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/sbin/raidctl
Module Name:src Committed By: martin Date: Sun Apr 28 12:12:00 UTC 2024 Modified Files: src/sbin/raidctl [netbsd-10]: raidctl.8 raidctl.c Log Message: Pull up following revision(s) (requested by oster in ticket #675): sbin/raidctl/raidctl.8: revision 1.81 sbin/raidctl/raidctl.c: revision 1.80 Implement command-line configuration of simple RAID sets with raidctl based on the usage pattern: raidctl create... For example, raidctl raid0 create mirror absent /dev/wd1e will create a RAID level 1 (mirror) set with an absent first component and /dev/wd1e as the second component. The resulting RAID device will be marked as auto-configurable, will have a serial number set (based on the current time), and parity will be initialized. Reasonable performance values are automatically used by default for other parameters normally specified in the configuration file. Also: Only print out Autoconfig status if being verbose. To generate a diff of this commit: cvs rdiff -u -r1.79.2.1 -r1.79.2.2 src/sbin/raidctl/raidctl.8 cvs rdiff -u -r1.78.2.1 -r1.78.2.2 src/sbin/raidctl/raidctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.79.2.1 src/sbin/raidctl/raidctl.8:1.79.2.2 --- src/sbin/raidctl/raidctl.8:1.79.2.1 Sun Apr 28 12:09:08 2024 +++ src/sbin/raidctl/raidctl.8 Sun Apr 28 12:12:00 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: raidctl.8,v 1.79.2.1 2024/04/28 12:09:08 martin Exp $ +.\" $NetBSD: raidctl.8,v 1.79.2.2 2024/04/28 12:12:00 martin Exp $ .\" .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -53,7 +53,7 @@ .\" any improvements or extensions that they make and grant Carnegie the .\" rights to redistribute these changes. .\" -.Dd September 16, 2023 +.Dd September 20, 2023 .Dt RAIDCTL 8 .Os .Sh NAME @@ -61,6 +61,10 @@ .Nd configuration utility for the RAIDframe disk driver .Sh SYNOPSIS .Nm +.Ar dev +.Ar command +.Op Ar arg Op ... +.Nm .Op Fl v .Fl A Op yes | no | forceroot | softroot .Ar dev @@ -148,7 +152,27 @@ For more information about the RAIDframe This document assumes the reader has at least rudimentary knowledge of RAID and RAID concepts. .Pp -The command-line options for +The simplified command-line options for +.Nm +are as follows: +.Bl -tag -width indent +.It Ic create Ar level Ar component1 Ar component2 Ar ... +where +.Ar level +specifies the RAID level and is one of +.Ar 0 +, +.Ar 1 +(or +.Ar mirror +), or +.Ar 5 +and each of +.Ar componentN +specify the devices to be configured into the RAID set. +.El +.Pp +The advanced command-line options for .Nm are as follows: .Bl -tag -width indent @@ -370,6 +394,38 @@ for many others, or just simply .Pa /dev/rraid0[cd] ) . It is recommended that the partitions used to represent the RAID device are not used for file systems. +.Ss Simple RAID configuration +For simple RAID configurations using RAID levels 0 (simple striping), +1 (mirroring), or 5 (striping with distributed parity) +.Nm +supports command-line configuration of RAID setups without +the use of a configuration file. For example, +.Bd -literal -offset indent +raidctl raid0 create 0 /dev/wd0e /dev/wd1e /dev/wd2e +.Ed +.Pp +will create a RAID level 0 set on the device named +.Pa raid0 +using the components +.Pa /dev/wd0e , +.Pa /dev/wd1e , +and +.Pa /dev/wd2e . +Similarly, +.Bd -literal -offset indent +raidctl raid0 create mirror absent /dev/wd1e +.Ed +.Pp +will create a RAID level 1 (mirror) set with an absent first component +and +.Pa /dev/wd1e +as the second component. In all cases the resulting RAID device will +be marked as auto-configurable, will have a serial number set (based +on the current time), and parity will be initialized (if the RAID level +has parity and sufficent components are present). Reasonable +performance values are automatically used by default for other +parameters normally specified in the configuration file. +.Pp .Ss Configuration file The format of the configuration file is complex, and only an abbreviated treatment is given here. @@ -540,6 +596,10 @@ for a more complete configuration file e device special files. .El .Sh EXAMPLES +The examples given in this section are for more complex +setups than can be configured with the simplified command-line +configuration option described early. +.Pp It is highly recommended that before using the RAID driver for real file systems that the system administrator(s) become quite familiar with the use of Index: src/sbin/raidctl/raidctl.c diff -u src/sbin/raidctl/raidctl.c:1.78.2.1 src/sbin/raidctl/raidctl.c:1.78.2.2 --- src/sbin/raidctl/raidctl.c:1.78.2.1 Sun Apr 28 12:09:08 2024 +++ src/sbin/raidctl/raidctl.c Sun Apr 28 12:12:00 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: raidctl.c,v 1.78.2.1 2024/04/28 12:09:08 martin Exp $ */ +/* $NetBSD: raidctl.c,v 1.78.2.2
CVS commit: [netbsd-10] src/sbin/raidctl
Module Name:src Committed By: martin Date: Sun Apr 28 12:12:00 UTC 2024 Modified Files: src/sbin/raidctl [netbsd-10]: raidctl.8 raidctl.c Log Message: Pull up following revision(s) (requested by oster in ticket #675): sbin/raidctl/raidctl.8: revision 1.81 sbin/raidctl/raidctl.c: revision 1.80 Implement command-line configuration of simple RAID sets with raidctl based on the usage pattern: raidctl create... For example, raidctl raid0 create mirror absent /dev/wd1e will create a RAID level 1 (mirror) set with an absent first component and /dev/wd1e as the second component. The resulting RAID device will be marked as auto-configurable, will have a serial number set (based on the current time), and parity will be initialized. Reasonable performance values are automatically used by default for other parameters normally specified in the configuration file. Also: Only print out Autoconfig status if being verbose. To generate a diff of this commit: cvs rdiff -u -r1.79.2.1 -r1.79.2.2 src/sbin/raidctl/raidctl.8 cvs rdiff -u -r1.78.2.1 -r1.78.2.2 src/sbin/raidctl/raidctl.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
Module Name:src Committed By: martin Date: Sun Apr 28 12:09:09 UTC 2024 Modified Files: src/sbin/raidctl [netbsd-10]: raidctl.8 raidctl.c src/sys/dev/raidframe [netbsd-10]: raidframeio.h rf_diskqueue.c rf_diskqueue.h rf_disks.c rf_disks.h rf_driver.c rf_netbsdkintf.c rf_raid.h rf_reconstruct.c Log Message: Pull up following revision(s) (requested by oster in ticket #674): sys/dev/raidframe/rf_raid.h: revision 1.52 sbin/raidctl/raidctl.8: revision 1.80 sys/dev/raidframe/rf_driver.c: revision 1.141 sys/dev/raidframe/rf_disks.c: revision 1.94 sys/dev/raidframe/rf_diskqueue.c: revision 1.64 sys/dev/raidframe/rf_diskqueue.h: revision 1.30 sys/dev/raidframe/rf_disks.h: revision 1.15 sys/dev/raidframe/rf_netbsdkintf.c: revision 1.414 sys/dev/raidframe/rf_reconstruct.c: revision 1.129 sys/dev/raidframe/raidframeio.h: revision 1.12 sbin/raidctl/raidctl.c: revision 1.79 Implement hot removal of spares and components. From manu@. Implement a long desired feature of automatically incorporating a used spare into the array after a reconstruct. Given the configuration: Components: /dev/wd0e: failed /dev/wd1e: optimal /dev/wd2e: optimal Spares: /dev/wd3e: spare Running 'raidctl -F /dev/wd0e raid0' will now result in the following configuration after a successful rebuild: Components: /dev/wd3e: optimal /dev/wd1e: optimal /dev/wd2e: optimal No spares. Thanks to manu@ for the development of the initial set of changes which allowed the changes to automatically incorporate a used spare to come to fruition. Thanks also to manu@ for useful discussions about and additional testing of these changes. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.79.2.1 src/sbin/raidctl/raidctl.8 cvs rdiff -u -r1.78 -r1.78.2.1 src/sbin/raidctl/raidctl.c cvs rdiff -u -r1.11 -r1.11.6.1 src/sys/dev/raidframe/raidframeio.h cvs rdiff -u -r1.63 -r1.63.4.1 src/sys/dev/raidframe/rf_diskqueue.c cvs rdiff -u -r1.29 -r1.29.10.1 src/sys/dev/raidframe/rf_diskqueue.h cvs rdiff -u -r1.93 -r1.93.4.1 src/sys/dev/raidframe/rf_disks.c cvs rdiff -u -r1.14 -r1.14.196.1 src/sys/dev/raidframe/rf_disks.h cvs rdiff -u -r1.140 -r1.140.4.1 src/sys/dev/raidframe/rf_driver.c cvs rdiff -u -r1.410.4.3 -r1.410.4.4 src/sys/dev/raidframe/rf_netbsdkintf.c cvs rdiff -u -r1.51 -r1.51.6.1 src/sys/dev/raidframe/rf_raid.h cvs rdiff -u -r1.127.10.1 -r1.127.10.2 src/sys/dev/raidframe/rf_reconstruct.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/raidctl/raidctl.8 diff -u src/sbin/raidctl/raidctl.8:1.79 src/sbin/raidctl/raidctl.8:1.79.2.1 --- src/sbin/raidctl/raidctl.8:1.79 Tue Jun 14 08:06:18 2022 +++ src/sbin/raidctl/raidctl.8 Sun Apr 28 12:09:08 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: raidctl.8,v 1.79 2022/06/14 08:06:18 kre Exp $ +.\" $NetBSD: raidctl.8,v 1.79.2.1 2024/04/28 12:09:08 martin Exp $ .\" .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -53,7 +53,7 @@ .\" any improvements or extensions that they make and grant Carnegie the .\" rights to redistribute these changes. .\" -.Dd June 13, 2022 +.Dd September 16, 2023 .Dt RAIDCTL 8 .Os .Sh NAME @@ -322,9 +322,10 @@ if necessary, and immediately begins a r This is useful for reconstructing back onto a component after it has been replaced following a failure. .It Fl r Ar component Ar dev -Remove the spare disk specified by +Remove the specified .Ar component -from the set of available spare components. +from the RAID. The component must be in the failed, spare, or spared state +in order to be removed. .It Fl S Ar dev Check the status of parity re-writing, component reconstruction, and component copyback. @@ -1005,10 +1006,9 @@ option will show: .Bd -literal -offset indent Components: /dev/sd1e: optimal - /dev/sd2e: spared + /dev/sd4e: optimal /dev/sd3e: optimal -Spares: - /dev/sd4e: used_spare +No spares. [...] Parity status: clean Reconstruction is 100% complete. @@ -1016,62 +1016,10 @@ Parity Re-write is 100% complete. Copyback is 100% complete. .Ed .Pp -At this point there are at least two options. -First, if -.Pa /dev/sd2e -is known to be good (i.e., the failure was either caused by -.Fl f -or -.Fl F , -or the failed disk was replaced), then a copyback of the data can -be initiated with the -.Fl B -option. -In this example, this would copy the entire contents of -.Pa /dev/sd4e -to -.Pa /dev/sd2e . -Once the copyback procedure is complete, the -status of the device would be (in part): -.Bd -literal -offset indent -Components: - /dev/sd1e: optimal - /dev/sd2e: optimal - /dev/sd3e: optimal -Spares: - /dev/sd4e: spare -.Ed -.Pp -and the system is back to normal operation. -.Pp -The second option after the
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sun Apr 28 12:09:09 UTC 2024 Modified Files: src/sbin/raidctl [netbsd-10]: raidctl.8 raidctl.c src/sys/dev/raidframe [netbsd-10]: raidframeio.h rf_diskqueue.c rf_diskqueue.h rf_disks.c rf_disks.h rf_driver.c rf_netbsdkintf.c rf_raid.h rf_reconstruct.c Log Message: Pull up following revision(s) (requested by oster in ticket #674): sys/dev/raidframe/rf_raid.h: revision 1.52 sbin/raidctl/raidctl.8: revision 1.80 sys/dev/raidframe/rf_driver.c: revision 1.141 sys/dev/raidframe/rf_disks.c: revision 1.94 sys/dev/raidframe/rf_diskqueue.c: revision 1.64 sys/dev/raidframe/rf_diskqueue.h: revision 1.30 sys/dev/raidframe/rf_disks.h: revision 1.15 sys/dev/raidframe/rf_netbsdkintf.c: revision 1.414 sys/dev/raidframe/rf_reconstruct.c: revision 1.129 sys/dev/raidframe/raidframeio.h: revision 1.12 sbin/raidctl/raidctl.c: revision 1.79 Implement hot removal of spares and components. From manu@. Implement a long desired feature of automatically incorporating a used spare into the array after a reconstruct. Given the configuration: Components: /dev/wd0e: failed /dev/wd1e: optimal /dev/wd2e: optimal Spares: /dev/wd3e: spare Running 'raidctl -F /dev/wd0e raid0' will now result in the following configuration after a successful rebuild: Components: /dev/wd3e: optimal /dev/wd1e: optimal /dev/wd2e: optimal No spares. Thanks to manu@ for the development of the initial set of changes which allowed the changes to automatically incorporate a used spare to come to fruition. Thanks also to manu@ for useful discussions about and additional testing of these changes. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.79.2.1 src/sbin/raidctl/raidctl.8 cvs rdiff -u -r1.78 -r1.78.2.1 src/sbin/raidctl/raidctl.c cvs rdiff -u -r1.11 -r1.11.6.1 src/sys/dev/raidframe/raidframeio.h cvs rdiff -u -r1.63 -r1.63.4.1 src/sys/dev/raidframe/rf_diskqueue.c cvs rdiff -u -r1.29 -r1.29.10.1 src/sys/dev/raidframe/rf_diskqueue.h cvs rdiff -u -r1.93 -r1.93.4.1 src/sys/dev/raidframe/rf_disks.c cvs rdiff -u -r1.14 -r1.14.196.1 src/sys/dev/raidframe/rf_disks.h cvs rdiff -u -r1.140 -r1.140.4.1 src/sys/dev/raidframe/rf_driver.c cvs rdiff -u -r1.410.4.3 -r1.410.4.4 src/sys/dev/raidframe/rf_netbsdkintf.c cvs rdiff -u -r1.51 -r1.51.6.1 src/sys/dev/raidframe/rf_raid.h cvs rdiff -u -r1.127.10.1 -r1.127.10.2 src/sys/dev/raidframe/rf_reconstruct.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Apr 28 10:17:03 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1960 To generate a diff of this commit: cvs rdiff -u -r1.1.2.228 -r1.1.2.229 src/doc/CHANGES-8.3 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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.228 src/doc/CHANGES-8.3:1.1.2.229 --- src/doc/CHANGES-8.3:1.1.2.228 Thu Apr 18 16:45:55 2024 +++ src/doc/CHANGES-8.3 Sun Apr 28 10:17:03 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.228 2024/04/18 16:45:55 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.229 2024/04/28 10:17:03 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4430,3 +4430,8 @@ sys/arch/x86/x86/viac7temp.c 1.10 viac7temp(4): PR 58148: fix the kernel module. [andvar, ticket #1959] +sys/netinet6/frag6.c1.78 + + inet6: fix calculation of fragment length. + [ozaki-r, ticket #1960] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Apr 28 10:17:03 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1960 To generate a diff of this commit: cvs rdiff -u -r1.1.2.228 -r1.1.2.229 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/netinet6
Module Name:src
Committed By: martin
Date: Sun Apr 28 10:15:20 UTC 2024
Modified Files:
src/sys/netinet6 [netbsd-8]: frag6.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1960):
sys/netinet6/frag6.c: revision 1.78
frag6: fix calculation of fragment length
Because of the miscalculation, 32 bytes fragmented IPv6 packets
have been wrongly dropped.
See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html
for more details.
Patch from Yasuyuki KOZAKAI (with minor tweaks)
To generate a diff of this commit:
cvs rdiff -u -r1.60.6.6 -r1.60.6.7 src/sys/netinet6/frag6.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/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.60.6.6 src/sys/netinet6/frag6.c:1.60.6.7
--- src/sys/netinet6/frag6.c:1.60.6.6 Thu Oct 27 16:08:50 2022
+++ src/sys/netinet6/frag6.c Sun Apr 28 10:15:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.60.6.6 2022/10/27 16:08:50 martin Exp $ */
+/* $NetBSD: frag6.c,v 1.60.6.7 2024/04/28 10:15:20 martin Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.60.6.6 2022/10/27 16:08:50 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.60.6.7 2024/04/28 10:15:20 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -158,9 +158,10 @@ frag6_input(struct mbuf **mp, int *offp,
* sizeof(struct ip6_frag) == 8
* sizeof(struct ip6_hdr) = 40
*/
- if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
- (((ntohs(ip6->ip6_plen) - offset) == 0) ||
- ((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
+ frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset
+ - sizeof(struct ip6_frag);
+ if ((frgpartlen == 0) ||
+ ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) && (frgpartlen & 0x7) != 0)) {
icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
offsetof(struct ip6_hdr, ip6_plen));
in6_ifstat_inc(dstifp, ifs6_reass_fail);
@@ -269,7 +270,6 @@ frag6_input(struct mbuf **mp, int *offp,
* in size.
* If it would exceed, discard the fragment and return an ICMP error.
*/
- frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset;
if (q6->ip6q_unfrglen >= 0) {
/* The 1st fragment has already arrived. */
if (q6->ip6q_unfrglen + fragoff + frgpartlen > IPV6_MAXPACKET) {
CVS commit: [netbsd-8] src/sys/netinet6
Module Name:src Committed By: martin Date: Sun Apr 28 10:15:20 UTC 2024 Modified Files: src/sys/netinet6 [netbsd-8]: frag6.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1960): sys/netinet6/frag6.c: revision 1.78 frag6: fix calculation of fragment length Because of the miscalculation, 32 bytes fragmented IPv6 packets have been wrongly dropped. See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html for more details. Patch from Yasuyuki KOZAKAI (with minor tweaks) To generate a diff of this commit: cvs rdiff -u -r1.60.6.6 -r1.60.6.7 src/sys/netinet6/frag6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/netinet6
Module Name:src
Committed By: martin
Date: Sun Apr 28 10:14:18 UTC 2024
Modified Files:
src/sys/netinet6 [netbsd-9]: frag6.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1836):
sys/netinet6/frag6.c: revision 1.78
frag6: fix calculation of fragment length
Because of the miscalculation, 32 bytes fragmented IPv6 packets
have been wrongly dropped.
See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html
for more details.
Patch from Yasuyuki KOZAKAI (with minor tweaks)
To generate a diff of this commit:
cvs rdiff -u -r1.74.6.1 -r1.74.6.2 src/sys/netinet6/frag6.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/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.74.6.1 src/sys/netinet6/frag6.c:1.74.6.2
--- src/sys/netinet6/frag6.c:1.74.6.1 Thu Oct 27 16:06:24 2022
+++ src/sys/netinet6/frag6.c Sun Apr 28 10:14:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.74.6.1 2022/10/27 16:06:24 martin Exp $ */
+/* $NetBSD: frag6.c,v 1.74.6.2 2024/04/28 10:14:18 martin Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.74.6.1 2022/10/27 16:06:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.74.6.2 2024/04/28 10:14:18 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -197,9 +197,10 @@ frag6_input(struct mbuf **mp, int *offp,
* sizeof(struct ip6_frag) == 8
* sizeof(struct ip6_hdr) = 40
*/
- if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
- (((ntohs(ip6->ip6_plen) - offset) == 0) ||
- ((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
+ frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset
+ - sizeof(struct ip6_frag);
+ if ((frgpartlen == 0) ||
+ ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) && (frgpartlen & 0x7) != 0)) {
icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
offsetof(struct ip6_hdr, ip6_plen));
in6_ifstat_inc(dstifp, ifs6_reass_fail);
@@ -307,7 +308,6 @@ frag6_input(struct mbuf **mp, int *offp,
* in size. If it would exceed, discard the fragment and return an
* ICMP error.
*/
- frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset;
if (q6->ip6q_unfrglen >= 0) {
/* The 1st fragment has already arrived. */
if (q6->ip6q_unfrglen + fragoff + frgpartlen > IPV6_MAXPACKET) {
CVS commit: [netbsd-9] src/sys/netinet6
Module Name:src Committed By: martin Date: Sun Apr 28 10:14:18 UTC 2024 Modified Files: src/sys/netinet6 [netbsd-9]: frag6.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1836): sys/netinet6/frag6.c: revision 1.78 frag6: fix calculation of fragment length Because of the miscalculation, 32 bytes fragmented IPv6 packets have been wrongly dropped. See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html for more details. Patch from Yasuyuki KOZAKAI (with minor tweaks) To generate a diff of this commit: cvs rdiff -u -r1.74.6.1 -r1.74.6.2 src/sys/netinet6/frag6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sun Apr 28 10:11:21 UTC 2024 Modified Files: src/doc [netbsd-9]: README.files src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Added Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Welcome to 9.4_STABLE To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-9.5 cvs rdiff -u -r1.5.26.2 -r1.5.26.3 src/doc/README.files cvs rdiff -u -r1.5.6.12 -r1.5.6.13 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.14 -r1.599.2.15 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/README.files diff -u src/doc/README.files:1.5.26.2 src/doc/README.files:1.5.26.3 --- src/doc/README.files:1.5.26.2 Mon Aug 8 16:58:05 2022 +++ src/doc/README.files Sun Apr 28 10:11:21 2024 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.5.26.2 2022/08/08 16:58:05 martin Exp $ +# $NetBSD: README.files,v 1.5.26.3 2024/04/28 10:11:21 martin Exp $ What's in this directory: @@ -10,6 +10,7 @@ CHANGES-9.1 Changes between the the 9.0 CHANGES-9.2 Changes between the the 9.1 release and the 9.2 release. CHANGES-9.3 Changes between the the 9.2 release and the 9.3 release. CHANGES-9.4 Changes between the the 9.3 release and the 9.4 release. +CHANGES-9.5 Changes between the the 9.4 release and the 9.5 release. CHANGES.prev Changes in previous NetBSD releases. Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.5.6.12 src/external/gpl2/groff/tmac/mdoc.local:1.5.6.13 --- src/external/gpl2/groff/tmac/mdoc.local:1.5.6.12 Sat Apr 20 13:32:22 2024 +++ src/external/gpl2/groff/tmac/mdoc.local Sun Apr 28 10:11:21 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.5.6.12 2024/04/20 13:32:22 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.5.6.13 2024/04/28 10:11:21 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~9.4 +.ds doc-operating-system NetBSD\~9.4_STABLE .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~9.4 +.ds doc-default-operating-system NetBSD\~9.4_STABLE .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.599.2.14 src/sys/sys/param.h:1.599.2.15 --- src/sys/sys/param.h:1.599.2.14 Sat Apr 20 13:32:21 2024 +++ src/sys/sys/param.h Sun Apr 28 10:11:21 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.599.2.14 2024/04/20 13:32:21 martin Exp $ */ +/* $NetBSD: param.h,v 1.599.2.15 2024/04/28 10:11:21 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 90400 /* NetBSD 9.4 */ +#define __NetBSD_Version__ 90400 /* NetBSD 9.4_STABLE */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__) Added files: Index: src/doc/CHANGES-9.5 diff -u /dev/null src/doc/CHANGES-9.5:1.1.2.1 --- /dev/null Sun Apr 28 10:11:21 2024 +++ src/doc/CHANGES-9.5 Sun Apr 28 10:11:21 2024 @@ -0,0 +1,14 @@ +# $NetBSD: CHANGES-9.5,v 1.1.2.1 2024/04/28 10:11:21 martin Exp $ + +A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5 +release: + +external/gpl2/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand +doc/README.filespatched by hand +doc/CHANGES-9.5 added + + Welcome to 9.4_STABLE. + [martin] + +
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sun Apr 28 10:11:21 UTC 2024 Modified Files: src/doc [netbsd-9]: README.files src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Added Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Welcome to 9.4_STABLE To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-9.5 cvs rdiff -u -r1.5.26.2 -r1.5.26.3 src/doc/README.files cvs rdiff -u -r1.5.6.12 -r1.5.6.13 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.14 -r1.599.2.15 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/netinet6
Module Name:src
Committed By: martin
Date: Sun Apr 28 10:07:03 UTC 2024
Modified Files:
src/sys/netinet6 [netbsd-10]: frag6.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #673):
sys/netinet6/frag6.c: revision 1.78
frag6: fix calculation of fragment length
Because of the miscalculation, 32 bytes fragmented IPv6 packets
have been wrongly dropped.
See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html
for more details.
Patch from Yasuyuki KOZAKAI (with minor tweaks)
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.76.2.1 src/sys/netinet6/frag6.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/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.76 src/sys/netinet6/frag6.c:1.76.2.1
--- src/sys/netinet6/frag6.c:1.76 Fri Oct 21 09:21:17 2022
+++ src/sys/netinet6/frag6.c Sun Apr 28 10:07:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.76 2022/10/21 09:21:17 ozaki-r Exp $ */
+/* $NetBSD: frag6.c,v 1.76.2.1 2024/04/28 10:07:03 martin Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.76 2022/10/21 09:21:17 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.76.2.1 2024/04/28 10:07:03 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -197,9 +197,10 @@ frag6_input(struct mbuf **mp, int *offp,
* sizeof(struct ip6_frag) == 8
* sizeof(struct ip6_hdr) = 40
*/
- if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
- (((ntohs(ip6->ip6_plen) - offset) == 0) ||
- ((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
+ frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset
+ - sizeof(struct ip6_frag);
+ if ((frgpartlen == 0) ||
+ ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) && (frgpartlen & 0x7) != 0)) {
icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
offsetof(struct ip6_hdr, ip6_plen));
in6_ifstat_inc(dstifp, ifs6_reass_fail);
@@ -307,7 +308,6 @@ frag6_input(struct mbuf **mp, int *offp,
* in size. If it would exceed, discard the fragment and return an
* ICMP error.
*/
- frgpartlen = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) - offset;
if (q6->ip6q_unfrglen >= 0) {
/* The 1st fragment has already arrived. */
if (q6->ip6q_unfrglen + fragoff + frgpartlen > IPV6_MAXPACKET) {
CVS commit: [netbsd-10] src/sys/netinet6
Module Name:src Committed By: martin Date: Sun Apr 28 10:07:03 UTC 2024 Modified Files: src/sys/netinet6 [netbsd-10]: frag6.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #673): sys/netinet6/frag6.c: revision 1.78 frag6: fix calculation of fragment length Because of the miscalculation, 32 bytes fragmented IPv6 packets have been wrongly dropped. See https://mail-index.netbsd.org/tech-net/2024/04/14/msg008741.html for more details. Patch from Yasuyuki KOZAKAI (with minor tweaks) To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.76.2.1 src/sys/netinet6/frag6.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
Module Name:src Committed By: martin Date: Sun Apr 28 10:02:51 UTC 2024 Modified Files: src/distrib/sets/lists/xbase [netbsd-10]: mi src/external/mit/xorg/bin/xsetwallpaper [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by jakllsch in ticket #672): distrib/sets/lists/xbase/mi: revision 1.175 external/mit/xorg/bin/xsetwallpaper/Makefile: revision 1.6 Install xsetwallpaper(1) manual page Should fix PR 58172. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.172.2.1 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.5 -r1.5.2.1 src/external/mit/xorg/bin/xsetwallpaper/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.172 src/distrib/sets/lists/xbase/mi:1.172.2.1 --- src/distrib/sets/lists/xbase/mi:1.172 Mon Oct 17 07:40:22 2022 +++ src/distrib/sets/lists/xbase/mi Sun Apr 28 10:02:51 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.172 2022/10/17 07:40:22 mrg Exp $ +# $NetBSD: mi,v 1.172.2.1 2024/04/28 10:02:51 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1394,6 +1394,7 @@ ./usr/X11R7/man/cat1/xsetmode.0xbase-xsetmode-catman .cat,xorg ./usr/X11R7/man/cat1/xsetpointer.0 xbase-xsetpointer-catman .cat,xorg ./usr/X11R7/man/cat1/xsetroot.0xbase-xsetroot-catman .cat,xorg +./usr/X11R7/man/cat1/xsetwallpaper.0 xbase-xsetwallpaper-catman .cat,xorg ./usr/X11R7/man/cat1/xsm.0xbase-xsm-catman .cat,xorg ./usr/X11R7/man/cat1/xstdcmap.0xbase-xstdcmap-catman .cat,xorg ./usr/X11R7/man/cat1/xterm.0xbase-xterm-catman .cat,xorg @@ -1546,6 +1547,7 @@ ./usr/X11R7/man/html1/xsetmode.html xbase-xsetmode-htmlman html,xorg ./usr/X11R7/man/html1/xsetpointer.html xbase-xsetpointer-htmlman html,xorg ./usr/X11R7/man/html1/xsetroot.html xbase-xsetroot-htmlman html,xorg +./usr/X11R7/man/html1/xsetwallpaper.html xbase-xsetwallpaper-htmlman html,xorg ./usr/X11R7/man/html1/xsm.htmlxbase-xsm-htmlman html,xorg ./usr/X11R7/man/html1/xstdcmap.html xbase-xstdcmap-htmlman html,xorg ./usr/X11R7/man/html1/xterm.html xbase-xterm-htmlman html,xorg @@ -1699,6 +1701,7 @@ ./usr/X11R7/man/man1/xsetmode.1xbase-xsetmode-man .man,xorg ./usr/X11R7/man/man1/xsetpointer.1 xbase-xsetpointer-man .man,xorg ./usr/X11R7/man/man1/xsetroot.1xbase-xsetroot-man .man,xorg +./usr/X11R7/man/man1/xsetwallpaper.1 xbase-xsetwallpaper-man .man,xorg ./usr/X11R7/man/man1/xsm.1xbase-xsm-man .man,xorg ./usr/X11R7/man/man1/xstdcmap.1xbase-xstdcmap-man .man,xorg ./usr/X11R7/man/man1/xterm.1xbase-xterm-man .man,xorg Index: src/external/mit/xorg/bin/xsetwallpaper/Makefile diff -u src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.5 src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.5.2.1 --- src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.5 Fri Feb 11 01:36:02 2022 +++ src/external/mit/xorg/bin/xsetwallpaper/Makefile Sun Apr 28 10:02:51 2024 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/02/11 01:36:02 uwe Exp $ - -NOMAN= # defined +# $NetBSD: Makefile,v 1.5.2.1 2024/04/28 10:02:51 martin Exp $ .include
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sun Apr 28 10:02:51 UTC 2024 Modified Files: src/distrib/sets/lists/xbase [netbsd-10]: mi src/external/mit/xorg/bin/xsetwallpaper [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by jakllsch in ticket #672): distrib/sets/lists/xbase/mi: revision 1.175 external/mit/xorg/bin/xsetwallpaper/Makefile: revision 1.6 Install xsetwallpaper(1) manual page Should fix PR 58172. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.172.2.1 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.5 -r1.5.2.1 src/external/mit/xorg/bin/xsetwallpaper/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 24 20:38:24 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Explicitly exclude VAX from new Mesa due to a gcc internal compiler error
To generate a diff of this commit:
cvs rdiff -u -r1.1371 -r1.1372 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1371 src/share/mk/bsd.own.mk:1.1372
--- src/share/mk/bsd.own.mk:1.1371 Wed Apr 24 19:14:39 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 20:38:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1371 2024/04/24 19:14:39 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1372 2024/04/24 20:38:24 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1331,7 +1331,8 @@ HAVE_XORG_SERVER_VER?=120
.endif
# Newer Mesa does not build with old X server
-.if ${HAVE_XORG_SERVER_VER} != "120"
+# VAX build triggers a gcc internal error
+.if ${HAVE_XORG_SERVER_VER} != "120" || ${MACHINE} == "vax"
HAVE_MESA_VER=19
.endif
CVS commit: src/share/mk
Module Name:src Committed By: martin Date: Wed Apr 24 20:38:24 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Explicitly exclude VAX from new Mesa due to a gcc internal compiler error To generate a diff of this commit: cvs rdiff -u -r1.1371 -r1.1372 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: martin Date: Wed Apr 24 19:14:39 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Force old Mesa for all old X server builds To generate a diff of this commit: cvs rdiff -u -r1.1370 -r1.1371 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 24 19:14:39 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Force old Mesa for all old X server builds
To generate a diff of this commit:
cvs rdiff -u -r1.1370 -r1.1371 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1370 src/share/mk/bsd.own.mk:1.1371
--- src/share/mk/bsd.own.mk:1.1370 Wed Apr 24 07:54:53 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 19:14:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1370 2024/04/24 07:54:53 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1371 2024/04/24 19:14:39 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1320,10 +1320,18 @@ MKDTB.earmv7hfeb= yes
MKDTB.riscv32= yes
MKDTB.riscv64= yes
-# alpha build fails due to missing X include files,
-# vax build triggers a gcc bug and dies with an internal compiler error.
-# XXX switch both to old Mesa for now.
-.if ${MACHINE} == "alpha" || ${MACHINE} == "vax"
+# During transition from xorg-server 1.10 to 1.20
+.if \
+${MACHINE} == "alpha" || \
+${MACHINE} == "netwinder" || \
+${MACHINE} == "sgimips"
+HAVE_XORG_SERVER_VER?=110
+.else
+HAVE_XORG_SERVER_VER?=120
+.endif
+
+# Newer Mesa does not build with old X server
+.if ${HAVE_XORG_SERVER_VER} != "120"
HAVE_MESA_VER=19
.endif
@@ -1676,16 +1684,6 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib
X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
.endfor
-# During transition from xorg-server 1.10 to 1.20
-.if \
-${MACHINE} == "alpha" || \
-${MACHINE} == "netwinder" || \
-${MACHINE} == "sgimips"
-HAVE_XORG_SERVER_VER?=110
-.else
-HAVE_XORG_SERVER_VER?=120
-.endif
-
.if ${HAVE_XORG_SERVER_VER} == "120"
XORG_SERVER_SUBDIR?=xorg-server
. if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "evbarm"
CVS commit: xsrc/external/mit/MesaLib/dist/src/util
Module Name:xsrc
Committed By: martin
Date: Wed Apr 24 19:05:53 UTC 2024
Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_cpu_detect.c
Log Message:
fix pasto in previous
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c
diff -u xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.3 xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.4
--- xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.3 Wed Apr 24 07:51:17 2024
+++ xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c Wed Apr 24 19:05:53 2024
@@ -437,7 +437,7 @@ check_os_arm_support(void)
#if defined(PIPE_ARCH_MIPS64)
#ifdef __NetBSD__
static void
-check_os_arm_support(void)
+check_os_mips64_support(void)
{
util_cpu_caps.has_msa = false; /* XXX seems there is no way to detect MSA support from userland */
}
CVS commit: xsrc/external/mit/MesaLib/dist/src/util
Module Name:xsrc Committed By: martin Date: Wed Apr 24 19:05:53 UTC 2024 Modified Files: xsrc/external/mit/MesaLib/dist/src/util: u_cpu_detect.c Log Message: fix pasto in previous To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
