CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 17:56:27 UTC 2017

Modified Files:
src/external/bsd/file/dist: configure

Log Message:
put back maintainer mode


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 17:56:27 UTC 2017

Modified Files:
src/external/bsd/file/dist: configure

Log Message:
put back maintainer mode


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/configure

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/file/dist/configure
diff -u src/external/bsd/file/dist/configure:1.15 src/external/bsd/file/dist/configure:1.16
--- src/external/bsd/file/dist/configure:1.15	Fri Feb 10 12:53:24 2017
+++ src/external/bsd/file/dist/configure	Fri Feb 10 12:56:27 2017
@@ -2977,6 +2977,28 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+# Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;

CVS commit: src

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Fri Feb 10 19:31:42 UTC 2017

Modified Files:
src/share/man/man4: audio.4
src/sys/dev: audio.c audiobell.c audiovar.h
src/sys/sys: audioio.h file.h
src/usr.bin/audio/ctl: audioctl.1 ctl.c

Log Message:
Audio now uses fdclone, there is no longer a limitation of one audio
instance per process.  Virtual channels are placed in a queue, so there is
no longer a compile time limit of VAUDIOCHANS.

A new sysctl has been added to control multiple user access.
Mixer labels on virtual channels are now prefixed by vchan.

audiobell.c and audioctl have been updated to reflect these changes.

Use of fdclone was posted to tech-kern@ and improvements made.
Multiuser access control changes and the use of a queue were suggessted by
pgoyette@


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/share/man/man4/audio.4
cvs rdiff -u -r1.301 -r1.302 src/sys/dev/audio.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/audiobell.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/audiovar.h
cvs rdiff -u -r1.35 -r1.36 src/sys/sys/audioio.h
cvs rdiff -u -r1.80 -r1.81 src/sys/sys/file.h
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/audio/ctl/audioctl.1
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/audio/ctl/ctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/audio.4
diff -u src/share/man/man4/audio.4:1.73 src/share/man/man4/audio.4:1.74
--- src/share/man/man4/audio.4:1.73	Mon Dec 12 11:49:27 2016
+++ src/share/man/man4/audio.4	Fri Feb 10 19:31:42 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: audio.4,v 1.73 2016/12/12 11:49:27 nat Exp $
+.\"	$NetBSD: audio.4,v 1.74 2017/02/10 19:31:42 nat Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -99,11 +99,8 @@ and
 are identical.
 .Sh VIRTUAL CHANNELS
 Any process may open a sampling device at a given time.
-There is a constraint of
-.Em one
-device per process and file descriptors may
-.Em not
-be shared between processes.
+Any number of devices per process and file descriptors may be shared between
+processes.
 .Pp
 Virtual channels are converted to a common format, signed linear encoding,
 frequency channels and precision.
@@ -116,6 +113,7 @@ variables.
 .It hw.driverN.frequency
 .It hw.driverN.channels
 .It hw.driverN.saturate
+.It hw.driverN.multiuser
 .El
 .Pp
 Where
@@ -141,14 +139,28 @@ If set to false the channels are
 .Em divided
 evenly in volume with respect to the master volume.
 .Pp
+An additional
+.Xr sysctl 8
+variable determines if multiple users are allowed to access the sampling
+device, hw.driverN.multiuser.
+.Pp
+By default it is set to false.
+This means that the sampling device may be only used by
+.Em one
+user at a time.
+Other users (except root) attempting to open the sampling device will be
+denied.
+.Pp
+If set to true, all users may access the sampling device at any time.
+.Pp
 Each virtual channel has a corresponding mixer:
 .Bl -tag -width -compact
-.It outputs.dacN  Output volume
-.It inputs.micN   Recording volume
+.It vchan.dacN  Output volume
+.It vchan.micN  Recording volume
 .El
 .Pp
 Where N is the virtual channel number.
-e.g ouputs.dac0 controlling playback volume and outputs.mic0 controlling
+e.g vchan.dac0 controlling playback volume and vchan.mic0 controlling
 recording volume for the first virtual channel.
 .Pp
 On a half-duplex device, writes while recording is in progress will be
@@ -233,17 +245,8 @@ The following
 commands are supported on the sample devices:
 .Pp
 .Bl -tag -width indent
-.It Dv AUDIO_SETPROC (struct audio_pid)
-This command will select the audio device opened by pid.
-.Bd -literal
-struct audio_pid {
-pid_t   pid;
-lwpid_t lwpid;
-};
-.Ed
-.Pp
-Currently the lpwid value is
-.Em ignored .
+.It Dv AUDIO_SETPROC (int)
+This command will select the audio channel for subsequent ioctl calls.
 .It Dv AUDIO_FLUSH
 This command stops all playback and recording, clears all queued
 buffers, resets error counters, and restarts recording and playback as

Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.301 src/sys/dev/audio.c:1.302
--- src/sys/dev/audio.c:1.301	Tue Feb  7 02:05:26 2017
+++ src/sys/dev/audio.c	Fri Feb 10 19:31:42 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.301 2017/02/07 02:05:26 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.302 2017/02/10 19:31:42 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.301 2017/02/07 02:05:26 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.302 2017/02/10 19:31:42 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -157,12 +157,17 @@ __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 

CVS commit: src/sys/arch/arm/xscale

[Tobias Nygren]

Module Name:src
Committed By:   tnn
Date:   Fri Feb 10 20:30:39 UTC 2017

Modified Files:
src/sys/arch/arm/xscale: ixp425-fw.README

Log Message:
update firmware download URL


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/xscale/ixp425-fw.README

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/xscale/ixp425-fw.README
diff -u src/sys/arch/arm/xscale/ixp425-fw.README:1.2 src/sys/arch/arm/xscale/ixp425-fw.README:1.3
--- src/sys/arch/arm/xscale/ixp425-fw.README:1.2	Wed Mar 24 13:55:04 2010
+++ src/sys/arch/arm/xscale/ixp425-fw.README	Fri Feb 10 20:30:39 2017
@@ -1,4 +1,4 @@
-$NetBSD: ixp425-fw.README,v 1.2 2010/03/24 13:55:04 scw Exp $
+$NetBSD: ixp425-fw.README,v 1.3 2017/02/10 20:30:39 tnn Exp $
 
 IXP425 NPE Microcode
 
@@ -19,7 +19,7 @@ through license.
 
 You must grab the NPE microcode from here:
 
- http://www.intel.com/design/network/products/npfamily/download_ixp400.htm
+ https://downloadcenter.intel.com/download/13757/IXP400-Software-NPE-Microcode-v3-0-without-crypto
 
 Select the "Download (without Crypto)" link in the "NPE Microcode"
 section. Note that there is no benefit in selecting the "with Cypto"
@@ -42,7 +42,7 @@ Extract the microcode under any decent U
 command provided with the OS, or with the version included in the pkgsrc
 collection under archivers/unzip:
 
-	$ unzip IPL_ixp400NpeLibrary-2_3.zip
+	$ unzip IPL_ixp400NpeLibrary-3_0.zip
 
 Next, you must generate a microcode image suitable for inclusion in the
 NetBSD kernel.

CVS commit: src/sys/arch/arm/xscale

[Tobias Nygren]

Module Name:src
Committed By:   tnn
Date:   Fri Feb 10 20:30:39 UTC 2017

Modified Files:
src/sys/arch/arm/xscale: ixp425-fw.README

Log Message:
update firmware download URL


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/xscale/ixp425-fw.README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Fri Feb 10 19:31:42 UTC 2017

Modified Files:
src/share/man/man4: audio.4
src/sys/dev: audio.c audiobell.c audiovar.h
src/sys/sys: audioio.h file.h
src/usr.bin/audio/ctl: audioctl.1 ctl.c

Log Message:
Audio now uses fdclone, there is no longer a limitation of one audio
instance per process.  Virtual channels are placed in a queue, so there is
no longer a compile time limit of VAUDIOCHANS.

A new sysctl has been added to control multiple user access.
Mixer labels on virtual channels are now prefixed by vchan.

audiobell.c and audioctl have been updated to reflect these changes.

Use of fdclone was posted to tech-kern@ and improvements made.
Multiuser access control changes and the use of a queue were suggessted by
pgoyette@


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/share/man/man4/audio.4
cvs rdiff -u -r1.301 -r1.302 src/sys/dev/audio.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/audiobell.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/audiovar.h
cvs rdiff -u -r1.35 -r1.36 src/sys/sys/audioio.h
cvs rdiff -u -r1.80 -r1.81 src/sys/sys/file.h
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/audio/ctl/audioctl.1
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/audio/ctl/ctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 18:12:52 UTC 2017

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new file


To generate a diff of this commit:
cvs rdiff -u -r1.1411 -r1.1412 src/doc/3RDPARTY
cvs rdiff -u -r1.2248 -r1.2249 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.1411 src/doc/3RDPARTY:1.1412
--- src/doc/3RDPARTY:1.1411	Wed Feb  8 20:55:41 2017
+++ src/doc/3RDPARTY	Fri Feb 10 13:12:52 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1411 2017/02/09 01:55:41 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1412 2017/02/10 18:12:52 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -426,8 +426,8 @@ Notes:
 Please use "expat" as the vendor tag for CVS imports.
 
 Package:	file
-Version:	5.22
-Current Vers:	5.29
+Version:	5.30
+Current Vers:	5.30
 Maintainer:	Christos Zoulas <chris...@zoulas.com>
 Archive Site:	ftp://ftp.astron.com/pub/file/
 Home Page:	http://www.darwinsys.com/file/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2248 src/doc/CHANGES:1.2249
--- src/doc/CHANGES:1.2248	Fri Feb 10 03:48:06 2017
+++ src/doc/CHANGES	Fri Feb 10 13:12:52 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2248 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2249 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -465,3 +465,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 		[msaitoh 20170208]
 	bind: Import version 9.10.4-P6. [christos 20170208]
 	openldap: Import 2.4.44. [christos 20170208]
+	file(1): Upgraded to 5.30. [christos 20170210]

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 18:12:52 UTC 2017

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new file


To generate a diff of this commit:
cvs rdiff -u -r1.1411 -r1.1412 src/doc/3RDPARTY
cvs rdiff -u -r1.2248 -r1.2249 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 16:46:55 UTC 2017

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
add MKDIRPERM


To generate a diff of this commit:
cvs rdiff -u -r1.1004 -r1.1005 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.1004 src/share/mk/bsd.own.mk:1.1005
--- src/share/mk/bsd.own.mk:1.1004	Fri Feb 10 11:44:55 2017
+++ src/share/mk/bsd.own.mk	Fri Feb 10 11:46:55 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1004 2017/02/10 16:44:55 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.1005 2017/02/10 16:46:55 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -719,6 +719,7 @@ DEBUGOWN?=	root
 DEBUGMODE?=	${NONBINMODE}
 
 MKDIRMODE?=	0755
+MKDIRPERM?=	-m ${MKDIRMODE}
 
 #
 # Data-driven table using make variables to control how

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 16:46:55 UTC 2017

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
add MKDIRPERM


To generate a diff of this commit:
cvs rdiff -u -r1.1004 -r1.1005 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS import: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 17:43:01 UTC 2017

Update of /cvsroot/src/external/bsd/file/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv7355

Log Message:
2017-02-10  12:24  Christos Zoulas 

* release 5.30

2017-02-07  23:27  Christos Zoulas 

* If we exceeded the offset in a search return no match
  (Christoph Biedl)
* Be more lenient on corrupt CDF files (Christoph Biedl)

2017-02-04  16:46  Christos Zoulas 

* pacify ubsan sign extension (oss-fuzz/524)

2017-02-01  12:42  Christos Zoulas 

