CVS commit: src/sys/dev/mii

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Fri Sep 26 08:05:00 UTC 2014

Modified Files:
src/sys/dev/mii: micphy.c

Log Message:
s/__diagused/__debugused/ for KDASSERT


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/micphy.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/mii/micphy.c
diff -u src/sys/dev/mii/micphy.c:1.2 src/sys/dev/mii/micphy.c:1.3
--- src/sys/dev/mii/micphy.c:1.2	Wed Sep 10 22:46:34 2014
+++ src/sys/dev/mii/micphy.c	Fri Sep 26 08:05:00 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: micphy.c,v 1.2 2014/09/10 22:46:34 ryo Exp $	*/
+/*	$NetBSD: micphy.c,v 1.3 2014/09/26 08:05:00 ryo Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: micphy.c,v 1.2 2014/09/10 22:46:34 ryo Exp $);
+__KERNEL_RCSID(0, $NetBSD: micphy.c,v 1.3 2014/09/26 08:05:00 ryo Exp $);
 
 #include opt_mii.h
 
@@ -219,7 +219,7 @@ micphy_service(struct mii_softc *sc, str
 
 static void micphy_writexreg(struct mii_softc *sc, uint32_t reg, uint32_t wval)
 {
-	int rval __diagused;
+	int rval __debugused;
 
 	PHY_WRITE(sc, XREG_CONTROL, XREG_CTL_SEL_WRITE | reg);
 	PHY_WRITE(sc, XREG_WRITE, wval);

CVS commit: src/sbin/gpt

[John Nemeth]

Module Name:src
Committed By:   jnemeth
Date:   Fri Sep 26 08:56:35 UTC 2014

Modified Files:
src/sbin/gpt: restore.c

Log Message:
- handle a GPT that isn't an exact multiple of a sector
- adjust PMBR size, in case new disk is a different size
- don't leak as much memory
- clean up error handling somewhat


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/gpt/restore.c

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

Modified files:

Index: src/sbin/gpt/restore.c
diff -u src/sbin/gpt/restore.c:1.2 src/sbin/gpt/restore.c:1.3
--- src/sbin/gpt/restore.c:1.2	Sat Sep 20 22:11:27 2014
+++ src/sbin/gpt/restore.c	Fri Sep 26 08:56:34 2014
@@ -29,7 +29,7 @@
 __FBSDID($FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $);
 #endif
 #ifdef __RCSID
-__RCSID($NetBSD: restore.c,v 1.2 2014/09/20 22:11:27 jnemeth Exp $);
+__RCSID($NetBSD: restore.c,v 1.3 2014/09/26 08:56:34 jnemeth Exp $);
 #endif
 
 #include sys/types.h
@@ -101,13 +101,15 @@ restore(int fd)
 			warnx(%s: error: device contains a MBR, device_name);
 			return;
 		}
-
 		/* Nuke the MBR in our internal map. */
 		map-map_type = MAP_TYPE_UNUSED;
 	}
 
 	props = prop_dictionary_internalize_from_file(/dev/stdin);
-	PROP_ERR(props);
+	if (props == NULL) {
+		warnx(error: unable to read/parse backup file);
+		return;
+	}
 
 	propnum = prop_dictionary_get(props, sector_size);
 	PROP_ERR(propnum);
@@ -133,6 +135,10 @@ restore(int fd)
 	propnum = prop_dictionary_get(gpt_dict, entries);
 	PROP_ERR(propnum);
 	entries = prop_number_integer_value(propnum);
+	gpt_size = entries * sizeof(struct gpt_ent) / secsz;
+	if (gpt_size * sizeof(struct gpt_ent) % secsz)
+		gpt_size++;
+
 	propstr = prop_dictionary_get(gpt_dict, guid);
 	PROP_ERR(propstr);
 	s = prop_string_cstring_nocopy(propstr);
@@ -143,7 +149,6 @@ restore(int fd)
 	}
 	le_uuid_enc(gpt_guid, uuid);
 
-	gpt_size = entries * sizeof(struct gpt_ent) / secsz;
 	firstdata = gpt_size + 2;		/* PMBR and GPT header */
 	lastdata = last - gpt_size - 1;		/* alt. GPT table and header */
 
@@ -187,12 +192,27 @@ restore(int fd)
 		warnx(not enough memory to create a sector buffer);
 		return;
 	}
