Re: CVS commit: src
On Sat, Nov 24, 2012 at 02:00:36PM +, Alexander Nasonov wrote: Module Name: src Committed By: alnsn Date: Sat Nov 24 14:00:36 UTC 2012 Modified Files: src/distrib/sets/lists/comp: md.evbmips src/share/mk: bsd.own.mk src/sys/arch/evbmips/include: Makefile Added Files: src/sys/arch/evbmips/include: sljitarch.h Log Message: Add sljit and bpfjit to evbmips. Not enabled by default. Why only evbmips, and not all mips platforms ? Shouldn't this be in arch/mips/include/ ? -- Manuel Bouyer bou...@antioche.eu.org NetBSD: 26 ans d'experience feront toujours la difference --
Re: CVS commit: src
Manuel Bouyer wrote: Why only evbmips, and not all mips platforms ? Shouldn't this be in arch/mips/include/ ? I'm now asking this exact question myself after I moved on to arm world ;-) These two platforms are very diverse. Perhaps I should have sought an advice before restricting myself to evbmips. I did it for two reasons, one is that evbmips is Tier I (other mips are Tier II) and the second reason is that I could find an emulator and a clear instruction of how to install NetBSD on evbmips. Alex
CVS commit: src/gnu/dist/gcc4/libcpp
Module Name:src
Committed By: apb
Date: Sat Nov 24 09:07:44 UTC 2012
Modified Files:
src/gnu/dist/gcc4/libcpp: init.c macro.c
src/gnu/dist/gcc4/libcpp/include: cpplib.h
Log Message:
Teach gcc4.1's cpp about the magic __COUNTER__ macro,
which returns a unique integer each time it is expanded.
This code was written without reference to any other
implementation of the same feature.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gcc4/libcpp/init.c
cvs rdiff -u -r1.3 -r1.4 src/gnu/dist/gcc4/libcpp/macro.c
cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gcc4/libcpp/include/cpplib.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gcc4/libcpp/init.c
diff -u src/gnu/dist/gcc4/libcpp/init.c:1.2 src/gnu/dist/gcc4/libcpp/init.c:1.3
--- src/gnu/dist/gcc4/libcpp/init.c:1.2 Fri May 12 00:24:43 2006
+++ src/gnu/dist/gcc4/libcpp/init.c Sat Nov 24 09:07:44 2012
@@ -309,6 +309,7 @@ static const struct builtin builtin_arra
B(__BASE_FILE__, BT_BASE_FILE),
B(__LINE__, BT_SPECLINE),
B(__INCLUDE_LEVEL__, BT_INCLUDE_LEVEL),
+ B(__COUNTER__, BT_COUNTER),
/* Keep builtins not used for -traditional-cpp at the end, and
update init_builtins() if any more are added. */
B(_Pragma, BT_PRAGMA),
Index: src/gnu/dist/gcc4/libcpp/macro.c
diff -u src/gnu/dist/gcc4/libcpp/macro.c:1.3 src/gnu/dist/gcc4/libcpp/macro.c:1.4
--- src/gnu/dist/gcc4/libcpp/macro.c:1.3 Wed Nov 11 19:03:52 2009
+++ src/gnu/dist/gcc4/libcpp/macro.c Sat Nov 24 09:07:44 2012
@@ -284,6 +284,14 @@ _cpp_builtin_macro_text (cpp_reader *pfi
else
result = pfile-time;
break;
+
+case BT_COUNTER:
+ {
+ static unsigned int counter = 0;
+
+ number = counter++;
+ }
+ break;
}
if (result == NULL)
Index: src/gnu/dist/gcc4/libcpp/include/cpplib.h
diff -u src/gnu/dist/gcc4/libcpp/include/cpplib.h:1.2 src/gnu/dist/gcc4/libcpp/include/cpplib.h:1.3
--- src/gnu/dist/gcc4/libcpp/include/cpplib.h:1.2 Wed Nov 11 19:03:52 2009
+++ src/gnu/dist/gcc4/libcpp/include/cpplib.h Sat Nov 24 09:07:44 2012
@@ -551,6 +551,7 @@ enum builtin_type
BT_BASE_FILE, /* `__BASE_FILE__' */
BT_INCLUDE_LEVEL, /* `__INCLUDE_LEVEL__' */
BT_TIME, /* `__TIME__' */
+ BT_COUNTER, /* `__COUNTER__' */
BT_STDC, /* `__STDC__' */
BT_PRAGMA /* `_Pragma' operator */
};
CVS commit: src
Module Name:src
Committed By: alnsn
Date: Sat Nov 24 14:00:36 UTC 2012
Modified Files:
src/distrib/sets/lists/comp: md.evbmips
src/share/mk: bsd.own.mk
src/sys/arch/evbmips/include: Makefile
Added Files:
src/sys/arch/evbmips/include: sljitarch.h
Log Message:
Add sljit and bpfjit to evbmips. Not enabled by default.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/comp/md.evbmips
cvs rdiff -u -r1.714 -r1.715 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbmips/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/include/sljitarch.h
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/comp/md.evbmips
diff -u src/distrib/sets/lists/comp/md.evbmips:1.16 src/distrib/sets/lists/comp/md.evbmips:1.17
--- src/distrib/sets/lists/comp/md.evbmips:1.16 Sun Jul 17 20:54:31 2011
+++ src/distrib/sets/lists/comp/md.evbmips Sat Nov 24 14:00:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbmips,v 1.16 2011/07/17 20:54:31 joerg Exp $
+# $NetBSD: md.evbmips,v 1.17 2012/11/24 14:00:35 alnsn Exp $
./usr/include/evbmipscomp-c-include
./usr/include/evbmips/_G_config.h comp-obsolete obsolete
./usr/include/evbmips/ansi.h comp-c-include
@@ -52,6 +52,7 @@
./usr/include/evbmips/rwlock.h comp-c-include
./usr/include/evbmips/setjmp.h comp-c-include
./usr/include/evbmips/signal.h comp-c-include
+./usr/include/evbmips/sljitarch.h comp-c-include
./usr/include/evbmips/stdarg.h comp-obsolete obsolete
./usr/include/evbmips/trap.h comp-c-include
./usr/include/evbmips/types.h comp-c-include
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.714 src/share/mk/bsd.own.mk:1.715
--- src/share/mk/bsd.own.mk:1.714 Thu Nov 22 21:41:22 2012
+++ src/share/mk/bsd.own.mk Sat Nov 24 14:00:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.714 2012/11/22 21:41:22 pooka Exp $
+# $NetBSD: bsd.own.mk,v 1.715 2012/11/24 14:00:35 alnsn Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -804,8 +804,7 @@ SOFTFLOAT_BITS= 32
${MACHINE_ARCH} == sparc
MKSLJIT?= yes
.else
-# Don't let this build where it really isn't supported.
-MKSLJIT:= no
+MKSLJIT?= no
.endif
#
Index: src/sys/arch/evbmips/include/Makefile
diff -u src/sys/arch/evbmips/include/Makefile:1.14 src/sys/arch/evbmips/include/Makefile:1.15
--- src/sys/arch/evbmips/include/Makefile:1.14 Sun Jul 17 20:54:39 2011
+++ src/sys/arch/evbmips/include/Makefile Sat Nov 24 14:00:36 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/07/17 20:54:39 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2012/11/24 14:00:36 alnsn Exp $
INCSDIR=/usr/include/evbmips
@@ -16,7 +16,7 @@ INCS= ansi.h asm.h \
param.h pcb.h \
pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
reg.h regdef.h regnum.h reloc.h rwlock.h \
- setjmp.h signal.h \
+ setjmp.h signal.h sljitarch.h \
trap.h types.h \
vmparam.h \
wchar_limits.h
Added files:
Index: src/sys/arch/evbmips/include/sljitarch.h
diff -u /dev/null src/sys/arch/evbmips/include/sljitarch.h:1.1
--- /dev/null Sat Nov 24 14:00:36 2012
+++ src/sys/arch/evbmips/include/sljitarch.h Sat Nov 24 14:00:36 2012
@@ -0,0 +1,34 @@
+/* $NetBSD: sljitarch.h,v 1.1 2012/11/24 14:00:36 alnsn Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * 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.
+ *
+ * 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.
+ */
+
+#ifndef EVBMIPS_SLJITARCH_H
+#define EVBMIPS_SLJITARCH_H
+
+#define SLJIT_CONFIG_MIPS_32 1
+
+#endif
CVS commit: src/share/mk
Module Name:src Committed By: alnsn Date: Sat Nov 24 14:01:28 UTC 2012 Modified Files: src/share/mk: bsd.README Log Message: Document MKSLJIT variable. To generate a diff of this commit: cvs rdiff -u -r1.308 -r1.309 src/share/mk/bsd.README 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.README diff -u src/share/mk/bsd.README:1.308 src/share/mk/bsd.README:1.309 --- src/share/mk/bsd.README:1.308 Mon Nov 19 16:04:54 2012 +++ src/share/mk/bsd.README Sat Nov 24 14:01:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.308 2012/11/19 16:04:54 apb Exp $ +# $NetBSD: bsd.README,v 1.309 2012/11/24 14:01:28 alnsn Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make include files for the NetBSD @@ -330,6 +330,10 @@ MKSKEY If no, disables building of S/ infrastructure (libraries and support programs). Default: yes +MKSLJIT If no, disables buildin of sljit (stack-less platform + independent JIT compiler) private library and tests. + Default: yes on amd64, i386 and sparc, no elsewhere. + MKSOFTFLOAT If not no, build with options to enable the compiler to generate output containing library calls for floating point and possibly soft-float library support.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: christos
Date: Sat Nov 24 15:05:46 UTC 2012
Modified Files:
src/tests/lib/libc/sys: t_kevent.c
Log Message:
Add a test for adding an event to an unsupported fd.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sys/t_kevent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_kevent.c
diff -u src/tests/lib/libc/sys/t_kevent.c:1.4 src/tests/lib/libc/sys/t_kevent.c:1.5
--- src/tests/lib/libc/sys/t_kevent.c:1.4 Sat Jun 2 12:52:18 2012
+++ src/tests/lib/libc/sys/t_kevent.c Sat Nov 24 10:05:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_kevent.c,v 1.4 2012/06/02 16:52:18 martin Exp $ */
+/* $NetBSD: t_kevent.c,v 1.5 2012/11/24 15:05:45 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_kevent.c,v 1.4 2012/06/02 16:52:18 martin Exp $);
+__RCSID($NetBSD: t_kevent.c,v 1.5 2012/11/24 15:05:45 christos Exp $);
#include sys/types.h
#include sys/event.h
@@ -41,6 +41,7 @@ __RCSID($NetBSD: t_kevent.c,v 1.4 2012/
#include stdlib.h
#include string.h
#include unistd.h
+#include fcntl.h
#include err.h
#include sys/event.h
#include sys/time.h
@@ -137,11 +138,40 @@ ATF_TC_BODY(kqueue_desc_passing, tc)
ATF_CHECK(WIFEXITED(status) WEXITSTATUS(status)==0);
}
+ATF_TC(kqueue_unsupported_fd);
+ATF_TC_HEAD(kqueue_unsupported_fd, tc)
+{
+ atf_tc_set_md_var(tc, descr, Checks that watching an fd whose
+ type is not supported does not crash the kernel);
+}
+
+ATF_TC_BODY(kqueue_unsupported_fd, tc)
+{
+ /* mqueue and semaphore use fnullop_kqueue also */
+ static const char drvctl[] = /dev/drvctl;
+ int fd, kq;
+ struct kevent ev;
+
+ ATF_REQUIRE((fd = open(drvctl, O_RDONLY)) != -1);
+ ATF_REQUIRE((kq = kqueue()) != -1);
+
+ EV_SET(ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
+ NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK|
+ NOTE_RENAME|NOTE_REVOKE, 0, 0);
+
+ ATF_REQUIRE(kevent(kq, ev, 1, NULL, 0, NULL) == -1);
+ ATF_REQUIRE_ERRNO(EOPNOTSUPP, true);
+
+ (void)close(fd);
+}
+
+
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, kevent_zerotimer);
ATF_TP_ADD_TC(tp, kqueue_desc_passing);
+ ATF_TP_ADD_TC(tp, kqueue_unsupported_fd);
return atf_no_error();
}
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Sat Nov 24 15:07:44 UTC 2012
Modified Files:
src/sys/kern: kern_descrip.c
Log Message:
Return EOPNOTSUPP for fnullop_kqfilter to prevent registration of unsupported
fds. XXX: We should really fix the fd's to be supported in the future.
Unsupported fd's have a NULL f_event, so registering crashes the kernel with
a NULL function dereference of f_event.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/sys/kern/kern_descrip.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/kern_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.218 src/sys/kern/kern_descrip.c:1.219
--- src/sys/kern/kern_descrip.c:1.218 Tue Jan 24 19:28:35 2012
+++ src/sys/kern/kern_descrip.c Sat Nov 24 10:07:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_descrip.c,v 1.218 2012/01/25 00:28:35 christos Exp $ */
+/* $NetBSD: kern_descrip.c,v 1.219 2012/11/24 15:07:44 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_descrip.c,v 1.218 2012/01/25 00:28:35 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_descrip.c,v 1.219 2012/11/24 15:07:44 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1885,7 +1885,7 @@ int
fnullop_kqfilter(file_t *fp, struct knote *kn)
{
- return 0;
+ return EOPNOTSUPP;
}
void
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Sat Nov 24 15:14:32 UTC 2012
Modified Files:
src/sys/kern: kern_event.c
Log Message:
- initialize kn_id
- in close, invalidate f_data and f_type early to prevent accidental re-use
- add a DIAGNOSTIC for when we use unsupported fd's and a KASSERT for f_event
being NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/kern/kern_event.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/kern_event.c
diff -u src/sys/kern/kern_event.c:1.78 src/sys/kern/kern_event.c:1.79
--- src/sys/kern/kern_event.c:1.78 Sun Nov 18 13:36:01 2012
+++ src/sys/kern/kern_event.c Sat Nov 24 10:14:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.78 2012/11/18 18:36:01 pooka Exp $ */
+/* $NetBSD: kern_event.c,v 1.79 2012/11/24 15:14:32 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.78 2012/11/18 18:36:01 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.79 2012/11/24 15:14:32 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -972,6 +972,7 @@ kqueue_register(struct kqueue *kq, struc
kn = newkn;
newkn = NULL;
kn-kn_obj = fp;
+ kn-kn_id = kev-ident;
kn-kn_kq = kq;
kn-kn_fop = kfilter-filtops;
kn-kn_kfilter = kfilter;
@@ -1013,6 +1014,10 @@ kqueue_register(struct kqueue *kq, struc
error = (*kfilter-filtops-f_attach)(kn);
KERNEL_UNLOCK_ONE(NULL); /* XXXSMP */
if (error != 0) {
+#ifdef DIAGNOSTIC
+printf(%s: event not supported for file type
+ %d\n, __func__, fp ? fp-f_type : -1);
+#endif
/* knote_detach() drops fdp-fd_lock */
knote_detach(kn, fdp, false);
goto done;
@@ -1028,6 +1033,13 @@ kqueue_register(struct kqueue *kq, struc
kn-kn_sdata = kev-data;
kn-kn_kevent.udata = kev-udata;
}
+ /*
+ * We can get here if we are trying to attach
+ * an event to a file descriptor that does not
+ * support events, and the attach routine is
+ * broken and does not return an error.
+ */
+ KASSERT(kn-kn_fop-f_event != NULL);
KERNEL_LOCK(1, NULL); /* XXXSMP */
rv = (*kn-kn_fop-f_event)(kn, 0);
KERNEL_UNLOCK_ONE(NULL); /* XXXSMP */
@@ -1432,6 +1444,8 @@ kqueue_close(file_t *fp)
int i;
kq = fp-f_data;
+ fp-f_data = NULL;
+ fp-f_type = 0;
fdp = curlwp-l_fd;
mutex_enter(fdp-fd_lock);
@@ -1452,7 +1466,6 @@ kqueue_close(file_t *fp)
cv_destroy(kq-kq_cv);
seldestroy(kq-kq_sel);
kmem_free(kq, sizeof(*kq));
- fp-f_data = NULL;
return (0);
}
CVS commit: src/lib/libc/sys
Module Name:src Committed By: christos Date: Sat Nov 24 15:16:52 UTC 2012 Modified Files: src/lib/libc/sys: kqueue.2 Log Message: mention that kevent returns now EOPNOTSUPP. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/lib/libc/sys/kqueue.2 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/sys/kqueue.2 diff -u src/lib/libc/sys/kqueue.2:1.32 src/lib/libc/sys/kqueue.2:1.33 --- src/lib/libc/sys/kqueue.2:1.32 Tue Jan 24 19:28:35 2012 +++ src/lib/libc/sys/kqueue.2 Sat Nov 24 10:16:52 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: kqueue.2,v 1.32 2012/01/25 00:28:35 christos Exp $ +.\ $NetBSD: kqueue.2,v 1.33 2012/11/24 15:16:52 christos Exp $ .\ .\ Copyright (c) 2000 Jonathan Lemon .\ All rights reserved. @@ -32,7 +32,7 @@ .\ .\ $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.22 2001/06/27 19:55:57 dd Exp $ .\ -.Dd January 23, 2012 +.Dd November 24, 2012 .Dt KQUEUE 2 .Os .Sh NAME @@ -604,6 +604,10 @@ The specified time limit or filter is in The event could not be found to be modified or deleted. .It Bq Er ENOMEM No memory was available to register the event. +.It Bq Er EOPNOTSUPP +This type of file descriptor is not supported for +.Fn kevent +operations. .It Bq Er ESRCH The specified process to attach to does not exist. .El
CVS commit: src/lib/libc/arch/powerpc64/gen
Module Name:src Committed By: christos Date: Sat Nov 24 15:20:58 UTC 2012 Modified Files: src/lib/libc/arch/powerpc64/gen: _lwp.c Log Message: fix lint. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/powerpc64/gen/_lwp.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/arch/powerpc64/gen/_lwp.c diff -u src/lib/libc/arch/powerpc64/gen/_lwp.c:1.2 src/lib/libc/arch/powerpc64/gen/_lwp.c:1.3 --- src/lib/libc/arch/powerpc64/gen/_lwp.c:1.2 Wed Jul 5 14:05:45 2006 +++ src/lib/libc/arch/powerpc64/gen/_lwp.c Sat Nov 24 10:20:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: _lwp.c,v 1.2 2006/07/05 18:05:45 ross Exp $ */ +/* $NetBSD: _lwp.c,v 1.3 2012/11/24 15:20:58 christos Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -37,7 +37,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: _lwp.c,v 1.2 2006/07/05 18:05:45 ross Exp $); +__RCSID($NetBSD: _lwp.c,v 1.3 2012/11/24 15:20:58 christos Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -46,6 +46,7 @@ __RCSID($NetBSD: _lwp.c,v 1.2 2006/07/0 #include lwp.h #include stdlib.h +/*ARGSUSED*/ void _lwp_makecontext(ucontext_t *u, void (*start)(void *), void *arg, void *private, caddr_t stack_base, size_t stack_size) @@ -58,7 +59,7 @@ _lwp_makecontext(ucontext_t *u, void (*s u-uc_stack.ss_sp = stack_base; u-uc_stack.ss_size = stack_size; - sp = (void **) (stack_base + stack_size); + sp = (void *)(stack_base + stack_size); u-uc_mcontext.__gregs[3] = (__greg_t) arg; /* arg1 */ u-uc_mcontext.__gregs[1] = ((__greg_t) sp) - 112; /* stack */
CVS commit: [netbsd-6] src/sys/dev/marvell
Module Name:src Committed By: jdc Date: Sat Nov 24 18:10:10 UTC 2012 Modified Files: src/sys/dev/marvell [netbsd-6]: mvgbereg.h Log Message: Apply patch from msaitoh to fix pullup-6 #671. To generate a diff of this commit: cvs rdiff -u -r1.3.10.1 -r1.3.10.2 src/sys/dev/marvell/mvgbereg.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/dev/marvell/mvgbereg.h diff -u src/sys/dev/marvell/mvgbereg.h:1.3.10.1 src/sys/dev/marvell/mvgbereg.h:1.3.10.2 --- src/sys/dev/marvell/mvgbereg.h:1.3.10.1 Tue Nov 20 22:26:03 2012 +++ src/sys/dev/marvell/mvgbereg.h Sat Nov 24 18:10:10 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mvgbereg.h,v 1.3.10.1 2012/11/20 22:26:03 riz Exp $ */ +/* $NetBSD: mvgbereg.h,v 1.3.10.2 2012/11/24 18:10:10 jdc Exp $ */ /* * Copyright (c) 2007 KIYOHARA Takashi * All rights reserved. @@ -34,9 +34,6 @@ #define MVGBE_PHY_TIMEOUT 1 /* msec */ -#define MVGBE_RX_CSUM_MIN_BYTE 72 - - /* * Ethernet Unit Registers */
CVS commit: [netbsd-6] src
Module Name:src
Committed By: jdc
Date: Sat Nov 24 18:15:22 UTC 2012
Modified Files:
src/common/lib/libc/gen [netbsd-6]: ptree.c
src/sys/sys [netbsd-6]: ptree.h
Log Message:
Pull up revisions:
src/common/lib/libc/gen/ptree.c revision 1.10
src/sys/sys/ptree.h revision 1.8
(requested by rmind in ticket #717).
Add a ptree_mask_node_p to determine if an item is a mask node, and what
its non-mask length is.
To generate a diff of this commit:
cvs rdiff -u -r1.5.8.2 -r1.5.8.3 src/common/lib/libc/gen/ptree.c
cvs rdiff -u -r1.4.8.2 -r1.4.8.3 src/sys/sys/ptree.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/gen/ptree.c
diff -u src/common/lib/libc/gen/ptree.c:1.5.8.2 src/common/lib/libc/gen/ptree.c:1.5.8.3
--- src/common/lib/libc/gen/ptree.c:1.5.8.2 Mon Jul 16 22:10:46 2012
+++ src/common/lib/libc/gen/ptree.c Sat Nov 24 18:15:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ptree.c,v 1.5.8.2 2012/07/16 22:10:46 riz Exp $ */
+/* $NetBSD: ptree.c,v 1.5.8.3 2012/11/24 18:15:22 jdc Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include sys/types.h
#include sys/systm.h
#include lib/libkern/libkern.h
-__KERNEL_RCSID(0, $NetBSD: ptree.c,v 1.5.8.2 2012/07/16 22:10:46 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: ptree.c,v 1.5.8.3 2012/11/24 18:15:22 jdc Exp $);
#else
#include stddef.h
#include stdint.h
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, $NetBSD: ptree.c,v 1.
#else
#define KASSERT(e) do { } while (/*CONSTCOND*/ 0)
#endif
-__RCSID($NetBSD: ptree.c,v 1.5.8.2 2012/07/16 22:10:46 riz Exp $);
+__RCSID($NetBSD: ptree.c,v 1.5.8.3 2012/11/24 18:15:22 jdc Exp $);
#endif /* _KERNEL || _STANDALONE */
#ifdef _LIBC
@@ -1214,3 +1214,17 @@ ptree_check(const pt_tree_t *pt)
#endif
return ok;
}
+
+bool
+ptree_mask_node_p(pt_tree_t *pt, const void *item, pt_bitlen_t *lenp)
+{
+ const pt_node_t * const mask = ITEMTONODE(pt, item);
+
+ if (!PTN_ISMASK_P(mask))
+ return false;
+
+ if (lenp != NULL)
+ *lenp = PTN_MASK_BITLEN(mask);
+
+ return true;
+}
Index: src/sys/sys/ptree.h
diff -u src/sys/sys/ptree.h:1.4.8.2 src/sys/sys/ptree.h:1.4.8.3
--- src/sys/sys/ptree.h:1.4.8.2 Mon Jul 16 22:10:47 2012
+++ src/sys/sys/ptree.h Sat Nov 24 18:15:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ptree.h,v 1.4.8.2 2012/07/16 22:10:47 riz Exp $ */
+/* $NetBSD: ptree.h,v 1.4.8.3 2012/11/24 18:15:22 jdc Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -184,6 +184,7 @@ typedef bool (*pt_filter_t)(void *, cons
void ptree_init(pt_tree_t *, const pt_tree_ops_t *, void *, size_t, size_t);
bool ptree_insert_node(pt_tree_t *, void *);
bool ptree_insert_mask_node(pt_tree_t *, void *, pt_bitlen_t);
+bool ptree_mask_node_p(pt_tree_t *, const void *, pt_bitlen_t *);
void * ptree_find_filtered_node(pt_tree_t *, const void *, pt_filter_t, void *);
#define ptree_find_node(pt,key) \
ptree_find_filtered_node((pt), (key), NULL, NULL)
CVS commit: src/sys/rump/librump/rumpkern/arch/powerpc
Module Name:src
Committed By: pgoyette
Date: Sat Nov 24 18:16:16 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern/arch/powerpc: Makefile.inc
Log Message:
File is common between pp6 and ppc64 ports, so define ARCH_ELFSIZE
accordingly.
From christos@, resolves the latest build break
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc
diff -u src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc:1.1 src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc:1.2
--- src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc:1.1 Sun Jul 3 08:53:23 2011
+++ src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc Sat Nov 24 18:16:15 2012
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/07/03 08:53:23 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2012/11/24 18:16:15 pgoyette Exp $
+.if ${MACHINE_ARCH} == powerpc
CPPFLAGS+= -DARCH_ELFSIZE=32
+.else
+CPPFLAGS+= -DARCH_ELFSIZE=64
+.endif
SRCS+= kobj_stubs.c rumpcpu_generic.c
CVS commit: [netbsd-6] src
Module Name:src
Committed By: jdc
Date: Sat Nov 24 19:02:10 UTC 2012
Modified Files:
src/doc [netbsd-6]: HACKS
src/lib/libc/softfloat [netbsd-6]: Makefile.inc
Log Message:
Pull up revisions:
src/lib/libc/softfloat/Makefile.inc 1.11-1.12 via patch
src/doc/HACKS 1.124 via patch
(requested by msaitoh in ticket #703).
For arm, add -fno-tree-vrp to COPTS when compiling softfloat.c.
Without -fno-tree-vrp, -INF + -INF returns 0 by adddf3.
Fixes PR#46953.
To generate a diff of this commit:
cvs rdiff -u -r1.122.2.1 -r1.122.2.2 src/doc/HACKS
cvs rdiff -u -r1.10 -r1.10.4.1 src/lib/libc/softfloat/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.122.2.1 src/doc/HACKS:1.122.2.2
--- src/doc/HACKS:1.122.2.1 Mon Mar 5 20:59:25 2012
+++ src/doc/HACKS Sat Nov 24 19:02:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.122.2.1 2012/03/05 20:59:25 sborrill Exp $
+# $NetBSD: HACKS,v 1.122.2.2 2012/11/24 19:02:10 jdc Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -554,6 +554,24 @@ port arm
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48863#c4
kcah
+ hack gcc-4.5 arm without -fno-tree-vrp generate broken code
+ cdate Wed Nov 14 13:02:02 JST 2012
+ who msaitoh
+ file lib/libc/softfloat/Makefile.inc
+ pr 46953
+ regress src/tests/lib/libm/t_cbrt
+ regress src/tests/lib/libm/t_ceil
+ regress src/tests/lib/libm/t_exp
+ regress src/tests/lib/libm/t_log
+ regress src/tests/lib/libm/t_scalbn
+ regress src/tests/lib/libm/t_sinh
+ regress src/tests/lib/libm/t_sqrt
+ descr Gcc has a bug in tree optimization. For adddf3,
+ -INF + -INF returns 0 without -fno-tree-vrp.
+ Debugging with -fdump-tree-all shows that
+ softfloat.c.021t.cleanup_cfg is ok but softfloat.c.023t.ssa
+ is broken.
+ kcah
port sh3
Index: src/lib/libc/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.10 src/lib/libc/softfloat/Makefile.inc:1.10.4.1
--- src/lib/libc/softfloat/Makefile.inc:1.10 Mon Jul 4 02:53:15 2011
+++ src/lib/libc/softfloat/Makefile.inc Sat Nov 24 19:02:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2011/07/04 02:53:15 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.10.4.1 2012/11/24 19:02:09 jdc Exp $
SOFTFLOAT_BITS?=64
.PATH: ${ARCHDIR}/softfloat \
@@ -20,9 +20,12 @@ SRCS.softfloat+=eqsf2.c nesf2.c gtsf2.c
SRCS+= ${SRCS.softfloat}
# XXX
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45 \
-(${MACHINE_CPU} == arm || \
- ${MACHINE_CPU} == mips || \
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45
+.if (${MACHINE_CPU} == arm)
+# See doc/HACKS for more information.
+COPTS.softfloat.c+= -Wno-enum-compare -fno-tree-vrp
+.elif (${MACHINE_CPU} == mips || \
${MACHINE_CPU} == sh3)
COPTS.softfloat.c+= -Wno-enum-compare
.endif
+.endif
CVS commit: [netbsd-6-0] src
Module Name:src
Committed By: jdc
Date: Sat Nov 24 19:02:14 UTC 2012
Modified Files:
src/doc [netbsd-6-0]: HACKS
src/lib/libc/softfloat [netbsd-6-0]: Makefile.inc
Log Message:
Pull up revisions:
src/lib/libc/softfloat/Makefile.inc 1.11-1.12 via patch
src/doc/HACKS 1.124 via patch
(requested by msaitoh in ticket #703).
For arm, add -fno-tree-vrp to COPTS when compiling softfloat.c.
Without -fno-tree-vrp, -INF + -INF returns 0 by adddf3.
Fixes PR#46953.
To generate a diff of this commit:
cvs rdiff -u -r1.122.2.1 -r1.122.2.1.4.1 src/doc/HACKS
cvs rdiff -u -r1.10 -r1.10.10.1 src/lib/libc/softfloat/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.122.2.1 src/doc/HACKS:1.122.2.1.4.1
--- src/doc/HACKS:1.122.2.1 Mon Mar 5 20:59:25 2012
+++ src/doc/HACKS Sat Nov 24 19:02:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.122.2.1 2012/03/05 20:59:25 sborrill Exp $
+# $NetBSD: HACKS,v 1.122.2.1.4.1 2012/11/24 19:02:14 jdc Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -554,6 +554,24 @@ port arm
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48863#c4
kcah
+ hack gcc-4.5 arm without -fno-tree-vrp generate broken code
+ cdate Wed Nov 14 13:02:02 JST 2012
+ who msaitoh
+ file lib/libc/softfloat/Makefile.inc
+ pr 46953
+ regress src/tests/lib/libm/t_cbrt
+ regress src/tests/lib/libm/t_ceil
+ regress src/tests/lib/libm/t_exp
+ regress src/tests/lib/libm/t_log
+ regress src/tests/lib/libm/t_scalbn
+ regress src/tests/lib/libm/t_sinh
+ regress src/tests/lib/libm/t_sqrt
+ descr Gcc has a bug in tree optimization. For adddf3,
+ -INF + -INF returns 0 without -fno-tree-vrp.
+ Debugging with -fdump-tree-all shows that
+ softfloat.c.021t.cleanup_cfg is ok but softfloat.c.023t.ssa
+ is broken.
+ kcah
port sh3
Index: src/lib/libc/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.10 src/lib/libc/softfloat/Makefile.inc:1.10.10.1
--- src/lib/libc/softfloat/Makefile.inc:1.10 Mon Jul 4 02:53:15 2011
+++ src/lib/libc/softfloat/Makefile.inc Sat Nov 24 19:02:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2011/07/04 02:53:15 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.10.10.1 2012/11/24 19:02:14 jdc Exp $
SOFTFLOAT_BITS?=64
.PATH: ${ARCHDIR}/softfloat \
@@ -20,9 +20,12 @@ SRCS.softfloat+=eqsf2.c nesf2.c gtsf2.c
SRCS+= ${SRCS.softfloat}
# XXX
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45 \
-(${MACHINE_CPU} == arm || \
- ${MACHINE_CPU} == mips || \
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45
+.if (${MACHINE_CPU} == arm)
+# See doc/HACKS for more information.
+COPTS.softfloat.c+= -Wno-enum-compare -fno-tree-vrp
+.elif (${MACHINE_CPU} == mips || \
${MACHINE_CPU} == sh3)
COPTS.softfloat.c+= -Wno-enum-compare
.endif
+.endif
CVS commit: [netbsd-6] src/sys/arch/arm/broadcom
Module Name:src
Committed By: jdc
Date: Sat Nov 24 19:14:49 UTC 2012
Modified Files:
src/sys/arch/arm/broadcom [netbsd-6]: bcm2835_tmr.c
Log Message:
Pull up revision 1.2 (requested by skrll in ticket #704).
Fix delay.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/broadcom/bcm2835_tmr.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/broadcom/bcm2835_tmr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.1.2.2 src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.1.2.3
--- src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.1.2.2 Thu Aug 9 06:36:50 2012
+++ src/sys/arch/arm/broadcom/bcm2835_tmr.c Sat Nov 24 19:14:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_tmr.c,v 1.1.2.2 2012/08/09 06:36:50 jdc Exp $ */
+/* $NetBSD: bcm2835_tmr.c,v 1.1.2.3 2012/11/24 19:14:49 jdc Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_tmr.c,v 1.1.2.2 2012/08/09 06:36:50 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_tmr.c,v 1.1.2.3 2012/11/24 19:14:49 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -159,22 +159,19 @@ delay(unsigned int n)
uint32_t delta, usecs;
KASSERT(sc != NULL);
- int nhloops = 0;
last = bus_space_read_4(sc-sc_iot, sc-sc_ioh, BCM2835_STIMER_CLO);
delta = usecs = 0;
while (n usecs) {
- if (nhloops++ 0x10) Debugger();
curr = bus_space_read_4(sc-sc_iot, sc-sc_ioh,
BCM2835_STIMER_CLO);
- /* XXXNH !?!?!?!?!?!?! - use CHI? */
/* Check to see if the timer has wrapped around. */
if (curr last)
- delta += (last + (counts_per_hz - curr));
+ delta += curr + (UINT32_MAX - last);
else
- delta += (last - curr);
+ delta += curr - last;
last = curr;
CVS commit: [netbsd-6] src
Module Name:src
Committed By: jdc
Date: Sat Nov 24 19:22:17 UTC 2012
Modified Files:
src/distrib/x68k/floppies/ramdisk [netbsd-6]: Makefile
src/sys/arch/x68k/conf [netbsd-6]: INSTALL
Log Message:
Pull up revisions:
src/distrib/x68k/floppies/ramdisk/Makefile revision 1.41
src/sys/arch/x68k/conf/INSTALL revision 1.96
(requested by tsutsui in ticket #705).
- add dhcpcd support to x68k install ramdisk
- enable bpf(4) in INSTALL kernel for dhcpcd
- bump ramdisk size from 1400k to 1440k
No objection on port-x68k.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.8.1 src/distrib/x68k/floppies/ramdisk/Makefile
cvs rdiff -u -r1.94 -r1.94.2.1 src/sys/arch/x68k/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/x68k/floppies/ramdisk/Makefile
diff -u src/distrib/x68k/floppies/ramdisk/Makefile:1.40 src/distrib/x68k/floppies/ramdisk/Makefile:1.40.8.1
--- src/distrib/x68k/floppies/ramdisk/Makefile:1.40 Thu Feb 11 09:06:51 2010
+++ src/distrib/x68k/floppies/ramdisk/Makefile Sat Nov 24 19:22:17 2012
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2010/02/11 09:06:51 roy Exp $
+# $NetBSD: Makefile,v 1.40.8.1 2012/11/24 19:22:17 jdc Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= inst.fs
-IMAGESIZE= 1400k
+IMAGESIZE= 1440k
# `floppy-root' cannot be used now, due to size issue.
#IMAGE_RELEASEDIR= installation/floppy
@@ -35,6 +35,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
.include ${HACKSRC}/Makefile.inc
${CRUNCHBIN}: libhack.o
+.include ${DISTRIBDIR}/common/Makefile.dhcpcd
.include ${DISTRIBDIR}/common/Makefile.crunch
.include ${DISTRIBDIR}/common/Makefile.makedev
.include ${DISTRIBDIR}/common/Makefile.image
Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.94 src/sys/arch/x68k/conf/INSTALL:1.94.2.1
--- src/sys/arch/x68k/conf/INSTALL:1.94 Sun Dec 18 05:49:33 2011
+++ src/sys/arch/x68k/conf/INSTALL Sat Nov 24 19:22:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.94 2011/12/18 05:49:33 dholland Exp $
+# $NetBSD: INSTALL,v 1.94.2.1 2012/11/24 19:22:17 jdc Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include arch/x68k/conf/std.x68k
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident INSTALL-$Revision: 1.94 $
+#ident INSTALL-$Revision: 1.94.2.1 $
makeoptions COPTS=-Os # Optimise for space. Implies -O2
@@ -18,7 +18,7 @@ maxusers 4
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on memory-disk
options MEMORY_DISK_SERVER=0 # No user space hooks
-options MEMORY_DISK_ROOT_SIZE=2800
+options MEMORY_DISK_ROOT_SIZE=2880
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
## System kernel configuration. See options(4) for more detail.
@@ -277,5 +277,6 @@ ne* at neptune? addr 0x300 # NE2000 or
pseudo-device md # boot floppy image
pseudo-device loop
+pseudo-device bpfilter
pseudo-device sl
pseudo-device pty 2 # pseudo-terminals (Sysinst needs two)
CVS commit: [netbsd-6] src/distrib/utils/sysinst
Module Name:src Committed By: jdc Date: Sat Nov 24 19:32:28 UTC 2012 Modified Files: src/distrib/utils/sysinst [netbsd-6]: disks.c Log Message: Pull up revision 1.127 (requested by tsutsui in ticket #706). Don't show a disk which is mounted as root partition in the Available disks list during sysinst procedure to prevent users from shooting their foot in case of installation using install-image on a USB stick. Per suggestion in PR/47195. To generate a diff of this commit: cvs rdiff -u -r1.123.2.2 -r1.123.2.3 src/distrib/utils/sysinst/disks.c 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/sysinst/disks.c diff -u src/distrib/utils/sysinst/disks.c:1.123.2.2 src/distrib/utils/sysinst/disks.c:1.123.2.3 --- src/distrib/utils/sysinst/disks.c:1.123.2.2 Thu Jul 5 17:29:15 2012 +++ src/distrib/utils/sysinst/disks.c Sat Nov 24 19:32:28 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: disks.c,v 1.123.2.2 2012/07/05 17:29:15 riz Exp $ */ +/* $NetBSD: disks.c,v 1.123.2.3 2012/11/24 19:32:28 jdc Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -377,6 +377,14 @@ get_disks(struct disk_desc *dd) break; continue; } + + /* + * Exclude a disk mounted as root partition, + * in case of install-image on a USB memstick. + */ + if (is_active_rootpart(dd-dd_name, 0)) +continue; + dd-dd_cyl = l.d_ncylinders; dd-dd_head = l.d_ntracks; dd-dd_sec = l.d_nsectors;
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Sat Nov 24 19:36:35 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 671 (update), 703-706, 717. To generate a diff of this commit: cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.41 src/doc/CHANGES-6.1:1.1.2.42 --- src/doc/CHANGES-6.1:1.1.2.41 Sat Nov 24 04:36:38 2012 +++ src/doc/CHANGES-6.1 Sat Nov 24 19:36:34 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.41 2012/11/24 04:36:38 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.42 2012/11/24 19:36:34 jdc Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -725,7 +725,7 @@ sys/kern/kern_exec.c1.358 [christos, ticket #670] sys/dev/marvell/if_mvgbe.c 1.19-1.23, 1.26-1.31 -sys/dev/marvell/mvgbereg.h 1.4-1.5, 1.7 +sys/dev/marvell/mvgbereg.h 1.4-1.5, patch, 1.7 Fix a number of mvgbe(4) issues. [msaitoh, ticket #671] @@ -916,7 +916,7 @@ sys/dev/usb/if_urndis.c1.4 lib/libc/arch/arm/sys/__aeabi_read_tp.S 1.3 - Add $NetBSD: CHANGES-6.1,v 1.1.2.41 2012/11/24 04:36:38 riz Exp $ tag. Use ip to save r1 instead of the stack. + Add $NetBSD: CHANGES-6.1,v 1.1.2.42 2012/11/24 19:36:34 jdc Exp $ tag. Use ip to save r1 instead of the stack. [matt, ticket #701] sys/net/npf/npf.c1.14 @@ -935,3 +935,33 @@ usr.sbin/npf/npftest/libnpftest/npf_tabl listing, and preservation of entries on reload. [rmind, ticket #702] +common/lib/libc/gen/ptree.c 1.10 +sys/sys/ptree.h 1.8 + Add a ptree_mask_node_p to determine if an item is a mask node, and + what its non-mask length is. + [rmind, ticket #717] + +src/lib/libc/softfloat/Makefile.inc 1.11-1.12 via patch +src/doc/HACKS 1.124 via patch + For arm, add -fno-tree-vrp to COPTS when compiling softfloat.c. + Without -fno-tree-vrp, -INF + -INF returns 0 by adddf3. PR#46953. + [msaitoh, ticket #703] + +sys/arch/arm/broadcom/bcm2835_tmr.c 1.2 + Fix delay. + [skrll, ticket #704] + +distrib/x68k/floppies/ramdisk/Makefile 1.41 +sys/arch/x68k/conf/INSTALL 1.96 + - add dhcpcd support to x68k install ramdisk + - enable bpf(4) in INSTALL kernel for dhcpcd + - bump ramdisk size from 1400k to 1440k + [tsutsui, ticket #705] + +distrib/utils/sysinst/disks.c 1.127 + Don't show a disk which is mounted as root partition in the + Available disks list during sysinst procedure to prevent + users from shooting their foot in case of installation using + install-image on a USB stick. PR#47195. + [tsutsui, ticket #706] +
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: jdc Date: Sat Nov 24 19:36:47 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 703 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.20 src/doc/CHANGES-6.0.1:1.1.2.21 --- src/doc/CHANGES-6.0.1:1.1.2.20 Sat Nov 24 04:01:43 2012 +++ src/doc/CHANGES-6.0.1 Sat Nov 24 19:36:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.20 2012/11/24 04:01:43 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.21 2012/11/24 19:36:47 jdc Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -170,3 +170,9 @@ sys/dev/usb/if_urndis.c1.4 keyboard on a number of HP and possibly other vendors' machines. [joerg, ticket #700] +src/lib/libc/softfloat/Makefile.inc 1.11-1.12 via patch +src/doc/HACKS 1.124 via patch + For arm, add -fno-tree-vrp to COPTS when compiling softfloat.c. + Without -fno-tree-vrp, -INF + -INF returns 0 by adddf3. PR#46953. + [msaitoh, ticket #703] +
CVS commit: src/sys
Module Name:src Committed By: nakayama Date: Sat Nov 24 19:48:25 UTC 2012 Modified Files: src/sys/fs/smbfs: smbfs_smb.c src/sys/netsmb: smb_smb.c Log Message: - fix endian cofusion around FID, which is used as is, so no need to do byte swapping. - put right value to ByteCount of SMB_COM_NT_CREATE_ANDX request. The fix makes smbfs actually works on big-endian port. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/fs/smbfs/smbfs_smb.c cvs rdiff -u -r1.32 -r1.33 src/sys/netsmb/smb_smb.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/fs/smbfs/smbfs_smb.c diff -u src/sys/fs/smbfs/smbfs_smb.c:1.42 src/sys/fs/smbfs/smbfs_smb.c:1.43 --- src/sys/fs/smbfs/smbfs_smb.c:1.42 Tue Sep 27 02:05:10 2011 +++ src/sys/fs/smbfs/smbfs_smb.c Sat Nov 24 19:48:24 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $ */ +/* $NetBSD: smbfs_smb.c,v 1.43 2012/11/24 19:48:24 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.42 2011/09/27 02:05:10 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.43 2012/11/24 19:48:24 nakayama Exp $); #include sys/param.h #include sys/systm.h @@ -689,7 +689,7 @@ smbfs_smb_create(struct smbnode *dnp, co smb_rq_getreply(rqp, mdp); md_get_uint8(mdp, wc); if (wc == 1) -md_get_uint16le(mdp, fid); +md_get_uint16(mdp, fid); else error = EBADRPC; } @@ -1422,8 +1422,6 @@ smbfs_smb_ntcreatex(struct smbnode *np, mb_put_uint8(mbp, 0); /* Security tracking mode flags */ smb_rq_wend(rqp); smb_rq_bstart(rqp); - smb_rq_bend(rqp); - mbp-mb_count = 0; error = smbfs_fullpath(mbp, SSTOVC(ssp), np, NULL, 0); if (error) @@ -1435,6 +1433,7 @@ smbfs_smb_ntcreatex(struct smbnode *np, flen = mbp-mb_count; SMBRQ_PUTLE16(nmlen, flen); + smb_rq_bend(rqp); error = smb_rq_simple(rqp); if (error) goto bad; Index: src/sys/netsmb/smb_smb.c diff -u src/sys/netsmb/smb_smb.c:1.32 src/sys/netsmb/smb_smb.c:1.33 --- src/sys/netsmb/smb_smb.c:1.32 Sun Oct 18 23:20:31 2009 +++ src/sys/netsmb/smb_smb.c Sat Nov 24 19:48:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $ */ +/* $NetBSD: smb_smb.c,v 1.33 2012/11/24 19:48:25 nakayama Exp $ */ /* * Copyright (c) 2000-2001 Boris Popov @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $); +__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.33 2012/11/24 19:48:25 nakayama Exp $); #include sys/param.h #include sys/systm.h @@ -175,7 +175,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st SMBERROR((Unexpected length of security blob (%d)\n, sblen)); break; } -error = md_get_uint16(mdp, bc); +error = md_get_uint16le(mdp, bc); if (error) break; if (sp-sv_caps SMB_CAP_EXT_SECURITY) @@ -210,7 +210,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st if (swlen SMB_MAXCHALLENGELEN) break; md_get_uint16(mdp, NULL); /* mbz */ -if (md_get_uint16(mdp, bc) != 0) +if (md_get_uint16le(mdp, bc) != 0) break; if (bc swlen) break;
CVS commit: [netbsd-6] src/sys/arch/x68k/stand
Module Name:src
Committed By: jdc
Date: Sat Nov 24 20:20:29 UTC 2012
Modified Files:
src/sys/arch/x68k/stand/boot [netbsd-6]: dp8390.c dp8390.h if_ne.c ne.c
src/sys/arch/x68k/stand/boot_ufs [netbsd-6]: boot.S
src/sys/arch/x68k/stand/libsa [netbsd-6]: clock.c sdcd.c
src/sys/arch/x68k/stand/netboot [netbsd-6]: Makefile boot.c conf.c
src/sys/arch/x68k/stand/xxboot [netbsd-6]: boot.S bootmain.c version
xx.c
src/sys/arch/x68k/stand/xxboot/cdboot_cd9660 [netbsd-6]: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1 [netbsd-6]: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2 [netbsd-6]: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1 [netbsd-6]: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2 [netbsd-6]: Makefile
Removed Files:
src/sys/arch/x68k/stand/bootlogo [netbsd-6]: MANIFEST netbsd.xpm
setbootimg.c xpm2bootimg.c
Log Message:
Pull up revisions:
src/sys/arch/x68k/stand/boot_ufs/boot.S revision 1.10
src/sys/arch/x68k/stand/boot/dp8390.c revision 1.2
src/sys/arch/x68k/stand/boot/dp8390.h revision 1.2
src/sys/arch/x68k/stand/boot/if_ne.c revision 1.2
src/sys/arch/x68k/stand/boot/ne.c revision 1.2
src/sys/arch/x68k/stand/libsa/clock.c revision 1.2
src/sys/arch/x68k/stand/netboot/Makefile revision 1.2
src/sys/arch/x68k/stand/netboot/boot.c revision 1.2
src/sys/arch/x68k/stand/netboot/conf.c revision 1.2
src/sys/arch/x68k/stand/bootlogo/MANIFEST delete
src/sys/arch/x68k/stand/bootlogo/netbsd.xpm delete
src/sys/arch/x68k/stand/bootlogo/setbootimg.c delete
src/sys/arch/x68k/stand/bootlogo/xpm2bootimg.c delete
src/sys/arch/x68k/stand/xxboot/boot.S revisions 1.2,1.3
src/sys/arch/x68k/stand/xxboot/bootmain.c revisions 1.2,1.3,1.4
src/sys/arch/x68k/stand/xxboot/xx.c revision 1.2
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile revisions 1.2,1.3,1.4
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile revisions 1.2,1.3,1.4
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile revisions 1.2,1.3,1.4
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile revisions 1.2,1.3,1.4
src/sys/arch/x68k/stand/xxboot/version revision 1.2
src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile revision 1.2
src/sys/arch/x68k/stand/libsa/sdcd.c revision 1.14
(requested by tsutsui in ticket #707).
Fix typo in comment. s/d1/d0/
Remove my local RCS IDs.
Remove x68k/stand/bootlogo/ directory.
It was a tool before the bootloader becomes multi-stage (10 years ago),
and it does not work anymore today.
Pull fixes in comments from x68k/stand/boot_ufs/boot.S rev 1.9 and 1.10.
Use a correct function name in .globl decl.
- fix comments
- use proper uintNN_t types
- use ANSI function decls
- remove unnecessary function decl
- remove __P()
- misc KNF and cosmetics
- use declarations in lib/libsa/stand.h
- remove __P() and some KNF
- remove extern variable decl
- use uintNN_t type
Set *file for FS_OPS() pathname properly in devopen().
Now bootxx_ffsv1 (and other bootxx ufs variants) work properly.
XXX: cd9660_open() in sys/lib/libsa/cd9660.c seems to open a file in
the first entry of root directory if specified path is empty.
Not sure if it's intentional behavoir.
Appease warning nbmake: ${TOUCHPROG} expands to empty string.
Fix previous; no need to echo dummy command.
Make xxboot for ufs variants actually functional:
- set bootdev properly even on SCSI HD and floppy boot
per SDBOOT/FDBOOT/CDBOOT defines in each Makefile
- always print xxboot name and version
- use IOCS PRINT calls instead of printf to avoid size overflow in DEBUG case
- wrap debug stuff with #ifdef XXBOOT_DEBUG
- bump version to denote changes
Mostly taken from old boot_ufs.
XXX: xxboot_lfs[12] are untested.
Make sure to initialize partition offset in cdopen(),
i.e. fix an uninitialized auto variable which happened
to be zero on XM6i emulator.
Now cdboot also works on real X68030.
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/x68k/stand/boot/dp8390.c \
src/sys/arch/x68k/stand/boot/dp8390.h \
src/sys/arch/x68k/stand/boot/if_ne.c src/sys/arch/x68k/stand/boot/ne.c
cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/arch/x68k/stand/boot_ufs/boot.S
cvs rdiff -u -r1.1 -r0 src/sys/arch/x68k/stand/bootlogo/MANIFEST \
src/sys/arch/x68k/stand/bootlogo/netbsd.xpm
cvs rdiff -u -r1.4 -r0 src/sys/arch/x68k/stand/bootlogo/setbootimg.c
cvs rdiff -u -r1.5 -r0 src/sys/arch/x68k/stand/bootlogo/xpm2bootimg.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/x68k/stand/libsa/clock.c
cvs rdiff -u -r1.11.8.1 -r1.11.8.2 src/sys/arch/x68k/stand/libsa/sdcd.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/x68k/stand/netboot/Makefile \
src/sys/arch/x68k/stand/netboot/boot.c \
src/sys/arch/x68k/stand/netboot/conf.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/arch/x68k/stand/xxboot/boot.S
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/sys/arch/x68k/stand/xxboot/bootmain.c
CVS commit: [netbsd-6] src/distrib/x68k/cdroms/installcd
Module Name:src
Committed By: jdc
Date: Sat Nov 24 20:29:49 UTC 2012
Modified Files:
src/distrib/x68k/cdroms/installcd [netbsd-6]: Makefile
Log Message:
Pull up revisions:
src/distrib/x68k/cdroms/installcd/Makefile revisions 1.2,1.3
(requested by tsutsui in ticket #708).
The x68k installcd is now bootable.
Use CDBUILDEXTRA to copy secondary bootloader into target CD iso image.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.40.1 src/distrib/x68k/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/x68k/cdroms/installcd/Makefile
diff -u src/distrib/x68k/cdroms/installcd/Makefile:1.1 src/distrib/x68k/cdroms/installcd/Makefile:1.1.40.1
--- src/distrib/x68k/cdroms/installcd/Makefile:1.1 Tue Mar 6 21:57:28 2007
+++ src/distrib/x68k/cdroms/installcd/Makefile Sat Nov 24 20:29:49 2012
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:28 bouyer Exp $
+# $NetBSD: Makefile,v 1.1.40.1 2012/11/24 20:29:49 jdc Exp $
CDBASE= x68kcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDINSTKERNEL= ../../floppies/instkernel
+CDKERNELS= netbsd-INSTALL.gz netbsd
+CDBUILDEXTRA= ${BOOT}
+BOOTXX_CD9660= ${DESTDIR}/usr/mdec/xxboot_cd9660
+CDMAKEFSOPTIONS= generic-bootimage=${BOOTXX_CD9660}
.include ${.CURDIR}/../../../common/Makefile.bootcd
CVS commit: [netbsd-6] src/distrib/x68k/floppies/bootfloppy.sysinst
Module Name:src
Committed By: jdc
Date: Sat Nov 24 20:34:13 UTC 2012
Modified Files:
src/distrib/x68k/floppies/bootfloppy.sysinst [netbsd-6]: Makefile
Log Message:
Pull up revision 1.13 (requested by tsutsui in ticket #709).
FLOPPYPAD=1 for padding floppies.
On XM6i (emulator), the floppy format type of plain image is
decided by filesize, so it makes easy to use the image on XM6i.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.58.1 \
src/distrib/x68k/floppies/bootfloppy.sysinst/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/x68k/floppies/bootfloppy.sysinst/Makefile
diff -u src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile:1.12 src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile:1.12.58.1
--- src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile:1.12 Mon Nov 18 12:39:56 2002
+++ src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile Sat Nov 24 20:34:12 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/11/18 12:39:56 lukem Exp $
+# $NetBSD: Makefile,v 1.12.58.1 2012/11/24 20:34:12 jdc Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -10,6 +10,7 @@ FLOPPYSIZE= 2400
BOOTNAME!= printf USTAR.volsize.%o ${FLOPPYSIZE}
FLOPPYFILES= ${BOOTNAME} netbsd
FLOPPYSUFFIX= .fs
+FLOPPYPAD= 1
FLOPPY_RELEASEDIR= installation/floppy
CVS commit: [netbsd-6] src/distrib/notes/common
Module Name:src Committed By: jdc Date: Sat Nov 24 20:38:08 UTC 2012 Modified Files: src/distrib/notes/common [netbsd-6]: postinstall Log Message: Pull up revision 1.75 (requested by tsutsui in ticket #710). Most contents in ftp://ftp.NetBSD.org/pub/NetBSD/packages/ seem removed recently (do we have any announcment?) so update pakcages URLs and descriptions accordingly. To generate a diff of this commit: cvs rdiff -u -r1.74.8.1 -r1.74.8.2 src/distrib/notes/common/postinstall 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/postinstall diff -u src/distrib/notes/common/postinstall:1.74.8.1 src/distrib/notes/common/postinstall:1.74.8.2 --- src/distrib/notes/common/postinstall:1.74.8.1 Fri Aug 17 23:53:49 2012 +++ src/distrib/notes/common/postinstall Sat Nov 24 20:38:07 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: postinstall,v 1.74.8.1 2012/08/17 23:53:49 riz Exp $ +.\ $NetBSD: postinstall,v 1.74.8.2 2012/11/24 20:38:07 jdc Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -339,7 +339,7 @@ More information on the package system i .Lk http://www.NetBSD.org/docs/software/packages.html .It A list of available packages suitable for browsing is at -.Lk ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/README.html +.Lk ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/README.html .It Precompiled binaries can be found at .Lk ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/ @@ -369,9 +369,6 @@ is correctly configured, you can install Some mirror sites don't mirror the .Pa /pub/pkgsrc directory. -If you would like to use such mirrors, you could also try the -.Pa /pub/NetBSD/packages/current-packages/NetBSD/\*M/\*V/All -directory, which may have the same contents. .Note) .Pp The above commands will install the Tenex-csh and Bourne Again shells, @@ -385,7 +382,7 @@ post-installation configuration menu, th .Xr pkgsrc 7 framework for compiling packages can be obtained by retrieving the file -.Lk ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc.tar.gz +.Lk ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc.tar.gz . It is typically extracted into .Pa /usr/pkgsrc (though other locations work fine) with the commands:
CVS commit: [netbsd-6-0] src/distrib/notes/common
Module Name:src Committed By: jdc Date: Sat Nov 24 20:41:14 UTC 2012 Modified Files: src/distrib/notes/common [netbsd-6-0]: postinstall Log Message: Pull up revision 1.75 (requested by tsutsui in ticket #710). Most contents in ftp://ftp.NetBSD.org/pub/NetBSD/packages/ seem removed recently (do we have any announcment?) so update pakcages URLs and descriptions accordingly. To generate a diff of this commit: cvs rdiff -u -r1.74.8.1 -r1.74.8.1.4.1 src/distrib/notes/common/postinstall 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/postinstall diff -u src/distrib/notes/common/postinstall:1.74.8.1 src/distrib/notes/common/postinstall:1.74.8.1.4.1 --- src/distrib/notes/common/postinstall:1.74.8.1 Fri Aug 17 23:53:49 2012 +++ src/distrib/notes/common/postinstall Sat Nov 24 20:41:14 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: postinstall,v 1.74.8.1 2012/08/17 23:53:49 riz Exp $ +.\ $NetBSD: postinstall,v 1.74.8.1.4.1 2012/11/24 20:41:14 jdc Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -339,7 +339,7 @@ More information on the package system i .Lk http://www.NetBSD.org/docs/software/packages.html .It A list of available packages suitable for browsing is at -.Lk ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/README.html +.Lk ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/README.html .It Precompiled binaries can be found at .Lk ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/ @@ -369,9 +369,6 @@ is correctly configured, you can install Some mirror sites don't mirror the .Pa /pub/pkgsrc directory. -If you would like to use such mirrors, you could also try the -.Pa /pub/NetBSD/packages/current-packages/NetBSD/\*M/\*V/All -directory, which may have the same contents. .Note) .Pp The above commands will install the Tenex-csh and Bourne Again shells, @@ -385,7 +382,7 @@ post-installation configuration menu, th .Xr pkgsrc 7 framework for compiling packages can be obtained by retrieving the file -.Lk ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc.tar.gz +.Lk ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc.tar.gz . It is typically extracted into .Pa /usr/pkgsrc (though other locations work fine) with the commands:
CVS commit: [netbsd-6] src/sbin/mount_msdos
Module Name:src Committed By: jdc Date: Sat Nov 24 20:43:16 UTC 2012 Modified Files: src/sbin/mount_msdos [netbsd-6]: mount_msdos.8 Log Message: Pull up revisions: src/sbin/mount_msdos/mount_msdos.8 revisions 1.35,1.36 (requested by tsutsui in ticket #711). Remove the bit about empty DOS file systems assumed to have short names by default; jmcneill changed this back in Jan 2009, but missed this text. Note mount_msdos -G option also allows mounting X680x0's Human68k floppies. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.34.4.1 src/sbin/mount_msdos/mount_msdos.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_msdos/mount_msdos.8 diff -u src/sbin/mount_msdos/mount_msdos.8:1.34 src/sbin/mount_msdos/mount_msdos.8:1.34.4.1 --- src/sbin/mount_msdos/mount_msdos.8:1.34 Thu Sep 15 09:44:59 2011 +++ src/sbin/mount_msdos/mount_msdos.8 Sat Nov 24 20:43:16 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount_msdos.8,v 1.34 2011/09/15 09:44:59 wiz Exp $ +.\ $NetBSD: mount_msdos.8,v 1.34.4.1 2012/11/24 20:43:16 jdc Exp $ .\ .\ Copyright (c) 1993, 1994 Christopher G. Demetriou .\ All rights reserved. @@ -32,7 +32,7 @@ .\ .\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp .\ -.Dd January 23, 2009 +.Dd November 16, 2012 .Dt MOUNT_MSDOS 8 .Os .Sh NAME @@ -84,6 +84,7 @@ This option causes the filesystem to be filesystem. The differences to the MS-DOS filesystem are minimal and limited to the boot block. +This option also allows mounting X680x0's Human68k floppies. This option enforces .Fl s . .It Fl g Ar gid @@ -192,13 +193,3 @@ The use of the flag could result in damaged filesystems, albeit the damage is in part taken care of by procedures similar to the ones used in Win'95. -.Pp -The default handling for -.Fl s -and -.Fl l -will result in empty filesystems to be populated -with short filenames only. -To generate long filenames -on empty DOS filesystems use -.Fl l .
CVS commit: [netbsd-6-0] src/sbin/mount_msdos
Module Name:src Committed By: jdc Date: Sat Nov 24 20:45:39 UTC 2012 Modified Files: src/sbin/mount_msdos [netbsd-6-0]: mount_msdos.8 Log Message: Pull up revisions: src/sbin/mount_msdos/mount_msdos.8 revisions 1.35,1.36 (requested by tsutsui in ticket #711). Remove the bit about empty DOS file systems assumed to have short names by default; jmcneill changed this back in Jan 2009, but missed this text. Note mount_msdos -G option also allows mounting X680x0's Human68k floppies. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.34.10.1 src/sbin/mount_msdos/mount_msdos.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_msdos/mount_msdos.8 diff -u src/sbin/mount_msdos/mount_msdos.8:1.34 src/sbin/mount_msdos/mount_msdos.8:1.34.10.1 --- src/sbin/mount_msdos/mount_msdos.8:1.34 Thu Sep 15 09:44:59 2011 +++ src/sbin/mount_msdos/mount_msdos.8 Sat Nov 24 20:45:39 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount_msdos.8,v 1.34 2011/09/15 09:44:59 wiz Exp $ +.\ $NetBSD: mount_msdos.8,v 1.34.10.1 2012/11/24 20:45:39 jdc Exp $ .\ .\ Copyright (c) 1993, 1994 Christopher G. Demetriou .\ All rights reserved. @@ -32,7 +32,7 @@ .\ .\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp .\ -.Dd January 23, 2009 +.Dd November 16, 2012 .Dt MOUNT_MSDOS 8 .Os .Sh NAME @@ -84,6 +84,7 @@ This option causes the filesystem to be filesystem. The differences to the MS-DOS filesystem are minimal and limited to the boot block. +This option also allows mounting X680x0's Human68k floppies. This option enforces .Fl s . .It Fl g Ar gid @@ -192,13 +193,3 @@ The use of the flag could result in damaged filesystems, albeit the damage is in part taken care of by procedures similar to the ones used in Win'95. -.Pp -The default handling for -.Fl s -and -.Fl l -will result in empty filesystems to be populated -with short filenames only. -To generate long filenames -on empty DOS filesystems use -.Fl l .
CVS commit: [netbsd-6] src/sys/kern
Module Name:src Committed By: jdc Date: Sat Nov 24 20:50:16 UTC 2012 Modified Files: src/sys/kern [netbsd-6]: kern_runq.c Log Message: Pull up revision 1.34 (requested by para in ticket #712). change sched_upreempt_pri default to 0 as discussed on tech-kern@ should improve interactive performance on SMP machines as user preemption happens immediately in x-cpu wakeup case now To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.4.1 src/sys/kern/kern_runq.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/kern_runq.c diff -u src/sys/kern/kern_runq.c:1.33 src/sys/kern/kern_runq.c:1.33.4.1 --- src/sys/kern/kern_runq.c:1.33 Fri Dec 2 12:31:03 2011 +++ src/sys/kern/kern_runq.c Sat Nov 24 20:50:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_runq.c,v 1.33 2011/12/02 12:31:03 yamt Exp $ */ +/* $NetBSD: kern_runq.c,v 1.33.4.1 2012/11/24 20:50:15 jdc Exp $ */ /* * Copyright (c) 2007, 2008 Mindaugas Rasiukevicius rmind at NetBSD org @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_runq.c,v 1.33 2011/12/02 12:31:03 yamt Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_runq.c,v 1.33.4.1 2012/11/24 20:50:15 jdc Exp $); #include sys/param.h #include sys/kernel.h @@ -99,7 +99,7 @@ static void sched_balance(void *); /* * Preemption control. */ -int sched_upreempt_pri = PRI_KERNEL; +int sched_upreempt_pri = 0; #ifdef __HAVE_PREEMPTION # ifdef DEBUG int sched_kpreempt_pri = 0;
CVS commit: [netbsd-6] src/sys/arch/arm/marvell
Module Name:src
Committed By: jdc
Date: Sat Nov 24 20:53:13 UTC 2012
Modified Files:
src/sys/arch/arm/marvell [netbsd-6]: mvsocgpp.c
Log Message:
Pull up revision 1.5 (requested by msaitoh in ticket #713).
Fix a uvm_fault panic that memory is not allocated for the last few GPIO bits.
To generate a diff of this commit:
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/sys/arch/arm/marvell/mvsocgpp.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/marvell/mvsocgpp.c
diff -u src/sys/arch/arm/marvell/mvsocgpp.c:1.3.8.1 src/sys/arch/arm/marvell/mvsocgpp.c:1.3.8.2
--- src/sys/arch/arm/marvell/mvsocgpp.c:1.3.8.1 Tue Oct 23 19:50:49 2012
+++ src/sys/arch/arm/marvell/mvsocgpp.c Sat Nov 24 20:53:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsocgpp.c,v 1.3.8.1 2012/10/23 19:50:49 riz Exp $ */
+/* $NetBSD: mvsocgpp.c,v 1.3.8.2 2012/11/24 20:53:13 jdc Exp $ */
/*
* Copyright (c) 2008, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mvsocgpp.c,v 1.3.8.1 2012/10/23 19:50:49 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: mvsocgpp.c,v 1.3.8.2 2012/11/24 20:53:13 jdc Exp $);
#include gpio.h
@@ -168,7 +168,8 @@ mvsocgpp_attach(device_t parent, device_
MVSOCGPP_WRITE(sc, MVSOCGPP_GPIOIC(i), 0);
sc-sc_pic =
- kmem_zalloc(sizeof(struct mvsocgpp_pic) * gpp_npins / 8, KM_SLEEP);
+ kmem_zalloc(sizeof(struct mvsocgpp_pic) * howmany(gpp_npins, 8),
+ KM_SLEEP);
for (i = 0, j = 0; i gpp_npins; i += 8, j++) {
gpio_pic = (sc-sc_pic + j)-gpio_pic;
gpio_pic-pic_ops = gpio_pic_ops;
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: riastradh
Date: Sat Nov 24 20:56:39 UTC 2012
Modified Files:
src/sys/dev/acpi: thinkpad_acpi.c
Log Message:
Match LEN0068 in thinkpad(4) too, as newer Thinkpads report.
Tested on a W530. Lots of stuff is missing, though.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/acpi/thinkpad_acpi.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/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.41 src/sys/dev/acpi/thinkpad_acpi.c:1.42
--- src/sys/dev/acpi/thinkpad_acpi.c:1.41 Tue Aug 14 14:36:43 2012
+++ src/sys/dev/acpi/thinkpad_acpi.c Sat Nov 24 20:56:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.41 2012/08/14 14:36:43 jruoho Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.42 2012/11/24 20:56:39 riastradh Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: thinkpad_acpi.c,v 1.41 2012/08/14 14:36:43 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: thinkpad_acpi.c,v 1.42 2012/11/24 20:56:39 riastradh Exp $);
#include sys/param.h
#include sys/device.h
@@ -133,6 +133,7 @@ CFATTACH_DECL_NEW(thinkpad, sizeof(think
static const char * const thinkpad_ids[] = {
IBM0068,
+ LEN0068,
NULL
};
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: jdc
Date: Sat Nov 24 20:58:00 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: subr_cprng.c
Log Message:
Pull up revision 1.14 (requested by msaitoh in ticket #714).
Pass correct wait channel string.
To generate a diff of this commit:
cvs rdiff -u -r1.5.2.5 -r1.5.2.6 src/sys/kern/subr_cprng.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/subr_cprng.c
diff -u src/sys/kern/subr_cprng.c:1.5.2.5 src/sys/kern/subr_cprng.c:1.5.2.6
--- src/sys/kern/subr_cprng.c:1.5.2.5 Wed Oct 31 17:30:21 2012
+++ src/sys/kern/subr_cprng.c Sat Nov 24 20:58:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cprng.c,v 1.5.2.5 2012/10/31 17:30:21 riz Exp $ */
+/* $NetBSD: subr_cprng.c,v 1.5.2.6 2012/11/24 20:58:00 jdc Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
#include sys/cprng.h
-__KERNEL_RCSID(0, $NetBSD: subr_cprng.c,v 1.5.2.5 2012/10/31 17:30:21 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_cprng.c,v 1.5.2.6 2012/11/24 20:58:00 jdc Exp $);
void
cprng_init(void)
@@ -178,7 +178,7 @@ cprng_strong_create(const char *const na
mutex_init(c-mtx, MUTEX_DEFAULT, ipl);
if (c-flags CPRNG_USE_CV) {
- cv_init(c-cv, name);
+ cv_init(c-cv, (const char *)c-name);
}
selinit(c-selq);
CVS commit: [netbsd-6] src/external/mit/expat/dist
Module Name:src
Committed By: jdc
Date: Sat Nov 24 21:08:47 UTC 2012
Modified Files:
src/external/mit/expat/dist/lib [netbsd-6]: expat.h xmlparse.c
src/external/mit/expat/dist/xmlwf [netbsd-6]: readfilemap.c
Log Message:
Pull up revisions:
src/external/mit/expat/dist/lib/expat.h 1.1.1.2 via patch
src/external/mit/expat/dist/lib/xmlparse.c 1.1.1.2 via patch
src/external/mit/expat/dist/xmlwf/readfilemap.c 1.1.1.2 via patch
(requested by spz in ticket #715)
import of expat 2.1.0
Fixes CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security
issues have been previously fixed in our tree)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 src/external/mit/expat/dist/lib/expat.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/external/mit/expat/dist/lib/xmlparse.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
src/external/mit/expat/dist/xmlwf/readfilemap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/expat/dist/lib/expat.h
diff -u src/external/mit/expat/dist/lib/expat.h:1.1.1.1 src/external/mit/expat/dist/lib/expat.h:1.1.1.1.2.1
--- src/external/mit/expat/dist/lib/expat.h:1.1.1.1 Sat Feb 11 18:18:17 2012
+++ src/external/mit/expat/dist/lib/expat.h Sat Nov 24 21:08:46 2012
@@ -883,6 +883,15 @@ XMLPARSEAPI(int)
XML_SetParamEntityParsing(XML_Parser parser,
enum XML_ParamEntityParsing parsing);
+/* Sets the hash salt to use for internal hash calculations.
+ Helps in preventing DoS attacks based on predicting hash
+ function behavior. This must be called before parsing is started.
+ Returns 1 if successful, 0 when called after parsing has started.
+*/
+XMLPARSEAPI(int)
+XML_SetHashSalt(XML_Parser parser,
+unsigned long hash_salt);
+
/* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then
XML_GetErrorCode returns information about the error.
*/
Index: src/external/mit/expat/dist/lib/xmlparse.c
diff -u src/external/mit/expat/dist/lib/xmlparse.c:1.2 src/external/mit/expat/dist/lib/xmlparse.c:1.2.2.1
--- src/external/mit/expat/dist/lib/xmlparse.c:1.2 Sat Feb 11 18:22:58 2012
+++ src/external/mit/expat/dist/lib/xmlparse.c Sat Nov 24 21:08:46 2012
@@ -5,6 +5,8 @@
#include stddef.h
#include string.h /* memset(), memcpy() */
#include assert.h
+#include limits.h /* UINT_MAX */
+#include time.h /* time() */
#define XML_BUILDING_EXPAT 1
@@ -391,12 +393,13 @@ static void dtdReset(DTD *p, const XML_M
static void
dtdDestroy(DTD *p, XML_Bool isDocEntity, const XML_Memory_Handling_Suite *ms);
static int
-dtdCopy(DTD *newDtd, const DTD *oldDtd, const XML_Memory_Handling_Suite *ms);
+dtdCopy(XML_Parser oldParser,
+DTD *newDtd, const DTD *oldDtd, const XML_Memory_Handling_Suite *ms);
static int
-copyEntityTable(HASH_TABLE *, STRING_POOL *, const HASH_TABLE *);
-
+copyEntityTable(XML_Parser oldParser,
+HASH_TABLE *, STRING_POOL *, const HASH_TABLE *);
static NAMED *
-lookup(HASH_TABLE *table, KEY name, size_t createSize);
+lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize);
static void FASTCALL
hashTableInit(HASH_TABLE *, const XML_Memory_Handling_Suite *ms);
static void FASTCALL hashTableClear(HASH_TABLE *);
@@ -429,11 +432,15 @@ static ELEMENT_TYPE *
getElementType(XML_Parser parser, const ENCODING *enc,
const char *ptr, const char *end);
+static unsigned long generate_hash_secret_salt(void);
+static XML_Bool startParsing(XML_Parser parser);
+
static XML_Parser
parserCreate(const XML_Char *encodingName,
const XML_Memory_Handling_Suite *memsuite,
const XML_Char *nameSep,
DTD *dtd);
+
static void
parserInit(XML_Parser parser, const XML_Char *encodingName);
@@ -546,6 +553,7 @@ struct XML_ParserStruct {
XML_Bool m_useForeignDTD;
enum XML_ParamEntityParsing m_paramEntityParsing;
#endif
+ unsigned long m_hash_secret_salt;
};
#define MALLOC(s) (parser-m_mem.malloc_fcn((s)))
@@ -653,6 +661,7 @@ struct XML_ParserStruct {
#define useForeignDTD (parser-m_useForeignDTD)
#define paramEntityParsing (parser-m_paramEntityParsing)
#endif /* XML_DTD */
+#define hash_secret_salt (parser-m_hash_secret_salt)
XML_Parser XMLCALL
XML_ParserCreate(const XML_Char *encodingName)
@@ -677,22 +686,35 @@ static const XML_Char implicitContext[]
ASCII_s, ASCII_p, ASCII_a, ASCII_c, ASCII_e, '\0'
};
+static unsigned long
+generate_hash_secret_salt(void)
+{
+ unsigned int seed = time(NULL) % UINT_MAX;
+ srand(seed);
+ return rand();
+}
+
+static XML_Bool /* only valid for root parser */
+startParsing(XML_Parser parser)
+{
+/* hash functions must be initialized before setContext() is called */
+if (hash_secret_salt == 0)
+ hash_secret_salt = generate_hash_secret_salt();
+if (ns) {
+ /* implicit
CVS commit: [netbsd-6-0] src/external/mit/expat/dist
Module Name:src
Committed By: jdc
Date: Sat Nov 24 21:09:41 UTC 2012
Modified Files:
src/external/mit/expat/dist/lib [netbsd-6-0]: expat.h xmlparse.c
src/external/mit/expat/dist/xmlwf [netbsd-6-0]: readfilemap.c
Log Message:
Pull up revisions:
src/external/mit/expat/dist/lib/expat.h 1.1.1.2 via patch
src/external/mit/expat/dist/lib/xmlparse.c 1.1.1.2 via patch
src/external/mit/expat/dist/xmlwf/readfilemap.c 1.1.1.2 via patch
(requested by spz in ticket #715)
import of expat 2.1.0
Fixes CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security
issues have been previously fixed in our tree)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 src/external/mit/expat/dist/lib/expat.h
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/mit/expat/dist/lib/xmlparse.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \
src/external/mit/expat/dist/xmlwf/readfilemap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/expat/dist/lib/expat.h
diff -u src/external/mit/expat/dist/lib/expat.h:1.1.1.1 src/external/mit/expat/dist/lib/expat.h:1.1.1.1.6.1
--- src/external/mit/expat/dist/lib/expat.h:1.1.1.1 Sat Feb 11 18:18:17 2012
+++ src/external/mit/expat/dist/lib/expat.h Sat Nov 24 21:09:40 2012
@@ -883,6 +883,15 @@ XMLPARSEAPI(int)
XML_SetParamEntityParsing(XML_Parser parser,
enum XML_ParamEntityParsing parsing);
+/* Sets the hash salt to use for internal hash calculations.
+ Helps in preventing DoS attacks based on predicting hash
+ function behavior. This must be called before parsing is started.
+ Returns 1 if successful, 0 when called after parsing has started.
+*/
+XMLPARSEAPI(int)
+XML_SetHashSalt(XML_Parser parser,
+unsigned long hash_salt);
+
/* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then
XML_GetErrorCode returns information about the error.
*/
Index: src/external/mit/expat/dist/lib/xmlparse.c
diff -u src/external/mit/expat/dist/lib/xmlparse.c:1.2 src/external/mit/expat/dist/lib/xmlparse.c:1.2.6.1
--- src/external/mit/expat/dist/lib/xmlparse.c:1.2 Sat Feb 11 18:22:58 2012
+++ src/external/mit/expat/dist/lib/xmlparse.c Sat Nov 24 21:09:41 2012
@@ -5,6 +5,8 @@
#include stddef.h
#include string.h /* memset(), memcpy() */
#include assert.h
+#include limits.h /* UINT_MAX */
+#include time.h /* time() */
#define XML_BUILDING_EXPAT 1
@@ -391,12 +393,13 @@ static void dtdReset(DTD *p, const XML_M
static void
dtdDestroy(DTD *p, XML_Bool isDocEntity, const XML_Memory_Handling_Suite *ms);
static int
-dtdCopy(DTD *newDtd, const DTD *oldDtd, const XML_Memory_Handling_Suite *ms);
+dtdCopy(XML_Parser oldParser,
+DTD *newDtd, const DTD *oldDtd, const XML_Memory_Handling_Suite *ms);
static int
-copyEntityTable(HASH_TABLE *, STRING_POOL *, const HASH_TABLE *);
-
+copyEntityTable(XML_Parser oldParser,
+HASH_TABLE *, STRING_POOL *, const HASH_TABLE *);
static NAMED *
-lookup(HASH_TABLE *table, KEY name, size_t createSize);
+lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize);
static void FASTCALL
hashTableInit(HASH_TABLE *, const XML_Memory_Handling_Suite *ms);
static void FASTCALL hashTableClear(HASH_TABLE *);
@@ -429,11 +432,15 @@ static ELEMENT_TYPE *
getElementType(XML_Parser parser, const ENCODING *enc,
const char *ptr, const char *end);
+static unsigned long generate_hash_secret_salt(void);
+static XML_Bool startParsing(XML_Parser parser);
+
static XML_Parser
parserCreate(const XML_Char *encodingName,
const XML_Memory_Handling_Suite *memsuite,
const XML_Char *nameSep,
DTD *dtd);
+
static void
parserInit(XML_Parser parser, const XML_Char *encodingName);
@@ -546,6 +553,7 @@ struct XML_ParserStruct {
XML_Bool m_useForeignDTD;
enum XML_ParamEntityParsing m_paramEntityParsing;
#endif
+ unsigned long m_hash_secret_salt;
};
#define MALLOC(s) (parser-m_mem.malloc_fcn((s)))
@@ -653,6 +661,7 @@ struct XML_ParserStruct {
#define useForeignDTD (parser-m_useForeignDTD)
#define paramEntityParsing (parser-m_paramEntityParsing)
#endif /* XML_DTD */
+#define hash_secret_salt (parser-m_hash_secret_salt)
XML_Parser XMLCALL
XML_ParserCreate(const XML_Char *encodingName)
@@ -677,22 +686,35 @@ static const XML_Char implicitContext[]
ASCII_s, ASCII_p, ASCII_a, ASCII_c, ASCII_e, '\0'
};
+static unsigned long
+generate_hash_secret_salt(void)
+{
+ unsigned int seed = time(NULL) % UINT_MAX;
+ srand(seed);
+ return rand();
+}
+
+static XML_Bool /* only valid for root parser */
+startParsing(XML_Parser parser)
+{
+/* hash functions must be initialized before setContext() is called */
+if (hash_secret_salt == 0)
+ hash_secret_salt = generate_hash_secret_salt();
+if (ns) {
+ /*
CVS commit: src/usr.bin/mail
Module Name:src
Committed By: christos
Date: Sat Nov 24 21:40:02 UTC 2012
Modified Files:
src/usr.bin/mail: mime_codecs.c
Log Message:
PR/47237: Steffen Nurpmeso: Detect more than 2 pad characters and mark as bad.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/mail/mime_codecs.c
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/mail/mime_codecs.c
diff -u src/usr.bin/mail/mime_codecs.c:1.9 src/usr.bin/mail/mime_codecs.c:1.10
--- src/usr.bin/mail/mime_codecs.c:1.9 Fri Apr 10 09:08:25 2009
+++ src/usr.bin/mail/mime_codecs.c Sat Nov 24 16:40:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mime_codecs.c,v 1.9 2009/04/10 13:08:25 christos Exp $ */
+/* $NetBSD: mime_codecs.c,v 1.10 2012/11/24 21:40:02 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
#include sys/cdefs.h
#ifndef __lint__
-__RCSID($NetBSD: mime_codecs.c,v 1.9 2009/04/10 13:08:25 christos Exp $);
+__RCSID($NetBSD: mime_codecs.c,v 1.10 2012/11/24 21:40:02 christos Exp $);
#endif /* not __lint__ */
#include assert.h
@@ -237,6 +237,10 @@ mime_b64tobin(char *bin, const char *b64
unsigned c = uchar64(q[2]);
unsigned d = uchar64(q[3]);
+ if (a == BAD || a == EQU || b == BAD || b == EQU ||
+ c == BAD || d == BAD)
+ return -1;
+
*p++ = ((a 2) | ((b 0x30) 4));
if (c == EQU) { /* got '=' */
if (d != EQU)
@@ -248,9 +252,6 @@ mime_b64tobin(char *bin, const char *b64
break;
}
*p++ = (((c 0x03) 6) | d);
-
- if (a == BAD || b == BAD || c == BAD || d == BAD)
- return -1;
}
#undef uchar64
CVS commit: [netbsd-6] src
Module Name:src
Committed By: jdc
Date: Sat Nov 24 21:40:03 UTC 2012
Modified Files:
src/lib/libc/sys [netbsd-6]: kqueue.2
src/sys/kern [netbsd-6]: kern_descrip.c kern_event.c
src/tests/lib/libc/sys [netbsd-6]: t_kevent.c
Log Message:
Pull up revisions:
src/sys/kern/kern_event.c revision 1.79
src/sys/kern/kern_descrip.c revision 1.219
src/lib/libc/sys/kqueue.2 revision 1.33
src/tests/lib/libc/sys/t_kevent.c revision 1.2-1.5
(requested by christos in ticket #716).
- initialize kn_id
- in close, invalidate f_data and f_type early to prevent accidental re-use
- add a DIAGNOSTIC for when we use unsupported fd's and a KASSERT for f_event
being NULL.
Return EOPNOTSUPP for fnullop_kqfilter to prevent registration of unsupported
fds. XXX: We should really fix the fd's to be supported in the future.
Unsupported fd's have a NULL f_event, so registering crashes the kernel with
a NULL function dereference of f_event.
mention that kevent returns now EOPNOTSUPP.
Move the references to PRs from code comments to the test description. Once
ATF has the ability to output the metadata in the HTML reports, it should be
easy to traverse between releng and gnats -reports via links.
Add a (skipped for now) test case for PR 46463
adapt to new reality
Add a test for adding an event to an unsupported fd.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 src/lib/libc/sys/kqueue.2
cvs rdiff -u -r1.218 -r1.218.2.1 src/sys/kern/kern_descrip.c
cvs rdiff -u -r1.75 -r1.75.2.1 src/sys/kern/kern_event.c
cvs rdiff -u -r1.1 -r1.1.2.1 src/tests/lib/libc/sys/t_kevent.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/sys/kqueue.2
diff -u src/lib/libc/sys/kqueue.2:1.32 src/lib/libc/sys/kqueue.2:1.32.2.1
--- src/lib/libc/sys/kqueue.2:1.32 Wed Jan 25 00:28:35 2012
+++ src/lib/libc/sys/kqueue.2 Sat Nov 24 21:40:03 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: kqueue.2,v 1.32 2012/01/25 00:28:35 christos Exp $
+.\ $NetBSD: kqueue.2,v 1.32.2.1 2012/11/24 21:40:03 jdc Exp $
.\
.\ Copyright (c) 2000 Jonathan Lemon
.\ All rights reserved.
@@ -32,7 +32,7 @@
.\
.\ $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.22 2001/06/27 19:55:57 dd Exp $
.\
-.Dd January 23, 2012
+.Dd November 24, 2012
.Dt KQUEUE 2
.Os
.Sh NAME
@@ -604,6 +604,10 @@ The specified time limit or filter is in
The event could not be found to be modified or deleted.
.It Bq Er ENOMEM
No memory was available to register the event.
+.It Bq Er EOPNOTSUPP
+This type of file descriptor is not supported for
+.Fn kevent
+operations.
.It Bq Er ESRCH
The specified process to attach to does not exist.
.El
Index: src/sys/kern/kern_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.218 src/sys/kern/kern_descrip.c:1.218.2.1
--- src/sys/kern/kern_descrip.c:1.218 Wed Jan 25 00:28:35 2012
+++ src/sys/kern/kern_descrip.c Sat Nov 24 21:40:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_descrip.c,v 1.218 2012/01/25 00:28:35 christos Exp $ */
+/* $NetBSD: kern_descrip.c,v 1.218.2.1 2012/11/24 21:40:02 jdc Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_descrip.c,v 1.218 2012/01/25 00:28:35 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_descrip.c,v 1.218.2.1 2012/11/24 21:40:02 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1885,7 +1885,7 @@ int
fnullop_kqfilter(file_t *fp, struct knote *kn)
{
- return 0;
+ return EOPNOTSUPP;
}
void
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.75 src/sys/kern/kern_event.c:1.75.2.1
--- src/sys/kern/kern_event.c:1.75 Wed Jan 25 00:28:35 2012
+++ src/sys/kern/kern_event.c Sat Nov 24 21:40:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.75 2012/01/25 00:28:35 christos Exp $ */
+/* $NetBSD: kern_event.c,v 1.75.2.1 2012/11/24 21:40:02 jdc Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.75 2012/01/25 00:28:35 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.75.2.1 2012/11/24 21:40:02 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -961,6 +961,7 @@ kqueue_register(struct kqueue *kq, struc
kn = newkn;
newkn = NULL;
kn-kn_obj = fp;
+ kn-kn_id = kev-ident;
kn-kn_kq = kq;
kn-kn_fop = kfilter-filtops;
kn-kn_kfilter = kfilter;
@@ -1002,6 +1003,10 @@ kqueue_register(struct kqueue *kq, struc
error = (*kfilter-filtops-f_attach)(kn);
KERNEL_UNLOCK_ONE(NULL); /* XXXSMP */
if (error != 0) {
+#ifdef DIAGNOSTIC
+printf(%s: event not supported for file type
+ %d\n, __func__, fp ? fp-f_type : -1);
+#endif
/* knote_detach() drops fdp-fd_lock */
knote_detach(kn, fdp, false);
goto done;
@@ -1017,6 +1022,13 @@ kqueue_register(struct kqueue *kq, struc
kn-kn_sdata = kev-data;
CVS commit: [netbsd-6-0] src
Module Name:src
Committed By: jdc
Date: Sat Nov 24 21:40:08 UTC 2012
Modified Files:
src/lib/libc/sys [netbsd-6-0]: kqueue.2
src/sys/kern [netbsd-6-0]: kern_descrip.c kern_event.c
src/tests/lib/libc/sys [netbsd-6-0]: t_kevent.c
Log Message:
Pull up revisions:
src/sys/kern/kern_event.c revision 1.79
src/sys/kern/kern_descrip.c revision 1.219
src/lib/libc/sys/kqueue.2 revision 1.33
src/tests/lib/libc/sys/t_kevent.c revision 1.2-1.5
(requested by christos in ticket #716).
- initialize kn_id
- in close, invalidate f_data and f_type early to prevent accidental re-use
- add a DIAGNOSTIC for when we use unsupported fd's and a KASSERT for f_event
being NULL.
Return EOPNOTSUPP for fnullop_kqfilter to prevent registration of unsupported
fds. XXX: We should really fix the fd's to be supported in the future.
Unsupported fd's have a NULL f_event, so registering crashes the kernel with
a NULL function dereference of f_event.
mention that kevent returns now EOPNOTSUPP.
Move the references to PRs from code comments to the test description. Once
ATF has the ability to output the metadata in the HTML reports, it should be
easy to traverse between releng and gnats -reports via links.
Add a (skipped for now) test case for PR 46463
adapt to new reality
Add a test for adding an event to an unsupported fd.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.8.1 src/lib/libc/sys/kqueue.2
cvs rdiff -u -r1.218 -r1.218.8.1 src/sys/kern/kern_descrip.c
cvs rdiff -u -r1.75 -r1.75.6.1 src/sys/kern/kern_event.c
cvs rdiff -u -r1.1 -r1.1.6.1 src/tests/lib/libc/sys/t_kevent.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/sys/kqueue.2
diff -u src/lib/libc/sys/kqueue.2:1.32 src/lib/libc/sys/kqueue.2:1.32.8.1
--- src/lib/libc/sys/kqueue.2:1.32 Wed Jan 25 00:28:35 2012
+++ src/lib/libc/sys/kqueue.2 Sat Nov 24 21:40:08 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: kqueue.2,v 1.32 2012/01/25 00:28:35 christos Exp $
+.\ $NetBSD: kqueue.2,v 1.32.8.1 2012/11/24 21:40:08 jdc Exp $
.\
.\ Copyright (c) 2000 Jonathan Lemon
.\ All rights reserved.
@@ -32,7 +32,7 @@
.\
.\ $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.22 2001/06/27 19:55:57 dd Exp $
.\
-.Dd January 23, 2012
+.Dd November 24, 2012
.Dt KQUEUE 2
.Os
.Sh NAME
@@ -604,6 +604,10 @@ The specified time limit or filter is in
The event could not be found to be modified or deleted.
.It Bq Er ENOMEM
No memory was available to register the event.
+.It Bq Er EOPNOTSUPP
+This type of file descriptor is not supported for
+.Fn kevent
+operations.
.It Bq Er ESRCH
The specified process to attach to does not exist.
.El
Index: src/sys/kern/kern_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.218 src/sys/kern/kern_descrip.c:1.218.8.1
--- src/sys/kern/kern_descrip.c:1.218 Wed Jan 25 00:28:35 2012
+++ src/sys/kern/kern_descrip.c Sat Nov 24 21:40:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_descrip.c,v 1.218 2012/01/25 00:28:35 christos Exp $ */
+/* $NetBSD: kern_descrip.c,v 1.218.8.1 2012/11/24 21:40:07 jdc Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_descrip.c,v 1.218 2012/01/25 00:28:35 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_descrip.c,v 1.218.8.1 2012/11/24 21:40:07 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1885,7 +1885,7 @@ int
fnullop_kqfilter(file_t *fp, struct knote *kn)
{
- return 0;
+ return EOPNOTSUPP;
}
void
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.75 src/sys/kern/kern_event.c:1.75.6.1
--- src/sys/kern/kern_event.c:1.75 Wed Jan 25 00:28:35 2012
+++ src/sys/kern/kern_event.c Sat Nov 24 21:40:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.75 2012/01/25 00:28:35 christos Exp $ */
+/* $NetBSD: kern_event.c,v 1.75.6.1 2012/11/24 21:40:07 jdc Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.75 2012/01/25 00:28:35 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_event.c,v 1.75.6.1 2012/11/24 21:40:07 jdc Exp $);
#include sys/param.h
#include sys/systm.h
@@ -961,6 +961,7 @@ kqueue_register(struct kqueue *kq, struc
kn = newkn;
newkn = NULL;
kn-kn_obj = fp;
+ kn-kn_id = kev-ident;
kn-kn_kq = kq;
kn-kn_fop = kfilter-filtops;
kn-kn_kfilter = kfilter;
@@ -1002,6 +1003,10 @@ kqueue_register(struct kqueue *kq, struc
error = (*kfilter-filtops-f_attach)(kn);
KERNEL_UNLOCK_ONE(NULL); /* XXXSMP */
if (error != 0) {
+#ifdef DIAGNOSTIC
+printf(%s: event not supported for file type
+ %d\n, __func__, fp ? fp-f_type : -1);
+#endif
/* knote_detach() drops fdp-fd_lock */
knote_detach(kn, fdp, false);
goto done;
@@ -1017,6 +1022,13 @@ kqueue_register(struct kqueue *kq, struc
kn-kn_sdata =
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Sat Nov 24 21:47:28 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 707-716. To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.43 src/doc/CHANGES-6.1:1.1.2.44 --- src/doc/CHANGES-6.1:1.1.2.43 Sat Nov 24 19:58:04 2012 +++ src/doc/CHANGES-6.1 Sat Nov 24 21:47:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.43 2012/11/24 19:58:04 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.44 2012/11/24 21:47:28 jdc Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -916,7 +916,7 @@ sys/dev/usb/if_urndis.c1.4 lib/libc/arch/arm/sys/__aeabi_read_tp.S 1.3 - Add $NetBSD: CHANGES-6.1,v 1.1.2.43 2012/11/24 19:58:04 riz Exp $ tag. Use ip to save r1 instead of the stack. + Add $NetBSD: CHANGES-6.1,v 1.1.2.44 2012/11/24 21:47:28 jdc Exp $ tag. Use ip to save r1 instead of the stack. [matt, ticket #701] sys/net/npf/npf.c1.14 @@ -6934,3 +6934,83 @@ share/mk/bsd.own.mk1.711 Switch mips ports to gdb 7.3.1. Remove gdb 6. [nick, ticket #668] +sys/arch/x68k/stand/boot_ufs/boot.S 1.10 +sys/arch/x68k/stand/boot/dp8390.c 1.2 +sys/arch/x68k/stand/boot/dp8390.h 1.2 +sys/arch/x68k/stand/boot/if_ne.c 1.2 +sys/arch/x68k/stand/boot/ne.c1.2 +sys/arch/x68k/stand/libsa/clock.c 1.2 +sys/arch/x68k/stand/netboot/Makefile 1.2 +sys/arch/x68k/stand/netboot/boot.c 1.2 +sys/arch/x68k/stand/netboot/conf.c 1.2 +sys/arch/x68k/stand/bootlogo/MANIFEST delete +sys/arch/x68k/stand/bootlogo/netbsd.xpm delete +sys/arch/x68k/stand/bootlogo/setbootimg.c delete +sys/arch/x68k/stand/bootlogo/xpm2bootimg.c delete +sys/arch/x68k/stand/xxboot/boot.S 1.2,1.3 +sys/arch/x68k/stand/xxboot/bootmain.c 1.2,1.3,1.4 +sys/arch/x68k/stand/xxboot/xx.c1.2 +sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile 1.2,1.3,1.4 +sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile 1.2,1.3,1.4 +sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile 1.2,1.3,1.4 +sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile 1.2,1.3,1.4 +sys/arch/x68k/stand/xxboot/version 1.2 +sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile 1.2 +sys/arch/x68k/stand/libsa/sdcd.c 1.14 + + Make xxboot UFS variants work. Make cdboot work on real X68030. + [tsutsui, ticket #707] + +distrib/x68k/cdroms/installcd/Makefile 1.2,1.3 + The x68k installcd is now bootable. Use CDBUILDEXTRA to copy + secondary bootloader into target CD iso image. + [tsutsui, ticket #708] + +distrib/x68k/floppies/bootfloppy.sysinst/Makefile 1.13 + FLOPPYPAD=1 for padding floppies. + On XM6i (emulator), the floppy format type of plain image is + decided by filesize, so it makes easy to use the image on XM6i. + [tsutsui, ticket #709] + +distrib/notes/common/postinstall 1.75 + Update install note for packages removal. + [tsutsui, ticket #710] + +sbin/mount_msdos/mount_msdos.81.35,1.36 + Remove the bit about empty DOS file systems assumed to have short + names by default. Note mount_msdos -G option also allows mounting + X680x0's Human68k floppies. + [tsutsui, ticket #711] + +sys/kern/kern_runq.c 1.34 + change sched_upreempt_pri default to 0 as discussed on tech-kern@ + should improve interactive performance on SMP machines + as user preemption happens immediately in x-cpu wakeup case now + [para, ticket #712] + +sys/arch/arm/marvell/mvsocgpp.c1.5 + Fix a uvm_fault panic that memory is not allocated for the last few + GPIO bits. + [msaitoh, ticket #713] + +sys/kern/subr_cprng.c 1.14 + Pass correct wait channel string. + [msaitoh, ticket #714] + +src/external/mit/expat/dist/lib/expat.h 1.1.1.2 via patch +src/external/mit/expat/dist/lib/xmlparse.c 1.1.1.2 via patch +src/external/mit/expat/dist/xmlwf/readfilemap.c 1.1.1.2 via patch + + Fix CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security + issues have been previously fixed in our tree) + [spz, ticket #715] + +sys/kern/kern_event.c 1.79 +sys/kern/kern_descrip.c 1.219 +lib/libc/sys/kqueue.2 1.33 +tests/lib/libc/sys/t_kevent.c1.2-1.5 + Prevent kernel crash when unsupported fd's are used. + Mention that kevent returns now EOPNOTSUPP. + Add a test for adding an event to an unsupported fd. + [christos, ticket #716] +
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: jdc Date: Sat Nov 24 21:47:35 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Tickets 710, 711, 715, 716. To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.21 src/doc/CHANGES-6.0.1:1.1.2.22 --- src/doc/CHANGES-6.0.1:1.1.2.21 Sat Nov 24 19:36:47 2012 +++ src/doc/CHANGES-6.0.1 Sat Nov 24 21:47:35 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.21 2012/11/24 19:36:47 jdc Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.22 2012/11/24 21:47:35 jdc Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -176,3 +176,30 @@ src/doc/HACKS 1.124 via patch Without -fno-tree-vrp, -INF + -INF returns 0 by adddf3. PR#46953. [msaitoh, ticket #703] +distrib/notes/common/postinstall 1.75 + Update install note for packages removal. + [tsutsui, ticket #710] + +sbin/mount_msdos/mount_msdos.81.35,1.36 + Remove the bit about empty DOS file systems assumed to have short + names by default. Note mount_msdos -G option also allows mounting + X680x0's Human68k floppies. + [tsutsui, ticket #711] + +src/external/mit/expat/dist/lib/expat.h 1.1.1.2 via patch +src/external/mit/expat/dist/lib/xmlparse.c 1.1.1.2 via patch +src/external/mit/expat/dist/xmlwf/readfilemap.c 1.1.1.2 via patch + + Fix CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security + issues have been previously fixed in our tree) + [spz, ticket #715] + +sys/kern/kern_event.c 1.79 +sys/kern/kern_descrip.c 1.219 +lib/libc/sys/kqueue.2 1.33 +tests/lib/libc/sys/t_kevent.c1.2-1.5 + Prevent kernel crash when unsupported fd's are used. + Mention that kevent returns now EOPNOTSUPP. + Add a test for adding an event to an unsupported fd. + [christos, ticket #716] +
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: christos
Date: Sat Nov 24 22:29:09 UTC 2012
Modified Files:
src/external/bsd/mdocml/dist: tbl_data.c
Log Message:
XXX: rename data() to getdata(). This is to avoid an assembler botch on the
ppc64 toolchain where function names are prefixed with a period, so data
becomes .data and .data is confused by the assembler with the segment
directive with the same name. Clearly this is a toolchain issue; we should
be able to call functions text and data but it is simpler to fix the
code rather than the toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/dist/tbl_data.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/tbl_data.c
diff -u src/external/bsd/mdocml/dist/tbl_data.c:1.3 src/external/bsd/mdocml/dist/tbl_data.c:1.4
--- src/external/bsd/mdocml/dist/tbl_data.c:1.3 Mon Jan 30 12:03:01 2012
+++ src/external/bsd/mdocml/dist/tbl_data.c Sat Nov 24 17:29:09 2012
@@ -29,13 +29,13 @@
#include libmandoc.h
#include libroff.h
-static int data(struct tbl_node *, struct tbl_span *,
+static int getdata(struct tbl_node *, struct tbl_span *,
int, const char *, int *);
static struct tbl_span *newspan(struct tbl_node *, int,
struct tbl_row *);
static int
-data(struct tbl_node *tbl, struct tbl_span *dp,
+getdata(struct tbl_node *tbl, struct tbl_span *dp,
int ln, const char *p, int *pos)
{
struct tbl_dat *dat;
@@ -154,7 +154,7 @@ tbl_cdata(struct tbl_node *tbl, int ln,
if (p[pos] == tbl-opts.tab) {
tbl-part = TBL_PART_DATA;
pos++;
- return(data(tbl, tbl-last_span, ln, p, pos));
+ return(getdata(tbl, tbl-last_span, ln, p, pos));
} else if ('\0' == p[pos]) {
tbl-part = TBL_PART_DATA;
return(1);
@@ -269,7 +269,7 @@ tbl_data(struct tbl_node *tbl, int ln, c
/* This returns 0 when TBL_PART_CDATA is entered. */
while ('\0' != p[pos])
- if ( ! data(tbl, dp, ln, p, pos))
+ if ( ! getdata(tbl, dp, ln, p, pos))
return(0);
return(1);
CVS commit: [netbsd-6] src/sbin/iscsid
Module Name:src Committed By: reed Date: Sun Nov 25 00:19:52 UTC 2012 Modified Files: src/sbin/iscsid [netbsd-6]: iscsid.8 Log Message: Fix simple typo. (3270 is MPLS) To generate a diff of this commit: cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/sbin/iscsid/iscsid.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/iscsid/iscsid.8 diff -u src/sbin/iscsid/iscsid.8:1.2.2.1 src/sbin/iscsid/iscsid.8:1.2.2.2 --- src/sbin/iscsid/iscsid.8:1.2.2.1 Wed May 30 08:06:26 2012 +++ src/sbin/iscsid/iscsid.8 Sun Nov 25 00:19:51 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: iscsid.8,v 1.2.2.1 2012/05/30 08:06:26 sborrill Exp $ +.\ $NetBSD: iscsid.8,v 1.2.2.2 2012/11/25 00:19:51 reed Exp $ .\ .\ Copyright (c) 2011 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -36,7 +36,7 @@ .Sh DESCRIPTION The iSCSI initiator runs as a kernel driver, and provides access to iSCSI targets running across a network using the iSCSI protocol, -RFC 3270. +RFC 3720. The .Nm utility itself interfaces to the kernel iSCSI driver, and also
CVS commit: src/usr.bin/fstat
Module Name:src
Committed By: christos
Date: Sun Nov 25 00:36:24 UTC 2012
Modified Files:
src/usr.bin/fstat: fstat.c
Log Message:
- add more debugging.
- in misctrans() we need the file index not the file type.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/usr.bin/fstat/fstat.c
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/fstat/fstat.c
diff -u src/usr.bin/fstat/fstat.c:1.99 src/usr.bin/fstat/fstat.c:1.100
--- src/usr.bin/fstat/fstat.c:1.99 Thu Oct 18 22:49:52 2012
+++ src/usr.bin/fstat/fstat.c Sat Nov 24 19:36:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fstat.c,v 1.99 2012/10/19 02:49:52 christos Exp $ */
+/* $NetBSD: fstat.c,v 1.100 2012/11/25 00:36:23 christos Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)fstat.c 8.3 (Berkeley) 5/2/95;
#else
-__RCSID($NetBSD: fstat.c,v 1.99 2012/10/19 02:49:52 christos Exp $);
+__RCSID($NetBSD: fstat.c,v 1.100 2012/11/25 00:36:23 christos Exp $);
#endif
#endif /* not lint */
@@ -170,7 +170,7 @@ static const char *inet6_addrstr(char *,
#endif
static const char *at_addrstr(char *, size_t, const struct sockaddr_at *);
static void socktrans(struct socket *, int);
-static void misctrans(struct file *);
+static void misctrans(struct file *, int);
static int ufs_filestat(struct vnode *, struct filestat *);
static void usage(void) __dead;
static const char *vfilestat(struct vnode *, struct filestat *);
@@ -485,8 +485,11 @@ ftrans(fdfile_t *fp, int i)
i, fp, Pid);
return;
}
- if (fdfile.ff_file == NULL)
+ if (fdfile.ff_file == NULL) {
+ dprintf(null ff_file for %d at %p for pid %d,
+ i, fp, Pid);
return;
+ }
if (!KVM_READ(fdfile.ff_file, file, sizeof(file))) {
dprintf(can't read file %d at %p for pid %d,
i, fdfile.ff_file, Pid);
@@ -510,7 +513,7 @@ ftrans(fdfile_t *fp, int i)
case DTYPE_MQUEUE:
case DTYPE_SEM:
if (checkfile == 0)
- misctrans(file);
+ misctrans(file, i);
break;
default:
dprintf(unknown file type %d for file %d of pid %d,
@@ -1192,10 +1195,10 @@ bad:
}
static void
-misctrans(struct file *file)
+misctrans(struct file *file, int i)
{
- PREFIX((int)file-f_type);
+ PREFIX(i);
pmisc(file, dtypes[file-f_type]);
}
CVS commit: src/sys/miscfs/procfs
Module Name:src Committed By: christos Date: Sun Nov 25 01:03:06 UTC 2012 Modified Files: src/sys/miscfs/procfs: procfs_subr.c procfs_vnops.c Log Message: do something reasonable with kernel semaphores. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/miscfs/procfs/procfs_subr.c cvs rdiff -u -r1.184 -r1.185 src/sys/miscfs/procfs/procfs_vnops.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/miscfs/procfs/procfs_subr.c diff -u src/sys/miscfs/procfs/procfs_subr.c:1.101 src/sys/miscfs/procfs/procfs_subr.c:1.102 --- src/sys/miscfs/procfs/procfs_subr.c:1.101 Mon May 28 09:16:10 2012 +++ src/sys/miscfs/procfs/procfs_subr.c Sat Nov 24 20:03:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_subr.c,v 1.101 2012/05/28 13:16:10 christos Exp $ */ +/* $NetBSD: procfs_subr.c,v 1.102 2012/11/25 01:03:05 christos Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -102,7 +102,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: procfs_subr.c,v 1.101 2012/05/28 13:16:10 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: procfs_subr.c,v 1.102 2012/11/25 01:03:05 christos Exp $); #include sys/param.h #include sys/systm.h @@ -253,6 +253,7 @@ procfs_allocvp(struct mount *mp, struct break; case DTYPE_KQUEUE: case DTYPE_MISC: + case DTYPE_SEM: symlink: pfs-pfs_mode = S_IRUSR|S_IXUSR|S_IRGRP| S_IXGRP|S_IROTH|S_IXOTH; Index: src/sys/miscfs/procfs/procfs_vnops.c diff -u src/sys/miscfs/procfs/procfs_vnops.c:1.184 src/sys/miscfs/procfs/procfs_vnops.c:1.185 --- src/sys/miscfs/procfs/procfs_vnops.c:1.184 Mon May 28 09:16:10 2012 +++ src/sys/miscfs/procfs/procfs_vnops.c Sat Nov 24 20:03:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_vnops.c,v 1.184 2012/05/28 13:16:10 christos Exp $ */ +/* $NetBSD: procfs_vnops.c,v 1.185 2012/11/25 01:03:05 christos Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -105,7 +105,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: procfs_vnops.c,v 1.184 2012/05/28 13:16:10 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: procfs_vnops.c,v 1.185 2012/11/25 01:03:05 christos Exp $); #include sys/param.h #include sys/systm.h @@ -1702,6 +1702,10 @@ procfs_readlink(void *v) len = snprintf(bf, sizeof(bf), %s, [kqueue]); break; + case DTYPE_SEM: + len = snprintf(bf, sizeof(bf), %s, [ksem]); + break; + default: error = EINVAL; break;
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sun Nov 25 01:05:04 UTC 2012
Modified Files:
src/sys/kern: uipc_sem.c
src/sys/sys: ksem.h
Log Message:
expose ksem_t for fstat(8), and implement stat for future reference.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/kern/uipc_sem.c
cvs rdiff -u -r1.13 -r1.14 src/sys/sys/ksem.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/kern/uipc_sem.c
diff -u src/sys/kern/uipc_sem.c:1.38 src/sys/kern/uipc_sem.c:1.39
--- src/sys/kern/uipc_sem.c:1.38 Tue Mar 13 14:40:55 2012
+++ src/sys/kern/uipc_sem.c Sat Nov 24 20:05:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_sem.c,v 1.38 2012/03/13 18:40:55 elad Exp $ */
+/* $NetBSD: uipc_sem.c,v 1.39 2012/11/25 01:05:04 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_sem.c,v 1.38 2012/03/13 18:40:55 elad Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_sem.c,v 1.39 2012/11/25 01:05:04 christos Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -88,21 +88,6 @@ MODULE(MODULE_CLASS_MISC, ksem, NULL);
#define KS_UNLINKED 0x01
-typedef struct ksem {
- LIST_ENTRY(ksem) ks_entry; /* global list entry */
- kmutex_t ks_lock; /* lock on this ksem */
- kcondvar_t ks_cv; /* condition variable */
- u_int ks_ref; /* number of references */
- u_int ks_value; /* current value */
- u_int ks_waiters; /* number of waiters */
- char * ks_name; /* name, if named */
- size_t ks_namelen; /* length of name */
- int ks_flags; /* for KS_UNLINKED */
- mode_t ks_mode; /* protection bits */
- uid_t ks_uid; /* creator uid */
- gid_t ks_gid; /* creator gid */
-} ksem_t;
-
static kmutex_t ksem_lock __cacheline_aligned;
static LIST_HEAD(,ksem) ksem_head __cacheline_aligned;
static u_int nsems_total __cacheline_aligned;
@@ -114,14 +99,17 @@ static int ksem_sysinit(void);
static int ksem_sysfini(bool);
static int ksem_modcmd(modcmd_t, void *);
static int ksem_close_fop(file_t *);
+static int ksem_stat_fop(file_t *, struct stat *);
+static int ksem_read_fop(file_t *, off_t *, struct uio *,
+kauth_cred_t, int);
static const struct fileops semops = {
- .fo_read = fbadop_read,
+ .fo_read = ksem_read_fop,
.fo_write = fbadop_write,
.fo_ioctl = fbadop_ioctl,
.fo_fcntl = fnullop_fcntl,
.fo_poll = fnullop_poll,
- .fo_stat = fbadop_stat,
+ .fo_stat = ksem_stat_fop,
.fo_close = ksem_close_fop,
.fo_kqfilter = fnullop_kqfilter,
.fo_restart = fnullop_restart,
@@ -536,6 +524,53 @@ sys__ksem_close(struct lwp *l, const str
}
static int
+ksem_read_fop(file_t *fp, off_t *offset, struct uio *uio, kauth_cred_t cred,
+int flags)
+{
+ size_t len;
+ char *name;
+ ksem_t *ks = fp-f_data;
+
+ mutex_enter(ks-ks_lock);
+ len = ks-ks_namelen;
+ name = ks-ks_name;
+ mutex_exit(ks-ks_lock);
+ if (name == NULL || len == 0)
+ return 0;
+ return uiomove(name, len, uio);
+}
+
+static int
+ksem_stat_fop(file_t *fp, struct stat *ub)
+{
+ ksem_t *ks = fp-f_data;
+
+ mutex_enter(ks-ks_lock);
+
+ memset(ub, 0, sizeof(*ub));
+
+ ub-st_mode = ks-ks_mode | ((ks-ks_name ks-ks_namelen)
+ ? _S_IFLNK : _S_IFREG);
+ ub-st_uid = ks-ks_uid;
+ ub-st_gid = ks-ks_gid;
+ ub-st_size = ks-ks_value;
+ ub-st_blocks = (ub-st_size) ? 1 : 0;
+ ub-st_nlink = ks-ks_ref;
+ ub-st_blksize = 4096;
+
+ nanotime(ub-st_atimespec);
+ ub-st_mtimespec = ub-st_ctimespec = ub-st_birthtimespec =
+ ub-st_atimespec;
+
+ /*
+ * Left as 0: st_dev, st_ino, st_rdev, st_flags, st_gen.
+ * XXX (st_dev, st_ino) should be unique.
+ */
+ mutex_exit(ks-ks_lock);
+ return 0;
+}
+
+static int
ksem_close_fop(file_t *fp)
{
ksem_t *ks = fp-f_data;
Index: src/sys/sys/ksem.h
diff -u src/sys/sys/ksem.h:1.13 src/sys/sys/ksem.h:1.14
--- src/sys/sys/ksem.h:1.13 Sat Mar 10 16:52:00 2012
+++ src/sys/sys/ksem.h Sat Nov 24 20:05:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ksem.h,v 1.13 2012/03/10 21:52:00 joerg Exp $ */
+/* $NetBSD: ksem.h,v 1.14 2012/11/25 01:05:04 christos Exp $ */
/*
* Copyright (c) 2002 Alfred Perlstein alf...@freebsd.org
@@ -36,6 +36,21 @@ struct timespec;
#ifdef _KERNEL
#define KSEM_MAX 128
+typedef struct ksem {
+ LIST_ENTRY(ksem) ks_entry; /* global list entry */
+ kmutex_t ks_lock; /* lock on this ksem */
+ kcondvar_t ks_cv; /* condition variable */
+ u_int ks_ref; /* number of references */
+ u_int ks_value; /* current value */
+ u_int ks_waiters; /* number of waiters */
+ char * ks_name; /* name, if named */
+ size_t ks_namelen; /* length of name */
+ int ks_flags; /* for KS_UNLINKED */
+ mode_t ks_mode; /* protection bits */
+ uid_t ks_uid; /* creator uid */
+ gid_t ks_gid; /* creator gid */
+} ksem_t;
+
int do_ksem_init(struct lwp *, unsigned int, intptr_t *, copyout_t);
int do_ksem_open(struct lwp *, const char *, int, mode_t, unsigned int,
intptr_t *,
CVS commit: src/usr.bin/fstat
Module Name:src
Committed By: christos
Date: Sun Nov 25 01:05:49 UTC 2012
Modified Files:
src/usr.bin/fstat: misc.c
Log Message:
return stuff for ksem
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/fstat/misc.c
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/fstat/misc.c
diff -u src/usr.bin/fstat/misc.c:1.9 src/usr.bin/fstat/misc.c:1.10
--- src/usr.bin/fstat/misc.c:1.9 Sat Oct 27 18:38:07 2012
+++ src/usr.bin/fstat/misc.c Sat Nov 24 20:05:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.9 2012/10/27 22:38:07 alnsn Exp $ */
+/* $NetBSD: misc.c,v 1.10 2012/11/25 01:05:49 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: misc.c,v 1.9 2012/10/27 22:38:07 alnsn Exp $);
+__RCSID($NetBSD: misc.c,v 1.10 2012/11/25 01:05:49 christos Exp $);
#define _KMEMUSER
#include stdbool.h
@@ -48,6 +48,8 @@ __RCSID($NetBSD: misc.c,v 1.9 2012/10/2
#include sys/proc.h
#define _KERNEL
#include sys/file.h
+#define copyout_t int
+#include sys/ksem.h
#undef _KERNEL
#include sys/vnode.h
#include sys/mount.h
@@ -55,6 +57,7 @@ __RCSID($NetBSD: misc.c,v 1.9 2012/10/2
#include net/bpfdesc.h
#include err.h
+#include string.h
#include kvm.h
#include fstat.h
@@ -105,7 +108,7 @@ p_bpf(struct file *f)
{
struct bpf_d bpf;
- if (!KVM_READ(f-f_data, bpf, sizeof (bpf))) {
+ if (!KVM_READ(f-f_data, bpf, sizeof(bpf))) {
dprintf(can't read bpf at %p for pid %d, f-f_data, Pid);
return 0;
}
@@ -133,11 +136,39 @@ p_bpf(struct file *f)
}
static int
+p_sem(struct file *f)
+{
+ ksem_t ks;
+ if (!KVM_READ(f-f_data, ks, sizeof(ks))) {
+ dprintf(can't read sem at %p for pid %d, f-f_data, Pid);
+ return 0;
+ }
+ (void)printf(* ksem ref=%u, value=%u, waiters=%u, flags=0x%x,
+ mode=%o, uid=%u, gid=%u, ks.ks_ref, ks.ks_value, ks.ks_waiters,
+ ks.ks_flags, ks.ks_mode, ks.ks_uid, ks.ks_gid);
+ if (ks.ks_name ks.ks_namelen) {
+ char buf[64];
+ if (ks.ks_namelen = sizeof(buf))
+ ks.ks_namelen = sizeof(buf) - 1;
+ if (!KVM_READ(ks.ks_name, buf, ks.ks_namelen)) {
+ dprintf(can't read sem name at %p for pid %d,
+ ks.ks_name, Pid);
+ } else {
+ buf[ks.ks_namelen] = '\0';
+ (void)printf(, name=%s\n, buf);
+ return 0;
+ }
+ }
+ (void)printf(\n);
+ return 0;
+}
+
+static int
p_mqueue(struct file *f)
{
struct mqueue mq;
- if (!KVM_READ(f-f_data, mq, sizeof (mq))) {
+ if (!KVM_READ(f-f_data, mq, sizeof(mq))) {
dprintf(can't read mqueue at %p for pid %d, f-f_data, Pid);
return 0;
}
@@ -150,7 +181,7 @@ p_kqueue(struct file *f)
{
struct kqueue kq;
- if (!KVM_READ(f-f_data, kq, sizeof (kq))) {
+ if (!KVM_READ(f-f_data, kq, sizeof(kq))) {
dprintf(can't read kqueue at %p for pid %d, f-f_data, Pid);
return 0;
}
@@ -167,8 +198,17 @@ pmisc(struct file *f, const char *name)
if ((n = KVM_NLIST(nl)) == -1)
errx(1, Cannot list kernel symbols (%s),
KVM_GETERR());
- else if (n != 0 vflg)
- warnx(Could not find %d symbols, n);
+ else if (n != 0 vflg) {
+ char buf[1024];
+ buf[0] = '\0';
+ for (struct nlist *l = nl; l-n_name != NULL; l++) {
+if (l-n_value != 0)
+ continue;
+strlcat(buf, , , sizeof(buf));
+strlcat(buf, l-n_name, sizeof(buf));
+ }
+ warnx(Could not find %d symbols: %s, n, buf + 2);
+ }
}
for (i = 0; i NL_MAX; i++)
if ((uintptr_t)f-f_ops == nl[i].n_value)
@@ -180,6 +220,8 @@ pmisc(struct file *f, const char *name)
return p_mqueue(f);
case NL_KQUEUE:
return p_kqueue(f);
+ case NL_SEM:
+ return p_sem(f);
case NL_TAP:
printf(* tap %lu\n, (unsigned long)(intptr_t)f-f_data);
return 0;
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: christos Date: Sun Nov 25 01:10:37 UTC 2012 Modified Files: src/sys/arch/powerpc/include: asm.h Log Message: provide _ENTRY(x) because some code needs it. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/powerpc/include/asm.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/powerpc/include/asm.h diff -u src/sys/arch/powerpc/include/asm.h:1.39 src/sys/arch/powerpc/include/asm.h:1.40 --- src/sys/arch/powerpc/include/asm.h:1.39 Tue Oct 25 21:46:11 2011 +++ src/sys/arch/powerpc/include/asm.h Sat Nov 24 20:10:37 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.39 2011/10/26 01:46:11 christos Exp $ */ +/* $NetBSD: asm.h,v 1.40 2012/11/25 01:10:37 christos Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -106,7 +106,7 @@ # define SF_LR 16 # define SF_PARAM SF_HEADER_SZ -# define ENTRY(y) \ +# define _ENTRY(y) \ .globl y; \ .section .opd,aw; \ .align 3; \ @@ -118,6 +118,8 @@ y: .quad .y,.TOC.@tocbase,0; \ .align 3; \ .y: +# define ENTRY(y) _ENTRY(y) + # define END(y) # define CALL(y) \
CVS commit: src/sys/arch/x68k/stand/libsa
Module Name:src Committed By: isaki Date: Sun Nov 25 04:07:00 UTC 2012 Modified Files: src/sys/arch/x68k/stand/libsa: putimage.S Log Message: Make the end of image address absolute-long. It allows to locate the end of image higher than 0x1. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/libsa/putimage.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x68k/stand/libsa/putimage.S diff -u src/sys/arch/x68k/stand/libsa/putimage.S:1.4 src/sys/arch/x68k/stand/libsa/putimage.S:1.5 --- src/sys/arch/x68k/stand/libsa/putimage.S:1.4 Mon Feb 21 02:31:59 2011 +++ src/sys/arch/x68k/stand/libsa/putimage.S Sun Nov 25 04:06:59 2012 @@ -1,7 +1,7 @@ | file: putimage.S | author: ITOH Yasufumi | -| $NetBSD: putimage.S,v 1.4 2011/02/21 02:31:59 itohy Exp $ +| $NetBSD: putimage.S,v 1.5 2012/11/25 04:06:59 isaki Exp $ #include machine/asm.h #include iocscall.h @@ -21,7 +21,7 @@ ENTRY_NOPROFILE(put_image) movel %a1@+,%a4@+ lea %pc@(img_title),%a2 - moveaw %a2@+,%a3 | only the lower word is valid + moveal %a2@+,%a3 1: tstb %a2@+ | skip human readable comment jne 1b @@ -98,7 +98,7 @@ Lrxabort: moveml %sp@+,%d2-%d7/%a2-%a4 rts img_title: - .word imgend1 + .long imgend1 | compressed image data | BSD Daemon Image, used for NetBSD boot by permission.
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: cherry
Date: Sun Nov 25 07:48:47 UTC 2012
Modified Files:
src/sys/arch/xen/xen: evtchn.c
Log Message:
hypervisor_set_ipending() should not set the pending flag across cpus. The
reason for this is that the pending flag update is not atomic, or protected by
a lock. Since its current (mis)use in evtchn_do_event() across cpus is to
notify the remote cpu of an interrupt, we use hypervisor_send_event() instead,
to trigger an event on the remote cpu, which in turn invokes evtchn_do_event()
on that cpu and DTRT on it.
On the local cpu, we protect hypervisor_set_ipending() from re-entry via cli().
Remove a redundant and unprotected call to hypervisor_set_ipending().
Thanks to jym@ for spotting this discrepancy while reviewing a related patch.
See: http://mail-index.netbsd.org/tech-kern/2012/11/12/msg014374.html
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/xen/xen/evtchn.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/xen/xen/evtchn.c
diff -u src/sys/arch/xen/xen/evtchn.c:1.62 src/sys/arch/xen/xen/evtchn.c:1.63
--- src/sys/arch/xen/xen/evtchn.c:1.62 Sun Feb 12 14:24:08 2012
+++ src/sys/arch/xen/xen/evtchn.c Sun Nov 25 07:48:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.c,v 1.62 2012/02/12 14:24:08 jym Exp $ */
+/* $NetBSD: evtchn.c,v 1.63 2012/11/25 07:48:46 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -54,7 +54,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1.62 2012/02/12 14:24:08 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1.63 2012/11/25 07:48:46 cherry Exp $);
#include opt_xen.h
#include isa.h
@@ -298,15 +298,12 @@ evtchn_do_event(int evtch, struct intrfr
ih = evtsource[evtch]-ev_handlers;
while (ih != NULL) {
if (ih-ih_cpu != ci) {
- hypervisor_set_ipending(ih-ih_cpu, 1 ih-ih_level,
- evtch LONG_SHIFT, evtch LONG_MASK);
+ hypervisor_send_event(ih-ih_cpu, evtch);
iplmask = ~IUNMASK(ci, ih-ih_level);
ih = ih-ih_evt_next;
continue;
}
if (ih-ih_level = ilevel) {
- hypervisor_set_ipending(ih-ih_cpu, iplmask,
- evtch LONG_SHIFT, evtch LONG_MASK);
#ifdef IRQ_DEBUG
if (evtch == IRQ_DEBUG)
printf(ih-ih_level %d = ilevel %d\n, ih-ih_level, ilevel);
CVS commit: src/gnu/dist/gcc4/libcpp
Module Name:src Committed By: apb Date: Sat Nov 24 09:07:44 UTC 2012 Modified Files: src/gnu/dist/gcc4/libcpp: init.c macro.c src/gnu/dist/gcc4/libcpp/include: cpplib.h Log Message: Teach gcc4.1's cpp about the magic __COUNTER__ macro, which returns a unique integer each time it is expanded. This code was written without reference to any other implementation of the same feature. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gcc4/libcpp/init.c cvs rdiff -u -r1.3 -r1.4 src/gnu/dist/gcc4/libcpp/macro.c cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gcc4/libcpp/include/cpplib.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: alnsn Date: Sat Nov 24 14:00:36 UTC 2012 Modified Files: src/distrib/sets/lists/comp: md.evbmips src/share/mk: bsd.own.mk src/sys/arch/evbmips/include: Makefile Added Files: src/sys/arch/evbmips/include: sljitarch.h Log Message: Add sljit and bpfjit to evbmips. Not enabled by default. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/comp/md.evbmips cvs rdiff -u -r1.714 -r1.715 src/share/mk/bsd.own.mk cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbmips/include/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/include/sljitarch.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: christos Date: Sat Nov 24 15:05:46 UTC 2012 Modified Files: src/tests/lib/libc/sys: t_kevent.c Log Message: Add a test for adding an event to an unsupported fd. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sys/t_kevent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Sat Nov 24 15:07:44 UTC 2012 Modified Files: src/sys/kern: kern_descrip.c Log Message: Return EOPNOTSUPP for fnullop_kqfilter to prevent registration of unsupported fds. XXX: We should really fix the fd's to be supported in the future. Unsupported fd's have a NULL f_event, so registering crashes the kernel with a NULL function dereference of f_event. To generate a diff of this commit: cvs rdiff -u -r1.218 -r1.219 src/sys/kern/kern_descrip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Sat Nov 24 15:14:32 UTC 2012 Modified Files: src/sys/kern: kern_event.c Log Message: - initialize kn_id - in close, invalidate f_data and f_type early to prevent accidental re-use - add a DIAGNOSTIC for when we use unsupported fd's and a KASSERT for f_event being NULL. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/kern/kern_event.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: christos Date: Sat Nov 24 15:16:52 UTC 2012 Modified Files: src/lib/libc/sys: kqueue.2 Log Message: mention that kevent returns now EOPNOTSUPP. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/lib/libc/sys/kqueue.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/powerpc64/gen
Module Name:src Committed By: christos Date: Sat Nov 24 15:20:58 UTC 2012 Modified Files: src/lib/libc/arch/powerpc64/gen: _lwp.c Log Message: fix lint. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/powerpc64/gen/_lwp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/dev/marvell
Module Name:src Committed By: jdc Date: Sat Nov 24 18:10:10 UTC 2012 Modified Files: src/sys/dev/marvell [netbsd-6]: mvgbereg.h Log Message: Apply patch from msaitoh to fix pullup-6 #671. To generate a diff of this commit: cvs rdiff -u -r1.3.10.1 -r1.3.10.2 src/sys/dev/marvell/mvgbereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: jdc Date: Sat Nov 24 18:15:22 UTC 2012 Modified Files: src/common/lib/libc/gen [netbsd-6]: ptree.c src/sys/sys [netbsd-6]: ptree.h Log Message: Pull up revisions: src/common/lib/libc/gen/ptree.c revision 1.10 src/sys/sys/ptree.h revision 1.8 (requested by rmind in ticket #717). Add a ptree_mask_node_p to determine if an item is a mask node, and what its non-mask length is. To generate a diff of this commit: cvs rdiff -u -r1.5.8.2 -r1.5.8.3 src/common/lib/libc/gen/ptree.c cvs rdiff -u -r1.4.8.2 -r1.4.8.3 src/sys/sys/ptree.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpkern/arch/powerpc
Module Name:src Committed By: pgoyette Date: Sat Nov 24 18:16:16 UTC 2012 Modified Files: src/sys/rump/librump/rumpkern/arch/powerpc: Makefile.inc Log Message: File is common between pp6 and ppc64 ports, so define ARCH_ELFSIZE accordingly. From christos@, resolves the latest build break To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/sys/rump/librump/rumpkern/arch/powerpc/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: jdc Date: Sat Nov 24 19:02:10 UTC 2012 Modified Files: src/doc [netbsd-6]: HACKS src/lib/libc/softfloat [netbsd-6]: Makefile.inc Log Message: Pull up revisions: src/lib/libc/softfloat/Makefile.inc 1.11-1.12 via patch src/doc/HACKS 1.124 via patch (requested by msaitoh in ticket #703). For arm, add -fno-tree-vrp to COPTS when compiling softfloat.c. Without -fno-tree-vrp, -INF + -INF returns 0 by adddf3. Fixes PR#46953. To generate a diff of this commit: cvs rdiff -u -r1.122.2.1 -r1.122.2.2 src/doc/HACKS cvs rdiff -u -r1.10 -r1.10.4.1 src/lib/libc/softfloat/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: jdc Date: Sat Nov 24 19:02:14 UTC 2012 Modified Files: src/doc [netbsd-6-0]: HACKS src/lib/libc/softfloat [netbsd-6-0]: Makefile.inc Log Message: Pull up revisions: src/lib/libc/softfloat/Makefile.inc 1.11-1.12 via patch src/doc/HACKS 1.124 via patch (requested by msaitoh in ticket #703). For arm, add -fno-tree-vrp to COPTS when compiling softfloat.c. Without -fno-tree-vrp, -INF + -INF returns 0 by adddf3. Fixes PR#46953. To generate a diff of this commit: cvs rdiff -u -r1.122.2.1 -r1.122.2.1.4.1 src/doc/HACKS cvs rdiff -u -r1.10 -r1.10.10.1 src/lib/libc/softfloat/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/arch/arm/broadcom
Module Name:src Committed By: jdc Date: Sat Nov 24 19:14:49 UTC 2012 Modified Files: src/sys/arch/arm/broadcom [netbsd-6]: bcm2835_tmr.c Log Message: Pull up revision 1.2 (requested by skrll in ticket #704). Fix delay. To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/broadcom/bcm2835_tmr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: jdc Date: Sat Nov 24 19:22:17 UTC 2012 Modified Files: src/distrib/x68k/floppies/ramdisk [netbsd-6]: Makefile src/sys/arch/x68k/conf [netbsd-6]: INSTALL Log Message: Pull up revisions: src/distrib/x68k/floppies/ramdisk/Makefile revision 1.41 src/sys/arch/x68k/conf/INSTALL revision 1.96 (requested by tsutsui in ticket #705). - add dhcpcd support to x68k install ramdisk - enable bpf(4) in INSTALL kernel for dhcpcd - bump ramdisk size from 1400k to 1440k No objection on port-x68k. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.8.1 src/distrib/x68k/floppies/ramdisk/Makefile cvs rdiff -u -r1.94 -r1.94.2.1 src/sys/arch/x68k/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/distrib/utils/sysinst
Module Name:src Committed By: jdc Date: Sat Nov 24 19:32:28 UTC 2012 Modified Files: src/distrib/utils/sysinst [netbsd-6]: disks.c Log Message: Pull up revision 1.127 (requested by tsutsui in ticket #706). Don't show a disk which is mounted as root partition in the Available disks list during sysinst procedure to prevent users from shooting their foot in case of installation using install-image on a USB stick. Per suggestion in PR/47195. To generate a diff of this commit: cvs rdiff -u -r1.123.2.2 -r1.123.2.3 src/distrib/utils/sysinst/disks.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Sat Nov 24 19:36:35 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 671 (update), 703-706, 717. To generate a diff of this commit: cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-6.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: jdc Date: Sat Nov 24 19:36:47 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 703 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-6.0.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: nakayama Date: Sat Nov 24 19:48:25 UTC 2012 Modified Files: src/sys/fs/smbfs: smbfs_smb.c src/sys/netsmb: smb_smb.c Log Message: - fix endian cofusion around FID, which is used as is, so no need to do byte swapping. - put right value to ByteCount of SMB_COM_NT_CREATE_ANDX request. The fix makes smbfs actually works on big-endian port. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/fs/smbfs/smbfs_smb.c cvs rdiff -u -r1.32 -r1.33 src/sys/netsmb/smb_smb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sat Nov 24 19:58:05 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Ticket 668. To generate a diff of this commit: cvs rdiff -u -r1.1.2.42 -r1.1.2.43 src/doc/CHANGES-6.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/distrib/x68k/cdroms/installcd
Module Name:src Committed By: jdc Date: Sat Nov 24 20:29:49 UTC 2012 Modified Files: src/distrib/x68k/cdroms/installcd [netbsd-6]: Makefile Log Message: Pull up revisions: src/distrib/x68k/cdroms/installcd/Makefile revisions 1.2,1.3 (requested by tsutsui in ticket #708). The x68k installcd is now bootable. Use CDBUILDEXTRA to copy secondary bootloader into target CD iso image. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.40.1 src/distrib/x68k/cdroms/installcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/distrib/x68k/floppies/bootfloppy.sysinst
Module Name:src Committed By: jdc Date: Sat Nov 24 20:34:13 UTC 2012 Modified Files: src/distrib/x68k/floppies/bootfloppy.sysinst [netbsd-6]: Makefile Log Message: Pull up revision 1.13 (requested by tsutsui in ticket #709). FLOPPYPAD=1 for padding floppies. On XM6i (emulator), the floppy format type of plain image is decided by filesize, so it makes easy to use the image on XM6i. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.58.1 \ src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/distrib/notes/common
Module Name:src Committed By: jdc Date: Sat Nov 24 20:38:08 UTC 2012 Modified Files: src/distrib/notes/common [netbsd-6]: postinstall Log Message: Pull up revision 1.75 (requested by tsutsui in ticket #710). Most contents in ftp://ftp.NetBSD.org/pub/NetBSD/packages/ seem removed recently (do we have any announcment?) so update pakcages URLs and descriptions accordingly. To generate a diff of this commit: cvs rdiff -u -r1.74.8.1 -r1.74.8.2 src/distrib/notes/common/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/distrib/notes/common
Module Name:src Committed By: jdc Date: Sat Nov 24 20:41:14 UTC 2012 Modified Files: src/distrib/notes/common [netbsd-6-0]: postinstall Log Message: Pull up revision 1.75 (requested by tsutsui in ticket #710). Most contents in ftp://ftp.NetBSD.org/pub/NetBSD/packages/ seem removed recently (do we have any announcment?) so update pakcages URLs and descriptions accordingly. To generate a diff of this commit: cvs rdiff -u -r1.74.8.1 -r1.74.8.1.4.1 src/distrib/notes/common/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sbin/mount_msdos
Module Name:src Committed By: jdc Date: Sat Nov 24 20:43:16 UTC 2012 Modified Files: src/sbin/mount_msdos [netbsd-6]: mount_msdos.8 Log Message: Pull up revisions: src/sbin/mount_msdos/mount_msdos.8 revisions 1.35,1.36 (requested by tsutsui in ticket #711). Remove the bit about empty DOS file systems assumed to have short names by default; jmcneill changed this back in Jan 2009, but missed this text. Note mount_msdos -G option also allows mounting X680x0's Human68k floppies. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.34.4.1 src/sbin/mount_msdos/mount_msdos.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/sbin/mount_msdos
Module Name:src Committed By: jdc Date: Sat Nov 24 20:45:39 UTC 2012 Modified Files: src/sbin/mount_msdos [netbsd-6-0]: mount_msdos.8 Log Message: Pull up revisions: src/sbin/mount_msdos/mount_msdos.8 revisions 1.35,1.36 (requested by tsutsui in ticket #711). Remove the bit about empty DOS file systems assumed to have short names by default; jmcneill changed this back in Jan 2009, but missed this text. Note mount_msdos -G option also allows mounting X680x0's Human68k floppies. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.34.10.1 src/sbin/mount_msdos/mount_msdos.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/kern
Module Name:src Committed By: jdc Date: Sat Nov 24 20:50:16 UTC 2012 Modified Files: src/sys/kern [netbsd-6]: kern_runq.c Log Message: Pull up revision 1.34 (requested by para in ticket #712). change sched_upreempt_pri default to 0 as discussed on tech-kern@ should improve interactive performance on SMP machines as user preemption happens immediately in x-cpu wakeup case now To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.4.1 src/sys/kern/kern_runq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/arch/arm/marvell
Module Name:src Committed By: jdc Date: Sat Nov 24 20:53:13 UTC 2012 Modified Files: src/sys/arch/arm/marvell [netbsd-6]: mvsocgpp.c Log Message: Pull up revision 1.5 (requested by msaitoh in ticket #713). Fix a uvm_fault panic that memory is not allocated for the last few GPIO bits. To generate a diff of this commit: cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/sys/arch/arm/marvell/mvsocgpp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: riastradh Date: Sat Nov 24 20:56:39 UTC 2012 Modified Files: src/sys/dev/acpi: thinkpad_acpi.c Log Message: Match LEN0068 in thinkpad(4) too, as newer Thinkpads report. Tested on a W530. Lots of stuff is missing, though. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/dev/acpi/thinkpad_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/kern
Module Name:src Committed By: jdc Date: Sat Nov 24 20:58:00 UTC 2012 Modified Files: src/sys/kern [netbsd-6]: subr_cprng.c Log Message: Pull up revision 1.14 (requested by msaitoh in ticket #714). Pass correct wait channel string. To generate a diff of this commit: cvs rdiff -u -r1.5.2.5 -r1.5.2.6 src/sys/kern/subr_cprng.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/external/mit/expat/dist
Module Name:src Committed By: jdc Date: Sat Nov 24 21:08:47 UTC 2012 Modified Files: src/external/mit/expat/dist/lib [netbsd-6]: expat.h xmlparse.c src/external/mit/expat/dist/xmlwf [netbsd-6]: readfilemap.c Log Message: Pull up revisions: src/external/mit/expat/dist/lib/expat.h 1.1.1.2 via patch src/external/mit/expat/dist/lib/xmlparse.c 1.1.1.2 via patch src/external/mit/expat/dist/xmlwf/readfilemap.c 1.1.1.2 via patch (requested by spz in ticket #715) import of expat 2.1.0 Fixes CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security issues have been previously fixed in our tree) To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 src/external/mit/expat/dist/lib/expat.h cvs rdiff -u -r1.2 -r1.2.2.1 src/external/mit/expat/dist/lib/xmlparse.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \ src/external/mit/expat/dist/xmlwf/readfilemap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/external/mit/expat/dist
Module Name:src Committed By: jdc Date: Sat Nov 24 21:09:41 UTC 2012 Modified Files: src/external/mit/expat/dist/lib [netbsd-6-0]: expat.h xmlparse.c src/external/mit/expat/dist/xmlwf [netbsd-6-0]: readfilemap.c Log Message: Pull up revisions: src/external/mit/expat/dist/lib/expat.h 1.1.1.2 via patch src/external/mit/expat/dist/lib/xmlparse.c 1.1.1.2 via patch src/external/mit/expat/dist/xmlwf/readfilemap.c 1.1.1.2 via patch (requested by spz in ticket #715) import of expat 2.1.0 Fixes CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security issues have been previously fixed in our tree) To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 src/external/mit/expat/dist/lib/expat.h cvs rdiff -u -r1.2 -r1.2.6.1 src/external/mit/expat/dist/lib/xmlparse.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \ src/external/mit/expat/dist/xmlwf/readfilemap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/mail
Module Name:src Committed By: christos Date: Sat Nov 24 21:40:02 UTC 2012 Modified Files: src/usr.bin/mail: mime_codecs.c Log Message: PR/47237: Steffen Nurpmeso: Detect more than 2 pad characters and mark as bad. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.bin/mail/mime_codecs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: jdc Date: Sat Nov 24 21:40:03 UTC 2012 Modified Files: src/lib/libc/sys [netbsd-6]: kqueue.2 src/sys/kern [netbsd-6]: kern_descrip.c kern_event.c src/tests/lib/libc/sys [netbsd-6]: t_kevent.c Log Message: Pull up revisions: src/sys/kern/kern_event.c revision 1.79 src/sys/kern/kern_descrip.c revision 1.219 src/lib/libc/sys/kqueue.2 revision 1.33 src/tests/lib/libc/sys/t_kevent.c revision 1.2-1.5 (requested by christos in ticket #716). - initialize kn_id - in close, invalidate f_data and f_type early to prevent accidental re-use - add a DIAGNOSTIC for when we use unsupported fd's and a KASSERT for f_event being NULL. Return EOPNOTSUPP for fnullop_kqfilter to prevent registration of unsupported fds. XXX: We should really fix the fd's to be supported in the future. Unsupported fd's have a NULL f_event, so registering crashes the kernel with a NULL function dereference of f_event. mention that kevent returns now EOPNOTSUPP. Move the references to PRs from code comments to the test description. Once ATF has the ability to output the metadata in the HTML reports, it should be easy to traverse between releng and gnats -reports via links. Add a (skipped for now) test case for PR 46463 adapt to new reality Add a test for adding an event to an unsupported fd. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.32.2.1 src/lib/libc/sys/kqueue.2 cvs rdiff -u -r1.218 -r1.218.2.1 src/sys/kern/kern_descrip.c cvs rdiff -u -r1.75 -r1.75.2.1 src/sys/kern/kern_event.c cvs rdiff -u -r1.1 -r1.1.2.1 src/tests/lib/libc/sys/t_kevent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: jdc Date: Sat Nov 24 21:40:08 UTC 2012 Modified Files: src/lib/libc/sys [netbsd-6-0]: kqueue.2 src/sys/kern [netbsd-6-0]: kern_descrip.c kern_event.c src/tests/lib/libc/sys [netbsd-6-0]: t_kevent.c Log Message: Pull up revisions: src/sys/kern/kern_event.c revision 1.79 src/sys/kern/kern_descrip.c revision 1.219 src/lib/libc/sys/kqueue.2 revision 1.33 src/tests/lib/libc/sys/t_kevent.c revision 1.2-1.5 (requested by christos in ticket #716). - initialize kn_id - in close, invalidate f_data and f_type early to prevent accidental re-use - add a DIAGNOSTIC for when we use unsupported fd's and a KASSERT for f_event being NULL. Return EOPNOTSUPP for fnullop_kqfilter to prevent registration of unsupported fds. XXX: We should really fix the fd's to be supported in the future. Unsupported fd's have a NULL f_event, so registering crashes the kernel with a NULL function dereference of f_event. mention that kevent returns now EOPNOTSUPP. Move the references to PRs from code comments to the test description. Once ATF has the ability to output the metadata in the HTML reports, it should be easy to traverse between releng and gnats -reports via links. Add a (skipped for now) test case for PR 46463 adapt to new reality Add a test for adding an event to an unsupported fd. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.32.8.1 src/lib/libc/sys/kqueue.2 cvs rdiff -u -r1.218 -r1.218.8.1 src/sys/kern/kern_descrip.c cvs rdiff -u -r1.75 -r1.75.6.1 src/sys/kern/kern_event.c cvs rdiff -u -r1.1 -r1.1.6.1 src/tests/lib/libc/sys/t_kevent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Sat Nov 24 21:47:28 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 707-716. To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-6.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: jdc Date: Sat Nov 24 21:47:35 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Tickets 710, 711, 715, 716. To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-6.0.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/mdocml/dist
Module Name:src Committed By: christos Date: Sat Nov 24 22:29:09 UTC 2012 Modified Files: src/external/bsd/mdocml/dist: tbl_data.c Log Message: XXX: rename data() to getdata(). This is to avoid an assembler botch on the ppc64 toolchain where function names are prefixed with a period, so data becomes .data and .data is confused by the assembler with the segment directive with the same name. Clearly this is a toolchain issue; we should be able to call functions text and data but it is simpler to fix the code rather than the toolchain. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/dist/tbl_data.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sbin/iscsid
Module Name:src Committed By: reed Date: Sun Nov 25 00:19:52 UTC 2012 Modified Files: src/sbin/iscsid [netbsd-6]: iscsid.8 Log Message: Fix simple typo. (3270 is MPLS) To generate a diff of this commit: cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/sbin/iscsid/iscsid.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/fstat
Module Name:src Committed By: christos Date: Sun Nov 25 00:36:24 UTC 2012 Modified Files: src/usr.bin/fstat: fstat.c Log Message: - add more debugging. - in misctrans() we need the file index not the file type. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/usr.bin/fstat/fstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/miscfs/procfs
Module Name:src Committed By: christos Date: Sun Nov 25 01:03:06 UTC 2012 Modified Files: src/sys/miscfs/procfs: procfs_subr.c procfs_vnops.c Log Message: do something reasonable with kernel semaphores. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/miscfs/procfs/procfs_subr.c cvs rdiff -u -r1.184 -r1.185 src/sys/miscfs/procfs/procfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Sun Nov 25 01:05:04 UTC 2012 Modified Files: src/sys/kern: uipc_sem.c src/sys/sys: ksem.h Log Message: expose ksem_t for fstat(8), and implement stat for future reference. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/kern/uipc_sem.c cvs rdiff -u -r1.13 -r1.14 src/sys/sys/ksem.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/fstat
Module Name:src Committed By: christos Date: Sun Nov 25 01:05:49 UTC 2012 Modified Files: src/usr.bin/fstat: misc.c Log Message: return stuff for ksem To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.bin/fstat/misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: christos Date: Sun Nov 25 01:10:37 UTC 2012 Modified Files: src/sys/arch/powerpc/include: asm.h Log Message: provide _ENTRY(x) because some code needs it. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/powerpc/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: cherry Date: Sun Nov 25 07:48:47 UTC 2012 Modified Files: src/sys/arch/xen/xen: evtchn.c Log Message: hypervisor_set_ipending() should not set the pending flag across cpus. The reason for this is that the pending flag update is not atomic, or protected by a lock. Since its current (mis)use in evtchn_do_event() across cpus is to notify the remote cpu of an interrupt, we use hypervisor_send_event() instead, to trigger an event on the remote cpu, which in turn invokes evtchn_do_event() on that cpu and DTRT on it. On the local cpu, we protect hypervisor_set_ipending() from re-entry via cli(). Remove a redundant and unprotected call to hypervisor_set_ipending(). Thanks to jym@ for spotting this discrepancy while reviewing a related patch. See: http://mail-index.netbsd.org/tech-kern/2012/11/12/msg014374.html To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/xen/xen/evtchn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