* off by one in cdf parsing (PR/593)
* report debugging sections in elf (PR/591)

2016-11-06  10:52  Christos Zoulas 

* Allow @@@ in extensions
* Add missing overflow check in der magic (Jonas Wagner)

2016-10-25  10:40  Christos Zoulas 

* release 5.29

2016-10-24  11:20  Christos Zoulas 

* der getlength overflow (Jonas Wagner)
* multiple magic file load failure (Christoph Biedl)

2016-10-17  11:26  Christos Zoulas 

* CDF parsing improvements (Guy Helmer)

2016-07-20   7:26  Christos Zoulas 

* Add support for signed indirect offsets

2016-07-18   7:41  Christos Zoulas 

* cat /dev/null | file - should print empty (Christoph Biedl)

2016-07-05  15:20  Christos Zoulas 

* Bump string size from 64 to 96.

2016-06-13  20:20  Christos Zoulas 

* PR/556: Fix separators on annotations.

2016-06-13  19:40  Christos Zoulas 

* release 5.28
* fix leak on allocation failure

2016-06-01   1:20  Christos Zoulas 

* PR/555: Avoid overflow for offset > nbytes
* PR/550: Segv on DER parsing:
- use the correct variable for length
- set offset to 0 on failure.

2016-05-13  12:00  Christos Zoulas 

* release 5.27

2016-04-18   9:35  Christos Zoulas 

* Errors comparing DER entries or computing offsets
  are just indications of malformed non-DER files.
  Don't print them.
* Offset comparison was off-by-one.
* Fix compression code (Werner Fink)
* Put new bytes constant in the right file (not the generated one)

2016-04-16  18:34  Christos Zoulas 

* release 5.26

2016-03-31  13:50  Christos Zoulas 

* make the number of bytes read from files configurable.

2016-03-21  13:40  Christos Zoulas 

* Add bounds checks for DER code (discovered by Thomas Jarosch)
* Change indirect recursion limit to indirect use count and
  bump from 15 to 50 to prevent abuse.

2016-03-13  20:39  Christos Zoulas 

* Add -00 which prints filename\0description\0

2016-03-01  13:28  Christos Zoulas 

* Fix ID3 indirect parsing

2016-01-19  10:18  Christos Zoulas 

* add DER parsing capability

2015-11-13  10:35  Christos Zoulas 

* provide dprintf(3) for the OS's that don't have it.

2015-11-11  16:25  Christos Zoulas 

* redo the compression code report decompression errors

2015-11-10  23:25  Christos Zoulas 

* REG_STARTEND code is not working as expected, delete it.

2015-11-09  16:05  Christos Zoulas 

* Add zlib support if we have it.

2015-11-05  11:22  Christos Zoulas 

* PR/492: compression forking was broken with magic_buffer.

2015-09-16   9:50  Christos Zoulas 

* release 5.25

2015-09-11  13:25  Christos Zoulas 

* add a limit to the length of regex searches

2015-09-08   9:50  Christos Zoulas 

* fix problems with --parameter (Christoph Biedl)

2015-07-11  10:35  Christos Zoulas 

* Windows fixes PR/466 (Jason Hood)

2015-07-09  10:35  Christos Zoulas 

* release 5.24

2015-06-11   8:52  Christos Zoulas 

* redo long option encoding to fix off-by-one in 5.23

2015-06-10  13:50  Christos Zoulas 

* release 5.23

2015-06-09  16:10  Christos Zoulas 

* Fix issue with regex range for magic with offset
* Always return true from mget with USE (success to mget not match
  indication). Fixes mime evaluation after USE magic
* PR/459: Don't insert magic entries to the list if there are parsing
  errors 

CVS commit: src/distrib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 16:43:59 UTC 2017

Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Makefile.installimage
src/distrib/common: Makefile.bootcd
src/distrib/common/bootimage: Makefile.bootimage Makefile.installimage
Makefile.liveimage
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/ofppc/cdroms/installcd: Makefile
src/distrib/sparc64/cdroms/installcd: Makefile
src/distrib/vax/cdroms/installcd: Makefile

Log Message:
Initial pass to be unaffected by build umask on build artifacts
1. ${MKDIR} -> ${MKDIR} ${MKDIRPERM}
2. ${CP} -> ${INSTALL} ${COPY} -m 


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage \
src/distrib/amd64/uefi-installimage/Makefile.installimage
cvs rdiff -u -r1.35 -r1.36 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.13 -r1.14 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.4 -r1.5 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.3 -r1.4 src/distrib/common/bootimage/Makefile.liveimage
cvs rdiff -u -r1.40 -r1.41 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.4 -r1.5 src/distrib/ofppc/cdroms/installcd/Makefile
cvs rdiff -u -r1.27 -r1.28 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.15 -r1.16 src/distrib/vax/cdroms/installcd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.21 src/distrib/amd64/cdroms/Makefile.cdrom:1.22
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.21	Tue Jan 24 06:27:55 2017
+++ src/distrib/amd64/cdroms/Makefile.cdrom	Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.21 2017/01/24 11:27:55 nonaka Exp $
+# $NetBSD: Makefile.cdrom,v 1.22 2017/02/10 16:43:59 christos Exp $
 
 .include 
 .include 
@@ -22,8 +22,8 @@ CD_SETS+=	modules
 ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx64.efi ${DESTDIR}/usr/mdec/bootia32.efi
 	${RM} -f ${EFIBOOTIMG}
 	${RM} -rf efiboot/EFI/boot
