date:20150708

CVS commit: src/lib/librt

2015-07-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Jul  8 07:14:38 UTC 2015

Modified Files:
src/lib/librt: shm.c

Log Message:
Simplify previous by just doing an open() on the directory and then using
the fstat* family to test for all relevant details.
Clean up buffer sizes and clarify a length check. Based on input from dholland.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/librt/shm.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/librt/shm.c
diff -u src/lib/librt/shm.c:1.2 src/lib/librt/shm.c:1.3
--- src/lib/librt/shm.c:1.2	Tue Jun 30 11:46:47 2015
+++ src/lib/librt/shm.c	Wed Jul  8 07:14:38 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: shm.c,v 1.2 2015/06/30 11:46:47 martin Exp $	*/
+/*	$NetBSD: shm.c,v 1.3 2015/07/08 07:14:38 martin Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: shm.c,v 1.2 2015/06/30 11:46:47 martin Exp $");
+__RCSID("$NetBSD: shm.c,v 1.3 2015/07/08 07:14:38 martin Exp $");
 
 #include 
 #include 
@@ -57,45 +57,36 @@ __RCSID("$NetBSD: shm.c,v 1.2 2015/06/30
 
 #define	MOUNT_SHMFS		MOUNT_TMPFS
 
-static const char *		_shmfs_path = NULL;
-static char			_shmfs_path_buf[PATH_MAX];
+static bool			shm_ok = false;
 
 static bool
 _shm_check_fs(void)
 {
-	const char *shmfs = SHMFS_DIR_PATH;
+	int fd;
 	struct statvfs sv;
 	struct stat st;
-	char buf[PATH_MAX];
-	ssize_t cnt;
 
-	if ((cnt = readlink(shmfs, buf, sizeof(buf))) > 0) {
-		if ((size_t)cnt >= sizeof(buf))
-			return false;
-		buf[cnt] = 0;
-		shmfs = buf;
-	}
-	if (statvfs1(shmfs, &sv, ST_NOWAIT) == -1) {
-		return false;
-	}
-	if (strncmp(sv.f_fstypename, MOUNT_SHMFS, sizeof(sv.f_fstypename))) {
+	fd = open(SHMFS_DIR_PATH, O_DIRECTORY|O_RDONLY);
+	if (fd == -1)
 		return false;
-	}
 
-	if (lstat(shmfs, &st) == -1) {
-		return false;
-	}
-	if ((st.st_mode & SHMFS_DIR_MODE) != SHMFS_DIR_MODE) {
-		return false;
-	}
+	if (fstatvfs1(fd, &sv, ST_NOWAIT) == -1)
+		goto out;
 
-	if (shmfs == buf) {
-		strcpy(_shmfs_path_buf, buf);
-		_shmfs_path = _shmfs_path_buf;
-	} else {
-		_shmfs_path = shmfs;
-	}
-	return true;
+	if (strncmp(sv.f_fstypename, MOUNT_SHMFS, sizeof(sv.f_fstypename)))
+		goto out;
+
+	if (fstat(fd, &st) == -1)
+		goto out;
+
+	if ((st.st_mode & SHMFS_DIR_MODE) != SHMFS_DIR_MODE)
+		goto out;
+
+	shm_ok = true;
+
+out:
+	close(fd);
+	return shm_ok;
 }
 
 static bool
@@ -103,7 +94,7 @@ _shm_get_path(char *buf, size_t len, con
 {
 	int ret;
 
-	if (__predict_false(!_shmfs_path) && !_shm_check_fs()) {
+	if (__predict_false(!shm_ok) && !_shm_check_fs()) {
 		errno = ENOTSUP;
 		return false;
 	}
@@ -117,10 +108,10 @@ _shm_get_path(char *buf, size_t len, con
 		return false;
 	}
 
-	ret = snprintf(buf, len, "%s/%s%s",
-	_shmfs_path, SHMFS_OBJ_PREFIX, name);
+	ret = snprintf(buf, len, SHMFS_DIR_PATH "/" SHMFS_OBJ_PREFIX "%s",
+	name);
 
-	if ((size_t)ret >= PATH_MAX) {
+	if ((size_t)ret >= len) {
 		errno = ENAMETOOLONG;
 		return false;
 	}
@@ -130,7 +121,7 @@ _shm_get_path(char *buf, size_t len, con
 int
 shm_open(const char *name, int oflag, mode_t mode)
 {
-	char path[PATH_MAX + 1];
+	char path[PATH_MAX];
 
 	if (!_shm_get_path(path, sizeof(path), name)) {
 		return -1;
@@ -141,7 +132,7 @@ shm_open(const char *name, int oflag, mo
 int
 shm_unlink(const char *name)
 {
-	char path[PATH_MAX + 1];
+	char path[PATH_MAX];
 
 	if (!_shm_get_path(path, sizeof(path), name)) {
 		return -1;

CVS commit: src/distrib/notes/common

2015-07-08 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Wed Jul  8 08:48:19 UTC 2015

Modified Files:
src/distrib/notes/common: main

Log Message:
Add myself


To generate a diff of this commit:
cvs rdiff -u -r1.522 -r1.523 src/distrib/notes/common/main

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

Modified files:

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.522 src/distrib/notes/common/main:1.523
--- src/distrib/notes/common/main:1.522	Fri May 29 09:13:49 2015
+++ src/distrib/notes/common/main	Wed Jul  8 08:48:19 2015
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.522 2015/05/29 09:13:49 youri Exp $
+.\"	$NetBSD: main,v 1.523 2015/07/08 08:48:19 kamil Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -1352,6 +1352,7 @@ If you're one of them, and would like to
 .It Ta Steve Rumble Ta Mt rum...@netbsd.org
 .It Ta Rumko Ta Mt ru...@netbsd.org
 .It Ta Jukka Ruohonen Ta Mt jru...@netbsd.org
+.It Ta Kamil Rytarowski Ta Mt ka...@netbsd.org
 .It Ta Blair J. Sadewitz Ta Mt b...@netbsd.org
 .It Ta David Sainty Ta Mt dsai...@netbsd.org
 .It Ta SAITOH Masanobu Ta Mt msai...@netbsd.org

CVS commit: src/distrib/utils/embedded/conf

2015-07-08 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Jul  8 10:57:46 UTC 2015

Modified Files:
src/distrib/utils/embedded/conf: armv7.conf

Log Message:
Turn resize on


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/embedded/conf/armv7.conf

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

Modified files:

Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.4 src/distrib/utils/embedded/conf/armv7.conf:1.5
--- src/distrib/utils/embedded/conf/armv7.conf:1.4	Sun May 24 17:11:18 2015
+++ src/distrib/utils/embedded/conf/armv7.conf	Wed Jul  8 10:57:46 2015
@@ -1,8 +1,9 @@
-# $NetBSD: armv7.conf,v 1.4 2015/05/24 17:11:18 christos Exp $
+# $NetBSD: armv7.conf,v 1.5 2015/07/08 10:57:46 skrll Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
 console=fb
+resize=true
 
 . ${DIR}/conf/evbarm.conf

CVS commit: src/sys/arch/mips/mips

2015-07-08 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Jul  8 14:53:07 UTC 2015

Modified Files:
src/sys/arch/mips/mips: genassym.cf

Log Message:
Add ifndef _MODULE around VM parameters.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/mips/mips/genassym.cf

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

Modified files:

Index: src/sys/arch/mips/mips/genassym.cf
diff -u src/sys/arch/mips/mips/genassym.cf:1.61 src/sys/arch/mips/mips/genassym.cf:1.62
--- src/sys/arch/mips/mips/genassym.cf:1.61	Thu Jun 11 15:50:17 2015
+++ src/sys/arch/mips/mips/genassym.cf	Wed Jul  8 14:53:07 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.61 2015/06/11 15:50:17 matt Exp $
+#	$NetBSD: genassym.cf,v 1.62 2015/07/08 14:53:07 matt Exp $
 #
 # Copyright (c) 1992, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -91,11 +91,17 @@ include 
 include 
 include 
 
+define	SIGFPE		 	SIGFPE
+define	SIGILL		 	SIGILL
+define	SIGSEGV			SIGSEGV
+
+ifndef _MODULE
 define	PAGE_SIZE		PAGE_SIZE
 define	PGSHIFT			PGSHIFT
 define	NBPG			NBPG
 define	USPACE			USPACE
 define	UPAGES			UPAGES
+#endif
 
 ifdef __HAVE_FAST_SOFTINTS
 define	__HAVE_FAST_SOFTINTS	1
@@ -140,13 +146,10 @@ define	VM_MAX_KERNEL_ADDRESS	VM_MAX_KERN
 
 define	CI_NINTR		offsetof(struct cpu_info, ci_data.cpu_nintr)
 
-define	SIGFPE		 	SIGFPE
-define	SIGILL		 	SIGILL
-define	SIGSEGV			SIGSEGV
-
 #/* XXX */
 define	MIPSX_FLUSHICACHE	0
 
