CVS commit: src/sys/dev/nvmm/x86
Module Name:src
Committed By: maxv
Date: Thu Jan 10 06:58:37 UTC 2019
Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_svmfunc.S
Log Message:
Optimize:
* Don't save/restore the host CR2, we don't care because we're not in a
#PF context (and preemption switches already handle CR2 safely).
* Don't save/restore the host FS and GS, just reset them to zero after
VMRUN. Note: DS and ES must be reset _before_ VMRUN, but that doesn't
apply to FS and GS.
* Handle FSBASE and KGSBASE outside of the VCPU loop, to avoid the cost
of saving/restoring them when there's no reason to leave the loop.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S
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/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.13 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.14
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.13 Tue Jan 8 14:43:18 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Thu Jan 10 06:58:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.13 2019/01/08 14:43:18 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.14 2019/01/10 06:58:36 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.13 2019/01/08 14:43:18 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.14 2019/01/10 06:58:36 maxv Exp $");
#include
#include
@@ -521,7 +521,8 @@ struct svm_cpudata {
uint64_t lstar;
uint64_t cstar;
uint64_t sfmask;
- uint64_t cr2;
+ uint64_t fsbase;
+ uint64_t kernelgsbase;
bool ts_set;
struct xsave_header hfpu __aligned(16);
@@ -1151,14 +1152,12 @@ svm_vcpu_guest_misc_enter(struct nvmm_cp
{
struct svm_cpudata *cpudata = vcpu->cpudata;
- /* Save the fixed Host MSRs. */
cpudata->star = rdmsr(MSR_STAR);
cpudata->lstar = rdmsr(MSR_LSTAR);
cpudata->cstar = rdmsr(MSR_CSTAR);
cpudata->sfmask = rdmsr(MSR_SFMASK);
-
- /* Save the Host CR2. */
- cpudata->cr2 = rcr2();
+ cpudata->fsbase = rdmsr(MSR_FSBASE);
+ cpudata->kernelgsbase = rdmsr(MSR_KERNELGSBASE);
}
static void
@@ -1166,14 +1165,12 @@ svm_vcpu_guest_misc_leave(struct nvmm_cp
{
struct svm_cpudata *cpudata = vcpu->cpudata;
- /* Restore the fixed Host MSRs. */
wrmsr(MSR_STAR, cpudata->star);
wrmsr(MSR_LSTAR, cpudata->lstar);
wrmsr(MSR_CSTAR, cpudata->cstar);
wrmsr(MSR_SFMASK, cpudata->sfmask);
-
- /* Restore the Host CR2. */
- lcr2(cpudata->cr2);
+ wrmsr(MSR_FSBASE, cpudata->fsbase);
+ wrmsr(MSR_KERNELGSBASE, cpudata->kernelgsbase);
}
static int
Index: src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S:1.1 src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S:1.2
--- src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S:1.1 Wed Nov 7 07:43:08 2018
+++ src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S Thu Jan 10 06:58:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svmfunc.S,v 1.1 2018/11/07 07:43:08 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svmfunc.S,v 1.2 2019/01/10 06:58:36 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -73,14 +73,6 @@
movq $msr,%rcx ;\
wrmsr
-#define HOST_SAVE_SEGREG(sreg) \
- movw sreg,%ax ;\
- pushw %ax
-
-#define HOST_RESTORE_SEGREG(sreg)\
- popw %ax ;\
- movw %ax,sreg
-
#define HOST_SAVE_TR \
strw %ax ;\
pushw %ax
@@ -150,22 +142,13 @@ ENTRY(svm_vmrun)
/* Save the Host TR. */
HOST_SAVE_TR
- /* Save the variable Host MSRs. */
- HOST_SAVE_MSR(MSR_KERNELGSBASE)
+ /* Save the Host GSBASE. */
HOST_SAVE_MSR(MSR_GSBASE)
- HOST_SAVE_MSR(MSR_FSBASE)
- /* Reset the Host Segregs. */
+ /* Reset DS and ES. */
movq $GSEL(GUDATA_SEL, SEL_UPL),%rax
movw %ax,%ds
movw %ax,%es
- xorq %rax,%rax
- movw %ax,%fs
- movw %ax,%gs
-
- /* Save some Host Segregs. */
- HOST_SAVE_SEGREG(%fs)
- HOST_SAVE_SEGREG(%gs)
/* Save the Host LDT. */
HOST_SAVE_LDT
@@ -195,14 +178,13 @@ ENTRY(svm_vmrun)
/* Restore the Host LDT. */
HOST_RESTORE_LDT
- /* Restore the Host Segregs. */
- HOST_RESTORE_SEGREG(%gs)
- HOST_RESTORE_SEGREG(%fs)
+ /* Reset FS and GS. */
+ xorq %rax,%rax
+ movw %ax,%fs
+ movw %ax,%gs
- /* Restore the variable Host MSRs. */
- HOST_RESTORE_MSR(MSR_FSBASE)
+ /* Restore the Host GSBASE. */
HOST_RESTORE_MSR(MSR_GSBASE)
- HOST_RESTORE_MSR(MSR_KERNELGSBASE)
/* Restore the Host TR. */
HOST_RESTORE_TR
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: martin
Date: Thu Jan 10 06:31:04 UTC 2019
Modified Files:
src/sys/ufs/lfs: lfs.h
Log Message:
Update comment (overlooked in r1.179).
>From Jos� Luis Rodr�guez Garc�a in PR kern/53849.
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/ufs/lfs/lfs.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/ufs/lfs/lfs.h
diff -u src/sys/ufs/lfs/lfs.h:1.203 src/sys/ufs/lfs/lfs.h:1.204
--- src/sys/ufs/lfs/lfs.h:1.203 Wed Jul 26 16:42:37 2017
+++ src/sys/ufs/lfs/lfs.h Thu Jan 10 06:31:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.203 2017/07/26 16:42:37 maya Exp $ */
+/* $NetBSD: lfs.h,v 1.204 2019/01/10 06:31:04 martin Exp $ */
/* from NetBSD: dinode.h,v 1.25 2016/01/22 23:06:10 dholland Exp */
/* from NetBSD: dir.h,v 1.25 2015/09/01 06:16:03 dholland Exp */
@@ -467,7 +467,7 @@ struct lfs64_dinode {
int64_t di_ib[ULFS_NIADDR]; /* 208: Indirect disk blocks. */
uint64_t di_modrev; /* 232: i_modrev for NFSv4 */
uint64_t di_inumber; /* 240: Inode number */
- uint64_t di_spare[1]; /* 244: Reserved; currently unused */
+ uint64_t di_spare[1]; /* 248: Reserved; currently unused */
};
union lfs_dinode {
CVS commit: src/sys/arch/mips/cavium/dev
Module Name:src
Committed By: msaitoh
Date: Thu Jan 10 05:41:10 UTC 2019
Modified Files:
src/sys/arch/mips/cavium/dev: octeon_smivar.h
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/cavium/dev/octeon_smivar.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/mips/cavium/dev/octeon_smivar.h
diff -u src/sys/arch/mips/cavium/dev/octeon_smivar.h:1.1 src/sys/arch/mips/cavium/dev/octeon_smivar.h:1.2
--- src/sys/arch/mips/cavium/dev/octeon_smivar.h:1.1 Wed Apr 29 08:32:01 2015
+++ src/sys/arch/mips/cavium/dev/octeon_smivar.h Thu Jan 10 05:41:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_smivar.h,v 1.1 2015/04/29 08:32:01 hikaru Exp $ */
+/* $NetBSD: octeon_smivar.h,v 1.2 2019/01/10 05:41:10 msaitoh Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -42,10 +42,10 @@ struct octeon_smi_attach_args {
bus_space_tag_t aa_regt;
};
-void octeon_smi_init(struct octeon_smi_attach_args *,
- struct octeon_smi_softc **);
-int octeon_smi_read(struct octeon_smi_softc *, int, int);
-void octeon_smi_write(struct octeon_smi_softc *, int, int, int);
-void octeon_smi_set_clock(struct octeon_smi_softc *, uint64_t);
+void octeon_smi_init(struct octeon_smi_attach_args *,
+struct octeon_smi_softc **);
+int octeon_smi_read(struct octeon_smi_softc *, int, int);
+void octeon_smi_write(struct octeon_smi_softc *, int, int, int);
+void octeon_smi_set_clock(struct octeon_smi_softc *, uint64_t);
#endif
CVS commit: [pgoyette-compat] src/sys/modules/compat_netbsd32
Module Name:src
Committed By: pgoyette
Date: Thu Jan 10 03:44:20 UTC 2019
Modified Files:
src/sys/modules/compat_netbsd32 [pgoyette-compat]: Makefile
Log Message:
Include newly-created files in compat_netbsd32 module build. Missed
this when resolving conflicts in most recent sync-with-HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.20.12.16 -r1.20.12.17 \
src/sys/modules/compat_netbsd32/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/modules/compat_netbsd32/Makefile
diff -u src/sys/modules/compat_netbsd32/Makefile:1.20.12.16 src/sys/modules/compat_netbsd32/Makefile:1.20.12.17
--- src/sys/modules/compat_netbsd32/Makefile:1.20.12.16 Mon Nov 26 12:25:19 2018
+++ src/sys/modules/compat_netbsd32/Makefile Thu Jan 10 03:44:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20.12.16 2018/11/26 12:25:19 pgoyette Exp $
+# $NetBSD: Makefile,v 1.20.12.17 2019/01/10 03:44:20 pgoyette Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -25,18 +25,19 @@ CPPFLAGS+= -DKTRACE -DMODULAR
CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
.PATH: ${S}/compat/netbsd32
-SRCS+= netbsd32_core.c netbsd32_event.c
-SRCS+= netbsd32_exec_elf32.c
-SRCS+= netbsd32_execve.c netbsd32_fs.c
-SRCS+= netbsd32_ioctl.c
-SRCS+= netbsd32_kern_proc.c
-SRCS+= netbsd32_lwp.c netbsd32_netbsd.c
-SRCS+= netbsd32_select.c
-SRCS+= netbsd32_sem.c netbsd32_signal.c
-SRCS+= netbsd32_socket.c netbsd32_syscalls.c
-SRCS+= netbsd32_sysctl.c netbsd32_sysent.c
-SRCS+= netbsd32_time.c netbsd32_wait.c
-SRCS+= netbsd32_mod.c netbsd32_module.c
+SRCS+= netbsd32_core.c netbsd32_event.c
+SRCS+= netbsd32_exec_elf32.c netbsd32_execve.c
+SRCS+= netbsd32_fd.c netbsd32_fs.c
+SRCS+= netbsd32_ioctl.c netbsd32_kern_proc.c
+SRCS+= netbsd32_lwp.c netbsd32_mod.c
+SRCS+= netbsd32_netbsd.c netbsd32_quota.c
+SRCS+= netbsd32_rlimit.c netbsd32_select.c
+SRCS+= netbsd32_sem.c netbsd32_signal.c
+SRCS+= netbsd32_socket.c netbsd32_syscalls.c
+SRCS+= netbsd32_sysctl.c netbsd32_sysent.c
+SRCS+= netbsd32_time.c netbsd32_wait.c
+SRCS+= netbsd32_vm.c
+SRCS+= netbsd32_module.c
.if ${MACHINE_CPU} != "mips" && ${MACHINE_CPU} != "powerpc"
CPPFLAGS+= -DEXEC_AOUT -DCOMPAT_NOMID
CVS commit: src/tests/net/if_ipsec
Module Name:src Committed By: knakahara Date: Thu Jan 10 00:45:08 UTC 2019 Modified Files: src/tests/net/if_ipsec: t_ipsec.sh Log Message: tests/net/if_ipsec/t_ipsec disable dad. This may fix PR kern/53848 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/net/if_ipsec/t_ipsec.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/net/if_ipsec/t_ipsec.sh diff -u src/tests/net/if_ipsec/t_ipsec.sh:1.5 src/tests/net/if_ipsec/t_ipsec.sh:1.6 --- src/tests/net/if_ipsec/t_ipsec.sh:1.5 Tue Dec 25 03:28:29 2018 +++ src/tests/net/if_ipsec/t_ipsec.sh Thu Jan 10 00:45:08 2019 @@ -1,4 +1,4 @@ -# $NetBSD: t_ipsec.sh,v 1.5 2018/12/25 03:28:29 knakahara Exp $ +# $NetBSD: t_ipsec.sh,v 1.6 2019/01/10 00:45:08 knakahara Exp $ # # Copyright (c) 2017 Internet Initiative Japan Inc. # All rights reserved. @@ -114,6 +114,9 @@ setup_router() fi atf_check -s exit:0 rump.ifconfig shmif1 up $DEBUG && rump.ifconfig shmif1 + + atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0 + atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0 unset RUMP_SERVER }
CVS commit: xsrc/external/mit/xf86-video-vboxvideo/include
Module Name:xsrc Committed By: mrg Date: Thu Jan 10 00:06:27 UTC 2019 Added Files: xsrc/external/mit/xf86-video-vboxvideo/include: config.h Log Message: config.h for vboxvideo driver. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ xsrc/external/mit/xf86-video-vboxvideo/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/xf86-video-vboxvideo/include/config.h diff -u /dev/null xsrc/external/mit/xf86-video-vboxvideo/include/config.h:1.1 --- /dev/null Thu Jan 10 00:06:27 2019 +++ xsrc/external/mit/xf86-video-vboxvideo/include/config.h Thu Jan 10 00:06:27 2019 @@ -0,0 +1,79 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +#include "xorg-server.h" + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Have ISA support */ +/* #undef HAVE_ISA */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* xextproto 7.1 available */ +#define HAVE_XEXTPROTO_71 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "xf86-video-vboxvideo" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg; + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "xf86-video-vboxvideo" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "xf86-video-vboxvideo 1.0.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "xf86-video-vboxvideo" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.0.0" + +/* Major version of this package */ +#define PACKAGE_VERSION_MAJOR 1 + +/* Minor version of this package */ +#define PACKAGE_VERSION_MINOR 0 + +/* Patch version of this package */ +#define PACKAGE_VERSION_PATCHLEVEL 0 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "1.0.0"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-vboxvideo
Module Name:src
Committed By: mrg
Date: Thu Jan 10 00:05:57 UTC 2019
Added Files:
src/external/mit/xorg/server/drivers/xf86-video-vboxvideo: Makefile
Log Message:
build infrastructure for vboxvideo driver.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile:1.1
--- /dev/null Thu Jan 10 00:05:57 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile Thu Jan 10 00:05:57 2019
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2019/01/10 00:05:57 mrg Exp $
+
+DRIVER= xf86-video-vboxvideo
+DRIVER_NAME= vboxvideo_drv
+
+SRCS= \
+ HGSMIBase.c \
+ HGSMIBuffers.c \
+ HGSMICommon.c \
+ Modesetting.c \
+ VBVABase.c \
+ edid.c \
+ getmode.c \
+ helpers.c \
+ hgsmimemalloc.c \
+ pointer.c \
+ setmode.c \
+ vboxvideo.c \
+ vbva.c
+
+CPPFLAGS+= \
+ -I${X11SRCDIR.${DRIVER}}/src \
+ -DXORG_7X \
+ -DIN_RING3 \
+ -DPCIACCESS \
+ -DVBOXVIDEO_13 \
+ -include ${DESTDIR}/usr/X11R7/include/xorg/xorg-server.h
+
+MAN= vboxvideo.4
+
+.include "../Makefile.xf86-driver"
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Wed Jan 9 23:52:29 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
add vboxvideo.
To generate a diff of this commit:
cvs rdiff -u -r1.1093 -r1.1094 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.1093 src/share/mk/bsd.own.mk:1.1094
--- src/share/mk/bsd.own.mk:1.1093 Thu Jan 3 17:41:26 2019
+++ src/share/mk/bsd.own.mk Wed Jan 9 23:52:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1093 2019/01/03 17:41:26 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1094 2019/01/09 23:52:29 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1514,7 +1514,7 @@ EXTRA_DRIVERS= modesetting
r128 rendition \
s3 s3virge savage siliconmotion sis suncg14 \
suncg6 sunffb sunleo suntcx \
- tdfx tga trident tseng vesa vga vmware wsfb xgi
+ tdfx tga trident tseng vboxvideo vesa vga vmware wsfb xgi
X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist
.endfor
CVS import: xsrc/external/mit/xf86-video-vboxvideo/dist
Module Name:xsrc Committed By: mrg Date: Wed Jan 9 23:50:31 UTC 2019 Update of /cvsroot/xsrc/external/mit/xf86-video-vboxvideo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13847 Log Message: initial import of xf86-video-vboxvideo-1.0.0 Status: Vendor Tag: xorg Release Tags: xf86-video-vboxvideo-1-0-0 N xsrc/external/mit/xf86-video-vboxvideo/dist/aclocal.m4 N xsrc/external/mit/xf86-video-vboxvideo/dist/compile N xsrc/external/mit/xf86-video-vboxvideo/dist/configure N xsrc/external/mit/xf86-video-vboxvideo/dist/Makefile.am N xsrc/external/mit/xf86-video-vboxvideo/dist/configure.ac N xsrc/external/mit/xf86-video-vboxvideo/dist/ChangeLog N xsrc/external/mit/xf86-video-vboxvideo/dist/config.guess N xsrc/external/mit/xf86-video-vboxvideo/dist/install-sh N xsrc/external/mit/xf86-video-vboxvideo/dist/missing N xsrc/external/mit/xf86-video-vboxvideo/dist/README N xsrc/external/mit/xf86-video-vboxvideo/dist/config.sub N xsrc/external/mit/xf86-video-vboxvideo/dist/ltmain.sh N xsrc/external/mit/xf86-video-vboxvideo/dist/depcomp N xsrc/external/mit/xf86-video-vboxvideo/dist/COPYING N xsrc/external/mit/xf86-video-vboxvideo/dist/INSTALL N xsrc/external/mit/xf86-video-vboxvideo/dist/config.h.in N xsrc/external/mit/xf86-video-vboxvideo/dist/Makefile.in N xsrc/external/mit/xf86-video-vboxvideo/dist/man/Makefile.am N xsrc/external/mit/xf86-video-vboxvideo/dist/man/Makefile.in N xsrc/external/mit/xf86-video-vboxvideo/dist/man/vboxvideo.man N xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoIPRT.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/Modesetting.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBVABase.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/HGSMIBuffers.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/HGSMIBase.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/helpers.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoVBE.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideo.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoGuest.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am N xsrc/external/mit/xf86-video-vboxvideo/dist/src/pointer.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/HGSMIMemAlloc.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/version-generated.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/vbva.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/HGSMIContext.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/hgsmimemalloc.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoErr.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/setmode.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/HGSMIChSetup.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/vboxvideo.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/HGSMICommon.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/getmode.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/HGSMI.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/HGSMIChannels.h N xsrc/external/mit/xf86-video-vboxvideo/dist/src/HGSMIBase.c N xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in N xsrc/external/mit/xf86-video-vboxvideo/dist/src/HGSMIDefs.h No conflicts created by this import
CVS commit: src/share/man/man4
Module Name:src Committed By: gutteridge Date: Wed Jan 9 23:43:13 UTC 2019 Modified Files: src/share/man/man4: wd.4 Log Message: wd(4): police my grammar police To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/wd.4 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/wd.4 diff -u src/share/man/man4/wd.4:1.19 src/share/man/man4/wd.4:1.20 --- src/share/man/man4/wd.4:1.19 Wed Jan 9 23:23:41 2019 +++ src/share/man/man4/wd.4 Wed Jan 9 23:43:13 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: wd.4,v 1.19 2019/01/09 23:23:41 gutteridge Exp $ +.\" $NetBSD: wd.4,v 1.20 2019/01/09 23:43:13 gutteridge Exp $ .\" .\" .\" Copyright (c) 1994 James A. Jegers @@ -61,8 +61,8 @@ A user interface is provided by Unlike the (historical) mechanisms provided by .Xr bad144 8 and -.Xr badsect 8 -the software list neither supports sector replacement nor is saved +.Xr badsect 8 , +the software list supports neither sector replacement nor retention across reboots. .Sh NOTES Certain
CVS commit: src/share/man/man4
Module Name:src Committed By: gutteridge Date: Wed Jan 9 23:23:41 UTC 2019 Modified Files: src/share/man/man4: wd.4 Log Message: wd(4): minor grammatical improvement To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/wd.4 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/wd.4 diff -u src/share/man/man4/wd.4:1.18 src/share/man/man4/wd.4:1.19 --- src/share/man/man4/wd.4:1.18 Mon Apr 24 10:04:38 2017 +++ src/share/man/man4/wd.4 Wed Jan 9 23:23:41 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: wd.4,v 1.18 2017/04/24 10:04:38 wiz Exp $ +.\" $NetBSD: wd.4,v 1.19 2019/01/09 23:23:41 gutteridge Exp $ .\" .\" .\" Copyright (c) 1994 James A. Jegers @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 24, 2017 +.Dd January 9, 2019 .Dt WD 4 .Os .Sh NAME @@ -62,7 +62,7 @@ Unlike the (historical) mechanisms provi .Xr bad144 8 and .Xr badsect 8 -the software list does neither support sector replacement nor is it saved +the software list neither supports sector replacement nor is saved across reboots. .Sh NOTES Certain
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Jan 9 22:51:53 UTC 2019 Modified Files: src/doc: 3RDPARTY Log Message: - delete trailing whitespace - remove non-functioning urls - update new software - add new field to indicate last update date. To generate a diff of this commit: cvs rdiff -u -r1.1592 -r1.1593 src/doc/3RDPARTY 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.1592 src/doc/3RDPARTY:1.1593 --- src/doc/3RDPARTY:1.1592 Wed Jan 9 12:01:03 2019 +++ src/doc/3RDPARTY Wed Jan 9 17:51:53 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1592 2019/01/09 17:01:03 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1593 2019/01/09 22:51:53 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -30,6 +30,7 @@ # Maintainer: name and/or email address of upstream maintainer (required) # Archive Site: URL to archive of upstream releases # Home Page: URL to web page for upstream project +# Date: Date last checked # Mailing List: email address or URL related to upstream mailing list # License: description of license # Responsible: comma-separated list of NetBSD developers @@ -41,10 +42,11 @@ Package: acpica Version: 20181213 -Current Vers: 20181213 +Current Vers: 20190108 Maintainer: Intel Archive Site: http://www.acpica.org/downloads/ Home Page: http://www.acpica.org/ +Date: 2019-01-09 Mailing List: de...@acpica.org License: BSD-like Responsible: jruoho @@ -59,6 +61,7 @@ Current Vers: 6.2 Maintainer: Erez Zadok Archive Site: ftp://ftp.am-utils.org/pub/am-utils/ Home Page: http://www.am-utils.org/ +Date: 2019-01-09 Mailing List: am-utils Responsible: christos License: BSD (4-clause) @@ -75,6 +78,7 @@ Current Vers: 0.21 Maintainer: Julio Merino Archive site: https://github.com/jmmv/atf/releases Home page: https://github.com/jmmv/atf +Date: 2019-01-09 Mailing List: atf-de...@netbsd.org Responsible: jmmv License: The NetBSD Foundation's license (BSD 2-clause) @@ -94,6 +98,7 @@ Current Vers: FreeBSD SVN revision numbe Maintainer: Sam Leffler Archive Site: none Home Page: https://svnweb.freebsd.org/base/head/sys/dev/ath/ath_hal/ +Date: 2019-01-09 Mailing List: none Responsible: sam, alc License: BSD-like (2-clause), ISC @@ -102,10 +107,11 @@ Notes: Package: bc Version: 1.06 -Current Vers: 1.07 +Current Vers: 1.07.1 Maintainer: Phil Nelson Archive Site: ftp://ftp.gnu.org/gnu/bc/ Home Page: http://www.gnu.org/software/bc/ +Date: 2019-01-09 Mailing List: bug...@gnu.org Responsible: phil, simonb License: GPLv2, LGPGv2.1 @@ -119,6 +125,7 @@ Current Vers: 9.13.5-W1/MPL Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ +Date: 2019-01-09 Mailing List: https://lists.isc.org/mailman/listinfo/bind-announce Mailing List: https://lists.isc.org/mailman/listinfo/bind-users Responsible: christos @@ -131,12 +138,13 @@ Build bind to generate the include files Then binclude4netbsd script to import into src/external/bsd/bind/include. The libc and include parts of the resolver are now part of libbind. -Package: unbound +Package: unbound Version: 1.7.3 -Current Vers: 1.7.3 +Current Vers: 1.8.3 Maintainer: Christos Zoulas Archive Site: https://www.unbound.net/downloads/unbound-latest.tar.gz Home Page: https://www.unbound.net/ +Date: 2019-01-09 Mailing List: https://unbound.nlnetlabs.nl/mailman/listinfo/unbound-users Responsible: christos License: BSD-like @@ -145,13 +153,14 @@ Notes: Use cleantags to import run configure and update config files in include -Package: nsd +Package: nsd Version: 4.1.24 -Current Vers: 4.1.24 +Current Vers: 4.1.26 Maintainer: Christos Zoulas Archive Site: https://www.nlnetlabs.nl/svn/nsd/ Home Page: https://www.nlnetlabs.nl/projects/nsd/ -Mailing List: https://open.nlnetlabs.nl/mailman/listinfo/nsd-users/ +Date: 2019-01-09 +Mailing List: https://open.nlnetlabs.nl/mailman/listinfo/nsd-users/ Responsible: christos License: BSD-like Location: external/bsd/nsd/dist @@ -165,6 +174,7 @@ Current Vers: libbind-6.0 Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/libbind/ Home Page: http://www.isc.org/software/libbind/ +Date: 2019-01-09 Mailing List: https://lists.isc.org/mailman/listinfo/bind-workers Responsible: christos License: BSD-like (2-clause) @@ -190,6 +200,7 @@ Current Vers: 20170201 Maintainer: m...@eterna.com.au Archive Site: ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ Home Page: http://eterna.com.au/bozohttpd/ +Date: 2019-01-09 Mailing List: Responsible: mrg License: BSD @@ -199,10 +210,11 @@ Delete "queue.h" from the distribution. Package: bsd-family-tree Version: 336757 -Current Vers: 336757 +Current Vers: 342397 Maintainer: The FreeBSD Project Archive Site:
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Wed Jan 9 20:39:28 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc: stats.c
Log Message:
use 32 bit counters on 32 bit platforms because we don't yet have 64 bit
atomics for them.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/stats.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/mpl/bind/dist/lib/isc/stats.c
diff -u src/external/mpl/bind/dist/lib/isc/stats.c:1.3 src/external/mpl/bind/dist/lib/isc/stats.c:1.4
--- src/external/mpl/bind/dist/lib/isc/stats.c:1.3 Wed Jan 9 11:55:14 2019
+++ src/external/mpl/bind/dist/lib/isc/stats.c Wed Jan 9 15:39:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: stats.c,v 1.3 2019/01/09 16:55:14 christos Exp $ */
+/* $NetBSD: stats.c,v 1.4 2019/01/09 20:39:28 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -32,7 +32,11 @@
#define ISC_STATS_MAGIC ISC_MAGIC('S', 't', 'a', 't')
#define ISC_STATS_VALID(x) ISC_MAGIC_VALID(x, ISC_STATS_MAGIC)
+#ifndef _LP64
+typedef atomic_int_fast32_t isc_stat_t;
+#else
typedef atomic_int_fast64_t isc_stat_t;
+#endif
struct isc_stats {
/*% Unlocked */
CVS commit: src/usr.bin/menuc
Module Name:src
Committed By: martin
Date: Wed Jan 9 19:43:37 UTC 2019
Modified Files:
src/usr.bin/menuc: mdb.c menu_sys.def
Log Message:
Allow argument expansion in menu titles as well.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/menuc/mdb.c
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/menuc/menu_sys.def
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/menuc/mdb.c
diff -u src/usr.bin/menuc/mdb.c:1.48 src/usr.bin/menuc/mdb.c:1.49
--- src/usr.bin/menuc/mdb.c:1.48 Fri Jan 4 15:27:19 2019
+++ src/usr.bin/menuc/mdb.c Wed Jan 9 19:43:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mdb.c,v 1.48 2019/01/04 15:27:19 martin Exp $ */
+/* $NetBSD: mdb.c,v 1.49 2019/01/09 19:43:37 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mdb.c,v 1.48 2019/01/04 15:27:19 martin Exp $");
+__RCSID("$NetBSD: mdb.c,v 1.49 2019/01/09 19:43:37 martin Exp $");
#endif
@@ -172,10 +172,11 @@ write_menu_file(char *initcode)
"typedef struct menudesc menudesc;\n"
"typedef struct menu_ent menu_ent;\n"
"struct menu_ent {\n"
- " const char *opt_name;\n"
- "#ifdef MENU_EXPANDS\n"
- " const char *opt_exp_name;\n"
- "#endif\n"
+ " const char *opt_name;\n");
+ if (do_expands)
+ (void)fprintf(out_file,
+ " const char *opt_exp_name;\n");
+ (void)fprintf(out_file,
" int opt_menu;\n"
" int opt_flags;\n"
" int (*opt_action)(menudesc *, void *);\n"
@@ -187,7 +188,11 @@ write_menu_file(char *initcode)
"#define OPT_NOSHORT 16\n"
"#define OPT_NOMENU -1\n\n"
"struct menudesc {\n"
- " const char *title;\n"
+ " const char *title;\n");
+ if (do_expands)
+ (void)fprintf(out_file,
+ " const char *exp_title;\n");
+ (void)fprintf(out_file,
" int y, x;\n"
" int h, w;\n"
" int mopt;\n"
@@ -367,8 +372,13 @@ write_menu_file(char *initcode)
(void)fprintf(out_file, "static struct menudesc menu_def[] = {\n");
for (i = 0; i < menu_no; i++) {
(void)fprintf(out_file,
- "\t{%s,%d,%d,%d,%d,%d,%d,0,0,optent%d,NULL,NULL,",
- menus[i]->info->title, menus[i]->info->y,
+ "\t{%s,", menus[i]->info->title);
+ if (do_expands)
+ (void)fprintf(out_file,
+"NULL,");
+ (void)fprintf(out_file,
+ "%d,%d,%d,%d,%d,%d,0,0,optent%d,NULL,NULL,",
+ menus[i]->info->y,
menus[i]->info->x, menus[i]->info->h,
menus[i]->info->w, menus[i]->info->mopt,
menus[i]->info->numopt, i);
@@ -422,7 +432,10 @@ write_menu_file(char *initcode)
(void)fprintf(out_file, "},\n");
}
- (void)fprintf(out_file, "{NULL, 0, 0, 0, 0, 0, 0, 0, 0, "
+ (void)fprintf(out_file, "{NULL");
+ if (do_expands)
+ (void)fprintf(out_file, ", NULL");
+ (void)fprintf(out_file, ", 0, 0, 0, 0, 0, 0, 0, 0, "
"NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL");
if (do_expands)
(void)fprintf(out_file, ", NULL");
Index: src/usr.bin/menuc/menu_sys.def
diff -u src/usr.bin/menuc/menu_sys.def:1.63 src/usr.bin/menuc/menu_sys.def:1.64
--- src/usr.bin/menuc/menu_sys.def:1.63 Sun Jan 6 11:08:34 2019
+++ src/usr.bin/menuc/menu_sys.def Wed Jan 9 19:43:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: menu_sys.def,v 1.63 2019/01/06 11:08:34 martin Exp $ */
+/* $NetBSD: menu_sys.def,v 1.64 2019/01/09 19:43:37 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -146,7 +146,14 @@ init_menu(menudesc *m)
if (!(m->mopt & MC_NOSHORTCUT))
wadd += 3;
- if (m->title && *(title = MSG_XLAT(m->title)) != 0) {
+ title = m->title;
+#ifdef MENU_EXPANDS
+ if (m->exp_title)
+ title = m->exp_title;
+#endif
+ if (title)
+ title = MSG_XLAT(title);
+ if (title && title[0] != 0) {
/* Allow multiple line titles */
for (tp = title; (ep = strchr(tp, '\n')); tp = ep + 1) {
i = ep - tp;
@@ -330,6 +337,7 @@ draw_menu(menudesc *m, void *arg)
int tadd;
int hasexit = (m->mopt & MC_NOEXITOPT ? 0 : 1);
const char *tp, *ep;
+ const char *title;
hasbox = (m->mopt & MC_NOBOX ? 0 : 1);
@@ -337,8 +345,13 @@ draw_menu(menudesc *m, void *arg)
wclear(m->mw);
tadd = hasbox;
- if (m->title) {
- for (tp = MSG_XLAT(m->title); ; tp = ep + 1) {
+ title = m->title;
+#ifdef MENU_EXPANDS
+ if (m->exp_title)
+ title = m->exp_title;
+#endif
+ if (title) {
+ for (tp = MSG_XLAT(title); ; tp = ep + 1) {
ep = strchr(tp , '\n');
mvwaddnstr(m->mw, tadd++, hasbox + 1, tp,
ep ? ep - tp : -1);
@@ -505,6 +518,10 @@ free_exp_menu_items(menudesc *m)
{
int i;
+ if (m->exp_title != NULL) {
+ free(__UNCONST(m->exp_title));
+ m->exp_title = NULL;
+ }
for (i = 0; i < m->numopts; i++) {
if (m->opts[i].opt_exp_name != NULL) {
free(__UNCONST(m->opts[i].opt_exp_name));
@@ -841,6 +858,9 @@ new_menu(const char *title, menu_ent *op
/* Set Entries */
m->title = title;
+#ifdef MENU_EXPANDS
+ m->exp_title = NULL;
+#endif
m->opts = opts;
m->numopts = numopts;
m->x = x;
CVS commit: src/share/man/man4
Module Name:src Committed By: dholland Date: Wed Jan 9 19:01:24 UTC 2019 Modified Files: src/share/man/man4: sk.4 Log Message: A driver that's been in GENERIC since 2011 cannot reasonably be called "experimental". Bump date. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/sk.4 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/sk.4 diff -u src/share/man/man4/sk.4:1.19 src/share/man/man4/sk.4:1.20 --- src/share/man/man4/sk.4:1.19 Wed May 9 08:04:06 2018 +++ src/share/man/man4/sk.4 Wed Jan 9 19:01:24 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: sk.4,v 1.19 2018/05/09 08:04:06 wiz Exp $ +.\" $NetBSD: sk.4,v 1.20 2019/01/09 19:01:24 dholland Exp $ .\" .\" Copyright (c) 2003, The NetBSD Foundation, Inc. .\" All rights reserved. @@ -58,7 +58,7 @@ .\" .\" $FreeBSD: src/share/man/man4/man4.i386/sk.4,v 1.3 1999/08/28 00:20:29 peter Exp $ .\" -.Dd October 12, 2012 +.Dd January 9, 2018 .Dt SK 4 .Os .Sh NAME @@ -283,9 +283,6 @@ driver was written by Support for the Marvell Yukon-2 was added by .An Mark Kettenis Aq Mt kette...@openbsd.org . .Sh BUGS -This driver is -.Em experimental . -.Pp Support for checksum offload is unimplemented. .Pp Performance with at least some Marvell-based adapters is poor,
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Wed Jan 9 18:03:34 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: syscall_stubs.S Log Message: whitespace cleanup To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/ia64/syscall_stubs.S 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/ia64/ia64/syscall_stubs.S diff -u src/sys/arch/ia64/ia64/syscall_stubs.S:1.4 src/sys/arch/ia64/ia64/syscall_stubs.S:1.5 --- src/sys/arch/ia64/ia64/syscall_stubs.S:1.4 Sat Apr 8 17:46:30 2017 +++ src/sys/arch/ia64/ia64/syscall_stubs.S Wed Jan 9 18:03:34 2019 @@ -1,6 +1,6 @@ -/* $NetBSD: syscall_stubs.S,v 1.4 2017/04/08 17:46:30 scole Exp $ */ +/* $NetBSD: syscall_stubs.S,v 1.5 2019/01/09 18:03:34 scole Exp $ */ - /*- +/*- * Copyright (c) 2002, 2003 Marcel Moolenaar * All rights reserved. *
CVS commit: src/libexec/tftpd
Module Name:src Committed By: uwe Date: Wed Jan 9 17:19:08 UTC 2019 Modified Files: src/libexec/tftpd: tftpd.8 Log Message: Spell "occurrence" correctly. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/libexec/tftpd/tftpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/tftpd/tftpd.8 diff -u src/libexec/tftpd/tftpd.8:1.30 src/libexec/tftpd/tftpd.8:1.31 --- src/libexec/tftpd/tftpd.8:1.30 Tue May 5 08:08:33 2015 +++ src/libexec/tftpd/tftpd.8 Wed Jan 9 17:19:08 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: tftpd.8,v 1.30 2015/05/05 08:08:33 wiz Exp $ +.\" $NetBSD: tftpd.8,v 1.31 2019/01/09 17:19:08 uwe Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -122,7 +122,7 @@ Logs all requests using Suppresses negative acknowledgement of requests for nonexistent relative filenames. .It Fl p Ar pathsep -All occurances of the single character +All occurrences of the single character .Ar pathsep (path separator) in the requested filename are replaced with .Sq / .
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Jan 9 17:01:03 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind To generate a diff of this commit: cvs rdiff -u -r1.1591 -r1.1592 src/doc/3RDPARTY cvs rdiff -u -r1.2488 -r1.2489 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.1591 src/doc/3RDPARTY:1.1592 --- src/doc/3RDPARTY:1.1591 Tue Jan 8 14:17:10 2019 +++ src/doc/3RDPARTY Wed Jan 9 12:01:03 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1591 2019/01/08 19:17:10 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1592 2019/01/09 17:01:03 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -114,8 +114,8 @@ Notes: bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.10.7/BSD 9.12.2-P1/MPL -Current Vers: 9.12.2-P1/MPL +Version: 9.10.7/BSD 9.13.5-W1/MPL +Current Vers: 9.13.5-W1/MPL Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2488 src/doc/CHANGES:1.2489 --- src/doc/CHANGES:1.2488 Tue Jan 8 01:34:23 2019 +++ src/doc/CHANGES Wed Jan 9 12:01:03 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2488 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2489 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -293,3 +293,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: TrouSerS: Import trousers-0.3.14 [christos 20190107] tpm-tools: Import tpm-tools-1.3.9.1 [christos 20190107] compiler-rt: Import compiler-rt r350590 LLVM sanitizers [kamil 20190108] + bind: Import version 9.13.2-P1. [christos 20190109]
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Jan 9 16:59:34 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump bind libraries. To generate a diff of this commit: cvs rdiff -u -r1.852 -r1.853 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.212 -r1.213 src/distrib/sets/lists/debug/shl.mi 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/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.852 src/distrib/sets/lists/base/shl.mi:1.853 --- src/distrib/sets/lists/base/shl.mi:1.852 Sun Dec 23 14:14:12 2018 +++ src/distrib/sets/lists/base/shl.mi Wed Jan 9 11:59:34 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.852 2018/12/23 19:14:12 christos Exp $ +# $NetBSD: shl.mi,v 1.853 2019/01/09 16:59:34 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -202,8 +202,8 @@ ./usr/lib/libbfd.so.16base-sys-shlib compatfile,binutils=231 ./usr/lib/libbfd.so.16.0 base-sys-shlib compatfile,binutils=231 ./usr/lib/libbind9.sobase-bind-shlib compatfile -./usr/lib/libbind9.so.9base-bind-shlib compatfile -./usr/lib/libbind9.so.9.0 base-bind-shlib compatfile +./usr/lib/libbind9.so.10base-bind-shlib compatfile +./usr/lib/libbind9.so.10.0 base-bind-shlib compatfile ./usr/lib/libblacklist.so base-sys-shlib compatfile ./usr/lib/libblacklist.so.0 base-sys-shlib compatfile ./usr/lib/libblacklist.so.0.0 base-sys-shlib compatfile @@ -259,8 +259,8 @@ ./usr/lib/libdm.so.0base-sys-shlib compatfile ./usr/lib/libdm.so.0.0base-sys-shlib compatfile ./usr/lib/libdns.sobase-bind-shlib compatfile -./usr/lib/libdns.so.9base-bind-shlib compatfile -./usr/lib/libdns.so.9.0base-bind-shlib compatfile +./usr/lib/libdns.so.10base-bind-shlib compatfile +./usr/lib/libdns.so.10.0 base-bind-shlib compatfile ./usr/lib/libdns_sd.sobase-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0 base-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0.0 base-mdns-shlib compatfile,mdns @@ -333,17 +333,17 @@ ./usr/lib/libipsec.so.3base-net-shlib compatfile ./usr/lib/libipsec.so.3.0 base-net-shlib compatfile ./usr/lib/libirs.sobase-bind-shlib compatfile -./usr/lib/libirs.so.9base-bind-shlib compatfile -./usr/lib/libirs.so.9.0base-bind-shlib compatfile +./usr/lib/libirs.so.10base-bind-shlib compatfile +./usr/lib/libirs.so.10.0 base-bind-shlib compatfile ./usr/lib/libisc.sobase-bind-shlib compatfile -./usr/lib/libisc.so.9base-bind-shlib compatfile -./usr/lib/libisc.so.9.0base-bind-shlib compatfile +./usr/lib/libisc.so.10base-bind-shlib compatfile +./usr/lib/libisc.so.10.0 base-bind-shlib compatfile ./usr/lib/libisccc.sobase-bind-shlib compatfile -./usr/lib/libisccc.so.9base-bind-shlib compatfile -./usr/lib/libisccc.so.9.0 base-bind-shlib compatfile +./usr/lib/libisccc.so.10 base-bind-shlib compatfile +./usr/lib/libisccc.so.10.0 base-bind-shlib compatfile ./usr/lib/libisccfg.sobase-bind-shlib compatfile -./usr/lib/libisccfg.so.9 base-bind-shlib compatfile -./usr/lib/libisccfg.so.9.0 base-bind-shlib compatfile +./usr/lib/libisccfg.so.10 base-bind-shlib compatfile +./usr/lib/libisccfg.so.10.0 base-bind-shlib compatfile ./usr/lib/libiscsi.sobase-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2base-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2.0 base-iscsi-shlib iscsi,compatfile @@ -423,8 +423,8 @@ ./usr/lib/libnpf.so.0base-npf-shlib npf,compatfile ./usr/lib/libnpf.so.0.1base-npf-shlib npf,compatfile ./usr/lib/libns.sobase-bind-shlib compatfile -./usr/lib/libns.so.9base-bind-shlib compatfile -./usr/lib/libns.so.9.0base-bind-shlib compatfile +./usr/lib/libns.so.10base-bind-shlib compatfile +./usr/lib/libns.so.10.0base-bind-shlib compatfile ./usr/lib/libnvpair.sobase-zfs-shlib compatfile,zfs ./usr/lib/libnvpair.so.0 base-zfs-shlib compatfile,zfs ./usr/lib/libnvpair.so.0.0 base-zfs-shlib compatfile,zfs Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.212 src/distrib/sets/lists/debug/shl.mi:1.213 --- src/distrib/sets/lists/debug/shl.mi:1.212 Sun Dec 23 14:16:43 2018 +++ src/distrib/sets/lists/debug/shl.mi Wed Jan 9 11:59:34 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.212 2018/12/23 19:16:43 christos Exp $ +# $NetBSD: shl.mi,v 1.213 2019/01/09 16:59:34 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot @@ -65,7 +65,7 @@ ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Wed Jan 9 16:55:23 UTC 2019 Modified Files: src/external/mpl/bind: Makefile.inc bind2netbsd src/external/mpl/bind/dist: Makefile.in bind.keys.h config.h.in configure src/external/mpl/bind/dist/bin/check: check-tool.c check-tool.h named-checkconf.8 named-checkconf.c named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.8 ddns-confgen.c keygen.c keygen.h rndc-confgen.8 rndc-confgen.c util.c src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dig.1 dig.c dighost.c host.1 host.c nslookup.1 nslookup.c src/external/mpl/bind/dist/bin/dig/include/dig: dig.h src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.8 dnssec-cds.c dnssec-dsfromkey.8 dnssec-dsfromkey.c dnssec-importkey.c dnssec-keyfromlabel.8 dnssec-keyfromlabel.c dnssec-keygen.8 dnssec-keygen.c dnssec-revoke.c dnssec-settime.c dnssec-signzone.8 dnssec-signzone.c dnssec-verify.c dnssectool.c dnssectool.h src/external/mpl/bind/dist/bin/named: bind9.xsl.h config.c control.c controlconf.c fuzz.c log.c logconf.c main.c named.conf.5 server.c statschannel.c tkeyconf.c tsigconf.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/named: config.h control.h globals.h log.h server.h tkeyconf.h zoneconf.h src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c os.c src/external/mpl/bind/dist/bin/named/unix/include/named: os.h src/external/mpl/bind/dist/bin/named/win32: dlz_dlopen_driver.c ntservice.c os.c src/external/mpl/bind/dist/bin/named/win32/include/named: os.h src/external/mpl/bind/dist/bin/nsupdate: nsupdate.1 nsupdate.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-destroy.c pkcs11-keygen.c pkcs11-list.c pkcs11-tokens.c src/external/mpl/bind/dist/bin/plugins: filter-.8 filter-.c src/external/mpl/bind/dist/bin/python: dnssec-keymgr.8 src/external/mpl/bind/dist/bin/rndc: rndc.8 rndc.c util.c src/external/mpl/bind/dist/bin/tests: cfg_test.c makejournal.c wire_test.c src/external/mpl/bind/dist/bin/tests/optional: adb_test.c byaddr_test.c byname_test.c db_test.c dst_test.c gsstest.c lfsr_test.c log_test.c master_test.c mempool_test.c name_test.c nsecify.c rbt_test.c rwlock_test.c serial_test.c shutdown_test.c sig0_test.c sym_test.c timer_test.c zone_test.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tests/system: feature-test.c src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: db.c driver.c instance.c instance.h syncptr.c zone.c src/external/mpl/bind/dist/bin/tests/system/pipelined: pipequeries.c src/external/mpl/bind/dist/bin/tests/system/rpz: dnsrps.c src/external/mpl/bind/dist/bin/tests/system/rsabigexponent: bigkey.c src/external/mpl/bind/dist/bin/tests/system/tkey: keycreate.c keydelete.c src/external/mpl/bind/dist/bin/tests/virtual-time: vtwrapper.c src/external/mpl/bind/dist/bin/tools: arpaname.c dnstap-read.c mdig.1 mdig.c named-nzd2nzf.c named-rrchecker.c nsec3hash.c src/external/mpl/bind/dist/bin/win32/BINDInstall: StdAfx.h src/external/mpl/bind/dist/contrib/dlz/bin/dlzbdb: dlzbdb.c src/external/mpl/bind/dist/contrib/dlz/drivers: dlz_bdb_driver.c dlz_bdbhpt_driver.c dlz_filesystem_driver.c dlz_ldap_driver.c dlz_odbc_driver.c dlz_postgres_driver.c sdlz_helper.c src/external/mpl/bind/dist/contrib/dlz/drivers/include/dlz: sdlz_helper.h src/external/mpl/bind/dist/contrib/dlz/example: dlz_example.c src/external/mpl/bind/dist/contrib/dlz/modules/bdbhpt: dlz_bdbhpt_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/common: dlz_dbi.c src/external/mpl/bind/dist/contrib/dlz/modules/filesystem: dlz_filesystem_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/include: dlz_dbi.h dlz_minimal.h src/external/mpl/bind/dist/contrib/dlz/modules/ldap: dlz_ldap_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/mysql: dlz_mysql_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/mysqldyn: dlz_mysqldyn_mod.c src/external/mpl/bind/dist/contrib/dlz/modules/sqlite3: dlz_sqlite3_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/wildcard: dlz_wildcard_dynamic.c
CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Wed Jan 9 11:09:16 UTC 2019
Modified Files:
src/bin/sh: input.c
Log Message:
Correct an (old) typo in a comment. NFC - it is just a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/bin/sh/input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/input.c
diff -u src/bin/sh/input.c:1.66 src/bin/sh/input.c:1.67
--- src/bin/sh/input.c:1.66 Wed Jan 9 11:08:09 2019
+++ src/bin/sh/input.c Wed Jan 9 11:09:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: input.c,v 1.66 2019/01/09 11:08:09 kre Exp $ */
+/* $NetBSD: input.c,v 1.67 2019/01/09 11:09:16 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)input.c 8.3 (Berkeley) 6/9/95";
#else
-__RCSID("$NetBSD: input.c,v 1.66 2019/01/09 11:08:09 kre Exp $");
+__RCSID("$NetBSD: input.c,v 1.67 2019/01/09 11:09:16 kre Exp $");
#endif
#endif /* not lint */
@@ -242,7 +242,7 @@ preadfd(void)
* 1) If a string was pushed back on the input, pop it;
* 2) If an EOF was pushed back (parsenleft == EOF_NLEFT) or we are reading
*from a string so we can't refill the buffer, return EOF.
- * 3) If the is more stuff in this buffer, use it else call read to fill it.
+ * 3) If there is more stuff in this buffer, use it else call read to fill it.
* 4) Process input up to the next newline, deleting nul characters.
*/
CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Wed Jan 9 11:04:54 UTC 2019
Modified Files:
src/bin/sh: input.c
Log Message:
Update some dead (#if 0'd) code that is never called to
cope with the changes made in the previous revision, in an
attempt to avoid bit rot.
Untested (uncompiled) - though it should work.
NFC: this change doesn't get compiled, let alone used.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/bin/sh/input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/input.c
diff -u src/bin/sh/input.c:1.64 src/bin/sh/input.c:1.65
--- src/bin/sh/input.c:1.64 Mon Dec 3 06:40:26 2018
+++ src/bin/sh/input.c Wed Jan 9 11:04:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: input.c,v 1.64 2018/12/03 06:40:26 kre Exp $ */
+/* $NetBSD: input.c,v 1.65 2019/01/09 11:04:54 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)input.c 8.3 (Berkeley) 6/9/95";
#else
-__RCSID("$NetBSD: input.c,v 1.64 2018/12/03 06:40:26 kre Exp $");
+__RCSID("$NetBSD: input.c,v 1.65 2019/01/09 11:04:54 kre Exp $");
#endif
#endif /* not lint */
@@ -150,6 +150,10 @@ pfgets(char *line, int len)
return NULL;
break;
}
+ if (c == PFAKE) {
+ ++nleft;
+ continue;
+ }
*p++ = c;
if (c == '\n')
break;
CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Wed Jan 9 10:59:21 UTC 2019
Modified Files:
src/bin/sh: parser.c
Log Message:
A similar fix to that added in 1.169 of eval.c, but here for when
processing command substitutions. If there is an error while processing,
the any pending queued input should be discarded. From FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/bin/sh/parser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.159 src/bin/sh/parser.c:1.160
--- src/bin/sh/parser.c:1.159 Tue Dec 11 13:31:20 2018
+++ src/bin/sh/parser.c Wed Jan 9 10:59:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.159 2018/12/11 13:31:20 kre Exp $ */
+/* $NetBSD: parser.c,v 1.160 2019/01/09 10:59:20 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95";
#else
-__RCSID("$NetBSD: parser.c,v 1.159 2018/12/11 13:31:20 kre Exp $");
+__RCSID("$NetBSD: parser.c,v 1.160 2019/01/09 10:59:20 kre Exp $");
#endif
#endif /* not lint */
@@ -1347,11 +1347,13 @@ parsebackq(VSS *const stack, char * cons
char *volatile sstr = str;
struct jmploc jmploc;
struct jmploc *const savehandler = handler;
+ struct parsefile *const savetopfile = getcurrentfile();
const int savelen = in - stackblock();
int saveprompt;
int lno;
if (setjmp(jmploc.loc)) {
+ popfilesupto(savetopfile);
if (sstr)
ckfree(__UNVOLATILE(sstr));
cleanup_state_stack(stack);
CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Wed Jan 9 10:57:44 UTC 2019
Modified Files:
src/bin/sh: eval.c
Log Message:
When an error occurs in a builtin from which we do not exit
(a normal builtin, though those are not genrally an issue for
this problem, or a special builtin that has been prefixed by "command")
make sure that we discard any pending input that might have been
queued up, but not yet processed.
We had the mechanism to fix this from when expansion of PS1 etc
was added (which has a similar problem to deal with) - all taken
from FreeBSD - but did not bother to use it here until now...
This fixes an error detected by newly added ATF tests of the eval
builtin, where
eval 'syntax error
another command'
would go ahead and evaluate "another command" which should not
happen (note: only when there was a \n between the two).
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/bin/sh/eval.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.168 src/bin/sh/eval.c:1.169
--- src/bin/sh/eval.c:1.168 Mon Dec 3 06:43:19 2018
+++ src/bin/sh/eval.c Wed Jan 9 10:57:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.168 2018/12/03 06:43:19 kre Exp $ */
+/* $NetBSD: eval.c,v 1.169 2019/01/09 10:57:43 kre Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: eval.c,v 1.168 2018/12/03 06:43:19 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.169 2019/01/09 10:57:43 kre Exp $");
#endif
#endif /* not lint */
@@ -871,6 +871,7 @@ evalcommand(union node *cmd, int flgs, s
const char *volatile savecmdname;
volatile struct shparam saveparam;
struct localvar *volatile savelocalvars;
+ struct parsefile *volatile savetopfile;
volatile int e;
char * volatile lastarg;
const char * volatile path = pathval();
@@ -1237,11 +1238,13 @@ evalcommand(union node *cmd, int flgs, s
mode |= REDIR_BACKQ;
}
e = -1;
- savehandler = handler;
savecmdname = commandname;
- handler =
+ savetopfile = getcurrentfile();
+ savehandler = handler;
temp_path = 0;
if (!setjmp(jmploc.loc)) {
+ handler =
+
/*
* We need to ensure the command hash table isn't
* corrupted by temporary PATH assignments.
@@ -1307,6 +1310,7 @@ evalcommand(union node *cmd, int flgs, s
if ((e != EXERROR && e != EXEXEC)
|| cmdentry.cmdtype == CMDSPLBLTIN)
exraise(e);
+ popfilesupto(savetopfile);
FORCEINTON;
}
if (cmdentry.u.bltin != execcmd)
CVS commit: src/tests/bin/sh
Module Name:src
Committed By: kre
Date: Wed Jan 9 10:51:24 UTC 2019
Modified Files:
src/tests/bin/sh: t_builtins.sh
Log Message:
Add several sub-tests to the test for the "eval" builtin,
including testing correct handling of error cases.
One of these new tests located a bug which will be fixed
within minutes of this commit ...
While doing this, move the test that was used only in the
echo builtin test case (testing if the NetBSD shell was being
tested) into a utility function, and also call it in the eval
test, so NetBSD specific behaviour of what is unspecified in
the standard can be checked to ensure it is not accidentally
altered.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/bin/sh/t_builtins.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/bin/sh/t_builtins.sh
diff -u src/tests/bin/sh/t_builtins.sh:1.4 src/tests/bin/sh/t_builtins.sh:1.5
--- src/tests/bin/sh/t_builtins.sh:1.4 Wed Dec 12 11:52:05 2018
+++ src/tests/bin/sh/t_builtins.sh Wed Jan 9 10:51:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_builtins.sh,v 1.4 2018/12/12 11:52:05 kre Exp $
+# $NetBSD: t_builtins.sh,v 1.5 2019/01/09 10:51:23 kre Exp $
#
# Copyright (c) 2018 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -73,6 +73,21 @@ have_builtin()
return 0
}
+# And another to test if the shell being tested is the NetBSD shell,
+# as we use these tests both to test standards conformance (correctness)
+# which should be possible for all shells, and to test NetBSD
+# extensions (which we mostly do by testing if the extension exists)
+# and NetBSD sh behaviour for what is unspecified by the standard
+# (so we will be notified via test failure should that unspecified
+# behaviour alter) for which we have to discover if that shell is the
+# one being tested.
+
+is_netbsd_sh()
+{
+ unset NETBSD_SHELL 2>/dev/null
+ test -n "$( ${TEST_SH} -c 'printf %s "${NETBSD_SHELL}"')"
+}
+
### Helper functions
nl='
@@ -222,8 +237,7 @@ echo_head() {
echo_body() {
have_builtin echo || return 0
- unset NETBSD_SHELL 2>/dev/null
- if test -z "$( ${TEST_SH} -c 'printf %s "${NETBSD_SHELL}"')"; then
+ if ! is_netbsd_sh; then
atf_skip \
"${TEST_SH%% *} is not the NetBSD shell, this test is for it alone"
return 0
@@ -290,6 +304,12 @@ eval_body() {
atf_check -s exit:0 -e empty -o empty ${TEST_SH} -c 'eval "exit 0"'
atf_check -s exit:1 -e empty -o empty ${TEST_SH} -c 'eval "exit 1"'
atf_check -s exit:0 -e empty -o empty ${TEST_SH} -c 'eval exit 0'
+ atf_check -s exit:1 -e empty -o empty ${TEST_SH} -c 'eval exit 1'
+
+ atf_check -s exit:0 -e empty -o inline:0 ${TEST_SH} -c \
+ 'eval true; printf %d $?'
+ atf_check -s exit:0 -e empty -o inline:1 ${TEST_SH} -c \
+ 'eval false; printf %d $?'
atf_check -s exit:0 -e empty -o inline:abc ${TEST_SH} -c \
'X=a Y=b Z=c; for V in X Y Z; do eval "printf %s \$$V"; done'
@@ -297,6 +317,54 @@ eval_body() {
'X=a Y=b Z=c; for V in X Y Z; do eval printf %s \$$V; done'
atf_check -s exit:0 -e empty -o inline:XYZ ${TEST_SH} -c \
'for V in X Y Z; do eval "${V}=${V}"; done; printf %s "$X$Y$Z"'
+
+ # make sure eval'd strings affect the shell environment
+
+ atf_check -s exit:0 -e empty -o inline:/b/ ${TEST_SH} -c \
+ 'X=a; eval "X=b"; printf /%s/ "${X-unset}"'
+ atf_check -s exit:0 -e empty -o inline:/b/ ${TEST_SH} -c \
+ 'X=a; Y=X; Z=b; eval "$Y=$Z"; printf /%s/ "${X-unset}"'
+ atf_check -s exit:0 -e empty -o inline:/unset/ ${TEST_SH} -c \
+ 'X=a; eval "unset X"; printf /%s/ "${X-unset}"'
+ atf_check -s exit:0 -e empty -o inline:// ${TEST_SH} -c \
+ 'unset X; eval "X="; printf /%s/ "${X-unset}"'
+ atf_check -s exit:0 -e empty -o inline:'2 y Z ' ${TEST_SH} -c \
+ 'set -- X y Z; eval shift; printf "%s " "$#" "$@"'
+
+ # ensure an error in an eval'd string causes the shell to exit
+ # unless 'eval' is preceded by 'command' (in which case the
+ # string is not eval'd but execution continues)
+
+ atf_check -s not-exit:0 -e not-empty -o empty ${TEST_SH} -c \
+ 'eval "if done"; printf %s status=$?'
+
+ atf_check -s exit:0 -e not-empty -o 'match:status=[1-9]' \
+ ${TEST_SH} -c \
+ 'command eval "if done"; printf %s status=$?'
+
+ atf_check -s not-exit:0 -e not-empty \
+ -o 'match:status=[1-9]' -o 'not-match:[XY]' ${TEST_SH} -c \
+ 'command eval "printf X; if done; printf Y"
+ S=$?; printf %s status=$S; exit $S'
+
+ # whether 'X' is output here is (or should be) unspecified.
+ atf_check -s not-exit:0 -e not-empty \
+ -o 'match:status=[1-9]' -o 'not-match:Y' ${TEST_SH} -c \
+ 'command eval "printf X
+ if done
+printf Y"
+ S=$?; printf %s status=$S; exit $S'
+
+ if is_netbsd_sh
+ then
+ # but on NetBSD we expect that X to appear...
+ atf_check -s not-exit:0 -e not-empty -o 'match:X' \
+ -o 'match:status=[1-9]' -o 'not-match:Y' ${TEST_SH} -c \
+ 'command eval "printf X
+ if done
+ printf Y"
+ S=$?;
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: mrg Date: Wed Jan 9 10:42:27 UTC 2019 Modified Files: src/sys/arch/sparc64/sparc64: cache.h Log Message: avoid function param names in prototypes. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sparc64/sparc64/cache.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/sparc64/sparc64/cache.h diff -u src/sys/arch/sparc64/sparc64/cache.h:1.28 src/sys/arch/sparc64/sparc64/cache.h:1.29 --- src/sys/arch/sparc64/sparc64/cache.h:1.28 Mon Jan 5 11:40:56 2015 +++ src/sys/arch/sparc64/sparc64/cache.h Wed Jan 9 10:42:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cache.h,v 1.28 2015/01/05 11:40:56 palle Exp $ */ +/* $NetBSD: cache.h,v 1.29 2019/01/09 10:42:27 mrg Exp $ */ /* * Copyright (c) 2011 Matthew R. Green @@ -124,8 +124,8 @@ void cache_setup_funcs(void); extern void (*sp_dcache_flush_page)(paddr_t); void smp_tlb_flush_pte(vaddr_t, struct pmap *); -void smp_dcache_flush_page_cpuset(paddr_t pa, sparc64_cpuset_t); -void smp_dcache_flush_page_allcpu(paddr_t pa); +void smp_dcache_flush_page_cpuset(paddr_t, sparc64_cpuset_t); +void smp_dcache_flush_page_allcpu(paddr_t); void smp_blast_dcache(void); #define tlb_flush_pte(va,pm) smp_tlb_flush_pte(va, pm) #define dcache_flush_page_all(pa) smp_dcache_flush_page_cpuset(pa, cpus_active)
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Jan 9 10:38:22 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen - otherwise compat_40_mount() is wrongly included in sysent.c
Missed this during earlier conflict resolution.
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.17 -r1.134.2.18 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.16 -r1.134.2.17 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.17 -r1.132.2.18 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.16 -r1.13.2.17 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.16 -r1.132.2.17 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.15 -r1.24.2.16 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.17 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.18
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.17 Wed Dec 26 14:01:46 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Jan 9 10:38:21 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.17 2018/12/26 14:01:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.18 2019/01/09 10:38:21 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.16 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.17
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.16 Wed Dec 26 14:01:46 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Jan 9 10:38:21 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.16 2018/12/26 14:01:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.17 2019/01/09 10:38:21 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.17 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.18
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.17 Wed Dec 26 14:01:46 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Jan 9 10:38:21 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.17 2018/12/26 14:01:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.18 2019/01/09 10:38:21 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.17 2018/12/26 14:01:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.18 2019/01/09 10:38:21 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.16 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.17
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.16 Wed Dec 26 14:01:46 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Jan 9 10:38:21 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.16 2018/12/26 14:01:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.17 2019/01/09 10:38:21 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.16 2018/12/26 14:01:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.17 2019/01/09 10:38:21 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
Index:
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Wed Jan 9 09:48:44 UTC 2019 Modified Files: src/share/man/man9: crashme.9 Log Message: More markup. Add missing El. Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/crashme.9 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/man9/crashme.9 diff -u src/share/man/man9/crashme.9:1.1 src/share/man/man9/crashme.9:1.2 --- src/share/man/man9/crashme.9:1.1 Wed Jan 9 04:02:26 2019 +++ src/share/man/man9/crashme.9 Wed Jan 9 09:48:44 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: crashme.9,v 1.1 2019/01/09 04:02:26 mrg Exp $ +.\" $NetBSD: crashme.9,v 1.2 2019/01/09 09:48:44 wiz Exp $ .\" .\" Copyright (c) 2019 Matthew R. Green .\" All rights reserved. @@ -52,8 +52,9 @@ The crashme functionality is only availa .Dv DEBUG option set. .Pp -Each crashme node is maintained in a crashme_node structure which -has the following public members: +Each crashme node is maintained in a +.Vt crashme_node +structure which has the following public members: .Bd -literal typedef int (*crashme_fn)(int); @@ -90,15 +91,17 @@ node to be executed. .It Ic debug.crashme.panic Basic panic node. .It Ic debug.crashme.null_deref -Derefence NULL node. +Dereference +.Dv NULL +node. +.El .Sh SEE ALSO .Xr options 4 , .Xr panic 9 .Sh HISTORY The .Nm -driver -appeared in +driver appeared in .Nx 9.0 . .Sh AUTHORS -.An Matthew R. Green . +.An Matthew R. Green
CVS commit: src/external/bsd/acpica/bin/iasl
Module Name:src
Committed By: martin
Date: Wed Jan 9 09:27:29 UTC 2019
Modified Files:
src/external/bsd/acpica/bin/iasl: Makefile
Log Message:
Make aslcompilerparse.y generation atomic to avoid parallel build races.
Solution suggested by mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/acpica/bin/iasl/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/bsd/acpica/bin/iasl/Makefile
diff -u src/external/bsd/acpica/bin/iasl/Makefile:1.22 src/external/bsd/acpica/bin/iasl/Makefile:1.23
--- src/external/bsd/acpica/bin/iasl/Makefile:1.22 Sun Oct 14 13:36:33 2018
+++ src/external/bsd/acpica/bin/iasl/Makefile Wed Jan 9 09:27:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/10/14 13:36:33 jmcneill Exp $
+# $NetBSD: Makefile,v 1.23 2019/01/09 09:27:29 martin Exp $
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64")
PROG= iasl
@@ -277,7 +277,8 @@ aslparser.y: asltokens.y asltypes.y aslr
YPREFIX.aslcompilerparse.y=AslCompiler
aslcompilerparse.y: aslparser.y
- ${TOOL_M4} -P -I${TOPDIR} ${.ALLSRC} > ${.TARGET}
+ ${TOOL_M4} -P -I${TOPDIR} ${.ALLSRC} > ${.TARGET}.tmp \
+ && mv ${.TARGET}.tmp ${.TARGET}
aslcompiler.y.h: aslcompilerparse.h
ln -sf ${.ALLSRC} ${.TARGET}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Jan 9 08:28:22 UTC 2019
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
- Remove an extra register read in wm_kmrn_lock_loss_workaround_ich8lan().
- Don't leave the MDICNFG register modified when the Power Management
capability offset can't get.
To generate a diff of this commit:
cvs rdiff -u -r1.614 -r1.615 src/sys/dev/pci/if_wm.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.614 src/sys/dev/pci/if_wm.c:1.615
--- src/sys/dev/pci/if_wm.c:1.614 Mon Jan 7 01:43:22 2019
+++ src/sys/dev/pci/if_wm.c Wed Jan 9 08:28:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.614 2019/01/07 01:43:22 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.615 2019/01/09 08:28:22 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.614 2019/01/07 01:43:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.615 2019/01/09 08:28:22 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -15128,7 +15128,6 @@ wm_kmrn_lock_loss_workaround_ich8lan(str
if (__SHIFTOUT(status, STATUS_SPEED) != STATUS_SPEED_1000)
return;
- reg = CSR_READ(sc, WMREG_PHY_CTRL);
for (i = 0; i < 10; i++) {
/* read twice */
reg = mii->mii_readreg(sc->sc_dev, 1, IGP3_KMRN_DIAG);
@@ -15837,6 +15836,11 @@ wm_pll_workaround_i210(struct wm_softc *
bool wa_done = false;
int i;
+ /* Get Power Management cap offset */
+ if (pci_get_capability(sc->sc_pc, sc->sc_pcitag, PCI_CAP_PWRMGMT,
+ , NULL) == 0)
+ return;
+
/* Save WUC and MDICNFG registers */
wuc = CSR_READ(sc, WMREG_WUC);
mdicnfg = CSR_READ(sc, WMREG_MDICNFG);
@@ -15848,10 +15852,6 @@ wm_pll_workaround_i210(struct wm_softc *
nvmword = INVM_DEFAULT_AL;
tmp_nvmword = nvmword | INVM_PLL_WO_VAL;
- /* Get Power Management cap offset */
- if (pci_get_capability(sc->sc_pc, sc->sc_pcitag, PCI_CAP_PWRMGMT,
- , NULL) == 0)
- return;
for (i = 0; i < WM_MAX_PLL_TRIES; i++) {
phyval = wm_gmii_gs40g_readreg(sc->sc_dev, 1,
GS40G_PHY_PLL_FREQ_PAGE | GS40G_PHY_PLL_FREQ_REG);