-	${MKDIR} efiboot/EFI/boot
-	${CP} ${.ALLSRC} efiboot/EFI/boot/
+	${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
+	${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
 	${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} \
 		-t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
 
@@ -33,6 +33,6 @@ image_md_pre: ${EFIBOOTIMG}
 	${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
 	${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
 	${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
-	${MKDIR} cdrom/mnt2 cdrom/targetroot
+	${MKDIR} ${MKDIRPERM} cdrom/mnt2 cdrom/targetroot
 	${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
-	${MKDIR} cdrom/var
+	${MKDIR} ${MKDIRPERM} cdrom/var

Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.1 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.2
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.1	Tue Jan 24 06:16:50 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage	Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootimage,v 1.1 2017/01/24 11:16:50 nonaka Exp $
+#	$NetBSD: Makefile.bootimage,v 1.2 2017/02/10 16:43:59 christos Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -149,7 +149,6 @@ TIMESTAMP=-T ${NETBSDSRCDIR}/sys/sys/par
 # should be defined elsewhere? 
 CAT?=		cat
 CHMOD?=		chmod
-CP?=		cp
 DD?=		dd
 MKDIR?=		mkdir -p
 RM?=		rm
@@ -254,7 +253,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
 		echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \
 		false; 			\
 	fi;
-	@${MKDIR} ${WORKDIR}
+	@${MKDIR} ${MKDIRPERM} ${WORKDIR}
 .for set in ${IMG_SETS}
 	@if [ ! -f ${SETS_DIR}/${set}.tgz ]; then 			\
 		echo "Missing ${SETS_DIR}/${set}.tgz, aborting";	\
@@ -265,7 +264,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
 .endfor
 .if defined(SECONDARY_BOOT)
 	@echo Copying secondary boot...
-	${CP} -f ${WORKDIR}/usr/mdec/${SECONDARY_BOOT} ${WORKDIR}
+	${INSTALL} ${COPY} -m 0444 ${WORKDIR}/usr/mdec/${SECONDARY_BOOT} ${WORKDIR}
 .endif
 	@echo Preparing /etc/fstab ...
 .if ${USE_GPT} != "no"
@@ -290,11 +289,11 @@ ${TARGETFS}: prepare_md_post pre-targetf
 	< ${FSTAB_IN} > ${WORKFSTAB}
 .endif
 .endif	# USE_GPT != "no"
-	${CP} ${WORKFSTAB} ${WORKDIR}/etc/fstab
+	${INSTALL} ${COPY} -m 0644 ${WORKFSTAB} ${WORKDIR}/etc/fstab
 	@echo Setting rc_configured=YES in /etc/rc.conf ...
 	${TOOL_SED} "s/rc_configured=NO/rc_configured=YES/"		\
 	< ${WORKDIR}/etc/rc.conf > ${WORKRCCONF}
-	${CP} ${WORKRCCONF} ${WORKDIR}/etc/rc.conf
+	${INSTALL} ${COPY} -m 0644 ${WORKRCCONF} 

CVS commit: src/distrib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 16:43:59 UTC 2017

Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Makefile.installimage
src/distrib/common: Makefile.bootcd
src/distrib/common/bootimage: Makefile.bootimage Makefile.installimage
Makefile.liveimage
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/ofppc/cdroms/installcd: Makefile
src/distrib/sparc64/cdroms/installcd: Makefile
src/distrib/vax/cdroms/installcd: Makefile

Log Message:
Initial pass to be unaffected by build umask on build artifacts
1. ${MKDIR} -> ${MKDIR} ${MKDIRPERM}
2. ${CP} -> ${INSTALL} ${COPY} -m 


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage \
src/distrib/amd64/uefi-installimage/Makefile.installimage
cvs rdiff -u -r1.35 -r1.36 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.13 -r1.14 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.4 -r1.5 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.3 -r1.4 src/distrib/common/bootimage/Makefile.liveimage
cvs rdiff -u -r1.40 -r1.41 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.4 -r1.5 src/distrib/ofppc/cdroms/installcd/Makefile
cvs rdiff -u -r1.27 -r1.28 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.15 -r1.16 src/distrib/vax/cdroms/installcd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 17:53:25 UTC 2017

Modified Files:
src/external/bsd/file/dist: ChangeLog Makefile.in aclocal.m4 compile
config.guess config.h.in config.sub configure configure.ac depcomp
missing
src/external/bsd/file/dist/doc: Makefile.in file.1 libmagic.3 magic.5
src/external/bsd/file/dist/magic: Makefile.am Makefile.in
src/external/bsd/file/dist/magic/magdir: apple archive elf filesystems
jpeg netbsd pgp
src/external/bsd/file/dist/python: Makefile.in
src/external/bsd/file/dist/src: Makefile.in apprentice.c cdf.c
compress.c encoding.c file.c file.h fsmagic.c funcs.c magic.c
print.c readcdf.c readelf.c softmagic.c
src/external/bsd/file/dist/tests: Makefile.in
src/external/bsd/file/include: config.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/ChangeLog
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/Makefile.in
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/aclocal.m4
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/compile \
src/external/bsd/file/dist/config.sub
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/config.guess
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/config.h.in
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/configure
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/configure.ac
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/depcomp
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/missing
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/doc/Makefile.in
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/doc/file.1
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/doc/libmagic.3 \
src/external/bsd/file/dist/doc/magic.5
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/magic/Makefile.am
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/magic/magdir/apple
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/magic/magdir/archive \
src/external/bsd/file/dist/magic/magdir/filesystems
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/magic/magdir/elf
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/magic/magdir/jpeg \
src/external/bsd/file/dist/magic/magdir/netbsd
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/magic/magdir/pgp
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/python/Makefile.in
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/src/Makefile.in \
src/external/bsd/file/dist/src/readcdf.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/src/apprentice.c \
src/external/bsd/file/dist/src/file.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/src/cdf.c \
src/external/bsd/file/dist/src/fsmagic.c \
src/external/bsd/file/dist/src/readelf.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/src/compress.c \
src/external/bsd/file/dist/src/funcs.c \
src/external/bsd/file/dist/src/magic.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/encoding.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/src/file.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/src/print.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/src/softmagic.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/tests/Makefile.in
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 18:11:18 UTC 2017

Modified Files:
src/external/bsd/file/dist/src: der.c
src/external/bsd/file/lib: Makefile shlib_version

Log Message:
fix der.c bump shared library


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/src/der.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/lib/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/file

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 18:11:18 UTC 2017

Modified Files:
src/external/bsd/file/dist/src: der.c
src/external/bsd/file/lib: Makefile shlib_version

Log Message:
fix der.c bump shared library


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/src/der.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/lib/shlib_version

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/file/dist/src/der.c
diff -u src/external/bsd/file/dist/src/der.c:1.1.1.1 src/external/bsd/file/dist/src/der.c:1.2
--- src/external/bsd/file/dist/src/der.c:1.1.1.1	Fri Feb 10 12:42:57 2017
+++ src/external/bsd/file/dist/src/der.c	Fri Feb 10 13:11:17 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: der.c,v 1.1.1.1 2017/02/10 17:42:57 christos Exp $	*/
+/*	$NetBSD: der.c,v 1.2 2017/02/10 18:11:17 christos Exp $	*/
 
 /*-
  * Copyright (c) 2016 Christos Zoulas
@@ -40,7 +40,7 @@
 #if 0
 FILE_RCSID("@(#)$File: der.c,v 1.11 2016/11/07 15:51:23 christos Exp $")
 #else
-__RCSID("$NetBSD: der.c,v 1.1.1.1 2017/02/10 17:42:57 christos Exp $");
+__RCSID("$NetBSD: der.c,v 1.2 2017/02/10 18:11:17 christos Exp $");
 #endif
 #endif
 #endif
@@ -207,7 +207,7 @@ getlength(const uint8_t *c, size_t *p, s
 
 	if (*p + len >= l)
 		return DER_BAD;
-	return len;
+	return CAST(uint32_t, len);
 }
 
 static const char *
@@ -266,12 +266,12 @@ der_offs(struct magic_set *ms, struct ma
 #endif
 	if (m->cont_level != 0) {
 		if (offs + tlen > nbytes)
-			return DER_BAD;
-		ms->c.li[m->cont_level - 1].off = offs + tlen;
+			return -1;
+		ms->c.li[m->cont_level - 1].off = CAST(int, offs + tlen);
 		DPRINTF(("cont_level[%u] = %u\n", m->cont_level - 1,
 		ms->c.li[m->cont_level - 1].off));
 	}
-	return offs;
+	return CAST(int32_t, offs);
 }
 
 int

Index: src/external/bsd/file/lib/Makefile
diff -u src/external/bsd/file/lib/Makefile:1.7 src/external/bsd/file/lib/Makefile:1.8
--- src/external/bsd/file/lib/Makefile:1.7	Tue Jan 10 08:51:36 2017
+++ src/external/bsd/file/lib/Makefile	Fri Feb 10 13:11:18 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2017/01/10 13:51:36 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2017/02/10 18:11:18 christos Exp $
 #
 
 USE_FORT?= yes	# data driven bugs?
@@ -19,7 +19,7 @@ CPPFLAGS+=-I.
 
 SRCS=		magic.c apprentice.c softmagic.c ascmagic.c compress.c	\
 		is_tar.c readelf.c print.c fsmagic.c apptype.c funcs.c \
-		cdf.c readcdf.c cdf_time.c encoding.c
+		cdf.c readcdf.c cdf_time.c encoding.c der.c
 MAN=		libmagic.3
 MLINKS+=	libmagic.3 magic_open.3 \
 		libmagic.3 magic_close.3 \

Index: src/external/bsd/file/lib/shlib_version
diff -u src/external/bsd/file/lib/shlib_version:1.5 src/external/bsd/file/lib/shlib_version:1.6
--- src/external/bsd/file/lib/shlib_version:1.5	Fri Jan  2 16:15:32 2015
+++ src/external/bsd/file/lib/shlib_version	Fri Feb 10 13:11:18 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.5 2015/01/02 21:15:32 christos Exp $
+#	$NetBSD: shlib_version,v 1.6 2017/02/10 18:11:18 christos Exp $
 #
 major=5
-minor=1
+minor=2

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 16:44:55 UTC 2017

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Add MKDIRMODE


To generate a diff of this commit:
cvs rdiff -u -r1.1003 -r1.1004 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.1003 src/share/mk/bsd.own.mk:1.1004
--- src/share/mk/bsd.own.mk:1.1003	Tue Jan 17 21:33:25 2017
+++ src/share/mk/bsd.own.mk	Fri Feb 10 11:44:55 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1003 2017/01/18 02:33:25 matt Exp $
+#	$NetBSD: bsd.own.mk,v 1.1004 2017/02/10 16:44:55 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -718,6 +718,8 @@ DEBUGGRP?=	wheel
 DEBUGOWN?=	root
 DEBUGMODE?=	${NONBINMODE}
 
+MKDIRMODE?=	0755
+
 #
 # Data-driven table using make variables to control how
 # toolchain-dependent targets and shared libraries are built

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 16:44:55 UTC 2017

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Add MKDIRMODE


To generate a diff of this commit:
cvs rdiff -u -r1.1003 -r1.1004 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 18:11:56 UTC 2017

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
bump libmagic


To generate a diff of this commit:
cvs rdiff -u -r1.801 -r1.802 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.161 -r1.162 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.801 src/distrib/sets/lists/base/shl.mi:1.802
--- src/distrib/sets/lists/base/shl.mi:1.801	Wed Feb  8 15:26:26 2017
+++ src/distrib/sets/lists/base/shl.mi	Fri Feb 10 13:11:56 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.801 2017/02/08 20:26:26 maya Exp $
+# $NetBSD: shl.mi,v 1.802 2017/02/10 18:11:56 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -390,7 +390,7 @@
 ./usr/lib/libm.so.0.11base-sys-shlib		compatfile
 ./usr/lib/libmagic.sobase-sys-shlib		compatfile
 ./usr/lib/libmagic.so.5base-sys-shlib		compatfile
-./usr/lib/libmagic.so.5.1			base-sys-shlib		compatfile
+./usr/lib/libmagic.so.5.2			base-sys-shlib		compatfile
 ./usr/lib/libmenu.sobase-sys-shlib		compatfile
 ./usr/lib/libmenu.so.6base-sys-shlib		compatfile
 ./usr/lib/libmenu.so.6.0			base-sys-shlib		compatfile

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.161 src/distrib/sets/lists/debug/shl.mi:1.162
--- src/distrib/sets/lists/debug/shl.mi:1.161	Wed Feb  8 18:08:27 2017
+++ src/distrib/sets/lists/debug/shl.mi	Fri Feb 10 13:11:56 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.161 2017/02/08 23:08:27 rin Exp $
+# $NetBSD: shl.mi,v 1.162 2017/02/10 18:11:56 christos Exp $
 ./usr/lib/libbfd_g.a		comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
@@ -135,7 +135,7 @@
 ./usr/libdata/debug/usr/lib/liblzf.so.1.0.debug			comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/liblzma.so.2.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libm.so.0.11.debug			comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libmagic.so.5.1.debug		comp-sys-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libmagic.so.5.2.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libmenu.so.6.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libmj.so.1.0.debug			comp-crypto-debug	debug,compatfile,crypto
 ./usr/libdata/debug/usr/lib/libmpc.so.2.0.debug			comp-obsolete	debug,compatfile,obsolete

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 18:11:56 UTC 2017

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
bump libmagic


To generate a diff of this commit:
cvs rdiff -u -r1.801 -r1.802 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.161 -r1.162 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.

CVS commit: src/distrib/amd64

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 16:53:51 UTC 2017

Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/uefi-installimage: Makefile.bootimage

Log Message:
MKREPRO_TIMESTAMP fixes for efiboot


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.2 -r1.3 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.22 src/distrib/amd64/cdroms/Makefile.cdrom:1.23
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.22	Fri Feb 10 11:43:59 2017
+++ src/distrib/amd64/cdroms/Makefile.cdrom	Fri Feb 10 11:53:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.22 2017/02/10 16:43:59 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.23 2017/02/10 16:53:51 christos Exp $
 
 .include 
 .include 
@@ -7,6 +7,9 @@ SYSINSTDIR!= cd ${.CURDIR}/../../../../u
 
 EFIBOOTIMG=	efiboot.img
 CLEANFILES+=	${EFIBOOTIMG}
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+.endif
 
 # Need multidot for the boot loader to read kernel modules as it doesn't
 # understand rockridge.
@@ -24,7 +27,7 @@ ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx
 	${RM} -rf efiboot/EFI/boot
 	${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
 	${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
-	${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} \
+	${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
 		-t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
 
 image_md_pre: ${EFIBOOTIMG}

Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.2 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.3
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.2	Fri Feb 10 11:43:59 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage	Fri Feb 10 11:53:51 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootimage,v 1.2 2017/02/10 16:43:59 christos Exp $
+#	$NetBSD: Makefile.bootimage,v 1.3 2017/02/10 16:53:51 christos Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -136,8 +136,8 @@
 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
-.if ${MKREPRO:Uno} == "yes"
-TIMESTAMP=-T ${NETBSDSRCDIR}/sys/sys/param.h
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
 .endif
 
 .if empty(IMGBASE)
@@ -341,7 +341,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
 	${TOOL_MAKEFS} -M ${FSSIZE} -m ${FSSIZE}			\
 	-B ${TARGET_ENDIANNESS}	\
 	-F ${WORKSPEC} -N ${WORKDIR}/etc\
-	${TIMESTAMP}		\
+	${MAKEFS_TIMESTAMP}		\
 	${IMGMAKEFSOPTIONS}		\
 	${WORKFS} ${WORKDIR}
 .if !empty(PRIMARY_BOOT) && ${INSTALLBOOT_AFTER_DISKLABEL} == "no"
@@ -414,7 +414,7 @@ ${IMGBASE}.img:	${TARGETFS}
 	${RM} -f ${WORKEFI}
 	${TOOL_MAKEFS} -M ${EFIMB}m -m ${EFIMB}m			\
 	-B ${TARGET_ENDIANNESS}	\
-	${TIMESTAMP}		\
+	${MAKEFS_TIMESTAMP}		\
 	-t msdos -o F=32,c=1	\
 	${WORKEFI} ${EFIWORKDIR}
 	@echo create GPT image...

CVS commit: src/distrib/amd64

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 16:53:51 UTC 2017

Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/uefi-installimage: Makefile.bootimage

Log Message:
MKREPRO_TIMESTAMP fixes for efiboot


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.2 -r1.3 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS import: src/external/bsd/file/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 17:43:01 UTC 2017

Update of /cvsroot/src/external/bsd/file/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv7355

Log Message:
2017-02-10  12:24  Christos Zoulas 

* release 5.30

2017-02-07  23:27  Christos Zoulas 

* If we exceeded the offset in a search return no match
  (Christoph Biedl)
* Be more lenient on corrupt CDF files (Christoph Biedl)

2017-02-04  16:46  Christos Zoulas 

* pacify ubsan sign extension (oss-fuzz/524)

2017-02-01  12:42  Christos Zoulas 

* off by one in cdf parsing (PR/593)
* report debugging sections in elf (PR/591)

2016-11-06  10:52  Christos Zoulas 

* Allow @@@ in extensions
* Add missing overflow check in der magic (Jonas Wagner)

2016-10-25  10:40  Christos Zoulas 

* release 5.29

2016-10-24  11:20  Christos Zoulas 

* der getlength overflow (Jonas Wagner)
* multiple magic file load failure (Christoph Biedl)

2016-10-17  11:26  Christos Zoulas 

* CDF parsing improvements (Guy Helmer)

2016-07-20   7:26  Christos Zoulas 

* Add support for signed indirect offsets

2016-07-18   7:41  Christos Zoulas 

* cat /dev/null | file - should print empty (Christoph Biedl)

2016-07-05  15:20  Christos Zoulas 

* Bump string size from 64 to 96.

2016-06-13  20:20  Christos Zoulas 

* PR/556: Fix separators on annotations.

2016-06-13  19:40  Christos Zoulas 

* release 5.28
* fix leak on allocation failure

2016-06-01   1:20  Christos Zoulas 

* PR/555: Avoid overflow for offset > nbytes
* PR/550: Segv on DER parsing:
- use the correct variable for length
- set offset to 0 on failure.

2016-05-13  12:00  Christos Zoulas 

* release 5.27

2016-04-18   9:35  Christos Zoulas 

* Errors comparing DER entries or computing offsets
  are just indications of malformed non-DER files.
  Don't print them.
* Offset comparison was off-by-one.
* Fix compression code (Werner Fink)
* Put new bytes constant in the right file (not the generated one)

2016-04-16  18:34  Christos Zoulas 

* release 5.26

2016-03-31  13:50  Christos Zoulas 

* make the number of bytes read from files configurable.

2016-03-21  13:40  Christos Zoulas 

* Add bounds checks for DER code (discovered by Thomas Jarosch)
* Change indirect recursion limit to indirect use count and
  bump from 15 to 50 to prevent abuse.

2016-03-13  20:39  Christos Zoulas 

* Add -00 which prints filename\0description\0

2016-03-01  13:28  Christos Zoulas 

* Fix ID3 indirect parsing

2016-01-19  10:18  Christos Zoulas 

* add DER parsing capability

2015-11-13  10:35  Christos Zoulas 

* provide dprintf(3) for the OS's that don't have it.

2015-11-11  16:25  Christos Zoulas 

* redo the compression code report decompression errors

2015-11-10  23:25  Christos Zoulas 

* REG_STARTEND code is not working as expected, delete it.

2015-11-09  16:05  Christos Zoulas 

* Add zlib support if we have it.

2015-11-05  11:22  Christos Zoulas 

* PR/492: compression forking was broken with magic_buffer.

2015-09-16   9:50  Christos Zoulas 

* release 5.25

2015-09-11  13:25  Christos Zoulas 

* add a limit to the length of regex searches

2015-09-08   9:50  Christos Zoulas 

* fix problems with --parameter (Christoph Biedl)

2015-07-11  10:35  Christos Zoulas 

* Windows fixes PR/466 (Jason Hood)

2015-07-09  10:35  Christos Zoulas 

* release 5.24

2015-06-11   8:52  Christos Zoulas 

* redo long option encoding to fix off-by-one in 5.23

2015-06-10  13:50  Christos Zoulas 

* release 5.23

2015-06-09  16:10  Christos Zoulas 

* Fix issue with regex range for magic with offset
* Always return true from mget with USE (success to mget not match
  indication). Fixes mime evaluation after USE magic
* PR/459: Don't insert magic entries to the list if there are parsing
  errors 

CVS commit: src/external/bsd/file/dist/src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 18:06:59 UTC 2017

Modified Files:
src/external/bsd/file/dist/src: apprentice.c cdf.c compress.c print.c
readelf.c softmagic.c

Log Message:
pacify lint.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/src/apprentice.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/src/cdf.c \
src/external/bsd/file/dist/src/readelf.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/src/compress.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/print.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/src/softmagic.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/file/dist/src/apprentice.c
diff -u src/external/bsd/file/dist/src/apprentice.c:1.15 src/external/bsd/file/dist/src/apprentice.c:1.16
--- src/external/bsd/file/dist/src/apprentice.c:1.15	Fri Feb 10 12:53:24 2017
+++ src/external/bsd/file/dist/src/apprentice.c	Fri Feb 10 13:06:59 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: apprentice.c,v 1.15 2017/02/10 17:53:24 christos Exp $	*/
+/*	$NetBSD: apprentice.c,v 1.16 2017/02/10 18:06:59 christos Exp $	*/
 
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
@@ -37,7 +37,7 @@
 #if 0
 FILE_RCSID("@(#)$File: apprentice.c,v 1.257 2017/02/04 16:46:16 christos Exp $")
 #else
-__RCSID("$NetBSD: apprentice.c,v 1.15 2017/02/10 17:53:24 christos Exp $");
+__RCSID("$NetBSD: apprentice.c,v 1.16 2017/02/10 18:06:59 christos Exp $");
 #endif
 #endif	/* lint */
 
@@ -555,8 +555,10 @@ apprentice_unmap(struct magic_map *map)
 		break;
 	case MAP_TYPE_MALLOC:
 		for (i = 0; i < MAGIC_SETS; i++) {
-			if ((char *)map->magic[i] >= (char *)map->p &&
-			(char *)map->magic[i] <= (char *)map->p + map->len)
+			void *b = map->magic[i];
+			void *p = map->p;
+			if (CAST(char *, b) >= CAST(char *, p) &&
+			CAST(char *, b) <= CAST(char *, p) + map->len)
 continue;
 			free(map->magic[i]);
 		}

Index: src/external/bsd/file/dist/src/cdf.c
diff -u src/external/bsd/file/dist/src/cdf.c:1.12 src/external/bsd/file/dist/src/cdf.c:1.13
--- src/external/bsd/file/dist/src/cdf.c:1.12	Fri Feb 10 12:53:24 2017
+++ src/external/bsd/file/dist/src/cdf.c	Fri Feb 10 13:06:59 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cdf.c,v 1.12 2017/02/10 17:53:24 christos Exp $	*/
+/*	$NetBSD: cdf.c,v 1.13 2017/02/10 18:06:59 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 Christos Zoulas
@@ -40,7 +40,7 @@
 #if 0
 FILE_RCSID("@(#)$File: cdf.c,v 1.88 2017/02/07 23:21:29 christos Exp $")
 #else
-__RCSID("$NetBSD: cdf.c,v 1.12 2017/02/10 17:53:24 christos Exp $");
+__RCSID("$NetBSD: cdf.c,v 1.13 2017/02/10 18:06:59 christos Exp $");
 #endif
 #endif
 
@@ -817,7 +817,7 @@ cdf_find_stream(const cdf_dir_t *dir, co
 		== 0)
 			break;
 	if (i > 0)
-		return i;
+		return CAST(int, i);
 
 	DPRINTF(("Cannot find type %d `%s'\n", type, name));
 	errno = ESRCH;
@@ -1074,7 +1074,7 @@ cdf_unpack_catalog(const cdf_header_t *h
 {
 	size_t ss = cdf_check_stream(sst, h);
 	const char *b = CAST(const char *, sst->sst_tab);
-	const char *eb = b + ss * sst->sst_len;
+	const char *nb, *eb = b + ss * sst->sst_len;
 	size_t nr, i, j, k;
 	cdf_catalog_entry_t *ce;
 	uint16_t reclen;
@@ -1119,7 +1119,9 @@ cdf_unpack_catalog(const cdf_header_t *h
 			cep->ce_namlen = rlen;
 
 		np = CAST(const uint16_t *, CAST(const void *, (b + 16)));
-		if (RCAST(const char *, np + cep->ce_namlen) > eb) {
+		nb = CAST(const char *, CAST(const void *,
+		(np + cep->ce_namlen)));
+		if (nb > eb) {
 			cep->ce_namlen = 0;
 			break;
 		}
Index: src/external/bsd/file/dist/src/readelf.c
diff -u src/external/bsd/file/dist/src/readelf.c:1.12 src/external/bsd/file/dist/src/readelf.c:1.13
--- src/external/bsd/file/dist/src/readelf.c:1.12	Fri Feb 10 12:53:24 2017
+++ src/external/bsd/file/dist/src/readelf.c	Fri Feb 10 13:06:59 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: readelf.c,v 1.12 2017/02/10 17:53:24 christos Exp $	*/
+/*	$NetBSD: readelf.c,v 1.13 2017/02/10 18:06:59 christos Exp $	*/
 
 /*
  * Copyright (c) Christos Zoulas 2003.
@@ -32,7 +32,7 @@
 #if 0
 FILE_RCSID("@(#)$File: readelf.c,v 1.130 2017/01/29 19:34:24 christos Exp $")
 #else
-__RCSID("$NetBSD: readelf.c,v 1.12 2017/02/10 17:53:24 christos Exp $");
+__RCSID("$NetBSD: readelf.c,v 1.13 2017/02/10 18:06:59 christos Exp $");
 #endif
 #endif
 
@@ -896,7 +896,7 @@ get_string_on_virtaddr(struct magic_set 
 
 	offset = get_offset_from_virtaddr(ms, swap, clazz, fd, ph_off, ph_num,
 	fsize, virtaddr);
-	if ((buflen = pread(fd, buf, buflen, offset)) <= 0) {
+	if ((buflen = pread(fd, buf, CAST(size_t, buflen), offset)) <= 0) {
 		file_badread(ms);
 		return 0;
 	}

Index: src/external/bsd/file/dist/src/compress.c
diff -u src/external/bsd/file/dist/src/compress.c:1.11 src/external/bsd/file/dist/src/compress.c:1.12
--- src/external/bsd/file/dist/src/compress.c:1.11	Fri Feb 10 12:53:24 2017
+++ 

CVS commit: src/external/bsd/file/dist/src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 18:06:59 UTC 2017

Modified Files:
src/external/bsd/file/dist/src: apprentice.c cdf.c compress.c print.c
readelf.c softmagic.c

Log Message:
pacify lint.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/src/apprentice.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/src/cdf.c \
src/external/bsd/file/dist/src/readelf.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/src/compress.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/print.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/src/softmagic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/net

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 20:56:21 UTC 2017

Modified Files:
src/sys/net: if.c

Log Message:
make attach and detach locking symmetric (detaching cloners failed)


To generate a diff of this commit:
cvs rdiff -u -r1.376 -r1.377 src/sys/net/if.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/net/if.c
diff -u src/sys/net/if.c:1.376 src/sys/net/if.c:1.377
--- src/sys/net/if.c:1.376	Thu Feb  9 04:30:26 2017
+++ src/sys/net/if.c	Fri Feb 10 15:56:21 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.376 2017/02/09 09:30:26 ozaki-r Exp $	*/
+/*	$NetBSD: if.c,v 1.377 2017/02/10 20:56:21 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.376 2017/02/09 09:30:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.377 2017/02/10 20:56:21 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1653,9 +1653,10 @@ void
 if_clone_detach(struct if_clone *ifc)
 {
 
-	KASSERT(mutex_owned(_clone_mtx));
+	mutex_enter(_clone_mtx);
 	LIST_REMOVE(ifc, ifc_list);
 	if_cloners_count--;
+	mutex_exit(_clone_mtx);
 }
 
 /*

CVS commit: src/sys/net

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 20:56:21 UTC 2017

Modified Files:
src/sys/net: if.c

Log Message:
make attach and detach locking symmetric (detaching cloners failed)


To generate a diff of this commit:
cvs rdiff -u -r1.376 -r1.377 src/sys/net/if.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Fri Feb 10 21:03:15 UTC 2017

Modified Files:
src/sys/dev: audiobell.c

Log Message:
Committed a temporary copy with extra lines of code not needed. Opps...


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/audiobell.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Fri Feb 10 21:03:15 UTC 2017

Modified Files:
src/sys/dev: audiobell.c

Log Message:
Committed a temporary copy with extra lines of code not needed. Opps...


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/audiobell.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/audiobell.c
diff -u src/sys/dev/audiobell.c:1.13 src/sys/dev/audiobell.c:1.14
--- src/sys/dev/audiobell.c:1.13	Fri Feb 10 19:31:42 2017
+++ src/sys/dev/audiobell.c	Fri Feb 10 21:03:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audiobell.c,v 1.13 2017/02/10 19:31:42 nat Exp $	*/
+/*	$NetBSD: audiobell.c,v 1.14 2017/02/10 21:03:15 nat Exp $	*/
 
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.13 2017/02/10 19:31:42 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.14 2017/02/10 21:03:15 nat Exp $");
 
 #include 
 #include 
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: audiobell.c,
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -159,9 +158,6 @@ audiobell(void *v, u_int pitch, u_int pe
 	/* If not configured, we can't beep. */
 	if (audiobellopen(audio, FWRITE, 0, NULL, ) != EMOVEFD || fp == NULL)
 		return;
-	mutex_enter(>f_lock);
-	fp->f_count++;
-	mutex_exit(>f_lock);
 
 	if (audioioctl(fp, AUDIO_GETINFO, ) != 0) {
 		audioclose(fp);

CVS commit: src/sys/arch/arm/xscale

[Tobias Nygren]

Module Name:src
Committed By:   tnn
Date:   Fri Feb 10 23:11:30 UTC 2017

Modified Files:
src/sys/arch/arm/xscale: ixp425-fw.README

Log Message:
remove misleading comment about version 3.0 microcode

The last known microcode to work is 2.4. Version 3.0 changes
the header signature and fails with "block too big for NPE memory".
Provide a backup download URL since intel removed version < 3.0.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xscale/ixp425-fw.README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/sparc64

[Palle Lyckegaard]

Module Name:src
Committed By:   palle
Date:   Fri Feb 10 23:26:23 UTC 2017

Modified Files:
src/sys/arch/sparc64/include: cpu.h hypervisor.h
src/sys/arch/sparc64/sparc64: cpu.c genassym.cf locore.s pmap.c trap.c

Log Message:
sun4v: Added handling of trap type 0x034 (address alignment error) + fixed typo 
mmfsa -> mmufsa. Verified for both sun4u and sun4v using qemu.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/include/hypervisor.h
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/sparc64/sparc64/genassym.cf
cvs rdiff -u -r1.407 -r1.408 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.306 -r1.307 src/sys/arch/sparc64/sparc64/pmap.c
cvs rdiff -u -r1.184 -r1.185 src/sys/arch/sparc64/sparc64/trap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/sparc64

[Palle Lyckegaard]

Module Name:src
Committed By:   palle
Date:   Fri Feb 10 23:26:23 UTC 2017

Modified Files:
src/sys/arch/sparc64/include: cpu.h hypervisor.h
src/sys/arch/sparc64/sparc64: cpu.c genassym.cf locore.s pmap.c trap.c

Log Message:
sun4v: Added handling of trap type 0x034 (address alignment error) + fixed typo 
mmfsa -> mmufsa. Verified for both sun4u and sun4v using qemu.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/include/hypervisor.h
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/sparc64/sparc64/genassym.cf
cvs rdiff -u -r1.407 -r1.408 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.306 -r1.307 src/sys/arch/sparc64/sparc64/pmap.c
cvs rdiff -u -r1.184 -r1.185 src/sys/arch/sparc64/sparc64/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/arch/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.122 src/sys/arch/sparc64/include/cpu.h:1.123
--- src/sys/arch/sparc64/include/cpu.h:1.122	Sat Jun 25 13:52:04 2016
+++ src/sys/arch/sparc64/include/cpu.h	Fri Feb 10 23:26:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.122 2016/06/25 13:52:04 palle Exp $ */
+/*	$NetBSD: cpu.h,v 1.123 2017/02/10 23:26:23 palle Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -185,7 +185,7 @@ struct cpu_info {
 	 * Will be initialized to the physical address of the bottom of
 	 * the interrupt stack.
 	 */
-	paddr_t			ci_mmfsa;
+	paddr_t			ci_mmufsa;
 
 	/*
 	 * sun4v mondo control fields

Index: src/sys/arch/sparc64/include/hypervisor.h
diff -u src/sys/arch/sparc64/include/hypervisor.h:1.5 src/sys/arch/sparc64/include/hypervisor.h:1.6
--- src/sys/arch/sparc64/include/hypervisor.h:1.5	Wed Sep 24 18:32:10 2014
+++ src/sys/arch/sparc64/include/hypervisor.h	Fri Feb 10 23:26:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: hypervisor.h,v 1.5 2014/09/24 18:32:10 palle Exp $ */
+/*	$NetBSD: hypervisor.h,v 1.6 2017/02/10 23:26:23 palle Exp $ */
 /*	$OpenBSD: hypervisor.h,v 1.14 2011/06/26 17:23:46 kettenis Exp $	*/
 
 /*
@@ -92,6 +92,17 @@ struct tsb_desc {
 	uint64_t	td_reserved;
 };
 
+struct mmufsa {
+	uint64_t	ift; /* instruction fault type */
+	uint64_t	ifa; /* instruction fault address */
+	uint64_t	ifc; /* instruction fault context */
+	uint64_t	reserved1[5]; /* reserved */
+	uint64_t	dft; /* data fault type */
+	uint64_t	dfa; /* data fault address */
+	uint64_t	dfc; /* data fault context */
+	uint64_t	reserved2[5]; /* reserved */
+};
+
 int64_t	hv_mmu_tsb_ctx0(uint64_t ntsb, paddr_t tsbptr);
 int64_t	hv_mmu_tsb_ctxnon0(uint64_t ntsb, paddr_t tsbptr);
 #endif

Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.129 src/sys/arch/sparc64/sparc64/cpu.c:1.130
--- src/sys/arch/sparc64/sparc64/cpu.c:1.129	Wed Dec 28 19:16:25 2016
+++ src/sys/arch/sparc64/sparc64/cpu.c	Fri Feb 10 23:26:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.129 2016/12/28 19:16:25 martin Exp $ */
+/*	$NetBSD: cpu.c,v 1.130 2017/02/10 23:26:23 palle Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.129 2016/12/28 19:16:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.130 2017/02/10 23:26:23 palle Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -355,7 +355,7 @@ alloc_cpuinfo(u_int cpu_node)
 	cpi->ci_paddr = pa0;
 	cpi->ci_self = cpi;
 	if (CPU_ISSUN4V)
-		cpi->ci_mmfsa = pa0;
+		cpi->ci_mmufsa = pa0;
 	cpi->ci_node = cpu_node;
 	cpi->ci_idepth = -1;
 	memset(cpi->ci_intrpending, -1, sizeof(cpi->ci_intrpending));

Index: src/sys/arch/sparc64/sparc64/genassym.cf
diff -u src/sys/arch/sparc64/sparc64/genassym.cf:1.80 src/sys/arch/sparc64/sparc64/genassym.cf:1.81
--- src/sys/arch/sparc64/sparc64/genassym.cf:1.80	Fri Jan 27 21:35:38 2017
+++ src/sys/arch/sparc64/sparc64/genassym.cf	Fri Feb 10 23:26:23 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.80 2017/01/27 21:35:38 palle Exp $
+#	$NetBSD: genassym.cf,v 1.81 2017/02/10 23:26:23 palle Exp $
 
 #
 # Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -181,7 +181,7 @@ define	CI_TICK_IH	offsetof(struct cpu_in
 define	CI_CTXBUSY	offsetof(struct cpu_info, ci_ctxbusy)
 define	CI_TSB_DMMU	offsetof(struct cpu_info, ci_tsb_dmmu)
 define	CI_TSB_IMMU	offsetof(struct cpu_info, ci_tsb_immu)
-define	CI_MMFSA	offsetof(struct cpu_info, ci_mmfsa)
+define	CI_MMUFSA	offsetof(struct cpu_info, ci_mmufsa)
 define	CI_TSB_DESC	offsetof(struct cpu_info, ci_tsb_desc)
 define	CI_CPUMQ	offsetof(struct cpu_info, ci_cpumq)
 define	CI_DEVMQ	offsetof(struct cpu_info, ci_devmq)

Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.407 src/sys/arch/sparc64/sparc64/locore.s:1.408
--- src/sys/arch/sparc64/sparc64/locore.s:1.407	Mon Jan 30 21:24:33 2017
+++ src/sys/arch/sparc64/sparc64/locore.s	Fri Feb 10 23:26:23 2017
@@ 

CVS commit: src/distrib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb 11 03:07:06 UTC 2017

Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
src/distrib/cdrom: Makefile
src/distrib/common: Makefile.bootcd Makefile.image Makefile.tarfloppy
buildfloppies.sh
src/distrib/common/bootimage: Makefile.bootimage
src/distrib/evbarm/instkernel/sshramdisk: Makefile
src/distrib/vax/floppy: Makefile
src/distrib/x68k/stand: Makefile

Log Message:
more MKREPRO_TIMESTAMP fixes (for pax/tar generated files)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.50 -r1.51 src/distrib/cdrom/Makefile
cvs rdiff -u -r1.36 -r1.37 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.39 -r1.40 src/distrib/common/Makefile.image
cvs rdiff -u -r1.18 -r1.19 src/distrib/common/Makefile.tarfloppy
cvs rdiff -u -r1.17 -r1.18 src/distrib/common/buildfloppies.sh
cvs rdiff -u -r1.14 -r1.15 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.12 -r1.13 src/distrib/evbarm/instkernel/sshramdisk/Makefile
cvs rdiff -u -r1.13 -r1.14 src/distrib/vax/floppy/Makefile
cvs rdiff -u -r1.9 -r1.10 src/distrib/x68k/stand/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/arm/xscale

[Tobias Nygren]

Module Name:src
Committed By:   tnn
Date:   Fri Feb 10 23:11:30 UTC 2017

Modified Files:
src/sys/arch/arm/xscale: ixp425-fw.README

Log Message:
remove misleading comment about version 3.0 microcode

The last known microcode to work is 2.4. Version 3.0 changes
the header signature and fails with "block too big for NPE memory".
Provide a backup download URL since intel removed version < 3.0.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xscale/ixp425-fw.README

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/xscale/ixp425-fw.README
diff -u src/sys/arch/arm/xscale/ixp425-fw.README:1.3 src/sys/arch/arm/xscale/ixp425-fw.README:1.4
--- src/sys/arch/arm/xscale/ixp425-fw.README:1.3	Fri Feb 10 20:30:39 2017
+++ src/sys/arch/arm/xscale/ixp425-fw.README	Fri Feb 10 23:11:30 2017
@@ -1,4 +1,4 @@
-$NetBSD: ixp425-fw.README,v 1.3 2017/02/10 20:30:39 tnn Exp $
+$NetBSD: ixp425-fw.README,v 1.4 2017/02/10 23:11:30 tnn Exp $
 
 IXP425 NPE Microcode
 
@@ -21,17 +21,19 @@ You must grab the NPE microcode from her
 
  https://downloadcenter.intel.com/download/13757/IXP400-Software-NPE-Microcode-v3-0-without-crypto
 
+SHA1 (IPL_ixp400NpeLibrary-3_0.zip) = dda6b27265e6db3dfec68361644197c0f311a07b
+
+or the older version which is archived here:
+ https://downloads.openwrt.org/sources/IPL_ixp400NpeLibrary-2_4.zip
+
+SHA1 (IPL_ixp400NpeLibrary-2_4.zip) = abf1562e750e16e6f9baf9892a59640f863a693e
+
 Select the "Download (without Crypto)" link in the "NPE Microcode"
 section. Note that there is no benefit in selecting the "with Cypto"
 microcode at this time since NetBSD does not support it.
 
-Note: At the time of writing (December 2006), the NPE Microcode is at
-version 2.3. Newer versions may not work with NetBSD's native Ethernet
-driver. If this is the case, let us know via send-pr(1).
-
-Update: As of March 2010, NPE Microcode is at version 3.0 and has been
-confirmed to work. See:
- http://mail-index.netbsd.org/port-arm/2010/03/24/msg000912.html
+Note: At the time of writing (February 2017), the NPE Microcode is at
+version 3.0. However, the last known microcode version to work is 2.4.
 
 After clicking the link, you will be directed to a click-through license
 page. Assuming you agree to the terms of the license (and you are
@@ -42,7 +44,7 @@ Extract the microcode under any decent U
 command provided with the OS, or with the version included in the pkgsrc
 collection under archivers/unzip:
 
-	$ unzip IPL_ixp400NpeLibrary-3_0.zip
+	$ unzip IPL_ixp400NpeLibrary-2_4.zip
 
 Next, you must generate a microcode image suitable for inclusion in the
 NetBSD kernel.

CVS commit: src/distrib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb 11 03:07:06 UTC 2017

Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
src/distrib/cdrom: Makefile
src/distrib/common: Makefile.bootcd Makefile.image Makefile.tarfloppy
buildfloppies.sh
src/distrib/common/bootimage: Makefile.bootimage
src/distrib/evbarm/instkernel/sshramdisk: Makefile
src/distrib/vax/floppy: Makefile
src/distrib/x68k/stand: Makefile

Log Message:
more MKREPRO_TIMESTAMP fixes (for pax/tar generated files)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.50 -r1.51 src/distrib/cdrom/Makefile
cvs rdiff -u -r1.36 -r1.37 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.39 -r1.40 src/distrib/common/Makefile.image
cvs rdiff -u -r1.18 -r1.19 src/distrib/common/Makefile.tarfloppy
cvs rdiff -u -r1.17 -r1.18 src/distrib/common/buildfloppies.sh
cvs rdiff -u -r1.14 -r1.15 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.12 -r1.13 src/distrib/evbarm/instkernel/sshramdisk/Makefile
cvs rdiff -u -r1.13 -r1.14 src/distrib/vax/floppy/Makefile
cvs rdiff -u -r1.9 -r1.10 src/distrib/x68k/stand/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.3 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.4
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.3	Fri Feb 10 11:53:51 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage	Fri Feb 10 22:07:06 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootimage,v 1.3 2017/02/10 16:53:51 christos Exp $
+#	$NetBSD: Makefile.bootimage,v 1.4 2017/02/11 03:07:06 christos Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -138,6 +138,7 @@
 
 .if ${MKREPRO_TIMESTAMP:Uno} != "no"
 MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
 .endif
 
 .if empty(IMGBASE)
@@ -260,7 +261,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
 		false; 			\
 	fi
 	@echo Extracting ${set}.tgz ...
-	@(cd ${WORKDIR}; ${TOOL_PAX} -rnz -f ${SETS_DIR}/${set}.tgz .)
+	@(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.tgz .)
 .endfor
 .if defined(SECONDARY_BOOT)
 	@echo Copying secondary boot...
@@ -303,7 +304,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
 	fi
 	${MKDIR} ${MKDIRPERM} ${WORKDIR}/${_TARGET}
 	(cd ${_SRCDIR} ;		\
-	${TOOL_PAX} -rw -pe	-v	\
+	${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pe -v			\
 	${IMGDIR_EXCLUDE}		\
 	. ${.OBJDIR}/${WORKDIR}/${_TARGET} )
 .endfor

Index: src/distrib/cdrom/Makefile
diff -u src/distrib/cdrom/Makefile:1.50 src/distrib/cdrom/Makefile:1.51
--- src/distrib/cdrom/Makefile:1.50	Mon Mar 31 07:25:47 2014
+++ src/distrib/cdrom/Makefile	Fri Feb 10 22:07:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2014/03/31 11:25:47 martin Exp $
+# $NetBSD: Makefile,v 1.51 2017/02/11 03:07:06 christos Exp $
 #
 # Consult "*.conf" for the configuration variables; this Makefile is typically
 # not edited for basic configuration changes.
@@ -12,6 +12,10 @@ all:	cdimages
 .include "site.conf"
 .endif
 
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
+.endif
+
 .if !defined(RELEASE)
 .BEGIN:
 	@echo "Please set RELEASE in the environment or in site.conf to the basename"
@@ -377,7 +381,8 @@ USE-FILE: .USE
 			cp `pwd -P`/${>:S/,link$//} $@;; \
 		*.tgz,*) \
 			echo "Extracting: $> --> $@..."; \
-			${TOOL_PAX} -rnz -f ${>:C/,.*$//} ${>:C/^.*,//} ; \
+			${TOOL_PAX} ${PAX_TIMESTAMP} -rnz \
+			-f ${>:C/,.*$//} ${>:C/^.*,//} ; \
 			cp ${>:C/^.*,//} $@; rm -rf ${>:C/^.*,//} ;; \
 		*.gz) echo "gunzip -c <$> >$@"; gunzip -c <$> >$@;; \
 		*) echo "Unknown archive method for $@"; false;; \

Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.36 src/distrib/common/Makefile.bootcd:1.37
--- src/distrib/common/Makefile.bootcd:1.36	Fri Feb 10 11:43:59 2017
+++ src/distrib/common/Makefile.bootcd	Fri Feb 10 22:07:06 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.36 2017/02/10 16:43:59 christos Exp $
+#	$NetBSD: Makefile.bootcd,v 1.37 2017/02/11 03:07:06 christos Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -76,6 +76,7 @@ _CDMAKEFSOPTIONS=	rockridge,label=${ISO_
 
 .if ${MKREPRO_TIMESTAMP:Uno} != "no"
 MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
 .endif
 
 .if ${MKUNPRIVED} == "no"
@@ -181,7 +182,7 @@ copy-releasedir:
 		release_destdir="${CUROBJDIR}/cdrom/${MACHINE}";	\
 		cd ${RELEASEDIR}/${RELEASEMACHINEDIR}; 			\
 		echo Copying $$(pwd) to $$release_destdir ...; 		\
-		${TOOL_PAX} 		\
+		${TOOL_PAX} ${PAX_TIMESTAMP}\
 			-rw -pe 

CVS commit: src/distrib/common/bootimage

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb 11 04:19:25 UTC 2017

Modified Files:
src/distrib/common/bootimage: Makefile.bootimage

Log Message:
remove extra endif


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/common/bootimage/Makefile.bootimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.15 src/distrib/common/bootimage/Makefile.bootimage:1.16
--- src/distrib/common/bootimage/Makefile.bootimage:1.15	Fri Feb 10 22:07:06 2017
+++ src/distrib/common/bootimage/Makefile.bootimage	Fri Feb 10 23:19:25 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootimage,v 1.15 2017/02/11 03:07:06 christos Exp $
+#	$NetBSD: Makefile.bootimage,v 1.16 2017/02/11 04:19:25 christos Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -131,7 +131,6 @@
 MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
 PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
 .endif
-.endif
 
 .if empty(IMGBASE)
 .BEGIN:

CVS commit: src/distrib/common/bootimage

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb 11 04:19:25 UTC 2017

Modified Files:
src/distrib/common/bootimage: Makefile.bootimage

Log Message:
remove extra endif


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/common/bootimage/Makefile.bootimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb 11 04:59:01 UTC 2017

Modified Files:
src/doc: HACKS

Log Message:
add sparc64 hack


To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/doc/HACKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb 11 04:59:01 UTC 2017

Modified Files:
src/doc: HACKS

Log Message:
add sparc64 hack


To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/doc/HACKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.176 src/doc/HACKS:1.177
--- src/doc/HACKS:1.176	Wed Feb  8 18:13:59 2017
+++ src/doc/HACKS	Fri Feb 10 23:59:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.176 2017/02/08 23:13:59 rin Exp $
+# $NetBSD: HACKS,v 1.177 2017/02/11 04:59:01 christos Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -942,3 +942,13 @@ who	matt
 file	crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S: 1.2
 descr	workaround for clang misassembling an instruction
 kcah
+
+port	sparc64
+hack	during profiling with -m32 (and ASLR) labels are not generated
+	consistently
+who	christos
+file	/cvsroot/src/crypto/external/bsd/heimdal/lib/libasn1/Makefile: 1.4
+desc 	asn1_krb5_asn1.po does not produce the same results during successive
+	compilation runs; it is bimodal. Turning optimization to -O0 fixes
+	the issue
+kcah

CVS commit: src/crypto/external/bsd/heimdal/lib/libasn1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb 11 04:56:37 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/lib/libasn1: Makefile

Log Message:
Add hack for profiling bimodal label generation with -m32 on sparc64


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/lib/libasn1/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.3	Sat Jan 28 16:31:51 2017
+++ src/crypto/external/bsd/heimdal/lib/libasn1/Makefile	Fri Feb 10 23:56:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:51 christos Exp $
+# $NetBSD: Makefile,v 1.4 2017/02/11 04:56:37 christos Exp $
 
 USE_FORT?= yes	# network protocol library
 
@@ -68,8 +68,19 @@ ${ASN1COMPILEOBJ}/asn1_compile: try_to_b
 SUBDIR=	asn1_compile
 .endif
 
+
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 
 .if ${USETOOLS} != "yes"
 .include 
 .endif
+
+.if ${MACHINE_ARCH} == "sparc64"
+# Or anything else that uses PROFILE_HOOK with gcc.
+# What happens is that we end up generating one of two different
+# function orders and since the profile code uses the function
+# number for label generation, we end up with one of two different
+# label orders. Disabling ASLR or optimization fixes it.
+# This happens only with -m32...
+COPTS.asn1_krb5_asn1.c+=-O0
+.endif

CVS commit: src/crypto/external/bsd/heimdal/lib/libasn1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb 11 04:56:37 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/lib/libasn1: Makefile

Log Message:
Add hack for profiling bimodal label generation with -m32 on sparc64


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/doc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Feb 10 08:48:06 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
ixg(4): Support TX/RX multiqueue


To generate a diff of this commit:
cvs rdiff -u -r1.2247 -r1.2248 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/doc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Feb 10 08:48:06 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
ixg(4): Support TX/RX multiqueue


To generate a diff of this commit:
cvs rdiff -u -r1.2247 -r1.2248 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/CHANGES
diff -u src/doc/CHANGES:1.2247 src/doc/CHANGES:1.2248
--- src/doc/CHANGES:1.2247	Thu Feb  9 01:55:41 2017
+++ src/doc/CHANGES	Fri Feb 10 08:48:06 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2247 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2248 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -460,6 +460,7 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	libevent: Import libevent 2.1.18 [christos 20170131]
 	nc(1): Add a netcat utility from OpenBSD [christos 20170206]
 	pthread_dbg(3): Removed from the base distribution. [kamil 20170208]
+	ixg(4): Support TX/RX multiqueue [msaitoh 20170208]
 	ixv(4): Add Intel 10G Ethernet virtual function driver.
 		[msaitoh 20170208]
 	bind: Import version 9.10.4-P6. [christos 20170208]

CVS commit: src/lib/libossaudio

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Fri Feb 10 08:52:04 UTC 2017

Modified Files:
src/lib/libossaudio: ossaudio.c

Log Message:
speed limit is 80 (missed this one)


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libossaudio/ossaudio.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/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.31 src/lib/libossaudio/ossaudio.c:1.32
--- src/lib/libossaudio/ossaudio.c:1.31	Fri Feb 10 08:50:27 2017
+++ src/lib/libossaudio/ossaudio.c	Fri Feb 10 08:52:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ossaudio.c,v 1.31 2017/02/10 08:50:27 maya Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.32 2017/02/10 08:52:04 maya Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: ossaudio.c,v 1.31 2017/02/10 08:50:27 maya Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.32 2017/02/10 08:52:04 maya Exp $");
 
 /*
  * This is an OSS (Linux) sound API emulator.
@@ -497,7 +497,8 @@ audio_ioctl(int fd, unsigned long com, v
 		*(struct count_info *)argp = cntinfo;
 		break;
 	case SNDCTL_SYSINFO:
-		strlcpy(tmpsysinfo.product, "OSS/NetBSD", sizeof tmpsysinfo.product);
+		strlcpy(tmpsysinfo.product, "OSS/NetBSD",
+		sizeof tmpsysinfo.product);
 		strlcpy(tmpsysinfo.version, version, sizeof tmpsysinfo.version);
 		strlcpy(tmpsysinfo.license, license, sizeof tmpsysinfo.license);
 		tmpsysinfo.versionnum = SOUND_VERSION;

CVS commit: src/lib/libossaudio

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Fri Feb 10 08:52:04 UTC 2017

Modified Files:
src/lib/libossaudio: ossaudio.c

Log Message:
speed limit is 80 (missed this one)


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libossaudio/ossaudio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/pci/ixgbe

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Feb 10 08:41:13 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c

Log Message:
 Change the Interrupt Moderation flag from global variable to per device.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.72 src/sys/dev/pci/ixgbe/ixgbe.c:1.73
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.72	Fri Feb 10 06:35:22 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Fri Feb 10 08:41:13 2017
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.72 2017/02/10 06:35:22 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.73 2017/02/10 08:41:13 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -282,7 +282,7 @@ MODULE_DEPEND(ix, ether, 1, 1, 1);
 ** is varied over time based on the
 ** traffic for that interrupt vector
 */
-static int ixgbe_enable_aim = TRUE;
+static bool ixgbe_enable_aim = true;
 #define SYSCTL_INT(_a1, _a2, _a3, _a4, _a5, _a6, _a7)
 SYSCTL_INT(_hw_ix, OID_AUTO, enable_aim, CTLFLAG_RWTUN, _enable_aim, 0,
 "Enable adaptive interrupt moderation");
@@ -1708,7 +1708,7 @@ ixgbe_msix_que(void *arg)
 
 	/* Do AIM now? */
 
-	if (adapter->enable_aim == FALSE)
+	if (adapter->enable_aim == false)
 		goto no_calc;
 	/*
 	** Do Adaptive Interrupt Moderation:
@@ -4521,13 +4521,10 @@ ixgbe_add_device_sysctls(struct adapter 
 	ixgbe_sysctl_flowcntl, 0, (void *)adapter, 0, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 
-	/* XXX This is an *instance* sysctl controlling a *global* variable.
-	 * XXX It's that way in the FreeBSD driver that this derives from.
-	 */
 	if (sysctl_createv(log, 0, , ,
-	CTLFLAG_READWRITE, CTLTYPE_INT,
+	CTLFLAG_READWRITE, CTLTYPE_BOOL,
 	"enable_aim", SYSCTL_DESCR("Interrupt Moderation"),
-	NULL, 0, _enable_aim, 0, CTL_CREATE, CTL_EOL) != 0)
+	NULL, 0, >enable_aim, 0, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 
 	if (sysctl_createv(log, 0, , ,

Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.49 src/sys/dev/pci/ixgbe/ixv.c:1.50
--- src/sys/dev/pci/ixgbe/ixv.c:1.49	Fri Feb 10 06:35:22 2017
+++ src/sys/dev/pci/ixgbe/ixv.c	Fri Feb 10 08:41:13 2017
@@ -31,7 +31,7 @@
 
 **/
 /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixv.c,v 1.49 2017/02/10 06:35:22 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.50 2017/02/10 08:41:13 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -197,7 +197,7 @@ TUNABLE_INT("hw.ixv.num_queues", _nu
 ** is varied over time based on the
 ** traffic for that interrupt vector
 */
-static int ixv_enable_aim = FALSE;
+static bool ixv_enable_aim = false;
 TUNABLE_INT("hw.ixv.enable_aim", _enable_aim);
 
 /* How many packets rxeof tries to clean at a time */
@@ -425,6 +425,9 @@ ixv_attach(device_t parent, device_t dev
 		bcopy(addr, hw->mac.addr, sizeof(addr));
 	}
 
+	/* hw.ix defaults init */
+	adapter->enable_aim = ixv_enable_aim;
+
 	/* Setup OS specific network interface */
 	ixv_setup_interface(dev, adapter);
 
@@ -943,7 +946,7 @@ ixv_msix_que(void *arg)
 
 	/* Do AIM now? */
 
-	if (ixv_enable_aim == FALSE)
+	if (adapter->enable_aim == false)
 		goto no_calc;
 	/*
 	** Do Adaptive Interrupt Moderation:
@@ -2323,13 +2326,10 @@ ixv_add_device_sysctls(struct adapter *a
 	ixv_sysctl_debug, 0, (void *)adapter, 0, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 
-	/* XXX This is an *instance* sysctl controlling a *global* variable.
-	 * XXX It's that way in the FreeBSD driver that this derives from.
-	 */
 	if (sysctl_createv(log, 0, , ,
-	CTLFLAG_READWRITE, CTLTYPE_INT,
+	CTLFLAG_READWRITE, CTLTYPE_BOOL,
 	"enable_aim", SYSCTL_DESCR("Interrupt Moderation"),
-	NULL, 0, _enable_aim, 0, CTL_CREATE, CTL_EOL) != 0)
+	NULL, 0, >enable_aim, 0, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 }
 

CVS commit: src/sys/dev/pci/ixgbe

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Feb 10 08:41:13 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c

Log Message:
 Change the Interrupt Moderation flag from global variable to per device.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/ixgbe/ixv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/lib/libossaudio

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Fri Feb 10 08:50:27 UTC 2017

Modified Files:
src/lib/libossaudio: ossaudio.c

Log Message:
strncpy->strlcpy. use sizeof instead of numbers.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libossaudio/ossaudio.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/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.30 src/lib/libossaudio/ossaudio.c:1.31
--- src/lib/libossaudio/ossaudio.c:1.30	Tue Sep  9 10:45:18 2014
+++ src/lib/libossaudio/ossaudio.c	Fri Feb 10 08:50:27 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ossaudio.c,v 1.30 2014/09/09 10:45:18 nat Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.31 2017/02/10 08:50:27 maya Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: ossaudio.c,v 1.30 2014/09/09 10:45:18 nat Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.31 2017/02/10 08:50:27 maya Exp $");
 
 /*
  * This is an OSS (Linux) sound API emulator.
@@ -497,12 +497,9 @@ audio_ioctl(int fd, unsigned long com, v
 		*(struct count_info *)argp = cntinfo;
 		break;
 	case SNDCTL_SYSINFO:
-		strncpy(tmpsysinfo.product, "OSS/NetBSD", 31);
-		tmpsysinfo.product[31] = 0; 
-		strncpy(tmpsysinfo.version, version, 31); 
-		tmpsysinfo.version[31] = 0; 
-		strncpy(tmpsysinfo.license, license, 15);
-		tmpsysinfo.license[15] = 0; 
+		strlcpy(tmpsysinfo.product, "OSS/NetBSD", sizeof tmpsysinfo.product);
+		strlcpy(tmpsysinfo.version, version, sizeof tmpsysinfo.version);
+		strlcpy(tmpsysinfo.license, license, sizeof tmpsysinfo.license);
 		tmpsysinfo.versionnum = SOUND_VERSION;
 		memset(tmpsysinfo.options, 0, 8);
 		tmpsysinfo.numaudios = OSS_MAX_AUDIO_DEVS;
@@ -550,8 +547,8 @@ audio_ioctl(int fd, unsigned long com, v
 		if (idata & AUDIO_PROP_MMAP)
 			idat |= DSP_CAP_MMAP;
 		idat = PCM_CAP_INPUT | PCM_CAP_OUTPUT;
-		strncpy(tmpaudioinfo->name, tmpaudiodev.name, 64);
-		tmpaudioinfo->name[63] = 0;
+		strlcpy(tmpaudioinfo->name, tmpaudiodev.name,
+		sizeof tmpaudioinfo->name);
 		tmpaudioinfo->busy = tmpinfo.play.open;
 		tmpaudioinfo->pid = -1;
 		tmpaudioinfo->caps = idat;
@@ -799,7 +796,7 @@ getdevinfo(int fd)
 di->devmask |= 1 << dp->code;
 if (mi.un.v.num_channels == 2)
 	di->stereomask |= 1 << dp->code;
-strncpy(di->names[i], mi.label.name, 
+strlcpy(di->names[i], mi.label.name,
 	sizeof di->names[i]);
 			}
 			break;
@@ -866,8 +863,8 @@ mixer_ioctl(int fd, unsigned long com, v
 		omi = argp;
 		if (com == SOUND_MIXER_INFO)
 			omi->modify_counter = 1;
-		strncpy(omi->id, adev.name, sizeof omi->id);
-		strncpy(omi->name, adev.name, sizeof omi->name);
+		strlcpy(omi->id, adev.name, sizeof omi->id);
+		strlcpy(omi->name, adev.name, sizeof omi->name);
 		return 0;
 	case SOUND_MIXER_READ_RECSRC:
 		if (di->source == -1)

CVS commit: src/lib/libossaudio

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Fri Feb 10 08:50:27 UTC 2017

Modified Files:
src/lib/libossaudio: ossaudio.c

Log Message:
strncpy->strlcpy. use sizeof instead of numbers.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libossaudio/ossaudio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Feb 10 10:39:36 UTC 2017

Modified Files:
src/sys/arch/x86/x86: x86_machdep.c

Log Message:
If the segment list is full, print a warning on the console and launch the
system with the available segments.

High memory systems may have more than VM_PHYSSEG_MAX segments; it is
better to truncate the memory and allow the system to work rather than
just panicking. The user can still increase VM_PHYSSEG_MAX (or ask us to).

Fixes issues such as PR/47093.

Note: the warning is logged but does not appear in dmesg, this too needs
to be fixed for the rest of the bootstrap procedure.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/x86/x86/x86_machdep.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/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.86 src/sys/arch/x86/x86/x86_machdep.c:1.87
--- src/sys/arch/x86/x86/x86_machdep.c:1.86	Fri Feb 10 10:02:26 2017
+++ src/sys/arch/x86/x86/x86_machdep.c	Fri Feb 10 10:39:36 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_machdep.c,v 1.86 2017/02/10 10:02:26 maxv Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.87 2017/02/10 10:39:36 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.86 2017/02/10 10:02:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.87 2017/02/10 10:39:36 maxv Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -583,8 +583,9 @@ x86_add_cluster(uint64_t seg_start, uint
 		return 0;
 
 	if (mem_cluster_cnt >= VM_PHYSSEG_MAX) {
-		panic("%s: too many memory segments (increase VM_PHYSSEG_MAX)",
-			__func__);
+		printf("WARNING: too many memory segments"
+		"(increase VM_PHYSSEG_MAX)");
+		return -1;
 	}
 
 #ifdef PHYSMEM_MAX_ADDR
@@ -715,10 +716,13 @@ x86_parse_clusters(struct btinfo_common 
 			"0x%"PRIx64"/0x%"PRIx64"/0x%x\n", seg_start,
 			seg_end - seg_start, type);
 
-			x86_add_cluster(seg_start, IOM_BEGIN, type);
-			x86_add_cluster(IOM_END, seg_end, type);
+			if (x86_add_cluster(seg_start, IOM_BEGIN, type) == -1)
+break;
+			if (x86_add_cluster(IOM_END, seg_end, type) == -1)
+break;
 		} else {
-			x86_add_cluster(seg_start, seg_end, type);
+			if (x86_add_cluster(seg_start, seg_end, type) == -1)
+break;
 		}
 	}
 

CVS commit: src/sys/arch/x86/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Feb 10 10:39:36 UTC 2017

Modified Files:
src/sys/arch/x86/x86: x86_machdep.c

Log Message:
If the segment list is full, print a warning on the console and launch the
system with the available segments.

High memory systems may have more than VM_PHYSSEG_MAX segments; it is
better to truncate the memory and allow the system to work rather than
just panicking. The user can still increase VM_PHYSSEG_MAX (or ask us to).

Fixes issues such as PR/47093.

Note: the warning is logged but does not appear in dmesg, this too needs
to be fixed for the rest of the bootstrap procedure.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/x86/x86/x86_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Feb 10 09:57:04 UTC 2017

Modified Files:
src/sys/arch/x86/x86: x86_machdep.c

Log Message:
Import iomem_ex locally.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/x86/x86/x86_machdep.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/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.84 src/sys/arch/x86/x86/x86_machdep.c:1.85
--- src/sys/arch/x86/x86/x86_machdep.c:1.84	Thu Feb  9 11:56:41 2017
+++ src/sys/arch/x86/x86/x86_machdep.c	Fri Feb 10 09:57:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_machdep.c,v 1.84 2017/02/09 11:56:41 nonaka Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.85 2017/02/10 09:57:04 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.84 2017/02/09 11:56:41 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.85 2017/02/10 09:57:04 maxv Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -510,9 +510,9 @@ x86_select_freelist(uint64_t maxaddr)
 }
 
 static int
-x86_add_cluster(struct extent *iomem_ex, uint64_t seg_start, uint64_t seg_end,
-uint32_t type)
+x86_add_cluster(uint64_t seg_start, uint64_t seg_end, uint32_t type)
 {
+	extern struct extent *iomem_ex;
 	uint64_t new_physmem = 0;
 	phys_ram_seg_t *cluster;
 	int i;
@@ -629,7 +629,7 @@ x86_add_cluster(struct extent *iomem_ex,
 }
 
 static int
-x86_parse_clusters(struct btinfo_common *bi, struct extent *iomem_ex)
+x86_parse_clusters(struct btinfo_common *bi)
 {
 	union {
 		struct btinfo_common *common;
@@ -720,10 +720,10 @@ x86_parse_clusters(struct btinfo_common 
 			"0x%"PRIx64"/0x%"PRIx64"/0x%x\n", seg_start,
 			seg_end - seg_start, type);
 
-			x86_add_cluster(iomem_ex, seg_start, 0xa, type);
-			x86_add_cluster(iomem_ex, 0x10, seg_end, type);
+			x86_add_cluster(seg_start, 0xa, type);
+			x86_add_cluster(0x10, seg_end, type);
 		} else {
-			x86_add_cluster(iomem_ex, seg_start, seg_end, type);
+			x86_add_cluster(seg_start, seg_end, type);
 		}
 	}
 
@@ -731,8 +731,9 @@ x86_parse_clusters(struct btinfo_common 
 }
 
 static int
-x86_fake_clusters(struct extent *iomem_ex)
+x86_fake_clusters(void)
 {
+	extern struct extent *iomem_ex;
 	phys_ram_seg_t *cluster;
 	KASSERT(mem_cluster_cnt == 0);
 
@@ -842,7 +843,6 @@ x86_load_region(uint64_t seg_start, uint
 void
 init_x86_clusters(void)
 {
-	extern struct extent *iomem_ex;
 	struct btinfo_memmap *bim = NULL;
 	struct btinfo_efimemmap *biem;
 
@@ -857,18 +857,16 @@ init_x86_clusters(void)
 		bim = lookup_bootinfo(BTINFO_MEMMAP);
 	if ((biosmem_implicit || (biosbasemem == 0 && biosextmem == 0)) &&
 	((bim != NULL && bim->num > 0) || (biem != NULL && biem->num > 0)))
-		x86_parse_clusters(biem != NULL ? >common : >common,
-		iomem_ex);
+		x86_parse_clusters(biem != NULL ? >common : >common);
 #else
 #if !defined(REALBASEMEM) && !defined(REALEXTMEM)
 	biem = lookup_bootinfo(BTINFO_EFIMEMMAP);
 	if (biem == NULL)
 		bim = lookup_bootinfo(BTINFO_MEMMAP);
 	if ((bim != NULL && bim->num > 0) || (biem != NULL && biem->num > 0))
-		x86_parse_clusters(biem != NULL ? >common : >common,
-		iomem_ex);
+		x86_parse_clusters(biem != NULL ? >common : >common);
 #else
-	(void)bim, (void)biem, (void)iomem_ex;
+	(void)bim, (void)biem;
 #endif
 #endif
 
@@ -877,7 +875,7 @@ init_x86_clusters(void)
 		 * If x86_parse_clusters didn't find any valid segment, create
 		 * fake clusters.
 		 */
-		x86_fake_clusters(iomem_ex);
+		x86_fake_clusters();
 	}
 }
 

CVS commit: src/sys/arch/x86/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Feb 10 09:57:04 UTC 2017

Modified Files:
src/sys/arch/x86/x86: x86_machdep.c

Log Message:
Import iomem_ex locally.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/x86/x86/x86_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Feb 10 10:02:26 UTC 2017

Modified Files:
src/sys/arch/x86/x86: x86_machdep.c

Log Message:
Use macros instead of hard-coded constants. By the way, I don't think this
code is correct, but whatever.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/x86/x86/x86_machdep.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/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.85 src/sys/arch/x86/x86/x86_machdep.c:1.86
--- src/sys/arch/x86/x86/x86_machdep.c:1.85	Fri Feb 10 09:57:04 2017
+++ src/sys/arch/x86/x86/x86_machdep.c	Fri Feb 10 10:02:26 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_machdep.c,v 1.85 2017/02/10 09:57:04 maxv Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.86 2017/02/10 10:02:26 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.85 2017/02/10 09:57:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.86 2017/02/10 10:02:26 maxv Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -704,24 +704,19 @@ x86_parse_clusters(struct btinfo_common 
 		seg_end = addr + size;
 
 		/*
-		 * XXX XXX: Avoid compatibility holes.
-		 *
-		 * Holes within memory space that allow access to be directed
-		 * to the PC-compatible frame buffer (0xa-0xb), to
-		 * adapter ROM space (0xc-0xd), and to system BIOS
-		 * space (0xe-0xf).
+		 * XXX XXX: Avoid the ISA I/O MEM.
 		 * 
-		 * Some laptop (for example, Toshiba Satellite2550X) report
-		 * this area and occurred problems, so we avoid this area.
+		 * Some laptops (for example, Toshiba Satellite2550X) report
+		 * this area as valid.
 		 */
-		if (seg_start < 0x10 && seg_end > 0xa) {
+		if (seg_start < IOM_END && seg_end > IOM_BEGIN) {
 			printf("WARNING: memory map entry overlaps "
 			"with ``Compatibility Holes'': "
 			"0x%"PRIx64"/0x%"PRIx64"/0x%x\n", seg_start,
 			seg_end - seg_start, type);
 
-			x86_add_cluster(seg_start, 0xa, type);
-			x86_add_cluster(0x10, seg_end, type);
+			x86_add_cluster(seg_start, IOM_BEGIN, type);
+			x86_add_cluster(IOM_END, seg_end, type);
 		} else {
 			x86_add_cluster(seg_start, seg_end, type);
 		}

CVS commit: src/sys/arch/x86/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Feb 10 10:02:26 UTC 2017

Modified Files:
src/sys/arch/x86/x86: x86_machdep.c

Log Message:
Use macros instead of hard-coded constants. By the way, I don't think this
code is correct, but whatever.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/x86/x86/x86_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Feb 10 13:44:47 UTC 2017

Modified Files:
src/sys/net: route.c

Log Message:
Fix locking against myself in ifa_ifwithroute_psref

It happened on the path: rtrequest1 => rt_getifa => ifa_ifwithroute_psref.

Reported by ryo@


To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/net/route.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/net/route.c
diff -u src/sys/net/route.c:1.188 src/sys/net/route.c:1.189
--- src/sys/net/route.c:1.188	Thu Jan 19 06:58:55 2017
+++ src/sys/net/route.c	Fri Feb 10 13:44:47 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.188 2017/01/19 06:58:55 ozaki-r Exp $	*/
+/*	$NetBSD: route.c,v 1.189 2017/02/10 13:44:47 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.188 2017/01/19 06:58:55 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.189 2017/02/10 13:44:47 ozaki-r Exp $");
 
 #include 
 #ifdef RTFLUSH_DEBUG
@@ -1012,7 +1012,11 @@ ifa_ifwithroute_psref(int flags, const s
 		int s;
 		struct rtentry *rt;
 
-		rt = rtalloc1(dst, 0);
+		/* XXX we cannot call rtalloc1 if holding the rt lock */
+		if (RT_LOCKED())
+			rt = rtalloc1_locked(dst, 0, true);
+		else
+			rt = rtalloc1(dst, 0);
 		if (rt == NULL)
 			return NULL;
 		/*

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Feb 10 13:48:06 UTC 2017

Modified Files:
src/sys/net: route.c

Log Message:
Ensure that nobody references a rtentry that is passed to rt_setgate


To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/net/route.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/net/route.c
diff -u src/sys/net/route.c:1.189 src/sys/net/route.c:1.190
--- src/sys/net/route.c:1.189	Fri Feb 10 13:44:47 2017
+++ src/sys/net/route.c	Fri Feb 10 13:48:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.189 2017/02/10 13:44:47 ozaki-r Exp $	*/
+/*	$NetBSD: route.c,v 1.190 2017/02/10 13:48:06 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.189 2017/02/10 13:44:47 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.190 2017/02/10 13:48:06 ozaki-r Exp $");
 
 #include 
 #ifdef RTFLUSH_DEBUG
@@ -918,15 +918,27 @@ rtredirect(const struct sockaddr *dst, c
 			 * Smash the current notion of the gateway to
 			 * this destination.  Should check about netmask!!!
 			 */
-			/*
-			 * FIXME NOMPSAFE: the rtentry is updated with the existence
-			 * of refeferences of it.
-			 */
-			error = rt_setgate(rt, gateway);
+#ifdef NET_MPSAFE
+			KASSERT(!cpu_softintr_p());
+
+			error = rt_update_prepare(rt);
 			if (error == 0) {
-rt->rt_flags |= RTF_MODIFIED;
-flags |= RTF_MODIFIED;
+#endif
+error = rt_setgate(rt, gateway);
+if (error == 0) {
+	rt->rt_flags |= RTF_MODIFIED;
+	flags |= RTF_MODIFIED;
+}
+#ifdef NET_MPSAFE
+rt_update_finish(rt);
+			} else {
+/*
+ * If error != 0, the rtentry is being
+ * destroyed, so doing nothing doesn't
+ * matter.
+ */
 			}
+#endif
 			stat = _newgateway;
 		}
 	} else

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Feb 10 13:48:06 UTC 2017

Modified Files:
src/sys/net: route.c

Log Message:
Ensure that nobody references a rtentry that is passed to rt_setgate


To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/net/route.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Feb 10 13:44:47 UTC 2017

Modified Files:
src/sys/net: route.c

Log Message:
Fix locking against myself in ifa_ifwithroute_psref

It happened on the path: rtrequest1 => rt_getifa => ifa_ifwithroute_psref.

Reported by ryo@


To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/net/route.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.