-	lseek(fd, 0LL, SEEK_SET);
-	for (i = 0; i  firstdata; i++)
-		write(fd, secbuf, secsz);
-	lseek(fd, (lastdata + 1) * secsz, SEEK_SET);
-	for (i = lastdata + 1; i = last; i++)
-		write(fd, secbuf, secsz);
+
+	if (lseek(fd, 0LL, SEEK_SET) == -1) {
+		warnx(%s: error: can't seek to beginning, device_name);
+		return;
+	}
+	for (i = 0; i  firstdata; i++) {
+		if (write(fd, secbuf, secsz) == -1) {
+			warnx(%s: error: can't write, device_name);
+			return;
+		}
+	}
+	if (lseek(fd, (lastdata + 1) * secsz, SEEK_SET) == -1) {
+		warnx(%s: error: can't seek to end, device_name);
+		return;
+	}
+	for (i = lastdata + 1; i = last; i++) {
+		if (write(fd, secbuf, secsz) == -1) {
+			warnx(%s: error: can't write, device_name);
+			return;
+		}
+	}
 
 	mbr = (struct mbr *)secbuf;
 	type_dict = prop_dictionary_get(props, MBR);
@@ -249,19 +269,35 @@ restore(int fd)
 		PROP_ERR(propnum);
 		mbr-mbr_part[i].part_start_hi =
 		htole16(prop_number_unsigned_integer_value(propnum));
-		propnum = prop_dictionary_get(mbr_dict, lba_size_low);
-		PROP_ERR(propnum);
-		mbr-mbr_part[i].part_size_lo =
-		htole16(prop_number_unsigned_integer_value(propnum));
-		propnum = prop_dictionary_get(mbr_dict, lba_size_high);
-		PROP_ERR(propnum);
-		mbr-mbr_part[i].part_size_hi =
-		htole16(prop_number_unsigned_integer_value(propnum));
+		/* adjust PMBR size to size of device */
+if (mbr-mbr_part[i].part_typ == MBR_PTYPE_PMBR) {
+			if (last  0x) {
+mbr-mbr_part[0].part_size_lo = htole16(0x);
+mbr-mbr_part[0].part_size_hi = htole16(0x);
+			} else {
+mbr-mbr_part[0].part_size_lo = htole16(last);
+mbr-mbr_part[0].part_size_hi =
+htole16(last  16);
+			}
+		} else {
+			propnum = prop_dictionary_get(mbr_dict, lba_size_low);
+			PROP_ERR(propnum);
+			mbr-mbr_part[i].part_size_lo =
+			htole16(prop_number_unsigned_integer_value(propnum));
+			propnum =
+			prop_dictionary_get(mbr_dict, lba_size_high);
+			PROP_ERR(propnum);
+			mbr-mbr_part[i].part_size_hi =
+			htole16(prop_number_unsigned_integer_value(propnum));
+		}
 	}
 	prop_object_iterator_release(propiter);
 	mbr-mbr_sig = htole16(MBR_SIG);
-	lseek(fd, 0LL, SEEK_SET);
-	write(fd, mbr, secsz);
+	if (lseek(fd, 0LL, SEEK_SET) == -1 ||
+	write(fd, mbr, secsz) == -1) {
+		warnx(%s: error: unable to write MBR, device_name);
+		return;
+	}
 	
 	propiter = prop_array_iterator(gpt_array);
 	PROP_ERR(propiter);
@@ -309,10 +345,16 @@ restore(int fd)
 		sizeof(ent));
 	}
 	prop_object_iterator_release(propiter);
-	lseek(fd, 2 * secsz, SEEK_SET);
-	write(fd, (char *)secbuf + 1 * secsz, gpt_size * secsz);
-	lseek(fd, (lastdata + 1) * secsz, SEEK_SET);
-	write(fd, (char *)secbuf + 1 * secsz, gpt_size * secsz);
+	if 

CVS commit: src/etc/defaults

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Sep 26 10:36:11 UTC 2014

Modified Files:
src/etc/defaults: rc.conf

Log Message:
Re-add default for rtsol. /etc/rc.d/network still checks for this
setting and complains if it isn't defined at all. Add a comment that
it is deprecated and suggest to use dhcpcd=YES instead.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/etc/defaults/rc.conf

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

Modified files:

Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.126 src/etc/defaults/rc.conf:1.127
--- src/etc/defaults/rc.conf:1.126	Sat Sep 13 11:07:08 2014
+++ src/etc/defaults/rc.conf	Fri Sep 26 10:36:11 2014
@@ -1,187 +1,188 @@
-#	$NetBSD: rc.conf,v 1.126 2014/09/13 11:07:08 roy Exp $
-#
-# /etc/defaults/rc.conf --
-#	default configuration of /etc/rc.conf
-#
-# see rc.conf(5) for more information.
-#
-# DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
-# EDIT /etc/rc.conf INSTEAD.
-#
-
-#
-# Use program=YES to enable program, NO to disable it. program_flags are
-# passed to the program on the command line.
-#
-
-# Uncomment this if you want to use local paths in rc.
-#
-#export PATH=$PATH:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin
-
-# Uncomment the following to execute each /etc/rc.d script in
-# the current shell rather than in a subshell.  This may be
-# faster on very slow machines that have an expensive fork(2).
-#	NOTE:	USE THIS AT YOUR OWN RISK; A ROGUE COMMAND
-#		MAY INADVERTENTLY PREVENT BOOT TO MULTIUSER.
-#
-#rc_fast_and_loose=YES
-
-# If rc_silent is true then /etc/rc will suppress most output to
-# the console.  The default is taken from the AB_SILENT flag passed
-# from the boot loader to the kernel in the boothowto(9) variable.
-#
-# rc_silent_cmd is executed once for each suppressed line of output.
-# Useful values are : and twiddle.
-#
-rc_silent=$( [ $(( $(/sbin/sysctl -n kern.boothowto 2/dev/null || echo 0) \
-		 0x4 )) != 0 ]  echo true || echo false )
-rc_silent_cmd=twiddle
-
-# Additional flags to the rcorder(8) that's run by /etc/rc.
-#
-rc_rcorder_flags=
-
-# The directories searched for rc scripts.
-# These directories must be part of the root file system.
-rc_directories=/etc/rc.d 
-
-# If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
-#
-do_rcshutdown=YES
-
-# Additional flags to the rcorder(8) that's run by /etc/rc.shutdown.
-#
-rcshutdown_rcorder_flags=
-
-# If this is non-blank, use as the number of seconds to run a watchdog
-# timer which will terminate /etc/rc.shutdown if the timeout expires.
-#
-rcshutdown_timeout=
-
-
-# Basic network configuration
-#
-
-# Fully Qualified Internet Domain Name (a.k.a. hostname, e.g. foo.baz.edu).
-# If blank, use /etc/myname.
-#
-hostname=
-
-# If there's only one way out of your IPv4 network, set this to the hostname
-# or the IPv4 address of the router that will get your packets off the LAN.
-# If blank, use /etc/mygate.
-#
-defaultroute=
-
-# Same thing for IPv6.  If blank, use /etc/mygate6.
-#
-defaultroute6=
-
-# The NIS domain name (formerly known as Yellow Pages); not in any way
-# related to Internet domain names.
-# If blank, use /etc/defaultdomain.
-#
-domainname=
-
-# Filesystems to mount early in boot-up.
-# Note that `/var' is needed in $critical_filesystems_local (or
-# implied as part of `/') as certain services that need /var (such as
-# dhclient) may be needed to get the network operational enough to mount
-# the $critical_filesystems_remote.  Prepending OPTIONAL:  means it
-# will not be an error if that file system is not present in fstab(5).
-#
-critical_filesystems_local=OPTIONAL:/var
-critical_filesystems_remote=OPTIONAL:/usr
-
-# Swap device controls.
-#
-no_swap=NO		# Set to YES if you have purposefully setup no swap
-			# partitions and don't want to be warned about it.
-swapoff=YES		# Remove block-type swap partitions upon shutdown
-			# This defaults to yes, so that raids shutdown cleanly
-
-# Concatenated disk driver.
-#
-ccd=YES
-
-# RAIDframe driver (manually configured devices).
-#
-raidframe=YES
-
-# Crypto file system.
-#
-cgd=YES
-
-# Logical Volume Manager
-#
-lvm=NO
-
-# One-time actions and programs on boot-up.
-#
-savecore=YES		savecore_flags=-z
-			savecore_dir=/var/crash
-per_user_tmp=NO	# per-user /tmp directories
-per_user_tmp_dir=/private/tmp			# real storage for /tmp
-clear_tmp=YES	# clear /tmp after reboot
-update_motd=YES	# updates /etc/motd
-dmesg=YES		dmesg_flags=		# write /var/run/dmesg.boot
-accounting=NO	# uses /var/account/acct
-newsyslog=NO		newsyslog_flags=	# trim log files
-quota=YES	# check and enable quotas
-ldconfig=YES	# rebuild a.out ldconfig cache
-sysdb=YES	# build system databases
-rndctl=NO		rndctl_flags=		# configure rndctl(8)
-gpio=NO		# configure GPIO devices
-
-# cope with other OSes using the real time clock at 

CVS commit: src/etc/defaults

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Fri Sep 26 11:04:06 UTC 2014

Modified Files:
src/etc/defaults: rc.conf

Log Message:
Revert last change. This was already fixed differently and something
went wrong with the change anyway. Sorry


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/etc/defaults/rc.conf

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

Modified files:

Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.127 src/etc/defaults/rc.conf:1.128
--- src/etc/defaults/rc.conf:1.127	Fri Sep 26 10:36:11 2014
+++ src/etc/defaults/rc.conf	Fri Sep 26 11:04:06 2014
@@ -1,188 +1,187 @@
-#	$NetBSD: rc.conf,v 1.127 2014/09/26 10:36:11 tron Exp $
- #
- # /etc/defaults/rc.conf --
- #	default configuration of /etc/rc.conf
- #
- # see rc.conf(5) for more information.
- #
- # DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
- # EDIT /etc/rc.conf INSTEAD.
- #
-
- #
- # Use program=YES to enable program, NO to disable it. program_flags are
- # passed to the program on the command line.
- #
-
- # Uncomment this if you want to use local paths in rc.
- #
- #export PATH=$PATH:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin
-
- # Uncomment the following to execute each /etc/rc.d script in
- # the current shell rather than in a subshell.  This may be
- # faster on very slow machines that have an expensive fork(2).
- #	NOTE:	USE THIS AT YOUR OWN RISK; A ROGUE COMMAND
- #		MAY INADVERTENTLY PREVENT BOOT TO MULTIUSER.
- #
- #rc_fast_and_loose=YES
-
- # If rc_silent is true then /etc/rc will suppress most output to
- # the console.  The default is taken from the AB_SILENT flag passed
- # from the boot loader to the kernel in the boothowto(9) variable.
- #
- # rc_silent_cmd is executed once for each suppressed line of output.
- # Useful values are : and twiddle.
- #
- rc_silent=$( [ $(( $(/sbin/sysctl -n kern.boothowto 2/dev/null || echo 0) \
-		  0x4 )) != 0 ]  echo true || echo false )
- rc_silent_cmd=twiddle
-
- # Additional flags to the rcorder(8) that's run by /etc/rc.
- #
- rc_rcorder_flags=
-
- # The directories searched for rc scripts.
- # These directories must be part of the root file system.
- rc_directories=/etc/rc.d 
-
- # If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
- #
- do_rcshutdown=YES
-
- # Additional flags to the rcorder(8) that's run by /etc/rc.shutdown.
- #
- rcshutdown_rcorder_flags=
-
- # If this is non-blank, use as the number of seconds to run a watchdog
- # timer which will terminate /etc/rc.shutdown if the timeout expires.
- #
- rcshutdown_timeout=
-
-
- # Basic network configuration
- #
-
- # Fully Qualified Internet Domain Name (a.k.a. hostname, e.g. foo.baz.edu).
- # If blank, use /etc/myname.
- #
- hostname=
-
- # If there's only one way out of your IPv4 network, set this to the hostname
- # or the IPv4 address of the router that will get your packets off the LAN.
- # If blank, use /etc/mygate.
- #
- defaultroute=
-
- # Same thing for IPv6.  If blank, use /etc/mygate6.
- #
- defaultroute6=
-
- # The NIS domain name (formerly known as Yellow Pages); not in any way
- # related to Internet domain names.
- # If blank, use /etc/defaultdomain.
- #
- domainname=
-
- # Filesystems to mount early in boot-up.
- # Note that `/var' is needed in $critical_filesystems_local (or
- # implied as part of `/') as certain services that need /var (such as
- # dhclient) may be needed to get the network operational enough to mount
- # the $critical_filesystems_remote.  Prepending OPTIONAL:  means it
- # will not be an error if that file system is not present in fstab(5).
- #
- critical_filesystems_local=OPTIONAL:/var
- critical_filesystems_remote=OPTIONAL:/usr
-
- # Swap device controls.
- #
- no_swap=NO		# Set to YES if you have purposefully setup no swap
-			 # partitions and don't want to be warned about it.
- swapoff=YES		# Remove block-type swap partitions upon shutdown
-			 # This defaults to yes, so that raids shutdown cleanly
-
- # Concatenated disk driver.
- #
- ccd=YES
-
- # RAIDframe driver (manually configured devices).
- #
- raidframe=YES
-
- # Crypto file system.
- #
- cgd=YES
-
- # Logical Volume Manager
- #
- lvm=NO
-
- # One-time actions and programs on boot-up.
- #
- savecore=YES		savecore_flags=-z
-			 savecore_dir=/var/crash
- per_user_tmp=NO	# per-user /tmp directories
- per_user_tmp_dir=/private/tmp			# real storage for /tmp
- clear_tmp=YES	# clear /tmp after reboot
- update_motd=YES	# updates /etc/motd
- dmesg=YES		dmesg_flags=		# write /var/run/dmesg.boot
- accounting=NO	# uses /var/account/acct
- newsyslog=NO		newsyslog_flags=	# trim log files
- quota=YES	# check and enable quotas
- ldconfig=YES	# rebuild a.out ldconfig cache
- sysdb=YES	# build system databases
- rndctl=NO		rndctl_flags=		# configure rndctl(8)
- gpio=NO		# configure GPIO devices
-
- # cope with other OSes 

CVS commit: src/lib/libc/gen

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Fri Sep 26 12:59:28 UTC 2014

Modified Files:
src/lib/libc/gen: unvis.c

Log Message:
Decode any printable characters encoded with VIS_CSTYLE so
unvis(3) works with vis.c r1.25


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/gen/unvis.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/libc/gen/unvis.c
diff -u src/lib/libc/gen/unvis.c:1.41 src/lib/libc/gen/unvis.c:1.42
--- src/lib/libc/gen/unvis.c:1.41	Sat Dec 15 04:29:53 2012
+++ src/lib/libc/gen/unvis.c	Fri Sep 26 12:59:28 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: unvis.c,v 1.41 2012/12/15 04:29:53 matt Exp $	*/
+/*	$NetBSD: unvis.c,v 1.42 2014/09/26 12:59:28 roy Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = @(#)unvis.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: unvis.c,v 1.41 2012/12/15 04:29:53 matt Exp $);
+__RCSID($NetBSD: unvis.c,v 1.42 2014/09/26 12:59:28 roy Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -313,6 +313,12 @@ unvis(char *cp, int c, int *astate, int 
 			 */
 			*astate = SS(0, S_GROUND);
 			return UNVIS_NOCHAR;
+		default:
+			if (isgraph(c)) {
+*cp = c;
+*astate = SS(0, S_GROUND);
+return UNVIS_VALID;
+			}
 		}
 		goto bad;
 

CVS commit: src/lib/libc/gen

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Fri Sep 26 13:03:22 UTC 2014

Modified Files:
src/lib/libc/gen: unvis.c

Log Message:
Remove \$ as a hidden marker as vis(3) wasn't setting it
and it clobbered VIS_SHELL | VIS_CSTYLE.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/gen/unvis.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/libc/gen/unvis.c
diff -u src/lib/libc/gen/unvis.c:1.42 src/lib/libc/gen/unvis.c:1.43
--- src/lib/libc/gen/unvis.c:1.42	Fri Sep 26 12:59:28 2014
+++ src/lib/libc/gen/unvis.c	Fri Sep 26 13:03:22 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: unvis.c,v 1.42 2014/09/26 12:59:28 roy Exp $	*/
+/*	$NetBSD: unvis.c,v 1.43 2014/09/26 13:03:22 roy Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = @(#)unvis.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: unvis.c,v 1.42 2014/09/26 12:59:28 roy Exp $);
+__RCSID($NetBSD: unvis.c,v 1.43 2014/09/26 13:03:22 roy Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -307,12 +307,6 @@ unvis(char *cp, int c, int *astate, int 
 			 */
 			*astate = SS(0, S_GROUND);
 			return UNVIS_NOCHAR;