+ifndef _MODULE
 define	PG_ASID			PG_ASID
 define	MIPS1_PG_G		MIPS1_PG_G
 define	MIPS1_PG_V		MIPS1_PG_V
@@ -155,6 +158,7 @@ define	MIPS3_PG_V		MIPS3_PG_V
 define	MIPS3_PG_HVPN		MIPS3_PG_HVPN
 define	MIPS3_PG_ASID		MIPS3_PG_ASID
 define	MIPS3_PG_ODDPG		MIPS3_PG_ODDPG
+endif
 
 define	TF_SIZ			sizeof(struct trapframe)
 define	TF_REG_ZERO		offsetof(struct trapframe, tf_regs[_R_ZERO])

CVS commit: src/sys/arch/mips/mips

2015-07-08 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Jul  8 15:05:25 UTC 2015

Modified Files:
src/sys/arch/mips/mips: genassym.cf

Log Message:
fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/mips/mips/genassym.cf

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

Modified files:

Index: src/sys/arch/mips/mips/genassym.cf
diff -u src/sys/arch/mips/mips/genassym.cf:1.62 src/sys/arch/mips/mips/genassym.cf:1.63
--- src/sys/arch/mips/mips/genassym.cf:1.62	Wed Jul  8 14:53:07 2015
+++ src/sys/arch/mips/mips/genassym.cf	Wed Jul  8 15:05:24 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.62 2015/07/08 14:53:07 matt Exp $
+#	$NetBSD: genassym.cf,v 1.63 2015/07/08 15:05:24 matt Exp $
 #
 # Copyright (c) 1992, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -101,7 +101,7 @@ define	PGSHIFT			PGSHIFT
 define	NBPG			NBPG
 define	USPACE			USPACE
 define	UPAGES			UPAGES
-#endif
+endif
 
 ifdef __HAVE_FAST_SOFTINTS
 define	__HAVE_FAST_SOFTINTS	1

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

2015-07-08 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Jul  8 15:18:04 UTC 2015

Modified Files:
src/sys/arch/arm/include: cpuconf.h

Log Message:
Remove CPU_CORTEXA8 from a conditional - it doesn't believe there.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/include/cpuconf.h

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

Modified files:

