CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: msaitoh
Date: Fri Nov 30 08:12:27 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: cpu.c
Log Message:
S/,/;/
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 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.88 src/sys/arch/arm/arm32/cpu.c:1.89
--- src/sys/arch/arm/arm32/cpu.c:1.88 Mon Nov 12 18:00:35 2012
+++ src/sys/arch/arm/arm32/cpu.c Fri Nov 30 08:12:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.88 2012/11/12 18:00:35 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.89 2012/11/30 08:12:27 msaitoh Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.88 2012/11/12 18:00:35 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.89 2012/11/30 08:12:27 msaitoh Exp $);
#include sys/systm.h
#include sys/conf.h
@@ -612,7 +612,7 @@ identify_arm_cpu(device_t dv, struct cpu
if (cpuids[i].cpuid == (cpuid CPU_ID_CPU_MASK)) {
cpu_class = cpuids[i].cpu_class;
steppingstr = cpuids[i].cpu_steppings[cpuid
- CPU_ID_REVISION_MASK],
+ CPU_ID_REVISION_MASK];
sprintf(cpu_model, %s%s%s (%s core),
cpuids[i].cpu_classname,
steppingstr[0] == '*' ? : ,
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: msaitoh
Date: Fri Nov 30 08:15:46 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: cpu.c
Log Message:
Use snprintf() instead of sprintf().
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 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.89 src/sys/arch/arm/arm32/cpu.c:1.90
--- src/sys/arch/arm/arm32/cpu.c:1.89 Fri Nov 30 08:12:27 2012
+++ src/sys/arch/arm/arm32/cpu.c Fri Nov 30 08:15:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.89 2012/11/30 08:12:27 msaitoh Exp $ */
+/* $NetBSD: cpu.c,v 1.90 2012/11/30 08:15:45 msaitoh Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.89 2012/11/30 08:12:27 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.90 2012/11/30 08:15:45 msaitoh Exp $);
#include sys/systm.h
#include sys/conf.h
@@ -613,8 +613,8 @@ identify_arm_cpu(device_t dv, struct cpu
cpu_class = cpuids[i].cpu_class;
steppingstr = cpuids[i].cpu_steppings[cpuid
CPU_ID_REVISION_MASK];
- sprintf(cpu_model, %s%s%s (%s core),
- cpuids[i].cpu_classname,
+ snprintf(cpu_model, sizeof(cpu_model),
+ %s%s%s (%s core), cpuids[i].cpu_classname,
steppingstr[0] == '*' ? : ,
steppingstr[steppingstr[0] == '*'],
cpu_classes[cpu_class].class_name);
@@ -622,7 +622,8 @@ identify_arm_cpu(device_t dv, struct cpu
}
if (cpuids[i].cpuid == 0)
- sprintf(cpu_model, unknown CPU (ID = 0x%x), cpuid);
+ snprintf(cpu_model, sizeof(cpu_model),
+ unknown CPU (ID = 0x%x), cpuid);
if (ci-ci_data.cpu_cc_freq != 0) {
char freqbuf[8];
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: wiz Date: Fri Nov 30 08:19:01 UTC 2012 Modified Files: src/crypto/dist/ipsec-tools/src/racoon: racoon.conf.5 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 \ src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 diff -u src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.65 src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.66 --- src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.65 Thu Nov 29 15:31:25 2012 +++ src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 Fri Nov 30 08:19:01 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: racoon.conf.5,v 1.65 2012/11/29 15:31:25 vanhu Exp $ +.\ $NetBSD: racoon.conf.5,v 1.66 2012/11/30 08:19:01 wiz Exp $ .\ .\ Id: racoon.conf.5,v 1.54 2006/08/22 18:17:17 manubsd Exp .\ @@ -29,7 +29,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd November 15, 2011 +.Dd November 29, 2012 .Dt RACOON.CONF 5 .Os .\
CVS commit: src/usr.bin/mkubootimage
Module Name:src Committed By: wiz Date: Fri Nov 30 08:25:35 UTC 2012 Modified Files: src/usr.bin/mkubootimage: mkubootimage.1 Log Message: Sort SYNOPSIS. Remove unnecessary Ns. Punctuation nit. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/mkubootimage/mkubootimage.1 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/mkubootimage/mkubootimage.1 diff -u src/usr.bin/mkubootimage/mkubootimage.1:1.1 src/usr.bin/mkubootimage/mkubootimage.1:1.2 --- src/usr.bin/mkubootimage/mkubootimage.1:1.1 Thu Nov 29 23:23:22 2012 +++ src/usr.bin/mkubootimage/mkubootimage.1 Fri Nov 30 08:25:35 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mkubootimage.1,v 1.1 2012/11/29 23:23:22 reed Exp $ +.\ $NetBSD: mkubootimage.1,v 1.2 2012/11/30 08:25:35 wiz Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -35,12 +35,12 @@ .Nd create U-Boot loader image .Sh SYNOPSIS .Nm +.Op Fl h .Fl A No ( arm Ns | Ns mips Ns | Ns mips64 Ns | Ns powerpc ) .Fl a Ar address .Op Fl C No Po bz2 Ns | Ns gz Ns | Ns lzma Ns | Ns lzo Ns | Ns none Pc .Op Fl E Ar address .Op Fl e Ar address -.Op Fl h .Op Fl m Ar magic .Fl n Ar image .Op Fl O No Po freebsd Ns | Ns linux Ns | Ns netbsd Ns | Ns openbsd Pc @@ -62,7 +62,7 @@ This is required. Sets the image load address. This is an integer between 0 and ULONG_MAX. This is required. -.It Fl C No ( bz2 Ns | Ns gz Ns | Ns lzma Ns | Ns lzo Ns | Ns none Ns ) +.It Fl C No ( bz2 Ns | Ns gz Ns | Ns lzma Ns | Ns lzo Ns | Ns none ) Defines the compression. The default is .Qq none . @@ -96,7 +96,7 @@ Display the usage and exit. Set the magic. This is an integer between 0 and ULONG_MAX. The default is -.Qq 0x27051956. +.Qq 0x27051956 . .It Fl n Ar image Defines the image name. This is required.
CVS commit: src/lib/libterminfo
Module Name:src
Committed By: msaitoh
Date: Fri Nov 30 10:14:18 UTC 2012
Modified Files:
src/lib/libterminfo: tparm.c
Log Message:
Fix off by one error.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libterminfo/tparm.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/libterminfo/tparm.c
diff -u src/lib/libterminfo/tparm.c:1.8 src/lib/libterminfo/tparm.c:1.9
--- src/lib/libterminfo/tparm.c:1.8 Sat Jun 2 19:10:33 2012
+++ src/lib/libterminfo/tparm.c Fri Nov 30 10:14:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tparm.c,v 1.8 2012/06/02 19:10:33 roy Exp $ */
+/* $NetBSD: tparm.c,v 1.9 2012/11/30 10:14:18 msaitoh Exp $ */
/*
* Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: tparm.c,v 1.8 2012/06/02 19:10:33 roy Exp $);
+__RCSID($NetBSD: tparm.c,v 1.9 2012/11/30 10:14:18 msaitoh Exp $);
#include sys/param.h
#include assert.h
@@ -57,7 +57,7 @@ typedef struct {
static int
push(int num, char *string, TPSTACK *stack)
{
- if (stack-offset sizeof(stack-nums)) {
+ if (stack-offset = sizeof(stack-nums)) {
errno = E2BIG;
return -1;
}
CVS commit: src/sys/kern
Module Name:src
Committed By: njoly
Date: Fri Nov 30 13:26:37 UTC 2012
Modified Files:
src/sys/kern: vfs_syscalls.c
Log Message:
Apply fix from hannken to ensure that VOP_ACCESS() is called on a
locked vnode for fd_nameiat(), fd_nameiat_simple() and do_sys_openat().
Fix both PR/47226 and PR/47255.
To generate a diff of this commit:
cvs rdiff -u -r1.461 -r1.462 src/sys/kern/vfs_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.461 src/sys/kern/vfs_syscalls.c:1.462
--- src/sys/kern/vfs_syscalls.c:1.461 Mon Nov 19 15:01:17 2012
+++ src/sys/kern/vfs_syscalls.c Fri Nov 30 13:26:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.461 2012/11/19 15:01:17 martin Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.462 2012/11/30 13:26:37 njoly Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.461 2012/11/19 15:01:17 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.462 2012/11/30 13:26:37 njoly Exp $);
#ifdef _KERNEL_OPT
#include opt_fileassoc.h
@@ -182,7 +182,9 @@ fd_nameiat(struct lwp *l, int fdat, stru
goto out;
if (!(dfp-f_flag FSEARCH)) {
+ vn_lock(dfp-f_data, LK_EXCLUSIVE);
error = VOP_ACCESS(dfp-f_data, VEXEC, l-l_cred);
+ VOP_UNLOCK(dfp-f_data);
if (error)
goto cleanup;
}
@@ -212,7 +214,9 @@ fd_nameiat_simple_user(struct lwp *l, in
goto out;
if (!(dfp-f_flag FSEARCH)) {
+ vn_lock(dfp-f_data, LK_EXCLUSIVE);
error = VOP_ACCESS(dfp-f_data, VEXEC, l-l_cred);
+ VOP_UNLOCK(dfp-f_data);
if (error)
goto cleanup;
}
@@ -1660,7 +1664,9 @@ do_sys_openat(lwp_t *l, int fdat, const
dvp = dfp-f_data;
if (!(dfp-f_flag FSEARCH)) {
+ vn_lock(dfp-f_data, LK_EXCLUSIVE);
error = VOP_ACCESS(dfp-f_data, VEXEC, l-l_cred);
+ VOP_UNLOCK(dfp-f_data);
if (error)
goto cleanup;
}
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Fri Nov 30 14:46:48 UTC 2012
Modified Files:
src/tests/ipf: h_common.sh
Log Message:
If we're going to expect a failure, we need to use the correct shell
function! atf_expect_fail() does not have a _tc in its name!
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/h_common.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/h_common.sh
diff -u src/tests/ipf/h_common.sh:1.5 src/tests/ipf/h_common.sh:1.6
--- src/tests/ipf/h_common.sh:1.5 Thu Nov 29 18:54:43 2012
+++ src/tests/ipf/h_common.sh Fri Nov 30 14:46:48 2012
@@ -1,4 +1,4 @@
-# $NetBSD: h_common.sh,v 1.5 2012/11/29 18:54:43 pgoyette Exp $
+# $NetBSD: h_common.sh,v 1.6 2012/11/30 14:46:48 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -71,7 +71,7 @@ failing_test_case()
atf_test_case ${name}
eval ${name}_body() { \
- atf_tc_expect_fail ${reason}; \
+ atf_expect_fail ${reason}; \
${check_function} '${name}' ${@} ; \
}
}
CVS commit: src/doc
Module Name:src Committed By: mbalmer Date: Fri Nov 30 16:22:54 UTC 2012 Modified Files: src/doc: RESPONSIBLE Log Message: I am absolutely not happy with the name change, but I still feel responsible for the code. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/doc/RESPONSIBLE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/RESPONSIBLE diff -u src/doc/RESPONSIBLE:1.100 src/doc/RESPONSIBLE:1.101 --- src/doc/RESPONSIBLE:1.100 Wed May 30 14:33:48 2012 +++ src/doc/RESPONSIBLE Fri Nov 30 16:22:53 2012 @@ -1,4 +1,4 @@ -# $NetBSD: RESPONSIBLE,v 1.100 2012/05/30 14:33:48 nonaka Exp $ +# $NetBSD: RESPONSIBLE,v 1.101 2012/11/30 16:22:53 mbalmer Exp $ List of sections of the system, and who is responsible for them (or at least considered an expert on them). @@ -57,7 +57,7 @@ toolchain thorpej, mrg top simonb user agc vi aymeric -wake mbalmer +wakeonlan mbalmer wpa_supplicant scw Userland Libraries:
CVS commit: src/share/mk
Module Name:src Committed By: joerg Date: Fri Nov 30 17:51:51 UTC 2012 Modified Files: src/share/mk: bsd.own.mk Log Message: Don't force link and CSS options in bsd.own.mk, bsd.man.mk sets them. To generate a diff of this commit: cvs rdiff -u -r1.715 -r1.716 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.715 src/share/mk/bsd.own.mk:1.716 --- src/share/mk/bsd.own.mk:1.715 Sat Nov 24 14:00:35 2012 +++ src/share/mk/bsd.own.mk Fri Nov 30 17:51:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.715 2012/11/24 14:00:35 alnsn Exp $ +# $NetBSD: bsd.own.mk,v 1.716 2012/11/30 17:51:50 joerg Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -399,7 +399,7 @@ TOOL_MAKEFS= makefs TOOL_MAKEINFO= makeinfo TOOL_MAKEWHATIS= /usr/libexec/makewhatis TOOL_MANDOC_ASCII= mandoc -Tascii -TOOL_MANDOC_HTML= mandoc -Thtml -Oman=../html%S/%N.html -Ostyle=../style.css +TOOL_MANDOC_HTML= mandoc -Thtml TOOL_MANDOC_LINT= mandoc -Tlint TOOL_MDSETIMAGE= mdsetimage TOOL_MENUC= menuc
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Fri Nov 30 17:52:13 UTC 2012
Modified Files:
src/share/mk: bsd.man.mk
Log Message:
CATDEPS is bogus for mandoc, so disable it in that case.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/share/mk/bsd.man.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.man.mk
diff -u src/share/mk/bsd.man.mk:1.109 src/share/mk/bsd.man.mk:1.110
--- src/share/mk/bsd.man.mk:1.109 Sat Sep 10 16:57:35 2011
+++ src/share/mk/bsd.man.mk Fri Nov 30 17:52:13 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.man.mk,v 1.109 2011/09/10 16:57:35 apb Exp $
+# $NetBSD: bsd.man.mk,v 1.110 2012/11/30 17:52:13 joerg Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include bsd.init.mk
@@ -17,12 +17,16 @@ TMACDEPDIR?= /usr/share/tmac
.endif
HTMLDIR?= ${DESTDIR}${MANDIR}
+.if ${MKMANDOC} == yes !defined(NOMANDOC)
+CATDEPS?=
+.else
CATDEPS?= ${TMACDEPDIR}/andoc.tmac \
${TMACDEPDIR}/doc.tmac \
${TMACDEPDIR}/mdoc/doc-common \
${TMACDEPDIR}/mdoc/doc-ditroff \
${TMACDEPDIR}/mdoc/doc-nroff \
${TMACDEPDIR}/mdoc/doc-syms
+.endif
MANTARGET?= cat
MAN?=
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: riz Date: Fri Nov 30 18:13:30 UTC 2012 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: Add alc* at pci, re-sort slightly to reduce diffs from GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/amd64/conf/XEN3_DOM0 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/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.90 src/sys/arch/amd64/conf/XEN3_DOM0:1.91 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.90 Wed Oct 17 14:48:08 2012 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Nov 30 18:13:30 2012 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.90 2012/10/17 14:48:08 apb Exp $ +# $NetBSD: XEN3_DOM0,v 1.91 2012/11/30 18:13:30 riz Exp $ include arch/amd64/conf/std.xen @@ -322,8 +322,9 @@ amdpm* at pci? dev ? function ? # RNG an # PCI network interfaces age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet -an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) +alc* at pci? dev ? function ? # Attansic/Atheros L1C/L2C Ethernet ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet +an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet
CVS commit: src/sys
Module Name:src
Committed By: nakayama
Date: Fri Nov 30 23:24:22 UTC 2012
Modified Files:
src/sys/fs/smbfs: smbfs_smb.c smbfs_subr.c smbfs_subr.h smbfs_vnops.c
src/sys/netsmb: smb.h
Log Message:
Improve smbfs timestamp handling.
Don't round timestamp to 2 seconds resolution if the server
supports the CAP_INFOLEVEL_PASSTHRU capability.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/fs/smbfs/smbfs_smb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/fs/smbfs/smbfs_subr.c
cvs rdiff -u -r1.20 -r1.21 src/sys/fs/smbfs/smbfs_subr.h
cvs rdiff -u -r1.84 -r1.85 src/sys/fs/smbfs/smbfs_vnops.c
cvs rdiff -u -r1.19 -r1.20 src/sys/netsmb/smb.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/fs/smbfs/smbfs_smb.c
diff -u src/sys/fs/smbfs/smbfs_smb.c:1.43 src/sys/fs/smbfs/smbfs_smb.c:1.44
--- src/sys/fs/smbfs/smbfs_smb.c:1.43 Sat Nov 24 19:48:24 2012
+++ src/sys/fs/smbfs/smbfs_smb.c Fri Nov 30 23:24:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_smb.c,v 1.43 2012/11/24 19:48:24 nakayama Exp $ */
+/* $NetBSD: smbfs_smb.c,v 1.44 2012/11/30 23:24:21 nakayama Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.43 2012/11/24 19:48:24 nakayama Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.44 2012/11/30 23:24:21 nakayama Exp $);
#include sys/param.h
#include sys/systm.h
@@ -430,7 +430,6 @@ smbfs_smb_setptime2(struct smbnode *np,
/*
* NT level. Specially for win9x
*/
-#if 0
int
smbfs_smb_setpattrNT(struct smbnode *np, u_short attr, struct timespec *mtime,
struct timespec *atime, struct smb_cred *scred)
@@ -442,13 +441,22 @@ smbfs_smb_setpattrNT(struct smbnode *np,
int64_t tm;
int error, tzoff;
+ /*
+ * SMB_SET_FILE_BASIC_INFO isn't supported for
+ * SMB_TRANS2_SET_PATH_INFORMATION,
+ * so use SMB_SET_FILE_BASIC_INFORMATION instead,
+ * but it requires SMB_CAP_INFOLEVEL_PASSTHRU capability.
+ */
+ if ((SMB_CAPS(vcp) SMB_CAP_INFOLEVEL_PASSTHRU) == 0)
+ return smbfs_smb_setptime2(np, mtime, atime, attr, scred);
+
error = smb_t2_alloc(SSTOCP(ssp), SMB_TRANS2_SET_PATH_INFORMATION,
scred, t2p);
if (error)
return error;
mbp = t2p-t2_tparam;
mb_init(mbp);
- mb_put_uint16le(mbp, SMB_SET_FILE_BASIC_INFO);
+ mb_put_uint16le(mbp, SMB_SET_FILE_BASIC_INFORMATION);
mb_put_uint32le(mbp, 0); /* MBZ */
error = smbfs_fullpath(mbp, vcp, np, NULL, 0);
if (error) {
@@ -471,13 +479,13 @@ smbfs_smb_setpattrNT(struct smbnode *np,
mb_put_int64le(mbp, tm);
mb_put_int64le(mbp, tm); /* change time */
mb_put_uint32le(mbp, attr); /* attr */
- t2p-t2_maxpcount = 24;
- t2p-t2_maxdcount = 56;
+ mb_put_uint32le(mbp, 0); /* padding */
+ t2p-t2_maxpcount = 2;
+ t2p-t2_maxdcount = 0;
error = smb_t2_request(t2p);
smb_t2_done(t2p);
return error;
}
-#endif
/*
* Set file atime and mtime. Doesn't supported by core dialect.
@@ -560,9 +568,8 @@ smbfs_smb_setfattrNT(struct smbnode *np,
tm = 0;
mb_put_int64le(mbp, tm);
mb_put_int64le(mbp, tm); /* change time */
- mb_put_uint16le(mbp, attr);
- mb_put_uint32le(mbp, 0); /* padding */
- mb_put_uint16le(mbp, 0);
+ mb_put_uint32le(mbp, attr); /* attr */
+ mb_put_uint32le(mbp, 0); /* padding */
t2p-t2_maxpcount = 2;
t2p-t2_maxdcount = 0;
error = smb_t2_request(t2p);
Index: src/sys/fs/smbfs/smbfs_subr.c
diff -u src/sys/fs/smbfs/smbfs_subr.c:1.15 src/sys/fs/smbfs/smbfs_subr.c:1.16
--- src/sys/fs/smbfs/smbfs_subr.c:1.15 Thu Jun 9 02:59:22 2011
+++ src/sys/fs/smbfs/smbfs_subr.c Fri Nov 30 23:24:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_subr.c,v 1.15 2011/06/09 02:59:22 rmind Exp $ */
+/* $NetBSD: smbfs_subr.c,v 1.16 2012/11/30 23:24:21 nakayama Exp $ */
/*
* Copyright (c) 2000-2001, Boris Popov
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_subr.c,v 1.15 2011/06/09 02:59:22 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbfs_subr.c,v 1.16 2012/11/30 23:24:21 nakayama Exp $);
#include sys/param.h
#include sys/systm.h
@@ -145,7 +145,7 @@ smb_time_local2NT(struct timespec *tsp,
u_long seconds;
smb_time_local2server(tsp, 0, seconds);
- *nsec = (((int64_t)(seconds) ~1) + DIFF1970TO1601) * (int64_t)1000;
+ *nsec = ((int64_t)seconds + DIFF1970TO1601) * (int64_t)1000;
}
void
Index: src/sys/fs/smbfs/smbfs_subr.h
diff -u src/sys/fs/smbfs/smbfs_subr.h:1.20 src/sys/fs/smbfs/smbfs_subr.h:1.21
--- src/sys/fs/smbfs/smbfs_subr.h:1.20 Tue Oct 20 20:55:01 2009
+++ src/sys/fs/smbfs/smbfs_subr.h Fri Nov 30 23:24:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_subr.h,v 1.20 2009/10/20 20:55:01 tron Exp $ */
+/* $NetBSD: smbfs_subr.h,v 1.21 2012/11/30 23:24:21 nakayama Exp $ */
/*
* Copyright (c) 2000-2001, Boris Popov
@@ -142,10 +142,8 @@ int smbfs_smb_setpattr(struct smbnode *
struct timespec *mtime, struct smb_cred *scred);
int smbfs_smb_setptime2(struct
CVS commit: [matt-nb6-plus] src/lib/csu/arch/arm
Module Name:src Committed By: matt Date: Fri Nov 30 23:32:14 UTC 2012 Modified Files: src/lib/csu/arch/arm [matt-nb6-plus]: Makefile.inc crt0.S crti.S crtn.S Added Files: src/lib/csu/arch/arm [matt-nb6-plus]: crtbegin.S crtend.S Log Message: Pull from HEAD. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.10.1 src/lib/csu/arch/arm/Makefile.inc \ src/lib/csu/arch/arm/crt0.S src/lib/csu/arch/arm/crti.S \ src/lib/csu/arch/arm/crtn.S cvs rdiff -u -r0 -r1.4.6.2 src/lib/csu/arch/arm/crtbegin.S cvs rdiff -u -r0 -r1.2.6.2 src/lib/csu/arch/arm/crtend.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/csu/arch/arm/Makefile.inc diff -u src/lib/csu/arch/arm/Makefile.inc:1.1 src/lib/csu/arch/arm/Makefile.inc:1.1.10.1 --- src/lib/csu/arch/arm/Makefile.inc:1.1 Sat Aug 7 18:01:33 2010 +++ src/lib/csu/arch/arm/Makefile.inc Fri Nov 30 23:32:14 2012 @@ -1,5 +1,3 @@ -# $NetBSD: Makefile.inc,v 1.1 2010/08/07 18:01:33 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.1.10.1 2012/11/30 23:32:14 matt Exp $ CPPFLAGS+= -DELFSIZE=32 - - Index: src/lib/csu/arch/arm/crt0.S diff -u src/lib/csu/arch/arm/crt0.S:1.1 src/lib/csu/arch/arm/crt0.S:1.1.10.1 --- src/lib/csu/arch/arm/crt0.S:1.1 Sat Aug 7 18:01:33 2010 +++ src/lib/csu/arch/arm/crt0.S Fri Nov 30 23:32:14 2012 @@ -1,11 +1,12 @@ -/* $NetBSD: crt0.S,v 1.1 2010/08/07 18:01:33 joerg Exp $ */ +/* $NetBSD: crt0.S,v 1.1.10.1 2012/11/30 23:32:14 matt Exp $ */ -/* - * Copyright (C) 1997 Mark Brinicombe - * Copyright (C) 1995 Wolfgang Solfrank. - * Copyright (C) 1995 TooLs GmbH. +/*- + * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -14,43 +15,41 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by TooLs GmbH. - * 4. The name of TooLs GmbH may not be used to endorse or promote products - *derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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 NETBSD FOUNDATION, INC. 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. */ -#include machine/asm.h -RCSID($NetBSD: crt0.S,v 1.1 2010/08/07 18:01:33 joerg Exp $) +#include arm/asm.h + +RCSID($NetBSD: crt0.S,v 1.1.10.1 2012/11/30 23:32:14 matt Exp $) STRONG_ALIAS(_start,__start) _ENTRY(__start) - mov r5, r2 /* cleanup */ - mov r4, r1 /* obj_main */ - mov r3, r0 /* ps_strings */ - /* Get argc, argv, and envp from stack */ - ldr r0, [sp, #0x] - add r1, sp, #0x0004 - add r2, r1, r0, lsl #2 - add r2, r2, #0x0004 + /* + * We need to swap ps_strings and cleanup + */ + mov ip, r0 /* ps_strings - tmp */ + mov r0, r2 /* cleanup - ps_strings */ + mov r2, ip /* tmp - ps_strings */ /* Ensure the stack is properly aligned before calling C code. */ bic sp, sp, #7 - sub sp, sp, #8 - str r5, [sp, #4] - str r4, [sp, #0] + + /* + * void ___start(void (*cleanup)(void), + *
CVS commit: [matt-nb6-plus] src/share/mk
Module Name:src
Committed By: matt
Date: Fri Nov 30 23:34:22 UTC 2012
Modified Files:
src/share/mk [matt-nb6-plus]: bsd.own.mk
Log Message:
Switch ARM to USE_COMPILERCRTSTUFF=no
To generate a diff of this commit:
cvs rdiff -u -r1.696.2.2.2.3 -r1.696.2.2.2.4 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.696.2.2.2.3 src/share/mk/bsd.own.mk:1.696.2.2.2.4
--- src/share/mk/bsd.own.mk:1.696.2.2.2.3 Tue Nov 20 23:22:25 2012
+++ src/share/mk/bsd.own.mk Fri Nov 30 23:34:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.696.2.2.2.3 2012/11/20 23:22:25 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.696.2.2.2.4 2012/11/30 23:34:22 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -57,6 +57,7 @@ HAVE_GCC?=45
.endif
.if \
+${MACHINE_CPU} == arm || \
${MACHINE_ARCH} == i386 || \
${MACHINE_ARCH} == powerpc || \
${MACHINE_ARCH} == x86_64
CVS commit: [matt-nb6-plus] src/lib/csu/arm_elf
Module Name:src Committed By: matt Date: Fri Nov 30 23:38:57 UTC 2012 Modified Files: src/lib/csu/arm_elf [matt-nb6-plus]: crt0.c dot_init.h Log Message: Don't include machine/asm.h in C files. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.4.1 src/lib/csu/arm_elf/crt0.c cvs rdiff -u -r1.6 -r1.6.22.1 src/lib/csu/arm_elf/dot_init.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/csu/arm_elf/crt0.c diff -u src/lib/csu/arm_elf/crt0.c:1.10 src/lib/csu/arm_elf/crt0.c:1.10.4.1 --- src/lib/csu/arm_elf/crt0.c:1.10 Wed Jan 25 13:29:58 2012 +++ src/lib/csu/arm_elf/crt0.c Fri Nov 30 23:38:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: crt0.c,v 1.10 2012/01/25 13:29:58 he Exp $ */ +/* $NetBSD: crt0.c,v 1.10.4.1 2012/11/30 23:38:57 matt Exp $ */ /* * Copyright (C) 1997 Mark Brinicombe @@ -35,7 +35,6 @@ #include sys/cdefs.h #include sys/param.h -#include machine/asm.h #include stdlib.h #include common.h @@ -68,7 +67,7 @@ __asm( .text \n b ___STRING(_C_LABEL(___start)) ); #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: crt0.c,v 1.10 2012/01/25 13:29:58 he Exp $); +__RCSID($NetBSD: crt0.c,v 1.10.4.1 2012/11/30 23:38:57 matt Exp $); #endif /* LIBC_SCCS and not lint */ void Index: src/lib/csu/arm_elf/dot_init.h diff -u src/lib/csu/arm_elf/dot_init.h:1.6 src/lib/csu/arm_elf/dot_init.h:1.6.22.1 --- src/lib/csu/arm_elf/dot_init.h:1.6 Sat May 10 15:31:03 2008 +++ src/lib/csu/arm_elf/dot_init.h Fri Nov 30 23:38:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: dot_init.h,v 1.6 2008/05/10 15:31:03 martin Exp $ */ +/* $NetBSD: dot_init.h,v 1.6.22.1 2012/11/30 23:38:57 matt Exp $ */ /*- * Copyright (c) 2001 Ross Harvey @@ -34,7 +34,6 @@ */ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -#include machine/asm.h #define MD_SECTION_PROLOGUE(sect, entry_pt) \ __asm ( \
CVS commit: src/doc
Module Name:src Committed By: dholland Date: Sat Dec 1 03:09:55 UTC 2012 Modified Files: src/doc: RESPONSIBLE Log Message: Some updates: - add a vfs section and some vfs subareas - list all filesystems (some with ?, please fill in) - note that npf is rmind's and that christos knows about lint - note that I know about a few other things, e.g. quotas (Remember that this is chiefly a list of who knows about what; being listed for something here does not make you responsible for its bug list or anything.) To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/doc/RESPONSIBLE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/RESPONSIBLE diff -u src/doc/RESPONSIBLE:1.101 src/doc/RESPONSIBLE:1.102 --- src/doc/RESPONSIBLE:1.101 Fri Nov 30 16:22:53 2012 +++ src/doc/RESPONSIBLE Sat Dec 1 03:09:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: RESPONSIBLE,v 1.101 2012/11/30 16:22:53 mbalmer Exp $ +# $NetBSD: RESPONSIBLE,v 1.102 2012/12/01 03:09:55 dholland Exp $ List of sections of the system, and who is responsible for them (or at least considered an expert on them). @@ -20,6 +20,7 @@ bc phil, simonb csh christos cvs christos, wiz dhcp mellon +edquota dholland etcupdate martti expr jdolecek file christos, pooka @@ -32,6 +33,7 @@ hostapd none installboot(mi) core kerberos lha, joda less/more mrg +lint christos lua/luac mbalmer make christos, sjg, dholland named(bind) christos @@ -51,6 +53,7 @@ sendmail atatat sh christos, dsl sort jdolecek sysctl atatat +talk/talkd dholland tcpdump core texinfo wiz toolchain thorpej, mrg @@ -59,6 +62,7 @@ user agc vi aymeric wakeonlan mbalmer wpa_supplicant scw +ypbind dholland Userland Libraries: @@ -70,6 +74,7 @@ kerberos lha, joda openssl thorpej, christos pcap core pthread nathanw +quota dholland resolver(bind) christos softfloat bjh21 tz kleink @@ -170,18 +175,46 @@ elanpex dyoung file systems: +adosfs ? +cd9660 ? +chfs ttoth coda gdt efs rumble +ext2fs [nobody in particular] +ffs ? +ffs+wapbl ? hfs dillo -lfs dholland +kernfs ? +lfs dholland, perseant +mfs [nobody in particular] msdosfs jdolecek nilfs reinoud -nfs fvdl +nfs [nobody really] ntfs jdolecek +nullfs/layerfs dholland, pooka +overlay [nobody] +procfs ? +ptyfs ? +puffs pooka smbfs jdolecek +sysvbfs ? +tmpfs rmind udf reinoud -ufs fvdl -ufs2 fvdl +ufs ? +union [nobody] +umapfs [nobody] +v7fs uch + +kern/vfs: + +buffercache [nobody] +fstrans hannken +genfs_io yamt +mount ? +namei dholland +rename dholland, riastradh +vnode-lifecycle hannken +misc dholland, pooka kern/general: @@ -194,7 +227,6 @@ ntp simonb, jonathan pipes jdolecek splash jmcneill uvm chuck, chs, mrg, atatat -vfs pooka, dholland kern/compat: @@ -214,6 +246,7 @@ networking: general net thorpej, matt ipf darrenr, martti kame/ipv6 core +npf rmind pf peter, yamt ppp(async) christos ppp(sync) martin
CVS commit: src/sys/arch/evbsh3/t_sh7706lan
Module Name:src Committed By: tsutsui Date: Sat Dec 1 03:16:46 UTC 2012 Modified Files: src/sys/arch/evbsh3/t_sh7706lan: if_ne_mainbus.c t_sh7706lan.c Log Message: Fix RCSId. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c \ src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lan.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/evbsh3/t_sh7706lan/if_ne_mainbus.c diff -u src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c:1.2 src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c:1.3 --- src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c:1.2 Tue Jul 19 15:44:53 2011 +++ src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c Sat Dec 1 03:16:46 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_mainbus.c,v 1.2 2011/07/19 15:44:53 dyoung Exp $ */ +/* $NetBSD: if_ne_mainbus.c,v 1.3 2012/12/01 03:16:46 tsutsui Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBS$); +__KERNEL_RCSID(0, $NetBSD: if_ne_mainbus.c,v 1.3 2012/12/01 03:16:46 tsutsui Exp $); #include sys/param.h #include sys/systm.h Index: src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lan.c diff -u src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lan.c:1.2 src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lan.c:1.3 --- src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lan.c:1.2 Sat Jan 21 19:44:29 2012 +++ src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lan.c Sat Dec 1 03:16:46 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: t_sh7706lan.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */ +/* $NetBSD: t_sh7706lan.c,v 1.3 2012/12/01 03:16:46 tsutsui Exp $ */ /*- * Copyright (C) 2009 NONAKA Kimihiro non...@netbsd.org @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBS$); +__KERNEL_RCSID(0, $NetBSD: t_sh7706lan.c,v 1.3 2012/12/01 03:16:46 tsutsui Exp $); #include sys/param.h #include sys/systm.h
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Sat Dec 1 04:19:24 UTC 2012 Modified Files: src/tests/ipf: t_filter_parse.sh Log Message: Based on the error messages, the test is not broken, but ipftest probably in broken. Once we can analyze the error further, we can open a PR in Gnats and then move this to Expected-Failure. But we shouldn't skip it because we'll never come back to fix it. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/ipf/t_filter_parse.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_filter_parse.sh diff -u src/tests/ipf/t_filter_parse.sh:1.7 src/tests/ipf/t_filter_parse.sh:1.8 --- src/tests/ipf/t_filter_parse.sh:1.7 Thu Nov 29 17:11:19 2012 +++ src/tests/ipf/t_filter_parse.sh Sat Dec 1 04:19:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_parse.sh,v 1.7 2012/11/29 17:11:19 pgoyette Exp $ +# $NetBSD: t_filter_parse.sh,v 1.8 2012/12/01 04:19:24 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -99,7 +99,7 @@ test_case i13 itest text ipf failing_test_case i14 itest PR kern/47262 Proto-family missing from logs text ipf test_case i15 itest text ipf test_case i16 itest text ipf -broken_test_case i17 itest text ipftest +test_case i17 itest text ipftest test_case i18 itest text ipf failing_test_case i19 itest_i19 PR kern/47262 Proto-family missing from logs text ipf test_case i20 itest text ipf
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Sat Dec 1 04:40:00 UTC 2012 Modified Files: src/tests/ipf: t_pools.sh Log Message: Now that we have a PR for the brokenness in ipftest -P -N, mark the related tests as Expected Failure rather than just skipping the tests. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/t_pools.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_pools.sh diff -u src/tests/ipf/t_pools.sh:1.5 src/tests/ipf/t_pools.sh:1.6 --- src/tests/ipf/t_pools.sh:1.5 Sun Jul 8 00:36:46 2012 +++ src/tests/ipf/t_pools.sh Sat Dec 1 04:40:00 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_pools.sh,v 1.5 2012/07/08 00:36:46 pgoyette Exp $ +# $NetBSD: t_pools.sh,v 1.6 2012/12/01 04:40:00 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -73,9 +73,9 @@ test_case p5 ptest text text test_case p6 ptest text text test_case p7 ptest text text test_case p9 ptest text text -broken_test_case p10 ptest text text -broken_test_case p11 ptest text text -broken_test_case p12 ptest text text +failing_test_case p10 PR kern/47270 - ipftest -P -N is broken ptest text text +failing_test_case p11 PR kern/47270 - ipftest -P -N is broken ptest text text +failing_test_case p12 PR kern/47270 - ipftest -P -N is broken ptest text text test_case p13 ptest text text test_case ip1 iptest text text test_case ip2 iptest text text
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Sat Dec 1 04:43:44 UTC 2012
Modified Files:
src/tests/ipf: h_common.sh
Log Message:
Use proper quoting for the expected-failure reason
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/h_common.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/h_common.sh
diff -u src/tests/ipf/h_common.sh:1.6 src/tests/ipf/h_common.sh:1.7
--- src/tests/ipf/h_common.sh:1.6 Fri Nov 30 14:46:48 2012
+++ src/tests/ipf/h_common.sh Sat Dec 1 04:43:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: h_common.sh,v 1.6 2012/11/30 14:46:48 pgoyette Exp $
+# $NetBSD: h_common.sh,v 1.7 2012/12/01 04:43:44 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -71,7 +71,7 @@ failing_test_case()
atf_test_case ${name}
eval ${name}_body() { \
- atf_expect_fail ${reason}; \
+ atf_expect_fail '${reason}'; \
${check_function} '${name}' ${@} ; \
}
}
CVS commit: src/usr.bin/mkubootimage
Module Name:src Committed By: matt Date: Sat Dec 1 05:26:16 UTC 2012 Modified Files: src/usr.bin/mkubootimage: mkubootimage.1 Log Message: Change ULONG_MAX to UINT32_MAX To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/mkubootimage/mkubootimage.1 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/mkubootimage/mkubootimage.1 diff -u src/usr.bin/mkubootimage/mkubootimage.1:1.2 src/usr.bin/mkubootimage/mkubootimage.1:1.3 --- src/usr.bin/mkubootimage/mkubootimage.1:1.2 Fri Nov 30 08:25:35 2012 +++ src/usr.bin/mkubootimage/mkubootimage.1 Sat Dec 1 05:26:16 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mkubootimage.1,v 1.2 2012/11/30 08:25:35 wiz Exp $ +.\ $NetBSD: mkubootimage.1,v 1.3 2012/12/01 05:26:16 matt Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -60,7 +60,7 @@ Defines the architecture. This is required. .It Fl a Ar address Sets the image load address. -This is an integer between 0 and ULONG_MAX. +This is an integer between 0 and UINT32_MAX. This is required. .It Fl C No ( bz2 Ns | Ns gz Ns | Ns lzma Ns | Ns lzo Ns | Ns none ) Defines the compression. @@ -68,7 +68,7 @@ The default is .Qq none . .It Fl E Ar address Define the entry point. -This is an integer between 0 and ULONG_MAX. +This is an integer between 0 and UINT32_MAX. This option is the same as .Fl e but it inverts the bytes to convert the 32 bit integer @@ -82,7 +82,7 @@ image load address .Pq Fl a . .It Fl e Ar address Define the entry point. -This is an integer between 0 and ULONG_MAX. +This is an integer between 0 and UINT32_MAX. If .Fl E or @@ -94,7 +94,7 @@ image load address Display the usage and exit. .It Fl m Ar magic Set the magic. -This is an integer between 0 and ULONG_MAX. +This is an integer between 0 and UINT32_MAX. The default is .Qq 0x27051956 . .It Fl n Ar image
