CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Wed Mar 13 05:22:07 UTC 2019 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add TSX_FORCE_ABORT related definitions. To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.143 src/sys/arch/x86/include/specialreg.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/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.142 src/sys/arch/x86/include/specialreg.h:1.143 --- src/sys/arch/x86/include/specialreg.h:1.142 Sat Mar 9 08:42:26 2019 +++ src/sys/arch/x86/include/specialreg.h Wed Mar 13 05:22:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.142 2019/03/09 08:42:26 maxv Exp $ */ +/* $NetBSD: specialreg.h,v 1.143 2019/03/13 05:22:07 msaitoh Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -426,6 +426,7 @@ /* %edx */ #define CPUID_SEF_AVX512_4VNNIW __BIT(2) #define CPUID_SEF_AVX512_4FMAPS __BIT(3) +#define CPUID_SEF_TSX_FORCE_ABORT __BIT(13) /* MSR_TSX_FORCE_ABORT bit 0 */ #define CPUID_SEF_IBRS __BIT(26) /* IBRS / IBPB Speculation Control */ #define CPUID_SEF_STIBP __BIT(27) /* STIBP Speculation Control */ #define CPUID_SEF_L1D_FLUSH __BIT(28) /* IA32_FLUSH_CMD MSR */ @@ -435,7 +436,8 @@ #define CPUID_SEF_FLAGS2 "\20" \ "\3" "AVX512_4VNNIW" "\4" "AVX512_4FMAPS" \ - "\33" "IBRS" "\34" "STIBP" \ + "\16" "TSX_FORCE_ABORT"\ + "\33" "IBRS" "\34" "STIBP" \ "\35" "L1D_FLUSH" "\36" "ARCH_CAP" "\37CORE_CAP" "\40" "SSBD" /* @@ -745,8 +747,9 @@ #define IA32_ARCH_RSBA 0x04 #define IA32_ARCH_SKIP_L1DFL_VMENTRY 0x08 #define IA32_ARCH_SSB_NO 0x10 -#define MSR_IA32_FLUSH_CMD 0x10b +#define MSR_IA32_FLUSH_CMD 0x10b #define IA32_FLUSH_CMD_L1D_FLUSH 0x01 +#define MSR_TSX_FORCE_ABORT 0x10f #define MSR_BBL_CR_ADDR 0x116 /* PII+ only */ #define MSR_BBL_CR_DECC 0x118 /* PII+ only */ #define MSR_BBL_CR_CTL 0x119 /* PII+ only */
CVS commit: src/external/mit/xorg/lib/libXcursor
Module Name:src
Committed By: mrg
Date: Tue Mar 12 23:52:46 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libXcursor: Makefile
Log Message:
catch up the default __XCURSORPATH__ from libXcursor 1.2.0.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libXcursor/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/lib/libXcursor/Makefile
diff -u src/external/mit/xorg/lib/libXcursor/Makefile:1.6 src/external/mit/xorg/lib/libXcursor/Makefile:1.7
--- src/external/mit/xorg/lib/libXcursor/Makefile:1.6 Mon Aug 25 10:25:53 2014
+++ src/external/mit/xorg/lib/libXcursor/Makefile Tue Mar 12 23:52:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/08/25 10:25:53 apb Exp $
+# $NetBSD: Makefile,v 1.7 2019/03/12 23:52:46 mrg Exp $
.include
@@ -13,8 +13,12 @@ INCS= Xcursor.h
INCSDIR=${X11INCDIR}/X11/Xcursor
MAN= Xcursor.3
-__XCURSORPATH__ = ~/.icons, /usr/share/icons, /usr/share/pixmaps, \
- ${X11LIBDIR}/icons
+__XCURSORPATH__ = \
+ ~/.local/share/icons, \
+ ~/.icons, \
+ /usr/share/icons, \
+ /usr/share/pixmaps, \
+ ${X11LIBDIR}/icons
X11EXTRAMANDEFS+= -e s%__XCURSORPATH__%${__XCURSORPATH__:Q}%g
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Tue Mar 12 23:51:40 UTC 2019 Modified Files: src/distrib/sets/lists/comp: mi Log Message: lint library for jemalloc To generate a diff of this commit: cvs rdiff -u -r1.2262 -r1.2263 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2262 src/distrib/sets/lists/comp/mi:1.2263 --- src/distrib/sets/lists/comp/mi:1.2262 Tue Mar 12 11:10:43 2019 +++ src/distrib/sets/lists/comp/mi Tue Mar 12 19:51:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2262 2019/03/12 15:10:43 christos Exp $ +# $NetBSD: mi,v 1.2263 2019/03/12 23:51:40 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -3899,6 +3899,7 @@ ./usr/libdata/lint/llib-lisccfg.ln comp-bind-lintlib lint ./usr/libdata/lint/llib-liscsi.ln comp-c-lintlib lint,iscsi ./usr/libdata/lint/llib-lisns.ln comp-isns-lintlib lint +./usr/libdata/lint/llib-ljemalloc.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lkdc.ln comp-krb5-lintlib lint,kerberos ./usr/libdata/lint/llib-lkstream.ln comp-obsolete obsolete ./usr/libdata/lint/llib-lkvm.ln comp-c-lintlib lint
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: christos Date: Tue Mar 12 23:50:56 UTC 2019 Modified Files: src/distrib/sets/lists/xcomp: md.amd64 md.evbarm md.i386 Log Message: lint library for vdpau To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xcomp/md.amd64 cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xcomp/md.evbarm cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/xcomp/md.i386 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/xcomp/md.amd64 diff -u src/distrib/sets/lists/xcomp/md.amd64:1.54 src/distrib/sets/lists/xcomp/md.amd64:1.55 --- src/distrib/sets/lists/xcomp/md.amd64:1.54 Mon Mar 11 23:37:23 2019 +++ src/distrib/sets/lists/xcomp/md.amd64 Tue Mar 12 19:50:56 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.54 2019/03/12 03:37:23 mrg Exp $ +# $NetBSD: md.amd64,v 1.55 2019/03/12 23:50:56 christos Exp $ ./usr/X11R7/include/intel_bufmgr.h -unknown- obsolete ./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h -unknown- xorg ./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h -unknown- xorg @@ -33,13 +33,14 @@ ./usr/X11R7/lib/libvdpau.a-unknown- xorg,compatx11file ./usr/X11R7/lib/libvdpau_p.a-unknown- profile,xorg,compatx11file ./usr/X11R7/lib/libvdpau_pic.a-unknown- xorg,picinstall,compatx11file -./usr/X11R7/lib/pkgconfig/vdpau.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/libdrm_amdgpu.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/libdrm_intel.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- xorg +./usr/X11R7/lib/pkgconfig/vdpau.pc -unknown- xorg ./usr/libdata/lint/llib-lI810XvMC.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lchromeXvMC.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lchromeXvMCPro.ln -unknown- lint,xorg ./usr/libdata/lint/llib-ldrm_amdgpu.ln -unknown- lint,xorg ./usr/libdata/lint/llib-ldrm_intel.ln -unknown- lint,xorg ./usr/libdata/lint/llib-ldrm_nouveau.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lvdpau.ln -unknown- lint,xorg Index: src/distrib/sets/lists/xcomp/md.evbarm diff -u src/distrib/sets/lists/xcomp/md.evbarm:1.12 src/distrib/sets/lists/xcomp/md.evbarm:1.13 --- src/distrib/sets/lists/xcomp/md.evbarm:1.12 Mon Mar 11 23:37:23 2019 +++ src/distrib/sets/lists/xcomp/md.evbarm Tue Mar 12 19:50:56 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbarm,v 1.12 2019/03/12 03:37:23 mrg Exp $ +# $NetBSD: md.evbarm,v 1.13 2019/03/12 23:50:56 christos Exp $ ./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h -unknown- xorg ./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h -unknown- xorg ./usr/X11R7/include/libdrm/nouveau/nvif/class.h -unknown- xorg @@ -14,6 +14,7 @@ ./usr/X11R7/lib/libvdpau.a-unknown- xorg,compatx11file ./usr/X11R7/lib/libvdpau_p.a-unknown- profile,xorg,compatx11file ./usr/X11R7/lib/libvdpau_pic.a-unknown- xorg,picinstall,compatx11file -./usr/X11R7/lib/pkgconfig/vdpau.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- xorg +./usr/X11R7/lib/pkgconfig/vdpau.pc -unknown- xorg ./usr/libdata/lint/llib-ldrm_nouveau.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lvdpau.ln -unknown- lint,xorg Index: src/distrib/sets/lists/xcomp/md.i386 diff -u src/distrib/sets/lists/xcomp/md.i386:1.59 src/distrib/sets/lists/xcomp/md.i386:1.60 --- src/distrib/sets/lists/xcomp/md.i386:1.59 Mon Mar 11 23:37:23 2019 +++ src/distrib/sets/lists/xcomp/md.i386 Tue Mar 12 19:50:56 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.59 2019/03/12 03:37:23 mrg Exp $ +# $NetBSD: md.i386,v 1.60 2019/03/12 23:50:56 christos Exp $ #./usr/libdata/lint/llib-lIntelXvMC.ln -unknown- lint,xorg ./usr/X11R7/include/intel_bufmgr.h -unknown- obsolete ./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h -unknown- xorg @@ -34,13 +34,14 @@ ./usr/X11R7/lib/libvdpau.a-unknown- xorg,compatx11file ./usr/X11R7/lib/libvdpau_p.a-unknown- profile,xorg,compatx11file ./usr/X11R7/lib/libvdpau_pic.a-unknown- xorg,picinstall,compatx11file -./usr/X11R7/lib/pkgconfig/vdpau.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/libdrm_amdgpu.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/libdrm_intel.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- xorg +./usr/X11R7/lib/pkgconfig/vdpau.pc -unknown- xorg ./usr/libdata/lint/llib-lI810XvMC.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lchromeXvMC.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lchromeXvMCPro.ln -unknown- lint,xorg ./usr/libdata/lint/llib-ldrm_amdgpu.ln -unknown- lint,xorg ./usr/libdata/lint/llib-ldrm_intel.ln -unknown- lint,xorg ./usr/libdata/lint/llib-ldrm_nouveau.ln -unknown- lint,xorg +./usr/libdata/lint/llib-lvdpau.ln -unknown- lint,xorg
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Tue Mar 12 22:21:53 UTC 2019 Modified Files: src/lib/libc/gen: humanize_number.3 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/gen/humanize_number.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/humanize_number.3 diff -u src/lib/libc/gen/humanize_number.3:1.12 src/lib/libc/gen/humanize_number.3:1.13 --- src/lib/libc/gen/humanize_number.3:1.12 Mon Mar 11 15:10:51 2019 +++ src/lib/libc/gen/humanize_number.3 Tue Mar 12 22:21:53 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: humanize_number.3,v 1.12 2019/03/11 15:10:51 kre Exp $ +.\" $NetBSD: humanize_number.3,v 1.13 2019/03/12 22:21:53 wiz Exp $ .\" .\" Copyright (c) 1999, 2002, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -89,7 +89,7 @@ The .Fa scale must be at least 0 and no more than 6. .Pp -Alternatively, one of fhe following special values may be given as +Alternatively, one of the following special values may be given as .Pa scale : .Bl -tag -width Dv -offset indent .It Dv HN_AUTOSCALE
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jakllsch
Date: Tue Mar 12 18:46:20 UTC 2019
Modified Files:
src/sys/arch/arm/nvidia: tegra_pcie.c
Log Message:
Fix paste-o in an error path diagnostic message.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/nvidia/tegra_pcie.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/arm/nvidia/tegra_pcie.c
diff -u src/sys/arch/arm/nvidia/tegra_pcie.c:1.25 src/sys/arch/arm/nvidia/tegra_pcie.c:1.26
--- src/sys/arch/arm/nvidia/tegra_pcie.c:1.25 Fri Nov 16 15:06:22 2018
+++ src/sys/arch/arm/nvidia/tegra_pcie.c Tue Mar 12 18:46:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pcie.c,v 1.25 2018/11/16 15:06:22 jmcneill Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.26 2019/03/12 18:46:20 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.25 2018/11/16 15:06:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.26 2019/03/12 18:46:20 jakllsch Exp $");
#include
#include
@@ -185,7 +185,7 @@ tegra_pcie_attach(device_t parent, devic
error = bus_space_map(sc->sc_bst, pads_addr, pads_size, 0,
>sc_bsh_pads);
if (error) {
- aprint_error(": couldn't map afi registers: %d\n", error);
+ aprint_error(": couldn't map pads registers: %d\n", error);
return;
}
error = bus_space_map(sc->sc_bst, cs_addr, cs_size, 0,
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: snj Date: Tue Mar 12 17:48:50 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: 121[12] To generate a diff of this commit: cvs rdiff -u -r1.1.2.115 -r1.1.2.116 src/doc/CHANGES-8.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-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.115 src/doc/CHANGES-8.1:1.1.2.116 --- src/doc/CHANGES-8.1:1.1.2.115 Sat Mar 9 17:13:18 2019 +++ src/doc/CHANGES-8.1 Tue Mar 12 17:48:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.115 2019/03/09 17:13:18 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.116 2019/03/12 17:48:50 snj Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -2696,3 +2696,13 @@ sys/dev/usb/if_urndisreg.h delete Add Microsoft Hyper-V support. [nonaka, ticket #1210] +sys/compat/netbsd32/netbsd32_compat_60.c 1.3 + + don't forget to convert the timespec. + [martin, ticket #1211] + +external/bsd/bzip2/dist/bzip2recover.c 1.4 + + CVE-2016-3189 bzip2: heap use after free in bzip2recover + [martin, ticket #1212] +
CVS commit: [netbsd-8] src/external/bsd/bzip2/dist
Module Name:src Committed By: snj Date: Tue Mar 12 17:48:04 UTC 2019 Modified Files: src/external/bsd/bzip2/dist [netbsd-8]: bzip2recover.c Log Message: Pull up following revision(s) (requested by martin in ticket #1212): external/bsd/bzip2/dist/bzip2recover.c: revision 1.4 Apply fix for CVE-2016-3189 bzip2: heap use after free in bzip2recover To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.28.1 src/external/bsd/bzip2/dist/bzip2recover.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/bzip2/dist/bzip2recover.c diff -u src/external/bsd/bzip2/dist/bzip2recover.c:1.3 src/external/bsd/bzip2/dist/bzip2recover.c:1.3.28.1 --- src/external/bsd/bzip2/dist/bzip2recover.c:1.3 Mon May 7 00:45:47 2012 +++ src/external/bsd/bzip2/dist/bzip2recover.c Tue Mar 12 17:48:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: bzip2recover.c,v 1.3 2012/05/07 00:45:47 wiz Exp $ */ +/* $NetBSD: bzip2recover.c,v 1.3.28.1 2019/03/12 17:48:03 snj Exp $ */ /*---*/ /*--- Block recoverer program for bzip2 ---*/ @@ -472,6 +472,7 @@ Int32 main ( Int32 argc, Char** argv ) bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); bsPutUInt32 ( bsWr, blockCRC ); bsClose ( bsWr ); +outFile = NULL; } if (wrBlock >= rbCtr) break; wrBlock++;
CVS commit: [netbsd-8] src/sys/compat/netbsd32
Module Name:src Committed By: snj Date: Tue Mar 12 17:46:59 UTC 2019 Modified Files: src/sys/compat/netbsd32 [netbsd-8]: netbsd32_compat_60.c Log Message: Pull up following revision(s) (requested by martin in ticket #1211): sys/compat/netbsd32/netbsd32_compat_60.c: 1.3 don't forget to convert the timespec. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.12.1 src/sys/compat/netbsd32/netbsd32_compat_60.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_compat_60.c diff -u src/sys/compat/netbsd32/netbsd32_compat_60.c:1.2 src/sys/compat/netbsd32/netbsd32_compat_60.c:1.2.12.1 --- src/sys/compat/netbsd32/netbsd32_compat_60.c:1.2 Thu Aug 21 06:40:35 2014 +++ src/sys/compat/netbsd32/netbsd32_compat_60.c Tue Mar 12 17:46:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_60.c,v 1.2 2014/08/21 06:40:35 maxv Exp $ */ +/* $NetBSD: netbsd32_compat_60.c,v 1.2.12.1 2019/03/12 17:46:59 snj Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.2 2014/08/21 06:40:35 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.2.12.1 2019/03/12 17:46:59 snj Exp $"); #include #include @@ -71,6 +71,7 @@ compat_60_netbsd32__lwp_park(struct lwp error = copyin(SCARG_P32(uap, ts), , sizeof ts32); if (error != 0) return error; + netbsd32_to_timespec(, ); tsp = }
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Mar 12 16:59:16 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssl To generate a diff of this commit: cvs rdiff -u -r1.1602 -r1.1603 src/doc/3RDPARTY cvs rdiff -u -r1.2509 -r1.2510 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.1602 src/doc/3RDPARTY:1.1603 --- src/doc/3RDPARTY:1.1602 Sun Mar 10 20:17:16 2019 +++ src/doc/3RDPARTY Tue Mar 12 12:59:16 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1602 2019/03/11 00:17:16 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1603 2019/03/12 16:59:16 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1101,12 +1101,12 @@ markus is very cooperative about it): - adjust the DEFAULT_PKCS11_WHITELIST for ssh-agent Package: OpenSSL -Version: 1.0.2o/1.1.1a -Current Vers: 1.0.2q/1.1.1a +Version: 1.0.2o/1.1.1b +Current Vers: 1.0.2r/1.1.1b Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/ -Date: 2019-01-09 +Date: 2019-03-12 Mailing List: openssl-annou...@openssl.org Responsible: christos, mjf, tls, riastradh, spz License: OpenSSL and SSLeay license (both BSD-like) Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2509 src/doc/CHANGES:1.2510 --- src/doc/CHANGES:1.2509 Sun Mar 10 20:17:16 2019 +++ src/doc/CHANGES Tue Mar 12 12:59:16 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2509 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2510 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -345,3 +345,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: jemalloc: Import 5.1.0 [christos 20190304] kcov(4): Added driver for kernel coverage tracing [kamil 20190310] mdocml: Import 1.14.5. [christos 20190310] + OpenSSL: Imported 1.1.1b. [christos 20190312]
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Tue Mar 12 16:50:35 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: fix pasto (gnumalloc vs jemalloc) To generate a diff of this commit: cvs rdiff -u -r1.859 -r1.860 src/distrib/sets/lists/base/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.859 src/distrib/sets/lists/base/shl.mi:1.860 --- src/distrib/sets/lists/base/shl.mi:1.859 Tue Mar 12 11:10:43 2019 +++ src/distrib/sets/lists/base/shl.mi Tue Mar 12 12:50:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.859 2019/03/12 15:10:43 christos Exp $ +# $NetBSD: shl.mi,v 1.860 2019/03/12 16:50:35 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -302,6 +302,7 @@ ./usr/lib/libgcc_s.so.1.0 base-sys-shlib compatfile,gcc ./usr/lib/libgnumalloc.so base-sys-shlib compatfile ./usr/lib/libgnumalloc.so.1 base-sys-shlib compatfile +./usr/lib/libgnumalloc.so.1.0 base-sys-shlib compatfile ./usr/lib/libgomp.sobase-sys-shlib compatfile,gcc ./usr/lib/libgomp.so.1base-sys-shlib compatfile,gcc=6 ./usr/lib/libgomp.so.1.2 base-obsolete obsolete @@ -354,7 +355,6 @@ ./usr/lib/libjemalloc.so base-sys-shlib compatfile ./usr/lib/libjemalloc.so.0 base-sys-shlib compatfile ./usr/lib/libjemalloc.so.0.0 base-sys-shlib compatfile -./usr/lib/libjemalloc.so.1.0 base-sys-shlib compatfile ./usr/lib/libkadm.sobase-obsolete obsolete ./usr/lib/libkadm5clnt.so base-krb5-shlib compatfile,kerberos ./usr/lib/libkadm5clnt.so.14 base-krb5-shlib compatfile,kerberos
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Tue Mar 12 15:14:02 UTC 2019
Modified Files:
src/lib: Makefile
Log Message:
add libjemalloc for the non-standard jemalloc symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.269 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.268 src/lib/Makefile:1.269
--- src/lib/Makefile:1.268 Mon Mar 4 03:22:19 2019
+++ src/lib/Makefile Tue Mar 12 11:14:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.268 2019/03/04 08:22:19 maya Exp $
+# $NetBSD: Makefile,v 1.269 2019/03/12 15:14:02 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -86,6 +86,8 @@ SUBDIR+= ../external/mit/expat/lib
SUBDIR+= ../external/gpl2/libmalloc
+SUBDIR+= ../external/bsd/jemalloc/lib
+
.if (${MKGCC} != "no")
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libobjc
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libgomp
CVS commit: src/external/bsd/jemalloc
Module Name:src
Committed By: christos
Date: Tue Mar 12 15:13:25 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: jemalloc.c
src/external/bsd/jemalloc/include/jemalloc: jemalloc.h
src/external/bsd/jemalloc/lib: Makefile Makefile.inc
Added Files:
src/external/bsd/jemalloc: Makefile
src/external/bsd/jemalloc/lib: jemalloc_stub.c
Log Message:
- descend to build libjemalloc
- namespace protect all functions __je
- provide getters and setters for malloc_conf and malloc_message
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/jemalloc/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/jemalloc/dist/src/jemalloc.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/jemalloc/include/jemalloc/jemalloc.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/jemalloc/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/jemalloc/lib/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/jemalloc/lib/jemalloc_stub.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/jemalloc/dist/src/jemalloc.c
diff -u src/external/bsd/jemalloc/dist/src/jemalloc.c:1.5 src/external/bsd/jemalloc/dist/src/jemalloc.c:1.6
--- src/external/bsd/jemalloc/dist/src/jemalloc.c:1.5 Sun Mar 10 15:34:30 2019
+++ src/external/bsd/jemalloc/dist/src/jemalloc.c Tue Mar 12 11:13:25 2019
@@ -20,24 +20,31 @@
#include "jemalloc/internal/ticker.h"
#include "jemalloc/internal/util.h"
-__weak_alias(mallocx, je_mallocx)
-__weak_alias(rallocx, je_rallocx)
-__weak_alias(xallocx, je_xallocx)
-__weak_alias(sallocx, je_sallocx)
-__weak_alias(dallocx, je_dallocx)
-__weak_alias(sdallocx, je_sdallocx)
-__weak_alias(nallocx, je_nallocx)
-
-__weak_alias(mallctl, je_mallctl)
-__weak_alias(mallctlnametomib, je_mallctlnametomib)
-__weak_alias(mallctlbymib, je_mallctlbymib)
+#ifdef JEMALLOC_WEAK_NOSTD
+__weak_alias(mallocx, __je_mallocx)
+__weak_alias(rallocx, __je_rallocx)
+__weak_alias(xallocx, __je_xallocx)
+__weak_alias(sallocx, __je_sallocx)
+__weak_alias(dallocx, __je_dallocx)
+__weak_alias(sdallocx, __je_sdallocx)
+__weak_alias(nallocx, __je_nallocx)
+
+__weak_alias(mallctl, __je_mallctl)
+__weak_alias(mallctlnametomib, __je_mallctlnametomib)
+__weak_alias(mallctlbymib, __je_mallctlbymib)
+
+__weak_alias(malloc_stats_print, __je_malloc_stats_print)
+__weak_alias(malloc_usable_size, __je_malloc_usable_size)
-__weak_alias(malloc_stats_print, je_malloc_stats_print)
-__weak_alias(malloc_usable_size, je_malloc_usable_size)
+__weak_alias(malloc_message, __je_malloc_message)
+__weak_alias(malloc_conf, __je_malloc_conf)
-__weak_alias(malloc_message, je_malloc_message)
+__weak_alias(malloc_message_get, __je_malloc_message_get)
+__weak_alias(malloc_conf_get, __je_malloc_conf_get)
-__weak_alias(malloc_conf, je_malloc_conf)
+__weak_alias(malloc_message_set, __je_malloc_message_set)
+__weak_alias(malloc_conf_set, __je_malloc_conf_set)
+#endif
/**/
/* Data. */
@@ -3354,4 +3361,28 @@ jemalloc_postfork_child(void) {
ctl_postfork_child(tsd_tsdn(tsd));
}
+void (*
+je_malloc_message_get(void))(void *, const char *)
+{
+ return je_malloc_message;
+}
+
+void
+je_malloc_message_set(void (*m)(void *, const char *))
+{
+ je_malloc_message = m;
+}
+
+const char *
+je_malloc_conf_get(void)
+{
+ return je_malloc_conf;
+}
+
+void
+je_malloc_conf_set(const char *m)
+{
+ je_malloc_conf = m;
+}
+
/**/
Index: src/external/bsd/jemalloc/include/jemalloc/jemalloc.h
diff -u src/external/bsd/jemalloc/include/jemalloc/jemalloc.h:1.5 src/external/bsd/jemalloc/include/jemalloc/jemalloc.h:1.6
--- src/external/bsd/jemalloc/include/jemalloc/jemalloc.h:1.5 Sun Mar 10 15:32:56 2019
+++ src/external/bsd/jemalloc/include/jemalloc/jemalloc.h Tue Mar 12 11:13:25 2019
@@ -64,48 +64,51 @@ extern "C" {
#ifndef JEMALLOC_NO_RENAME
# define je_aligned_alloc aligned_alloc
# define je_calloc calloc
-# define je_dallocx dallocx
# define je_free free
+# define je_malloc malloc
+# define je_posix_memalign posix_memalign
+# define je_realloc realloc
+# define je_valloc valloc
+
+# ifndef JEMALLOC_PROTECT_NOSTD
+# define je_dallocx dallocx
# define je_mallctl mallctl
# define je_mallctlbymib mallctlbymib
# define je_mallctlnametomib mallctlnametomib
-# define je_malloc malloc
# define je_malloc_conf malloc_conf
+# define je_malloc_conf_get malloc_conf_get
+# define je_malloc_conf_set malloc_conf_set
# define je_malloc_message malloc_message
+# define je_malloc_message_get malloc_message_get
+# define je_malloc_message_set malloc_message_set
# define je_malloc_stats_print malloc_stats_print
# define je_malloc_usable_size malloc_usable_size
# define je_mallocx mallocx
# define je_nallocx nallocx
-# define je_posix_memalign posix_memalign
#
CVS commit: src/include
Module Name:src Committed By: christos Date: Tue Mar 12 15:11:13 UTC 2019 Modified Files: src/include: malloc.h Log Message: remove global pointers, add get/seters. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/include/malloc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/malloc.h diff -u src/include/malloc.h:1.7 src/include/malloc.h:1.8 --- src/include/malloc.h:1.7 Sun Mar 10 11:31:02 2019 +++ src/include/malloc.h Tue Mar 12 11:11:13 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: malloc.h,v 1.7 2019/03/10 15:31:02 christos Exp $ */ +/* $NetBSD: malloc.h,v 1.8 2019/03/12 15:11:13 christos Exp $ */ /*- * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ __BEGIN_DECLS void *mallocx(size_t, int); void *rallocx(void *, size_t, int); size_t xallocx(void *, size_t, size_t, int); -size_t sallocx(void *, int); +size_t sallocx(const void *, int); void dallocx(void *, int); void sdallocx(void *, size_t, int); size_t nallocx(size_t, int); @@ -49,9 +49,11 @@ void malloc_stats_print(void (*)(void *, size_t malloc_usable_size(const void *); -extern void (*malloc_message)(void *, const char *); +void (*malloc_message_get(void))(void *, const char *); +void malloc_message_set(void (*)(void *, const char *)); -extern const char *malloc_conf; +const char *malloc_conf_get(void); +void malloc_conf_set(const char *); __END_DECLS
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Tue Mar 12 15:10:44 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi src/distrib/sets/lists/debug: mi shl.mi Log Message: Add libjemalloc.so To generate a diff of this commit: cvs rdiff -u -r1.858 -r1.859 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2261 -r1.2262 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.324 -r1.325 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.278 -r1.279 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.218 -r1.219 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.858 src/distrib/sets/lists/base/shl.mi:1.859 --- src/distrib/sets/lists/base/shl.mi:1.858 Mon Mar 4 18:03:10 2019 +++ src/distrib/sets/lists/base/shl.mi Tue Mar 12 11:10:43 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.858 2019/03/04 23:03:10 rin Exp $ +# $NetBSD: shl.mi,v 1.859 2019/03/12 15:10:43 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -103,9 +103,6 @@ ./lib/npf/ext_rndblock.so.0 base-npf-shlib compatfile,npf ./lib/npf/ext_rndblock.so.0.0 base-npf-shlib compatfile,npf ./libexec/ld.elf_sobase-sys-shlib dynamicroot -./usr/lib/libbozohttpd.so base-sys-shlib compatfile -./usr/lib/libbozohttpd.so.0 base-sys-shlib compatfile -./usr/lib/libbozohttpd.so.0.0 base-sys-shlib compatfile ./usr/lib/i18n/libBIG5.so base-i18n-shlib compatfile ./usr/lib/i18n/libBIG5.so.5 base-i18n-shlib compatfile ./usr/lib/i18n/libBIG5.so.5.0 base-i18n-shlib compatfile @@ -210,6 +207,9 @@ ./usr/lib/libbluetooth.so base-sys-shlib compatfile ./usr/lib/libbluetooth.so.4 base-sys-shlib compatfile ./usr/lib/libbluetooth.so.4.2 base-sys-shlib compatfile +./usr/lib/libbozohttpd.so base-sys-shlib compatfile +./usr/lib/libbozohttpd.so.0 base-sys-shlib compatfile +./usr/lib/libbozohttpd.so.0.0 base-sys-shlib compatfile ./usr/lib/libbsdmalloc.so base-sys-shlib compatfile ./usr/lib/libbsdmalloc.so.0 base-sys-shlib compatfile ./usr/lib/libbsdmalloc.so.0.0 base-sys-shlib compatfile @@ -302,7 +302,6 @@ ./usr/lib/libgcc_s.so.1.0 base-sys-shlib compatfile,gcc ./usr/lib/libgnumalloc.so base-sys-shlib compatfile ./usr/lib/libgnumalloc.so.1 base-sys-shlib compatfile -./usr/lib/libgnumalloc.so.1.0 base-sys-shlib compatfile ./usr/lib/libgomp.sobase-sys-shlib compatfile,gcc ./usr/lib/libgomp.so.1base-sys-shlib compatfile,gcc=6 ./usr/lib/libgomp.so.1.2 base-obsolete obsolete @@ -352,6 +351,10 @@ ./usr/lib/libisns.sobase-isns-shlib compatfile ./usr/lib/libisns.so.0base-isns-shlib compatfile ./usr/lib/libisns.so.0.0 base-isns-shlib compatfile +./usr/lib/libjemalloc.so base-sys-shlib compatfile +./usr/lib/libjemalloc.so.0 base-sys-shlib compatfile +./usr/lib/libjemalloc.so.0.0 base-sys-shlib compatfile +./usr/lib/libjemalloc.so.1.0 base-sys-shlib compatfile ./usr/lib/libkadm.sobase-obsolete obsolete ./usr/lib/libkadm5clnt.so base-krb5-shlib compatfile,kerberos ./usr/lib/libkadm5clnt.so.14 base-krb5-shlib compatfile,kerberos Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2261 src/distrib/sets/lists/comp/mi:1.2262 --- src/distrib/sets/lists/comp/mi:1.2261 Mon Feb 25 05:25:40 2019 +++ src/distrib/sets/lists/comp/mi Tue Mar 12 11:10:43 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2261 2019/02/25 10:25:40 kamil Exp $ +# $NetBSD: mi,v 1.2262 2019/03/12 15:10:43 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -708,8 +708,8 @@ ./usr/include/dev/scsipi/ses.h comp-c-include ./usr/include/dev/scsipi/ss_mustek.h comp-obsolete obsolete ./usr/include/dev/scsipi/ssvar.h comp-obsolete obsolete -./usr/include/dev/spkrio.h comp-c-include ./usr/include/dev/spi/spi_io.h comp-c-include +./usr/include/dev/spkrio.h comp-c-include ./usr/include/dev/sun/disklabel.h comp-c-include ./usr/include/dev/sun/eeprom.h comp-c-include ./usr/include/dev/sun/event_var.h comp-obsolete obsolete @@ -3449,6 +3449,8 @@ ./usr/lib/libiscsi_p.acomp-iscsi-proflib compatfile,iscsi,profile ./usr/lib/libisns.acomp-isns-lib compatfile ./usr/lib/libisns_p.acomp-isns-proflib compatfile,profile +./usr/lib/libjemalloc.acomp-c-lib compatfile +./usr/lib/libjemalloc_p.a comp-c-proflib compatfile,profile ./usr/lib/libkadm.acomp-obsolete obsolete ./usr/lib/libkadm5clnt.a comp-krb5-lib compatfile,kerberos ./usr/lib/libkadm5clnt_p.a comp-krb5-proflib compatfile,kerberos,profile Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.324
CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Tue Mar 12 14:03:35 UTC 2019
Modified Files:
src/sys/kern: vfs_lookup.c
Log Message:
Take a reference on ndp->ni_rootdir and ndp->ni_erootdir.
A multithreaded process may chroot during namei() and we end up with
vn_under() trying to reference the now unreferenced ni_rootdir.
Ok: David Holland
Reported-by: syzbot+889319cdf91a3d037...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.208 -r1.209 src/sys/kern/vfs_lookup.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/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.208 src/sys/kern/vfs_lookup.c:1.209
--- src/sys/kern/vfs_lookup.c:1.208 Sun Jul 9 22:48:44 2017
+++ src/sys/kern/vfs_lookup.c Tue Mar 12 14:03:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.208 2017/07/09 22:48:44 dholland Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.209 2019/03/12 14:03:35 hannken Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.208 2017/07/09 22:48:44 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.209 2019/03/12 14:03:35 hannken Exp $");
#ifdef _KERNEL_OPT
#include "opt_magiclinks.h"
@@ -469,6 +469,8 @@ struct namei_state {
int slashes;
unsigned attempt_retry:1; /* true if error allows emul retry */
+ unsigned root_referenced:1; /* true if ndp->ni_rootdir and
+ ndp->ni_erootdir were referenced */
};
@@ -486,6 +488,8 @@ namei_init(struct namei_state *state, st
state->rdonly = 0;
state->slashes = 0;
+ state->root_referenced = 0;
+
KASSERTMSG((state->cnp->cn_cred != NULL), "namei: bad cred/proc");
KASSERTMSG(((state->cnp->cn_nameiop & (~OPMASK)) == 0),
"namei: nameiop contaminated with flags: %08"PRIx32,
@@ -510,8 +514,11 @@ namei_cleanup(struct namei_state *state)
{
KASSERT(state->cnp == >ndp->ni_cnd);
- /* nothing for now */
- (void)state;
+ if (state->root_referenced) {
+ vrele(state->ndp->ni_rootdir);
+ if (state->ndp->ni_erootdir != NULL)
+ vrele(state->ndp->ni_erootdir);
+ }
}
//
@@ -578,11 +585,15 @@ namei_getstartdir(struct namei_state *st
/*
* Get a reference to the start dir so we can safely unlock cwdi.
*
- * XXX: should we hold references to rootdir and erootdir while
- * we're running? What happens if a multithreaded process chroots
- * during namei?
+ * Must hold references to rootdir and erootdir while we're running.
+ * A multithreaded process may chroot during namei.
*/
vref(startdir);
+ KASSERT(! state->root_referenced);
+ vref(state->ndp->ni_rootdir);
+ if (state->ndp->ni_erootdir != NULL)
+ vref(state->ndp->ni_erootdir);
+ state->root_referenced = 1;
rw_exit(>cwdi_lock);
return startdir;
@@ -603,6 +614,9 @@ namei_getstartdir_for_nfsd(struct namei_
state->ndp->ni_erootdir = NULL;
vref(state->ndp->ni_atdir);
+ KASSERT(! state->root_referenced);
+ vref(state->ndp->ni_rootdir);
+ state->root_referenced = 1;
return state->ndp->ni_atdir;
}
CVS commit: src/external/mit/xorg/lib/libvdpau
Module Name:src
Committed By: christos
Date: Tue Mar 12 11:05:09 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libvdpau: Makefile
Log Message:
it is CPPFLAGS for -D etc otherwise lint breaks!
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libvdpau/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/lib/libvdpau/Makefile
diff -u src/external/mit/xorg/lib/libvdpau/Makefile:1.2 src/external/mit/xorg/lib/libvdpau/Makefile:1.3
--- src/external/mit/xorg/lib/libvdpau/Makefile:1.2 Sun Mar 10 08:44:58 2019
+++ src/external/mit/xorg/lib/libvdpau/Makefile Tue Mar 12 07:05:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/03/10 12:44:58 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/03/12 11:05:09 christos Exp $
.include
@@ -12,7 +12,7 @@ SRCS= vdpau_wrapper.c \
VDPAU_SYSCONFDIR= ${X11ETCDIR}/vdpau
VDPAU_MODULEDIR= ${X11LIBDIR}/vdpau
-CFLAGS+= -DVDPAU_SYSCONFDIR=\"${VDPAU_SYSCONFDIR}\" \
+CPPFLAGS+= -DVDPAU_SYSCONFDIR=\"${VDPAU_SYSCONFDIR}\" \
-DVDPAU_MODULEDIR=\"${VDPAU_MODULEDIR}\"
SHLIB_MAJOR= 1
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: martin Date: Tue Mar 12 10:32:35 UTC 2019 Modified Files: src/distrib/sets/lists/xdebug: md.evbarm md.evbarm.armeb Log Message: Add libvdpau_g.a here as well To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/xdebug/md.evbarm cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xdebug/md.evbarm.armeb 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/xdebug/md.evbarm diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.19 src/distrib/sets/lists/xdebug/md.evbarm:1.20 --- src/distrib/sets/lists/xdebug/md.evbarm:1.19 Sun Mar 10 11:18:02 2019 +++ src/distrib/sets/lists/xdebug/md.evbarm Tue Mar 12 10:32:35 2019 @@ -1,5 +1,6 @@ -# $NetBSD: md.evbarm,v 1.19 2019/03/10 11:18:02 mrg Exp $ +# $NetBSD: md.evbarm,v 1.20 2019/03/12 10:32:35 martin Exp $ ./usr/X11R7/lib/libdrm_nouveau_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/libvdpau_g.a-unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete ./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete ./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg,obsolete Index: src/distrib/sets/lists/xdebug/md.evbarm.armeb diff -u src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.11 src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.12 --- src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.11 Sun Mar 10 11:18:02 2019 +++ src/distrib/sets/lists/xdebug/md.evbarm.armeb Tue Mar 12 10:32:35 2019 @@ -1,4 +1,5 @@ -# $NetBSD: md.evbarm.armeb,v 1.11 2019/03/10 11:18:02 mrg Exp $ +# $NetBSD: md.evbarm.armeb,v 1.12 2019/03/12 10:32:35 martin Exp $ +./usr/X11R7/lib/libvdpau_g.a-unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,xorg_server_ver=110 ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,xorg_server_ver=120,obsolete ./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete
CVS commit: src/etc/mtree
Module Name:src
Committed By: mrg
Date: Tue Mar 12 10:07:50 UTC 2019
Modified Files:
src/etc/mtree: Makefile NetBSD.dist.i386 NetBSD.dist.powerpc
NetBSD.dist.sparc NetBSD.dist.sparc64 NetBSD.dist.x86_64
Added Files:
src/etc/mtree: NetBSD.dist.sun2 NetBSD.dist.sun3
Removed Files:
src/etc/mtree: NetBSD.dist.aarch64 NetBSD.dist.ia64 NetBSD.dist.ofppc
Log Message:
remove the recently added files or added entries for what is
./usr/include/$MACHINE and automatically add it.
add sun68k for sun2/sun3. tested on about 12 platforms.
there may be more failures to figure out but this should make
them all special cases rather than always expected cases.
fortunately, most builds don't see to hit these issues for
reasons i haven't determined yet.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/etc/mtree/Makefile
cvs rdiff -u -r1.6 -r0 src/etc/mtree/NetBSD.dist.aarch64
cvs rdiff -u -r1.1 -r1.2 src/etc/mtree/NetBSD.dist.i386 \
src/etc/mtree/NetBSD.dist.powerpc src/etc/mtree/NetBSD.dist.sparc
cvs rdiff -u -r1.1 -r0 src/etc/mtree/NetBSD.dist.ia64 \
src/etc/mtree/NetBSD.dist.ofppc
cvs rdiff -u -r1.12 -r1.13 src/etc/mtree/NetBSD.dist.sparc64
cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.dist.sun2 \
src/etc/mtree/NetBSD.dist.sun3
cvs rdiff -u -r1.13 -r1.14 src/etc/mtree/NetBSD.dist.x86_64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.40 src/etc/mtree/Makefile:1.41
--- src/etc/mtree/Makefile:1.40 Sun Feb 17 05:29:08 2019
+++ src/etc/mtree/Makefile Tue Mar 12 10:07:49 2019
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.40 2019/02/17 05:29:08 mrg Exp $
+# $NetBSD: Makefile,v 1.41 2019/03/12 10:07:49 mrg Exp $
.include
+EXTRA_DIST_FILES= NetBSD.dist.machine # autogenerated
+
.if ${MKX11} != "no"
-EXTRA_DIST_FILES= NetBSD.dist.Xorg
+EXTRA_DIST_FILES+= NetBSD.dist.Xorg
.endif
# Derived from MACHINE_CPU, but keeping 32/64bit for most.
@@ -77,6 +79,10 @@ NetBSD.dist: NetBSD.dist.tmp
NetBSD.dist.tmp: NetBSD.dist.base ${EXTRA_DIST_FILES}
${TOOL_CAT} ${.ALLSRC} > ${.TARGET}
+NetBSD.dist.machine:
+ ${MKCREATE}
+ echo ./usr/include/${MACHINE} > ${.TARGET}
+
NetBSD.dist.compat: NetBSD.dist.compat.in mkcompat.awk
${MKCREATE}
${TOOL_AWK} -f ${.ALLSRC:M*.awk} -v COMPATDIRS=${ARCHDIR_SUBDIR:T:Q} \
@@ -130,6 +136,7 @@ distrib-dirs: .PHONY check_DESTDIR NetBS
.endif # DISTRIBUTION_DONE # }
CLEANFILES+= NetBSD.dist NetBSD.dist.tmp
+CLEANFILES+= NetBSD.dist.machine
CLEANFILES+= NetBSD.dist.compat
CLEANFILES+= NetBSD.dist.tests.compat
Index: src/etc/mtree/NetBSD.dist.i386
diff -u src/etc/mtree/NetBSD.dist.i386:1.1 src/etc/mtree/NetBSD.dist.i386:1.2
--- src/etc/mtree/NetBSD.dist.i386:1.1 Sat Feb 9 00:15:28 2019
+++ src/etc/mtree/NetBSD.dist.i386 Tue Mar 12 10:07:49 2019
@@ -1,5 +1,4 @@
-# $NetBSD: NetBSD.dist.i386,v 1.1 2019/02/09 00:15:28 mrg Exp $
+# $NetBSD: NetBSD.dist.i386,v 1.2 2019/03/12 10:07:49 mrg Exp $
-./usr/include/i386
./usr/include/x86
./usr/include/xen
Index: src/etc/mtree/NetBSD.dist.powerpc
diff -u src/etc/mtree/NetBSD.dist.powerpc:1.1 src/etc/mtree/NetBSD.dist.powerpc:1.2
--- src/etc/mtree/NetBSD.dist.powerpc:1.1 Sun Feb 17 05:29:08 2019
+++ src/etc/mtree/NetBSD.dist.powerpc Tue Mar 12 10:07:49 2019
@@ -1,3 +1,5 @@
-# $NetBSD: NetBSD.dist.powerpc,v 1.1 2019/02/17 05:29:08 mrg Exp $
+# $NetBSD: NetBSD.dist.powerpc,v 1.2 2019/03/12 10:07:49 mrg Exp $
./usr/include/powerpc
+./usr/include/powerpc/oea
+./usr/include/powerpc/ibm4xx
Index: src/etc/mtree/NetBSD.dist.sparc
diff -u src/etc/mtree/NetBSD.dist.sparc:1.1 src/etc/mtree/NetBSD.dist.sparc:1.2
--- src/etc/mtree/NetBSD.dist.sparc:1.1 Sun Feb 17 05:29:08 2019
+++ src/etc/mtree/NetBSD.dist.sparc Tue Mar 12 10:07:49 2019
@@ -1,4 +1,3 @@
-# $NetBSD: NetBSD.dist.sparc,v 1.1 2019/02/17 05:29:08 mrg Exp $
+# $NetBSD: NetBSD.dist.sparc,v 1.2 2019/03/12 10:07:49 mrg Exp $
-./usr/include/sparc
./usr/include/sparc64
Index: src/etc/mtree/NetBSD.dist.sparc64
diff -u src/etc/mtree/NetBSD.dist.sparc64:1.12 src/etc/mtree/NetBSD.dist.sparc64:1.13
--- src/etc/mtree/NetBSD.dist.sparc64:1.12 Sun Feb 17 05:29:08 2019
+++ src/etc/mtree/NetBSD.dist.sparc64 Tue Mar 12 10:07:49 2019
@@ -1,4 +1,3 @@
-# $NetBSD: NetBSD.dist.sparc64,v 1.12 2019/02/17 05:29:08 mrg Exp $
+# $NetBSD: NetBSD.dist.sparc64,v 1.13 2019/03/12 10:07:49 mrg Exp $
-./usr/include/sparc
./usr/include/sparc64
Index: src/etc/mtree/NetBSD.dist.x86_64
diff -u src/etc/mtree/NetBSD.dist.x86_64:1.13 src/etc/mtree/NetBSD.dist.x86_64:1.14
--- src/etc/mtree/NetBSD.dist.x86_64:1.13 Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/NetBSD.dist.x86_64 Tue Mar 12 10:07:49 2019
@@ -1,6 +1,5 @@
-# $NetBSD: NetBSD.dist.x86_64,v 1.13 2019/02/09 21:43:23 mrg Exp $
+# $NetBSD: NetBSD.dist.x86_64,v 1.14 2019/03/12 10:07:49 mrg Exp $
-./usr/include/amd64
./usr/include/dev/nvmm
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: gson
Date: Tue Mar 12 08:29:52 UTC 2019
Modified Files:
src/sys/arch/x86/x86: pmap.c
Log Message:
Add missing space in "wiring for pmap .. did not change" message
To generate a diff of this commit:
cvs rdiff -u -r1.330 -r1.331 src/sys/arch/x86/x86/pmap.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/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.330 src/sys/arch/x86/x86/pmap.c:1.331
--- src/sys/arch/x86/x86/pmap.c:1.330 Sun Mar 10 16:30:01 2019
+++ src/sys/arch/x86/x86/pmap.c Tue Mar 12 08:29:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.330 2019/03/10 16:30:01 maxv Exp $ */
+/* $NetBSD: pmap.c,v 1.331 2019/03/12 08:29:52 gson Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.330 2019/03/10 16:30:01 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.331 2019/03/12 08:29:52 gson Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -4117,7 +4117,7 @@ pmap_unwire(struct pmap *pmap, vaddr_t v
pmap_stats_update_bypte(pmap, npte, opte);
} else {
printf("%s: wiring for pmap %p va %#" PRIxVADDR
- "did not change!\n", __func__, pmap, va);
+ " did not change!\n", __func__, pmap, va);
}
/* Release pmap. */
CVS commit: src/sys/ddb
Module Name:src
Committed By: skrll
Date: Tue Mar 12 07:44:58 UTC 2019
Modified Files:
src/sys/ddb: db_trap.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/ddb/db_trap.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/ddb/db_trap.c
diff -u src/sys/ddb/db_trap.c:1.25 src/sys/ddb/db_trap.c:1.26
--- src/sys/ddb/db_trap.c:1.25 Wed Feb 9 18:24:44 2011
+++ src/sys/ddb/db_trap.c Tue Mar 12 07:44:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trap.c,v 1.25 2011/02/09 18:24:44 matt Exp $ */
+/* $NetBSD: db_trap.c,v 1.26 2019/03/12 07:44:58 skrll Exp $ */
/*
* Mach Operating System
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_trap.c,v 1.25 2011/02/09 18:24:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trap.c,v 1.26 2019/03/12 07:44:58 skrll Exp $");
#include
#include
@@ -67,7 +67,8 @@ db_trap(int type, int code)
bkpt = IS_BREAKPOINT_TRAP(type, code);
watchpt = IS_WATCHPOINT_TRAP(type, code);
- if (db_trap_callback) db_trap_callback(1);
+ if (db_trap_callback)
+ db_trap_callback(1);
if (db_stop_at_pc(DDB_REGS, )) {
if (db_inst_count) {