Index: src/sys/arch/arm/include/cpuconf.h
diff -u src/sys/arch/arm/include/cpuconf.h:1.24 src/sys/arch/arm/include/cpuconf.h:1.25
--- src/sys/arch/arm/include/cpuconf.h:1.24	Mon Apr 14 20:50:47 2014
+++ src/sys/arch/arm/include/cpuconf.h	Wed Jul  8 15:18:04 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuconf.h,v 1.24 2014/04/14 20:50:47 matt Exp $	*/
+/*	$NetBSD: cpuconf.h,v 1.25 2015/07/08 15:18:04 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -121,7 +121,7 @@
 #define	ARM_ARCH_5	0
 #endif
 
-#if defined(CPU_ARM11) || defined(CPU_CORTEXA8) || defined(CPU_ARM11MPCORE)
+#if defined(CPU_ARM11) || defined(CPU_ARM11MPCORE)
 #define ARM_ARCH_6	1
 #else
 #define ARM_ARCH_6	0

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

2015-07-08 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Jul  8 15:26:19 UTC 2015

Modified Files:
src/sys/arch/arm/arm32: cpu.c

Log Message:
aprint_verbose [sa]ctlr


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/arm/arm32/cpu.c

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

Modified files:

Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.109 src/sys/arch/arm/arm32/cpu.c:1.110
--- src/sys/arch/arm/arm32/cpu.c:1.109	Fri Jun  5 07:04:46 2015
+++ src/sys/arch/arm/arm32/cpu.c	Wed Jul  8 15:26:19 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.109 2015/06/05 07:04:46 skrll Exp $	*/
+/*	$NetBSD: cpu.c,v 1.110 2015/07/08 15:26:19 skrll Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.109 2015/06/05 07:04:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.110 2015/07/08 15:26:19 skrll Exp $");
 
 #include 
 #include 
@@ -840,6 +840,8 @@ identify_features(device_t dv)
 	cpu_processor_features[0] = armreg_pfr0_read();
 	cpu_processor_features[1] = armreg_pfr1_read();
 
+	aprint_verbose_dev(dv, "sctlr: %#x\n", armreg_sctlr_read());
+	aprint_verbose_dev(dv, "actlr: %#x\n", armreg_auxctl_read());
 	aprint_verbose_dev(dv, "revidr: %#x\n", armreg_revidr_read());
 #ifdef MULTIPROCESSOR
 	aprint_verbose_dev(dv, "mpidr: %#x\n", armreg_mpidr_read());

CVS commit: src/external/bsd/bind

2015-07-08 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jul  8 17:29:01 UTC 2015

Modified Files:
src/external/bsd/bind/dist: CHANGES README config.h.in configure
configure.in srcid version
src/external/bsd/bind/dist/bin/check: named-checkconf.c
src/external/bsd/bind/dist/bin/delv: delv.c
src/external/bsd/bind/dist/bin/dig: dig.1 dighost.c host.c nslookup.c
src/external/bsd/bind/dist/bin/dig/include/dig: dig.h
src/external/bsd/bind/dist/bin/dnssec: dnssec-dsfromkey.c
dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.8
dnssec-keygen.c dnssec-settime.8 dnssec-settime.c dnssec-signzone.c
dnssec-verify.c dnssectool.c dnssectool.h
src/external/bsd/bind/dist/bin/named: client.c config.c interfacemgr.c
main.c query.c server.c update.c xfrout.c zoneconf.c
src/external/bsd/bind/dist/bin/named/include/named: globals.h
src/external/bsd/bind/dist/bin/named/win32: dlz_dlopen_driver.c os.c
src/external/bsd/bind/dist/bin/nsupdate: nsupdate.c
src/external/bsd/bind/dist/bin/rndc: rndc.c
src/external/bsd/bind/dist/bin/tests: sig0_test.c
src/external/bsd/bind/dist/bin/tests/dst: gsstest.c
src/external/bsd/bind/dist/bin/tests/system: ans.pl
src/external/bsd/bind/dist/contrib/sdb/ldap: ldapdb.c
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf isc-logo.pdf man.arpaname.html man.ddns-confgen.html
man.delv.html man.dig.html man.dnssec-checkds.html
man.dnssec-coverage.html man.dnssec-dsfromkey.html
man.dnssec-importkey.html man.dnssec-keyfromlabel.html
man.dnssec-keygen.html man.dnssec-revoke.html
man.dnssec-settime.html man.dnssec-signzone.html
man.dnssec-verify.html man.genrandom.html man.host.html
man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/bind9: check.c getaddresses.c
src/external/bsd/bind/dist/lib/dns: acache.c adb.c api client.c diff.c
dispatch.c dnssec.c ecdb.c gen.c journal.c keytable.c log.c
master.c masterdump.c message.c name.c ncache.c nsec3.c
openssldh_link.c opensslecdsa_link.c opensslgost_link.c private.c
rbt.c rbtdb.c rdata.c rdatalist.c rdataset.c rdataslab.c request.c
resolver.c rootns.c rpz.c sdb.c sdlz.c spnego_asn1.c tkey.c tsig.c
validator.c xfrin.c zone.c zt.c
src/external/bsd/bind/dist/lib/dns/include/dns: dispatch.h log.h rbt.h
rdataset.h request.h rpz.h zone.h
src/external/bsd/bind/dist/lib/dns/rdata/generic: keydata_65533.c
nsec3_50.c opt_41.c rrsig_46.c sig_24.c spf_99.h txt_16.c
src/external/bsd/bind/dist/lib/dns/tests: Makefile.in geoip_test.c
master_test.c zonemgr_test.c
src/external/bsd/bind/dist/lib/irs: getnameinfo.c
src/external/bsd/bind/dist/lib/isc: hash.c hmacmd5.c hmacsha.c httpd.c
md5.c mem.c print.c radix.c ratelimiter.c result.c sha1.c sha2.c
src/external/bsd/bind/dist/lib/isc/include/isc: print.h radix.h
ratelimiter.h
src/external/bsd/bind/dist/lib/isc/pthreads: mutex.c
src/external/bsd/bind/dist/lib/isc/unix: app.c net.c socket.c stdio.c
time.c
src/external/bsd/bind/dist/lib/isc/unix/include/isc: net.h time.h
src/external/bsd/bind/dist/lib/isc/win32: socket.c win32os.c
src/external/bsd/bind/dist/lib/isc/win32/include/isc: time.h win32os.h
src/external/bsd/bind/dist/lib/isccfg: namedconf.c parser.c
src/external/bsd/bind/dist/lib/lwres: gethost.c
src/external/bsd/bind/include: config.h
src/external/bsd/bind/include/dns: code.h enumclass.h enumtype.h
rdatastruct.h
src/external/bsd/bind/include/isc: platform.h
src/external/bsd/bind/lib/libbind9: shlib_version
src/external/bsd/bind/lib/libdns: shlib_version
src/external/bsd/bind/lib/libirs: shlib_version
src/external/bsd/bind/lib/libisc: shlib_version
src/external/bsd/bind/lib/libisccc: shlib_version
src/external/bsd/bind/lib/libisccfg: shlib_version
src/external/bsd/bind/lib/liblwres: shlib_version
Removed Files:
src/external/bsd/bind/dist/bin/pkcs11: openssl-0.9.8za-patch
openssl-1.0.0m-patch openssl-1.0.1h-patch
src/external/bsd/bind/dist/bin/tests/system/dnssec/ns5: named.conf
src/external/bsd/bind/dist/contrib/zkt-1.1.2: CHANGELOG LICENSE
Makefile.in README README.logging TODO co

CVS commit: src/distrib/sets/lists

2015-07-08 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jul  8 17:29:56 UTC 2015

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

Log Message:
bump bind libraries


To generate a diff of this commit:
cvs rdiff -u -r1.742 -r1.743 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.103 -r1.104 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.742 src/distrib/sets/lists/base/shl.mi:1.743
--- src/distrib/sets/lists/base/shl.mi:1.742	Thu Jul  2 21:01:00 2015
+++ src/distrib/sets/lists/base/shl.mi	Wed Jul  8 13:29:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.742 2015/07/03 01:01:00 christos Exp $
+# $NetBSD: shl.mi,v 1.743 2015/07/08 17:29:56 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -191,7 +191,7 @@
 ./usr/lib/libbfd.so.13.0			base-sys-shlib		compatfile,binutils
 ./usr/lib/libbind9.sobase-bind-shlib		compatfile
 ./usr/lib/libbind9.so.8base-bind-shlib		compatfile
-./usr/lib/libbind9.so.8.1			base-bind-shlib		compatfile
+./usr/lib/libbind9.so.8.2			base-bind-shlib		compatfile
 ./usr/lib/libblacklist.so			base-sys-shlib		compatfile
 ./usr/lib/libblacklist.so.0			base-sys-shlib		compatfile
 ./usr/lib/libblacklist.so.0.0			base-sys-shlib		compatfile
@@ -244,7 +244,7 @@
 ./usr/lib/libdm.so.0.0base-sys-shlib		compatfile
 ./usr/lib/libdns.sobase-bind-shlib		compatfile
 ./usr/lib/libdns.so.8base-bind-shlib		compatfile
-./usr/lib/libdns.so.8.1base-bind-shlib		compatfile
+./usr/lib/libdns.so.8.2base-bind-shlib		compatfile
 ./usr/lib/libdns_sd.sobase-mdns-shlib		compatfile,mdns
 ./usr/lib/libdns_sd.so.0			base-mdns-shlib		compatfile,mdns
 ./usr/lib/libdns_sd.so.0.0			base-mdns-shlib		compatfile,mdns
@@ -319,16 +319,16 @@
 ./usr/lib/libipsec.so.3.0			base-net-shlib		compatfile
 ./usr/lib/libirs.sobase-bind-shlib		compatfile
 ./usr/lib/libirs.so.8base-bind-shlib		compatfile
-./usr/lib/libirs.so.8.1base-bind-shlib		compatfile
+./usr/lib/libirs.so.8.2base-bind-shlib		compatfile
 ./usr/lib/libisc.sobase-bind-shlib		compatfile
 ./usr/lib/libisc.so.8base-bind-shlib		compatfile
-./usr/lib/libisc.so.8.1base-bind-shlib		compatfile
+./usr/lib/libisc.so.8.2base-bind-shlib		compatfile
 ./usr/lib/libisccc.sobase-bind-shlib		compatfile
 ./usr/lib/libisccc.so.8base-bind-shlib		compatfile
-./usr/lib/libisccc.so.8.1			base-bind-shlib		compatfile
+./usr/lib/libisccc.so.8.2			base-bind-shlib		compatfile
 ./usr/lib/libisccfg.sobase-bind-shlib		compatfile
 ./usr/lib/libisccfg.so.8			base-bind-shlib		compatfile
-./usr/lib/libisccfg.so.8.1			base-bind-shlib		compatfile
+./usr/lib/libisccfg.so.8.2			base-bind-shlib		compatfile
 ./usr/lib/libiscsi.sobase-iscsi-shlib	iscsi,compatfile
 ./usr/lib/libiscsi.so.2base-iscsi-shlib	iscsi,compatfile
 ./usr/lib/libiscsi.so.2.0			base-iscsi-shlib	iscsi,compatfile
@@ -376,7 +376,7 @@
 ./usr/lib/liblutok.so.2.0			base-sys-shlib		kyua,compatfile
 ./usr/lib/liblwres.sobase-bind-shlib		compatfile
 ./usr/lib/liblwres.so.8base-bind-shlib		compatfile
-./usr/lib/liblwres.so.8.1			base-bind-shlib		compatfile
+./usr/lib/liblwres.so.8.2			base-bind-shlib		compatfile
 ./usr/lib/liblzf.sobase-sys-shlib		compatfile
 ./usr/lib/liblzf.so.1base-sys-shlib		compatfile
 ./usr/lib/liblzf.so.1.0base-sys-shlib		compatfile

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.103 src/distrib/sets/lists/debug/shl.mi:1.104
--- src/distrib/sets/lists/debug/shl.mi:1.103	Thu Jul  2 21:01:00 2015
+++ src/distrib/sets/lists/debug/shl.mi	Wed Jul  8 13:29:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.103 2015/07/03 01:01:00 christos Exp $
+# $NetBSD: shl.mi,v 1.104 2015/07/08 17:29:56 christos Exp $
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libc.so.12.197.debug			comp-sys-debug	debug,dynamicroot
@@ -60,7 +60,7 @@
 ./usr/libdata/debug/usr/lib/libatf-c.so.0.0.debug		comp-atf-debug	debug,compatfile,atf
 ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,compatfile,zfs
 ./usr/libdata/debug/usr/lib/libbfd.so.13.0.debug		comp-sys-debug	debug,compatfile,binutils
-./usr/libdata/debug/usr/lib/libbind9.so.8.1.debug		comp-bind-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libbind9.so.8.2.debug		comp-bind-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libbluetooth.so.4.2.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug		comp-sys-debug	debug,compatfile
@@ -78,7 +78,7

CVS commit: src/doc

2015-07-08 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jul  8 17:30:46 UTC 2015

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new bind


To generate a diff of this commit:
cvs rdiff -u -r1.1231 -r1.1232 src/doc/3RDPARTY
cvs rdiff -u -r1.2079 -r1.2080 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.1231 src/doc/3RDPARTY:1.1232
--- src/doc/3RDPARTY:1.1231	Sat Jun 27 03:30:10 2015
+++ src/doc/3RDPARTY	Wed Jul  8 13:30:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1231 2015/06/27 07:30:10 mrg Exp $
+#	$NetBSD: 3RDPARTY,v 1.1232 2015/07/08 17:30:46 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -113,8 +113,8 @@ Notes:
 bc includes dc, both of which are in the NetBSD tree.
 
 Package:	bind [named and utils]
-Version:	9.10.1-P2
-Current Vers:	9.10.1-P2
+Version:	9.10.2-P2
+Current Vers:	9.10.2-P2
 Maintainer:	Paul Vixie 
 Archive Site:	ftp://ftp.isc.org/isc/bind9/
 Home Page:	http://www.isc.org/software/bind/
@@ -996,8 +996,8 @@ Notes:
 Patch applied after OpenSSH import.
 
 Package:	OpenSSH
-Version:	6.8
-Current Vers:	6.8 / portable 6.8p1
+Version:	6.9
+Current Vers:	6.9 / portable 6.9p1
 Maintainer:	OpenSSH
 Archive Site:	http://www.openssh.com/ftp.html
 Home Page:	http://www.openssh.com/portable.html

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2079 src/doc/CHANGES:1.2080
--- src/doc/CHANGES:1.2079	Sun Jun 21 11:32:52 2015
+++ src/doc/CHANGES	Wed Jul  8 13:30:46 2015
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2079 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2080 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -163,3 +163,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	openssl: Import openssl 1.0.1n [christos 20150612]
 	openssl: Import openssl 1.0.1o [christos 20150616]
 	zoneinfo: Import tzdata2015e. [apb 20150621]
+	OpenSSH: Imported 6.9. [christos 20150630]
+	bind: Import version 9.10.2-P2. [christos 20150708]

CVS commit: src/lib/libc/time

2015-07-08 Thread Brian Ginsbach

Module Name:src
Committed By:   ginsbach
Date:   Wed Jul  8 18:44:09 UTC 2015

Modified Files:
src/lib/libc/time: strptime.c


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/lib/libc/time/strptime.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/time/strptime.c
diff -u src/lib/libc/time/strptime.c:1.40 src/lib/libc/time/strptime.c:1.41
--- src/lib/libc/time/strptime.c:1.40	Fri Jul  3 13:06:54 2015
+++ src/lib/libc/time/strptime.c	Wed Jul  8 18:44:09 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: strptime.c,v 1.40 2015/07/03 13:06:54 christos Exp $	*/
+/*	$NetBSD: strptime.c,v 1.41 2015/07/08 18:44:09 ginsbach Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strptime.c,v 1.40 2015/07/03 13:06:54 christos Exp $");
+__RCSID("$NetBSD: strptime.c,v 1.41 2015/07/08 18:44:09 ginsbach Exp $");
 #endif
 
 #include "namespace.h"
@@ -62,11 +62,11 @@ __weak_alias(strptime_l, _strptime_l)
 #define ALT_O			0x02
 #define	LEGAL_ALT(x)		{ if (alt_format & ~(x)) return NULL; }
 
-#define	FLAG_YEAR	(1 << 0)
-#define	FLAG_MONTH	(1 << 1)
-#define	FLAG_YDAY	(1 << 2)
-#define	FLAG_MDAY	(1 << 3)
-#define	FLAG_WDAY	(1 << 4)
+#define	S_YEAR		(1 << 0)
+#define	S_MON		(1 << 1)
+#define	S_YDAY		(1 << 2)
+#define	S_MDAY		(1 << 3)
+#define	S_WDAY		(1 << 4)
 
 static char gmt[] = { "GMT" };
 static char utc[] = { "UTC" };
@@ -112,7 +112,7 @@ strptime_l(const char *buf, const char *
 {
 	unsigned char c;
 	const unsigned char *bp, *ep;
-	int alt_format, i, split_year = 0, neg = 0, flags = 0,
+	int alt_format, i, split_year = 0, neg = 0, state = 0,
 	day_offset = -1, week_offset = 0, offs;
 	const char *new_fmt;
 
@@ -161,20 +161,20 @@ literal:
 		 */
 		case 'c':	/* Date and time, using the locale's format. */
 			new_fmt = _TIME_LOCALE(loc)->d_t_fmt;