-		case '$':
-			/*
-			 * hidden marker
-			 */
-			*astate = SS(0, S_GROUND);
-			return UNVIS_NOCHAR;
 		default:
 			if (isgraph(c)) {
 *cp = c;

CVS commit: src/lib/libc/gen

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Fri Sep 26 13:48:00 UTC 2014

Modified Files:
src/lib/libc/gen: vis.c

Log Message:
Don't encode any characters in VIS_CSTYLE that have a special meaning
in unvis(3), such as n r b, etc.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/lib/libc/gen/vis.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/libc/gen/vis.c
diff -u src/lib/libc/gen/vis.c:1.64 src/lib/libc/gen/vis.c:1.65
--- src/lib/libc/gen/vis.c:1.64	Fri Sep 26 05:01:44 2014
+++ src/lib/libc/gen/vis.c	Fri Sep 26 13:48:00 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: vis.c,v 1.64 2014/09/26 05:01:44 christos Exp $	*/
+/*	$NetBSD: vis.c,v 1.65 2014/09/26 13:48:00 roy Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: vis.c,v 1.64 2014/09/26 05:01:44 christos Exp $);
+__RCSID($NetBSD: vis.c,v 1.65 2014/09/26 13:48:00 roy Exp $);
 #endif /* LIBC_SCCS and not lint */
 #ifdef __FBSDID
 __FBSDID($FreeBSD$);
@@ -216,8 +216,22 @@ do_mbyte(wchar_t *dst, wint_t c, int fla
 *dst++ = L'0';
 			}
 			return dst;
+		/* We cannot encode these characters in VIS_CSTYLE
+		 * because they special meaning */
+		case L'n':
+		case L'r':
+		case L'b':
+		case L'a':
+		case L'v':
+		case L't':
+		case L'f':
+		case L's':
+		case L'0':
+		case L'M':
+		case L'^':
+			break;
 		default:
-			if (iswgraph(c)) {
+			if (iswgraph(c)  !iswoctal(c)) {
 *dst++ = L'\\';
 *dst++ = c;
 return dst;

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Sep 26 15:26:01 UTC 2014

Modified Files:
src/usr.bin/xlint/lint1: cgram.y

Log Message:
oops I terminated the block too early (thanks unit tests!)


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/usr.bin/xlint/lint1/cgram.y

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

Modified files:

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.66 src/usr.bin/xlint/lint1/cgram.y:1.67
--- src/usr.bin/xlint/lint1/cgram.y:1.66	Thu Sep 25 21:20:00 2014
+++ src/usr.bin/xlint/lint1/cgram.y	Fri Sep 26 11:26:01 2014
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.66 2014/09/26 01:20:00 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.67 2014/09/26 15:26:01 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(lint)
-__RCSID($NetBSD: cgram.y,v 1.66 2014/09/26 01:20:00 christos Exp $);
+__RCSID($NetBSD: cgram.y,v 1.67 2014/09/26 15:26:01 christos Exp $);
 #endif
 
 #include stdlib.h
@@ -1526,10 +1526,14 @@ iteration_stmnt:
 	| for_exprs stmnt {
 		CLRWFLGS(__FILE__, __LINE__);
 		for2();
+		popdecl();
+		blklev--;
 	  }
 	| for_exprs error {
 		CLRWFLGS(__FILE__, __LINE__);
 		for2();
+		popdecl();
+		blklev--;
 	  }
 	;
 
@@ -1564,14 +1568,10 @@ for_exprs:
 		c99ism(325);
 		for1(NULL, $6, $8);
 		CLRWFLGS(__FILE__, __LINE__);
-		popdecl();
-		blklev--;
 	}
 	  | for_start opt_expr T_SEMI opt_expr T_SEMI opt_expr T_RPARN {
 		for1($2, $4, $6);
 		CLRWFLGS(__FILE__, __LINE__);
-		popdecl();
-		blklev--;
 	  }
 	;
 

CVS commit: src/tests/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Sep 26 15:27:12 UTC 2014

Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_for_loops.c

Log Message:
add a test for the bug I fixed yesterday, and explain the tests.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/d_c99_for_loops.c

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

Modified files:

Index: src/tests/usr.bin/xlint/lint1/d_c99_for_loops.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_for_loops.c:1.1 src/tests/usr.bin/xlint/lint1/d_c99_for_loops.c:1.2
--- src/tests/usr.bin/xlint/lint1/d_c99_for_loops.c:1.1	Sat Mar 17 12:33:15 2012
+++ src/tests/usr.bin/xlint/lint1/d_c99_for_loops.c	Fri Sep 26 11:27:12 2014
@@ -4,7 +4,12 @@ extern void foo(int);
 int
 main(void)
 {
+	// Test the basic functionality
 	for (int i = 0; i  10; i++)
 		foo(i);
+
+	// Test that the scope of the iterator is correct
+	for (int i = 0; i  10; i++)
+		continue;
 	return 0;
 }

CVS commit: src/sys/arch/evbarm/conf

[Reinoud Zandijk]

Module Name:src
Committed By:   reinoud
Date:   Fri Sep 26 15:33:33 UTC 2014

Modified Files:
src/sys/arch/evbarm/conf: ODROID-U

Log Message:
Add USBHIST_SIZE option


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/ODROID-U

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/evbarm/conf/ODROID-U
diff -u src/sys/arch/evbarm/conf/ODROID-U:1.14 src/sys/arch/evbarm/conf/ODROID-U:1.15
--- src/sys/arch/evbarm/conf/ODROID-U:1.14	Fri Sep 19 14:39:34 2014
+++ src/sys/arch/evbarm/conf/ODROID-U	Fri Sep 26 15:33:33 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ODROID-U,v 1.14 2014/09/19 14:39:34 reinoud Exp $
+#	$NetBSD: ODROID-U,v 1.15 2014/09/26 15:33:33 reinoud Exp $
 #
 #	ODROID-U -- ODROID-U series Exynos Kernel
 #
@@ -30,6 +30,7 @@ options 	EXYNOS_CONSOLE_EARLY
 #options 	UVMHIST_PRINT,KERNHIST_DELAY=0
 #options	KERNHIST
 #options	USBHIST
+#options	USBHIST_SIZE=10
 options 	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
 options 	PMAP_NEED_ALLOC_POOLPAGE
 

CVS commit: src/sys/arch/evbarm/conf

[Reinoud Zandijk]

Module Name:src
Committed By:   reinoud
Date:   Fri Sep 26 15:33:59 UTC 2014

Added Files:
src/sys/arch/evbarm/conf: ODROID-XU ODROID-XU_INSTALL
Removed Files:
src/sys/arch/evbarm/conf: ODROID ODROID_INSTALL

Log Message:
Rename ODROID to ODROID-XU


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r0 src/sys/arch/evbarm/conf/ODROID
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/ODROID-XU \
src/sys/arch/evbarm/conf/ODROID-XU_INSTALL
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/ODROID_INSTALL

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

Added files:

Index: src/sys/arch/evbarm/conf/ODROID-XU
diff -u /dev/null src/sys/arch/evbarm/conf/ODROID-XU:1.1
--- /dev/null	Fri Sep 26 15:33:59 2014
+++ src/sys/arch/evbarm/conf/ODROID-XU	Fri Sep 26 15:33:58 2014
@@ -0,0 +1,267 @@
+#
+#	$NetBSD: ODROID-XU,v 1.1 2014/09/26 15:33:58 reinoud Exp $
+#
+#	ODROID -- ODROID series Exynos Kernel
+#
+
+include	arch/evbarm/conf/std.odroid
+
+# estimated number of users
+
+maxusers	32
+
+# Standard system options
+
+options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
+#options 	NTP		# NTP phase/frequency locked loop
+
+# CPU options
+#options 	CPU_CORTEX
+#options 	CPU_CORTEXA9
+#options 	CPU_CORTEXA7
+#options 	CPU_CORTEXA15
+#options 	EXYNOS4120
+#options 	EXYNOS4212
+#options 	EXYNOS4412
+#options 	EXYNOS4412P
+options 	EXYNOS5260
+options 	EXYNOS5410
+options 	EXYNOS5420
+options 	EXYNOS5440
+options 	EXYNOS5422
+#options 	MULTIPROCESSOR
+options 	PMAPCOUNTERS
+options 	BUSDMA_COUNTERS
+options 	EXYNOS_CONSOLE_EARLY
+#options 	UVMHIST
+options		USBHIST
+#options 	UVMHIST_PRINT,KERNHIST_DELAY=0
+options 	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
+options 	PMAP_NEED_ALLOC_POOLPAGE
+
+# Specify the memory size in megabytes (optional).
+#options 	MEMSIZE=2048
+
+# File systems
+file-system	FFS		# UFS
+#file-system	LFS		# log-structured file system
+file-system	MFS		# memory file system
+file-system	NFS		# Network file system
+#file-system 	ADOSFS		# AmigaDOS-compatible file system
+#file-system 	EXT2FS		# second extended file system (linux)
+#file-system	CD9660		# ISO 9660 + Rock Ridge file system
+file-system	MSDOSFS		# MS-DOS file system
+#file-system	FDESC		# /dev/fd
+file-system	KERNFS		# /kern
+#file-system	NULLFS		# loopback file system
+file-system	PROCFS		# /proc
+#file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g  sshfs)
+#file-system	UMAPFS		# NULLFS + uid and gid remapping
+#file-system	UNION		# union file system
+file-system	TMPFS		# memory file system
+file-system	PTYFS		# /dev/pts/N support
+
+# File system options
+#options 	QUOTA		# legacy UFS quotas
+#options 	QUOTA2		# new, in-filesystem UFS quotas
+#options 	FFS_EI		# FFS Endian Independent support
+#options 	NFSSERVER
+options 	WAPBL		# File system journaling support
+#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
+
+# Networking options
+
+#options 	GATEWAY		# packet forwarding
+options 	INET		# IP + ICMP + TCP + UDP
+options 	INET6		# IPV6
+#options 	IPSEC		# IP security
+#options 	IPSEC_DEBUG	# debug for IP security
+#options 	MROUTING	# IP multicast routing
+#options 	PIM		# Protocol Independent Multicast
+#options 	NETATALK	# AppleTalk networking
+#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
+#options 	PPP_DEFLATE	# Deflate compression support for PPP
+#options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
+#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
+
+options 	NFS_BOOT_BOOTP
+options 	NFS_BOOT_DHCP
+#options		NFS_BOOT_BOOTSTATIC
+#options		NFS_BOOTSTATIC_MYIP=\192.168.1.4\
+#options		NFS_BOOTSTATIC_GWIP=\192.168.1.1\
+#options		NFS_BOOTSTATIC_MASK=\255.255.255.0\
+#options		NFS_BOOTSTATIC_SERVADDR=\192.168.1.1\
+#options		NFS_BOOTSTATIC_SERVER=\192.168.1.1:/nfs/sdp2430\
+
+options		NFS_BOOT_RWSIZE=1024
+
+# Compatibility options
+
+options		COMPAT_NETBSD32	# allow running arm (e.g. non-earm) binaries
+#options 	COMPAT_43	# 4.3BSD compatibility.
+#options 	COMPAT_09	# NetBSD 0.9,
+#options 	COMPAT_10	# NetBSD 1.0,
+#options 	COMPAT_11	# NetBSD 1.1,
+#options 	COMPAT_12	# NetBSD 1.2,
+#options 	COMPAT_13	# NetBSD 1.3,
+#options 	COMPAT_14	# NetBSD 1.4,
+#options 	COMPAT_15	# NetBSD 1.5,
+#options 	COMPAT_16	# NetBSD 1.6,
+#options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0,
+options 	COMPAT_40	# NetBSD 4.0,
+options 	COMPAT_50	# NetBSD 5.0,
+options 	COMPAT_60	# NetBSD 6.0, and
+options 	COMPAT_70	# NetBSD 7.0 binary compatibility.
+#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
+#options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
+
+# Shared memory options
+
+options 	SYSVMSG		# System V-like message queues
+options 	SYSVSEM		# System V-like semaphores
+options 	SYSVSHM		# System V-like memory sharing
+
+# Device options
+
+#options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
+#options 	MEMORY_DISK_ROOT_SIZE=8192	# Size in blocks

CVS commit: src/lib/libc/gen

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Fri Sep 26 15:43:36 UTC 2014

Modified Files:
src/lib/libc/gen: unvis.c

Log Message:
Revert prior patch as it breaks `vis -l` as pointed out by apb.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/lib/libc/gen/unvis.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/libc/gen/unvis.c
diff -u src/lib/libc/gen/unvis.c:1.43 src/lib/libc/gen/unvis.c:1.44
--- src/lib/libc/gen/unvis.c:1.43	Fri Sep 26 13:03:22 2014
+++ src/lib/libc/gen/unvis.c	Fri Sep 26 15:43:36 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: unvis.c,v 1.43 2014/09/26 13:03:22 roy Exp $	*/
+/*	$NetBSD: unvis.c,v 1.44 2014/09/26 15:43:36 roy Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = @(#)unvis.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: unvis.c,v 1.43 2014/09/26 13:03:22 roy Exp $);
+__RCSID($NetBSD: unvis.c,v 1.44 2014/09/26 15:43:36 roy Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -307,6 +307,12 @@ unvis(char *cp, int c, int *astate, int 
 			 */
 			*astate = SS(0, S_GROUND);
 			return UNVIS_NOCHAR;
+		case '$':
+			/*
+			 * hidden marker
+			 */
+			*astate = SS(0, S_GROUND);
+			return UNVIS_NOCHAR;
 		default:
 			if (isgraph(c)) {
 *cp = c;

CVS commit: src/lib/libc/gen

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Fri Sep 26 15:58:59 UTC 2014

Modified Files:
src/lib/libc/gen: vis.c

Log Message:
Cannot encode \$ in VIS_CSTYLE as that looks like `vis -l` encoding.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/lib/libc/gen/vis.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/libc/gen/vis.c
diff -u src/lib/libc/gen/vis.c:1.65 src/lib/libc/gen/vis.c:1.66
--- src/lib/libc/gen/vis.c:1.65	Fri Sep 26 13:48:00 2014
+++ src/lib/libc/gen/vis.c	Fri Sep 26 15:58:59 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: vis.c,v 1.65 2014/09/26 13:48:00 roy Exp $	*/
+/*	$NetBSD: vis.c,v 1.66 2014/09/26 15:58:59 roy Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: vis.c,v 1.65 2014/09/26 13:48:00 roy Exp $);
+__RCSID($NetBSD: vis.c,v 1.66 2014/09/26 15:58:59 roy Exp $);
 #endif /* LIBC_SCCS and not lint */
 #ifdef __FBSDID
 __FBSDID($FreeBSD$);
@@ -229,6 +229,7 @@ do_mbyte(wchar_t *dst, wint_t c, int fla
 		case L'0':
 		case L'M':
 		case L'^':
+		case L'$': /* vis(1) -l */
 			break;
 		default:
 			if (iswgraph(c)  !iswoctal(c)) {

CVS commit: src/sys/arch/evbarm/conf

[Reinoud Zandijk]

Module Name:src
Committed By:   reinoud
Date:   Fri Sep 26 16:30:32 UTC 2014

Modified Files:
src/sys/arch/evbarm/conf: ODROID-U ODROID-XU

Log Message:
Split the two kernels to include only support for the device it describes


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/ODROID-U
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/ODROID-XU

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/evbarm/conf/ODROID-U
diff -u src/sys/arch/evbarm/conf/ODROID-U:1.15 src/sys/arch/evbarm/conf/ODROID-U:1.16
--- src/sys/arch/evbarm/conf/ODROID-U:1.15	Fri Sep 26 15:33:33 2014
+++ src/sys/arch/evbarm/conf/ODROID-U	Fri Sep 26 16:30:32 2014
@@ -1,7 +1,7 @@
 #
-#	$NetBSD: ODROID-U,v 1.15 2014/09/26 15:33:33 reinoud Exp $
+#	$NetBSD: ODROID-U,v 1.16 2014/09/26 16:30:32 reinoud Exp $
 #
-#	ODROID-U -- ODROID-U series Exynos Kernel
+#	ODROID-U -- ODROID-U{2,3} series Exynos4x12(P) based kernel
 #
 
 include	arch/evbarm/conf/std.odroid
@@ -18,19 +18,19 @@ options 	RTC_OFFSET=0	# hardware clock i
 # CPU options
 options 	CPU_CORTEX
 options 	CPU_CORTEXA9
-options 	EXYNOS4120
 options 	EXYNOS4212
 options 	EXYNOS4412
 options 	EXYNOS4412P
 #options 	MULTIPROCESSOR
+
 options 	PMAPCOUNTERS
 options 	BUSDMA_COUNTERS
 options 	EXYNOS_CONSOLE_EARLY
-#options 	UVMHIST
-#options 	UVMHIST_PRINT,KERNHIST_DELAY=0
-#options	KERNHIST
-#options	USBHIST
-#options	USBHIST_SIZE=10
+#options  	UVMHIST
+#options  	UVMHIST_PRINT,KERNHIST_DELAY=0
+#options 	KERNHIST
+#options 	USBHIST
+#options 	USBHIST_SIZE=10
 options 	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
 options 	PMAP_NEED_ALLOC_POOLPAGE
 
@@ -161,6 +161,7 @@ options OHCI_DEBUG
 options UHUB_DEBUG
 options	USBVERBOSE
 
+
 # Valid options for BOOT_ARGS:
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
@@ -181,8 +182,8 @@ cpu0		at mainbus?
 
 # A9 core devices
 armperiph0	at mainbus?
-arml2cc0	at armperiph?			# L2 Cache Controller
 armgic0		at armperiph?			# Interrupt Controller
+arml2cc0	at armperiph?			# L2 Cache Controller
 
 # Exynos SoC
 exyo0		at mainbus?
@@ -215,11 +216,7 @@ ukphy*  at mii? phy ?   
 exyoiic0	at exyo0
 iic*		at exyoiic?
 
-
 # serial console connectivity
-# UARTS
-# sscom0 attached to expansion port
-# sscom1 is default serial UART console, enable for low-level console:
 options		SSCOM1CONSOLE, CONSPEED=115200
 
 # include all USB devices

Index: src/sys/arch/evbarm/conf/ODROID-XU
diff -u src/sys/arch/evbarm/conf/ODROID-XU:1.1 src/sys/arch/evbarm/conf/ODROID-XU:1.2
--- src/sys/arch/evbarm/conf/ODROID-XU:1.1	Fri Sep 26 15:33:58 2014
+++ src/sys/arch/evbarm/conf/ODROID-XU	Fri Sep 26 16:30:32 2014
@@ -1,7 +1,7 @@
 #
-#	$NetBSD: ODROID-XU,v 1.1 2014/09/26 15:33:58 reinoud Exp $
+#	$NetBSD: ODROID-XU,v 1.2 2014/09/26 16:30:32 reinoud Exp $
 #
-#	ODROID -- ODROID series Exynos Kernel
+#	ODROID-XU -- ODROID-XU Exynos5410 based kernel
 #
 
 include	arch/evbarm/conf/std.odroid
@@ -16,25 +16,18 @@ options 	RTC_OFFSET=0	# hardware clock i
 #options 	NTP		# NTP phase/frequency locked loop
 
 # CPU options
-#options 	CPU_CORTEX
-#options 	CPU_CORTEXA9
-#options 	CPU_CORTEXA7
-#options 	CPU_CORTEXA15
-#options 	EXYNOS4120
-#options 	EXYNOS4212
-#options 	EXYNOS4412
-#options 	EXYNOS4412P
-options 	EXYNOS5260
+options 	CPU_CORTEX
+options 	CPU_CORTEXA7
+options 	CPU_CORTEXA15
 options 	EXYNOS5410
-options 	EXYNOS5420
-options 	EXYNOS5440
-options 	EXYNOS5422
 #options 	MULTIPROCESSOR
+
 options 	PMAPCOUNTERS
 options 	BUSDMA_COUNTERS
 options 	EXYNOS_CONSOLE_EARLY
 #options 	UVMHIST
-options		USBHIST
+options 	USBHIST
+options 	USBHIST_SIZE=10
 #options 	UVMHIST_PRINT,KERNHIST_DELAY=0
 options 	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
 options 	PMAP_NEED_ALLOC_POOLPAGE
@@ -148,7 +141,7 @@ options 	KTRACE		# system call tracing, 
 #options 	PERFCTRS	# performance counters
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
-#options	LOCKDEBUG
+options	LOCKDEBUG
 #options 	PMAP_DEBUG	# Enable pmap_debug_level code
 #options 	IPKDB		# remote kernel debugging
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
@@ -188,22 +181,12 @@ cpu0		at mainbus?
 
 # A9 core devices
 armperiph0	at mainbus?
-ifdef EXYNOS4
-arml2cc0	at armperiph?			# L2 Cache Controller
-endif
 armgic0		at armperiph?			# Interrupt Controller
-#ifdef EXYNOS5
 armgtmr0	at armperiph?			# Generic Timer
-#endif
 
 # Exynos SoC
 exyo0		at mainbus?
 
-# Integrated Samsung devices
-ifdef EXYNOS4
-mct0		at exyo0
-endif
-
 # Integrated Samsung UARTs
 #sscom*		at exyo0  port ?		# UART ?
 sscom2		at exyo0  port 2		# UART2
@@ -231,14 +214,11 @@ iic*		at exyoiic?
 
 # SATA
 #ahcisata*	at exyno0
-#atabus*		at ata?
+#atabus* 	at ata?
 #wd*		at atabus? drive ?
 
 
 # serial console connectivity
-# UARTS
-# sscom0 is default serial UART console, enable for low-level console:
-# sscomX attached to expansion port
 

CVS commit: src/sys/arch/atari/atari

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Sep 26 17:11:05 UTC 2014

Modified Files:
src/sys/arch/atari/atari: intr.c

Log Message:
copy the leak fix to the other switch branch (from max)


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/atari/atari/intr.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/atari/atari/intr.c
diff -u src/sys/arch/atari/atari/intr.c:1.24 src/sys/arch/atari/atari/intr.c:1.25
--- src/sys/arch/atari/atari/intr.c:1.24	Sun Sep 21 11:49:21 2014
+++ src/sys/arch/atari/atari/intr.c	Fri Sep 26 13:11:05 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.24 2014/09/21 15:49:21 christos Exp $	*/
+/*	$NetBSD: intr.c,v 1.25 2014/09/26 17:11:05 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.24 2014/09/21 15:49:21 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.25 2014/09/26 17:11:05 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -141,14 +141,16 @@ intr_establish(int vector, int type, int
 		ih-ih_intrcnt = intrcnt_auto[vector-1];
 		break;
 	case USER_VEC:
-		if (vector  UVEC_MIN || vector  UVEC_MAX)
+		if (vector  UVEC_MIN || vector  UVEC_MAX) {
+			free(ih, M_DEVBUF);
 			return NULL;
+		}
 		vec_list = uservec_list[vector];
 		hard_vec = uservects[vector];
 		ih-ih_intrcnt = intrcnt_user[vector];
 		break;
 	default:
-		printf(intr_establish: bogus vector type\n);
+		printf(%s: bogus vector type\n, __func__);
 		free(ih, M_DEVBUF);
 		return NULL;
 	}

CVS commit: src/sys/arch/evbarm/odroid

[Reinoud Zandijk]

Module Name:src
Committed By:   reinoud
Date:   Fri Sep 26 18:26:24 UTC 2014

Modified Files:
src/sys/arch/evbarm/odroid: odroid_start.S

Log Message:
Decouple sscom console choice from Exynos SoC ID


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/odroid/odroid_start.S

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

Modified files:

Index: src/sys/arch/evbarm/odroid/odroid_start.S
diff -u src/sys/arch/evbarm/odroid/odroid_start.S:1.3 src/sys/arch/evbarm/odroid/odroid_start.S:1.4
--- src/sys/arch/evbarm/odroid/odroid_start.S:1.3	Mon Aug  4 18:14:43 2014
+++ src/sys/arch/evbarm/odroid/odroid_start.S	Fri Sep 26 18:26:24 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: odroid_start.S,v 1.3 2014/08/04 18:14:43 reinoud Exp $	*/
+/*	$NetBSD: odroid_start.S,v 1.4 2014/09/26 18:26:24 reinoud Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
 
 #include evbarm/odroid/platform.h
 
-RCSID($NetBSD: odroid_start.S,v 1.3 2014/08/04 18:14:43 reinoud Exp $)
+RCSID($NetBSD: odroid_start.S,v 1.4 2014/09/26 18:26:24 reinoud Exp $)
 
 
 #if defined(VERBOSE_INIT_ARM)
@@ -178,13 +178,20 @@ _C_LABEL(odroid_start):
 	str	r0, [r4]// save pop_id
 #endif
 
-	/* Pick uart address and initial MMU table for the SoC */
-	mov	r2, #0
-	ubfx	r1, r5, #24, #8
-	cmp	r1, #0xe5
-	movteq	r2, #:upper16:(EXYNOS_CORE_PBASE + EXYNOS5_UART2_OFFSET)
-	cmp	r1, #0xe4
-	movteq	r2, #:upper16:(EXYNOS_CORE_PBASE + EXYNOS4_UART1_OFFSET)
+	/* Pick uart address for the SoC */
+#ifdef EXYNOS4
+	adr	r1, .Lsscom_exynos4_table
+#endif
+#ifdef EXYNO55
+	adr	r1, .Lsscom_exynos5_table
+#endif
+#ifdef SSCOM0CONSOLE
+	ldr	r2, [r1, #0]
+#endif
+#ifdef SSCOM1CONSOLE
+	ldr	r2, [r1, #4]
+#endif
+	add	r2, r2, #EXYNOS_CORE_PBASE
 	mcr	p15, 0, r2, c13, c0, 3		// TPIDRURO set (uart address)
 
 	/*
@@ -237,6 +244,20 @@ _C_LABEL(odroid_start):
 
 	/* NOTREACHED */
 
+
+.Lsscom_exynos4_table:
+	.word	EXYNOS4_UART0_OFFSET
+	.word	EXYNOS4_UART1_OFFSET
+	.word	EXYNOS4_UART2_OFFSET
+	.word	EXYNOS4_UART3_OFFSET
+
+.Lsscom_exynos5_table:
+	.word	EXYNOS5_UART0_OFFSET
+	.word	EXYNOS5_UART1_OFFSET
+	.word	EXYNOS5_UART2_OFFSET
+	.word	EXYNOS5_UART3_OFFSET
+
+
 #if defined(VERBOSE_INIT_ARM)
 	.align 0
 	.global xputc

CVS commit: src/sys/arch/evbarm/odroid

[Reinoud Zandijk]

Module Name:src
Committed By:   reinoud
Date:   Fri Sep 26 18:59:29 UTC 2014

Modified Files:
src/sys/arch/evbarm/odroid: odroid_machdep.c odroid_start.S

Log Message:
Redo the magic of console selection


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/odroid/odroid_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/odroid/odroid_start.S

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

Modified files:

Index: src/sys/arch/evbarm/odroid/odroid_machdep.c
diff -u src/sys/arch/evbarm/odroid/odroid_machdep.c:1.35 src/sys/arch/evbarm/odroid/odroid_machdep.c:1.36
--- src/sys/arch/evbarm/odroid/odroid_machdep.c:1.35	Wed Sep 24 20:38:33 2014
+++ src/sys/arch/evbarm/odroid/odroid_machdep.c	Fri Sep 26 18:59:29 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: odroid_machdep.c,v 1.35 2014/09/24 20:38:33 reinoud Exp $ */
+/*	$NetBSD: odroid_machdep.c,v 1.36 2014/09/26 18:59:29 reinoud Exp $ */
 
 /*
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.35 2014/09/24 20:38:33 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.36 2014/09/26 18:59:29 reinoud Exp $);
 
 #include opt_evbarm_boardtype.h
 #include opt_exynos.h
@@ -108,44 +108,9 @@ __KERNEL_RCSID(0, $NetBSD: odroid_machd
 #include arm/samsung/sscom_var.h
 #include arm/samsung/sscom_reg.h
 
-static const struct sscom_uart_info exynos_uarts[] = {
-#ifdef EXYNOS5
-	{
-		.unit= 0,
-		.iobase = EXYNOS5_UART0_OFFSET
-	},
-	{
-		.unit= 1,
-		.iobase = EXYNOS5_UART1_OFFSET
-	},
-	{
-		.unit= 2,
-		.iobase = EXYNOS5_UART2_OFFSET
-	},
-	{
-		.unit= 3,
-		.iobase = EXYNOS5_UART3_OFFSET
-	},
-#endif
-#ifdef EXYNOS4
-	{
-		.unit= 0,
-		.iobase = EXYNOS4_UART0_OFFSET
-	},
-	{
-		.unit= 1,
-		.iobase = EXYNOS4_UART1_OFFSET
-	},
-	{
-		.unit= 2,
-		.iobase = EXYNOS4_UART2_OFFSET
-	},
-	{
-		.unit= 3,
-		.iobase = EXYNOS4_UART3_OFFSET
-	},
-#endif
-};
+extern const int num_exynos_uarts_entries;
+extern const struct sscom_uart_info exynos_uarts[];
+KASSERT(sizeof(struct sscom_uart_info) == 8);
 
 /* sanity checks for serial console */
 #ifndef CONSPEED
@@ -161,7 +126,7 @@ static const struct sscom_uart_info exyn
 //static const bus_addr_t conaddr = CONADDR;
 static const int conspeed = CONSPEED;
 static const int conmode = CONMODE;
-#endif /*defined(KGDB) || defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE) */
+#endif /*defined(KGDB) || defined(SSCOM*CONSOLE) */
 
 /*
  * uboot passes 4 arguments to us.
@@ -458,12 +423,13 @@ consinit(void)
 	freq = (freq + conspeed / 2) / 1000;
 	freq *= 1000;
 
-	for (i = 0; i  __arraycount(exynos_uarts); i++) {
+	/* go trough all entries */
+	for (i = 0; i  num_exynos_uarts_entries; i++) {
 		/* attach console */
 		if (exynos_uarts[i].iobase + EXYNOS_CORE_PBASE == iobase)
 			break;
 	}
-	KASSERT(i  __arraycount(exynos_uarts));
+	KASSERT(i  num_exynos_uarts_entries);
 	printf(%s: attaching console @ %#PRIxPTR (%u HZ, %u bps)\n,
 	__func__, iobase, freq, conspeed);
 	if (sscom_cnattach(bst, exynos_core_bsh, exynos_uarts[i],

Index: src/sys/arch/evbarm/odroid/odroid_start.S
diff -u src/sys/arch/evbarm/odroid/odroid_start.S:1.4 src/sys/arch/evbarm/odroid/odroid_start.S:1.5
--- src/sys/arch/evbarm/odroid/odroid_start.S:1.4	Fri Sep 26 18:26:24 2014
+++ src/sys/arch/evbarm/odroid/odroid_start.S	Fri Sep 26 18:59:29 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: odroid_start.S,v 1.4 2014/09/26 18:26:24 reinoud Exp $	*/
+/*	$NetBSD: odroid_start.S,v 1.5 2014/09/26 18:59:29 reinoud Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
 
 #include evbarm/odroid/platform.h
 
-RCSID($NetBSD: odroid_start.S,v 1.4 2014/09/26 18:26:24 reinoud Exp $)
+RCSID($NetBSD: odroid_start.S,v 1.5 2014/09/26 18:59:29 reinoud Exp $)
 
 
 #if defined(VERBOSE_INIT_ARM)
@@ -186,10 +186,16 @@ _C_LABEL(odroid_start):
 	adr	r1, .Lsscom_exynos5_table
 #endif
 #ifdef SSCOM0CONSOLE
-	ldr	r2, [r1, #0]
+	ldr	r2, [r1, #0*8+4]
 #endif
 #ifdef SSCOM1CONSOLE
-	ldr	r2, [r1, #4]
+	ldr	r2, [r1, #1*8+4]
+#endif
+#ifdef SSCOM2CONSOLE
+	ldr	r2, [r1, #2*8+4]
+#endif
+#ifdef SSCOM3CONSOLE
+	ldr	r2, [r1, #3*8+4]
 #endif
 	add	r2, r2, #EXYNOS_CORE_PBASE
 	mcr	p15, 0, r2, c13, c0, 3		// TPIDRURO set (uart address)
@@ -244,17 +250,30 @@ _C_LABEL(odroid_start):
 
 	/* NOTREACHED */
 
-
+	.align 0
+	.global _C_LABEL(num_exynos_uarts_entries)
+_C_LABEL(num_exynos_uarts_entries):
+	.word	8// update number of entries!!!
+	.global _C_LABEL(exynos_uarts)
+_C_LABEL(exynos_uarts):
 .Lsscom_exynos4_table:
+	.word	0
 	.word	EXYNOS4_UART0_OFFSET
+	.word	1
 	.word	EXYNOS4_UART1_OFFSET
+	.word	2
 	.word	EXYNOS4_UART2_OFFSET
+	.word	3
 	.word	EXYNOS4_UART3_OFFSET
 
 .Lsscom_exynos5_table:
+	.word	0
 	.word	EXYNOS5_UART0_OFFSET
+	.word	1
 	.word	EXYNOS5_UART1_OFFSET
+	.word	2
 	.word	EXYNOS5_UART2_OFFSET
+	.word	3
 	.word	EXYNOS5_UART3_OFFSET
 
 

CVS commit: src/sys/arch/evbarm/odroid

[Reinoud Zandijk]

Module Name:src
Committed By:   reinoud
Date:   Fri Sep 26 19:03:25 UTC 2014

Modified Files:
src/sys/arch/evbarm/odroid: odroid_machdep.c

Log Message:
Remove KASSERT that bugs compilation


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/odroid/odroid_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/evbarm/odroid/odroid_machdep.c
diff -u src/sys/arch/evbarm/odroid/odroid_machdep.c:1.36 src/sys/arch/evbarm/odroid/odroid_machdep.c:1.37
--- src/sys/arch/evbarm/odroid/odroid_machdep.c:1.36	Fri Sep 26 18:59:29 2014
+++ src/sys/arch/evbarm/odroid/odroid_machdep.c	Fri Sep 26 19:03:24 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: odroid_machdep.c,v 1.36 2014/09/26 18:59:29 reinoud Exp $ */
+/*	$NetBSD: odroid_machdep.c,v 1.37 2014/09/26 19:03:24 reinoud Exp $ */
 
 /*
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.36 2014/09/26 18:59:29 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.37 2014/09/26 19:03:24 reinoud Exp $);
 
 #include opt_evbarm_boardtype.h
 #include opt_exynos.h
@@ -110,7 +110,6 @@ __KERNEL_RCSID(0, $NetBSD: odroid_machd
 
 extern const int num_exynos_uarts_entries;
 extern const struct sscom_uart_info exynos_uarts[];
-KASSERT(sizeof(struct sscom_uart_info) == 8);
 
 /* sanity checks for serial console */
 #ifndef CONSPEED

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Sep 26 19:25:56 UTC 2014

Modified Files:
src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.powerpc
ad.riscv md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc
ad.riscv md.amd64 md.sparc64 shl.mi

Log Message:
add execvpe,execlpe bump.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base/ad.riscv
cvs rdiff -u -r1.246 -r1.247 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.234 -r1.235 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.715 -r1.716 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1913 -r1.1914 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/debug/ad.riscv
cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.74 -r1.75 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/ad.aarch64
diff -u src/distrib/sets/lists/base/ad.aarch64:1.6 src/distrib/sets/lists/base/ad.aarch64:1.7
--- src/distrib/sets/lists/base/ad.aarch64:1.6	Wed Sep 24 14:16:37 2014
+++ src/distrib/sets/lists/base/ad.aarch64	Fri Sep 26 15:25:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.6 2014/09/24 18:16:37 christos Exp $
+# $NetBSD: ad.aarch64,v 1.7 2014/09/26 19:25:56 christos Exp $
 ./lib/eabi	base-compat-shlib	compat
 ./lib/eabi/npf	base-npf-shlib		compat
 ./lib/eabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -108,7 +108,7 @@
 ./usr/lib/eabi/libc++.so.1			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/eabi/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/eabi/libc.so.12base-compat-shlib	compat,pic
-./usr/lib/eabi/libc.so.12.194			base-compat-shlib	compat,pic
+./usr/lib/eabi/libc.so.12.195			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/eabi/libcom_err.so.7.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/eabi/libcrypt.so.1			base-compat-shlib	compat,pic
@@ -422,7 +422,7 @@
 ./usr/lib/eabihf/libc++.so.1			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/eabihf/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/eabihf/libc.so.12base-compat-shlib	compat,pic
-./usr/lib/eabihf/libc.so.12.194			base-compat-shlib	compat,pic
+./usr/lib/eabihf/libc.so.12.195			base-compat-shlib	compat,pic
 ./usr/lib/eabihf/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/eabihf/libcom_err.so.7.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/eabihf/libcrypt.so.1			base-compat-shlib	compat,pic
@@ -736,7 +736,7 @@
 ./usr/lib/oabi/libc++.so.1			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/oabi/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/oabi/libc.so.12			base-compat-shlib	compat,pic
-./usr/lib/oabi/libc.so.12.194			base-compat-shlib	compat,pic
+./usr/lib/oabi/libc.so.12.195			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/oabi/libcom_err.so.7.0		base-compat-shlib	compat,pic,kerberos
 ./usr/lib/oabi/libcrypt.so.1			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.55 src/distrib/sets/lists/base/ad.arm:1.56
--- src/distrib/sets/lists/base/ad.arm:1.55	Wed Sep 24 14:16:37 2014
+++ src/distrib/sets/lists/base/ad.arm	Fri Sep 26 15:25:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.55 2014/09/24 18:16:37 christos Exp $
+# $NetBSD: ad.arm,v 1.56 2014/09/26 19:25:56 christos Exp $
 ./lib/oabi	base-compat-shlib	compat
 ./lib/oabi/npf	base-npf-shlib		compat
 ./lib/oabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -92,7 +92,7 @@
 ./usr/lib/oabi/libc++.so.1			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/oabi/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/oabi/libc.so.12			base-compat-shlib	compat,pic
-./usr/lib/oabi/libc.so.12.194			base-compat-shlib	compat,pic
+./usr/lib/oabi/libc.so.12.195			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libc_vfp.so.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libc_vfp.so.0.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos

Index: 

CVS commit: src/sys/arch/evbarm/odroid

[Reinoud Zandijk]

Module Name:src
Committed By:   reinoud
Date:   Fri Sep 26 19:27:05 UTC 2014

Modified Files:
src/sys/arch/evbarm/odroid: odroid_machdep.c

Log Message:
EXYNOS4 and EXYNOS5 are now exclusive in odroid_machdep.c


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/odroid/odroid_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/evbarm/odroid/odroid_machdep.c
diff -u src/sys/arch/evbarm/odroid/odroid_machdep.c:1.37 src/sys/arch/evbarm/odroid/odroid_machdep.c:1.38
--- src/sys/arch/evbarm/odroid/odroid_machdep.c:1.37	Fri Sep 26 19:03:24 2014
+++ src/sys/arch/evbarm/odroid/odroid_machdep.c	Fri Sep 26 19:27:05 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: odroid_machdep.c,v 1.37 2014/09/26 19:03:24 reinoud Exp $ */
+/*	$NetBSD: odroid_machdep.c,v 1.38 2014/09/26 19:27:05 reinoud Exp $ */
 
 /*
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.37 2014/09/26 19:03:24 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: odroid_machdep.c,v 1.38 2014/09/26 19:27:05 reinoud Exp $);
 
 #include opt_evbarm_boardtype.h
 #include opt_exynos.h
@@ -94,6 +94,15 @@ __KERNEL_RCSID(0, $NetBSD: odroid_machd
 #include dev/usb/ukbdvar.h
 #include net/if_ether.h
 
+
+/* sanity checks */
+#ifndef EXYNOS4
+#ifndef EXYNOS5
+#error Please define _either_ an EXYNOS4 or an EXYNOS5 cpu, not mixed
+#endif
+#endif
+
+
 /* serial console stuff */
 #include sscom.h
 #include opt_sscom.h
@@ -338,16 +347,14 @@ initarm(void *arg)
 	ram_size = (psize_t) 0xC000 - 0x4000;
 
 #if defined(EXYNOS4)
-	if (IS_EXYNOS4_P()) {
-		switch (exynos_pop_id) {
-		case EXYNOS_PACKAGE_ID_2_GIG:
-			KASSERT(ram_size = 2UL*1024*1024*1024);
-			break;
-		default:
-			printf(Unknown PoP package id 0x%08x, assuming 1Gb\n,
-exynos_pop_id);
-			ram_size = (psize_t) 0x1000;
-		}
+	switch (exynos_pop_id) {
+	case EXYNOS_PACKAGE_ID_2_GIG:
+		KASSERT(ram_size = 2UL*1024*1024*1024);
+		break;
+	default:
+		printf(Unknown PoP package id 0x%08x, assuming 1Gb\n,
+			exynos_pop_id);
+		ram_size = (psize_t) 0x1000;
 	}
 #endif
 
@@ -666,7 +673,7 @@ odroid_device_register(device_t self, vo
 	}
 
 #ifdef EXYNOS4
-	if (device_is_a(self, exyogpio)  (IS_EXYNOS4_P())) {
+	if (device_is_a(self, exyogpio)) {
 		/* unused bits */
 		odroid_exynos4_gpio_ncs(self, dict);
 
@@ -679,7 +686,7 @@ odroid_device_register(device_t self, vo
 
 		prop_dictionary_set_cstring(dict, p3v3_en, GPA1[3]);
 	}
-	if (device_is_a(self, exyoiic)  (IS_EXYNOS4_P())) {
+	if (device_is_a(self, exyoiic)) {
 		prop_dictionary_set_bool(dict, iic0_enable, true);
 		prop_dictionary_set_bool(dict, iic1_enable, true);
 		prop_dictionary_set_bool(dict, iic2_enable, true);
@@ -692,7 +699,7 @@ odroid_device_register(device_t self, vo
 	}
 #endif
 #ifdef EXYNOS5
-	if (device_is_a(self, exyogpio)  (IS_EXYNOS5_P())) {
+	if (device_is_a(self, exyogpio)) {
 		/* unused bits */
 		odroid_exynos5_gpio_ncs(self, dict);
 
@@ -704,7 +711,7 @@ odroid_device_register(device_t self, vo
 		/* internal hub IIRC, unknown if this line exists */
 		//prop_dictionary_set_cstring(dict, p3v3_en, GPA1[3]);
 	}
-	if (device_is_a(self, exyoiic)  (IS_EXYNOS5_P())) {
+	if (device_is_a(self, exyoiic)) {
 		/* IIC0 not used (NC) */
 		prop_dictionary_set_bool(dict, iic1_enable, true);
 		prop_dictionary_set_bool(dict, iic2_enable, true);

CVS commit: src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Sep 26 19:28:03 UTC 2014

Modified Files:
src/include: unistd.h
src/lib/libc: shlib_version
src/lib/libc/gen: Makefile.inc exec.3 execlp.c execvp.c
src/lib/libc/include: namespace.h

Log Message:
add execvpe, execlpe (reviewed by phone)


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/include/unistd.h
cvs rdiff -u -r1.255 -r1.256 src/lib/libc/shlib_version
cvs rdiff -u -r1.188 -r1.189 src/lib/libc/gen/Makefile.inc
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/gen/exec.3
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/gen/execlp.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libc/gen/execvp.c
cvs rdiff -u -r1.175 -r1.176 src/lib/libc/include/namespace.h

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

Modified files:

Index: src/include/unistd.h
diff -u src/include/unistd.h:1.142 src/include/unistd.h:1.143
--- src/include/unistd.h:1.142	Fri Jul 25 04:30:47 2014
+++ src/include/unistd.h	Fri Sep 26 15:28:03 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: unistd.h,v 1.142 2014/07/25 08:30:47 dholland Exp $	*/
+/*	$NetBSD: unistd.h,v 1.143 2014/09/26 19:28:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -328,6 +328,8 @@ int	 des_setkey(const char *);
 int	 dup3(int, int, int);
 void	 endusershell(void);
 int	 exect(const char *, char * const *, char * const *);
+int	 execvpe(const char *, char * const *, char * const *);
+int	 execlpe(const char *, const char *, ...);
 int	 fchroot(int);
 int	 fdiscard(int, off_t, off_t);
 int	 fsync_range(int, int, off_t, off_t);

Index: src/lib/libc/shlib_version
diff -u src/lib/libc/shlib_version:1.255 src/lib/libc/shlib_version:1.256
--- src/lib/libc/shlib_version:1.255	Wed Sep 24 14:16:37 2014
+++ src/lib/libc/shlib_version	Fri Sep 26 15:28:03 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.255 2014/09/24 18:16:37 christos Exp $
+#	$NetBSD: shlib_version,v 1.256 2014/09/26 19:28:03 christos Exp $
 #	Remember to update distrib/sets/lists/base/shl.* when changing
 #
 # things we wish to do on next major version bump:
@@ -42,4 +42,4 @@
 # - move gethostbyname to a compat library
 # - remove arc4random(3) API
 major=12
-minor=194
+minor=195

Index: src/lib/libc/gen/Makefile.inc
diff -u src/lib/libc/gen/Makefile.inc:1.188 src/lib/libc/gen/Makefile.inc:1.189
--- src/lib/libc/gen/Makefile.inc:1.188	Fri Jun 13 11:45:05 2014
+++ src/lib/libc/gen/Makefile.inc	Fri Sep 26 15:28:03 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.188 2014/06/13 15:45:05 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.189 2014/09/26 19:28:03 christos Exp $
 #	from: @(#)Makefile.inc	8.6 (Berkeley) 5/4/95
 
 # gen sources
@@ -94,8 +94,8 @@ MLINKS+=endutxent.3 getutxent.3 endutxen
 MLINKS+=err.3 verr.3 err.3 errx.3 err.3 verrx.3 err.3 warn.3 err.3 vwarn.3 \
 err.3 warnx.3 err.3 vwarnx.3 err.3 errc.3 err.3 verrc.3 err.3 warnc.3 \
 	err.3 vwarnc.3
-MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 execv.3 \
-	exec.3 execvp.3 exec.3 exect.3
+MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 execlpe.3 \
+	exec.3 execv.3 exec.3 execvp.3 exec.3 execvpe.3 exec.3 exect.3 
 MLINKS+=extattr_namespace_to_string.3 extattr_string_to_namespace.3 \
 	extattr_copy_file.3 extattr_copy_fd.3 \
 	extattr_copy_file.3 extattr_copy_link.3 \

Index: src/lib/libc/gen/exec.3
diff -u src/lib/libc/gen/exec.3:1.22 src/lib/libc/gen/exec.3:1.23
--- src/lib/libc/gen/exec.3:1.22	Thu Nov 22 11:19:49 2012
+++ src/lib/libc/gen/exec.3	Fri Sep 26 15:28:03 2014
@@ -1,4 +1,4 @@
-.\	$NetBSD: exec.3,v 1.22 2012/11/22 16:19:49 abs Exp $
+.\	$NetBSD: exec.3,v 1.23 2014/09/26 19:28:03 christos Exp $
 .\
 .\ Copyright (c) 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\ @(#)exec.3	8.3 (Berkeley) 1/24/94
 .\
-.Dd May 6, 2005
+.Dd September 26, 2014
 .Dt EXEC 3
 .Os
 .Sh NAME
@@ -50,6 +50,8 @@
 .Ft int
 .Fn execlp const char *file const char *arg ...
 .Ft int
+.Fn execlpe const char *path const char *arg ... char *const envp[]
+.Ft int
 .Fn execle const char *path const char *arg ... char *const envp[]
 .Ft int
 .Fn exect const char *path char *const argv[]  char *const envp[]
@@ -57,6 +59,8 @@
 .Fn execv const char *path char *const argv[]
 .Ft int
 .Fn execvp const char *file char *const argv[]
+.Ft int
+.Fn execvpe const char *file char *const argv[], char *const envp[]
 .Sh DESCRIPTION
 The
 .Fn exec
@@ -80,6 +84,7 @@ The
 and subsequent ellipses in the
 .Fn execl ,
 .Fn execlp ,
+.Fn execlpe ,
 and
 .Fn execle
 functions can be thought of as
@@ -100,8 +105,9 @@ pointer.
 The
 .Fn exect ,
 .Fn execv ,
+.Fn execvp ,
 and
-.Fn execvp
+.Fn execvpe
 functions provide an array of pointers to null-terminated strings that
 represent the argument list available to the new program.
 The first argument, by convention, should point to the file name associated
@@ -135,9 +141,11 @@ in 

CVS commit: src/sys/compat/linux/arch/powerpc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Sep 26 20:32:52 UTC 2014

Modified Files:
src/sys/compat/linux/arch/powerpc: linux_ptrace.c

Log Message:
set error return on error (from max)


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/compat/linux/arch/powerpc/linux_ptrace.c

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

Modified files:

Index: src/sys/compat/linux/arch/powerpc/linux_ptrace.c
diff -u src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.26 src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.27
--- src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.26	Sun Sep 21 12:59:08 2014
+++ src/sys/compat/linux/arch/powerpc/linux_ptrace.c	Fri Sep 26 16:32:52 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_ptrace.c,v 1.26 2014/09/21 16:59:08 christos Exp $ */
+/*	$NetBSD: linux_ptrace.c,v 1.27 2014/09/26 20:32:52 christos Exp $ */
 
 /*-
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_ptrace.c,v 1.26 2014/09/21 16:59:08 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_ptrace.c,v 1.27 2014/09/26 20:32:52 christos Exp $);
 
 #include sys/param.h
 #include sys/malloc.h
@@ -159,6 +159,7 @@ linux_sys_ptrace_arch(struct lwp *l, con
 	mutex_enter(proc_lock);
 	if ((t = proc_find(SCARG(uap, pid))) == NULL) {
 		mutex_exit(proc_lock);
+		error = ESRCH;
 		goto out;
 	}
 	mutex_enter(t-p_lock);

CVS commit: src/external/bsd/dhcp

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Sep 26 22:18:48 UTC 2014

Modified Files:
src/external/bsd/dhcp: Makefile.inc

Log Message:
The crypto-enabled dhclient command needs more libraries burned in so that
it does not depend on /usr/lib
XXX: pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/dhcp/Makefile.inc

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/dhcp/Makefile.inc
diff -u src/external/bsd/dhcp/Makefile.inc:1.11 src/external/bsd/dhcp/Makefile.inc:1.12
--- src/external/bsd/dhcp/Makefile.inc:1.11	Sat Jul 12 08:11:22 2014
+++ src/external/bsd/dhcp/Makefile.inc	Fri Sep 26 18:18:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2014/07/12 12:11:22 spz Exp $
+# $NetBSD: Makefile.inc,v 1.12 2014/09/26 22:18:48 christos Exp $
 
 WARNS?=	1	# XXX -Wshadow -Wcast-qual -Wsign-compare
 
@@ -36,9 +36,6 @@ LDADD+=-Wl,-Bstatic
 .endif
 LDADD+= -lirs -lisccfg -ldns -lisc
 LDADD+=-lpthread
-.if defined(PROG)  ${PROG} == dhclient
-LDADD+=-Wl,-Bdynamic
-.endif
 .if (${MKCRYPTO} != no)
 .if (${MKKERBEROS} != no)
 LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
@@ -46,6 +43,9 @@ LDADD+= -lgssapi -lkrb5 -lhx509 -lheimnt
 DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
 	${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
 .endif
+.if defined(PROG)  ${PROG} == dhclient
+LDADD+=-Wl,-Bdynamic
+.endif
 LDADD+= -lcrypto -lipsec -lcrypt
 DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
 .endif

CVS commit: src/lib/libc/gen

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Sep 26 23:57:26 UTC 2014

Modified Files:
src/lib/libc/gen: exec.3

Log Message:
missed one reference.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/gen/exec.3

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

Modified files:

Index: src/lib/libc/gen/exec.3
diff -u src/lib/libc/gen/exec.3:1.23 src/lib/libc/gen/exec.3:1.24
--- src/lib/libc/gen/exec.3:1.23	Fri Sep 26 15:28:03 2014
+++ src/lib/libc/gen/exec.3	Fri Sep 26 19:57:26 2014
@@ -1,4 +1,4 @@
-.\	$NetBSD: exec.3,v 1.23 2014/09/26 19:28:03 christos Exp $
+.\	$NetBSD: exec.3,v 1.24 2014/09/26 23:57:26 christos Exp $
 .\
 .\ Copyright (c) 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -119,7 +119,8 @@ be terminated by a
 pointer.
 .Pp
 The
-.Fn execle
+.Fn execle ,
+.Fn execlpe
 and
 .Fn exect
 functions also specify the environment of the executed process by following

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

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Sat Sep 27 01:14:56 UTC 2014

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

Log Message:
Import dhcpcd-6.4.6 with the following changes:

  *  Detect removal of IPv6 routes
  *  Don't add link-local addresses to POINTOPOINT interfaces
  *  Don't discard expired DHCPv6 leases when dumping them
  *  If a DHCPv6 lease has no timers, expire it right away
  *  Report delegated addresses
  *  Call dhcpcd-run-hooks correctly when delegated prefixes already exist
  *  Fix a memory error when ia_* config exists but IPv6 is disabled
  *  Ensure servername and bootfile are safely exported
  *  Sanitise the following characters using svis(3) with VIS_CTYLE and
 VIS_OCTAL:
 | ^  ;   ( ) $ ` \  ' tab newline
 This allows a non buggy unvis(1) to decode it 100% and stays compatible
 with how dhcpcd used to handle encoding on most platforms.
 For systems that supply svis(3) there is a code reduction, for systems
 that do not, a slight code increase. This change mitigates systems
 affected by bash CVE-2014-6271 and CVE-2014-7169.


Status:

Vendor Tag: roy
Release Tags:   dhcpcd-6-4-6

U src/external/bsd/dhcpcd/dist/common.c
U src/external/bsd/dhcpcd/dist/control.c
C src/external/bsd/dhcpcd/dist/dhcpcd.c
U src/external/bsd/dhcpcd/dist/duid.c
U src/external/bsd/dhcpcd/dist/eloop.c
U src/external/bsd/dhcpcd/dist/if.c
U src/external/bsd/dhcpcd/dist/if-options.c
C src/external/bsd/dhcpcd/dist/script.c
U src/external/bsd/dhcpcd/dist/dhcp-common.c
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c
C src/external/bsd/dhcpcd/dist/if-bsd.c
U src/external/bsd/dhcpcd/dist/arp.c
C src/external/bsd/dhcpcd/dist/dhcp.c
U src/external/bsd/dhcpcd/dist/ipv4.c
U src/external/bsd/dhcpcd/dist/ipv4ll.c
U src/external/bsd/dhcpcd/dist/ipv6.c
U src/external/bsd/dhcpcd/dist/ipv6nd.c
U src/external/bsd/dhcpcd/dist/dhcp6.c
U src/external/bsd/dhcpcd/dist/auth.c
U src/external/bsd/dhcpcd/dist/dhcpcd.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in
C src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
C src/external/bsd/dhcpcd/dist/dhcpcd.8.in
U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
U src/external/bsd/dhcpcd/dist/arp.h
U src/external/bsd/dhcpcd/dist/auth.h
U src/external/bsd/dhcpcd/dist/bpf-filter.h
U src/external/bsd/dhcpcd/dist/common.h
U src/external/bsd/dhcpcd/dist/config.h
U src/external/bsd/dhcpcd/dist/control.h
U src/external/bsd/dhcpcd/dist/defs.h
U src/external/bsd/dhcpcd/dist/dev.h
U src/external/bsd/dhcpcd/dist/dhcp-common.h
U src/external/bsd/dhcpcd/dist/dhcp.h
U src/external/bsd/dhcpcd/dist/dhcp6.h
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h
U src/external/bsd/dhcpcd/dist/dhcpcd.h
U src/external/bsd/dhcpcd/dist/duid.h
U src/external/bsd/dhcpcd/dist/eloop.h
U src/external/bsd/dhcpcd/dist/if-options.h
U src/external/bsd/dhcpcd/dist/if.h
U src/external/bsd/dhcpcd/dist/ipv4.h
U src/external/bsd/dhcpcd/dist/ipv4ll.h
U src/external/bsd/dhcpcd/dist/ipv6.h
U src/external/bsd/dhcpcd/dist/ipv6nd.h
U src/external/bsd/dhcpcd/dist/script.h
U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c
U src/external/bsd/dhcpcd/dist/crypt/crypt.h
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind

6 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist

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

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Sat Sep 27 01:17:34 UTC 2014

Modified Files:
src/external/bsd/dhcpcd/dist: dhcp.c dhcpcd-run-hooks.8.in dhcpcd.8.in
dhcpcd.c if-bsd.c script.c

Log Message:
Sync


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/dhcpcd.c \
src/external/bsd/dhcpcd/dist/if-bsd.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcpcd/dist/script.c

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

Modified files:

Index: src/external/bsd/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.16 src/external/bsd/dhcpcd/dist/dhcp.c:1.17
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.16	Tue Sep 16 22:27:04 2014
+++ src/external/bsd/dhcpcd/dist/dhcp.c	Sat Sep 27 01:17:34 2014
@@ -1,5 +1,5 @@
 #include sys/cdefs.h
- __RCSID($NetBSD: dhcp.c,v 1.16 2014/09/16 22:27:04 roy Exp $);
+ __RCSID($NetBSD: dhcp.c,v 1.17 2014/09/27 01:17:34 roy Exp $);
 
 /*
  * dhcpcd - DHCP client daemon
@@ -1204,7 +1204,7 @@ dhcp_env(char **env, const char *prefix,
 	struct dhcp_opt *opt, *vo;
 	size_t e, i, pl;
 	char **ep;
-	char cidr[4];
+	char cidr[4], safe[(BOOTFILE_LEN * 4) + 1];
 	uint8_t overl = 0;
 	uint32_t en;
 
@@ -1271,11 +1271,16 @@ dhcp_env(char **env, const char *prefix,
 		setvar(ep, prefix, network_number, inet_ntoa(addr));
 	}
 
-	if (*dhcp-bootfile  !(overl  1))
-		setvar(ep, prefix, filename, (const char *)dhcp-bootfile);
-	if (*dhcp-servername  !(overl  2))
-		setvar(ep, prefix, server_name,
-		(const char *)dhcp-servername);
+	if (*dhcp-bootfile  !(overl  1)) {
+		print_string(safe, sizeof(safe),
+		dhcp-bootfile, sizeof(dhcp-bootfile));
+		setvar(ep, prefix, filename, safe);
+	}
+	if (*dhcp-servername  !(overl  2)) {
+		print_string(safe, sizeof(safe),
+		dhcp-servername, sizeof(dhcp-servername));
+		setvar(ep, prefix, server_name, safe);
+	}
 
 	/* Zero our indexes */
 	if (env) {
@@ -2184,7 +2189,7 @@ log_dhcp1(int lvl, const char *msg,
 const struct in_addr *from, int ad)
 {
 	const char *tfrom;
-	char *a;
+	char *a,  sname[sizeof(dhcp-servername) * 4];
 	struct in_addr addr;
 	int r;
 
@@ -2203,12 +2208,14 @@ log_dhcp1(int lvl, const char *msg,
 	tfrom = from;
 	r = get_option_addr(iface-ctx, addr, dhcp, DHO_SERVERID);
 	if (dhcp-servername[0]  r == 0) {
+		print_string(sname, sizeof(sname),
+		dhcp-servername, strlen((const char *)dhcp-servername));
 		if (a == NULL)
 			syslog(lvl, %s: %s %s %s `%s', iface-name, msg,
-			tfrom, inet_ntoa(addr), dhcp-servername);
+			tfrom, inet_ntoa(addr), sname);
 		else
 			syslog(lvl, %s: %s %s %s %s `%s', iface-name, msg, a,
-			tfrom, inet_ntoa(addr), dhcp-servername);
+			tfrom, inet_ntoa(addr), sname);
 	} else {
 		if (r != 0) {
 			tfrom = via;

Index: src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in:1.6 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in:1.7
--- src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in:1.6	Tue Sep 16 22:27:04 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in	Sat Sep 27 01:17:34 2014
@@ -1,5 +1,5 @@
-.\ $NetBSD: dhcpcd-run-hooks.8.in,v 1.6 2014/09/16 22:27:04 roy Exp $
-.\ Copyright (c) 2006-2013 Roy Marples
+.\ $NetBSD: dhcpcd-run-hooks.8.in,v 1.7 2014/09/27 01:17:34 roy Exp $
+.\ Copyright (c) 2006-2014 Roy Marples
 .\ All rights reserved
 .\
 .\ Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd September 12, 2014
+.Dd September 26, 2014
 .Dt DHCPCD-RUN-HOOKS 8
 .Os
 .Sh NAME
@@ -90,6 +90,8 @@ dhcpcd renewed it's lease.
 dhcpcd has rebound to a new DHCP server.
 .It Dv REBOOT | Dv REBOOT6
 dhcpcd successfully requested a lease from a DHCP server.
+.It Dv DELEGATED6
+dhcpcd assigned a delegated prefix to the interface.
 .It Dv IPV4LL
 dhcpcd failed to contact any DHCP servers but did obtain an IPV4LL address.
 .It Dv STATIC
@@ -135,7 +137,7 @@ and
 .Ev $RC_SVCNAME .
 The following variables will then be set, along with any protocol supplied
 ones.
-.Bl -tag -width Xinterface_order
+.Bl -tag -width xnew_dhcp6_prefix
 .It Ev $interface
 the name of the interface.
 .It Ev $reason
@@ -197,6 +199,8 @@ is connected to.
 the name of the SSID the
 .Ev interface
 was connected to.
+.It Ev $new_dhcp6_prefix
+space separated list of delegated prefixes.
 .El
 .Sh FILES
 When

Index: src/external/bsd/dhcpcd/dist/dhcpcd.8.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.30 src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.31
--- src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.30	Tue Sep 16 22:27:04 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.8.in	

CVS commit: src/doc

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Sat Sep 27 01:18:49 UTC 2014

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note import of dhcpcd-6.4.6


To generate a diff of this commit:
cvs rdiff -u -r1.1151 -r1.1152 src/doc/3RDPARTY
cvs rdiff -u -r1.1983 -r1.1984 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.1151 src/doc/3RDPARTY:1.1152
--- src/doc/3RDPARTY:1.1151	Thu Sep 18 20:47:39 2014
+++ src/doc/3RDPARTY	Sat Sep 27 01:18:49 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1151 2014/09/18 20:47:39 roy Exp $
+#	$NetBSD: 3RDPARTY,v 1.1152 2014/09/27 01:18:49 roy Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -305,8 +305,8 @@ Notes:
 Use the dhcp2netbsd script.
 
 Package:	dhcpcd
-Version:	6.4.5
-Current Vers:	6.4.5
+Version:	6.4.6
+Current Vers:	6.4.6
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/dhcpcd/
 Home Page:	http://roy.marples.name/projects/dhcpcd/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1983 src/doc/CHANGES:1.1984
--- src/doc/CHANGES:1.1983	Fri Sep 26 09:02:26 2014
+++ src/doc/CHANGES	Sat Sep 27 01:18:49 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1983 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1984 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -53,3 +53,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	gpt(8): Completed overhaul, including adding follwing subcommands:
 		resize, set, unset, backup, restore, and resizedisk.
 		[jnemeth 20140926]
+	dhcpcd(8): Import dhcpcd-6.4.6. [roy 20140927]

CVS commit: src/sys/arch/evbarm/conf

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat Sep 27 04:03:25 UTC 2014

Modified Files:
src/sys/arch/evbarm/conf: NITROGEN6X mk.nitrogen6
Added Files:
src/sys/arch/evbarm/conf: NITROGEN6X_INSTALL

Log Message:
Add INSTALL kernel.  Fix .ub generation.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/NITROGEN6X \
src/sys/arch/evbarm/conf/mk.nitrogen6
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/NITROGEN6X_INSTALL

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/evbarm/conf/NITROGEN6X
diff -u src/sys/arch/evbarm/conf/NITROGEN6X:1.1 src/sys/arch/evbarm/conf/NITROGEN6X:1.2
--- src/sys/arch/evbarm/conf/NITROGEN6X:1.1	Thu Sep 25 05:05:28 2014
+++ src/sys/arch/evbarm/conf/NITROGEN6X	Sat Sep 27 04:03:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: NITROGEN6X,v 1.1 2014/09/25 05:05:28 ryo Exp $
+# $NetBSD: NITROGEN6X,v 1.2 2014/09/27 04:03:24 matt Exp $
 #
 # Nitrogen6X
 # - http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/
@@ -339,10 +339,6 @@ pseudo-device	raid			# RAIDframe disk dr
 pseudo-device	fss			# file system snapshot device
 pseudo-device	putter			# for puffs and pud
 
-pseudo-device	md			# memory disk device (ramdisk)
-options 	MEMORY_DISK_HOOKS	# enable root ramdisk
-options 	MEMORY_DISK_DYNAMIC	# loaded via kernel module(7)
-
 pseudo-device	vnd			# disk-like interface to files
 options 	VND_COMPRESSION		# compressed vnd(4)
 
Index: src/sys/arch/evbarm/conf/mk.nitrogen6
diff -u src/sys/arch/evbarm/conf/mk.nitrogen6:1.1 src/sys/arch/evbarm/conf/mk.nitrogen6:1.2
--- src/sys/arch/evbarm/conf/mk.nitrogen6:1.1	Thu Sep 25 05:05:28 2014
+++ src/sys/arch/evbarm/conf/mk.nitrogen6	Sat Sep 27 04:03:24 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.nitrogen6,v 1.1 2014/09/25 05:05:28 ryo Exp $
+#	$NetBSD: mk.nitrogen6,v 1.2 2014/09/27 04:03:24 matt Exp $
 
 SYSTEM_FIRST_OBJ=	nitrogen6_start.o
 SYSTEM_FIRST_SFILE=	${THISARM}/nitrogen6/nitrogen6_start.S
@@ -19,5 +19,15 @@ MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS}
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${OBJCOPY} -S -O binary $@ $@.bin; \
 	${OBJCOPY} -S -O binary $@ $@.bin; \
+	echo ${TOOL_GZIP} -9c $@.bin  $@.bin.gz; \
+	${TOOL_GZIP} -9c $@.bin  $@.bin.gz; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+	echo
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}

Added files:

Index: src/sys/arch/evbarm/conf/NITROGEN6X_INSTALL
diff -u /dev/null src/sys/arch/evbarm/conf/NITROGEN6X_INSTALL:1.1
--- /dev/null	Sat Sep 27 04:03:25 2014
+++ src/sys/arch/evbarm/conf/NITROGEN6X_INSTALL	Sat Sep 27 04:03:24 2014
@@ -0,0 +1,9 @@
+#	$NetBSD: NITROGEN6X_INSTALL,v 1.1 2014/09/27 04:03:24 matt Exp $
+#
+#	NITROGEN6X_INSTALL -- NITROGEN6X kernel with installation-sized
+#	ramdisk
+#
+
+include arch/evbarm/conf/NITROGEN6X
+include arch/evbarm/conf/INSTALL
+no makeoptions	DEBUG