CVS commit: src/sys/compat
Module Name:src Committed By: njoly Date: Sun May 18 09:30:00 UTC 2014 Modified Files: src/sys/compat/linux/common: linux_file.c src/sys/compat/linux32/common: linux32_unistd.c Log Message: Simplify dup3 emulation to call dodup() directly instead of sys_dup2()+fd_set_exclose(). While here, add some error conditions. To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/sys/compat/linux/common/linux_file.c cvs rdiff -u -r1.37 -r1.38 src/sys/compat/linux32/common/linux32_unistd.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/common/linux_file.c diff -u src/sys/compat/linux/common/linux_file.c:1.110 src/sys/compat/linux/common/linux_file.c:1.111 --- src/sys/compat/linux/common/linux_file.c:1.110 Tue May 6 13:21:50 2014 +++ src/sys/compat/linux/common/linux_file.c Sun May 18 09:30:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_file.c,v 1.110 2014/05/06 13:21:50 njoly Exp $ */ +/* $NetBSD: linux_file.c,v 1.111 2014/05/18 09:30:00 njoly Exp $ */ /*- * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_file.c,v 1.110 2014/05/06 13:21:50 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_file.c,v 1.111 2014/05/18 09:30:00 njoly Exp $); #include sys/param.h #include sys/systm.h @@ -784,14 +784,16 @@ linux_sys_dup3(struct lwp *l, const stru syscallarg(int) to; syscallarg(int) flags; } */ - int error; - if ((error = sys_dup2(l, (const struct sys_dup2_args *)uap, retval))) - return error; + int flags; - if (SCARG(uap, flags) LINUX_O_CLOEXEC) - fd_set_exclose(l, SCARG(uap, to), true); + flags = linux_to_bsd_ioflags(SCARG(uap, flags)); + if ((flags ~O_CLOEXEC) != 0) + return EINVAL; - return 0; + if (SCARG(uap, from) == SCARG(uap, to)) + return EINVAL; + + return dodup(l, SCARG(uap, from), SCARG(uap, to), flags, retval); } Index: src/sys/compat/linux32/common/linux32_unistd.c diff -u src/sys/compat/linux32/common/linux32_unistd.c:1.37 src/sys/compat/linux32/common/linux32_unistd.c:1.38 --- src/sys/compat/linux32/common/linux32_unistd.c:1.37 Sun May 4 10:08:53 2014 +++ src/sys/compat/linux32/common/linux32_unistd.c Sun May 18 09:30:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_unistd.c,v 1.37 2014/05/04 10:08:53 njoly Exp $ */ +/* $NetBSD: linux32_unistd.c,v 1.38 2014/05/18 09:30:00 njoly Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux32_unistd.c,v 1.37 2014/05/04 10:08:53 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: linux32_unistd.c,v 1.38 2014/05/18 09:30:00 njoly Exp $); #include sys/types.h #include sys/param.h @@ -293,19 +293,13 @@ linux32_sys_dup3(struct lwp *l, const st syscallarg(int) to; syscallarg(int) flags; } */ - struct sys_dup2_args ua; - int error; + struct linux_sys_dup3_args ua; NETBSD32TO64_UAP(from); NETBSD32TO64_UAP(to); + NETBSD32TO64_UAP(flags); - if ((error = sys_dup2(l, ua, retval))) - return error; - - if (SCARG(uap, flags) LINUX_O_CLOEXEC) - fd_set_exclose(l, SCARG(uap, to), true); - - return 0; + return linux_sys_dup3(l, ua, retval); }
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: nat Date: Sun May 18 10:36:34 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 shl.mi Log Message: libossaudio minor version bump to signify new ioctls. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.232 -r1.233 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.219 -r1.220 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.701 -r1.702 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.61 -r1.62 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.arm diff -u src/distrib/sets/lists/base/ad.arm:1.42 src/distrib/sets/lists/base/ad.arm:1.43 --- src/distrib/sets/lists/base/ad.arm:1.42 Thu May 15 16:32:28 2014 +++ src/distrib/sets/lists/base/ad.arm Sun May 18 10:36:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.42 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: ad.arm,v 1.43 2014/05/18 10:36:34 nat 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 @@ -230,7 +230,7 @@ ./usr/lib/oabi/libopcodes.so.6 base-compat-shlib compat,pic,binutils ./usr/lib/oabi/libopcodes.so.6.0 base-compat-shlib compat,pic,binutils ./usr/lib/oabi/libossaudio.so.1 base-compat-shlib compat,pic -./usr/lib/oabi/libossaudio.so.1.0 base-compat-shlib compat,pic +./usr/lib/oabi/libossaudio.so.1.1 base-compat-shlib compat,pic ./usr/lib/oabi/libp2k.so.2 base-compat-shlib compat,pic,rump ./usr/lib/oabi/libp2k.so.2.0 base-compat-shlib compat,pic,rump ./usr/lib/oabi/libpam.so.4 base-compat-shlib compat,pic,pam Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.38 src/distrib/sets/lists/base/ad.mips:1.39 --- src/distrib/sets/lists/base/ad.mips:1.38 Thu May 15 16:32:28 2014 +++ src/distrib/sets/lists/base/ad.mips Sun May 18 10:36:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.38 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: ad.mips,v 1.39 2014/05/18 10:36:34 nat Exp $ ./lib/64 base-compat-shlib compat,arch64 ./lib/64/npf base-npf-shlib compat,arch64 ./lib/64/npf/ext_log.sobase-npf-shlib compat,pic,arch64 @@ -230,7 +230,7 @@ ./usr/lib/64/libopcodes.so.6 base-compat-shlib compat,pic,binutils,arch64 ./usr/lib/64/libopcodes.so.6.0 base-compat-shlib compat,pic,binutils,arch64 ./usr/lib/64/libossaudio.so.1 base-compat-shlib compat,pic,arch64 -./usr/lib/64/libossaudio.so.1.0 base-compat-shlib compat,pic,arch64 +./usr/lib/64/libossaudio.so.1.1 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libp2k.so.2 base-compat-shlib compat,pic,rump,arch64 ./usr/lib/64/libp2k.so.2.0 base-compat-shlib compat,pic,rump,arch64 ./usr/lib/64/libpam.so.4 base-compat-shlib compat,pic,pam,arch64 @@ -562,7 +562,7 @@ ./usr/lib/o32/libopcodes.so.6 base-compat-shlib compat,pic,binutils,arch64 ./usr/lib/o32/libopcodes.so.6.0 base-compat-shlib compat,pic,binutils,arch64 ./usr/lib/o32/libossaudio.so.1 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libossaudio.so.1.0 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libossaudio.so.1.1 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libp2k.so.2 base-compat-shlib compat,pic,rump,arch64 ./usr/lib/o32/libp2k.so.2.0 base-compat-shlib compat,pic,rump,arch64 ./usr/lib/o32/libpam.so.4 base-compat-shlib compat,pic,pam,arch64 Index: src/distrib/sets/lists/base/ad.powerpc diff -u src/distrib/sets/lists/base/ad.powerpc:1.7 src/distrib/sets/lists/base/ad.powerpc:1.8 --- src/distrib/sets/lists/base/ad.powerpc:1.7 Thu May 15 16:32:28 2014 +++ src/distrib/sets/lists/base/ad.powerpc Sun May 18 10:36:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.powerpc,v 1.7 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: ad.powerpc,v 1.8 2014/05/18 10:36:34 nat Exp $ ./lib/powerpc base-npf-shlib compat,arch64 ./lib/powerpc/npfbase-npf-shlib compat,arch64 ./lib/powerpc/npf/ext_log.so base-npf-shlib compat,arch64,pic @@ -209,7 +209,7 @@ ./usr/lib/powerpc/libopcodes.so.6 base-compat-shlib compat,arch64,pic,binutils ./usr/lib/powerpc/libopcodes.so.6.0 base-compat-shlib compat,arch64,pic,binutils ./usr/lib/powerpc/libossaudio.so.1 base-compat-shlib compat,arch64,pic
CVS commit: src/lib/libossaudio
Module Name:src Committed By: nat Date: Sun May 18 10:38:40 UTC 2014 Modified Files: src/lib/libossaudio: shlib_version Log Message: libossaudio minor version bump to signify new ioctls. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libossaudio/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libossaudio/shlib_version diff -u src/lib/libossaudio/shlib_version:1.6 src/lib/libossaudio/shlib_version:1.7 --- src/lib/libossaudio/shlib_version:1.6 Sun Jan 11 03:07:49 2009 +++ src/lib/libossaudio/shlib_version Sun May 18 10:38:40 2014 @@ -1,5 +1,5 @@ -# $NetBSD: shlib_version,v 1.6 2009/01/11 03:07:49 christos Exp $ +# $NetBSD: shlib_version,v 1.7 2014/05/18 10:38:40 nat Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # major=1 -minor=0 +minor=1
CVS commit: src/sys/arch/alpha/alpha
Module Name:src
Committed By: martin
Date: Sun May 18 10:43:54 UTC 2014
Modified Files:
src/sys/arch/alpha/alpha: fp_complete.c
Log Message:
Properly handle PCU_REENABLE in fpu_state_load. Hint from Nick Hudson.
This seems to help PR port-alpha/48782 a lot.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/alpha/alpha/fp_complete.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/alpha/alpha/fp_complete.c
diff -u src/sys/arch/alpha/alpha/fp_complete.c:1.17 src/sys/arch/alpha/alpha/fp_complete.c:1.18
--- src/sys/arch/alpha/alpha/fp_complete.c:1.17 Fri May 16 19:18:21 2014
+++ src/sys/arch/alpha/alpha/fp_complete.c Sun May 18 10:43:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fp_complete.c,v 1.17 2014/05/16 19:18:21 matt Exp $ */
+/* $NetBSD: fp_complete.c,v 1.18 2014/05/18 10:43:54 martin Exp $ */
/*-
* Copyright (c) 2001 Ross Harvey
@@ -35,7 +35,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: fp_complete.c,v 1.17 2014/05/16 19:18:21 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: fp_complete.c,v 1.18 2014/05/18 10:43:54 martin Exp $);
#include opt_compat_osf1.h
@@ -723,6 +723,12 @@ void
fpu_state_load(struct lwp *l, u_int flags)
{
struct pcb * const pcb = lwp_getpcb(l);
+ KASSERT(l == curlwp);
+
+ if (flags PCU_REENABLE) {
+ l-l_md.md_flags |= MDLWP_FPACTIVE;
+ return;
+ }
/*
* Instrument FP usage -- if a process had not previously
CVS commit: src/lib/libm
Module Name:src
Committed By: martin
Date: Sun May 18 10:47:04 UTC 2014
Modified Files:
src/lib/libm: Makefile
Log Message:
Re-enable alpha IEEE compiler options
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.158 src/lib/libm/Makefile:1.159
--- src/lib/libm/Makefile:1.158 Mon May 5 18:08:32 2014
+++ src/lib/libm/Makefile Sun May 18 10:47:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.158 2014/05/05 18:08:32 martin Exp $
+# $NetBSD: Makefile,v 1.159 2014/05/18 10:47:03 martin Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -53,7 +53,7 @@ LINTFLAGS += -g
.if (${MACHINE_ARCH} == alpha)
.PATH: ${.CURDIR}/arch/alpha
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
-# COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
+COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
.elif (${MACHINE_CPU} == arm)
.PATH: ${.CURDIR}/arch/arm
COMMON_SRCS+= fenv.c s_nexttowardf.c \
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: martin
Date: Sun May 18 10:47:38 UTC 2014
Modified Files:
src/tests/lib/libm: Makefile
Log Message:
Re-enable alpha IEEE compiler options
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/tests/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/Makefile
diff -u src/tests/lib/libm/Makefile:1.23 src/tests/lib/libm/Makefile:1.24
--- src/tests/lib/libm/Makefile:1.23 Mon May 5 18:08:33 2014
+++ src/tests/lib/libm/Makefile Sun May 18 10:47:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/05/05 18:08:33 martin Exp $
+# $NetBSD: Makefile,v 1.24 2014/05/18 10:47:38 martin Exp $
.include bsd.own.mk
@@ -11,7 +11,7 @@ CPPFLAGS+= -DHAVE_FENV_H
.endif
.if ${MACHINE} == alpha
-# COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
+COPTS+= -mfloat-ieee -mieee-with-inexact -mfp-trap-mode=sui -mtrap-precision=i
.endif
TESTS_C+= t_acos
CVS commit: src/sys/arch/alpha/alpha
Module Name:src
Committed By: martin
Date: Sun May 18 11:04:51 UTC 2014
Modified Files:
src/sys/arch/alpha/alpha: fp_complete.c
Log Message:
No need to re-set MDLWP_FPACTIVE in the REENABLE case - it should be
set already.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/alpha/fp_complete.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/alpha/alpha/fp_complete.c
diff -u src/sys/arch/alpha/alpha/fp_complete.c:1.18 src/sys/arch/alpha/alpha/fp_complete.c:1.19
--- src/sys/arch/alpha/alpha/fp_complete.c:1.18 Sun May 18 10:43:54 2014
+++ src/sys/arch/alpha/alpha/fp_complete.c Sun May 18 11:04:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fp_complete.c,v 1.18 2014/05/18 10:43:54 martin Exp $ */
+/* $NetBSD: fp_complete.c,v 1.19 2014/05/18 11:04:51 martin Exp $ */
/*-
* Copyright (c) 2001 Ross Harvey
@@ -35,7 +35,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: fp_complete.c,v 1.18 2014/05/18 10:43:54 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: fp_complete.c,v 1.19 2014/05/18 11:04:51 martin Exp $);
#include opt_compat_osf1.h
@@ -726,7 +726,7 @@ fpu_state_load(struct lwp *l, u_int flag
KASSERT(l == curlwp);
if (flags PCU_REENABLE) {
- l-l_md.md_flags |= MDLWP_FPACTIVE;
+ KASSERT(l-l_md.md_flags MDLWP_FPACTIVE);
return;
}
CVS commit: src
Module Name:src
Committed By: kardel
Date: Sun May 18 11:46:24 UTC 2014
Modified Files:
src/doc: CHANGES
src/share/man/man4: Makefile
src/sys/dev/i2c: files.i2c
src/sys/dev/sysmon: sysmon_envsys_tables.c
src/sys/modules: Makefile
src/sys/sys: envsys.h
src/usr.sbin/envstat: envstat.8 envstat.c
Added Files:
src/share/man/man4: hythygtemp.4
src/sys/dev/i2c: hytp14.c hytp14reg.h hytp14var.h
src/sys/modules/hythygtemp: Makefile hythygtemp.ioconf
Log Message:
add HYT-221/271/939 humidity/temperature I2C sensor
extend envsys(4) framework by %rH (relative humidity)
To generate a diff of this commit:
cvs rdiff -u -r1.1925 -r1.1926 src/doc/CHANGES
cvs rdiff -u -r1.613 -r1.614 src/share/man/man4/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man4/hythygtemp.4
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/i2c/files.i2c
cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/hytp14.c src/sys/dev/i2c/hytp14reg.h \
src/sys/dev/i2c/hytp14var.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/sysmon/sysmon_envsys_tables.c
cvs rdiff -u -r1.135 -r1.136 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/hythygtemp/Makefile \
src/sys/modules/hythygtemp/hythygtemp.ioconf
cvs rdiff -u -r1.33 -r1.34 src/sys/sys/envsys.h
cvs rdiff -u -r1.61 -r1.62 src/usr.sbin/envstat/envstat.8
cvs rdiff -u -r1.94 -r1.95 src/usr.sbin/envstat/envstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1925 src/doc/CHANGES:1.1926
--- src/doc/CHANGES:1.1925 Fri May 16 06:25:22 2014
+++ src/doc/CHANGES Sun May 18 11:46:23 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1925 $
+# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1926 $
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -417,3 +417,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
[pettai 20140424]
libc: Update to tzcode2014c. [christos 20140513]
zoneinfo: Import tzdata2014c. [apb 20140515]
+ hythygtemp(4): Add HYT-221/271/939 humidity/temperature iic sensor
+ driver. [kardel 20140518]
+ envsys(4): Add %rH (relative Humidity) to sensor framework.
+ [kardel 20140518]
\ No newline at end of file
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.613 src/share/man/man4/Makefile:1.614
--- src/share/man/man4/Makefile:1.613 Wed Apr 23 06:53:14 2014
+++ src/share/man/man4/Makefile Sun May 18 11:46:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.613 2014/04/23 06:53:14 kardel Exp $
+# $NetBSD: Makefile,v 1.614 2014/05/18 11:46:23 kardel Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -28,7 +28,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a
gcscaudio.4 gem.4 genfb.4 gentbi.4 geodeide.4 \
glxtphy.4 gpib.4 gpio.4 gpiolock.4 gpiopwm.4 gpiosim.4 gre.4 \
gphyter.4 gsip.4 \
- hdaudio.4 hifn.4 hme.4 hpacel.4 hpqlb.4 hptide.4 \
+ hdaudio.4 hifn.4 hme.4 hpacel.4 hpqlb.4 hptide.4 hythygtemp.4 \
ibmcd.4 ibmhawk.4 ichsmb.4 icmp.4 icp.4 icsphy.4 iee.4 ieee80211.4 \
ifmedia.4 igmafb.4 igphy.4 igsfb.4 iha.4 ihphy.4 iic.4 inet.4 ikphy.4 \
inphy.4 intersil7170.4 \
Index: src/sys/dev/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.53 src/sys/dev/i2c/files.i2c:1.54
--- src/sys/dev/i2c/files.i2c:1.53 Tue Oct 15 19:13:32 2013
+++ src/sys/dev/i2c/files.i2c Sun May 18 11:46:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.53 2013/10/15 19:13:32 jdc Exp $
+# $NetBSD: files.i2c,v 1.54 2014/05/18 11:46:23 kardel Exp $
obsolete defflag opt_i2cbus.h I2C_SCAN
define i2cbus { }
@@ -103,6 +103,11 @@ device lmtemp: sysmon_envsys
attach lmtemp at iic
file dev/i2c/lm75.clmtemp
+# IST-AG Humidity and Teperature sensor (P14)
+device hythygtemp: sysmon_envsys
+attach hythygtemp at iic
+file dev/i2c/hytp14.c hythygtemp
+
# National Semiconductor LM78 temp sensor/fan controller
attach lm at iic with lm_iic
file dev/i2c/lm_i2c.c lm_iic
Index: src/sys/dev/sysmon/sysmon_envsys_tables.c
diff -u src/sys/dev/sysmon/sysmon_envsys_tables.c:1.11 src/sys/dev/sysmon/sysmon_envsys_tables.c:1.12
--- src/sys/dev/sysmon/sysmon_envsys_tables.c:1.11 Mon Aug 27 21:42:04 2012
+++ src/sys/dev/sysmon/sysmon_envsys_tables.c Sun May 18 11:46:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_tables.c,v 1.11 2012/08/27 21:42:04 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_tables.c,v 1.12 2014/05/18 11:46:23 kardel Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_tables.c,v 1.11 2012/08/27 21:42:04 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_tables.c,v 1.12 2014/05/18 11:46:23 kardel Exp $);
#include sys/types.h
@@ -51,6 +51,7 @@ static const struct sme_descr_entry sme_
{ ENVSYS_DRIVE, PENVSYS_TYPE_DRIVE, Drive },
{ ENVSYS_BATTERY_CAPACITY
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sun May 18 12:45:03 UTC 2014 Modified Files: src/share/man/man4: hythygtemp.4 Log Message: New sentence, new line. Sort SEE ALSO. Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/hythygtemp.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/hythygtemp.4 diff -u src/share/man/man4/hythygtemp.4:1.1 src/share/man/man4/hythygtemp.4:1.2 --- src/share/man/man4/hythygtemp.4:1.1 Sun May 18 11:46:23 2014 +++ src/share/man/man4/hythygtemp.4 Sun May 18 12:45:03 2014 @@ -1,28 +1,28 @@ -.\ $NetBSD: hythygtemp.4,v 1.1 2014/05/18 11:46:23 kardel Exp $ +.\ $NetBSD: hythygtemp.4,v 1.2 2014/05/18 12:45:03 wiz Exp $ .\ -.\Copyright (c) 2014 Frank Kardel -.\All rights reserved. +.\ Copyright (c) 2014 Frank Kardel +.\ All rights reserved. .\ -.\Redistribution and use in source and binary forms, with or without -.\modification, are permitted provided that the following conditions -.\are met: -.\1. Redistributions of source code must retain the above copyright -.\ notice, this list of conditions and the following disclaimer. -.\2. Redistributions in binary form must reproduce the above copyright -.\ notice, this list of conditions and the following disclaimer in the -.\ documentation and/or other materials provided with the distribution. +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. .\ -.\THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS -.\``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -.\TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -.\PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -.\BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -.\CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -.\SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -.\CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -.\POSSIBILITY OF SUCH DAMAGE. +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\ POSSIBILITY OF SUCH DAMAGE. .\ .Dd May 18, 2014 .Dt HYTHYGTEMP 4 @@ -42,14 +42,15 @@ framework. The .Nm .Ar addr -argument selects the address at the +argument selects the address at the .Xr iic 4 -bus. The sensor chips can be reconfigured to respond to other addresses than the +bus. +The sensor chips can be reconfigured to respond to other addresses than the default value of 0x28. .Sh SEE ALSO -.Xr envstat 8 , .Xr envsys 4 , -.Xr iic 4 +.Xr iic 4 , +.Xr envstat 8 .Sh HISTORY The .Nm
CVS commit: src/distrib
Module Name:src
Committed By: martin
Date: Sun May 18 13:06:12 UTC 2014
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
PR install/48818: put vi on install CDs
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.28 -r1.29 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.16 -r1.17 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.8 src/distrib/amd64/cdroms/Makefile.cdrom:1.9
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.8 Fri Dec 21 18:11:10 2012
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sun May 18 13:06:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.8 2012/12/21 18:11:10 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.9 2014/05/18 13:06:12 martin Exp $
.include bsd.own.mk
@@ -35,6 +35,7 @@ CDRUNTIME+= ./usr/bin/sed
CDRUNTIME+= ./usr/bin/sort
CDRUNTIME+= ./usr/bin/tip
CDRUNTIME+= ./usr/bin/tput
+CDRUNTIME+= ./usr/bin/vi
CDRUNTIME+= ./usr/bin/vmstat
CDRUNTIME+= ./usr/lib/libbz2.so*
CDRUNTIME+= ./usr/lib/libc.so*
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.28 src/distrib/i386/cdroms/Makefile.cdrom:1.29
--- src/distrib/i386/cdroms/Makefile.cdrom:1.28 Fri Dec 21 18:13:22 2012
+++ src/distrib/i386/cdroms/Makefile.cdrom Sun May 18 13:06:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.28 2012/12/21 18:13:22 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.29 2014/05/18 13:06:12 martin Exp $
.include bsd.own.mk
@@ -35,6 +35,7 @@ CDRUNTIME+= ./usr/bin/sed
CDRUNTIME+= ./usr/bin/sort
CDRUNTIME+= ./usr/bin/tip
CDRUNTIME+= ./usr/bin/tput
+CDRUNTIME+= ./usr/bin/vi
CDRUNTIME+= ./usr/bin/vmstat
CDRUNTIME+= ./usr/lib/libbz2.so*
CDRUNTIME+= ./usr/lib/libc.so*
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.16 src/distrib/sparc64/cdroms/installcd/Makefile:1.17
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.16 Sat Dec 22 17:51:19 2012
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sun May 18 13:06:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/12/22 17:51:19 tsutsui Exp $
+# $NetBSD: Makefile,v 1.17 2014/05/18 13:06:12 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -36,6 +36,7 @@ CDRUNTIME+= ./usr/bin/sed
CDRUNTIME+= ./usr/bin/sort
CDRUNTIME+= ./usr/bin/tip
CDRUNTIME+= ./usr/bin/tput
+CDRUNTIME+= ./usr/bin/vi
CDRUNTIME+= ./usr/bin/vmstat
CDRUNTIME+= ./usr/lib/libbz2.so*
CDRUNTIME+= ./usr/lib/libc.so*
CVS commit: src/sys/rump/librump/rumpnet
Module Name:src Committed By: rmind Date: Sun May 18 14:03:26 UTC 2014 Modified Files: src/sys/rump/librump/rumpnet: net_stub.c Log Message: Fix RUMP build. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/rump/librump/rumpnet/net_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpnet/net_stub.c diff -u src/sys/rump/librump/rumpnet/net_stub.c:1.17 src/sys/rump/librump/rumpnet/net_stub.c:1.18 --- src/sys/rump/librump/rumpnet/net_stub.c:1.17 Sat Apr 26 11:23:56 2014 +++ src/sys/rump/librump/rumpnet/net_stub.c Sun May 18 14:03:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: net_stub.c,v 1.17 2014/04/26 11:23:56 pooka Exp $ */ +/* $NetBSD: net_stub.c,v 1.18 2014/05/18 14:03:26 rmind Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.17 2014/04/26 11:23:56 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.18 2014/05/18 14:03:26 rmind Exp $); #include sys/param.h #include sys/protosw.h @@ -61,7 +61,7 @@ __weak_alias(agr_input,rumpnet_stub); __weak_alias(ieee8023ad_lacp_input,rumpnet_stub); __weak_alias(ieee8023ad_marker_input,rumpnet_stub); -struct ifnet_head ifnet; +struct ifnet_head ifnet_list; int compat_ifconf(u_long cmd, void *data)
CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Sun May 18 15:45:08 UTC 2014 Modified Files: src/share/man/man3: queue.3 Log Message: Whitespace and punctuation. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/share/man/man3/queue.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/queue.3 diff -u src/share/man/man3/queue.3:1.48 src/share/man/man3/queue.3:1.49 --- src/share/man/man3/queue.3:1.48 Sat May 17 21:22:56 2014 +++ src/share/man/man3/queue.3 Sun May 18 15:45:08 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: queue.3,v 1.48 2014/05/17 21:22:56 rmind Exp $ +.\ $NetBSD: queue.3,v 1.49 2014/05/18 15:45:08 wiz Exp $ .\ .\ Copyright (c) 2000, 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -139,7 +139,7 @@ .Nm STAILQ_REMOVE_HEAD , .Nm STAILQ_REMOVE , .Nm STAILQ_CONCAT , -.Nd implementations of singly-linked lists, lists, simple queues, tail queues, and singly-linked tail queues. +.Nd implementations of singly-linked lists, lists, simple queues, tail queues, and singly-linked tail queues .Sh SYNOPSIS .In sys/queue.h .Pp @@ -377,8 +377,8 @@ of data structure. .Pp .TS box tab(:); -l | c | c | c | c | c -l | c | c | c | c | c +l | c | c | c | c | c +l | c | c | c | c | c l | c | c | c | c | c l | c | c | c | c | c l | c | c | c | c | c
CVS commit: src/share/zoneinfo
Module Name:src
Committed By: apb
Date: Sun May 18 16:53:56 UTC 2014
Modified Files:
src/share/zoneinfo: tzdata2netbsd
Log Message:
Many changes to tzdata2netbsd.
This has been tested in a private repository.
* Use set -e
* Pass -d ${CVSROOT} to all cvs invocations. cvs import needs it.
* cvs import needs to be done in the directory where the tarball
was extracted.
* cvs import does not take a -F messagefile option (as cvs commit does);
it needs -m messagestring.
* The DOIT function now prompts for a yes/no/quit response, and quotes
complex arguments when printing the command.
* When checking the PGP signature, require the correct key to have been used.
* Usability improvements when editing the cvs log message.
* More error checking.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/zoneinfo/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/zoneinfo/tzdata2netbsd
diff -u src/share/zoneinfo/tzdata2netbsd:1.1 src/share/zoneinfo/tzdata2netbsd:1.2
--- src/share/zoneinfo/tzdata2netbsd:1.1 Sat May 17 19:53:22 2014
+++ src/share/zoneinfo/tzdata2netbsd Sun May 18 16:53:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.1 2014/05/17 19:53:22 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.2 2014/05/18 16:53:56 apb Exp $
#
# For use by NetBSD developers when updating to new versions of tzdata.
#
@@ -33,18 +33,72 @@ NEWSFILE=${WORKDIR}/NEWS
NEWSTRIMFILE=${WORKDIR}/NEWS.trimmed
IMPORTMSGFILE=${WORKDIR}/import.msg
MERGSMSGFILE=${WORKDIR}/merge.msg
+PGPVERIFYLOG=${WORKDIR}/pgpverify.log
DOIT()
{
- really_do_it=false
+ local really_do_it=false
+ local reply
+ echo ABOUT TO DO: $(shell_quote $@)
+ read -p Really do it? [yes/no/quit] reply
+ case ${reply} in
+ [yY]*) really_do_it=true ;;
+ [nN]*) really_do_it=false ;;
+ [qQ]*)
+ echo Aborting
+ return 1
+ ;;
+ esac
if $really_do_it; then
+ echo REALLY DOING IT NOW...
$@
else
echo NOT REALLY DOING: $@
fi
}
+# Quote args to make them safe in the shell.
+# Usage: quotedlist=$(shell_quote args...)
+#
+# After building up a quoted list, use it by evaling it inside
+# double quotes, like this:
+#eval set -- $quotedlist
+# or like this:
+#eval \$command $quotedlist \$filename
+shell_quote()
+{
+ local result=''
+ local arg qarg
+ for arg in $@ ; do
+ case ${arg} in
+ ''|*[!-./a-zA-Z0-9]*)
+ # Convert each embedded ' to '\'',
+ # then insert ' at the beginning of the first line,
+ # and append ' at the end of the last line.
+ qarg=$(printf %s\n $arg | \
+ sed -e s/'/'''/g -e 1s/^/'/ -e \$s/\$/'/)
+ ;;
+ *)
+ # Arg is not the empty string, and does not contain
+ # any unsafe characters.
+ qarg=${arg}
+ ;;
+ esac
+ result=${result}${result:+ }${qarg}
+ done
+ printf %s\n $result
+}
+
+findcvsroot()
+{
+ [ -n ${CVSROOT} ] return 0
+ CVSROOT=$( cat ./CVS/Root )
+ [ -n ${CVSROOT} ] return 0
+ echo 2 Failed to set CVSROOT value
+ return 1
+}
+
mkworkdir()
{
mkdir -p ${WORKDIR}
@@ -59,7 +113,23 @@ fetch()
checksig()
{
- gpg --verify ${SIGFILE} ${DISTFILE}
+ { gpg --verify ${SIGFILE} ${DISTFILE}
+ echo gpg exit status $?
+ } 21 | tee ${PGPVERIFYLOG}
+
+ # The output should contain lines that match all the following regexps
+ #
+ while read line; do
+ if ! grep -q -e ^${line}\$ ${PGPVERIFYLOG}; then
+ echo 2 Failed to verify signature: ${line}
+ return 1
+ fi
+ done 'EOF'
+gpg: Signature made .* using RSA key ID 62AA7E34
+gpg: Good signature from Paul Eggert egg...@cs.ucla.edu
+Primary key fingerprint: 7E37 92A9 D8AC F7D6 33BC 1588 ED97 E90E 62AA 7E34
+gpg exit status 0
+EOF
}
extract()
@@ -68,10 +138,8 @@ extract()
tar -z -xf ${DISTFILE} -C ${EXTRACTDIR}
}
-# Each release has a heading in the NEWS file, like
-# Release version - date.
-# Find the relevant part of the NEWS file for all release between
-# OLDVAR and NEWVER, and save them to NEWSTRIMFILE.
+# Find the relevant part of the NEWS file for all releases between
+# OLDVER and NEWVER, and save them to NEWSTRIMFILE.
#
trimnews()
{
@@ -79,6 +147,7 @@ trimnews()
'
BEGIN {inrange = 0}
/^Release [0-9]+[a-z]+ - .*/ {
+ # Release version - date
inrange = ($2 oldver $2 = newver)
}
// { if (inrange) print; }
@@ -88,12 +157,21 @@ trimnews()
# Create IMPORTMSGFILE from NEWSTRIMFILE, by ignoring some sections,
# keeping only the first sentence from paragraphs in other sections,
-# and changing the format. The result should be edited by hand before
-# performing a cvs commit.
+# and changing the format.
+#
+# The result should be edited by hand before performing a cvs commit.
+# A message to that effect is inserted at the beginning of the file.
#
mkimportmsg()
{
[ -s ${IMPORTMSGFILE} ] return
+ { cat EOF
+EDIT ME: Edit this file and then delete the lines marked EDIT ME.
+EDIT ME: This file will be used as a log message for the cvs commit that
CVS commit: src/sys/rump/net/lib/libsockin
Module Name:src
Committed By: rmind
Date: Sun May 18 17:57:44 UTC 2014
Modified Files:
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
Fix RUMP build.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/rump/net/lib/libsockin/sockin.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/rump/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.38 src/sys/rump/net/lib/libsockin/sockin.c:1.39
--- src/sys/rump/net/lib/libsockin/sockin.c:1.38 Fri May 9 06:12:48 2014
+++ src/sys/rump/net/lib/libsockin/sockin.c Sun May 18 17:57:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.38 2014/05/09 06:12:48 pooka Exp $ */
+/* $NetBSD: sockin.c,v 1.39 2014/05/18 17:57:44 rmind Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sockin.c,v 1.38 2014/05/09 06:12:48 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: sockin.c,v 1.39 2014/05/18 17:57:44 rmind Exp $);
#include sys/param.h
#include sys/condvar.h
@@ -70,13 +70,17 @@ static int sockin_usrreq(struct socket *
struct mbuf *, struct mbuf *, struct lwp *);
static int sockin_ctloutput(int op, struct socket *, struct sockopt *);
+static const struct pr_usrreqs sockin_usrreqs = {
+ .pr_generic = sockin_usrreq,
+};
+
const struct protosw sockinsw[] = {
{
.pr_type = SOCK_DGRAM,
.pr_domain = sockindomain,
.pr_protocol = IPPROTO_UDP,
.pr_flags = PR_ATOMIC|PR_ADDR,
- .pr_usrreq = sockin_usrreq,
+ .pr_usrreqs = sockin_usrreqs,
.pr_ctloutput = sockin_ctloutput,
},
{
@@ -84,7 +88,7 @@ const struct protosw sockinsw[] = {
.pr_domain = sockindomain,
.pr_protocol = IPPROTO_TCP,
.pr_flags = PR_CONNREQUIRED|PR_WANTRCVD|PR_LISTEN|PR_ABRTACPTDIS,
- .pr_usrreq = sockin_usrreq,
+ .pr_usrreqs = sockin_usrreqs,
.pr_ctloutput = sockin_ctloutput,
}};
const struct protosw sockin6sw[] = {
@@ -93,7 +97,7 @@ const struct protosw sockin6sw[] = {
.pr_domain = sockin6domain,
.pr_protocol = IPPROTO_UDP,
.pr_flags = PR_ATOMIC|PR_ADDR,
- .pr_usrreq = sockin_usrreq,
+ .pr_usrreqs = sockin_usrreqs,
.pr_ctloutput = sockin_ctloutput,
},
{
@@ -101,7 +105,7 @@ const struct protosw sockin6sw[] = {
.pr_domain = sockin6domain,
.pr_protocol = IPPROTO_TCP,
.pr_flags = PR_CONNREQUIRED|PR_WANTRCVD|PR_LISTEN|PR_ABRTACPTDIS,
- .pr_usrreq = sockin_usrreq,
+ .pr_usrreqs = sockin_usrreqs,
.pr_ctloutput = sockin_ctloutput,
}};
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: jakllsch Date: Sun May 18 18:24:16 UTC 2014 Modified Files: src/distrib/sets/lists/man: mi Log Message: add hythygtemp man page files to setlist To generate a diff of this commit: cvs rdiff -u -r1.1473 -r1.1474 src/distrib/sets/lists/man/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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1473 src/distrib/sets/lists/man/mi:1.1474 --- src/distrib/sets/lists/man/mi:1.1473 Thu May 15 16:32:28 2014 +++ src/distrib/sets/lists/man/mi Sun May 18 18:24:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1473 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: mi,v 1.1474 2014/05/18 18:24:16 jakllsch Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1193,6 +1193,7 @@ ./usr/share/man/cat4/hppa/wax.0 man-sys-catman .cat ./usr/share/man/cat4/hpqlb.0 man-sys-catman .cat ./usr/share/man/cat4/hptide.0 man-sys-catman .cat +./usr/share/man/cat4/hythygtemp.0 man-sys-catman .cat ./usr/share/man/cat4/i386/PCIBIOS.0 man-sys-catman .cat ./usr/share/man/cat4/i386/apm.0 man-sys-catman .cat ./usr/share/man/cat4/i386/autoconf.0 man-sys-catman .cat @@ -4221,6 +4222,7 @@ ./usr/share/man/html4/hppa/wax.html man-sys-htmlman html ./usr/share/man/html4/hpqlb.html man-sys-htmlman html ./usr/share/man/html4/hptide.html man-sys-htmlman html +./usr/share/man/html4/hythygtemp.html man-sys-htmlman html ./usr/share/man/html4/i386/PCIBIOS.html man-sys-htmlman html ./usr/share/man/html4/i386/apm.html man-sys-htmlman html ./usr/share/man/html4/i386/autoconf.html man-sys-htmlman html @@ -7039,6 +7041,7 @@ ./usr/share/man/man4/hppa/wax.4 man-sys-man .man ./usr/share/man/man4/hpqlb.4 man-sys-man .man ./usr/share/man/man4/hptide.4 man-sys-man .man +./usr/share/man/man4/hythygtemp.4 man-sys-man .man ./usr/share/man/man4/i386/PCIBIOS.4 man-sys-man .man ./usr/share/man/man4/i386/apm.4 man-sys-man .man ./usr/share/man/man4/i386/autoconf.4 man-sys-man .man
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: jakllsch Date: Sun May 18 18:28:49 UTC 2014 Modified Files: src/distrib/sets/lists/modules: md.evbppc.powerpc mi Log Message: add hythygtemp module to set lists To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/modules/md.evbppc.powerpc cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/modules/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/modules/md.evbppc.powerpc diff -u src/distrib/sets/lists/modules/md.evbppc.powerpc:1.2 src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3 --- src/distrib/sets/lists/modules/md.evbppc.powerpc:1.2 Thu May 15 16:32:28 2014 +++ src/distrib/sets/lists/modules/md.evbppc.powerpc Sun May 18 18:28:48 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc.powerpc,v 1.2 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: md.evbppc.powerpc,v 1.3 2014/05/18 18:28:48 jakllsch Exp $ ./stand/powerpc-4xx base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod,compatmodules @@ -90,6 +90,8 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/hdaudio/hdaudio.kmod base-obsolete obsolete ./stand/powerpc-4xx/@OSRELEASE@/modules/hfsbase-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/hfs/hfs.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/hythygtemp base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/hythygtemp/hythygtemp.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/if_axebase-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/if_axenbase-kernel-modules kmod,compatmodules @@ -323,6 +325,8 @@ ./stand/powerpc-booke/@OSRELEASE@/modules/hdaudio/hdaudio.kmod base-obsolete obsolete ./stand/powerpc-booke/@OSRELEASE@/modules/hfsbase-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/hfs/hfs.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-booke/@OSRELEASE@/modules/hythygtemp base-kernel-modules kmod,compatmodules +./stand/powerpc-booke/@OSRELEASE@/modules/hythygtemp/hythygtemp.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/if_axe base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/if_axen base-kernel-modules kmod,compatmodules Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.68 src/distrib/sets/lists/modules/mi:1.69 --- src/distrib/sets/lists/modules/mi:1.68 Thu May 15 16:32:28 2014 +++ src/distrib/sets/lists/modules/mi Sun May 18 18:28:49 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.68 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: mi,v 1.69 2014/05/18 18:28:49 jakllsch Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -92,6 +92,8 @@ ./@MODULEDIR@/gpiosim/gpiosim.kmod base-kernel-modules kmod ./@MODULEDIR@/hfsbase-kernel-modules kmod ./@MODULEDIR@/hfs/hfs.kmod base-kernel-modules kmod +./@MODULEDIR@/hythygtemp base-kernel-modules kmod +./@MODULEDIR@/hythygtemp/hythygtemp.kmod base-kernel-modules kmod ./@MODULEDIR@/if_axebase-kernel-modules kmod ./@MODULEDIR@/if_axe/if_axe.kmod base-kernel-modules kmod ./@MODULEDIR@/if_axenbase-kernel-modules kmod
CVS commit: src/sys/dev/pci
Module Name:src Committed By: christos Date: Sun May 18 18:43:46 UTC 2014 Modified Files: src/sys/dev/pci: if_de.c Log Message: remove stray line accidentally committed. To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.143 src/sys/dev/pci/if_de.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_de.c diff -u src/sys/dev/pci/if_de.c:1.142 src/sys/dev/pci/if_de.c:1.143 --- src/sys/dev/pci/if_de.c:1.142 Sat Mar 29 15:28:24 2014 +++ src/sys/dev/pci/if_de.c Sun May 18 14:43:46 2014 @@ -1,5 +1,4 @@ -/* $NetBSD: if_de.c,v 1.142 2014/03/29 19:28:24 christos Exp $ */ - char intrbuf[PCI_INTRSTR_LEN]; +/* $NetBSD: if_de.c,v 1.143 2014/05/18 18:43:46 christos Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (m...@3am-software.com) @@ -38,7 +37,7 @@ * board which support 21040, 21041, or 21140 (mostly). */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_de.c,v 1.142 2014/03/29 19:28:24 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: if_de.c,v 1.143 2014/05/18 18:43:46 christos Exp $); #define TULIP_HDR_DATA
CVS commit: src/sys/kern
Module Name:src
Committed By: justin
Date: Sun May 18 21:25:44 UTC 2014
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
Fix prototype of last arg of rump_sys_mknod to dev_t not uint32_t
Discussed with pooka@
See also https://github.com/rumpkernel/buildrump.sh/issues/53
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.142 src/sys/kern/makesyscalls.sh:1.143
--- src/sys/kern/makesyscalls.sh:1.142 Sun Apr 27 14:50:23 2014
+++ src/sys/kern/makesyscalls.sh Sun May 18 21:25:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: makesyscalls.sh,v 1.142 2014/04/27 14:50:23 pooka Exp $
+# $NetBSD: makesyscalls.sh,v 1.143 2014/05/18 21:25:44 justin Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -609,7 +609,9 @@ function printproto(wrap) {
# occurence for the default __RENAME()
seen = funcseen[fbase]
funcseen[fbase] = rumpfname
- if (seen)
+ # special case for mknod as type of last argument changed from
+ # uint32_t to dev_t
+ if ((seen fbase != mknod) || (!seen fbase == mknod))
return
printf(%s rump_sys_%s(, returntype, realname) rumpprotos
CVS commit: src/sys/netbt
Module Name:src
Committed By: rmind
Date: Mon May 19 03:18:57 UTC 2014
Modified Files:
src/sys/netbt: l2cap_socket.c
Log Message:
l2cap_detach1: fix gcc warning for non-DIAGNOSTIC case.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/netbt/l2cap_socket.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/netbt/l2cap_socket.c
diff -u src/sys/netbt/l2cap_socket.c:1.12 src/sys/netbt/l2cap_socket.c:1.13
--- src/sys/netbt/l2cap_socket.c:1.12 Mon May 19 02:51:24 2014
+++ src/sys/netbt/l2cap_socket.c Mon May 19 03:18:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: l2cap_socket.c,v 1.12 2014/05/19 02:51:24 rmind Exp $ */
+/* $NetBSD: l2cap_socket.c,v 1.13 2014/05/19 03:18:57 rmind Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: l2cap_socket.c,v 1.12 2014/05/19 02:51:24 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: l2cap_socket.c,v 1.13 2014/05/19 03:18:57 rmind Exp $);
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
@@ -111,9 +111,7 @@ l2cap_attach1(struct socket *so, int pro
static void
l2cap_detach1(struct socket *so)
{
- struct l2cap_channel *pcb = so-so_pcb;
-
- KASSERT(pcb != NULL);
+ KASSERT(so-so_pcb != NULL);
l2cap_detach((struct l2cap_channel **)so-so_pcb);
KASSERT(so-so_pcb == NULL);
}
CVS commit: src/sys/uvm
Module Name:src Committed By: riastradh Date: Mon May 19 05:24:29 UTC 2014 Modified Files: src/sys/uvm: uvm_pglist.c Log Message: Don't leak memory on failure in uvm_pglistalloc_contig. Free pages like uvm_pglistalloc_simple does. Discovered by code inspection. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/uvm/uvm_pglist.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/uvm/uvm_pglist.c diff -u src/sys/uvm/uvm_pglist.c:1.63 src/sys/uvm/uvm_pglist.c:1.64 --- src/sys/uvm/uvm_pglist.c:1.63 Sun Sep 15 15:54:23 2013 +++ src/sys/uvm/uvm_pglist.c Mon May 19 05:24:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_pglist.c,v 1.63 2013/09/15 15:54:23 martin Exp $ */ +/* $NetBSD: uvm_pglist.c,v 1.64 2014/05/19 05:24:29 riastradh Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_pglist.c,v 1.63 2013/09/15 15:54:23 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_pglist.c,v 1.64 2014/05/19 05:24:29 riastradh Exp $); #include sys/param.h #include sys/systm.h @@ -354,6 +354,8 @@ out: uvm_kick_pdaemon(); mutex_spin_exit(uvm_fpageqlock); + if (error) + uvm_pglistfree(rlist); return (error); }
CVS commit: src/etc/mtree
Module Name:src Committed By: uebayasi Date: Mon May 19 05:43:35 UTC 2014 Modified Files: src/etc/mtree: special Log Message: Tag all 0600 files as nodiff (== secret). To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.146 src/etc/mtree/special:1.147 --- src/etc/mtree/special:1.146 Tue Jul 9 09:34:58 2013 +++ src/etc/mtree/special Mon May 19 05:43:35 2014 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.146 2013/07/09 09:34:58 roy Exp $ +# $NetBSD: special,v 1.147 2014/05/19 05:43:35 uebayasi Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -38,7 +38,7 @@ ./etc/bootptab type=file mode=0644 optional ./etc/ccd.conf type=file mode=0644 optional ./etc/cgd type=dir mode=0700 optional -./etc/cgd/cgd.conf type=file mode=0600 optional +./etc/cgd/cgd.conf type=file mode=0600 optional tags=nodiff ./etc/changelist type=file mode=0644 ./etc/crontab type=file mode=0644 optional ./etc/csh.cshrc type=file mode=0644 @@ -81,7 +81,7 @@ ./etc/hosts type=file mode=0644 ./etc/hosts.allow type=file mode=0644 optional ./etc/hosts.deny type=file mode=0644 optional -./etc/hosts.equiv type=file mode=0600 optional +./etc/hosts.equiv type=file mode=0600 optional tags=nodiff ./etc/hosts.lpd type=file mode=0644 optional ./etc/ifaliases type=file mode=0644 optional ./etc/inetd.conf type=file mode=0644 @@ -90,7 +90,7 @@ ./etc/ipnat.conf type=file mode=0644 optional ./etc/ipsec.conf type=file mode=0600 optional tags=nodiff ./etc/iscsi type=dir mode=0755 -./etc/iscsi/auths type=file mode=0600 +./etc/iscsi/auths type=file mode=0600 tags=nodiff ./etc/iscsi/targets type=file mode=0644 ./etc/ld.so.conf type=file mode=0644 optional ./etc/localtime type=link mode=0755 @@ -304,16 +304,16 @@ ./etc/security.local type=file mode=0644 optional ./etc/services type=file mode=0644 ./etc/shells type=file mode=0644 -./etc/shosts.equiv type=file mode=0600 optional +./etc/shosts.equiv type=file mode=0600 optional tags=nodiff ./etc/skel type=dir mode=0755 optional -./etc/spwd.db type=file mode=0600 tags=exclude +./etc/spwd.db type=file mode=0600 tags=exclude tags=nodiff ./etc/ssh type=dir mode=0755 optional ./etc/ssh/ssh_config type=file mode=0644 optional ./etc/ssh/ssh_host_dsa_key type=file mode=0600 optional tags=nodiff ./etc/ssh/ssh_host_dsa_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_ecdsa_key type=file mode=0600 optional tags=nodiff ./etc/ssh/ssh_host_ecdsa_key.pub type=file mode=0644 optional -./etc/ssh/ssh_host_key type=file mode=0600 optional tags=nodiff +./etc/ssh/ssh_host_key type=file mode=0600 optional tags=nodiff tags=nodiff ./etc/ssh/ssh_host_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_rsa_key type=file mode=0600 optional tags=nodiff ./etc/ssh/ssh_host_rsa_key.pub type=file mode=0644 optional @@ -339,14 +339,14 @@ ./roottype=dir mode=0755 ./root/.cshrc type=file mode=0644 -./root/.klogin type=file mode=0600 optional +./root/.klogin type=file mode=0600 optional tags=nodiff ./root/.login type=file mode=0644 ./root/.profile type=file mode=0644 -./root/.rhosts type=file mode=0600 optional -./root/.shosts type=file mode=0600 optional +./root/.rhosts type=file mode=0600 optional tags=nodiff +./root/.shosts type=file mode=0600 optional tags=nodiff ./root/.ssh type=dir mode=0700 optional -./root/.ssh/authorized_keys type=file mode=0600 optional -./root/.ssh/authorized_keys2 type=file mode=0600 optional +./root/.ssh/authorized_keys type=file mode=0600 optional tags=nodiff +./root/.ssh/authorized_keys2 type=file mode=0600 optional tags=nodiff ./root/.ssh/config type=file mode=0644 optional ./root/.ssh/id_dsa type=file mode=0600 optional tags=nodiff ./root/.ssh/id_dsa.pub type=file mode=0644 optional @@ -404,10 +404,10 @@ ./var/chroot/tftp-proxy type=dir mode=0755 ./var/cron type=dir mode=0755 ./var/cron/tabs type=dir mode=0700 -./var/cron/tabs/root type=file mode=0600 +./var/cron/tabs/root type=file mode=0600 tags=nodiff ./var/db type=dir mode=0755 ./var/log type=dir mode=0755 -./var/log/authlog type=file mode=0600 optional tags=exclude +./var/log/authlog type=file mode=0600 optional tags=exclude tags=nodiff ./var/log/lastlog type=file mode=0664 gname=utmp tags=exclude ./var/log/lastlogx type=file mode=0664 gname=utmp tags=exclude ./var/log/wtmp type=file mode=0664 gname=utmp tags=exclude @@ -425,7 +425,7 @@ ./var/spool/ftp/etc type=dir mode=0755 optional ./var/spool/ftp/etc/group type=file mode=0644 optional ./var/spool/ftp/etc/localtime type=file mode=0644 optional -./var/spool/ftp/etc/master.passwd type=file mode=0600 optional +./var/spool/ftp/etc/master.passwd type=file
CVS commit: src/sys/uvm
Module Name:src Committed By: riastradh Date: Mon May 19 05:48:14 UTC 2014 Modified Files: src/sys/uvm: uvm_pglist.c Log Message: Back out previous silliness -- on failure no pages are allocated. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/uvm/uvm_pglist.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/uvm/uvm_pglist.c diff -u src/sys/uvm/uvm_pglist.c:1.64 src/sys/uvm/uvm_pglist.c:1.65 --- src/sys/uvm/uvm_pglist.c:1.64 Mon May 19 05:24:29 2014 +++ src/sys/uvm/uvm_pglist.c Mon May 19 05:48:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_pglist.c,v 1.64 2014/05/19 05:24:29 riastradh Exp $ */ +/* $NetBSD: uvm_pglist.c,v 1.65 2014/05/19 05:48:14 riastradh Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_pglist.c,v 1.64 2014/05/19 05:24:29 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_pglist.c,v 1.65 2014/05/19 05:48:14 riastradh Exp $); #include sys/param.h #include sys/systm.h @@ -354,8 +354,6 @@ out: uvm_kick_pdaemon(); mutex_spin_exit(uvm_fpageqlock); - if (error) - uvm_pglistfree(rlist); return (error); }