-			flags |= FLAG_WDAY | FLAG_MONTH | FLAG_MDAY |
-			FLAG_YEAR;
+			state |= S_WDAY | S_MON | S_MDAY |
+			S_YEAR;
 			goto recurse;
 
 		case 'D':	/* The date as "%m/%d/%y". */
 			new_fmt = "%m/%d/%y";
 			LEGAL_ALT(0);
-			flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
+			state |= S_MON | S_MDAY | S_YEAR;
 			goto recurse;
 
 		case 'F':	/* The date as "%Y-%m-%d". */
 			new_fmt = "%Y-%m-%d";
 			LEGAL_ALT(0);
-			flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
+			state |= S_MON | S_MDAY | S_YEAR;
 			goto recurse;
 
 		case 'R':	/* The time as "%H:%M". */
@@ -198,7 +198,7 @@ literal:
 
 		case 'x':	/* The date, using the locale's format. */
 			new_fmt = _TIME_LOCALE(loc)->d_fmt;
-			flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
+			state |= S_MON | S_MDAY | S_YEAR;
 		recurse:
 			bp = (const u_char *)strptime((const char *)bp,
 			new_fmt, tm);
@@ -213,7 +213,7 @@ literal:
 			bp = find_string(bp, &tm->tm_wday,
 			_TIME_LOCALE(loc)->day, _TIME_LOCALE(loc)->abday, 7);
 			LEGAL_ALT(0);
