CVS commit: src/sys/dev/pci
Module Name:src
Committed By: ozaki-r
Date: Mon Aug 11 06:02:38 UTC 2014
Modified Files:
src/sys/dev/pci: viaenv.c
Log Message:
Add missing curly braces
It unbreaks the i386 build of ALL.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/viaenv.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/viaenv.c
diff -u src/sys/dev/pci/viaenv.c:1.32 src/sys/dev/pci/viaenv.c:1.33
--- src/sys/dev/pci/viaenv.c:1.32 Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/viaenv.c Mon Aug 11 06:02:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: viaenv.c,v 1.32 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: viaenv.c,v 1.33 2014/08/11 06:02:38 ozaki-r Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: viaenv.c,v 1.32 2014/08/10 16:44:36 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: viaenv.c,v 1.33 2014/08/11 06:02:38 ozaki-r Exp $);
#include sys/param.h
#include sys/systm.h
@@ -343,9 +343,10 @@ viaenv_attach(device_t parent, device_t
#undef COPYDESCR
- for (i = 0; i 10; i++)
+ for (i = 0; i 10; i++) {
sc-sc_sensor[i].state = ENVSYS_SINVALID;
sc-sc_sensor[i].flags |= ENVSYS_FHAS_ENTROPY;
+ }
sc-sc_sme = sysmon_envsys_create();
CVS commit: src/lib/libm
Module Name:src
Committed By: mrg
Date: Mon Aug 11 08:20:57 UTC 2014
Modified Files:
src/lib/libm: Makefile
Log Message:
revert parts of 1.163 that affect the x86 build.
possibly, we want to build the i386 fenv.c for compat build, but they
seem largely compatible and for now, just go back to what we had before
that wasn't breaking the build or generating bug reports.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/lib/libm/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/libm/Makefile
diff -u src/lib/libm/Makefile:1.163 src/lib/libm/Makefile:1.164
--- src/lib/libm/Makefile:1.163 Sun Aug 10 23:25:50 2014
+++ src/lib/libm/Makefile Mon Aug 11 08:20:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2014/08/10 23:25:50 matt Exp $
+# $NetBSD: Makefile,v 1.164 2014/08/11 08:20:57 mrg Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -92,9 +92,10 @@ COPTS.e_sqrtl.c += -DHAVE_FENV_H
COMMON_SRCS+= s_nexttoward.c
.endif
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
-.elif ((${LIBC_MACHINE_ARCH} == i386) || (${LIBC_MACHINE_ARCH} == x86_64))
+.elif ((${MACHINE_ARCH} == i386) || (${MACHINE_ARCH} == x86_64))
-.if (${LIBC_MACHINE_ARCH} == x86_64)
+# XXX consider making this LIBC_MACHINE_ARCH?
+.if (${MACHINE_ARCH} == x86_64)
.PATH: ${.CURDIR}/arch/x86_64
.endif
.PATH: ${.CURDIR}/arch/i387
@@ -116,7 +117,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atan2.S
# do not pick up the i387 asm version, it is incorrect
s_modf.o s_modf.pico s_modf.po s_modf.d: s_modf.c
-.if (${LIBC_MACHINE_ARCH} == i386)
+.if (${MACHINE_ARCH} == i386)
SUBDIR=arch/i387
.endif
.elif (${LIBC_MACHINE_ARCH} == m68k)
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon
Module Name:src
Committed By: mrg
Date: Mon Aug 11 08:25:58 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
Log Message:
put KMS support under our X11DRI definition.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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/server/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.17 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.18
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.17 Mon Aug 4 01:25:23 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Mon Aug 11 08:25:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/08/04 01:25:23 rjs Exp $
+# $NetBSD: Makefile,v 1.18 2014/08/11 08:25:58 mrg Exp $
.include bsd.own.mk
@@ -16,11 +16,13 @@ SRCS.DRI= radeon_dri.c
CPPFLAGS+= ${X11FLAGS.DRI}
.endif
+.if ${X11DRI} != no
# XXX
-.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+. if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
SRCS.KMS= radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
CPPFLAGS+= -DXF86DRM_MODE
LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
+. endif
.endif
SRCS.EXA= radeon_exa.c r600_exa.c r6xx_accel.c \
CVS commit: src/sys/sys
Module Name:src Committed By: riz Date: Mon Aug 11 09:10:52 UTC 2014 Modified Files: src/sys/sys: param.h Log Message: Welcome to 7.99.1. To generate a diff of this commit: cvs rdiff -u -r1.459 -r1.460 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.459 src/sys/sys/param.h:1.460 --- src/sys/sys/param.h:1.459 Fri Jul 25 08:35:40 2014 +++ src/sys/sys/param.h Mon Aug 11 09:10:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.459 2014/07/25 08:35:40 dholland Exp $ */ +/* $NetBSD: param.h,v 1.460 2014/08/11 09:10:52 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 699004900 /* NetBSD 6.99.49 */ +#define __NetBSD_Version__ 799000100 /* NetBSD 7.99.1 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: src/doc
Module Name:src Committed By: riz Date: Mon Aug 11 09:12:34 UTC 2014 Modified Files: src/doc: BRANCHES CHANGES CHANGES.prev Log Message: Note the new netbsd-7 branch, and move CHANGES to CHANGES.prev . To generate a diff of this commit: cvs rdiff -u -r1.331 -r1.332 src/doc/BRANCHES cvs rdiff -u -r1.1967 -r1.1968 src/doc/CHANGES cvs rdiff -u -r1.118 -r1.119 src/doc/CHANGES.prev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.331 src/doc/BRANCHES:1.332 --- src/doc/BRANCHES:1.331 Tue Mar 18 18:20:35 2014 +++ src/doc/BRANCHES Mon Aug 11 09:12:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.331 2014/03/18 18:20:35 riastradh Exp $ +# $NetBSD: BRANCHES,v 1.332 2014/08/11 09:12:34 riz Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -236,6 +236,17 @@ Scope: Entire tree. (src + xsrc) Notes: Commits restricted to Release Engineering. +Branch: netbsd-7 +Description: The NetBSD 7 release branch +Status: Active +Start Date: 11 Aug 2014 +End Date: +Base Tag: netbsd-7-base +Maintainer: 7.0 Release Engineering relen...@netbsd.org +Scope: Entire tree. (src + xsrc) +Notes: + Commits restricted to Release Engineering. + # Individual developers' branches (Active/Dormant): Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1967 src/doc/CHANGES:1.1968 --- src/doc/CHANGES:1.1967 Mon Aug 11 03:43:25 2014 +++ src/doc/CHANGES Mon Aug 11 09:12:34 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1967 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1968 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -24,488 +24,4 @@ # -Changes from NetBSD 6.0 to NetBSD 7.0: - window(1): Removed from the base system in favor of tmux(1). Use the - pkgsrc/misc/window package from now on. [jmmv 20120215] - pkg_add(1): imported 20120221 version from pkgsrc [wiz 20120221] - file(1): upgraded to 5.11 [christos 20120222] - evbmips: Add support for Lemote Yeeloong Notebook. [nonaka 20120302] - dbsym(8): Add option -p [bsh 20120319] - dhcpcd(8): Import dhcpcd-5.5.5 [roy 20120323] - ipf: upgrade to 5.1.1 with new build framework, no module and - test support yet [christos 20120323] - pcc: upgrade to 1.1.0.DEVEL 20120325 [plunky 20120325] - openresolv(8): Import openresolv-3.5.1 [roy 20120327] - dhcpcd(8): Import dhcpcd-5.5.6 [roy 20120328] - apple: Recognize the apple disk partitioning scheme, and auto-discover - wedges. Fix iPod disk mounting, by adding quirk. - [christos 20120306] - fstab(5): Add NAME=wedgename for fs_spec and routines to parse it. Now - wedges can be used in /etc/fstab, even in dynamic environments - where disks come and go and wedges get renumbered. - [christos 20120306] - pdisk(8): Make it work for 64 bit hosts, and make it MI. - [christos 20120306] - amiga: Add clockport(4) layer and a driver for A1200 on-board clockport - a1k2cp(4). [rkujawa 20120417] - kernel: add mpii(4), a driver for LSI Logic Fusion-MPT Message Passing - Interface II SAS controllers. [bouyer 20120419] - kernel: Add support for 256 CPUs on amd64. [rmind 20120420] - OpenSSH: Imported 6.0 [christos 20120501] - bzip2(1): Imported 1.0.6 [wiz 20120507] - kernel: Add a genfs_rename abstraction to help file systems correctly - implement rename, and use it for tmpfs, ffs, and ext2fs. - [riastradh 20120508] - amiga: Rework X-Surf driver as xsurf(4). Add support for clockport(4) - on top of xsurf(4). [rkujawa 20120515] - backtrace(3): Add execinfo.h and the backtrace family of functions - [christos 20120526] - kernel: Add run(4), a driver for Ralink Technology - RT2700U/RT2800U/RT3000U USB IEEE 802.11a/b/g/n wireless - network devices, ported from OpenBSD. [nonaka 20120530] - bind: update to 9.9.1-P1 to fix the recent rdata exploit. - [christos 20120604] - empb(4): Add ELBOX Mediator PCI 1200 driver. [rkujawa 20120604] - kernel: Add a new RLIMIT_NTHR limit to limit the number of processes - per user and the corresponding kern.maxlwp sysctl. Expose - kern.uidinfo.* via sysctl. [christos 20120608] - usb(9): Added support for SMP to the USB subsytem. By Jared D. - McNeill and myself. [mrg 20120609] - kernel: Add sendmmsg and recvmmsg support [christos 20120621] - kernel: Add sysctls to avoid ipv6 DoS attacks (from OpenBSD): - net.inet6.ip6.neighborgcthresh = 2048 - net.inet6.ip6.maxifprefixes = 16 - net.inet6.ip6.maxifdefrouters = 16 - net.inet6.ip6.maxdynroutes = 4096 - [christos 20120622] - ata(4): added support for sata Port MultiPliers (PMP) - [bouyer 20120702] - kernel, libc: Add MurmurHash2 function. [rmind
CVS commit: src/gnu/usr.bin/groff/tmac
Module Name:src Committed By: riz Date: Mon Aug 11 09:12:59 UTC 2014 Modified Files: src/gnu/usr.bin/groff/tmac: mdoc.local Log Message: Add NetBSD 8.0, and make 7.0 the default. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/gnu/usr.bin/groff/tmac/mdoc.local Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.75 src/gnu/usr.bin/groff/tmac/mdoc.local:1.76 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.75 Wed Dec 25 15:09:10 2013 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Mon Aug 11 09:12:59 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.75 2013/12/25 15:09:10 christos Exp $ +.\ $NetBSD: mdoc.local,v 1.76 2014/08/11 09:12:59 riz Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\ Default .Os value -.ds doc-operating-system NetBSD\~6.0 +.ds doc-operating-system NetBSD\~7.0 .\ Default footer operating system value -.ds doc-default-operating-system NetBSD\~6.0 +.ds doc-default-operating-system NetBSD\~7.0 .\ Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -61,6 +61,7 @@ .ds doc-operating-system-NetBSD-6.06.0 .ds doc-operating-system-NetBSD-6.16.1 .ds doc-operating-system-NetBSD-7.07.0 +.ds doc-operating-system-NetBSD-8.08.0 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-5.4 5.4 .ds doc-operating-system-FreeBSD-5.5 5.5
CVS commit: [netbsd-7] src
Module Name:src Committed By: riz Date: Mon Aug 11 09:21:47 UTC 2014 Modified Files: src/doc [netbsd-7]: LAST_MINUTE README.files src/gnu/usr.bin/groff/tmac [netbsd-7]: mdoc.local src/sys/sys [netbsd-7]: param.h Added Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Welcome to 7.0_BETA! To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-7.0 cvs rdiff -u -r1.2 -r1.2.52.1 src/doc/LAST_MINUTE cvs rdiff -u -r1.5 -r1.5.12.1 src/doc/README.files cvs rdiff -u -r1.75 -r1.75.4.1 src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.459 -r1.459.2.1 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2 src/doc/LAST_MINUTE:1.2.52.1 --- src/doc/LAST_MINUTE:1.2 Mon Sep 23 07:52:18 2002 +++ src/doc/LAST_MINUTE Mon Aug 11 09:21:47 2014 @@ -1,7 +1,7 @@ -# $NetBSD: LAST_MINUTE,v 1.2 2002/09/23 07:52:18 lukem Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.52.1 2014/08/11 09:21:47 riz Exp $ -This file contains important information on the NetBSD XXX.XXX release that +This file contains important information on the NetBSD 7.0 release that did not make it into the main documentation. [all] - Nothing pertinent; this is NetBSD-current... + Nothing pertinent Index: src/doc/README.files diff -u src/doc/README.files:1.5 src/doc/README.files:1.5.12.1 --- src/doc/README.files:1.5 Thu Sep 6 22:20:38 2012 +++ src/doc/README.files Mon Aug 11 09:21:47 2014 @@ -1,8 +1,8 @@ -# $NetBSD: README.files,v 1.5 2012/09/06 22:20:38 riz Exp $ +# $NetBSD: README.files,v 1.5.12.1 2014/08/11 09:21:47 riz Exp $ What's in this directory: -CHANGES Changes between the XXX.XXX-1 and XXX.XXX releases. +CHANGES Changes between the 6.0 and 7.0 releases. CHANGES.prev Changes in previous NetBSD releases. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.75 src/gnu/usr.bin/groff/tmac/mdoc.local:1.75.4.1 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.75 Wed Dec 25 15:09:10 2013 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Mon Aug 11 09:21:47 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.75 2013/12/25 15:09:10 christos Exp $ +.\ $NetBSD: mdoc.local,v 1.75.4.1 2014/08/11 09:21:47 riz Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\ Default .Os value -.ds doc-operating-system NetBSD\~6.0 +.ds doc-operating-system NetBSD\~7.0 .\ Default footer operating system value -.ds doc-default-operating-system NetBSD\~6.0 +.ds doc-default-operating-system NetBSD\~7.0 .\ Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.459 src/sys/sys/param.h:1.459.2.1 --- src/sys/sys/param.h:1.459 Fri Jul 25 08:35:40 2014 +++ src/sys/sys/param.h Mon Aug 11 09:21:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.459 2014/07/25 08:35:40 dholland Exp $ */ +/* $NetBSD: param.h,v 1.459.2.1 2014/08/11 09:21:47 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 699004900 /* NetBSD 6.99.49 */ +#define __NetBSD_Version__ 7 /* NetBSD 7.0_BETA */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__) Added files: Index: src/doc/CHANGES-7.0 diff -u /dev/null src/doc/CHANGES-7.0:1.1.2.1 --- /dev/null Mon Aug 11 09:21:47 2014 +++ src/doc/CHANGES-7.0 Mon Aug 11 09:21:47 2014 @@ -0,0 +1,13 @@ +# $NetBSD: CHANGES-7.0,v 1.1.2.1 2014/08/11 09:21:47 riz Exp $ + +A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 +until the 7.0 release: + +doc/CHANGES-7.0 patched by hand +doc/LAST_MINUTE patched by hand +doc/README.filespatched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 7.0_BETA! +
CVS commit: src/doc
Module Name:src Committed By: apb Date: Mon Aug 11 10:28:38 UTC 2014 Modified Files: src/doc: CHANGES.prev Log Message: Formatting fixes, following the guidelines in the comments at the top of CHANGES: * Start with tabheadingcolonone spacecapital letter... * Indent with exactly two tabs. * End with full stopone or two spaces, or newline and two tabs left square bracketinitialsspacedateright square bracket I edited only in the Changes from NetBSD 6.0 to NetBSD 7.0 section, and I left one entry starting with a lowercase letter because it was a literal variable name. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/doc/CHANGES.prev 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.prev diff -u src/doc/CHANGES.prev:1.119 src/doc/CHANGES.prev:1.120 --- src/doc/CHANGES.prev:1.119 Mon Aug 11 09:12:34 2014 +++ src/doc/CHANGES.prev Mon Aug 11 10:28:38 2014 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: $Revision: 1.119 $ +LIST OF CHANGES FROM PREVIOUS RELEASES: $Revision: 1.120 $ Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -11217,16 +11217,16 @@ Changes from NetBSD 5.0 to NetBSD 6.0: Changes from NetBSD 6.0 to NetBSD 7.0: window(1): Removed from the base system in favor of tmux(1). Use the pkgsrc/misc/window package from now on. [jmmv 20120215] - pkg_add(1): imported 20120221 version from pkgsrc [wiz 20120221] - file(1): upgraded to 5.11 [christos 20120222] + pkg_add(1): Imported 20120221 version from pkgsrc. [wiz 20120221] + file(1): Upgraded to 5.11. [christos 20120222] evbmips: Add support for Lemote Yeeloong Notebook. [nonaka 20120302] - dbsym(8): Add option -p [bsh 20120319] - dhcpcd(8): Import dhcpcd-5.5.5 [roy 20120323] - ipf: upgrade to 5.1.1 with new build framework, no module and - test support yet [christos 20120323] - pcc: upgrade to 1.1.0.DEVEL 20120325 [plunky 20120325] - openresolv(8): Import openresolv-3.5.1 [roy 20120327] - dhcpcd(8): Import dhcpcd-5.5.6 [roy 20120328] + dbsym(8): Add option -p. [bsh 20120319] + dhcpcd(8): Import dhcpcd-5.5.5. [roy 20120323] + ipf: Upgrade to 5.1.1 with new build framework, no module and + test support yet. [christos 20120323] + pcc: Upgrade to 1.1.0.DEVEL 20120325. [plunky 20120325] + openresolv(8): Import openresolv-3.5.1. [roy 20120327] + dhcpcd(8): Import dhcpcd-5.5.6. [roy 20120328] apple: Recognize the apple disk partitioning scheme, and auto-discover wedges. Fix iPod disk mounting, by adding quirk. [christos 20120306] @@ -11238,11 +11238,11 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [christos 20120306] amiga: Add clockport(4) layer and a driver for A1200 on-board clockport a1k2cp(4). [rkujawa 20120417] - kernel: add mpii(4), a driver for LSI Logic Fusion-MPT Message Passing + kernel: Add mpii(4), a driver for LSI Logic Fusion-MPT Message Passing Interface II SAS controllers. [bouyer 20120419] kernel: Add support for 256 CPUs on amd64. [rmind 20120420] - OpenSSH: Imported 6.0 [christos 20120501] - bzip2(1): Imported 1.0.6 [wiz 20120507] + OpenSSH: Imported 6.0. [christos 20120501] + bzip2(1): Imported 1.0.6. [wiz 20120507] kernel: Add a genfs_rename abstraction to help file systems correctly implement rename, and use it for tmpfs, ffs, and ext2fs. [riastradh 20120508] @@ -11253,7 +11253,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0: kernel: Add run(4), a driver for Ralink Technology RT2700U/RT2800U/RT3000U USB IEEE 802.11a/b/g/n wireless network devices, ported from OpenBSD. [nonaka 20120530] - bind: update to 9.9.1-P1 to fix the recent rdata exploit. + bind: Update to 9.9.1-P1 to fix the recent rdata exploit. [christos 20120604] empb(4): Add ELBOX Mediator PCI 1200 driver. [rkujawa 20120604] kernel: Add a new RLIMIT_NTHR limit to limit the number of processes @@ -11261,18 +11261,18 @@ Changes from NetBSD 6.0 to NetBSD 7.0: kern.uidinfo.* via sysctl. [christos 20120608] usb(9): Added support for SMP to the USB subsytem. By Jared D. McNeill and myself. [mrg 20120609] - kernel: Add sendmmsg and recvmmsg support [christos 20120621] + kernel: Add sendmmsg and recvmmsg support. [christos 20120621] kernel: Add sysctls to avoid ipv6 DoS attacks (from OpenBSD): net.inet6.ip6.neighborgcthresh = 2048 net.inet6.ip6.maxifprefixes = 16 net.inet6.ip6.maxifdefrouters = 16 net.inet6.ip6.maxdynroutes = 4096 [christos 20120622] - ata(4): added support for sata Port MultiPliers (PMP) + ata(4): Added support for sata Port MultiPliers (PMP) [bouyer 20120702] kernel, libc: Add MurmurHash2 function. [rmind 20120708] atf(7): Import 0.16. [jmmv 20120711] - dhcpcd(8): Import dhcpcd-5.6.1 [roy 20120712] + dhcpcd(8): Import dhcpcd-5.6.1. [roy 20120712] kernel: Add support for sensors to provide entropy to rnd(4) [pgoyette 20120715] tdvfb(4): Add 3Dfx Voodoo2 driver. [rkujawa 20120719] @@ -11282,7 +11282,7 @@
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Aug 11 10:37:59 UTC 2014 Modified Files: src/sys/dev/usb: xhci.c Log Message: PR/49091: xhci: wrong wMaxPacketSize value While this is correct according to the specification only fixed sizes are allowed, i.e. 512 for SS, etc. Maybe these should be used? To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/xhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/xhci.c diff -u src/sys/dev/usb/xhci.c:1.23 src/sys/dev/usb/xhci.c:1.24 --- src/sys/dev/usb/xhci.c:1.23 Tue Aug 5 10:33:46 2014 +++ src/sys/dev/usb/xhci.c Mon Aug 11 10:37:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: xhci.c,v 1.23 2014/08/05 10:33:46 skrll Exp $ */ +/* $NetBSD: xhci.c,v 1.24 2014/08/11 10:37:59 skrll Exp $ */ /* * Copyright (c) 2013 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.23 2014/08/05 10:33:46 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.24 2014/08/11 10:37:59 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -1524,10 +1524,17 @@ xhci_new_device(device_t parent, usbd_bu err = usbd_get_initial_ddesc(dev, dd); if (err) return err; - USETW(dev-def_ep_desc.wMaxPacketSize, dd-bMaxPacketSize); + /* 4.8.2.1 */ + if (speed == USB_SPEED_SUPER) + USETW(dev-def_ep_desc.wMaxPacketSize, + (1 dd-bMaxPacketSize)); + else + USETW(dev-def_ep_desc.wMaxPacketSize, + dd-bMaxPacketSize); device_printf(sc-sc_dev, %s bMaxPacketSize %u\n, __func__, dd-bMaxPacketSize); - xhci_update_ep0_mps(sc, xs, dd-bMaxPacketSize); + xhci_update_ep0_mps(sc, xs, + UGETW(dev-def_ep_desc.wMaxPacketSize)); err = usbd_reload_device_desc(dev); if (err) return err;
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: martin
Date: Mon Aug 11 11:51:45 UTC 2014
Modified Files:
src/sys/arch/sparc64/sparc64: autoconf.c
Log Message:
Match firmware paths for the boot device in Mac style, as used by
QEMU/OpenBIOS.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/arch/sparc64/sparc64/autoconf.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/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.198 src/sys/arch/sparc64/sparc64/autoconf.c:1.199
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.198 Fri Jul 25 17:21:32 2014
+++ src/sys/arch/sparc64/sparc64/autoconf.c Mon Aug 11 11:51:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.198 2014/07/25 17:21:32 nakayama Exp $ */
+/* $NetBSD: autoconf.c,v 1.199 2014/08/11 11:51:45 martin Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.198 2014/07/25 17:21:32 nakayama Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.199 2014/08/11 11:51:45 martin Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -775,7 +775,7 @@ static void
dev_path_drive_match(device_t dev, int ctrlnode, int target,
uint64_t wwn, int lun)
{
- int child = 0;
+ int child = 0, ide_node = 0;
char buf[OFPATHLEN];
DPRINTF(ACDB_BOOTDEV, (dev_path_drive_match: %s, controller %x,
@@ -791,6 +791,27 @@ dev_path_drive_match(device_t dev, int c
if (child == ofbootpackage)
break;
+ if (child != ofbootpackage) {
+ /*
+ * Try Mac firmware style (also used by QEMU/OpenBIOS):
+ * below the controller there is an intermediate node
+ * for each IDE channel, and individual targets always
+ * are @0
+ */
+ for (ide_node = prom_firstchild(ctrlnode); ide_node != 0;
+ ide_node = prom_nextsibling(ide_node)) {
+ const char * name = prom_getpropstring(ide_node,
+ device_type);
+ if (strcmp(name, ide) != 0) continue;
+ for (child = prom_firstchild(ide_node); child != 0;
+ child = prom_nextsibling(child))
+if (child == ofbootpackage)
+ break;
+ if (child == ofbootpackage)
+break;
+ }
+ }
+
if (child == ofbootpackage) {
const char * name = prom_getpropstring(child, name);
@@ -805,6 +826,8 @@ dev_path_drive_match(device_t dev, int c
if (wwn)
snprintf(buf, sizeof(buf), %s@w%016 PRIx64 ,%d,
name, wwn, lun);
+ else if (ide_node)
+ snprintf(buf, sizeof(buf), %s@0, name);
else
snprintf(buf, sizeof(buf), %s@%d,%d,
name, target, lun);
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: roy
Date: Mon Aug 11 12:49:01 UTC 2014
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
FONTCONFIG_DIR not existing does not need to be fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.175 src/usr.sbin/postinstall/postinstall:1.176
--- src/usr.sbin/postinstall/postinstall:1.175 Mon Aug 4 21:56:30 2014
+++ src/usr.sbin/postinstall/postinstall Mon Aug 11 12:49:01 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.175 2014/08/04 21:56:30 apb Exp $
+# $NetBSD: postinstall,v 1.176 2014/08/11 12:49:01 roy Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -941,6 +941,11 @@ do_fontconfig()
FONTCONFIG_DIR=${XSRC_DIR}/external/mit/fontconfig/dist/conf.d
fi
+ if [ ! -d ${FONTCONFIG_DIR} ]; then
+ msg ${FONTCONFIG_DIR} is not a directory; skipping check
+ return 0
+ fi
+
populate_dir $op false ${FONTCONFIG_DIR} ${DEST_DIR}/etc/fonts/conf.avail 444 \
10-autohint.conf \
10-no-sub-pixel.conf \
CVS commit: src/sys/crypto/cprng_fast
Module Name:src
Committed By: riastradh
Date: Mon Aug 11 13:06:31 UTC 2014
Modified Files:
src/sys/crypto/cprng_fast: cprng_fast.c
Log Message:
Use percpu_foreach instead of manual iteration.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/crypto/cprng_fast/cprng_fast.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/crypto/cprng_fast/cprng_fast.c
diff -u src/sys/crypto/cprng_fast/cprng_fast.c:1.7 src/sys/crypto/cprng_fast/cprng_fast.c:1.8
--- src/sys/crypto/cprng_fast/cprng_fast.c:1.7 Mon Aug 11 13:01:58 2014
+++ src/sys/crypto/cprng_fast/cprng_fast.c Mon Aug 11 13:06:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cprng_fast.c,v 1.7 2014/08/11 13:01:58 riastradh Exp $ */
+/* $NetBSD: cprng_fast.c,v 1.8 2014/08/11 13:06:31 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cprng_fast.c,v 1.7 2014/08/11 13:01:58 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: cprng_fast.c,v 1.8 2014/08/11 13:06:31 riastradh Exp $);
#include sys/types.h
#include sys/param.h
@@ -203,6 +203,7 @@ struct cprng_fast {
__CTASSERT(sizeof ((struct cprng_fast *)0)-key == CPRNG_FAST_SEED_BYTES);
+static void cprng_fast_init_cpu(void *, void *, struct cpu_info *);
static void cprng_fast_schedule_reseed(struct cprng_fast *);
static void cprng_fast_intr(void *);
@@ -218,27 +219,25 @@ static void *cprng_fast_softint __read_m
void
cprng_fast_init(void)
{
- struct cpu_info *ci;
- CPU_INFO_ITERATOR cii;
crypto_core_selftest();
cprng_fast_percpu = percpu_alloc(sizeof(struct cprng_fast));
- for (CPU_INFO_FOREACH(cii, ci)) {
- struct cprng_fast *cprng;
- uint8_t seed[CPRNG_FAST_SEED_BYTES];
-
- percpu_traverse_enter();
- cprng = percpu_getptr_remote(cprng_fast_percpu, ci);
- cprng_strong(kern_cprng, seed, sizeof(seed), FASYNC);
- /* Can't do anything about it if not full entropy. */
- cprng_fast_seed(cprng, seed);
- explicit_memset(seed, 0, sizeof(seed));
- percpu_traverse_exit();
- }
+ percpu_foreach(cprng_fast_percpu, cprng_fast_init_cpu, NULL);
cprng_fast_softint = softint_establish(SOFTINT_SERIAL|SOFTINT_MPSAFE,
cprng_fast_intr, NULL);
}
+static void
+cprng_fast_init_cpu(void *p, void *arg __unused, struct cpu_info *ci __unused)
+{
+ struct cprng_fast *const cprng = p;
+ uint8_t seed[CPRNG_FAST_SEED_BYTES];
+
+ cprng_strong(kern_cprng, seed, sizeof seed, FASYNC);
+ cprng_fast_seed(cprng, seed);
+ (void)explicit_memset(seed, 0, sizeof seed);
+}
+
static inline int
cprng_fast_get(struct cprng_fast **cprngp)
{
CVS commit: src/sys/crypto/cprng_fast
Module Name:src
Committed By: riastradh
Date: Mon Aug 11 13:12:53 UTC 2014
Modified Files:
src/sys/crypto/cprng_fast: cprng_fast.c
Log Message:
Move initial entropy bookkeeping out of the fast path.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/crypto/cprng_fast/cprng_fast.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/crypto/cprng_fast/cprng_fast.c
diff -u src/sys/crypto/cprng_fast/cprng_fast.c:1.8 src/sys/crypto/cprng_fast/cprng_fast.c:1.9
--- src/sys/crypto/cprng_fast/cprng_fast.c:1.8 Mon Aug 11 13:06:31 2014
+++ src/sys/crypto/cprng_fast/cprng_fast.c Mon Aug 11 13:12:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cprng_fast.c,v 1.8 2014/08/11 13:06:31 riastradh Exp $ */
+/* $NetBSD: cprng_fast.c,v 1.9 2014/08/11 13:12:53 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cprng_fast.c,v 1.8 2014/08/11 13:06:31 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: cprng_fast.c,v 1.9 2014/08/11 13:12:53 riastradh Exp $);
#include sys/types.h
#include sys/param.h
@@ -235,15 +235,23 @@ cprng_fast_init_cpu(void *p, void *arg _
cprng_strong(kern_cprng, seed, sizeof seed, FASYNC);
cprng_fast_seed(cprng, seed);
+ cprng-have_initial = rnd_initial_entropy;
(void)explicit_memset(seed, 0, sizeof seed);
}
-
+
static inline int
cprng_fast_get(struct cprng_fast **cprngp)
{
+ struct cprng_fast *cprng;
+ int s;
+
+ *cprngp = cprng = percpu_getref(cprng_fast_percpu);
+ s = splvm();
- *cprngp = percpu_getref(cprng_fast_percpu);
- return splvm();
+ if (__predict_false(!cprng-have_initial))
+ cprng_fast_schedule_reseed(cprng);
+
+ return s;
}
static inline void
@@ -255,7 +263,7 @@ cprng_fast_put(struct cprng_fast *cprng,
splx(s);
percpu_putref(cprng_fast_percpu);
}
-
+
static inline void
cprng_fast_schedule_reseed(struct cprng_fast *cprng __unused)
{
@@ -275,6 +283,7 @@ cprng_fast_intr(void *cookie __unused)
cprng = percpu_getref(cprng_fast_percpu);
s = splvm();
cprng_fast_seed(cprng, seed);
+ cprng-have_initial = rnd_initial_entropy;
splx(s);
percpu_putref(cprng_fast_percpu);
@@ -300,12 +309,6 @@ cprng_fast_seed(struct cprng_fast *cprng
(void)memset(cprng-buffer, 0, sizeof cprng-buffer);
(void)memcpy(cprng-key, seed, sizeof cprng-key);
(void)memset(cprng-nonce, 0, sizeof cprng-nonce);
-
- if (__predict_true(rnd_initial_entropy)) {
- cprng-have_initial = true;
- } else {
- cprng-have_initial = false;
- }
}
static inline uint32_t
@@ -322,12 +325,6 @@ cprng_fast_word(struct cprng_fast *cprng
if (__predict_false(++cprng-nonce[0] == 0)) {
cprng-nonce[1]++;
cprng_fast_schedule_reseed(cprng);
- } else {
- if (__predict_false(false == cprng-have_initial)) {
-if (rnd_initial_entropy) {
- cprng_fast_schedule_reseed(cprng);
-}
- }
}
v = cprng-buffer[CPRNG_FAST_BUFIDX];
cprng-buffer[CPRNG_FAST_BUFIDX] = CPRNG_FAST_BUFIDX;
CVS commit: src/sys/crypto/cprng_fast
Module Name:src
Committed By: riastradh
Date: Mon Aug 11 13:22:17 UTC 2014
Modified Files:
src/sys/crypto/cprng_fast: cprng_fast.c
Log Message:
Tweak cprng_fast_buf to use 32-bit unaligned writes if possible.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/crypto/cprng_fast/cprng_fast.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/crypto/cprng_fast/cprng_fast.c
diff -u src/sys/crypto/cprng_fast/cprng_fast.c:1.9 src/sys/crypto/cprng_fast/cprng_fast.c:1.10
--- src/sys/crypto/cprng_fast/cprng_fast.c:1.9 Mon Aug 11 13:12:53 2014
+++ src/sys/crypto/cprng_fast/cprng_fast.c Mon Aug 11 13:22:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cprng_fast.c,v 1.9 2014/08/11 13:12:53 riastradh Exp $ */
+/* $NetBSD: cprng_fast.c,v 1.10 2014/08/11 13:22:16 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cprng_fast.c,v 1.9 2014/08/11 13:12:53 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: cprng_fast.c,v 1.10 2014/08/11 13:22:16 riastradh Exp $);
#include sys/types.h
#include sys/param.h
@@ -338,11 +338,17 @@ cprng_fast_buf(struct cprng_fast *cprng,
{
uint8_t *p = buf;
uint32_t v;
- unsigned r;
+ unsigned w, r;
- while (n) {
- r = MIN(n, 4);
- n -= r;
+ w = n / sizeof(uint32_t);
+ while (w--) {
+ v = cprng_fast_word(cprng);
+ (void)memcpy(p, v, 4);
+ p += 4;
+ }
+
+ r = n % sizeof(uint32_t);
+ if (r) {
v = cprng_fast_word(cprng);
while (r--) {
*p++ = (v 0xff);
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: joerg Date: Mon Aug 11 13:40:34 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.aarch64 Log Message: Mark compat directories as compat, not arch64. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base/ad.aarch64 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/ad.aarch64 diff -u src/distrib/sets/lists/base/ad.aarch64:1.2 src/distrib/sets/lists/base/ad.aarch64:1.3 --- src/distrib/sets/lists/base/ad.aarch64:1.2 Sun Aug 10 23:26:48 2014 +++ src/distrib/sets/lists/base/ad.aarch64 Mon Aug 11 13:40:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.2 2014/08/10 23:26:48 matt Exp $ +# $NetBSD: ad.aarch64,v 1.3 2014/08/11 13:40:34 joerg Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-npf-shlib compat ./lib/eabi/npf/ext_log.so base-npf-shlib compat,pic @@ -35,8 +35,8 @@ ./libexec/ld.elf_so-eabi base-compat-shlib compat,pic #./libexec/ld.elf_so-eabihf base-compat-shlib compat,pic ./libexec/ld.elf_so-oabi base-sysutil-bin compat,pic -./usr/lib/eabi base-compat-lib arch64 -./usr/lib/eabi/i18nbase-compat-lib arch64 +./usr/lib/eabi base-compat-lib compat +./usr/lib/eabi/i18nbase-compat-lib compat ./usr/lib/eabi/i18n/libBIG5.so.5 base-i18n-shlib compat,pic ./usr/lib/eabi/i18n/libBIG5.so.5.0 base-i18n-shlib compat,pic ./usr/lib/eabi/i18n/libDECHanyu.so.5 base-i18n-shlib compat,pic @@ -326,7 +326,7 @@ ./usr/lib/eabi/lua/5.3/gpio.so base-compat-shlib compat,pic ./usr/lib/eabi/lua/5.3/sqlite.so base-compat-shlib compat,pic ./usr/lib/eabi/lua/5.3/syslog.so base-compat-shlib compat,pic -./usr/lib/eabi/securitybase-compat-shlib arch64 +./usr/lib/eabi/securitybase-compat-shlib compat ./usr/lib/eabi/security/pam_afslog.so.4 base-compat-shlib compat,pic,kerberos,pam ./usr/lib/eabi/security/pam_chroot.so.4 base-compat-shlib compat,pic,pam ./usr/lib/eabi/security/pam_deny.so.4 base-compat-shlib compat,pic,pam @@ -349,8 +349,8 @@ ./usr/lib/eabi/security/pam_skey.so.4 base-compat-shlib compat,pic,skey,pam ./usr/lib/eabi/security/pam_ssh.so.4 base-compat-shlib compat,pic,crypto,pam ./usr/lib/eabi/security/pam_unix.so.4 base-compat-shlib compat,pic,pam -./usr/lib/eabihf base-compat-lib arch64 -./usr/lib/eabihf/i18nbase-compat-lib arch64 +./usr/lib/eabihfbase-compat-lib compat +./usr/lib/eabihf/i18nbase-compat-lib compat #./usr/lib/eabihf/i18n/libBIG5.so.5 base-i18n-shlib compat,pic #./usr/lib/eabihf/i18n/libBIG5.so.5.0 base-i18n-shlib compat,pic #./usr/lib/eabihf/i18n/libDECHanyu.so.5 base-i18n-shlib compat,pic @@ -640,7 +640,7 @@ #./usr/lib/eabihf/lua/5.3/gpio.so base-compat-shlib compat,pic #./usr/lib/eabihf/lua/5.3/sqlite.so base-compat-shlib compat,pic #./usr/lib/eabihf/lua/5.3/syslog.so base-compat-shlib compat,pic -./usr/lib/eabihf/securitybase-compat-shlib arch64 +./usr/lib/eabihf/securitybase-compat-shlib compat #./usr/lib/eabihf/security/pam_afslog.so.4 base-compat-shlib compat,pic,kerberos,pam #./usr/lib/eabihf/security/pam_chroot.so.4 base-compat-shlib compat,pic,pam #./usr/lib/eabihf/security/pam_deny.so.4 base-compat-shlib compat,pic,pam @@ -663,8 +663,8 @@ #./usr/lib/eabihf/security/pam_skey.so.4 base-compat-shlib compat,pic,skey,pam #./usr/lib/eabihf/security/pam_ssh.so.4 base-compat-shlib compat,pic,crypto,pam #./usr/lib/eabihf/security/pam_unix.so.4 base-compat-shlib compat,pic,pam -./usr/lib/oabi base-compat-lib arch64 -./usr/lib/oabi/i18nbase-compat-lib arch64 +./usr/lib/oabi base-compat-lib compat +./usr/lib/oabi/i18nbase-compat-lib compat ./usr/lib/oabi/i18n/libBIG5.so.5 base-i18n-shlib compat,pic ./usr/lib/oabi/i18n/libBIG5.so.5.0 base-i18n-shlib compat,pic ./usr/lib/oabi/i18n/libDECHanyu.so.5 base-i18n-shlib compat,pic @@ -952,7 +952,7 @@ ./usr/lib/oabi/lua/5.3/gpio.so base-compat-shlib compat,pic ./usr/lib/oabi/lua/5.3/sqlite.so base-compat-shlib compat,pic ./usr/lib/oabi/lua/5.3/syslog.so base-compat-shlib compat,pic -./usr/lib/oabi/securitybase-compat-shlib arch64 +./usr/lib/oabi/securitybase-compat-shlib compat ./usr/lib/oabi/security/pam_afslog.so.4 base-compat-shlib compat,pic,kerberos,pam ./usr/lib/oabi/security/pam_chroot.so.4 base-compat-shlib compat,pic,pam ./usr/lib/oabi/security/pam_deny.so.4 base-compat-shlib compat,pic,pam
CVS commit: src/sys/miscfs/umapfs
Module Name:src
Committed By: maxv
Date: Mon Aug 11 14:02:14 UTC 2014
Modified Files:
src/sys/miscfs/umapfs: umap_vfsops.c
Log Message:
1) 'error' is returned while it does not even hold an error code. Which
means that zero is returned, and the kernel keeps mounting (and it
probably ends up in a deadlock/memory corruption somewhere).
2) 'nentries' and 'gnentries' are int and user-controlled, and there's no
check to ensure they are greater than zero. Since they are used to
compute the size of two copyin's, a user can control the copied size
by giving a negative value (like 128-2^29), and thus overwrite kernel
memory.
Both triggerable from root only.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/miscfs/umapfs/umap_vfsops.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/miscfs/umapfs/umap_vfsops.c
diff -u src/sys/miscfs/umapfs/umap_vfsops.c:1.93 src/sys/miscfs/umapfs/umap_vfsops.c:1.94
--- src/sys/miscfs/umapfs/umap_vfsops.c:1.93 Sun May 25 13:51:25 2014
+++ src/sys/miscfs/umapfs/umap_vfsops.c Mon Aug 11 14:02:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umap_vfsops.c,v 1.93 2014/05/25 13:51:25 hannken Exp $ */
+/* $NetBSD: umap_vfsops.c,v 1.94 2014/08/11 14:02:14 maxv Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umap_vfsops.c,v 1.93 2014/05/25 13:51:25 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: umap_vfsops.c,v 1.94 2014/08/11 14:02:14 maxv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -153,9 +153,10 @@ umapfs_mount(struct mount *mp, const cha
/*
* Now copy in the number of entries and maps for umap mapping.
*/
- if (args-nentries MAPFILEENTRIES || args-gnentries GMAPFILEENTRIES) {
+ if (args-nentries 0 || args-nentries MAPFILEENTRIES ||
+ args-gnentries 0 || args-gnentries GMAPFILEENTRIES) {
vput(lowerrootvp);
- return (error);
+ return (EINVAL);
}
amp-info_nentries = args-nentries;
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Mon Aug 11 13:59:24 UTC 2014
Modified Files:
src/sys/kern: kern_rndpool.c
Log Message:
buf is not guaranteed to be aligned; don't *(uint32_t *) it.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/kern_rndpool.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/kern_rndpool.c
diff -u src/sys/kern/kern_rndpool.c:1.6 src/sys/kern/kern_rndpool.c:1.7
--- src/sys/kern/kern_rndpool.c:1.6 Sun Aug 10 16:44:36 2014
+++ src/sys/kern/kern_rndpool.c Mon Aug 11 13:59:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndpool.c,v 1.6 2014/08/10 16:44:36 tls Exp $*/
+/* $NetBSD: kern_rndpool.c,v 1.7 2014/08/11 13:59:24 riastradh Exp $*/
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rndpool.c,v 1.6 2014/08/10 16:44:36 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rndpool.c,v 1.7 2014/08/11 13:59:24 riastradh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -212,8 +212,7 @@ rndpool_add_data(rndpool_t *rp,
buf = p;
for (; len 3; len -= 4) {
- val = *((const u_int32_t *)buf);
-
+ (void)memcpy(val, buf, 4);
rndpool_add_one_word(rp, val);
buf += 4;
}
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Mon Aug 11 14:07:55 UTC 2014
Modified Files:
src/sys/kern: kern_rndq.c
Log Message:
done is not guaranteed to be aligned; don't *(uint32_t *) it.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/kern/kern_rndq.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/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.26 src/sys/kern/kern_rndq.c:1.27
--- src/sys/kern/kern_rndq.c:1.26 Mon Aug 11 04:26:53 2014
+++ src/sys/kern/kern_rndq.c Mon Aug 11 14:07:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.26 2014/08/11 04:26:53 riastradh Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.27 2014/08/11 14:07:55 riastradh Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rndq.c,v 1.26 2014/08/11 04:26:53 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rndq.c,v 1.27 2014/08/11 14:07:55 riastradh Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -816,7 +816,8 @@ rnd_add_data_ts(krndsource_t *rs, const
u_int32_t entropy, uint32_t ts)
{
rnd_sample_t *state = NULL;
- const uint32_t *dint = data;
+ const uint8_t *p = data;
+ uint32_t dint;
int todo, done, filled = 0;
int sample_count;
SIMPLEQ_HEAD(, _rnd_sample_t) tmp_samples =
@@ -828,7 +829,7 @@ rnd_add_data_ts(krndsource_t *rs, const
RND_FLAG_COLLECT_VALUE) {
return;
}
- todo = len / sizeof(*dint);
+ todo = len / sizeof(dint);
/*
* Let's try to be efficient: if we are warm, and a source
* is adding entropy at a rate of at least 1 bit every 10 seconds,
@@ -874,7 +875,8 @@ rnd_add_data_ts(krndsource_t *rs, const
}
state-ts[state-cursor] = ts;
- state-values[state-cursor] = dint[done];
+ (void)memcpy(dint, p[done*4], 4);
+ state-values[state-cursor] = dint;
state-cursor++;
if (state-cursor == sample_count) {
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src Committed By: martin Date: Mon Aug 11 15:36:45 UTC 2014 Modified Files: src/sys/dev/usb [netbsd-7]: xhci.c Log Message: Pull up following revision(s) (requested by skrll in ticket #3): sys/dev/usb/xhci.c: revision 1.24 PR/49091: xhci: wrong wMaxPacketSize value While this is correct according to the specification only fixed sizes are allowed, i.e. 512 for SS, etc. Maybe these should be used? To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/dev/usb/xhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/xhci.c diff -u src/sys/dev/usb/xhci.c:1.23 src/sys/dev/usb/xhci.c:1.23.2.1 --- src/sys/dev/usb/xhci.c:1.23 Tue Aug 5 10:33:46 2014 +++ src/sys/dev/usb/xhci.c Mon Aug 11 15:36:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: xhci.c,v 1.23 2014/08/05 10:33:46 skrll Exp $ */ +/* $NetBSD: xhci.c,v 1.23.2.1 2014/08/11 15:36:45 martin Exp $ */ /* * Copyright (c) 2013 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.23 2014/08/05 10:33:46 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.23.2.1 2014/08/11 15:36:45 martin Exp $); #include sys/param.h #include sys/systm.h @@ -1524,10 +1524,17 @@ xhci_new_device(device_t parent, usbd_bu err = usbd_get_initial_ddesc(dev, dd); if (err) return err; - USETW(dev-def_ep_desc.wMaxPacketSize, dd-bMaxPacketSize); + /* 4.8.2.1 */ + if (speed == USB_SPEED_SUPER) + USETW(dev-def_ep_desc.wMaxPacketSize, + (1 dd-bMaxPacketSize)); + else + USETW(dev-def_ep_desc.wMaxPacketSize, + dd-bMaxPacketSize); device_printf(sc-sc_dev, %s bMaxPacketSize %u\n, __func__, dd-bMaxPacketSize); - xhci_update_ep0_mps(sc, xs, dd-bMaxPacketSize); + xhci_update_ep0_mps(sc, xs, + UGETW(dev-def_ep_desc.wMaxPacketSize)); err = usbd_reload_device_desc(dev); if (err) return err;
CVS commit: [netbsd-7] src/sys/kern
Module Name:src
Committed By: martin
Date: Mon Aug 11 15:38:27 UTC 2014
Modified Files:
src/sys/kern [netbsd-7]: kern_rndpool.c kern_rndq.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #4):
sys/kern/kern_rndq.c: revision 1.27
sys/kern/kern_rndpool.c: revision 1.7
buf is not guaranteed to be aligned; don't *(uint32_t *) it.
done is not guaranteed to be aligned; don't *(uint32_t *) it.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/kern/kern_rndpool.c
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/kern/kern_rndq.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/kern_rndpool.c
diff -u src/sys/kern/kern_rndpool.c:1.6 src/sys/kern/kern_rndpool.c:1.6.2.1
--- src/sys/kern/kern_rndpool.c:1.6 Sun Aug 10 16:44:36 2014
+++ src/sys/kern/kern_rndpool.c Mon Aug 11 15:38:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndpool.c,v 1.6 2014/08/10 16:44:36 tls Exp $*/
+/* $NetBSD: kern_rndpool.c,v 1.6.2.1 2014/08/11 15:38:27 martin Exp $*/
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rndpool.c,v 1.6 2014/08/10 16:44:36 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rndpool.c,v 1.6.2.1 2014/08/11 15:38:27 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -212,8 +212,7 @@ rndpool_add_data(rndpool_t *rp,
buf = p;
for (; len 3; len -= 4) {
- val = *((const u_int32_t *)buf);
-
+ (void)memcpy(val, buf, 4);
rndpool_add_one_word(rp, val);
buf += 4;
}
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.26 src/sys/kern/kern_rndq.c:1.26.2.1
--- src/sys/kern/kern_rndq.c:1.26 Mon Aug 11 04:26:53 2014
+++ src/sys/kern/kern_rndq.c Mon Aug 11 15:38:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.26 2014/08/11 04:26:53 riastradh Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.26.2.1 2014/08/11 15:38:27 martin Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rndq.c,v 1.26 2014/08/11 04:26:53 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rndq.c,v 1.26.2.1 2014/08/11 15:38:27 martin Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -816,7 +816,8 @@ rnd_add_data_ts(krndsource_t *rs, const
u_int32_t entropy, uint32_t ts)
{
rnd_sample_t *state = NULL;
- const uint32_t *dint = data;
+ const uint8_t *p = data;
+ uint32_t dint;
int todo, done, filled = 0;
int sample_count;
SIMPLEQ_HEAD(, _rnd_sample_t) tmp_samples =
@@ -828,7 +829,7 @@ rnd_add_data_ts(krndsource_t *rs, const
RND_FLAG_COLLECT_VALUE) {
return;
}
- todo = len / sizeof(*dint);
+ todo = len / sizeof(dint);
/*
* Let's try to be efficient: if we are warm, and a source
* is adding entropy at a rate of at least 1 bit every 10 seconds,
@@ -874,7 +875,8 @@ rnd_add_data_ts(krndsource_t *rs, const
}
state-ts[state-cursor] = ts;
- state-values[state-cursor] = dint[done];
+ (void)memcpy(dint, p[done*4], 4);
+ state-values[state-cursor] = dint;
state-cursor++;
if (state-cursor == sample_count) {
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Aug 11 15:40:08 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets 3 and 4 To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.1 src/doc/CHANGES-7.0:1.1.2.2 --- src/doc/CHANGES-7.0:1.1.2.1 Mon Aug 11 09:21:47 2014 +++ src/doc/CHANGES-7.0 Mon Aug 11 15:40:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.1 2014/08/11 09:21:47 riz Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.2 2014/08/11 15:40:08 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -11,3 +11,20 @@ sys/sys/param.h patched by hand Welcome to 7.0_BETA! +sys/dev/usb/xhci.c1.24 + + PR/49091: xhci: wrong wMaxPacketSize value + + While this is correct according to the specification only fixed sizes + are allowed, i.e. 512 for SS, etc. Maybe these should be used? + [skrll, ticket #3] + + +sys/kern/kern_rndpool.c1.7 +sys/kern/kern_rndq.c1.27 + + buf is not guaranteed to be aligned; don't *(uint32_t *) it. + done is not guaranteed to be aligned; don't *(uint32_t *) it. + Fixes PR kern/49098. + [riastradh, ticket #4] +
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src
Committed By: skrll
Date: Mon Aug 11 20:53:16 UTC 2014
Modified Files:
src/external/gpl3/binutils/dist/bfd: ChangeLog elflink.c
Log Message:
Apply change from upstream to fix PR/48709 - port-alpha/48709: static
threaded programs crash.
With this fix the new weak symbol's st_other is not merged in, i.e. NOPV
is not copied from the libc __libc_thr_init.
* elflink.c (_bfd_elf_merge_symbol): If merging a new weak
symbol that will be skipped, we don't have a new definition.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/bfd/ChangeLog
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/bfd/elflink.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/ChangeLog
diff -u src/external/gpl3/binutils/dist/bfd/ChangeLog:1.5 src/external/gpl3/binutils/dist/bfd/ChangeLog:1.6
--- src/external/gpl3/binutils/dist/bfd/ChangeLog:1.5 Sun Sep 29 14:03:29 2013
+++ src/external/gpl3/binutils/dist/bfd/ChangeLog Mon Aug 11 20:53:16 2014
@@ -1,3 +1,8 @@
+2013-12-14 Alan Modra amo...@gmail.com
+
+ * elflink.c (_bfd_elf_merge_symbol): If merging a new weak
+ symbol that will be skipped, we don't have a new definition.
+
2013-03-25 Tristan Gingold ging...@adacore.com
* configure.in: Bump version to 2.23.2
Index: src/external/gpl3/binutils/dist/bfd/elflink.c
diff -u src/external/gpl3/binutils/dist/bfd/elflink.c:1.7 src/external/gpl3/binutils/dist/bfd/elflink.c:1.8
--- src/external/gpl3/binutils/dist/bfd/elflink.c:1.7 Sun Sep 29 14:03:29 2013
+++ src/external/gpl3/binutils/dist/bfd/elflink.c Mon Aug 11 20:53:16 2014
@@ -1442,7 +1442,10 @@ _bfd_elf_merge_symbol (bfd *abfd,
if (!(oldbfd != NULL
(oldbfd-flags BFD_PLUGIN) != 0
(abfd-flags BFD_PLUGIN) == 0))
- *skip = TRUE;
+ {
+ newdef = FALSE;
+ *skip = TRUE;
+ }
/* Merge st_other. If the symbol already has a dynamic index,
but visibility says it should not be visible, turn it into a
CVS commit: src/external/gpl3/binutils/dist/binutils
Module Name:src
Committed By: skrll
Date: Mon Aug 11 20:57:28 UTC 2014
Modified Files:
src/external/gpl3/binutils/dist/binutils: readelf.c
Log Message:
Decode alpha st_other
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/dist/binutils/readelf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/binutils/readelf.c
diff -u src/external/gpl3/binutils/dist/binutils/readelf.c:1.10 src/external/gpl3/binutils/dist/binutils/readelf.c:1.11
--- src/external/gpl3/binutils/dist/binutils/readelf.c:1.10 Tue Mar 18 23:41:02 2014
+++ src/external/gpl3/binutils/dist/binutils/readelf.c Mon Aug 11 20:57:28 2014
@@ -8847,6 +8847,20 @@ get_symbol_visibility (unsigned int visi
}
static const char *
+get_alpha_symbol_other (unsigned int other)
+{
+ switch (other)
+{
+case STO_ALPHA_NOPV:
+ return NOPV;
+case STO_ALPHA_STD_GPLOAD:
+ return STD GPLOAD;
+default:
+ return NULL;
+}
+}
+
+static const char *
get_mips_symbol_other (unsigned int other)
{
switch (other)
@@ -8940,6 +8954,9 @@ get_symbol_other (unsigned int other)
switch (elf_header.e_machine)
{
+case EM_ALPHA:
+ result = get_alpha_symbol_other (other);
+ break;
case EM_MIPS:
result = get_mips_symbol_other (other);
break;
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: matt
Date: Mon Aug 11 22:03:25 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
Add MKCOMPAT support for aarch64 (COMPAT_MACHINE_CPU)
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/rump/librump/rumpkern/Makefile.rumpkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.148 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.149
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.148 Sun Aug 10 16:44:36 2014
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Mon Aug 11 22:03:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.148 2014/08/10 16:44:36 tls Exp $
+# $NetBSD: Makefile.rumpkern,v 1.149 2014/08/11 22:03:25 matt Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -201,7 +201,11 @@ AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
# the kernel of our compat target (amd64-i386 sparc64-sparc), so
# take MD stuff from the right arch.
#
-.ifdef MLIBDIR
+.if defined(COMPAT_MACHINE_CPU) \
+ exists(${RUMPTOP}/librump/rumpkern/arch/${COMPAT_MACHINE_CPU})
+ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${COMPAT_MACHINE_CPU}
+LIBKERN_ARCH= ${COMPAT_MACHINE_CPU}
+.elif defined(MLIBDIR)
ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${MLIBDIR}
LIBKERN_ARCH= ${MLIBDIR}
.elif exists(${RUMPTOP}/librump/rumpkern/arch/${MACHINE_CPU})
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: matt Date: Mon Aug 11 22:08:34 UTC 2014 Modified Files: src/sys/arch/aarch64/include: vmparam.h Log Message: Add some definitions for building RUMP libraries with MKCOMPAT. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/aarch64/include/vmparam.h diff -u src/sys/arch/aarch64/include/vmparam.h:1.1 src/sys/arch/aarch64/include/vmparam.h:1.2 --- src/sys/arch/aarch64/include/vmparam.h:1.1 Sun Aug 10 05:47:38 2014 +++ src/sys/arch/aarch64/include/vmparam.h Mon Aug 11 22:08:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.1 2014/08/10 05:47:38 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.2 2014/08/11 22:08:34 matt Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -134,6 +134,15 @@ #elif defined(__arm__) +// These exist for building the RUMP libraries with MKCOMPAT + +#define KERNEL_BASE 0x8000 +#define PGSHIFT 12 +#define NBPG (1 PGSHIFT) +#define VM_PHYSSEG_MAX 1 +#define VM_NFREELIST 1 +#define VM_FREELIST_DEFAULT 0 + #include arm/vmparam.h #endif /* __aarch64__/__arm__ */
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: matt Date: Mon Aug 11 22:09:08 UTC 2014 Modified Files: src/sys/arch/aarch64/include: ptrace.h Log Message: #include arm/ptrace.h instead of arm/asm.h (opps) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/include/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/aarch64/include/ptrace.h diff -u src/sys/arch/aarch64/include/ptrace.h:1.1 src/sys/arch/aarch64/include/ptrace.h:1.2 --- src/sys/arch/aarch64/include/ptrace.h:1.1 Sun Aug 10 05:47:38 2014 +++ src/sys/arch/aarch64/include/ptrace.h Mon Aug 11 22:09:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ptrace.h,v 1.1 2014/08/10 05:47:38 matt Exp $ */ +/* $NetBSD: ptrace.h,v 1.2 2014/08/11 22:09:08 matt Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -51,7 +51,7 @@ #elif defined(__arm__) -#include arm/asm.h +#include arm/ptrace.h #endif
CVS commit: src/sys/rump
Module Name:src
Committed By: justin
Date: Mon Aug 11 22:13:56 UTC 2014
Modified Files:
src/sys/rump: listsrcdirs
Log Message:
Add aarch64 to rump srcdirs
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/listsrcdirs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/listsrcdirs
diff -u src/sys/rump/listsrcdirs:1.17 src/sys/rump/listsrcdirs:1.18
--- src/sys/rump/listsrcdirs:1.17 Wed Jul 9 12:20:32 2014
+++ src/sys/rump/listsrcdirs Mon Aug 11 22:13:56 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: listsrcdirs,v 1.17 2014/07/09 12:20:32 pooka Exp $
+# $NetBSD: listsrcdirs,v 1.18 2014/08/11 22:13:56 justin Exp $
#
#
@@ -58,7 +58,7 @@ lsrc ()
iswanted ${what} for arg in $* ; do echo src${pfx}${arg} ; done
}
-ARCHS=amd64 i386 x86 arm evbarm sparc sparc64 powerpc evbppc mips evbmips
+ARCHS=amd64 i386 x86 arm evbarm sparc sparc64 powerpc evbppc mips evbmips aarch64 evbarm64
ARCHS_EXTRA=arm/arm32 Makefile
# sources necessary for building rump kernel components. This list
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Mon Aug 11 22:28:50 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Change the way we default MK vars to yes or no allowing
MKvar.${MACHINE_ARCH} to override.
e.g MKGDB.aarch64=no will default MKGDB to no on aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.829 -r1.830 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.829 src/share/mk/bsd.own.mk:1.830
--- src/share/mk/bsd.own.mk:1.829 Mon Aug 11 03:43:25 2014
+++ src/share/mk/bsd.own.mk Mon Aug 11 22:28:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.829 2014/08/11 03:43:25 jnemeth Exp $
+# $NetBSD: bsd.own.mk,v 1.830 2014/08/11 22:28:50 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -709,6 +709,9 @@ MKGCC:= no
MKGCC:= no
.endif
+# No GDB support for aarch64
+MKGDB.aarch64= no
+
#
# The m68000 port is incomplete.
#
@@ -725,10 +728,8 @@ NOPROFILE= # defined
#
# The ia64 port is incomplete.
#
-.if ${MACHINE_ARCH} == ia64
-MKLINT= no
-MKGDB= no
-.endif
+MKLINT.ia64= no
+MKGDB.ia64= no
#
# On the MIPS, all libs are compiled with ABIcalls (and are thus PIC),
@@ -743,9 +744,7 @@ MKPICLIB:= no
# On VAX using ELF, all objects are PIC, not just shared libraries,
# so don't build the _pic version.
#
-.if ${MACHINE_ARCH} == vax
-MKPICLIB= no
-.endif
+MKPICLIB.vax= no
#
# Location of the file that contains the major and minor numbers of the
@@ -881,9 +880,9 @@ MK${var}:= yes
#
.if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == sparc64 \
|| ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el \
-|| ${MACHINE_ARCH} == powerpc64
+|| ${MACHINE_ARCH} == powerpc64 || ${MACHINE_CPU} == aarch64
MKCOMPAT?= yes
-.elif !empty(MACHINE_ARCH:Mearm*) || ${MACHINE_CPU} == aarch64
+.elif !empty(MACHINE_ARCH:Mearm*)
MKCOMPAT?= no
.else
# Don't let this build where it really isn't supported.
@@ -891,7 +890,7 @@ MKCOMPAT:= no
.endif
.if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386 || \
-${MACHINE} == evbppc ${MACHINE_ARCH} == powerpc
+(${MACHINE} == evbppc ${MACHINE_ARCH} == powerpc)
MKCOMPATMODULES?= yes
.else
MKCOMPATMODULES:= no
@@ -963,7 +962,7 @@ _MKVARS.yes= \
MKX11FONTS \
MKYP
.for var in ${_MKVARS.yes}
-${var}?= yes
+${var}?= ${${var}.${MACHINE_ARCH}:Uyes}
.endfor
#
@@ -995,7 +994,7 @@ _MKVARS.no= \
MKSOFTFLOAT MKSTRIPIDENT MKTPM \
MKUNPRIVED MKUPDATE MKX11 MKX11MOTIF MKZFS
.for var in ${_MKVARS.no}
-${var}?=no
+${var}?= ${${var}.${MACHINE_ARCH}:Uno}
.endfor
#
CVS commit: src/sys/crypto/cprng_fast
Module Name:src
Committed By: justin
Date: Mon Aug 11 22:36:49 UTC 2014
Modified Files:
src/sys/crypto/cprng_fast: cprng_fast.c
Log Message:
Fix inconsistent use of inline in prototype and definition
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/crypto/cprng_fast/cprng_fast.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/crypto/cprng_fast/cprng_fast.c
diff -u src/sys/crypto/cprng_fast/cprng_fast.c:1.10 src/sys/crypto/cprng_fast/cprng_fast.c:1.11
--- src/sys/crypto/cprng_fast/cprng_fast.c:1.10 Mon Aug 11 13:22:16 2014
+++ src/sys/crypto/cprng_fast/cprng_fast.c Mon Aug 11 22:36:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cprng_fast.c,v 1.10 2014/08/11 13:22:16 riastradh Exp $ */
+/* $NetBSD: cprng_fast.c,v 1.11 2014/08/11 22:36:49 justin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cprng_fast.c,v 1.10 2014/08/11 13:22:16 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: cprng_fast.c,v 1.11 2014/08/11 22:36:49 justin Exp $);
#include sys/types.h
#include sys/param.h
@@ -264,7 +264,7 @@ cprng_fast_put(struct cprng_fast *cprng,
percpu_putref(cprng_fast_percpu);
}
-static inline void
+static void
cprng_fast_schedule_reseed(struct cprng_fast *cprng __unused)
{
CVS commit: src
Module Name:src
Committed By: rmind
Date: Mon Aug 11 23:48:01 UTC 2014
Modified Files:
src/lib/libnpf: npf.c
src/sys/net/npf: npf_alg.c npf_conn.c npf_ctl.c npf_impl.h npf_nat.c
src/usr.sbin/npf/npfctl: npfctl.c
Log Message:
- Add and use npf_alg_export().
- npf_conn_import: handle NAT metadata correctly.
- npf_nat_newpolicy: restore the policy ID.
- npfctl_load: fix error code handling for the limit cases.
- npf_config_import: fix the inverted logic.
- npfctl_load: improve error handling.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/lib/libnpf/npf.c
cvs rdiff -u -r1.14 -r1.15 src/sys/net/npf/npf_alg.c
cvs rdiff -u -r1.10 -r1.11 src/sys/net/npf/npf_conn.c
cvs rdiff -u -r1.38 -r1.39 src/sys/net/npf/npf_ctl.c
cvs rdiff -u -r1.58 -r1.59 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.32 -r1.33 src/sys/net/npf/npf_nat.c
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/npf/npfctl/npfctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnpf/npf.c
diff -u src/lib/libnpf/npf.c:1.32 src/lib/libnpf/npf.c:1.33
--- src/lib/libnpf/npf.c:1.32 Sun Aug 10 19:09:43 2014
+++ src/lib/libnpf/npf.c Mon Aug 11 23:48:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.32 2014/08/10 19:09:43 rmind Exp $ */
+/* $NetBSD: npf.c,v 1.33 2014/08/11 23:48:01 rmind Exp $ */
/*-
* Copyright (c) 2010-2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf.c,v 1.32 2014/08/10 19:09:43 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf.c,v 1.33 2014/08/11 23:48:01 rmind Exp $);
#include sys/types.h
#include netinet/in_systm.h
@@ -237,11 +237,11 @@ npf_config_import(const char *path)
nl_config_t *ncf;
npf_dict = prop_dictionary_internalize_from_file(path);
- if (npf_dict) {
+ if (!npf_dict) {
return NULL;
}
ncf = _npf_config_consdict(npf_dict);
- if (ncf == NULL) {
+ if (!ncf) {
prop_object_release(npf_dict);
return NULL;
}
Index: src/sys/net/npf/npf_alg.c
diff -u src/sys/net/npf/npf_alg.c:1.14 src/sys/net/npf/npf_alg.c:1.15
--- src/sys/net/npf/npf_alg.c:1.14 Sun Jul 20 00:37:41 2014
+++ src/sys/net/npf/npf_alg.c Mon Aug 11 23:48:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_alg.c,v 1.14 2014/07/20 00:37:41 rmind Exp $ */
+/* $NetBSD: npf_alg.c,v 1.15 2014/08/11 23:48:01 rmind Exp $ */
/*-
* Copyright (c) 2010-2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_alg.c,v 1.14 2014/07/20 00:37:41 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_alg.c,v 1.15 2014/08/11 23:48:01 rmind Exp $);
#include sys/param.h
#include sys/types.h
@@ -244,3 +244,24 @@ npf_alg_conn(npf_cache_t *npc, int di)
pserialize_read_exit(s);
return con;
}
+
+prop_array_t
+npf_alg_export(void)
+{
+ prop_array_t alglist = prop_array_create();
+
+ KASSERT(npf_config_locked_p());
+
+ for (u_int i = 0; i alg_count; i++) {
+ const npf_alg_t *alg = alg_list[i];
+
+ if (alg-na_name == NULL) {
+ continue;
+ }
+ prop_dictionary_t algdict = prop_dictionary_create();
+ prop_dictionary_set_cstring(algdict, name, alg-na_name);
+ prop_array_add(alglist, algdict);
+ prop_object_release(algdict);
+ }
+ return alglist;
+}
Index: src/sys/net/npf/npf_conn.c
diff -u src/sys/net/npf/npf_conn.c:1.10 src/sys/net/npf/npf_conn.c:1.11
--- src/sys/net/npf/npf_conn.c:1.10 Sun Aug 10 19:09:43 2014
+++ src/sys/net/npf/npf_conn.c Mon Aug 11 23:48:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_conn.c,v 1.10 2014/08/10 19:09:43 rmind Exp $ */
+/* $NetBSD: npf_conn.c,v 1.11 2014/08/11 23:48:01 rmind Exp $ */
/*-
* Copyright (c) 2014 Mindaugas Rasiukevicius rmind at netbsd org
@@ -99,7 +99,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_conn.c,v 1.10 2014/08/10 19:09:43 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_conn.c,v 1.11 2014/08/11 23:48:01 rmind Exp $);
#include sys/param.h
#include sys/types.h
@@ -917,8 +917,11 @@ npf_conn_import(npf_conndb_t *cd, prop_d
}
memcpy(con-c_state, d, sizeof(npf_state_t));
- /* Reconstruct NAT association, if any, or return NULL. */
- con-c_nat = npf_nat_import(cdict, natlist, con);
+ /* Reconstruct NAT association, if any. */
+ if ((obj = prop_dictionary_get(cdict, nat)) != NULL
+ (con-c_nat = npf_nat_import(obj, natlist, con)) == NULL) {
+ goto err;
+ }
/*
* Fetch and copy the keys for each direction.
Index: src/sys/net/npf/npf_ctl.c
diff -u src/sys/net/npf/npf_ctl.c:1.38 src/sys/net/npf/npf_ctl.c:1.39
--- src/sys/net/npf/npf_ctl.c:1.38 Mon Aug 11 01:54:12 2014
+++ src/sys/net/npf/npf_ctl.c Mon Aug 11 23:48:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ctl.c,v 1.38 2014/08/11 01:54:12 rmind Exp $ */
+/* $NetBSD: npf_ctl.c,v 1.39 2014/08/11 23:48:01 rmind Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_ctl.c,v 1.38 2014/08/11
