CVS commit: src/lib/libc/arch/aarch64
Module Name:src Committed By: kamil Date: Tue Oct 13 01:59:55 UTC 2020 Modified Files: src/lib/libc/arch/aarch64: genassym.cf src/lib/libc/arch/aarch64/sys: __sigtramp2.S Log Message: Decorate the aarch64 signal trampoline with CFI attributes easing unwinding Now, the unwinders (in backtrace(3) and similar) can unwind properly the stack from a signal handler. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/aarch64/genassym.cf cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/aarch64/sys/__sigtramp2.S 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/arch/aarch64/genassym.cf diff -u src/lib/libc/arch/aarch64/genassym.cf:1.2 src/lib/libc/arch/aarch64/genassym.cf:1.3 --- src/lib/libc/arch/aarch64/genassym.cf:1.2 Sun May 10 14:05:59 2020 +++ src/lib/libc/arch/aarch64/genassym.cf Tue Oct 13 01:59:55 2020 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.2 2020/05/10 14:05:59 skrll Exp $ +# $NetBSD: genassym.cf,v 1.3 2020/10/13 01:59:55 kamil Exp $ #- # Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -34,6 +34,36 @@ include include define _UC_REGS_X0 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X0]) +define _UC_REGS_X1 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X1]) +define _UC_REGS_X2 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X2]) +define _UC_REGS_X3 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X3]) +define _UC_REGS_X4 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X4]) +define _UC_REGS_X5 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X5]) +define _UC_REGS_X6 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X6]) +define _UC_REGS_X7 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X7]) +define _UC_REGS_X8 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X8]) +define _UC_REGS_X9 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X9]) +define _UC_REGS_X10 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X10]) +define _UC_REGS_X11 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X11]) +define _UC_REGS_X12 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X12]) +define _UC_REGS_X13 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X13]) +define _UC_REGS_X14 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X14]) +define _UC_REGS_X15 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X15]) +define _UC_REGS_X16 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X16]) +define _UC_REGS_X17 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X17]) +define _UC_REGS_X18 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X18]) +define _UC_REGS_X19 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X19]) +define _UC_REGS_X20 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X20]) +define _UC_REGS_X21 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X21]) +define _UC_REGS_X22 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X22]) +define _UC_REGS_X23 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X23]) +define _UC_REGS_X24 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X24]) +define _UC_REGS_X25 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X25]) +define _UC_REGS_X26 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X26]) +define _UC_REGS_X27 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X27]) +define _UC_REGS_X28 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X28]) +define _UC_REGS_X29 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X29]) +define _UC_REGS_X30 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_X30]) define _UC_REGS_SP offsetof(ucontext_t, uc_mcontext.__gregs[_REG_SP]) define _UC_REGS_PC offsetof(ucontext_t, uc_mcontext.__gregs[_REG_PC]) Index: src/lib/libc/arch/aarch64/sys/__sigtramp2.S diff -u src/lib/libc/arch/aarch64/sys/__sigtramp2.S:1.1 src/lib/libc/arch/aarch64/sys/__sigtramp2.S:1.2 --- src/lib/libc/arch/aarch64/sys/__sigtramp2.S:1.1 Sun Aug 10 05:47:37 2014 +++ src/lib/libc/arch/aarch64/sys/__sigtramp2.S Tue Oct 13 01:59:55 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: __sigtramp2.S,v 1.1 2014/08/10 05:47:37 matt Exp $ */ +/* $NetBSD: __sigtramp2.S,v 1.2 2020/10/13 01:59:55 kamil Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,6 +30,7 @@ */ #include "SYS.h" +#include "assym.h" /* * The ARM signal trampoline is invoked only to return from @@ -40,11 +41,54 @@ * ucontext structure * sp-> siginfo structure * and x28 points to the ucontext + * + * The unwind entry includes the one byte prior to the trampoline + * because the unwinder will look up (return PC - 1) while unwinding. + * Normally (return PC - 1) computes an address inside the call + * instruction that created the child frame, but here there is no call + * instruction so we have to manually add padding. */ + .cfi_startproc simple + .cfi_signal_frame + .cfi_def_cfa x28, 0 + .cfi_offset x0, _UC_REGS_X0 + .cfi_offset x1, _UC_REGS_X1 + .cfi_offset x2, _UC_REGS_X2 + .cfi_offset x3, _UC_REGS_X3 + .cfi_offset x4, _UC_REGS_X4 + .cfi_offset x5, _UC_REGS_X5 + .cfi_offset x6, _UC_REGS_X6 + .cfi_offset x7, _UC_REGS_X7 +
CVS commit: src
Module Name:src Committed By: thorpej Date: Tue Oct 13 01:59:32 UTC 2020 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: Document CPUFLAGS here (it's already documented in share/mk/bsd.README). This will address the initial concern in PR port-alpha/55545. To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/BUILDING cvs rdiff -u -r1.130 -r1.131 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.137 src/BUILDING:1.138 --- src/BUILDING:1.137 Mon Oct 12 21:14:36 2020 +++ src/BUILDING Tue Oct 13 01:59:32 2020 @@ -192,6 +192,11 @@ CONFIGURATION information is available in the GCC documentation of -frandom-seed. + CPUFLAGSAdditional flags to the compiler/assembler to select CPU + instruction set options, CPU tuning options, etc. + + Default: Unset. + DESTDIR Directory to contain the built NetBSD system. If set, special options are passed to the compilation tools to prevent their default use of the host system's /usr/include, Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.130 src/doc/BUILDING.mdoc:1.131 --- src/doc/BUILDING.mdoc:1.130 Mon Oct 12 21:14:37 2020 +++ src/doc/BUILDING.mdoc Tue Oct 13 01:59:32 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.130 2020/10/12 21:14:37 uwe Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.131 2020/10/13 01:59:32 thorpej Exp $ .\" .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -405,6 +405,11 @@ built from the same sources, resulting i Additional information is available in the GCC documentation of -frandom-seed. . +.It Sy CPUFLAGS +Additional flags to the compiler/assembler to select +CPU instruction set options, CPU tuning options, etc. +.DFLTu +. .It Sy DESTDIR Directory to contain the built .Nx
CVS commit: src/lib/libc/arch/i386
Module Name:src Committed By: kamil Date: Mon Oct 12 23:58:14 UTC 2020 Modified Files: src/lib/libc/arch/i386: genassym.cf Log Message: Fix typo To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/i386/genassym.cf 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/arch/i386/genassym.cf diff -u src/lib/libc/arch/i386/genassym.cf:1.1 src/lib/libc/arch/i386/genassym.cf:1.2 --- src/lib/libc/arch/i386/genassym.cf:1.1 Mon Oct 12 23:56:08 2020 +++ src/lib/libc/arch/i386/genassym.cf Mon Oct 12 23:58:14 2020 @@ -1,10 +1,10 @@ -# $NetBSD: genassym.cf,v 1.1 2020/10/12 23:56:08 kamil Exp $ +# $NetBSD: genassym.cf,v 1.2 2020/10/12 23:58:14 kamil Exp $ # # Copyright (c) 2020 The NetBSD Foundation, Inc. # All rights reserved. # # This code is derived from software contributed to The NetBSD Foundation -# by Kamil Rytarowski or Moritz Systems Technology Company Sp. z o.o. +# by Kamil Rytarowski for Moritz Systems Technology Company Sp. z o.o. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions
CVS commit: src/lib/libc/arch/i386
Module Name:src
Committed By: kamil
Date: Mon Oct 12 23:56:08 UTC 2020
Modified Files:
src/lib/libc/arch/i386: Makefile.inc
src/lib/libc/arch/i386/sys: __sigtramp2.S
Added Files:
src/lib/libc/arch/i386: genassym.cf
Log Message:
Decorate the i386 signal trampoline with CFI attributes easing unwinding
Now, the unwinders (in backtrace(3) and similar) can unwind properly
the stack from a signal handler.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/arch/i386/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/arch/i386/genassym.cf
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/i386/sys/__sigtramp2.S
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/arch/i386/Makefile.inc
diff -u src/lib/libc/arch/i386/Makefile.inc:1.21 src/lib/libc/arch/i386/Makefile.inc:1.22
--- src/lib/libc/arch/i386/Makefile.inc:1.21 Wed Jul 15 14:27:49 2015
+++ src/lib/libc/arch/i386/Makefile.inc Mon Oct 12 23:56:08 2020
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.21 2015/07/15 14:27:49 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.22 2020/10/12 23:56:08 kamil Exp $
.if ${RUMPRUN} != "yes"
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
.endif
+
+CPPFLAGS+= -I.
Index: src/lib/libc/arch/i386/sys/__sigtramp2.S
diff -u src/lib/libc/arch/i386/sys/__sigtramp2.S:1.5 src/lib/libc/arch/i386/sys/__sigtramp2.S:1.6
--- src/lib/libc/arch/i386/sys/__sigtramp2.S:1.5 Fri May 23 02:34:19 2014
+++ src/lib/libc/arch/i386/sys/__sigtramp2.S Mon Oct 12 23:56:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: __sigtramp2.S,v 1.5 2014/05/23 02:34:19 uebayasi Exp $ */
+/* $NetBSD: __sigtramp2.S,v 1.6 2020/10/12 23:56:08 kamil Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,6 +30,7 @@
*/
#include "SYS.h"
+#include "assym.h"
/*
* The i386 signal trampoline is invoked only to return from
@@ -42,7 +43,26 @@
* pointer to ucontext structure [8]
* pointer to siginfo structure [4]
* sp-> signal number[0]
+ *
+ * The unwind entry includes the one byte prior to the trampoline
+ * because the unwinder will look up (return PC - 1) while unwinding.
+ * Normally (return PC - 1) computes an address inside the call
+ * instruction that created the child frame, but here there is no call
+ * instruction so we have to manually add padding.
*/
+ .cfi_startproc simple
+ .cfi_signal_frame
+ .cfi_def_cfa esp, 140
+ .cfi_offset eax, UC_GREGS_EAX
+ .cfi_offset ecx, UC_GREGS_ECX
+ .cfi_offset edx, UC_GREGS_EDX
+ .cfi_offset ebx, UC_GREGS_EBX
+ /* The unwinder will use the CFA to restore ESP. */
+ .cfi_offset ebp, UC_GREGS_EBP
+ .cfi_offset esi, UC_GREGS_ESI
+ .cfi_offset edi, UC_GREGS_EDI
+ .cfi_offset eip, UC_GREGS_EIP
+ nop
NENTRY(__sigtramp_siginfo_2)
leal 12+128(%esp),%eax /* get address of ucontext */
movl %eax,4(%esp) /* put it in the argument slot */
@@ -50,4 +70,5 @@ NENTRY(__sigtramp_siginfo_2)
SYSTRAP(setcontext) /* do setcontext */
movl $-1,4(%esp) /* if we return here, something is wrong */
SYSTRAP(exit) /* exit */
+ .cfi_endproc
END(__sigtramp_siginfo_2)
Added files:
Index: src/lib/libc/arch/i386/genassym.cf
diff -u /dev/null src/lib/libc/arch/i386/genassym.cf:1.1
--- /dev/null Mon Oct 12 23:56:08 2020
+++ src/lib/libc/arch/i386/genassym.cf Mon Oct 12 23:56:08 2020
@@ -0,0 +1,41 @@
+# $NetBSD: genassym.cf,v 1.1 2020/10/12 23:56:08 kamil Exp $
+#
+# Copyright (c) 2020 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Kamil Rytarowski or Moritz Systems Technology Company Sp. z o.o.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
CVS commit: src/lib/libc/arch/x86_64
Module Name:src Committed By: kamil Date: Mon Oct 12 21:33:46 UTC 2020 Modified Files: src/lib/libc/arch/x86_64: genassym.cf Log Message: Add CVS Id To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/x86_64/genassym.cf 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/arch/x86_64/genassym.cf diff -u src/lib/libc/arch/x86_64/genassym.cf:1.1 src/lib/libc/arch/x86_64/genassym.cf:1.2 --- src/lib/libc/arch/x86_64/genassym.cf:1.1 Mon Oct 12 17:55:53 2020 +++ src/lib/libc/arch/x86_64/genassym.cf Mon Oct 12 21:33:46 2020 @@ -1,3 +1,4 @@ +# $NetBSD: genassym.cf,v 1.2 2020/10/12 21:33:46 kamil Exp $ # # Copyright (c) 2020 The NetBSD Foundation, Inc. # All rights reserved.
CVS commit: src
Module Name:src Committed By: uwe Date: Mon Oct 12 21:14:37 UTC 2020 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: Mention HOST_CFLAGS and HOST_CXXFLAGS. To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/BUILDING cvs rdiff -u -r1.129 -r1.130 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.136 src/BUILDING:1.137 --- src/BUILDING:1.136 Mon Oct 12 21:05:54 2020 +++ src/BUILDING Mon Oct 12 21:14:36 2020 @@ -114,8 +114,12 @@ CONFIGURATION HOST_CC Path name to C compiler used to create the toolchain. + HOST_CFLAGS Flags passed to the host C compiler. + HOST_CXX Path name to C++ compiler used to create the toolchain. + HOST_CXXFLAGS Flags passed to the host C++ compiler. + MACHINE Machine type, e.g., "macppc". MACHINE_ARCH Machine architecture, e.g., "powerpc". @@ -1124,4 +1128,4 @@ CAVEATS in object directories. Instead, one may have to manually remove the files. Consult the UPDATING file for notices concerning this. -NetBSD July 1, 2020 NetBSD +NetBSD October 13, 2020 NetBSD Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.129 src/doc/BUILDING.mdoc:1.130 --- src/doc/BUILDING.mdoc:1.129 Mon Oct 12 21:12:34 2020 +++ src/doc/BUILDING.mdoc Mon Oct 12 21:14:37 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.129 2020/10/12 21:12:34 uwe Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.130 2020/10/12 21:14:37 uwe Exp $ .\" .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -33,7 +33,7 @@ .\" Toolchain prefix for commands .ds toolprefix nb . -.Dd July 1, 2020 +.Dd October 13, 2020 .Dt BUILDING 8 .Os NetBSD . @@ -230,9 +230,15 @@ to an absolute path by searching the .It Sy HOST_CC Path name to C compiler used to create the toolchain. . +.It Sy HOST_CFLAGS +Flags passed to the host C compiler. +. .It Sy HOST_CXX Path name to C++ compiler used to create the toolchain. . +.It Sy HOST_CXXFLAGS +Flags passed to the host C++ compiler. +. .It Sy MACHINE Machine type, e.g., .Dq macppc .
CVS commit: src/doc
Module Name:src
Committed By: uwe
Date: Mon Oct 12 21:12:34 UTC 2020
Modified Files:
src/doc: BUILDING.mdoc
Log Message:
If this file is processed with real roff (doc.tmac) tweak things to
make ascii output as close to the mandoc output as possible.
There are only two diffs:
- groff renders em-dash as -- in the NAME section
- mandoc misses "NetBSD" in the "NetBSD System Manager's Manual"
section header
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/doc/BUILDING.mdoc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.128 src/doc/BUILDING.mdoc:1.129
--- src/doc/BUILDING.mdoc:1.128 Mon Oct 12 21:05:54 2020
+++ src/doc/BUILDING.mdoc Mon Oct 12 21:12:34 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: BUILDING.mdoc,v 1.128 2020/10/12 21:05:54 uwe Exp $
+.\" $NetBSD: BUILDING.mdoc,v 1.129 2020/10/12 21:12:34 uwe Exp $
.\"
.\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -37,6 +37,16 @@
.Dt BUILDING 8
.Os NetBSD
.
+.\" if this file is processed with real roff (doc.tmac)
+.\" now that the tmac files have been lazily read,
+.\" we can override ``quotes'' with "quotes" for ascii output
+.ie '\*[Lq]'``' \{\
+.ds Lq \*q
+.ds Rq \*q
+.\}
+.\" and disable hyphenation
+.nr hyphen-flags 0
+.
.Sh NAME
.
.Nm BUILDING
CVS commit: src
Module Name:src Committed By: uwe Date: Mon Oct 12 21:05:54 UTC 2020 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: Bump date and regen for BUILDING.mdoc revision 1.127 that introduced build.sh -c option. To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/BUILDING cvs rdiff -u -r1.127 -r1.128 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.135 src/BUILDING:1.136 --- src/BUILDING:1.135 Wed May 8 14:03:57 2019 +++ src/BUILDING Mon Oct 12 21:05:54 2020 @@ -906,6 +906,17 @@ BUILDING may be specified via multiple -C options, or via a single option whose argument contains multiple space-separated paths. + -c compiler + Select the compiler for the toolchain to build NetBSD and for + inclusion in the NetBSD distribution. Supported choices: + + clang + + gcc [default] + + The compiler used to build the toolchain can be different; see + HOST_CC and HOST_CXX. + -D dest Set the value of DESTDIR to dest. If a relative path is specified, it will be converted to an absolute path before being used. @@ -1113,4 +1124,4 @@ CAVEATS in object directories. Instead, one may have to manually remove the files. Consult the UPDATING file for notices concerning this. -NetBSD July 29, 2018 NetBSD +NetBSD July 1, 2020 NetBSD Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.127 src/doc/BUILDING.mdoc:1.128 --- src/doc/BUILDING.mdoc:1.127 Tue Jun 30 21:22:19 2020 +++ src/doc/BUILDING.mdoc Mon Oct 12 21:05:54 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.127 2020/06/30 21:22:19 riastradh Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.128 2020/10/12 21:05:54 uwe Exp $ .\" .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -33,7 +33,7 @@ .\" Toolchain prefix for commands .ds toolprefix nb . -.Dd July 29, 2018 +.Dd July 1, 2020 .Dt BUILDING 8 .Os NetBSD .
CVS commit: src/lib/libc/arch/x86_64
Module Name:src
Committed By: kamil
Date: Mon Oct 12 17:55:54 UTC 2020
Modified Files:
src/lib/libc/arch/x86_64: Makefile.inc
src/lib/libc/arch/x86_64/sys: __sigtramp2.S
Added Files:
src/lib/libc/arch/x86_64: genassym.cf
Log Message:
Decorate the x86_64 signal trampoline with CFI attributes easing unwinding
Combine the approach provided by Nikhil Benesch and Andrew Cagney.
Now, the unwinders (in gccgo, backtrace(3), etc) can unwind properly
the stack from a signal handler.
Fixes lib/55719 by Nikhil Benesch
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/x86_64/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/arch/x86_64/genassym.cf
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/x86_64/sys/__sigtramp2.S
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/arch/x86_64/Makefile.inc
diff -u src/lib/libc/arch/x86_64/Makefile.inc:1.6 src/lib/libc/arch/x86_64/Makefile.inc:1.7
--- src/lib/libc/arch/x86_64/Makefile.inc:1.6 Wed Jul 15 14:27:49 2015
+++ src/lib/libc/arch/x86_64/Makefile.inc Mon Oct 12 17:55:53 2020
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.6 2015/07/15 14:27:49 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.7 2020/10/12 17:55:53 kamil Exp $
.if ${RUMPRUN} != "yes"
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
.endif
+
+CPPFLAGS+= -I.
Index: src/lib/libc/arch/x86_64/sys/__sigtramp2.S
diff -u src/lib/libc/arch/x86_64/sys/__sigtramp2.S:1.7 src/lib/libc/arch/x86_64/sys/__sigtramp2.S:1.8
--- src/lib/libc/arch/x86_64/sys/__sigtramp2.S:1.7 Mon Dec 2 01:38:54 2019
+++ src/lib/libc/arch/x86_64/sys/__sigtramp2.S Mon Oct 12 17:55:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: __sigtramp2.S,v 1.7 2019/12/02 01:38:54 christos Exp $ */
+/* $NetBSD: __sigtramp2.S,v 1.8 2020/10/12 17:55:54 kamil Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,14 +36,40 @@
*/
#include "SYS.h"
+#include "assym.h"
/*
* The x86-64 signal trampoline is invoked only to return from
* the signal; the kernel calls the signal handler directly.
+ *
+ * The unwind entry includes the one byte prior to the trampoline
+ * because the unwinder will look up (return PC - 1) while unwinding.
+ * Normally (return PC - 1) computes an address inside the call
+ * instruction that created the child frame, but here there is no call
+ * instruction so we have to manually add padding.
*/
+ .cfi_startproc simple
+ .cfi_signal_frame
+ .cfi_def_cfa r15, 0
+ .cfi_offset rax, UC_GREGS_RAX
+ .cfi_offset rdx, UC_GREGS_RDX
+ .cfi_offset rcx, UC_GREGS_RCX
+ .cfi_offset rbx, UC_GREGS_RBX
+ .cfi_offset rsi, UC_GREGS_RSI
+ .cfi_offset rdi, UC_GREGS_RDI
+ .cfi_offset rbp, UC_GREGS_RBP
+ /* The unwinder will use the CFA to restore RSP. */
+ .cfi_offset r8, UC_GREGS_R8
+ .cfi_offset r9, UC_GREGS_R9
+ .cfi_offset r10, UC_GREGS_R10
+ .cfi_offset r11, UC_GREGS_R11
+ .cfi_offset r12, UC_GREGS_R12
+ .cfi_offset r13, UC_GREGS_R13
+ .cfi_offset r14, UC_GREGS_R14
+ .cfi_offset r15, UC_GREGS_R15
+ .cfi_offset rip, UC_GREGS_RIP
+ nop
NENTRY(__sigtramp_siginfo_2)
- .cfi_startproc
- .cfi_def_cfa rsp, 8
movq %r15,%rdi
movq $SYS_setcontext, %rax
syscall
Added files:
Index: src/lib/libc/arch/x86_64/genassym.cf
diff -u /dev/null src/lib/libc/arch/x86_64/genassym.cf:1.1
--- /dev/null Mon Oct 12 17:55:54 2020
+++ src/lib/libc/arch/x86_64/genassym.cf Mon Oct 12 17:55:53 2020
@@ -0,0 +1,45 @@
+#
+# Copyright (c) 2020 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+include
+
+define UC_GREGS_RAX offsetof(ucontext_t, uc_mcontext.__gregs[_REG_RAX])
+define UC_GREGS_RDX offsetof(ucontext_t,
CVS commit: src/usr.sbin/powerd
Module Name:src
Committed By: roy
Date: Mon Oct 12 16:54:43 UTC 2020
Modified Files:
src/usr.sbin/powerd: powerd.c
Log Message:
powerd: Stop crashing if entries are not found in the dictionary
If the first three are not found, log a diagnostic and do nothing.
If the latter two are not found, set them to NULL rather than garbage.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/powerd/powerd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/powerd/powerd.c
diff -u src/usr.sbin/powerd/powerd.c:1.19 src/usr.sbin/powerd/powerd.c:1.20
--- src/usr.sbin/powerd/powerd.c:1.19 Sun Jun 7 05:54:00 2020
+++ src/usr.sbin/powerd/powerd.c Mon Oct 12 16:54:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: powerd.c,v 1.19 2020/06/07 05:54:00 thorpej Exp $ */
+/* $NetBSD: powerd.c,v 1.20 2020/10/12 16:54:43 roy Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -325,18 +325,33 @@ dispatch_power_event_state_change(int fd
__func__, error);
return;
}
-
+
if (debug) {
buf = prop_dictionary_externalize(dict);
printf("%s", buf);
free(buf);
}
- prop_dictionary_get_string(dict, "powerd-script-name", [0]);
- prop_dictionary_get_string(dict, "driver-name", [1]);
- prop_dictionary_get_string(dict, "powerd-event-name", [2]);
- prop_dictionary_get_string(dict, "sensor-name", [3]);
- prop_dictionary_get_string(dict, "state-description", [4]);
+ /* First three arguments are not optional. */
+ if (!prop_dictionary_get_string(dict, "powerd-script-name", [0])) {
+ powerd_log(LOG_ERR, "dict does not have powerd-script-name");
+ return;
+ }
+ if (!prop_dictionary_get_string(dict, "driver-name", [1])) {
+ powerd_log(LOG_ERR, "dict does not have driver-name");
+ return;
+ }
+ if (!prop_dictionary_get_string(dict, "powerd-event-name", [2])) {
+ powerd_log(LOG_ERR, "dict does not have powerd-event-name");
+ return;
+ }
+
+ /* These arguments are optional. */
+ if (!prop_dictionary_get_string(dict, "sensor-name", [3]))
+ argv[3] = NULL;
+ if (!prop_dictionary_get_string(dict, "state-description", [4]))
+ argv[4] = NULL;
+
argv[5] = NULL;
run_script(argv);
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Mon Oct 12 16:27:24 UTC 2020
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c part_edit.c
Log Message:
Minor fix to previous: fix condition when we offer the partition type
switch - it makes sense even if the disk is partitioned but has no valid
partitions.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/usr.sbin/sysinst/bsddisklabel.c
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/sysinst/part_edit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.52 src/usr.sbin/sysinst/bsddisklabel.c:1.53
--- src/usr.sbin/sysinst/bsddisklabel.c:1.52 Mon Oct 12 16:14:32 2020
+++ src/usr.sbin/sysinst/bsddisklabel.c Mon Oct 12 16:27:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.52 2020/10/12 16:14:32 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.53 2020/10/12 16:27:23 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -840,7 +840,7 @@ ask_layout(struct disk_partitions *parts
opt++;
num_opts++;
- if (have_existing && num_available_part_schemes > 1 &&
+ if (num_available_part_schemes > 1 &&
parts->parent == NULL) {
opt->opt_name = MSG_Use_Different_Part_Scheme;
opt->opt_flags = OPT_EXIT;
Index: src/usr.sbin/sysinst/part_edit.c
diff -u src/usr.sbin/sysinst/part_edit.c:1.23 src/usr.sbin/sysinst/part_edit.c:1.24
--- src/usr.sbin/sysinst/part_edit.c:1.23 Mon Oct 12 16:14:32 2020
+++ src/usr.sbin/sysinst/part_edit.c Mon Oct 12 16:27:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: part_edit.c,v 1.23 2020/10/12 16:14:32 martin Exp $ */
+/* $NetBSD: part_edit.c,v 1.24 2020/10/12 16:27:23 martin Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -1054,7 +1054,6 @@ ask_fullpart(struct disk_partitions *par
size_t num_opts;
menu_ent options[4], *opt;
daddr_t start, size;
- bool have_existing = false;
args[0] = msg_string(pm->parts->pscheme->name);
args[1] = msg_string(pm->parts->pscheme->short_name);
@@ -1072,7 +1071,6 @@ ask_fullpart(struct disk_partitions *par
opt->opt_action = set_keep_existing;
opt++;
num_opts++;
- have_existing = true;
}
opt->opt_name = MSG_Use_only_part_of_the_disk;
opt->opt_flags = OPT_EXIT;
@@ -1086,7 +1084,7 @@ ask_fullpart(struct disk_partitions *par
opt++;
num_opts++;
- if (have_existing && num_available_part_schemes > 1) {
+ if (num_available_part_schemes > 1) {
opt->opt_name = MSG_Use_Different_Part_Scheme;
opt->opt_flags = OPT_EXIT;
opt->opt_action = set_switch_scheme;
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Mon Oct 12 16:14:37 UTC 2020 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c defs.h disklabel.c gpt.c install.c mbr.c mbr.h msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl part_edit.c partitions.h src/usr.sbin/sysinst/arch/acorn32: md.c src/usr.sbin/sysinst/arch/alpha: md.c src/usr.sbin/sysinst/arch/amiga: md.c src/usr.sbin/sysinst/arch/arc: md.c src/usr.sbin/sysinst/arch/atari: md.c src/usr.sbin/sysinst/arch/bebox: md.c src/usr.sbin/sysinst/arch/cats: md.c src/usr.sbin/sysinst/arch/cobalt: md.c src/usr.sbin/sysinst/arch/dummy: md.c src/usr.sbin/sysinst/arch/emips: md.c src/usr.sbin/sysinst/arch/evbarm: md.c src/usr.sbin/sysinst/arch/evbmips: md.c src/usr.sbin/sysinst/arch/evbppc: md.c src/usr.sbin/sysinst/arch/evbsh3: md.c src/usr.sbin/sysinst/arch/ews4800mips: md.c src/usr.sbin/sysinst/arch/hp300: md.c src/usr.sbin/sysinst/arch/hpcarm: md.c src/usr.sbin/sysinst/arch/hpcmips: md.c src/usr.sbin/sysinst/arch/hpcsh: md.c src/usr.sbin/sysinst/arch/hppa: md.c src/usr.sbin/sysinst/arch/i386: md.c src/usr.sbin/sysinst/arch/landisk: md.c src/usr.sbin/sysinst/arch/luna68k: md.c src/usr.sbin/sysinst/arch/mac68k: md.c src/usr.sbin/sysinst/arch/macppc: md.c src/usr.sbin/sysinst/arch/mipsco: md.c src/usr.sbin/sysinst/arch/mvme68k: md.c src/usr.sbin/sysinst/arch/news68k: md.c src/usr.sbin/sysinst/arch/newsmips: md.c src/usr.sbin/sysinst/arch/ofppc: md.c src/usr.sbin/sysinst/arch/playstation2: md.c src/usr.sbin/sysinst/arch/pmax: md.c src/usr.sbin/sysinst/arch/prep: md.c src/usr.sbin/sysinst/arch/sandpoint: md.c src/usr.sbin/sysinst/arch/sgimips: md.c src/usr.sbin/sysinst/arch/shark: md.c src/usr.sbin/sysinst/arch/sparc: md.c src/usr.sbin/sysinst/arch/sparc64: md.c src/usr.sbin/sysinst/arch/vax: md.c src/usr.sbin/sysinst/arch/x68k: md.c src/usr.sbin/sysinst/arch/zaurus: md.c Log Message: PR 55536: when we find existing partition tables and have alternative formats available, offer to delete partitions and create new ones from scratch (in some other or the same on-disk format). To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/usr.sbin/sysinst/bsddisklabel.c cvs rdiff -u -r1.65 -r1.66 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/sysinst/disklabel.c cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/sysinst/gpt.c cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/sysinst/install.c \ src/usr.sbin/sysinst/partitions.h cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/mbr.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/mbr.h cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sysinst/msg.mi.de \ src/usr.sbin/sysinst/part_edit.c cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/sysinst/msg.mi.en \ src/usr.sbin/sysinst/msg.mi.pl cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/sysinst/msg.mi.es cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/sysinst/msg.mi.fr cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/acorn32/md.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/alpha/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/amiga/md.c cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/arch/arc/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/atari/md.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/bebox/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/cats/md.c cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sysinst/arch/cobalt/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/dummy/md.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/emips/md.c cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/sysinst/arch/evbarm/md.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/evbmips/md.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/evbppc/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/evbsh3/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/ews4800mips/md.c cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/arch/hp300/md.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/hpcarm/md.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/hpcmips/md.c cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/hpcsh/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/hppa/md.c cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/sysinst/arch/i386/md.c cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sysinst/arch/landisk/md.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/luna68k/md.c cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/mac68k/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/macppc/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/mipsco/md.c cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/arch/mvme68k/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/news68k/md.c cvs rdiff -u
CVS commit: src/external/mit/ctwm/etc
Module Name:src
Committed By: nia
Date: Mon Oct 12 15:24:16 UTC 2020
Modified Files:
src/external/mit/ctwm/etc: system.ctwmrc
Log Message:
xclock also gets AlwaysOnTop
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/ctwm/etc/system.ctwmrc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/ctwm/etc/system.ctwmrc
diff -u src/external/mit/ctwm/etc/system.ctwmrc:1.8 src/external/mit/ctwm/etc/system.ctwmrc:1.9
--- src/external/mit/ctwm/etc/system.ctwmrc:1.8 Mon Oct 12 11:07:24 2020
+++ src/external/mit/ctwm/etc/system.ctwmrc Mon Oct 12 15:24:16 2020
@@ -1,5 +1,5 @@
#
-# $NetBSD: system.ctwmrc,v 1.8 2020/10/12 11:07:24 nia Exp $
+# $NetBSD: system.ctwmrc,v 1.9 2020/10/12 15:24:16 nia Exp $
#
# ctwmrc by nia
#
@@ -300,6 +300,7 @@ OccupyAll
AlwaysOnTop
{
+ "xclock"
"XEyes"
"XVidCap"
}
CVS commit: src
Module Name:src
Committed By: roy
Date: Mon Oct 12 15:18:48 UTC 2020
Modified Files:
src/share/man/man4: carp.4
src/sys/netinet: ip_carp.c ip_carp.h
Log Message:
carp: link state is DOWN until it becomes a MASTER
This is consitent with other BSD's handling of CARP and means
we don't have to carry a custom flag for it.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/carp.4
cvs rdiff -u -r1.112 -r1.113 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/ip_carp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/carp.4
diff -u src/share/man/man4/carp.4:1.7 src/share/man/man4/carp.4:1.8
--- src/share/man/man4/carp.4:1.7 Thu Jan 16 12:56:39 2020
+++ src/share/man/man4/carp.4 Mon Oct 12 15:18:48 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: carp.4,v 1.7 2020/01/16 12:56:39 kardel Exp $
+.\" $NetBSD: carp.4,v 1.8 2020/10/12 15:18:48 roy Exp $
.\" $OpenBSD: carp.4,v 1.19 2005/08/09 09:52:12 jmc Exp $
.\"
.\" Copyright (c) 2003, Ryan McBride. All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd January 16, 2020
+.Dd October 12, 2020
.Dt CARP 4
.Os
.Sh NAME
@@ -76,20 +76,6 @@ or through the
.Dv SIOCSVH
ioctl.
.Pp
-Setting the
-.Cm link0
-parameter will cause the carp interface to report
-.Dv LINK_STATE_DOWN
-in non
-.Dv MASTER/BACKUP
-mode instead of
-.Dv LINK_STATE_UNKNOWN
-as link status.
-This prevents routing software to announce routes for the carp
-interface when in
-.Dv INIT
-mode.
-.Pp
Additionally, there are a number of global parameters which can be set using
.Xr sysctl 8 :
.Bl -tag -width xx
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.112 src/sys/netinet/ip_carp.c:1.113
--- src/sys/netinet/ip_carp.c:1.112 Mon Oct 12 11:07:27 2020
+++ src/sys/netinet/ip_carp.c Mon Oct 12 15:18:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.112 2020/10/12 11:07:27 roy Exp $ */
+/* $NetBSD: ip_carp.c,v 1.113 2020/10/12 15:18:48 roy Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.112 2020/10/12 11:07:27 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.113 2020/10/12 15:18:48 roy Exp $");
/*
* TODO:
@@ -890,6 +890,7 @@ carp_clone_create(struct if_clone *ifc,
/* Overwrite ethernet defaults */
ifp->if_type = IFT_CARP;
ifp->if_output = carp_output;
+ ifp->if_link_state = LINK_STATE_DOWN;
carp_set_enaddr(sc);
if_register(ifp);
@@ -2228,8 +2229,8 @@ carp_update_link_state(struct carp_softc
link_state = LINK_STATE_UP;
break;
default:
- link_state = ((sc->sc_if.if_flags & IFF_ONLY_MASTER_UP) != 0)
- ? LINK_STATE_DOWN : LINK_STATE_UNKNOWN;
+ /* Not useable, so down makes perfect sense. */
+ link_state = LINK_STATE_DOWN;
break;
}
if_link_state_change(>sc_if, link_state);
Index: src/sys/netinet/ip_carp.h
diff -u src/sys/netinet/ip_carp.h:1.11 src/sys/netinet/ip_carp.h:1.12
--- src/sys/netinet/ip_carp.h:1.11 Thu Jan 16 12:56:40 2020
+++ src/sys/netinet/ip_carp.h Mon Oct 12 15:18:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.h,v 1.11 2020/01/16 12:56:40 kardel Exp $ */
+/* $NetBSD: ip_carp.h,v 1.12 2020/10/12 15:18:48 roy Exp $ */
/* $OpenBSD: ip_carp.h,v 1.18 2005/04/20 23:00:41 mpf Exp $ */
/*
@@ -133,9 +133,6 @@ struct carpreq {
unsigned char carpr_key[CARP_KEY_LEN];
};
-/* enable link status up only for MASTER state */
-#define IFF_ONLY_MASTER_UP IFF_LINK0
-
/*
* Names for CARP sysctl objects
*/
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Mon Oct 12 14:29:41 UTC 2020
Modified Files:
src/usr.sbin/sysinst: disks.c
Log Message:
Remove very strange code that special-cased MSDOS file systems and refused
to newfs the partition (despite explicit request to do so) if it was
mountable.
Accidently carried over from a dim and distant past, before we had
fsck_newfs.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/usr.sbin/sysinst/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/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.69 src/usr.sbin/sysinst/disks.c:1.70
--- src/usr.sbin/sysinst/disks.c:1.69 Mon Sep 28 18:51:34 2020
+++ src/usr.sbin/sysinst/disks.c Mon Oct 12 14:29:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.69 2020/09/28 18:51:34 martin Exp $ */
+/* $NetBSD: disks.c,v 1.70 2020/10/12 14:29:41 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1188,23 +1188,8 @@ make_filesystems(struct install_partitio
break;
}
if ((ptn->instflags & PUIINST_NEWFS) && newfs != NULL) {
- if (ptn->fs_type == FS_MSDOS) {
- /* newfs only if mount fails */
- if (run_program(RUN_SILENT | RUN_ERROR_OK,
-"mount -rt msdos %s /mnt2", devdev) != 0)
- error = run_program(
- RUN_DISPLAY | RUN_PROGRESS,
- "%s %s",
- newfs, rdev);
-else {
- run_program(RUN_SILENT | RUN_ERROR_OK,
- "umount /mnt2");
- error = 0;
-}
- } else {
-error = run_program(RUN_DISPLAY | RUN_PROGRESS,
+ error = run_program(RUN_DISPLAY | RUN_PROGRESS,
"%s %s", newfs, rdev);
- }
} else if ((ptn->instflags & (PUIINST_MOUNT|PUIINST_BOOT))
&& fsname != NULL) {
/* We'd better check it isn't dirty */
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Oct 12 14:10:38 UTC 2020 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note update to dhcpcd-9.3.1 To generate a diff of this commit: cvs rdiff -u -r1.1751 -r1.1752 src/doc/3RDPARTY cvs rdiff -u -r1.2745 -r1.2746 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1751 src/doc/3RDPARTY:1.1752 --- src/doc/3RDPARTY:1.1751 Fri Oct 9 19:05:57 2020 +++ src/doc/3RDPARTY Mon Oct 12 14:10:37 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1751 2020/10/09 19:05:57 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1752 2020/10/12 14:10:37 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -352,12 +352,12 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 9.3.0 -Current Vers: 9.3.0 +Version: 9.3.1 +Current Vers: 9.3.1 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ -Date: 2020-10-05 +Date: 2020-10-12 Mailing List: dhcpcd-disc...@marples.name License: BSD (2-clause) Location: external/bsd/dhcpcd/dist Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2745 src/doc/CHANGES:1.2746 --- src/doc/CHANGES:1.2745 Fri Oct 9 19:05:57 2020 +++ src/doc/CHANGES Mon Oct 12 14:10:37 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2745 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2746 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -292,3 +292,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: dhcpcd: Update to version 9.3.0 [roy 20201005] tzdata updated to 2020b [kre 20201008] tzcode: Updated to 2020b. [christos 20201009] + dhcpcd: Update to version 9.3.1 [roy 20201012]
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src
Committed By: roy
Date: Mon Oct 12 14:09:03 UTC 2020
Modified Files:
src/external/bsd/dhcpcd/dist/src: dhcp.c dhcp6.c dhcpcd.c if-bsd.c
ipv6.c ipv6nd.c logerr.c privsep.c script.c
Log Message:
Sync withn dhcpcd-9.3.1
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/external/bsd/dhcpcd/dist/src/dhcp.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/dhcpcd/dist/src/dhcp6.c
cvs rdiff -u -r1.43 -r1.44 src/external/bsd/dhcpcd/dist/src/dhcpcd.c
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/dhcpcd/dist/src/if-bsd.c \
src/external/bsd/dhcpcd/dist/src/ipv6nd.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/src/ipv6.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/src/logerr.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcpcd/dist/src/privsep.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/src/script.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/bsd/dhcpcd/dist/src/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp.c:1.40 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.41
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.40 Mon Oct 5 16:02:15 2020
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c Mon Oct 12 14:09:03 2020
@@ -1712,7 +1712,7 @@ send_message(struct interface *ifp, uint
if (callback == NULL) {
/* No carrier? Don't bother sending the packet. */
- if (ifp->carrier <= LINK_DOWN)
+ if (!if_is_link_up(ifp))
return;
logdebugx("%s: sending %s with xid 0x%x",
ifp->name,
@@ -1731,7 +1731,7 @@ send_message(struct interface *ifp, uint
(arc4random_uniform(MSEC_PER_SEC * 2) - MSEC_PER_SEC);
/* No carrier? Don't bother sending the packet.
* However, we do need to advance the timeout. */
- if (ifp->carrier <= LINK_DOWN)
+ if (!if_is_link_up(ifp))
goto fail;
logdebugx("%s: sending %s (xid 0x%x), next in %0.1f seconds",
ifp->name,
@@ -2633,7 +2633,7 @@ dhcp_reboot(struct interface *ifp)
state->state = DHS_REBOOT;
state->interval = 0;
- if (ifo->options & DHCPCD_LINK && ifp->carrier <= LINK_DOWN) {
+ if (ifo->options & DHCPCD_LINK && !if_is_link_up(ifp)) {
loginfox("%s: waiting for carrier", ifp->name);
return;
}
@@ -2733,7 +2733,7 @@ dhcp_drop(struct interface *ifp, const c
state->state = DHS_RELEASE;
dhcp_unlink(ifp->ctx, state->leasefile);
- if (ifp->carrier > LINK_DOWN &&
+ if (if_is_link_up(ifp) &&
state->new != NULL &&
state->lease.server.s_addr != INADDR_ANY)
{
Index: src/external/bsd/dhcpcd/dist/src/dhcp6.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.23 src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.24
--- src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.23 Mon Oct 5 16:02:15 2020
+++ src/external/bsd/dhcpcd/dist/src/dhcp6.c Mon Oct 12 14:09:03 2020
@@ -1237,7 +1237,7 @@ dhcp6_sendmessage(struct interface *ifp,
};
char uaddr[INET6_ADDRSTRLEN];
- if (!callback && ifp->carrier <= LINK_DOWN)
+ if (!callback && !if_is_link_up(ifp))
return 0;
if (!IN6_IS_ADDR_UNSPECIFIED(>unicast)) {
@@ -1298,7 +1298,7 @@ dhcp6_sendmessage(struct interface *ifp,
+ (unsigned int)((float)state->RT
* ((float)lr / DHCP6_RAND_DIV));
- if (ifp->carrier > LINK_DOWN)
+ if (if_is_link_up(ifp))
logdebugx("%s: %s %s (xid 0x%02x%02x%02x)%s%s,"
" next in %0.1f seconds",
ifp->name,
@@ -1320,7 +1320,7 @@ dhcp6_sendmessage(struct interface *ifp,
}
}
- if (ifp->carrier <= LINK_DOWN)
+ if (!if_is_link_up(ifp))
return 0;
/* Update the elapsed time */
@@ -2906,7 +2906,7 @@ dhcp6_delegate_prefix(struct interface *
if (ia->sla_len == 0) {
/* no SLA configured, so lets
* automate it */
- if (ifd->carrier != LINK_UP) {
+ if (!if_is_link_up(ifd)) {
logdebugx(
"%s: has no carrier, cannot"
" delegate addresses",
@@ -2922,7 +2922,7 @@ dhcp6_delegate_prefix(struct interface *
sla = >sla[j];
if (strcmp(ifd->name, sla->ifname))
continue;
- if (ifd->carrier != LINK_UP) {
+ if (!if_is_link_up(ifd)) {
logdebugx(
"%s: has no carrier, cannot"
" delegate addresses",
@@ -4029,7 +4029,7 @@ dhcp6_freedrop(struct interface *ifp, in
if (drop && options & DHCPCD_RELEASE &&
state->state != DH6S_DELEGATED)
{
- if (ifp->carrier == LINK_UP &&
+ if (if_is_link_up(ifp) &&
state->state != DH6S_RELEASED &&
state->state != DH6S_INFORMED)
{
Index: src/external/bsd/dhcpcd/dist/src/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.43 src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.44
--- src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.43 Mon Oct 5 16:02:15 2020
+++ src/external/bsd/dhcpcd/dist/src/dhcpcd.c Mon Oct 12 14:09:03 2020
@@ -97,9 +97,6 @@ const int dhcpcd_signals_ignore[] = {
const size_t dhcpcd_signals_ignore_len = __arraycount(dhcpcd_signals_ignore);
#endif
-#define
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Oct 12 14:07:56 UTC 2020 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8895 Log Message: Update to dhcpcd-9.3.1 with the following changes: * dhcpcd: carrier handling issue fixed from 9.3.0 * dhcpcd: log if interface type is unsupported in debug * duid: memory leak fixed if UUID wanted but none available * privsep: fix receiving inet and no BPF running * privsep: allow gettimeofday for SECCOMP * privsep: fix stderr redirection again Status: Vendor Tag: ROY Release Tags: dhcpcd-9_3_1 U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/control.c C src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/eloop.c C src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/if.c U src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/sa.c U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.c C src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c C src/external/bsd/dhcpcd/dist/src/if-bsd.c C src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/ipv4.c U src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.c C src/external/bsd/dhcpcd/dist/src/ipv6.c C src/external/bsd/dhcpcd/dist/src/ipv6nd.c C src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/src/privsep.c U src/external/bsd/dhcpcd/dist/src/privsep-root.c U src/external/bsd/dhcpcd/dist/src/privsep-control.c U src/external/bsd/dhcpcd/dist/src/privsep-inet.c U src/external/bsd/dhcpcd/dist/src/privsep-bpf.c U src/external/bsd/dhcpcd/dist/src/privsep-bsd.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/sa.h U src/external/bsd/dhcpcd/dist/src/route.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/script.h U src/external/bsd/dhcpcd/dist/src/auth.h U src/external/bsd/dhcpcd/dist/src/dhcp.h U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.h U src/external/bsd/dhcpcd/dist/src/ipv6.h U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/src/privsep.h U src/external/bsd/dhcpcd/dist/src/privsep-root.h U src/external/bsd/dhcpcd/dist/src/privsep-control.h U src/external/bsd/dhcpcd/dist/src/privsep-inet.h U src/external/bsd/dhcpcd/dist/src/privsep-bpf.h U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/hooks/01-test U src/external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/hooks/15-timezone U src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/hooks/30-hostname.in U src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/hooks/50-ypbind.in 9 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/dhcpcd/dist
CVS commit: src/games/factor
Module Name:src
Committed By: christos
Date: Mon Oct 12 13:54:51 UTC 2020
Modified Files:
src/games/factor: factor.c
Log Message:
- remove duplicate comment
- flush after printing the number
(from kre@)
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/games/factor/factor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/factor/factor.c
diff -u src/games/factor/factor.c:1.37 src/games/factor/factor.c:1.38
--- src/games/factor/factor.c:1.37 Sun Oct 11 14:46:21 2020
+++ src/games/factor/factor.c Mon Oct 12 09:54:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: factor.c,v 1.37 2020/10/11 18:46:21 christos Exp $ */
+/* $NetBSD: factor.c,v 1.38 2020/10/12 13:54:51 christos Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
__SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: factor.c,v 1.37 2020/10/11 18:46:21 christos Exp $");
+__RCSID("$NetBSD: factor.c,v 1.38 2020/10/12 13:54:51 christos Exp $");
#endif
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/factor/factor.c 35 2020-01-12 20:25:11Z gad $");
@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD: head/usr.bin/factor/
* If the -x flag is specified numbers are printed in hex.
*
* If no number args are given, the list of numbers are read from stdin.
- * If no args are given, the list of numbers are read from stdin.
*/
#include
@@ -225,6 +224,7 @@ pr_fact(BIGNUM *val, int hflag, int xfla
} else
BN_print_dec_fp(stdout, val);
putchar(':');
+ fflush(stdout);
for (fact = [0]; !BN_is_one(val); ++fact) {
/* Look for the smallest factor. */
do {
CVS commit: src/games/factor
Module Name:src Committed By: christos Date: Mon Oct 12 13:53:43 UTC 2020 Modified Files: src/games/factor: factor.6 Log Message: more clarifications. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/games/factor/factor.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/factor/factor.6 diff -u src/games/factor/factor.6:1.17 src/games/factor/factor.6:1.18 --- src/games/factor/factor.6:1.17 Sun Oct 11 14:48:20 2020 +++ src/games/factor/factor.6 Mon Oct 12 09:53:43 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: factor.6,v 1.17 2020/10/11 18:48:20 christos Exp $ +.\" $NetBSD: factor.6,v 1.18 2020/10/12 13:53:43 christos Exp $ .\" .\" Copyright (c) 1989, 1993 .\" The Regents of the University of California. All rights reserved. @@ -35,7 +35,7 @@ .\" .\" By Landon Curt Noll, http://www.isthe.com/chongo/index.html /\oo/\ .\" -.Dd October 11, 2020 +.Dd October 12, 2020 .Dt FACTOR 6 .Os .Sh NAME @@ -48,7 +48,8 @@ .Sh DESCRIPTION The .Nm -utility factors integers larger than 1. +utility factors integers larger than +.Dv 0 . When a number is factored, it is printed, followed by a .Dq \&: , and the list of @@ -76,7 +77,10 @@ Numbers may be preceded by a single +. Numbers that start with .Dv 0x are interpreted as hexadecimal. -Integer less than 2 are rejected. +A +.Dv 0 +input exits the program. +Negative numbers are not allowed. Numbers are terminated by a non-digit character (such as a newline). After a number is read, it is factored. Input lines must not be longer than
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Mon Oct 12 12:17:29 UTC 2020
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c
Log Message:
Previously we abused pm->ptstart / pm->ptsize to pass the bounds of the
NetBSD outer partition to the inner partition editor - but now this is
not a valid assumption any more, so explicitly fix the bounds if an
outer partition exists.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/sysinst/bsddisklabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.50 src/usr.sbin/sysinst/bsddisklabel.c:1.51
--- src/usr.sbin/sysinst/bsddisklabel.c:1.50 Fri Oct 9 18:33:00 2020
+++ src/usr.sbin/sysinst/bsddisklabel.c Mon Oct 12 12:17:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.50 2020/10/09 18:33:00 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.51 2020/10/12 12:17:29 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1701,6 +1701,7 @@ make_bsd_partitions(struct install_parti
struct disk_partitions *parts = pm->parts;
const struct disk_partitioning_scheme *pscheme;
struct partition_usage_set wanted;
+ daddr_t p_start, p_size;
enum layout_type layoutkind = LY_SETSIZES;
bool have_existing;
@@ -1777,11 +1778,20 @@ make_bsd_partitions(struct install_parti
layoutkind = ask_layout(parts, have_existing);
}
+ if (layoutkind == LY_USEDEFAULT || layoutkind == LY_SETSIZES) {
+ /* calc available disk area for the NetBSD partitions */
+ p_start = pm->ptstart;
+ p_size = pm->ptsize;
+ if (parts->parent != NULL &&
+ parts->parent->pscheme->guess_install_target != NULL)
+ parts->parent->pscheme->guess_install_target(
+ parts->parent, _start, _size);
+ }
if (layoutkind == LY_USEDEFAULT) {
- replace_by_default(parts, pm->ptstart, pm->ptsize,
+ replace_by_default(parts, p_start, p_size,
);
} else if (layoutkind == LY_SETSIZES) {
- if (!edit_with_defaults(parts, pm->ptstart, pm->ptsize,
+ if (!edit_with_defaults(parts, p_start, p_size,
)) {
free_usage_set();
return false;
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Mon Oct 12 12:11:55 UTC 2020 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: Scale XTerm and other X11 apps using the same DPI detection as ctwm To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xinit/dist/xinitrc.cpp 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/xdm/dist/config/Xsession.in diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.7 xsrc/external/mit/xdm/dist/config/Xsession.in:1.8 --- xsrc/external/mit/xdm/dist/config/Xsession.in:1.7 Mon Oct 12 11:46:17 2020 +++ xsrc/external/mit/xdm/dist/config/Xsession.in Mon Oct 12 12:11:55 2020 @@ -52,6 +52,11 @@ XCOMM The startup script is not intended startup=$HOME/.xsession resources=$HOME/.Xresources +fontsize=$(/usr/X11R7/libexec/ctwm_font_size) +if ! [ -n "$fontsize" ]; then + fontsize=16 +fi + if [ -s "$startup" ]; then if [ -x "$startup" ]; then exec "$startup" @@ -68,6 +73,23 @@ else *VT100.foreground: grey90 *VT100.background: black #endif +*VT100.allowBoldFonts: false +*VT100.font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +*VT100.utf8Fonts.font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Editres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Viewres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +XCalc*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +XClipboard*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +XConsole*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +XFontSel*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +XLoad*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xedit*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xfd*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xgc*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xmag*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xmessage*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xmh*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* EOF fi BINDIR/xsetroot -cursor_name left_ptr Index: xsrc/external/mit/xinit/dist/xinitrc.cpp diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.9 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.10 --- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.9 Mon Oct 12 11:46:17 2020 +++ xsrc/external/mit/xinit/dist/xinitrc.cpp Mon Oct 12 12:11:55 2020 @@ -23,6 +23,11 @@ if [ -f $sysmodmap ]; then XMODMAP $sysmodmap fi +fontsize=$(/usr/X11R7/libexec/ctwm_font_size) +if ! [ -n "$fontsize" ]; then + fontsize=16 +fi + if [ -f "$userresources" ]; then #ifdef __APPLE__ if [ -x /usr/bin/cpp ] ; then @@ -40,6 +45,23 @@ else *VT100.foreground: grey90 *VT100.background: black #endif +*VT100.allowBoldFonts: false +*VT100.font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +*VT100.utf8Fonts.font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Editres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Viewres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +XCalc*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +XClipboard*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +XConsole*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +XFontSel*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +XLoad*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xedit*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xfd*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xgc*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xmag*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xmessage*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* +Xmh*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* EOF fi
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: ryoon
Date: Mon Oct 12 12:11:03 UTC 2020
Modified Files:
src/sys/arch/x86/x86: hyperv.c
Log Message:
Fix typo in comment
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x86/x86/hyperv.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/x86/x86/hyperv.c
diff -u src/sys/arch/x86/x86/hyperv.c:1.11 src/sys/arch/x86/x86/hyperv.c:1.12
--- src/sys/arch/x86/x86/hyperv.c:1.11 Tue Jul 14 00:45:53 2020
+++ src/sys/arch/x86/x86/hyperv.c Mon Oct 12 12:11:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hyperv.c,v 1.11 2020/07/14 00:45:53 yamaguchi Exp $ */
+/* $NetBSD: hyperv.c,v 1.12 2020/10/12 12:11:03 ryoon Exp $ */
/*-
* Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
@@ -29,11 +29,11 @@
*/
/**
- * Implements low-level interactions with Hyper-V/Azuree
+ * Implements low-level interactions with Hyper-V/Azure
*/
#include
#ifdef __KERNEL_RCSID
-__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.11 2020/07/14 00:45:53 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.12 2020/10/12 12:11:03 ryoon Exp $");
#endif
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/sys/dev/hyperv/vmbus/hyperv.c 331757 2018-03-30 02:25:12Z emaste $");
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Mon Oct 12 11:46:17 UTC 2020 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: more 'welcoming' default root window pointer To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xinit/dist/xinitrc.cpp 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/xdm/dist/config/Xsession.in diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.6 xsrc/external/mit/xdm/dist/config/Xsession.in:1.7 --- xsrc/external/mit/xdm/dist/config/Xsession.in:1.6 Sun Oct 11 10:09:09 2020 +++ xsrc/external/mit/xdm/dist/config/Xsession.in Mon Oct 12 11:46:17 2020 @@ -70,6 +70,7 @@ else #endif EOF fi + BINDIR/xsetroot -cursor_name left_ptr BINDIR/xsetroot -solid 'rgb:00/22/44' BINDIR/uxterm & exec BINDIR/ctwm -W Index: xsrc/external/mit/xinit/dist/xinitrc.cpp diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.8 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.9 --- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.8 Sun Oct 11 10:09:09 2020 +++ xsrc/external/mit/xinit/dist/xinitrc.cpp Mon Oct 12 11:46:17 2020 @@ -56,6 +56,7 @@ if [ -d XINITDIR/xinitrc.d ] ; then unset f fi +XSETROOT -cursor_name left_ptr XSETROOT -solid 'rgb:00/22/44' UXTERM & exec CTWM -W
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: nia
Date: Mon Oct 12 11:43:11 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
define xsetroot in the right place
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.10 src/external/mit/xorg/bin/xinit/Makefile:1.11
--- src/external/mit/xorg/bin/xinit/Makefile:1.10 Sun Oct 11 10:08:26 2020
+++ src/external/mit/xorg/bin/xinit/Makefile Mon Oct 12 11:43:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/10/11 10:08:26 nia Exp $
+# $NetBSD: Makefile,v 1.11 2020/10/12 11:43:11 nia Exp $
.include
@@ -14,6 +14,7 @@ CPPSCRIPTS= startx xinitrc
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
-DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
+ -DXSETROOT=${X11BINDIR}/xsetroot \
-DUXTERM=${X11BINDIR}/uxterm \
-DCTWM=${X11BINDIR}/ctwm
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Mon Oct 12 11:23:46 UTC 2020 Modified Files: src/usr.sbin/sysinst: part_edit.c Log Message: Fix editing start and size of not yet existing outer partitions. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/sysinst/part_edit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/part_edit.c diff -u src/usr.sbin/sysinst/part_edit.c:1.21 src/usr.sbin/sysinst/part_edit.c:1.22 --- src/usr.sbin/sysinst/part_edit.c:1.21 Sat Oct 10 19:42:19 2020 +++ src/usr.sbin/sysinst/part_edit.c Mon Oct 12 11:23:45 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: part_edit.c,v 1.21 2020/10/10 19:42:19 martin Exp $ */ +/* $NetBSD: part_edit.c,v 1.22 2020/10/12 11:23:45 martin Exp $ */ /* * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -214,7 +214,10 @@ edit_part_start(menudesc *m, void *arg) struct disk_part_info pinfo; daddr_t max_size; - marg->parts->pscheme->get_part_info(marg->parts, marg->cur_id, ); + if (marg->cur_id == NO_PART || + !marg->parts->pscheme->get_part_info(marg->parts, marg->cur_id, + )) + pinfo = marg->cur; marg->cur.start = getpartoff(marg->parts, marg->cur.start); max_size = marg->parts->pscheme->max_free_space_at(marg->parts, pinfo.start); @@ -231,7 +234,10 @@ edit_part_size(menudesc *m, void *arg) struct part_edit_info *marg = arg; struct disk_part_info pinfo; - marg->parts->pscheme->get_part_info(marg->parts, marg->cur_id, ); + if (marg->cur_id == NO_PART || + !marg->parts->pscheme->get_part_info(marg->parts, marg->cur_id, + )) + pinfo = marg->cur; marg->cur.size = getpartsize(marg->parts, pinfo.start, marg->cur.start, marg->cur.size);
CVS commit: src
Module Name:src Committed By: nia Date: Mon Oct 12 11:07:24 UTC 2020 Modified Files: src/distrib/sets/lists/xbase: mi src/external/mit/ctwm/etc: system.ctwmrc src/external/mit/ctwm/libexec: Makefile ctwm_app_menu Added Files: src/external/mit/ctwm/libexec: ctwm_font_size Log Message: Automatic font scaling based on screen size in the default ctwm config. Based on a shell script which gets the DPI from the X server, and if this fails, attempts to guess based on resolution. Taking advantage of M4 macros in the ctwmrc, we can also scale the workspace manager and window list. The following sizes are supported: 6x12 (<800x600) 8x16 12x24 (4k and higher) 16x32 32x64 Also makes Spleen the default font in ctwm To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.7 -r1.8 src/external/mit/ctwm/etc/system.ctwmrc cvs rdiff -u -r1.1 -r1.2 src/external/mit/ctwm/libexec/Makefile \ src/external/mit/ctwm/libexec/ctwm_app_menu cvs rdiff -u -r0 -r1.1 src/external/mit/ctwm/libexec/ctwm_font_size 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.157 src/distrib/sets/lists/xbase/mi:1.158 --- src/distrib/sets/lists/xbase/mi:1.157 Wed Sep 23 15:30:36 2020 +++ src/distrib/sets/lists/xbase/mi Mon Oct 12 11:07:23 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.157 2020/09/23 15:30:36 nia Exp $ +# $NetBSD: mi,v 1.158 2020/10/12 11:07:23 nia Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1263,6 +1263,7 @@ ./usr/X11R7/libexec base-x11-root xorg ./usr/X11R7/libexec/chooserxbase-chooser-bin xorg ./usr/X11R7/libexec/ctwm_app_menu xbase-ctwm-bin xorg +./usr/X11R7/libexec/ctwm_font_size xbase-ctwm-bin xorg ./usr/X11R7/man base-x11-root xorg ./usr/X11R7/man/cat1 base-x11-root xorg ./usr/X11R7/man/cat1/appres.0xbase-appres-catman .cat,xorg Index: src/external/mit/ctwm/etc/system.ctwmrc diff -u src/external/mit/ctwm/etc/system.ctwmrc:1.7 src/external/mit/ctwm/etc/system.ctwmrc:1.8 --- src/external/mit/ctwm/etc/system.ctwmrc:1.7 Sun Oct 11 10:12:53 2020 +++ src/external/mit/ctwm/etc/system.ctwmrc Mon Oct 12 11:07:24 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: system.ctwmrc,v 1.7 2020/10/11 10:12:53 nia Exp $ +# $NetBSD: system.ctwmrc,v 1.8 2020/10/12 11:07:24 nia Exp $ # # ctwmrc by nia # @@ -26,19 +26,79 @@ UseThreeDBorders #UseThreeDMenus UseThreeDTitles -ThreeDBorderWidth 3 +esyscmd(`printf "define(fontsize, %d)\n" "$(/usr/X11R7/libexec/ctwm_font_size)"') -# TODO: we can use syscmd() in combination with xdpyinfo to detect -# HiDPI screens and set appropiate fonts. -# -# need some good scaled bitmap fonts imported - terminus or spleen -# would be good candidates -MenuFont "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*" -TitleFont"-misc-fixed-bold-r-*-*-18-*-*-*-*-*-*-*" -IconManagerFont "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*" -IconFont "-misc-fixed-bold-r-*-*-18-*-*-*-*-*-*-*" -ResizeFont "-misc-fixed-medium-r-*-*-18-*-*-*-*-*-*-*" -WorkSpaceFont"-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*" +ifelse(fontsize, `64', ` +TitleFont"-*-spleen-*-*-*-*-64-*-*-*-*-*-*-*" +MenuFont "-*-spleen-*-*-*-*-64-*-*-*-*-*-*-*" +IconManagerFont "-*-spleen-*-*-*-*-64-*-*-*-*-*-*-*" +IconFont "-*-spleen-*-*-*-*-64-*-*-*-*-*-*-*" +ResizeFont "-*-spleen-*-*-*-*-64-*-*-*-*-*-*-*" +WorkSpaceFont"-*-spleen-*-*-*-*-32-*-*-*-*-*-*-*" +WorkSpaceManagerGeometry "240x960-4-4" 1 +IconManagerGeometry "800x-1-1+0" 1 +ThreeDBorderWidth 12 +BorderWidth 12 +define(setsizes, `yes') +') + +ifelse(fontsize, `32', ` +TitleFont"-*-spleen-*-*-*-*-32-*-*-*-*-*-*-*" +MenuFont "-*-spleen-*-*-*-*-32-*-*-*-*-*-*-*" +IconManagerFont "-*-spleen-*-*-*-*-32-*-*-*-*-*-*-*" +IconFont "-*-spleen-*-*-*-*-32-*-*-*-*-*-*-*" +ResizeFont "-*-spleen-*-*-*-*-32-*-*-*-*-*-*-*" +WorkSpaceFont"-*-spleen-*-*-*-*-24-*-*-*-*-*-*-*" +WorkSpaceManagerGeometry "120x480-4-4" 1 +IconManagerGeometry "400x-1-1+0" 1 +ThreeDBorderWidth 6 +BorderWidth 6 +define(setsizes, `yes') +') + +ifelse(fontsize, `24', ` +TitleFont"-*-spleen-*-*-*-*-24-*-*-*-*-*-*-*" +MenuFont "-*-spleen-*-*-*-*-24-*-*-*-*-*-*-*" +IconManagerFont "-*-spleen-*-*-*-*-24-*-*-*-*-*-*-*" +IconFont "-*-spleen-*-*-*-*-24-*-*-*-*-*-*-*" +ResizeFont "-*-spleen-*-*-*-*-24-*-*-*-*-*-*-*" +WorkSpaceFont"-*-spleen-*-*-*-*-16-*-*-*-*-*-*-*" +WorkSpaceManagerGeometry "90x360-4-4" 1 +IconManagerGeometry "300x-1-1+0" 1 +ThreeDBorderWidth 4 +BorderWidth 4 +define(setsizes, `yes') +') + +ifelse(fontsize, `12', ` +TitleFont"-*-spleen-*-*-*-*-12-*-*-*-*-*-*-*" +MenuFont
CVS commit: src/sys/netinet
Module Name:src Committed By: roy Date: Mon Oct 12 11:07:27 UTC 2020 Modified Files: src/sys/netinet: ip_carp.c Log Message: carp: Set ethernet address just before interface registation Otherwise ifconfig reports SIOCGLIFADDR errors. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/netinet/ip_carp.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/netinet/ip_carp.c diff -u src/sys/netinet/ip_carp.c:1.111 src/sys/netinet/ip_carp.c:1.112 --- src/sys/netinet/ip_carp.c:1.111 Fri Oct 9 08:10:41 2020 +++ src/sys/netinet/ip_carp.c Mon Oct 12 11:07:27 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_carp.c,v 1.111 2020/10/09 08:10:41 roy Exp $ */ +/* $NetBSD: ip_carp.c,v 1.112 2020/10/12 11:07:27 roy Exp $ */ /* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */ /* @@ -33,7 +33,7 @@ #endif #include -__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.111 2020/10/09 08:10:41 roy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.112 2020/10/12 11:07:27 roy Exp $"); /* * TODO: @@ -887,10 +887,10 @@ carp_clone_create(struct if_clone *ifc, return rv; } ether_ifattach(ifp, NULL); - carp_set_enaddr(sc); /* Overwrite ethernet defaults */ ifp->if_type = IFT_CARP; ifp->if_output = carp_output; + carp_set_enaddr(sc); if_register(ifp); return (0);
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Oct 12 10:27:57 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Ticket # To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-9.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-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.121 src/doc/CHANGES-9.1:1.1.2.122 --- src/doc/CHANGES-9.1:1.1.2.121 Sun Oct 11 12:36:14 2020 +++ src/doc/CHANGES-9.1 Mon Oct 12 10:27:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.121 2020/10/11 12:36:14 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.122 2020/10/12 10:27:57 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -5158,3 +5158,26 @@ sys/dev/dkwedge/dk.c1.102 ccd(4): fix various bugs related to handling of dk(4) wedges. [mlelstv, ticket #1110] +external/bsd/ntp/Makefile.inc 1.20,1.21 +external/bsd/ntp/bin/Makefile.inc 1.4 +external/bsd/ntp/bin/ntp-keygen/Makefile 1.7 (patch) +external/bsd/ntp/bin/ntp-keygen/ntp-keygen.8 delete +external/bsd/ntp/bin/ntpd/Makefile 1.28 (patch) +external/bsd/ntp/bin/ntpd/ntp.conf.5 delete +external/bsd/ntp/bin/ntpd/ntp.keys.5 delete +external/bsd/ntp/bin/ntpd/ntpd.8 delete +external/bsd/ntp/bin/ntpdc/Makefile 1.7 +external/bsd/ntp/bin/ntpdc/ntpdc.8 delete +external/bsd/ntp/bin/ntpq/Makefile 1.9 (patch) +external/bsd/ntp/bin/ntpq/ntpq.8 delete +external/bsd/ntp/bin/sntp/Makefile 1.8,1.9 (patch) +external/bsd/ntp/bin/sntp/sntp.1 delete + + ntpd(8): PR 55710: install the correct man pages. + [kim, ticket #1109] + +external/cddl/osnet/sys/sys/cred.h 1.8 + + Fix PR kern/55675: ZFS mounts do not work with setuid programs. + [hannken, ticket #] +
CVS commit: [netbsd-9] src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: martin
Date: Mon Oct 12 10:26:59 UTC 2020
Modified Files:
src/external/cddl/osnet/sys/sys [netbsd-9]: cred.h
Log Message:
Pull up following revision(s) (requested by hannken in ticket #):
external/cddl/osnet/sys/sys/cred.h: revision 1.8
Stub groupmember() has to test both group list and current group id.
Fixes kern/55675: ZFS mounts do not work with setuid programs
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.1 -r1.6.2.2 src/external/cddl/osnet/sys/sys/cred.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/cred.h
diff -u src/external/cddl/osnet/sys/sys/cred.h:1.6.2.1 src/external/cddl/osnet/sys/sys/cred.h:1.6.2.2
--- src/external/cddl/osnet/sys/sys/cred.h:1.6.2.1 Wed Apr 29 13:47:51 2020
+++ src/external/cddl/osnet/sys/sys/cred.h Mon Oct 12 10:26:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cred.h,v 1.6.2.1 2020/04/29 13:47:51 martin Exp $ */
+/* $NetBSD: cred.h,v 1.6.2.2 2020/10/12 10:26:59 martin Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -70,10 +70,12 @@ extern kauth_cred_t cred0;
static __inline int
groupmember(gid_t gid, cred_t *cr)
{
- int result;
+ int result, error;
- kauth_cred_ismember_gid(cr, gid, );
- return result;
+ error = kauth_cred_ismember_gid(cr, gid, );
+ if (error)
+ return 0;
+ return (kauth_cred_getegid(cr) == gid || result);
}
#endif /* _KERNEL */
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Oct 12 10:25:09 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1616 To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 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.43 src/doc/CHANGES-8.3:1.1.2.44 --- src/doc/CHANGES-8.3:1.1.2.43 Sun Oct 11 12:31:49 2020 +++ src/doc/CHANGES-8.3 Mon Oct 12 10:25:09 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.43 2020/10/11 12:31:49 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.44 2020/10/12 10:25:09 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1110,3 +1110,21 @@ external/bsd/ntp/dist/libntp/work_fork.c socket errors on startup. [kim, ticket #1615] +external/bsd/ntp/Makefile.inc 1.20,1.21 +external/bsd/ntp/bin/Makefile.inc 1.4 +external/bsd/ntp/bin/ntp-keygen/Makefile 1.7 (patch) +external/bsd/ntp/bin/ntp-keygen/ntp-keygen.8 delete +external/bsd/ntp/bin/ntpd/Makefile 1.28 (patch) +external/bsd/ntp/bin/ntpd/ntp.conf.5 delete +external/bsd/ntp/bin/ntpd/ntp.keys.5 delete +external/bsd/ntp/bin/ntpd/ntpd.8 delete +external/bsd/ntp/bin/ntpdc/Makefile 1.7 +external/bsd/ntp/bin/ntpdc/ntpdc.8 delete +external/bsd/ntp/bin/ntpq/Makefile 1.9 (patch) +external/bsd/ntp/bin/ntpq/ntpq.8 delete +external/bsd/ntp/bin/sntp/Makefile 1.8,1.9 (patch) +external/bsd/ntp/bin/sntp/sntp.1 delete + + ntpd(8): PR 55710: install the correct man pages. + [kim, ticket #1616] +
CVS commit: [netbsd-8] src/external/bsd/ntp
Module Name:src
Committed By: martin
Date: Mon Oct 12 10:23:41 UTC 2020
Modified Files:
src/external/bsd/ntp [netbsd-8]: Makefile.inc
src/external/bsd/ntp/bin [netbsd-8]: Makefile.inc
src/external/bsd/ntp/bin/ntp-keygen [netbsd-8]: Makefile
src/external/bsd/ntp/bin/ntpd [netbsd-8]: Makefile
src/external/bsd/ntp/bin/ntpdc [netbsd-8]: Makefile
src/external/bsd/ntp/bin/ntpq [netbsd-8]: Makefile
src/external/bsd/ntp/bin/sntp [netbsd-8]: Makefile
Removed Files:
src/external/bsd/ntp/bin/ntp-keygen [netbsd-8]: ntp-keygen.8
src/external/bsd/ntp/bin/ntpd [netbsd-8]: ntp.conf.5 ntp.keys.5 ntpd.8
src/external/bsd/ntp/bin/ntpdc [netbsd-8]: ntpdc.8
src/external/bsd/ntp/bin/ntpq [netbsd-8]: ntpq.8
src/external/bsd/ntp/bin/sntp [netbsd-8]: sntp.1
Log Message:
Pull up following revision(s) (requested by kim in ticket #1616):
external/bsd/ntp/bin/ntpq/ntpq.8: file removal
external/bsd/ntp/bin/Makefile.inc: revision 1.4
external/bsd/ntp/bin/ntpd/ntpd.8: file removal
external/bsd/ntp/bin/ntpq/Makefile: revision 1.9 (patch)
external/bsd/ntp/bin/ntpd/Makefile: revision 1.28 (patch)
external/bsd/ntp/bin/sntp/sntp.1: file removal
external/bsd/ntp/bin/ntpd/ntp.keys.5: file removal
external/bsd/ntp/bin/ntpd/ntp.conf.5: file removal
external/bsd/ntp/Makefile.inc: revision 1.20
external/bsd/ntp/Makefile.inc: revision 1.21
external/bsd/ntp/bin/sntp/Makefile: revision 1.8
external/bsd/ntp/bin/ntp-keygen/Makefile: revision 1.7 (patch)
external/bsd/ntp/bin/sntp/Makefile: revision 1.9 (patch)
external/bsd/ntp/bin/ntp-keygen/ntp-keygen.8: file removal
external/bsd/ntp/bin/ntpdc/ntpdc.8: file removal
external/bsd/ntp/bin/ntpdc/Makefile: revision 1.7 (patch)
Fix build; clean manpages only if they are generated automatically.
include bsd.own.mk so that ../../Makefile.inc does not do it...
Add rules for manual pages builds, remove including Makefile.inc
Use .PARSEDIR
PR/55710: Kimmo Suominen: Delete manual pages so that they get copy from the
imported, already generated ones.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.3 -r1.3.46.1 src/external/bsd/ntp/bin/Makefile.inc
cvs rdiff -u -r1.5 -r1.5.24.1 src/external/bsd/ntp/bin/ntp-keygen/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntp-keygen/ntp-keygen.8
cvs rdiff -u -r1.21.8.1 -r1.21.8.2 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntpd/ntp.conf.5 \
src/external/bsd/ntp/bin/ntpd/ntpd.8
cvs rdiff -u -r1.2 -r0 src/external/bsd/ntp/bin/ntpd/ntp.keys.5
cvs rdiff -u -r1.6 -r1.6.24.1 src/external/bsd/ntp/bin/ntpdc/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntpdc/ntpdc.8
cvs rdiff -u -r1.7 -r1.7.24.1 src/external/bsd/ntp/bin/ntpq/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntpq/ntpq.8
cvs rdiff -u -r1.6 -r1.6.24.1 src/external/bsd/ntp/bin/sntp/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/sntp/sntp.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.17 src/external/bsd/ntp/Makefile.inc:1.17.2.1
--- src/external/bsd/ntp/Makefile.inc:1.17 Sun May 21 15:28:39 2017
+++ src/external/bsd/ntp/Makefile.inc Mon Oct 12 10:23:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2017/05/21 15:28:39 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.17.2.1 2020/10/12 10:23:41 martin Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -12,9 +12,6 @@ CWARNFLAGS.clang+= -Wno-unneeded-interna
WARNS?= 4
-
-.include
-
IDIST= ${NETBSDSRCDIR}/external/bsd/ntp/dist
NTP_SRCDIR= ${NETBSDSRCDIR}/external/bsd/ntp
NTP_HTMLDIR= /usr/share/doc/reference/ref8
@@ -67,4 +64,24 @@ CPPFLAGS+=-DISC_PLATFORM_NEEDIN6ADDRANY
.include "${.CURDIR}/../../Makefile.inc"
.endif
+.SUFFIXES: .1 .5 .8 .1ntpdmdoc .5mdoc .1ntp-keygenmdoc .1ntpdcmdoc .1ntpqmdoc .1sntpmdoc
+
+.5mdoc.5:
+ ${TOOL_SED} -e 's/5mdoc/5/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntpdmdoc.8:
+ ${TOOL_SED} -e 's/1ntpdmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntp-keygenmdoc.8:
+ ${TOOL_SED} -e 's/1ntp-keygenmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntpdcmdoc.8:
+ ${TOOL_SED} -e 's/1ntpdcmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntpqmdoc.8:
+ ${TOOL_SED} -e 's/1ntpqmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1sntpmdoc.1:
+ ${TOOL_SED} -e 's/1sntpmdoc/1/g' < ${.IMPSRC} > ${.TARGET}
+
.endif
Index: src/external/bsd/ntp/bin/Makefile.inc
diff -u src/external/bsd/ntp/bin/Makefile.inc:1.3 src/external/bsd/ntp/bin/Makefile.inc:1.3.46.1
--- src/external/bsd/ntp/bin/Makefile.inc:1.3 Sat Dec 4 23:08:33 2010
+++ src/external/bsd/ntp/bin/Makefile.inc Mon Oct 12 10:23:40 2020
@@ -1,3 +1,3 @@
-# $NetBSD:
CVS commit: [netbsd-9] src/external/bsd/ntp
Module Name:src
Committed By: martin
Date: Mon Oct 12 10:17:33 UTC 2020
Modified Files:
src/external/bsd/ntp [netbsd-9]: Makefile.inc
src/external/bsd/ntp/bin [netbsd-9]: Makefile.inc
src/external/bsd/ntp/bin/ntp-keygen [netbsd-9]: Makefile
src/external/bsd/ntp/bin/ntpd [netbsd-9]: Makefile
src/external/bsd/ntp/bin/ntpdc [netbsd-9]: Makefile
src/external/bsd/ntp/bin/ntpq [netbsd-9]: Makefile
src/external/bsd/ntp/bin/sntp [netbsd-9]: Makefile
Removed Files:
src/external/bsd/ntp/bin/ntp-keygen [netbsd-9]: ntp-keygen.8
src/external/bsd/ntp/bin/ntpd [netbsd-9]: ntp.conf.5 ntp.keys.5 ntpd.8
src/external/bsd/ntp/bin/ntpdc [netbsd-9]: ntpdc.8
src/external/bsd/ntp/bin/ntpq [netbsd-9]: ntpq.8
src/external/bsd/ntp/bin/sntp [netbsd-9]: sntp.1
Log Message:
Pull up following revision(s) (requested by kim in ticket #1109):
external/bsd/ntp/bin/ntpq/ntpq.8: file removal
external/bsd/ntp/bin/Makefile.inc: revision 1.4
external/bsd/ntp/bin/ntpd/ntpd.8: file removal
external/bsd/ntp/bin/ntpq/Makefile: revision 1.9 (patch)
external/bsd/ntp/bin/ntpd/Makefile: revision 1.28 (patch)
external/bsd/ntp/bin/sntp/sntp.1: file removal
external/bsd/ntp/bin/ntpd/ntp.keys.5: file removal
external/bsd/ntp/bin/ntpd/ntp.conf.5: file removal
external/bsd/ntp/Makefile.inc: revision 1.20
external/bsd/ntp/Makefile.inc: revision 1.21
external/bsd/ntp/bin/sntp/Makefile: revision 1.8
external/bsd/ntp/bin/ntp-keygen/Makefile: revision 1.7 (patch)
external/bsd/ntp/bin/sntp/Makefile: revision 1.9 (patch)
external/bsd/ntp/bin/ntp-keygen/ntp-keygen.8: file removal
external/bsd/ntp/bin/ntpdc/ntpdc.8: file removal
external/bsd/ntp/bin/ntpdc/Makefile: revision 1.7 (patch)
Fix build; clean manpages only if they are generated automatically.
include bsd.own.mk so that ../../Makefile.inc does not do it...
Add rules for manual pages builds, remove including Makefile.inc
Use .PARSEDIR
PR/55710: Kimmo Suominen: Delete manual pages so that they get copy from the
imported, already generated ones.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.2.1 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.3 -r1.3.56.1 src/external/bsd/ntp/bin/Makefile.inc
cvs rdiff -u -r1.5 -r1.5.34.1 src/external/bsd/ntp/bin/ntp-keygen/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntp-keygen/ntp-keygen.8
cvs rdiff -u -r1.22 -r1.22.6.1 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntpd/ntp.conf.5 \
src/external/bsd/ntp/bin/ntpd/ntpd.8
cvs rdiff -u -r1.2 -r0 src/external/bsd/ntp/bin/ntpd/ntp.keys.5
cvs rdiff -u -r1.6 -r1.6.34.1 src/external/bsd/ntp/bin/ntpdc/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntpdc/ntpdc.8
cvs rdiff -u -r1.7 -r1.7.34.1 src/external/bsd/ntp/bin/ntpq/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/ntpq/ntpq.8
cvs rdiff -u -r1.6 -r1.6.34.1 src/external/bsd/ntp/bin/sntp/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/ntp/bin/sntp/sntp.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.18 src/external/bsd/ntp/Makefile.inc:1.18.2.1
--- src/external/bsd/ntp/Makefile.inc:1.18 Mon Feb 4 04:05:16 2019
+++ src/external/bsd/ntp/Makefile.inc Mon Oct 12 10:17:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2019/02/04 04:05:16 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.18.2.1 2020/10/12 10:17:33 martin Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -12,9 +12,6 @@ CWARNFLAGS.clang+= -Wno-unneeded-interna
WARNS?= 4
-
-.include
-
IDIST= ${NETBSDSRCDIR}/external/bsd/ntp/dist
NTP_SRCDIR= ${NETBSDSRCDIR}/external/bsd/ntp
NTP_HTMLDIR= /usr/share/doc/reference/ref8
@@ -74,4 +71,24 @@ COPTS.ntp_loopfilter.c+= -Wno-error=impl
COPTS.refclock_ulink.c+= -Wno-error=implicit-fallthrough
.endif
+.SUFFIXES: .1 .5 .8 .1ntpdmdoc .5mdoc .1ntp-keygenmdoc .1ntpdcmdoc .1ntpqmdoc .1sntpmdoc
+
+.5mdoc.5:
+ ${TOOL_SED} -e 's/5mdoc/5/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntpdmdoc.8:
+ ${TOOL_SED} -e 's/1ntpdmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntp-keygenmdoc.8:
+ ${TOOL_SED} -e 's/1ntp-keygenmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntpdcmdoc.8:
+ ${TOOL_SED} -e 's/1ntpdcmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1ntpqmdoc.8:
+ ${TOOL_SED} -e 's/1ntpqmdoc/8/g' < ${.IMPSRC} > ${.TARGET}
+
+.1sntpmdoc.1:
+ ${TOOL_SED} -e 's/1sntpmdoc/1/g' < ${.IMPSRC} > ${.TARGET}
+
.endif
Index: src/external/bsd/ntp/bin/Makefile.inc
diff -u src/external/bsd/ntp/bin/Makefile.inc:1.3 src/external/bsd/ntp/bin/Makefile.inc:1.3.56.1
--- src/external/bsd/ntp/bin/Makefile.inc:1.3 Sat Dec 4 23:08:33 2010
+++ src/external/bsd/ntp/bin/Makefile.inc Mon Oct 12 10:17:33 2020
@@ -1,3 +1,3 @@
-#
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: hannken
Date: Mon Oct 12 08:21:21 UTC 2020
Modified Files:
src/external/cddl/osnet/sys/sys: cred.h
Log Message:
Stub groupmember() has to test both group list and current group id.
Fixes kern/55675: ZFS mounts do not work with setuid programs
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/cred.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/cred.h
diff -u src/external/cddl/osnet/sys/sys/cred.h:1.7 src/external/cddl/osnet/sys/sys/cred.h:1.8
--- src/external/cddl/osnet/sys/sys/cred.h:1.7 Wed Apr 29 05:54:37 2020
+++ src/external/cddl/osnet/sys/sys/cred.h Mon Oct 12 08:21:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cred.h,v 1.7 2020/04/29 05:54:37 riastradh Exp $ */
+/* $NetBSD: cred.h,v 1.8 2020/10/12 08:21:21 hannken Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -70,10 +70,12 @@ extern kauth_cred_t cred0;
static __inline int
groupmember(gid_t gid, cred_t *cr)
{
- int result;
+ int result, error;
- kauth_cred_ismember_gid(cr, gid, );
- return result;
+ error = kauth_cred_ismember_gid(cr, gid, );
+ if (error)
+ return 0;
+ return (kauth_cred_getegid(cr) == gid || result);
}
#endif /* _KERNEL */