-			flags |= FLAG_WDAY;
+			state |= S_WDAY;
 			continue;
 
 		case 'B':	/* The month, using the locale's form. */
@@ -223,7 +223,7 @@ literal:
 			_TIME_LOCALE(loc)->mon, _TIME_LOCALE(loc)->abmon,
 			12);
 			LEGAL_ALT(0);
-			flags |= FLAG_MONTH;
+			state |= S_MON;
 			continue;
 
 		case 'C':	/* The century number. */
@@ -236,14 +236,14 @@ literal:
 			split_year = 1;
 			tm->tm_year = i;
 			LEGAL_ALT(ALT_E);
-			flags |= FLAG_YEAR;
+			state |= S_YEAR;
 			continue;
 
 		case 'd':	/* The day of month. */
 		case 'e':
 			bp = conv_num(bp, &tm->tm_mday, 1, 31);
 			LEGAL_ALT(ALT_O);
-			flags |= FLAG_MDAY;
+			state |= S_MDAY;
 			continue;
 
 		case 'k':	/* The hour (24-hour clock representation). */
@@ -269,7 +269,7 @@ literal:
 			bp = conv_num(bp, &i, 1, 366);
 			tm->tm_yday = i - 1;
 			LEGAL_ALT(0);
-			flags |= FLAG_YDAY;
+			state |= S_YDAY;
 			continue;
 
 		case 'M':	/* The minute. */
@@ -282,7 +282,7 @@ literal:
 			bp = conv_num(bp, &i, 1, 12);
 			tm->tm_mon = i - 1;
 			LEGAL_ALT(ALT_O);
-			flags |= FLAG_MONTH;
+			state |= S_MON;
 			continue;
 
 		case 'p':	/* The locale's equivalent of AM/PM. */
@@ -327,8 +327,8 @@ literal:
 if (localtime_r(&sse, tm) == NULL)
 	bp = NULL;
 else
-	flags |= FLAG_YDAY | FLAG_WDAY |
-	FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
+	state |= S_YDAY | S_WDAY |
+	S_MON | S_MDAY | S_YEAR;
 			}
 			continue;
 
@@ -352,7 +352,7 @@ literal:
 		case 'w':	/* The day of week, beginning on sunday. */
 			bp = conv_num(bp, &tm->tm_wday, 0, 6);
 			LEGAL_ALT(ALT_O);
-			flags |= FLAG_WDAY;
+			state |= S_WDAY;
 			continue;
 
 		case 'u':	/* The day of week, monday = 1. */
@@ -384,7 +384,7 @@ literal:
 			bp = conv_num(bp, &i, 0, );
 			tm->tm_year = i - TM_YEAR_BASE;
 			LEGAL_ALT(ALT_E);
-			flags |= FLAG_YEAR;
+			state |= S_YEAR;
 			continue;
 
 		case 'y':	/* The year within 100 years of the epoch. */
@@ -402,7 +402,7 @@ literal:
 	i =

CVS commit: xsrc/external/mit/xf86-video-r128/dist/src

2015-07-08 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Wed Jul  8 18:56:39 UTC 2015

Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128_driver.c

Log Message:
sprintf -> snprintf


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.10 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.11
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.10	Tue Jul  7 00:55:52 2015
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c	Wed Jul  8 18:56:39 2015
@@ -1622,8 +1622,8 @@ static int R128ValidateFPModes(ScrnInfoP
 /* If no mode specified in config, we use native resolution*/
 if(!pScrn->display->modes[0])
 {
-pScrn->display->modes[0] = xnfalloc(16);
-sprintf(pScrn->display->modes[0], "%dx%d",
+pScrn->display->modes[0] = xnfalloc(32);
+snprintf(pScrn->display->modes[0], 32, "%dx%d",
info->PanelXRes, info->PanelYRes);
 /* don't forget to NULL terminate */
 pScrn->display->modes[1] = NULL;

CVS commit: src/lib/libc/time

2015-07-08 Thread Brian Ginsbach

Module Name:src
Committed By:   ginsbach
Date:   Wed Jul  8 19:48:20 UTC 2015

Modified Files:
src/lib/libc/time: strptime.c

Log Message:
Add macros to clarify what (parse) state is needed to calculate 'missing'
tm fields.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/time/strptime.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/time/strptime.c
diff -u src/lib/libc/time/strptime.c:1.41 src/lib/libc/time/strptime.c:1.42
--- src/lib/libc/time/strptime.c:1.41	Wed Jul  8 18:44:09 2015
+++ src/lib/libc/time/strptime.c	Wed Jul  8 19:48:20 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: strptime.c,v 1.41 2015/07/08 18:44:09 ginsbach Exp $	*/
+/*	$NetBSD: strptime.c,v 1.42 2015/07/08 19:48:20 ginsbach Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strptime.c,v 1.41 2015/07/08 18:44:09 ginsbach Exp $");
+__RCSID("$NetBSD: strptime.c,v 1.42 2015/07/08 19:48:20 ginsbach Exp $");
 #endif
 
 #include "namespace.h"
@@ -68,6 +68,12 @@ __weak_alias(strptime_l, _strptime_l)
 #define	S_MDAY		(1 << 3)
 #define	S_WDAY		(1 << 4)
 
+#define HAVE_MDAY(s)	(s & S_MDAY)
+#define HAVE_MON(s)	(s & S_MON)
+#define HAVE_WDAY(s)	(s & S_WDAY)
+#define HAVE_YDAY(s)	(s & S_YDAY)
+#define HAVE_YEAR(s)	(s & S_YEAR)
+
 static char gmt[] = { "GMT" };
 static char utc[] = { "UTC" };
 /* RFC-822/RFC-2822 */
@@ -161,8 +167,7 @@ literal:
 		 */
 		case 'c':	/* Date and time, using the locale's format. */
 			new_fmt = _TIME_LOCALE(loc)->d_t_fmt;
-			state |= S_WDAY | S_MON | S_MDAY |
-			S_YEAR;
+			state |= S_WDAY | S_MON | S_MDAY | S_YEAR;
 			goto recurse;
 
 		case 'D':	/* The date as "%m/%d/%y". */
@@ -475,8 +480,7 @@ literal:
 continue;
 			case '+':
 neg = 0;
-state |= S_WDAY | S_MON |  S_MDAY |
-S_YEAR;
+state |= S_WDAY | S_MON | S_MDAY | S_YEAR;
 break;
 			case '-':
 neg = 1;
@@ -581,8 +585,8 @@ literal:
 		}
 	}
 
-	if (!(state & S_YDAY) && (state & S_YEAR)) {
-		if ((state & (S_MON | S_MDAY)) == (S_MON | S_MDAY)) {
+	if (!HAVE_YDAY(state) && HAVE_YEAR(state)) {
+		if (HAVE_MON(state) && HAVE_MDAY(state)) {
 			tm->tm_yday =  start_of_month[is_leap_year(tm->tm_year +
 			TM_YEAR_BASE)][tm->tm_mon] + (tm->tm_mday - 1);
 			state |= S_YDAY;
@@ -590,7 +594,7 @@ literal:
 			/* Set the date to the first Sunday (or Monday)
 			 * of the specified week of the year.
 			 */
-			if (!(state & S_WDAY)) {
+			if (!HAVE_WDAY(state)) {
 tm->tm_wday = day_offset;
 state |= S_WDAY;
 			}
@@ -602,9 +606,9 @@ literal:
 		}
 	}
 
-	if ((state & (S_YEAR | S_YDAY)) == (S_YEAR | S_YDAY)) {
+	if (HAVE_YDAY(state) && HAVE_YEAR(state)) {
 		int isleap;
-		if (!(state & S_MON)) {
+		if (!HAVE_MON(state)) {
 			i = 0;
 			isleap = is_leap_year(tm->tm_year + TM_YEAR_BASE);
 			while (tm->tm_yday >= start_of_month[isleap][i])
@@ -617,13 +621,13 @@ literal:
 			tm->tm_mon = i - 1;
 			state |= S_MON;
 		}
-		if (!(state & S_MDAY)) {
+		if (!HAVE_MDAY(state)) {
 			isleap = is_leap_year(tm->tm_year + TM_YEAR_BASE);
 			tm->tm_mday = tm->tm_yday -
 			start_of_month[isleap][tm->tm_mon] + 1;
 			state |= S_MDAY;
 		}
-		if (!(state & S_WDAY)) {
+		if (!HAVE_WDAY(state)) {
 			i = 0;
 			week_offset = first_wday_of(tm->tm_year);
 			while (i++ <= tm->tm_yday) {

CVS commit: [netbsd-7] src/sys/arch/amd64/include

2015-07-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Jul  8 21:58:53 UTC 2015

Modified Files:
src/sys/arch/amd64/include [netbsd-7]: sljit_machdep.h

Log Message:
Pull up following revision(s) (requested by alnsn in ticket #872):
sys/arch/amd64/include/sljit_machdep.h: revision 1.2
Include  for i386 compat build.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.4.1 src/sys/arch/amd64/include/sljit_machdep.h

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

Modified files:

Index: src/sys/arch/amd64/include/sljit_machdep.h
diff -u src/sys/arch/amd64/include/sljit_machdep.h:1.1 src/sys/arch/amd64/include/sljit_machdep.h:1.1.4.1
--- src/sys/arch/amd64/include/sljit_machdep.h:1.1	Wed Jul 23 18:19:43 2014
+++ src/sys/arch/amd64/include/sljit_machdep.h	Wed Jul  8 21:58:53 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: sljit_machdep.h,v 1.1 2014/07/23 18:19:43 alnsn Exp $	*/
+/*	$NetBSD: sljit_machdep.h,v 1.1.4.1 2015/07/08 21:58:53 snj Exp $	*/
 
 /*-
  * Copyright (c) 2012-2013 The NetBSD Foundation, Inc.
@@ -29,8 +29,16 @@
 #ifndef _AMD64_SLJITARCH_H
 #define _AMD64_SLJITARCH_H
 
+#if !defined __i386__
+
 #define SLJIT_CONFIG_X86_64 1
 
 #define SLJIT_CACHE_FLUSH(from, to)
 
+#else	/*	!__i386__	*/
+
+#include 
+
+#endif
+
 #endif

CVS commit: [netbsd-7] src/doc

2015-07-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Jul  8 22:00:28 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.0

Log Message:
872


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.336 -r1.1.2.337 src/doc/CHANGES-7.0

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

Modified files:

Index: src/doc/CHANGES-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.336 src/doc/CHANGES-7.0:1.1.2.337
--- src/doc/CHANGES-7.0:1.1.2.336	Sun Jul  5 21:34:32 2015
+++ src/doc/CHANGES-7.0	Wed Jul  8 22:00:28 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.336 2015/07/05 21:34:32 snj Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.337 2015/07/08 22:00:28 snj Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -32262,3 +32262,8 @@ sys/external/bsd/drm2/dist/drm/i915/i915
 	Fix Xorg coredumps that have started happening recently.
 	[chs, ticket #854]
 
+sys/arch/amd64/include/sljit_machdep.h		1.2
+
+	Fix build with MKPIE=yes.  PR toolchain/50008.
+	[alnsn, ticket #872]
+

CVS commit: src/lib/libm/src

2015-07-08 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Thu Jul  9 06:17:13 UTC 2015

Modified Files:
src/lib/libm/src: lrint.c lrintf.c

Log Message:
Return x for >= DBL_FRACBITS in lrint.c.
Return x for >= SNG_FRACBITS in lrintf.c

Addresses PR lib/49690

This commit was approved by christos@


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/src/lrint.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libm/src/lrintf.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/libm/src/lrint.c
diff -u src/lib/libm/src/lrint.c:1.4 src/lib/libm/src/lrint.c:1.5
--- src/lib/libm/src/lrint.c:1.4	Sat Apr 26 23:49:50 2008
+++ src/lib/libm/src/lrint.c	Thu Jul  9 06:17:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lrint.c,v 1.4 2008/04/26 23:49:50 christos Exp $ */
+/* $NetBSD: lrint.c,v 1.5 2015/07/09 06:17:13 nat Exp $ */
 
 /*-
  * Copyright (c) 2004
@@ -70,7 +70,8 @@ LRINTNAME(double x)
 		/* round, using current direction */
 		x += TWO52[s];
 		x -= TWO52[s];
-	}
+	} else
+		return x;
 
 	EXTRACT_WORDS(i0, i1, x);
 	e = ((i0 >> 20) & 0x7ff) - DBL_EXP_BIAS;

Index: src/lib/libm/src/lrintf.c
diff -u src/lib/libm/src/lrintf.c:1.5 src/lib/libm/src/lrintf.c:1.6
--- src/lib/libm/src/lrintf.c:1.5	Sat Apr 26 23:49:50 2008
+++ src/lib/libm/src/lrintf.c	Thu Jul  9 06:17:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lrintf.c,v 1.5 2008/04/26 23:49:50 christos Exp $ */
+/* $NetBSD: lrintf.c,v 1.6 2015/07/09 06:17:13 nat Exp $ */
 
 /*-
  * Copyright (c) 2004
@@ -74,7 +74,8 @@ LRINTNAME(float x)
 		/* round, using current direction */
 		w = TWO23[s] + x;
 		x = w - TWO23[s];
-	}
+	} else
+		return x;
 
 	GET_FLOAT_WORD(i0, x);
 	e = ((i0 >> SNG_FRACBITS) & 0xff) - SNG_EXP_BIAS;

CVS commit: src/lib/librt

CVS commit: src/distrib/notes/common

CVS commit: src/distrib/utils/embedded/conf

CVS commit: src/sys/arch/mips/mips

CVS commit: src/sys/arch/mips/mips

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

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

CVS commit: src/external/bsd/bind

CVS commit: src/distrib/sets/lists

CVS commit: src/doc

CVS commit: src/lib/libc/time

CVS commit: xsrc/external/mit/xf86-video-r128/dist/src

CVS commit: src/lib/libc/time

CVS commit: [netbsd-7] src/sys/arch/amd64/include

CVS commit: [netbsd-7] src/doc

CVS commit: src/lib/libm/src

16 matches

Site Navigation

Mail list logo

Footer information