CVS commit: [netbsd-5] src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Fri Aug 8 06:50:12 UTC 2014
Modified Files:
src/sys/dev/pckbport [netbsd-5]: wskbdmap_mfii.c
src/sys/dev/usb [netbsd-5]: ukbdmap.c
Log Message:
Pull up following revision(s) (requested by mbalmer in ticket #1915):
sys/dev/usb/ukbdmap.c: revision 1.29
sys/dev/pckbport/wskbdmap_mfii.c: revision 1.25
Add a belgian keyboard layout, based on the french keyboard layout.
Fixes PR install/46871.
To generate a diff of this commit:
cvs rdiff -u -r1.15.8.5 -r1.15.8.6 src/sys/dev/pckbport/wskbdmap_mfii.c
cvs rdiff -u -r1.20.8.2 -r1.20.8.3 src/sys/dev/usb/ukbdmap.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/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.5 src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.6
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.5 Sun Nov 15 06:03:59 2009
+++ src/sys/dev/pckbport/wskbdmap_mfii.c Fri Aug 8 06:50:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_mfii.c,v 1.15.8.5 2009/11/15 06:03:59 snj Exp $ */
+/* $NetBSD: wskbdmap_mfii.c,v 1.15.8.6 2014/08/08 06:50:12 msaitoh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.15.8.5 2009/11/15 06:03:59 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.15.8.6 2014/08/08 06:50:12 msaitoh Exp $);
#include opt_wskbdmap.h
#include sys/types.h
@@ -364,6 +364,28 @@ static const keysym_t pckbd_keydesc_fr[]
KC(184), KS_Mode_switch, KS_Multi_key,
};
+static const keysym_t pckbd_keydesc_be[] = {
+/* pos normal shifted altgr shift-altgr */
+KC(2), KS_ampersand, KS_1, KS_bar,
+KC(3), KS_eacute, KS_2, KS_at,
+KC(5), KS_apostrophe, KS_4,
+KC(6), KS_parenleft, KS_5,
+KC(7), KS_section, KS_6, KS_asciicircum,
+KC(8), KS_egrave, KS_7,
+KC(9), KS_exclam, KS_8,
+KC(10), KS_ccedilla, KS_9, KS_braceleft,
+KC(11), KS_agrave, KS_0, KS_braceright,
+KC(12), KS_parenright, KS_degree,
+KC(13), KS_minus, KS_underscore,
+KC(26), KS_dead_circumflex, KS_dead_diaeresis, KS_bracketleft,
+KC(27), KS_dollar, KS_asterisk, KS_bracketright,
+KC(43), KS_mu, KS_sterling, KS_grave,
+KC(40), KS_ugrave, KS_percent, KS_acute,
+KC(41), KS_twosuperior, KS_threesuperior,
+KC(53), KS_equal, KS_plus, KS_asciitilde,
+KC(86), KS_less, KS_greater, KS_backslash,
+};
+
static const keysym_t pckbd_keydesc_it[] = {
/* pos normal shifted altgr shift-altgr */
KC(3), KS_2, KS_quotedbl, KS_twosuperior,
@@ -694,6 +716,7 @@ const struct wscons_keydesc pckbd_keydes
KBD_MAP(KB_SF, KB_SG, pckbd_keydesc_sf),
KBD_MAP(KB_SF | KB_NODEAD, KB_SF, pckbd_keydesc_sg_nodead),
KBD_MAP(KB_FR, KB_US, pckbd_keydesc_fr),
+ KBD_MAP(KB_BE, KB_FR, pckbd_keydesc_be),
KBD_MAP(KB_DK, KB_US, pckbd_keydesc_dk),
KBD_MAP(KB_DK | KB_NODEAD, KB_DK, pckbd_keydesc_dk_nodead),
KBD_MAP(KB_IT, KB_US, pckbd_keydesc_it),
Index: src/sys/dev/usb/ukbdmap.c
diff -u src/sys/dev/usb/ukbdmap.c:1.20.8.2 src/sys/dev/usb/ukbdmap.c:1.20.8.3
--- src/sys/dev/usb/ukbdmap.c:1.20.8.2 Sun Nov 21 02:38:07 2010
+++ src/sys/dev/usb/ukbdmap.c Fri Aug 8 06:50:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbdmap.c,v 1.20.8.2 2010/11/21 02:38:07 riz Exp $ */
+/* $NetBSD: ukbdmap.c,v 1.20.8.3 2014/08/08 06:50:12 msaitoh Exp $ */
/*
* Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbdmap.c,v 1.20.8.2 2010/11/21 02:38:07 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbdmap.c,v 1.20.8.3 2014/08/08 06:50:12 msaitoh Exp $);
#include sys/types.h
#include dev/wscons/wsksymdef.h
@@ -415,6 +415,28 @@ Static const keysym_t ukbd_keydesc_fr[]
KC(230), KS_Mode_switch, KS_Multi_key,
};
+Static const keysym_t ukbd_keydesc_be[] = {
+/* pos normal shifted altgr shift-altgr */
+KC(30), KS_ampersand, KS_1, KS_bar,
+KC(31), KS_eacute, KS_2, KS_at,
+KC(33), KS_apostrophe, KS_4,
+KC(34), KS_parenleft, KS_5,
+KC(35), KS_section, KS_6, KS_asciicircum,
+KC(36), KS_egrave, KS_7,
+KC(37), KS_exclam, KS_8,
+KC(38), KS_ccedilla, KS_9, KS_braceleft,
+KC(39), KS_agrave, KS_0, KS_braceright,
+KC(45), KS_parenright, KS_degree,
+KC(46), KS_minus, KS_underscore,
+KC(47), KS_dead_circumflex, KS_dead_diaeresis, KS_bracketleft,
+KC(48), KS_dollar, KS_asterisk, KS_bracketright,
+KC(50), KS_mu, KS_sterling, KS_grave,
+KC(52), KS_ugrave, KS_percent, KS_acute,
+KC(53), KS_twosuperior, KS_threesuperior,
+KC(56), KS_equal, KS_plus, KS_asciitilde,
+KC(100), KS_less, KS_greater, KS_backslash,
+};
+
Static const keysym_t ukbd_keydesc_it[] = {
/* pos normal
CVS commit: [netbsd-5] src/sys/compat
Module Name:src Committed By: msaitoh Date: Fri Aug 8 06:52:24 UTC 2014 Modified Files: src/sys/compat/linux/common [netbsd-5]: linux_socketcall.c src/sys/compat/linux32/common [netbsd-5]: linux32_socketcall.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1916): sys/compat/linux32/common/linux32_socketcall.c: revision 1.9 sys/compat/linux/common/linux_socketcall.c: revision 1.44 If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's not a good idea; but not proven harmful. With the help of njoly@ To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.39.6.1 src/sys/compat/linux/common/linux_socketcall.c cvs rdiff -u -r1.6 -r1.6.20.1 \ src/sys/compat/linux32/common/linux32_socketcall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/common/linux_socketcall.c diff -u src/sys/compat/linux/common/linux_socketcall.c:1.39 src/sys/compat/linux/common/linux_socketcall.c:1.39.6.1 --- src/sys/compat/linux/common/linux_socketcall.c:1.39 Thu Jul 3 14:07:09 2008 +++ src/sys/compat/linux/common/linux_socketcall.c Fri Aug 8 06:52:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $ */ +/* $NetBSD: linux_socketcall.c,v 1.39.6.1 2014/08/08 06:52:24 msaitoh Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39.6.1 2014/08/08 06:52:24 msaitoh Exp $); #include sys/param.h #include sys/kernel.h @@ -123,7 +123,7 @@ linux_sys_socketcall(struct lwp *l, cons struct linux_socketcall_dummy_args lda; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG(uap, args), lda, Index: src/sys/compat/linux32/common/linux32_socketcall.c diff -u src/sys/compat/linux32/common/linux32_socketcall.c:1.6 src/sys/compat/linux32/common/linux32_socketcall.c:1.6.20.1 --- src/sys/compat/linux32/common/linux32_socketcall.c:1.6 Thu Dec 20 23:02:58 2007 +++ src/sys/compat/linux32/common/linux32_socketcall.c Fri Aug 8 06:52:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_socketcall.c,v 1.6 2007/12/20 23:02:58 dsl Exp $ */ +/* $NetBSD: linux32_socketcall.c,v 1.6.20.1 2014/08/08 06:52:24 msaitoh Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.6 2007/12/20 23:02:58 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.6.20.1 2014/08/08 06:52:24 msaitoh Exp $); #include opt_ktrace.h #include sys/types.h @@ -95,7 +95,7 @@ linux32_sys_socketcall(struct lwp *l, co union linux32_socketcall_args ua; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG_P32(uap, args), ua,
CVS commit: [netbsd-5-1] src/sys/compat
Module Name:src Committed By: msaitoh Date: Fri Aug 8 06:56:50 UTC 2014 Modified Files: src/sys/compat/linux/common [netbsd-5-1]: linux_socketcall.c src/sys/compat/linux32/common [netbsd-5-1]: linux32_socketcall.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1916): sys/compat/linux32/common/linux32_socketcall.c: revision 1.9 sys/compat/linux/common/linux_socketcall.c: revision 1.44 If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's not a good idea; but not proven harmful. With the help of njoly@ To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.39.20.1 \ src/sys/compat/linux/common/linux_socketcall.c cvs rdiff -u -r1.6 -r1.6.26.1 \ src/sys/compat/linux32/common/linux32_socketcall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/common/linux_socketcall.c diff -u src/sys/compat/linux/common/linux_socketcall.c:1.39 src/sys/compat/linux/common/linux_socketcall.c:1.39.20.1 --- src/sys/compat/linux/common/linux_socketcall.c:1.39 Thu Jul 3 14:07:09 2008 +++ src/sys/compat/linux/common/linux_socketcall.c Fri Aug 8 06:56:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $ */ +/* $NetBSD: linux_socketcall.c,v 1.39.20.1 2014/08/08 06:56:50 msaitoh Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39.20.1 2014/08/08 06:56:50 msaitoh Exp $); #include sys/param.h #include sys/kernel.h @@ -123,7 +123,7 @@ linux_sys_socketcall(struct lwp *l, cons struct linux_socketcall_dummy_args lda; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG(uap, args), lda, Index: src/sys/compat/linux32/common/linux32_socketcall.c diff -u src/sys/compat/linux32/common/linux32_socketcall.c:1.6 src/sys/compat/linux32/common/linux32_socketcall.c:1.6.26.1 --- src/sys/compat/linux32/common/linux32_socketcall.c:1.6 Thu Dec 20 23:02:58 2007 +++ src/sys/compat/linux32/common/linux32_socketcall.c Fri Aug 8 06:56:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_socketcall.c,v 1.6 2007/12/20 23:02:58 dsl Exp $ */ +/* $NetBSD: linux32_socketcall.c,v 1.6.26.1 2014/08/08 06:56:50 msaitoh Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.6 2007/12/20 23:02:58 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.6.26.1 2014/08/08 06:56:50 msaitoh Exp $); #include opt_ktrace.h #include sys/types.h @@ -95,7 +95,7 @@ linux32_sys_socketcall(struct lwp *l, co union linux32_socketcall_args ua; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG_P32(uap, args), ua,
CVS commit: [netbsd-5-2] src/sys/compat
Module Name:src Committed By: msaitoh Date: Fri Aug 8 06:56:35 UTC 2014 Modified Files: src/sys/compat/linux/common [netbsd-5-2]: linux_socketcall.c src/sys/compat/linux32/common [netbsd-5-2]: linux32_socketcall.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1916): sys/compat/linux32/common/linux32_socketcall.c: revision 1.9 sys/compat/linux/common/linux_socketcall.c: revision 1.44 If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's not a good idea; but not proven harmful. With the help of njoly@ To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.39.42.1 \ src/sys/compat/linux/common/linux_socketcall.c cvs rdiff -u -r1.6 -r1.6.30.1 \ src/sys/compat/linux32/common/linux32_socketcall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/common/linux_socketcall.c diff -u src/sys/compat/linux/common/linux_socketcall.c:1.39 src/sys/compat/linux/common/linux_socketcall.c:1.39.42.1 --- src/sys/compat/linux/common/linux_socketcall.c:1.39 Thu Jul 3 14:07:09 2008 +++ src/sys/compat/linux/common/linux_socketcall.c Fri Aug 8 06:56:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $ */ +/* $NetBSD: linux_socketcall.c,v 1.39.42.1 2014/08/08 06:56:35 msaitoh Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39 2008/07/03 14:07:09 njoly Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_socketcall.c,v 1.39.42.1 2014/08/08 06:56:35 msaitoh Exp $); #include sys/param.h #include sys/kernel.h @@ -123,7 +123,7 @@ linux_sys_socketcall(struct lwp *l, cons struct linux_socketcall_dummy_args lda; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG(uap, args), lda, Index: src/sys/compat/linux32/common/linux32_socketcall.c diff -u src/sys/compat/linux32/common/linux32_socketcall.c:1.6 src/sys/compat/linux32/common/linux32_socketcall.c:1.6.30.1 --- src/sys/compat/linux32/common/linux32_socketcall.c:1.6 Thu Dec 20 23:02:58 2007 +++ src/sys/compat/linux32/common/linux32_socketcall.c Fri Aug 8 06:56:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_socketcall.c,v 1.6 2007/12/20 23:02:58 dsl Exp $ */ +/* $NetBSD: linux32_socketcall.c,v 1.6.30.1 2014/08/08 06:56:34 msaitoh Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.6 2007/12/20 23:02:58 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: linux32_socketcall.c,v 1.6.30.1 2014/08/08 06:56:34 msaitoh Exp $); #include opt_ktrace.h #include sys/types.h @@ -95,7 +95,7 @@ linux32_sys_socketcall(struct lwp *l, co union linux32_socketcall_args ua; int error; - if (SCARG(uap, what) 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) + if (SCARG(uap, what) = 0 || SCARG(uap, what) LINUX32_MAX_SOCKETCALL) return ENOSYS; if ((error = copyin(SCARG_P32(uap, args), ua,
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 8 06:58:49 UTC 2014 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1915-1916. To generate a diff of this commit: cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-5.3 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-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.64 src/doc/CHANGES-5.3:1.1.2.65 --- src/doc/CHANGES-5.3:1.1.2.64 Mon Jul 14 09:15:07 2014 +++ src/doc/CHANGES-5.3 Fri Aug 8 06:58:49 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.64 2014/07/14 09:15:07 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.65 2014/08/08 06:58:49 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -924,3 +924,17 @@ sys/kern/sys_module.c1.15 via patch Fix a user-controlled memory allocation. [maxv, ticket #1914] + +sys/dev/pckbport/wskbdmap_mfii.c 1.25 +sys/dev/usb/ukbdmap.c1.29 + + Add a belgian keyboard layout, based on the french keyboard layout. + Fixes PR install/46871. + [mbalmer, ticket #1915] + +sys/compat/linux/common/linux_socketcall.c 1.44 +sys/compat/linux32/common/linux32_socketcall.c 1.9 + + If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's + not a good idea; but not proven harmful. With the help of njoly@. + [maxv, ticket #1916]
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 8 06:59:13 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.3 Log Message: Ticket 1916. To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-5.2.3 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-5.2.3 diff -u src/doc/CHANGES-5.2.3:1.1.2.12 src/doc/CHANGES-5.2.3:1.1.2.13 --- src/doc/CHANGES-5.2.3:1.1.2.12 Mon Jul 14 09:16:12 2014 +++ src/doc/CHANGES-5.2.3 Fri Aug 8 06:59:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.3,v 1.1.2.12 2014/07/14 09:16:12 msaitoh Exp $ +# $NetBSD: CHANGES-5.2.3,v 1.1.2.13 2014/08/08 06:59:13 msaitoh Exp $ A complete list of changes from the NetBSD 5.2.2 release to the NetBSD 5.2.3 release: @@ -189,3 +189,10 @@ sys/kern/sys_module.c1.15 via patch Fix a user-controlled memory allocation. [maxv, ticket #1914] + +sys/compat/linux/common/linux_socketcall.c 1.44 +sys/compat/linux32/common/linux32_socketcall.c 1.9 + + If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's + not a good idea; but not proven harmful. With the help of njoly@. + [maxv, ticket #1916]
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Fri Aug 8 06:59:33 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.5 Log Message: Ticket 1916. To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-5.1.5 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-5.1.5 diff -u src/doc/CHANGES-5.1.5:1.1.2.12 src/doc/CHANGES-5.1.5:1.1.2.13 --- src/doc/CHANGES-5.1.5:1.1.2.12 Mon Jul 14 09:17:04 2014 +++ src/doc/CHANGES-5.1.5 Fri Aug 8 06:59:32 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.5,v 1.1.2.12 2014/07/14 09:17:04 msaitoh Exp $ +# $NetBSD: CHANGES-5.1.5,v 1.1.2.13 2014/08/08 06:59:32 msaitoh Exp $ A complete list of changes from the NetBSD 5.1.4 release to the NetBSD 5.1.5 release: @@ -189,3 +189,10 @@ sys/kern/sys_module.c1.15 via patch Fix a user-controlled memory allocation. [maxv, ticket #1914] + +sys/compat/linux/common/linux_socketcall.c 1.44 +sys/compat/linux32/common/linux32_socketcall.c 1.9 + + If SCARG(uap, what) = 0, copyin() will copy (size_t)-1 bytes, and it's + not a good idea; but not proven harmful. With the help of njoly@. + [maxv, ticket #1916]
CVS commit: src/sys/arch/hppa/hppa
Module Name:src
Committed By: skrll
Date: Fri Aug 8 07:30:51 UTC 2014
Modified Files:
src/sys/arch/hppa/hppa: pmap.c
Log Message:
Trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/hppa/hppa/pmap.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/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.98 src/sys/arch/hppa/hppa/pmap.c:1.99
--- src/sys/arch/hppa/hppa/pmap.c:1.98 Tue Feb 28 07:30:30 2012
+++ src/sys/arch/hppa/hppa/pmap.c Fri Aug 8 07:30:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.98 2012/02/28 07:30:30 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.99 2014/08/08 07:30:51 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.98 2012/02/28 07:30:30 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.99 2014/08/08 07:30:51 skrll Exp $);
#include opt_cputype.h
@@ -157,7 +157,7 @@ u_int hppa_prot[8];
u_int sid_counter;
/*
- * Page 3-6 of the PA-RISC 1.1 Architecture and Instruction Set
+ * Page 3-6 of the PA-RISC 1.1 Architecture and Instruction Set
* Reference Manual (HP part number 09740-90039) defines equivalent
* and non-equivalent virtual addresses in the cache.
*
@@ -438,7 +438,7 @@ pmap_pte_flush(pmap_t pmap, vaddr_t va,
if (pmap_hpt) {
struct hpt_entry *hpt;
hpt = pmap_hash(pmap, va);
- if (hpt-hpt_valid
+ if (hpt-hpt_valid
hpt-hpt_space == pmap-pm_space
hpt-hpt_vpn == ((va 1) 0x7fff))
hpt-hpt_space = 0x;
@@ -802,13 +802,13 @@ pmap_bootstrap(vaddr_t vstart)
/*
* The kernel text, data, and bss must be direct-mapped,
- * because the kernel often runs in physical mode, and
- * anyways the loader loaded the kernel into physical
+ * because the kernel often runs in physical mode, and
+ * anyways the loader loaded the kernel into physical
* memory exactly where it was linked.
*
* All memory already allocated after bss, either by
* our caller or by this function itself, must also be
- * direct-mapped, because it's completely unmanaged
+ * direct-mapped, because it's completely unmanaged
* and was allocated in physical mode.
*
* BTLB entries are used to do this direct mapping.
@@ -869,7 +869,7 @@ pmap_bootstrap(vaddr_t vstart)
/* Coalesce BTLB entries whenever possible. */
while (btlb_j 0
- btlb_entry_vm_prot[btlb_j] ==
+ btlb_entry_vm_prot[btlb_j] ==
btlb_entry_vm_prot[btlb_j - 1]
btlb_entry_size[btlb_j] ==
btlb_entry_size[btlb_j - 1]
@@ -912,14 +912,14 @@ pmap_bootstrap(vaddr_t vstart)
size = 1;
btlb_entry_start[btlb_j] = addr;
btlb_entry_size[btlb_j] = size;
- btlb_entry_vm_prot[btlb_j] =
+ btlb_entry_vm_prot[btlb_j] =
VM_PROT_READ | VM_PROT_WRITE;
/* Move on. */
addr =
btlb_entry_start[btlb_j] + btlb_entry_size[btlb_j];
btlb_j++;
- }
+ }
/* Now insert all of the BTLB entries. */
for (btlb_i = 0; btlb_i btlb_j; btlb_i++) {
@@ -1029,7 +1029,7 @@ pmap_init(void)
DPRINTF(PDB_FOLLOW|PDB_INIT, (%s(): done\n, __func__));
}
-/*
+/*
* How much virtual space does this kernel have?
*/
void
@@ -1536,7 +1536,7 @@ pmap_changebit(struct vm_page *pg, u_int
struct pv_entry *pve;
int res;
- DPRINTF(PDB_FOLLOW|PDB_BITS,
+ DPRINTF(PDB_FOLLOW|PDB_BITS,
(%s(%p, %x, %x)\n, __func__, pg, set, clear));
KASSERT((set clear) == 0);
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: skrll Date: Fri Aug 8 07:34:02 UTC 2014 Modified Files: src/sys/arch/arm/include: mutex.h Log Message: Update a comment. Probably still needs tweaking further. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/include/mutex.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/mutex.h diff -u src/sys/arch/arm/include/mutex.h:1.16 src/sys/arch/arm/include/mutex.h:1.17 --- src/sys/arch/arm/include/mutex.h:1.16 Thu Jun 12 08:50:52 2014 +++ src/sys/arch/arm/include/mutex.h Fri Aug 8 07:34:02 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mutex.h,v 1.16 2014/06/12 08:50:52 ozaki-r Exp $ */ +/* $NetBSD: mutex.h,v 1.17 2014/08/08 07:34:02 skrll Exp $ */ /*- * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc. @@ -35,15 +35,15 @@ /* * The ARM mutex implementation is troublesome, because pre-v6 ARM lacks a * compare-and-swap operation. However, there aren't any MP pre-v6 ARM - * systems to speak of. We are mostly concerned with atomicity with respect - * to interrupts. + * systems to speak of. * - * ARMv6, however, does have ldrex/strex, and can thus implement an MP-safe - * compare-and-swap. + * ARMv6 and later, however, does have ldrex/strex, and can thus implement an + * MP-safe compare-and-swap. * - * So, what we have done is impement simple mutexes using a compare-and-swap. + * So, what we have done is implement simple mutexes using a compare-and-swap. * We support pre-ARMv6 by implementing CAS as a restartable atomic sequence - * that is checked by the IRQ vector. MP-safe ARMv6 support will be added later. + * that is checked by the IRQ vector. + * */ #ifndef __MUTEX_PRIVATE
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Fri Aug 8 07:40:35 UTC 2014 Modified Files: src/sys/sys: time.h Log Message: make constants unsigned (joerg@) To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/sys/time.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/sys/time.h diff -u src/sys/sys/time.h:1.66 src/sys/sys/time.h:1.67 --- src/sys/sys/time.h:1.66 Thu Aug 7 16:05:10 2014 +++ src/sys/sys/time.h Fri Aug 8 03:40:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: time.h,v 1.66 2014/08/07 20:05:10 christos Exp $ */ +/* $NetBSD: time.h,v 1.67 2014/08/08 07:40:35 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -174,7 +174,7 @@ timespec2bintime(const struct timespec * bt-sec = ts-tv_sec; /* 18446744073 = int(2^64 / 10) */ - bt-frac = (uint64_t)ts-tv_nsec * (uint64_t)18446744073LL; + bt-frac = (uint64_t)ts-tv_nsec * (uint64_t)18446744073ULL; } static __inline void @@ -192,7 +192,7 @@ timeval2bintime(const struct timeval *tv bt-sec = tv-tv_sec; /* 18446744073709 = int(2^64 / 100) */ - bt-frac = (uint64_t)tv-tv_usec * (uint64_t)18446744073709LL; + bt-frac = (uint64_t)tv-tv_usec * (uint64_t)18446744073709ULL; } #endif /* !defined(_STANDALONE) */
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: martin Date: Fri Aug 8 07:45:04 UTC 2014 Modified Files: src/sys/arch/macppc/conf: MAMBO POWERMAC_G5 Log Message: Make all ramdisk root sizes equal again To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/macppc/conf/MAMBO cvs rdiff -u -r1.21 -r1.22 src/sys/arch/macppc/conf/POWERMAC_G5 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/macppc/conf/MAMBO diff -u src/sys/arch/macppc/conf/MAMBO:1.20 src/sys/arch/macppc/conf/MAMBO:1.21 --- src/sys/arch/macppc/conf/MAMBO:1.20 Wed Aug 6 14:23:53 2014 +++ src/sys/arch/macppc/conf/MAMBO Fri Aug 8 07:45:04 2014 @@ -6,7 +6,7 @@ include arch/macppc/conf/std.macppc.g5 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.20 $ +#ident GENERIC-$Revision: 1.21 $ maxusers 32 @@ -197,7 +197,7 @@ pseudo-device nsmb # SMB requester # Enable the hooks used for initializing the ram-disk. options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk -options MEMORY_DISK_ROOT_SIZE=4480 # 2240 KiB +options MEMORY_DISK_ROOT_SIZE=4496 # 2248 KiB options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode options MAMBO Index: src/sys/arch/macppc/conf/POWERMAC_G5 diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.21 src/sys/arch/macppc/conf/POWERMAC_G5:1.22 --- src/sys/arch/macppc/conf/POWERMAC_G5:1.21 Wed Aug 6 14:23:53 2014 +++ src/sys/arch/macppc/conf/POWERMAC_G5 Fri Aug 8 07:45:04 2014 @@ -187,5 +187,5 @@ pseudo-device nsmb # SMB requester # Enable the hooks used for initializing the ram-disk. options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk -options MEMORY_DISK_ROOT_SIZE=4480 # 2240 KiB +options MEMORY_DISK_ROOT_SIZE=4496 # 2248 KiB options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: skrll Date: Fri Aug 8 07:47:05 UTC 2014 Modified Files: src/sys/arch/arm/include/arm32: pte.h Log Message: Spell user with an e. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/include/arm32/pte.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/arm32/pte.h diff -u src/sys/arch/arm/include/arm32/pte.h:1.16 src/sys/arch/arm/include/arm32/pte.h:1.17 --- src/sys/arch/arm/include/arm32/pte.h:1.16 Thu Jul 31 08:04:57 2014 +++ src/sys/arch/arm/include/arm32/pte.h Fri Aug 8 07:47:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.16 2014/07/31 08:04:57 skrll Exp $ */ +/* $NetBSD: pte.h,v 1.17 2014/08/08 07:47:05 skrll Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -250,8 +250,8 @@ typedef uint32_t pt_entry_t; /* L2 table */ #define AP_KR 0x00 /* kernel read */ #define AP_KRW 0x01 /* kernel read/write */ -#define AP_KRWUR 0x02 /* kernel read/write usr read */ -#define AP_KRWURW 0x03 /* kernel read/write usr read/write */ +#define AP_KRWUR 0x02 /* kernel read/write user read */ +#define AP_KRWURW 0x03 /* kernel read/write user read/write */ /* * Note: These values assume the S (System) and the R (ROM) bits are clear and @@ -269,9 +269,9 @@ typedef uint32_t pt_entry_t; /* L2 table * Also used for ARMv6 with XP bit set. */ #define AP7_KR 0x21 /* kernel read */ -#define AP7_KRUR 0x23 /* kernel read usr read */ +#define AP7_KRUR 0x23 /* kernel read user read */ #define AP7_KRW 0x01 /* kernel read/write */ -#define AP7_KRWURW 0x03 /* kernel read/write usr read/write */ +#define AP7_KRWURW 0x03 /* kernel read/write user read/write */ /* * Domain Types for the Domain Access Control Register.
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: skrll Date: Fri Aug 8 07:47:24 UTC 2014 Modified Files: src/sys/arch/arm/include/arm32: pte.h Log Message: Comment whitespace. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/include/arm32/pte.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/arm32/pte.h diff -u src/sys/arch/arm/include/arm32/pte.h:1.17 src/sys/arch/arm/include/arm32/pte.h:1.18 --- src/sys/arch/arm/include/arm32/pte.h:1.17 Fri Aug 8 07:47:05 2014 +++ src/sys/arch/arm/include/arm32/pte.h Fri Aug 8 07:47:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.17 2014/08/08 07:47:05 skrll Exp $ */ +/* $NetBSD: pte.h,v 1.18 2014/08/08 07:47:24 skrll Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -202,13 +202,13 @@ typedef uint32_t pt_entry_t; /* L2 table #define L2_TYPE_T 0x03 /* Tiny Page (not armv7) */ #define L2_TYPE_MASK 0x03 /* mask of type bits */ - /* - * This L2 Descriptor type is available on XScale processors - * when using a Coarse L1 Descriptor. The Extended Small - * Descriptor has the same format as the XScale Tiny Descriptor, - * but describes a 4K page, rather than a 1K page. - * For V6 MMU, this is used when XP bit is cleared. - */ +/* + * This L2 Descriptor type is available on XScale processors + * when using a Coarse L1 Descriptor. The Extended Small + * Descriptor has the same format as the XScale Tiny Descriptor, + * but describes a 4K page, rather than a 1K page. + * For V6 MMU, this is used when XP bit is cleared. + */ #define L2_TYPE_XS 0x03 /* XScale/ARMv6 Extended Small Page */ #define L2_B 0x0004 /* Bufferable page */
CVS commit: src/external/public-domain/tz/share/zoneinfo
Module Name:src
Committed By: apb
Date: Fri Aug 8 09:06:41 UTC 2014
Added Files:
src/external/public-domain/tz/share/zoneinfo: Makefile
Log Message:
Copy src/share/zoneinfo/Makefile (revision 1.47) to
src/external/public-domain/tz/share/zoneinfo/Makefile.
This is a verbatim copy, as part of moving the zoneinfo sources in the
NetBSD tree. It will need to be edited before it works.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/public-domain/tz/share/zoneinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/public-domain/tz/share/zoneinfo/Makefile
diff -u /dev/null src/external/public-domain/tz/share/zoneinfo/Makefile:1.1
--- /dev/null Fri Aug 8 09:06:41 2014
+++ src/external/public-domain/tz/share/zoneinfo/Makefile Fri Aug 8 09:06:41 2014
@@ -0,0 +1,145 @@
+# $NetBSD: Makefile,v 1.1 2014/08/08 09:06:41 apb Exp $
+
+.include bsd.own.mk
+
+# If you want something other than Eastern United States time as a template
+# for handling POSIX-style time zone environment variables,
+# change the line below (after finding the zone you want in the
+# time zone files, or adding it to a time zone file).
+# (When a POSIX-style environment variable is handled, the rules in the
+# template file are used to determine spring forward and fall back days and
+# times; the environment variable itself specifies UT offsets of standard and
+# summer time.)
+# Alternately, if you discover you've got the wrong time zone, you can just
+# zic -p rightzone
+# to correct things.
+# Use the command
+# make zonenames
+# to get a list of the values you can use for POSIXRULES.
+# If you want POSIX compatibility, use America/New_York.
+
+POSIXRULES= America/New_York
+
+# Compiled time zone information is placed in the TZDIR directory
+# (and subdirectories).
+# Use an absolute path name for TZDIR unless you're just testing the software.
+# Note: ${DESTDIR} is prepended to this for the actual copy.
+
+TZDIR= /usr/share/zoneinfo
+
+# If you always want time values interpreted as seconds since the epoch
+# (not counting leap seconds), use
+# REDO= posix_only
+# below. If you always want right time values interpreted as seconds since
+# the epoch (counting leap seconds), use
+# REDO= right_only
+# below. If you want both sets of data available, with leap seconds not
+# counted normally, use
+# REDO= posix_right
+# below. If you want both sets of data available, with leap seconds counted
+# normally, use
+# REDO= right_posix
+# below.
+
+REDO= posix_only
+
+# Since . may not be in PATH...
+YEARISTYPE= ${HOST_SH} ${.CURDIR}/yearistype.sh
+
+PRIMARY_YDATA= africa antarctica asia australasia \
+ europe northamerica southamerica
+YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward
+NDATA= systemv factory
+TDATA= $(YDATA) $(NDATA)
+ZONETABLES= zone1970.tab zone.tab
+TABDATA= iso3166.tab leapseconds $(ZONETABLES)
+DATA= $(YDATA) $(NDATA) $(TABDATA) # yearistype.sh
+
+TZBUILDDIR= ${.OBJDIR}/builddir
+
+.PHONY: posix_only
+posix_only: ${TDATA}
+ ${_MKTARGET_CREATE}
+ mkdir -p ${TZBUILDDIR}
+ cd ${.CURDIR} \
+ ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -L /dev/null ${TDATA}
+
+.PHONY: right_only
+right_only: leapseconds ${TDATA}
+ ${_MKTARGET_CREATE}
+ mkdir -p ${TZBUILDDIR}
+ cd ${.CURDIR} \
+ ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -L leapseconds ${TDATA}
+
+.PHONY: other_two
+other_two: leapseconds ${TDATA}
+ ${_MKTARGET_CREATE}
+ mkdir -p ${TZBUILDDIR}
+ cd ${.CURDIR} \
+ ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR}/posix -L /dev/null ${TDATA}
+ cd ${.CURDIR} \
+ ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR}/right -L leapseconds ${TDATA}
+
+.PHONY: posix_right
+posix_right: posix_only other_two
+
+.PHONY: right_posix
+right_posix: right_only other_two
+
+.if ${MKUNPRIVED} == no
+TOOL_PAX.unpriv=-pe
+.else
+TOOL_PAX.unpriv=
+.endif
+
+.if ${MKSHARE} != no
+afterinstall: ${DATA} ${REDO} ${TABDATA}
+ ${_MKMSG_CREATE} ${POSIXRULES}
+ mkdir -p ${TZBUILDDIR}
+ cd ${.CURDIR} \
+ ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -p ${POSIXRULES}
+ cd ${TZBUILDDIR} \
+ find . -type f -print | xargs ${TOOL_STAT} -qf '%d,%i %N' | sort \
+ | while read devino tzfile; do \
+ destfile=${DESTDIR}${TZDIR}/$${tzfile#./}; \
+ destdir=$$(dirname $${destfile}); \
+ if [ ! -d $$destdir ]; then \
+ ${_MKSHMSG_INSTALL} $$destdir; \
+ ${_MKSHECHO} ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} \
+ $$destdir; \
+ ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} $$destdir; \
+ fi; \
+ if [ $$devino = $$lastdevino ]; then \
+ if ldevino=$$(${TOOL_STAT} -qf '%d %i' $$lastfile) \
+ tdevino=$$(${TOOL_STAT} -qf '%d %i' $$destfile) \
+ [ $$ldevino = $$tdevino ]; then \
+continue; \
+ fi; \
+ ${_MKSHMSG_INSTALL} $$destfile; \
+ ${_MKSHECHO} ${INSTALL_LINK} -o ${BINOWN} -g ${BINGRP} \
+ -m ${NONBINMODE} $$lastfile $$destfile; \
+
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: apb
Date: Fri Aug 8 09:08:19 UTC 2014
Added Files:
src/external/public-domain/tz: tzdata2netbsd
Log Message:
Copy src/share/zoneinfo/tzdata2netbsd (revision 1.5) to
src/external/public-domain/tz/tzdata2netbsd.
This is a verbatim copy, as part of moving the zoneinfo sources in the
NetBSD tree. It will need to be edited before it works.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/public-domain/tz/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u /dev/null src/external/public-domain/tz/tzdata2netbsd:1.1
--- /dev/null Fri Aug 8 09:08:19 2014
+++ src/external/public-domain/tz/tzdata2netbsd Fri Aug 8 09:08:19 2014
@@ -0,0 +1,336 @@
+# $NetBSD: tzdata2netbsd,v 1.1 2014/08/08 09:08:19 apb Exp $
+
+# For use by NetBSD developers when updating to new versions of tzdata.
+#
+# 0. Be in an up-to-date checkout of src/share/zoneinfo from NetBSD-current.
+# 1. Edit OLDVER and NEWVER below.
+# 3. Run this script. You will be prompted for confirmation before
+#anything major (such as a cvs operation).
+# 4. If something fails, abort the script and fix it.
+# 5. Re-run this script until you are happy. It's designed to
+#be re-run over and over, and later runs will try not to
+#redo non-trivial work done by earlier runs.
+#
+
+OLDVER=2014e
+NEWVER=2014f
+
+# Uppercase variants of OLDVER and NEWVER
+OLDVER_UC=$( echo ${OLDVER} | tr '[a-z]' '[A-Z]' )
+NEWVER_UC=$( echo ${NEWVER} | tr '[a-z]' '[A-Z]' )
+
+# Tags for use with version control systems
+CVSOLDTAG=TZDATA${OLDVER_UC}
+CVSNEWTAG=TZDATA${NEWVER_UC}
+CVSBRANCHTAG=TZDATA
+GITHUBTAG=${NEWVER}
+
+# URLs for fetching distribution files, etc.
+DISTURL=ftp://ftp.iana.org/tz/releases/tzdata${NEWVER}.tar.gz;
+SIGURL=${DISTURL}.asc
+NEWSURL=https://github.com/eggert/tz/raw/${GITHUBTAG}/NEWS;
+
+# Directories
+REPODIR=src/share/zoneinfo # relative to the NetSBD CVS repository
+WORKDIR=$(pwd)/update-work/${NEWVER}
+EXTRACTDIR=${WORKDIR}/extract
+
+# Files in the work directory
+DISTFILE=${WORKDIR}/${DISTURL##*/}
+SIGFILE=${DISTFILE}.sig
+NEWSFILE=${WORKDIR}/NEWS
+NEWSTRIMFILE=${WORKDIR}/NEWS.trimmed
+IMPORTMSGFILE=${WORKDIR}/import.msg
+MERGSMSGFILE=${WORKDIR}/merge.msg
+PGPVERIFYLOG=${WORKDIR}/pgpverify.log
+
+DOIT()
+{
+ local really_do_it=false
+ local reply
+
+ echo ABOUT TO DO: $(shell_quote $@)
+ read -p Really do it? [yes/no/quit] reply
+ case ${reply} in
+ [yY]*) really_do_it=true ;;
+ [nN]*) really_do_it=false ;;
+ [qQ]*)
+ echo Aborting
+ return 1
+ ;;
+ esac
+ if $really_do_it; then
+ echo REALLY DOING IT NOW...
+ $@
+ else
+ echo NOT REALLY DOING THE ABOVE COMMAND
+ fi
+}
+
+# Quote args to make them safe in the shell.
+# Usage: quotedlist=$(shell_quote args...)
+#
+# After building up a quoted list, use it by evaling it inside
+# double quotes, like this:
+#eval set -- $quotedlist
+# or like this:
+#eval \$command $quotedlist \$filename
+#
+shell_quote()
+{(
+ local result=''
+ local arg qarg
+ LC_COLLATE=C ; export LC_COLLATE # so [a-zA-Z0-9] works in ASCII
+ for arg in $@ ; do
+ case ${arg} in
+ '')
+ qarg=''
+ ;;
+ *[!-./a-zA-Z0-9]*)
+ # Convert each embedded ' to '\'',
+ # then insert ' at the beginning of the first line,
+ # and append ' at the end of the last line.
+ # Finally, elide unnecessary '' pairs at the
+ # beginning and end of the result and as part of
+ # '\'''\'' sequences that result from multiple
+ # adjacent quotes in he input.
+ qarg=$(printf %s\n $arg | \
+ ${SED:-sed} -e s/'/'''/g \
+-e 1s/^/'/ -e \$s/\$/'/ \
+-e 1s/^''// -e \$s/''\$// \
+-e s/'''/'/g
+)
+ ;;
+ *)
+ # Arg is not the empty string, and does not contain
+ # any unsafe characters. Leave it unchanged for
+ # readability.
+ qarg=${arg}
+ ;;
+ esac
+ result=${result}${result:+ }${qarg}
+ done
+ printf %s\n $result
+)}
+
+findcvsroot()
+{
+ [ -n ${CVSROOT} ] return 0
+ CVSROOT=$( cat ./CVS/Root )
+ [ -n ${CVSROOT} ] return 0
+ echo 2 Failed to set CVSROOT value
+ return 1
+}
+
+mkworkdir()
+{
+ mkdir -p ${WORKDIR}
+}
+
+fetch()
+{
+ [ -f ${DISTFILE} ] || ftp -o ${DISTFILE} ${DISTURL}
+ [ -f ${SIGFILE} ] || ftp -o ${SIGFILE} ${SIGURL}
+ [ -f ${NEWSFILE} ] || ftp -o ${NEWSFILE} ${NEWSURL}
+}
+
+checksig()
+{
+ { gpg --verify ${SIGFILE} ${DISTFILE}
+ echo gpg exit status $?
+ } 21 | tee ${PGPVERIFYLOG}
+
+ # The output should contain lines that match all the following regexps
+ #
+ while read line; do
+ if ! grep -q -e ^${line}\$ ${PGPVERIFYLOG}; then
+ echo 2 Failed to verify signature: ${line}
+ return 1
+ fi
+ done 'EOF'
+gpg: Signature made .* using RSA key ID 62AA7E34
+gpg: Good signature from Paul Eggert egg...@cs.ucla.edu
+Primary key fingerprint: 7E37 92A9 D8AC F7D6 33BC 1588 ED97 E90E 62AA 7E34
+gpg exit status 0
+EOF
+}
+
+extract()
+{
+ [
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: apb
Date: Fri Aug 8 09:14:40 UTC 2014
Added Files:
src/external/public-domain/tz: Makefile Makefile.inc
Log Message:
Add infrastructure for building tzdata under src/external/public-domain/tz.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/public-domain/tz/Makefile \
src/external/public-domain/tz/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/public-domain/tz/Makefile
diff -u /dev/null src/external/public-domain/tz/Makefile:1.1
--- /dev/null Fri Aug 8 09:14:40 2014
+++ src/external/public-domain/tz/Makefile Fri Aug 8 09:14:40 2014
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2014/08/08 09:14:40 apb Exp $
+
+SUBDIR+= share
+
+.include bsd.subdir.mk
Index: src/external/public-domain/tz/Makefile.inc
diff -u /dev/null src/external/public-domain/tz/Makefile.inc:1.1
--- /dev/null Fri Aug 8 09:14:40 2014
+++ src/external/public-domain/tz/Makefile.inc Fri Aug 8 09:14:40 2014
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/08/08 09:14:40 apb Exp $
+
+.include bsd.own.mk
+
+TZDISTDIR:= ${.PARSEDIR}/dist
CVS commit: src/external/public-domain/tz/share/zoneinfo
Module Name:src
Committed By: apb
Date: Fri Aug 8 09:17:03 UTC 2014
Modified Files:
src/external/public-domain/tz/share/zoneinfo: Makefile
Log Message:
Adapt to the new source location under src/public-domain/tz.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/public-domain/tz/share/zoneinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/tz/share/zoneinfo/Makefile
diff -u src/external/public-domain/tz/share/zoneinfo/Makefile:1.1 src/external/public-domain/tz/share/zoneinfo/Makefile:1.2
--- src/external/public-domain/tz/share/zoneinfo/Makefile:1.1 Fri Aug 8 09:06:41 2014
+++ src/external/public-domain/tz/share/zoneinfo/Makefile Fri Aug 8 09:17:03 2014
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/08/08 09:06:41 apb Exp $
+# $NetBSD: Makefile,v 1.2 2014/08/08 09:17:03 apb Exp $
.include bsd.own.mk
+.include ../../Makefile.inc
+
+.PATH: ${TZDISTDIR}
# If you want something other than Eastern United States time as a template
# for handling POSIX-style time zone environment variables,
@@ -44,7 +47,7 @@ TZDIR= /usr/share/zoneinfo
REDO= posix_only
# Since . may not be in PATH...
-YEARISTYPE= ${HOST_SH} ${.CURDIR}/yearistype.sh
+YEARISTYPE= ${HOST_SH} ${TZDISTDIR}/yearistype.sh
PRIMARY_YDATA= africa antarctica asia australasia \
europe northamerica southamerica
@@ -61,23 +64,23 @@ TZBUILDDIR= ${.OBJDIR}/builddir
posix_only: ${TDATA}
${_MKTARGET_CREATE}
mkdir -p ${TZBUILDDIR}
- cd ${.CURDIR} \
+ cd ${TZDISTDIR} \
${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -L /dev/null ${TDATA}
.PHONY: right_only
right_only: leapseconds ${TDATA}
${_MKTARGET_CREATE}
mkdir -p ${TZBUILDDIR}
- cd ${.CURDIR} \
+ cd ${TZDISTDIR} \
${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -L leapseconds ${TDATA}
.PHONY: other_two
other_two: leapseconds ${TDATA}
${_MKTARGET_CREATE}
mkdir -p ${TZBUILDDIR}
- cd ${.CURDIR} \
+ cd ${TZDISTDIR} \
${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR}/posix -L /dev/null ${TDATA}
- cd ${.CURDIR} \
+ cd ${TZDISTDIR} \
${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR}/right -L leapseconds ${TDATA}
.PHONY: posix_right
@@ -96,7 +99,7 @@ TOOL_PAX.unpriv=
afterinstall: ${DATA} ${REDO} ${TABDATA}
${_MKMSG_CREATE} ${POSIXRULES}
mkdir -p ${TZBUILDDIR}
- cd ${.CURDIR} \
+ cd ${TZDISTDIR} \
${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -p ${POSIXRULES}
cd ${TZBUILDDIR} \
find . -type f -print | xargs ${TOOL_STAT} -qf '%d,%i %N' | sort \
@@ -133,7 +136,7 @@ afterinstall: ${DATA} ${REDO} ${TABDATA}
done
for f in ${TABDATA}; do \
${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
- ${.CURDIR}/$$f ${DESTDIR}${TZDIR}; \
+ ${TZDISTDIR}/$$f ${DESTDIR}${TZDIR}; \
done
.else # ${MKSHARE} == no
afterinstall:
CVS commit: src/external/public-domain/tz/share
Module Name:src Committed By: apb Date: Fri Aug 8 09:18:02 UTC 2014 Added Files: src/external/public-domain/tz/share: Makefile Log Message: Part of the new infrastructure for building tzdata under src/public-domain/tz. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/public-domain/tz/share/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/public-domain/tz/share/Makefile diff -u /dev/null src/external/public-domain/tz/share/Makefile:1.1 --- /dev/null Fri Aug 8 09:18:02 2014 +++ src/external/public-domain/tz/share/Makefile Fri Aug 8 09:18:02 2014 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2014/08/08 09:18:02 apb Exp $ + +SUBDIR+= zoneinfo + +.include bsd.subdir.mk
CVS commit: src
Module Name:src
Committed By: apb
Date: Fri Aug 8 09:34:10 UTC 2014
Modified Files:
src/external/public-domain: Makefile
src/share: Makefile
Log Message:
Hook external/public-domain/tz into the build, and unhook share/zoneinfo.
The timezone files are still installed in ${DESTDIR}/usr/share/zoneinfo/**,
and they are identical before and after this change.
This is almost the last step in moving NetBSD's tzdata sources from
share/zoneinfo to external/public/tz/dist, to ease future maintenance.
All that remains is to delete src/share/zoneinfo, but that will be
delayed for a while.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/Makefile
cvs rdiff -u -r1.32 -r1.33 src/share/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/Makefile
diff -u src/external/public-domain/Makefile:1.2 src/external/public-domain/Makefile:1.3
--- src/external/public-domain/Makefile:1.2 Thu Oct 13 22:08:20 2011
+++ src/external/public-domain/Makefile Fri Aug 8 09:34:10 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2011/10/13 22:08:20 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/08/08 09:34:10 apb Exp $
.include bsd.own.mk
-SUBDIR+= sqlite xz
+SUBDIR+= sqlite tz xz
.include bsd.subdir.mk
Index: src/share/Makefile
diff -u src/share/Makefile:1.32 src/share/Makefile:1.33
--- src/share/Makefile:1.32 Wed Feb 3 15:34:44 2010
+++ src/share/Makefile Fri Aug 8 09:34:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2010/02/03 15:34:44 roy Exp $
+# $NetBSD: Makefile,v 1.33 2014/08/08 09:34:10 apb Exp $
# from @(#)Makefile 8.1 (Berkeley) 6/5/93
# Missing: ms
@@ -8,7 +8,7 @@
.if ${MKSHARE} != no || \
make(clean) || make(cleandir) || make(distclean) || make(obj)
SUBDIR= dict doc examples legal man me misc mk \
- tabset terminfo tmac wscons xml zoneinfo
+ tabset terminfo tmac wscons xml
.if ${MKNLS} != no
SUBDIR+=i18n locale nls
.endif
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: apb
Date: Fri Aug 8 09:47:28 UTC 2014
Modified Files:
src/external/public-domain/tz: tzdata2netbsd
Log Message:
Adapt tzdata2netbsd script to the new source location.
* Change src/share/zoneinfo to src/external/public-domain/tz.
* The NEWS file is not distributed in the tzdata tar.gz file,
but it logically belongs with it. We were already downloading the
NEWS file from a different location, but now we also add it to the
import directory.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/tz/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.1 src/external/public-domain/tz/tzdata2netbsd:1.2
--- src/external/public-domain/tz/tzdata2netbsd:1.1 Fri Aug 8 09:08:19 2014
+++ src/external/public-domain/tz/tzdata2netbsd Fri Aug 8 09:47:28 2014
@@ -1,8 +1,9 @@
-# $NetBSD: tzdata2netbsd,v 1.1 2014/08/08 09:08:19 apb Exp $
+# $NetBSD: tzdata2netbsd,v 1.2 2014/08/08 09:47:28 apb Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
-# 0. Be in an up-to-date checkout of src/share/zoneinfo from NetBSD-current.
+# 0. Be in an up-to-date checkout of src/external/public-domain/tz
+#from NetBSD-current.
# 1. Edit OLDVER and NEWVER below.
# 3. Run this script. You will be prompted for confirmation before
#anything major (such as a cvs operation).
@@ -31,7 +32,7 @@ SIGURL=${DISTURL}.asc
NEWSURL=https://github.com/eggert/tz/raw/${GITHUBTAG}/NEWS;
# Directories
-REPODIR=src/share/zoneinfo # relative to the NetSBD CVS repository
+REPODIR=src/external/public-domain/tz/dist # relative to the NetBSD CVS repo
WORKDIR=$(pwd)/update-work/${NEWVER}
EXTRACTDIR=${WORKDIR}/extract
@@ -162,6 +163,12 @@ extract()
tar -z -xf ${DISTFILE} -C ${EXTRACTDIR}
}
+addnews()
+{
+ [ -f ${EXTRACTDIR}/NEWS ] return
+ cp -p ${NEWSFILE} ${EXTRACTDIR}/NEWS
+}
+
# Find the relevant part of the NEWS file for all releases between
# OLDVER and NEWVER, and save them to NEWSTRIMFILE.
#
@@ -198,7 +205,7 @@ EDIT ME: generated from ${NEWSFILE}.
EDIT ME:
EOF
awk -v oldver=${OLDVER} -v newver=${NEWVER} \
- -v disturl=${DISTURL} \
+ -v disturl=${DISTURL} -v newsurl=${NEWSURL} \
'
BEGIN {
bullet = * ;
@@ -207,6 +214,7 @@ EOF
goodsection = 0;
havesentence = 0;
print Import tzdatanewver from disturl;
+ print and NEWS file from newsurl;
}
/^Release/ {
# Release version - date
@@ -323,6 +331,7 @@ main()
fetch
checksig
extract
+ addnews
trimnews
mkimportmsg
editimportmsg
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jmcneill
Date: Fri Aug 8 10:17:07 UTC 2014
Modified Files:
src/sys/dev/pci: if_wpi.c
Log Message:
wpi_fix_channel hack no longer needed with recent scanning changes
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/pci/if_wpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.67 src/sys/dev/pci/if_wpi.c:1.68
--- src/sys/dev/pci/if_wpi.c:1.67 Thu Aug 7 22:10:05 2014
+++ src/sys/dev/pci/if_wpi.c Fri Aug 8 10:17:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.67 2014/08/07 22:10:05 jmcneill Exp $ */
+/* $NetBSD: if_wpi.c,v 1.68 2014/08/08 10:17:07 jmcneill Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.67 2014/08/07 22:10:05 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.68 2014/08/08 10:17:07 jmcneill Exp $);
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -102,7 +102,6 @@ static struct ieee80211_node * wpi_node_
static void wpi_newassoc(struct ieee80211_node *, int);
static int wpi_media_change(struct ifnet *);
static int wpi_newstate(struct ieee80211com *, enum ieee80211_state, int);
-static void wpi_fix_channel(struct ieee80211com *, struct mbuf *);
static void wpi_mem_lock(struct wpi_softc *);
static void wpi_mem_unlock(struct wpi_softc *);
static uint32_t wpi_mem_read(struct wpi_softc *, uint16_t);
@@ -987,44 +986,6 @@ wpi_newstate(struct ieee80211com *ic, en
}
/*
- * XXX: Hack to set the current channel to the value advertised in beacons or
- * probe responses. Only used during AP detection.
- * XXX: Duplicated from if_iwi.c
- */
-static void
-wpi_fix_channel(struct ieee80211com *ic, struct mbuf *m)
-{
- struct ieee80211_frame *wh;
- uint8_t subtype;
- uint8_t *frm, *efrm;
-
- wh = mtod(m, struct ieee80211_frame *);
-
- if ((wh-i_fc[0] IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_MGT)
- return;
-
- subtype = wh-i_fc[0] IEEE80211_FC0_SUBTYPE_MASK;
-
- if (subtype != IEEE80211_FC0_SUBTYPE_BEACON
- subtype != IEEE80211_FC0_SUBTYPE_PROBE_RESP)
- return;
-
- frm = (uint8_t *)(wh + 1);
- efrm = mtod(m, uint8_t *) + m-m_len;
-
- frm += 12; /* skip tstamp, bintval and capinfo fields */
- while (frm efrm) {
- if (*frm == IEEE80211_ELEMID_DSPARMS)
-#if IEEE80211_CHAN_MAX 255
- if (frm[2] = IEEE80211_CHAN_MAX)
-#endif
- ic-ic_curchan = ic-ic_channels[frm[2]];
-
- frm += frm[1] + 2;
- }
-}
-
-/*
* Grab exclusive access to NIC memory.
*/
static void
@@ -1554,9 +1515,6 @@ wpi_rx_intr(struct wpi_softc *sc, struct
/* finalize mbuf */
m-m_pkthdr.rcvif = ifp;
- if (ic-ic_state == IEEE80211_S_SCAN)
- wpi_fix_channel(ic, m);
-
if (sc-sc_drvbpf != NULL) {
struct wpi_rx_radiotap_header *tap = sc-sc_rxtap;
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Aug 8 11:00:56 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: Update tzdata section. To generate a diff of this commit: cvs rdiff -u -r1.1141 -r1.1142 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1141 src/doc/3RDPARTY:1.1142 --- src/doc/3RDPARTY:1.1141 Wed Aug 6 19:27:58 2014 +++ src/doc/3RDPARTY Fri Aug 8 11:00:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1141 2014/08/06 19:27:58 apb Exp $ +# $NetBSD: 3RDPARTY,v 1.1142 2014/08/08 11:00:56 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1310,12 +1310,14 @@ Home Page: http://www.iana.org/time-zone Mailing List: t...@iana.org Responsible: kleink, christos, apb License: Public domain -Location: lib/libc/time,share/zoneinfo +Location: lib/libc/time/zoneinfo, external/public-domain/tz/share Notes: Don't use src/lib/libc/time/tzcode2netbsd to prepare the source tree for import. Diffs are now applied by hand, since we have too many diffs (re-entrant tzcode, register removal) to apply. The diffs have been submitted upstream but there is too much inertia to apply them. Check for .gitignore files. +For the data files, do use external/public-domain/tz/tzdata2netbsd. You might +need to download the NEWS file separately if it's missing. Package: wpa_supplicant/hostapd Version: 2.0
CVS commit: src/distrib/hppa/ramdisk
Module Name:src
Committed By: joerg
Date: Fri Aug 8 14:00:30 UTC 2014
Modified Files:
src/distrib/hppa/ramdisk: Makefile
Log Message:
Cleanup cargo cult.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/hppa/ramdisk/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/hppa/ramdisk/Makefile
diff -u src/distrib/hppa/ramdisk/Makefile:1.3 src/distrib/hppa/ramdisk/Makefile:1.4
--- src/distrib/hppa/ramdisk/Makefile:1.3 Thu Jun 19 16:34:21 2014
+++ src/distrib/hppa/ramdisk/Makefile Fri Aug 8 14:00:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/06/19 16:34:21 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/08 14:00:30 joerg Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,6 @@ IMAGESIZE= 3000k
MAKEFS_FLAGS= -f 15
WARNS= 1
-# DBG= -Os -mmultiple -mstring
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS= -d ${DBG}
CVS commit: src/sys/arch/arm/samsung
Module Name:src
Committed By: reinoud
Date: Fri Aug 8 14:43:14 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: mct.c
Log Message:
Fix missed clock interrupts calculation
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/samsung/mct.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/samsung/mct.c
diff -u src/sys/arch/arm/samsung/mct.c:1.2 src/sys/arch/arm/samsung/mct.c:1.3
--- src/sys/arch/arm/samsung/mct.c:1.2 Fri May 9 22:21:46 2014
+++ src/sys/arch/arm/samsung/mct.c Fri Aug 8 14:43:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mct.c,v 1.2 2014/05/09 22:21:46 reinoud Exp $ */
+/* $NetBSD: mct.c,v 1.3 2014/08/08 14:43:14 reinoud Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: mct.c,v 1.2 2014/05/09 22:21:46 reinoud Exp $);
+__KERNEL_RCSID(1, $NetBSD: mct.c,v 1.3 2014/08/08 14:43:14 reinoud Exp $);
#include sys/param.h
#include sys/bus.h
@@ -230,21 +230,24 @@ clockhandler(void *arg)
struct clockframe * const cf = arg;
struct mct_softc * const sc = mct_sc;
const uint64_t now = mct_gettime(sc);
- uint64_t delta = now - sc-sc_lastintr;
- uint64_t missed = delta / sc-sc_autoinc;
+ int64_t delta = now - sc-sc_lastintr;
+ int64_t periods = delta / sc-sc_autoinc;
+
+ KASSERT(delta = 0);
+ KASSERT(periods = 0);
/* ack the interrupt */
mct_write_global(sc, MCT_G_INT_CSTAT, G_INT_CSTAT_CLEAR);
- /* check if we missed clock interrupts */
- if (delta sc-sc_autoinc)
- sc-sc_ev_missing_ticks.ev_count += missed;
+ /* check if we periods clock interrupts */
+ if (periods 1)
+ sc-sc_ev_missing_ticks.ev_count += periods - 1;
sc-sc_lastintr = now;
hardclock(cf);
if (sc-sc_has_blink_led) {
- sc-sc_led_timer = sc-sc_led_timer - 1 - missed;
+ sc-sc_led_timer = sc-sc_led_timer - periods - 1;
if (sc-sc_led_timer = 0) {
sc-sc_led_state = !sc-sc_led_state;
exynos_gpio_pindata_write(sc-sc_gpio_led,
CVS commit: src/bin/pax
Module Name:src Committed By: joerg Date: Fri Aug 8 14:48:55 UTC 2014 Modified Files: src/bin/pax: ar_io.c Log Message: Fix RCS ID. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/bin/pax/ar_io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/pax/ar_io.c diff -u src/bin/pax/ar_io.c:1.54 src/bin/pax/ar_io.c:1.55 --- src/bin/pax/ar_io.c:1.54 Tue Mar 20 18:42:28 2012 +++ src/bin/pax/ar_io.c Fri Aug 8 14:48:55 2014 @@ -1,4 +1,4 @@ -/* $netbsd: ar_io.c,v 1.48 2007/04/23 18:40:22 christos Exp $ */ +/* $NetBSD: ar_io.c,v 1.55 2014/08/08 14:48:55 joerg Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = @(#)ar_io.c 8.2 (Berkeley) 4/18/94; #else -__RCSID($NetBSD: ar_io.c,v 1.54 2012/03/20 18:42:28 matt Exp $); +__RCSID($NetBSD: ar_io.c,v 1.55 2014/08/08 14:48:55 joerg Exp $); #endif #endif /* not lint */
CVS commit: src/sys/arch/x68k/stand
Module Name:src
Committed By: isaki
Date: Fri Aug 8 15:19:51 UTC 2014
Modified Files:
src/sys/arch/x68k/stand/boot: Makefile
src/sys/arch/x68k/stand/mboot: Makefile
src/sys/arch/x68k/stand/netboot: Makefile
Log Message:
Remove STRIP?=strip.
Falling back to the hosttool is not a good way now.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x68k/stand/boot/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x68k/stand/mboot/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/stand/netboot/Makefile
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/boot/Makefile
diff -u src/sys/arch/x68k/stand/boot/Makefile:1.25 src/sys/arch/x68k/stand/boot/Makefile:1.26
--- src/sys/arch/x68k/stand/boot/Makefile:1.25 Wed Aug 6 14:10:42 2014
+++ src/sys/arch/x68k/stand/boot/Makefile Fri Aug 8 15:19:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/08/06 14:10:42 isaki Exp $
+# $NetBSD: Makefile,v 1.26 2014/08/08 15:19:51 isaki Exp $
NOMAN= # defined
@@ -19,7 +19,6 @@ BINMODE= 444
STRIPFLAG=
BFDNAME= a.out-m68k-netbsd
-STRIP?= /usr/bin/strip
SRCS= srt0.S boot.c conf.c switch.c exec_image.S
S= ${.CURDIR}/../../../..
Index: src/sys/arch/x68k/stand/mboot/Makefile
diff -u src/sys/arch/x68k/stand/mboot/Makefile:1.16 src/sys/arch/x68k/stand/mboot/Makefile:1.17
--- src/sys/arch/x68k/stand/mboot/Makefile:1.16 Thu Apr 5 12:01:36 2012
+++ src/sys/arch/x68k/stand/mboot/Makefile Fri Aug 8 15:19:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/04/05 12:01:36 isaki Exp $
+# $NetBSD: Makefile,v 1.17 2014/08/08 15:19:51 isaki Exp $
NOMAN= # defined
.include bsd.own.mk
@@ -15,8 +15,6 @@ BINDIR= /usr/mdec
BINMODE= 444
STRIPFLAG=
-STRIP?= /usr/bin/strip
-
SRCS= srt0.S mboot.c
KERN!= cd ${.CURDIR}/../../../..; pwd
Index: src/sys/arch/x68k/stand/netboot/Makefile
diff -u src/sys/arch/x68k/stand/netboot/Makefile:1.5 src/sys/arch/x68k/stand/netboot/Makefile:1.6
--- src/sys/arch/x68k/stand/netboot/Makefile:1.5 Wed Aug 6 14:10:42 2014
+++ src/sys/arch/x68k/stand/netboot/Makefile Fri Aug 8 15:19:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/08/06 14:10:42 isaki Exp $
+# $NetBSD: Makefile,v 1.6 2014/08/08 15:19:51 isaki Exp $
NOMAN= # defined
@@ -22,7 +22,6 @@ BINMODE= 444
STRIPFLAG=
BFDNAME= a.out-m68k-netbsd
-STRIP?= /usr/bin/strip
# XXX shared sources should be in COMMONDIR
BOOTDIR= ${.CURDIR}/../boot
CVS commit: src/sys/arch/x68k/stand/xxboot
Module Name:src
Committed By: isaki
Date: Fri Aug 8 15:20:10 UTC 2014
Modified Files:
src/sys/arch/x68k/stand/xxboot: Makefile.xxboot
Log Message:
Remove OBJCOPY?=objcopy.
Falling back to the hosttool is not a good way now.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
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/xxboot/Makefile.xxboot
diff -u src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.2 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.3
--- src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.2 Mon Aug 12 16:34:05 2013
+++ src/sys/arch/x68k/stand/xxboot/Makefile.xxboot Fri Aug 8 15:20:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xxboot,v 1.2 2013/08/12 16:34:05 joerg Exp $
+# $NetBSD: Makefile.xxboot,v 1.3 2014/08/08 15:20:10 isaki Exp $
NOMAN= # defined
@@ -47,7 +47,6 @@ LINKFLAGS= -n -Bstatic -T ${.CURDIR}/.
LINKFLAGS+= -noinhibit-exec # XXX
.else
LINKFLAGS= -n -Bstatic -Ttext ${TEXT} -M
-OBJCOPY?= objcopy
.endif
LIBIOCS!= cd $M/stand/libiocs ${PRINTOBJDIR}
LIBSA!= cd $M/stand/libsa ${PRINTOBJDIR}
CVS commit: src
Module Name:src
Committed By: joerg
Date: Fri Aug 8 16:56:32 UTC 2014
Modified Files:
src/distrib/bebox/ramdisk: Makefile
src/distrib/evbppc/ramdisk: Makefile
src/distrib/ibmnws/netboot/ramdisk: Makefile
src/distrib/macppc/floppies/ramdisk: Makefile
src/distrib/prep/floppies/ramdisk: Makefile
src/distrib/rs6000/ramdisk: Makefile
src/distrib/sandpoint/ramdisk: Makefile
src/sys/arch/bebox/stand/common: Makefile
src/sys/arch/evbppc/conf: Makefile.mpc85xx.inc
src/sys/arch/ibmnws/conf: GENERIC
src/sys/arch/macppc/conf: INSTALL
src/sys/arch/macppc/stand/bootxx: Makefile
src/sys/arch/macppc/stand/ofwboot: Makefile
src/sys/arch/ofppc/stand/ofwboot: Makefile
src/sys/arch/powerpc/conf: Makefile.powerpc
src/sys/arch/prep/conf: INSTALL INSTALL_SMALL
src/sys/arch/prep/stand/boot: Makefile
src/sys/arch/prep/stand/common: Makefile
src/sys/arch/rs6000/conf: INSTALL
src/sys/arch/rs6000/stand/boot: Makefile
src/sys/arch/rs6000/stand/common: Makefile
src/sys/arch/sandpoint/stand/altboot: Makefile
src/sys/modules/arch/powerpc/powerpc-booke: bsd.powerpc-booke.mk
Log Message:
Don't set -mmultiple or -mno-string for PowerPC, the difference is too
small to really matter and it sometimes even increases the size.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/bebox/ramdisk/Makefile
cvs rdiff -u -r1.16 -r1.17 src/distrib/evbppc/ramdisk/Makefile
cvs rdiff -u -r1.11 -r1.12 src/distrib/ibmnws/netboot/ramdisk/Makefile
cvs rdiff -u -r1.45 -r1.46 src/distrib/macppc/floppies/ramdisk/Makefile
cvs rdiff -u -r1.20 -r1.21 src/distrib/prep/floppies/ramdisk/Makefile
cvs rdiff -u -r1.6 -r1.7 src/distrib/rs6000/ramdisk/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/sandpoint/ramdisk/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/bebox/stand/common/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/conf/Makefile.mpc85xx.inc
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/ibmnws/conf/GENERIC
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/macppc/conf/INSTALL
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/macppc/stand/bootxx/Makefile
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/macppc/stand/ofwboot/Makefile
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/ofppc/stand/ofwboot/Makefile
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/powerpc/conf/Makefile.powerpc
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/prep/conf/INSTALL
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/prep/conf/INSTALL_SMALL
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/prep/stand/boot/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/prep/stand/common/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/rs6000/conf/INSTALL
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/rs6000/stand/boot/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/stand/common/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sandpoint/stand/altboot/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/bebox/ramdisk/Makefile
diff -u src/distrib/bebox/ramdisk/Makefile:1.1 src/distrib/bebox/ramdisk/Makefile:1.2
--- src/distrib/bebox/ramdisk/Makefile:1.1 Sun Oct 17 11:05:18 2010
+++ src/distrib/bebox/ramdisk/Makefile Fri Aug 8 16:56:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/10/17 11:05:18 kiyohara Exp $
+# $NetBSD: Makefile,v 1.2 2014/08/08 16:56:30 joerg Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,7 @@ IMAGESIZE= 2048k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS=-d ${DBG}
Index: src/distrib/evbppc/ramdisk/Makefile
diff -u src/distrib/evbppc/ramdisk/Makefile:1.16 src/distrib/evbppc/ramdisk/Makefile:1.17
--- src/distrib/evbppc/ramdisk/Makefile:1.16 Tue Aug 14 07:24:40 2012
+++ src/distrib/evbppc/ramdisk/Makefile Fri Aug 8 16:56:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/08/14 07:24:40 martin Exp $
+# $NetBSD: Makefile,v 1.17 2014/08/08 16:56:30 joerg Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -8,7 +8,7 @@ IMAGESIZE= 2880k
MAKEFS_FLAGS= -f 15
WARNS= 1
-DBG= -Os -mmultiple -mno-string -fno-pie -fno-pic
+DBG= -Os
CRUNCHBIN= ramdiskbin
CRUNCHGEN_FLAGS=-d ${DBG}
Index: src/distrib/ibmnws/netboot/ramdisk/Makefile
diff -u src/distrib/ibmnws/netboot/ramdisk/Makefile:1.11 src/distrib/ibmnws/netboot/ramdisk/Makefile:1.12
--- src/distrib/ibmnws/netboot/ramdisk/Makefile:1.11 Tue Aug 14 07:24:41 2012
+++ src/distrib/ibmnws/netboot/ramdisk/Makefile Fri Aug 8 16:56:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/08/14 07:24:41 martin Exp $
+# $NetBSD: Makefile,v 1.12 2014/08/08 16:56:31 joerg Exp $
.include bsd.own.mk
.include
CVS commit: src/sys/fs/sysvbfs
Module Name:src Committed By: gson Date: Fri Aug 8 19:14:45 UTC 2014 Modified Files: src/sys/fs/sysvbfs: sysvbfs_vnops.c Log Message: Whitespace fix To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/fs/sysvbfs/sysvbfs_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/fs/sysvbfs/sysvbfs_vnops.c diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.53 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.54 --- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.53 Fri Feb 7 15:29:21 2014 +++ src/sys/fs/sysvbfs/sysvbfs_vnops.c Fri Aug 8 19:14:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sysvbfs_vnops.c,v 1.53 2014/02/07 15:29:21 hannken Exp $ */ +/* $NetBSD: sysvbfs_vnops.c,v 1.54 2014/08/08 19:14:45 gson Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sysvbfs_vnops.c,v 1.53 2014/02/07 15:29:21 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: sysvbfs_vnops.c,v 1.54 2014/08/08 19:14:45 gson Exp $); #include sys/param.h #include sys/kernel.h @@ -450,7 +450,7 @@ sysvbfs_read(void *arg) DPRINTF(%s: read %ldbyte\n, __func__, sz); } - return sysvbfs_update(v, NULL, NULL, UPDATE_WAIT); + return sysvbfs_update(v, NULL, NULL, UPDATE_WAIT); } int
CVS commit: src/sys/fs/v7fs
Module Name:src Committed By: gson Date: Fri Aug 8 19:15:33 UTC 2014 Modified Files: src/sys/fs/v7fs: v7fs_vnops.c Log Message: Whitespace fix To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/fs/v7fs/v7fs_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/fs/v7fs/v7fs_vnops.c diff -u src/sys/fs/v7fs/v7fs_vnops.c:1.16 src/sys/fs/v7fs/v7fs_vnops.c:1.17 --- src/sys/fs/v7fs/v7fs_vnops.c:1.16 Fri Feb 7 15:29:22 2014 +++ src/sys/fs/v7fs/v7fs_vnops.c Fri Aug 8 19:15:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: v7fs_vnops.c,v 1.16 2014/02/07 15:29:22 hannken Exp $ */ +/* $NetBSD: v7fs_vnops.c,v 1.17 2014/08/08 19:15:33 gson Exp $ */ /*- * Copyright (c) 2004, 2011 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: v7fs_vnops.c,v 1.16 2014/02/07 15:29:22 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: v7fs_vnops.c,v 1.17 2014/08/08 19:15:33 gson Exp $); #if defined _KERNEL_OPT #include opt_v7fs.h #endif @@ -587,7 +587,7 @@ v7fs_read(void *v) } v7node-update_atime = true; - return error; + return error; } int
CVS import: src/external/bsd/ekermit/dist
Module Name:src Committed By: apb Date: Fri Aug 8 19:20:39 UTC 2014 Update of /cvsroot/src/external/bsd/ekermit/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7737 Log Message: Import ekermit-1.7 from http://www.kermitproject.org/ftp/kermit/archives/ek17.tar EK (Embedded Kermit, E-Kermit) is an implementation of the Kermit file transfer protocol written in ANSI C and designed for embedding in devices or firmware, use in realtime applications, or for construction of DLLs and libraries. A sample calling environment and i/o support are provided for Unix. Status: Vendor Tag: EKERMIT Release Tags: EKERMIT_1_7 N src/external/bsd/ekermit/dist/platform.h N src/external/bsd/ekermit/dist/COPYING N src/external/bsd/ekermit/dist/makefile N src/external/bsd/ekermit/dist/kermit.h N src/external/bsd/ekermit/dist/kermit.c N src/external/bsd/ekermit/dist/unixio.c N src/external/bsd/ekermit/dist/main.c N src/external/bsd/ekermit/dist/cdefs.h N src/external/bsd/ekermit/dist/unix.h N src/external/bsd/ekermit/dist/debug.h No conflicts created by this import
CVS commit: src/usr.bin/make
Module Name:src Committed By: gson Date: Fri Aug 8 19:20:39 UTC 2014 Modified Files: src/usr.bin/make: main.c Log Message: Fix comment: Error, Fatal, and Punt take any number of arguments, not two. To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 src/usr.bin/make/main.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/make/main.c diff -u src/usr.bin/make/main.c:1.226 src/usr.bin/make/main.c:1.227 --- src/usr.bin/make/main.c:1.226 Fri Feb 7 17:23:35 2014 +++ src/usr.bin/make/main.c Fri Aug 8 19:20:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $ */ +/* $NetBSD: main.c,v 1.227 2014/08/08 19:20:39 gson Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = $NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $; +static char rcsid[] = $NetBSD: main.c,v 1.227 2014/08/08 19:20:39 gson Exp $; #else #include sys/cdefs.h #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94; #else -__RCSID($NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $); +__RCSID($NetBSD: main.c,v 1.227 2014/08/08 19:20:39 gson Exp $); #endif #endif /* not lint */ #endif @@ -99,14 +99,14 @@ __RCSID($NetBSD: main.c,v 1.226 2014/02 * * Error Print a tagged error message. The global *MAKE variable must have been defined. This - *takes a format string and two optional - *arguments for it. + *takes a format string and optional arguments + *for it. * * Fatal Print an error message and exit. Also takes - *a format string and two arguments. + *a format string and arguments for it. * * Punt Aborts all jobs and exits with a message. Also - *takes a format string and two arguments. + *takes a format string and arguments for it. * * Finish Finish things up by printing the number of *errors which occurred, as passed to it, and
CVS commit: src/external/bsd/ekermit/dist
Module Name:src
Committed By: apb
Date: Fri Aug 8 19:29:34 UTC 2014
Modified Files:
src/external/bsd/ekermit/dist: kermit.h platform.h
Log Message:
Make ekermit compile on NetBSD:
* Add several #includes of standard headers in platform.h.
* #undef X_OK in platform.h. It's defined in the standard access.h,
but also used in the local kermit.h for a differentpurpose.
* Declare {struct k_data}.dbf as a function returning void, not int,
to match the way it's used.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ekermit/dist/kermit.h \
src/external/bsd/ekermit/dist/platform.h
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/ekermit/dist/kermit.h
diff -u src/external/bsd/ekermit/dist/kermit.h:1.1.1.1 src/external/bsd/ekermit/dist/kermit.h:1.2
--- src/external/bsd/ekermit/dist/kermit.h:1.1.1.1 Fri Aug 8 19:20:39 2014
+++ src/external/bsd/ekermit/dist/kermit.h Fri Aug 8 19:29:34 2014
@@ -383,7 +383,7 @@ struct k_data {
int (*readf)(struct k_data *); /* read-file function */
int (*writef)(struct k_data *,UCHAR *, int); /* write-file function */
int (*closef)(struct k_data *,UCHAR,int);/* close-file function */
-int (*dbf)(int,UCHAR *,UCHAR *,long); /* debug function */
+void (*dbf)(int,UCHAR *,UCHAR *,long); /* debug function */
UCHAR * zinbuf; /* Input file buffer itself */
int zincnt;/* Input buffer position */
int zinlen;/* Length of input file buffer */
Index: src/external/bsd/ekermit/dist/platform.h
diff -u src/external/bsd/ekermit/dist/platform.h:1.1.1.1 src/external/bsd/ekermit/dist/platform.h:1.2
--- src/external/bsd/ekermit/dist/platform.h:1.1.1.1 Fri Aug 8 19:20:38 2014
+++ src/external/bsd/ekermit/dist/platform.h Fri Aug 8 19:29:34 2014
@@ -1,8 +1,14 @@
/* Unix platform.h for EK */
+#include ctype.h
+#include errno.h
#include stdio.h
+#include stdlib.h
+#include unistd.h
#include sys/stat.h
+#undef X_OK /* namespace collision between kermit.h and unistd.h */
+
#ifndef IBUFLEN
#define IBUFLEN 4096 /* File input buffer size */
#endif /* IBUFLEN */
CVS commit: src/external/bsd/ekermit
Module Name:src
Committed By: apb
Date: Fri Aug 8 19:30:35 UTC 2014
Added Files:
src/external/bsd/ekermit: Makefile Makefile.inc
src/external/bsd/ekermit/bin: Makefile
src/external/bsd/ekermit/bin/ekermit: Makefile
Log Message:
Add reachover build infrastructure for ekermit.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/ekermit/Makefile \
src/external/bsd/ekermit/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/ekermit/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/ekermit/bin/ekermit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/ekermit/Makefile
diff -u /dev/null src/external/bsd/ekermit/Makefile:1.1
--- /dev/null Fri Aug 8 19:30:35 2014
+++ src/external/bsd/ekermit/Makefile Fri Aug 8 19:30:35 2014
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2014/08/08 19:30:35 apb Exp $
+
+SUBDIR= bin
+
+.include bsd.subdir.mk
Index: src/external/bsd/ekermit/Makefile.inc
diff -u /dev/null src/external/bsd/ekermit/Makefile.inc:1.1
--- /dev/null Fri Aug 8 19:30:35 2014
+++ src/external/bsd/ekermit/Makefile.inc Fri Aug 8 19:30:35 2014
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/08/08 19:30:35 apb Exp $
+
+.include bsd.own.mk
+
+EKERMITDIST:= ${.PARSEDIR}/dist
Index: src/external/bsd/ekermit/bin/Makefile
diff -u /dev/null src/external/bsd/ekermit/bin/Makefile:1.1
--- /dev/null Fri Aug 8 19:30:35 2014
+++ src/external/bsd/ekermit/bin/Makefile Fri Aug 8 19:30:35 2014
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2014/08/08 19:30:35 apb Exp $
+
+SUBDIR= ekermit
+
+.include bsd.subdir.mk
Index: src/external/bsd/ekermit/bin/ekermit/Makefile
diff -u /dev/null src/external/bsd/ekermit/bin/ekermit/Makefile:1.1
--- /dev/null Fri Aug 8 19:30:35 2014
+++ src/external/bsd/ekermit/bin/ekermit/Makefile Fri Aug 8 19:30:35 2014
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2014/08/08 19:30:35 apb Exp $
+
+.include ../../Makefile.inc
+
+BINDIR= /usr/bin
+PROG= ekermit
+SRCS= main.c kermit.c unixio.c
+
+#MAN= ekermit.1
+MAN= # XXX no man page
+
+.PATH: ${EKERMITDIST}
+
+.include bsd.prog.mk
CVS commit: src
Module Name:src Committed By: apb Date: Fri Aug 8 19:34:35 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi src/external/bsd: Makefile Log Message: Add ekermit to the build. It will replace gkermit, as proposed in tech-userlevel on 7 Aug 2014. To generate a diff of this commit: cvs rdiff -u -r1.1083 -r1.1084 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.46 -r1.47 src/external/bsd/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/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1083 src/distrib/sets/lists/base/mi:1.1084 --- src/distrib/sets/lists/base/mi:1.1083 Wed Aug 6 19:24:00 2014 +++ src/distrib/sets/lists/base/mi Fri Aug 8 19:34:35 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1083 2014/08/06 19:24:00 apb Exp $ +# $NetBSD: mi,v 1.1084 2014/08/08 19:34:35 apb Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -474,6 +474,7 @@ ./usr/bin/du base-util-bin ./usr/bin/egrep base-util-bin ./usr/bin/eject base-util-bin +./usr/bin/ekermitbase-util-bin ./usr/bin/env base-util-bin ./usr/bin/error base-util-bin ./usr/bin/ex base-util-bin Index: src/external/bsd/Makefile diff -u src/external/bsd/Makefile:1.46 src/external/bsd/Makefile:1.47 --- src/external/bsd/Makefile:1.46 Wed Dec 25 22:04:20 2013 +++ src/external/bsd/Makefile Fri Aug 8 19:34:35 2014 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.46 2013/12/25 22:04:20 christos Exp $ +# $NetBSD: Makefile,v 1.47 2014/08/08 19:34:35 apb Exp $ .include bsd.own.mk -SUBDIR= acpica am-utils bind byacc cron dhcpcd elftosb fetch file flex less \ +SUBDIR= acpica am-utils bind byacc cron dhcpcd ekermit elftosb \ + fetch file flex less \ libarchive libevent liblzf libpcap mdocml ntp openresolv tcpdump \ tmux top tre wpa
CVS commit: src/sys/sys
Module Name:src
Committed By: joerg
Date: Fri Aug 8 19:43:49 UTC 2014
Modified Files:
src/sys/sys: cdefs.h
Log Message:
Add __unreachable(), which can be used to mark dead branches when the
compiler can't tell side effects.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/sys/cdefs.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/sys/cdefs.h
diff -u src/sys/sys/cdefs.h:1.120 src/sys/sys/cdefs.h:1.121
--- src/sys/sys/cdefs.h:1.120 Mon Jul 14 18:50:22 2014
+++ src/sys/sys/cdefs.h Fri Aug 8 19:43:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.120 2014/07/14 18:50:22 plunky Exp $ */
+/* $NetBSD: cdefs.h,v 1.121 2014/08/08 19:43:49 joerg Exp $ */
/* * Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -296,6 +296,12 @@
#define __noprofile /* nothing */
#endif
+#if __GNUC_PREREQ__(4, 6) || defined(__clang__)
+#define __unreachable() __builtin_unreachable()
+#else
+#define __unreachable() do {} while (0)
+#endif
+
#if defined(__cplusplus)
#define __BEGIN_EXTERN_C extern C {
#define __END_EXTERN_C }
CVS commit: src/gnu
Module Name:src Committed By: apb Date: Fri Aug 8 19:45:06 UTC 2014 Removed Files: src/gnu/dist/gkermit: ANNOUNCE COPYING README gcmdline.c gkermit.c gkermit.h gkermit.nr gproto.c gproto.w gunixio.c gwart.c makefile src/gnu/usr.bin/gkermit: Makefile Log Message: Delete gnu/dist/gkermit, and the reachover Makefile in gnu/usr.bin/gkermit. It is being replaced by the BSD-licenced ekermit, as proposed on tech-userlevel on 7 Aug 2014. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/gnu/dist/gkermit/ANNOUNCE \ src/gnu/dist/gkermit/COPYING src/gnu/dist/gkermit/README \ src/gnu/dist/gkermit/gkermit.h src/gnu/dist/gkermit/gproto.c \ src/gnu/dist/gkermit/gproto.w src/gnu/dist/gkermit/gwart.c \ src/gnu/dist/gkermit/makefile cvs rdiff -u -r1.2 -r0 src/gnu/dist/gkermit/gcmdline.c \ src/gnu/dist/gkermit/gkermit.nr cvs rdiff -u -r1.4 -r0 src/gnu/dist/gkermit/gkermit.c cvs rdiff -u -r1.3 -r0 src/gnu/dist/gkermit/gunixio.c cvs rdiff -u -r1.3 -r0 src/gnu/usr.bin/gkermit/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: joerg
Date: Fri Aug 8 19:45:48 UTC 2014
Modified Files:
src/sys/arch/bebox/stand/boot: boot.c
src/sys/arch/prep/stand/boot: boot.c
Log Message:
Mark _rtt as dead
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/bebox/stand/boot/boot.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/prep/stand/boot/boot.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/bebox/stand/boot/boot.c
diff -u src/sys/arch/bebox/stand/boot/boot.c:1.26 src/sys/arch/bebox/stand/boot/boot.c:1.27
--- src/sys/arch/bebox/stand/boot/boot.c:1.26 Wed Dec 19 13:53:47 2012
+++ src/sys/arch/bebox/stand/boot/boot.c Fri Aug 8 19:45:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.26 2012/12/19 13:53:47 kiyohara Exp $ */
+/* $NetBSD: boot.c,v 1.27 2014/08/08 19:45:48 joerg Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -253,4 +253,5 @@ _rtt(void)
{
/* */
+ __unreachable();
}
Index: src/sys/arch/prep/stand/boot/boot.c
diff -u src/sys/arch/prep/stand/boot/boot.c:1.19 src/sys/arch/prep/stand/boot/boot.c:1.20
--- src/sys/arch/prep/stand/boot/boot.c:1.19 Sat May 19 14:40:13 2012
+++ src/sys/arch/prep/stand/boot/boot.c Fri Aug 8 19:45:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.19 2012/05/19 14:40:13 kiyohara Exp $ */
+/* $NetBSD: boot.c,v 1.20 2014/08/08 19:45:48 joerg Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -238,4 +238,5 @@ _rtt(void)
{
/* */
+ __unreachable();
}
CVS commit: src/doc
Module Name:src Committed By: apb Date: Fri Aug 8 19:50:45 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: gkermit has been replaced by ekermit. To generate a diff of this commit: cvs rdiff -u -r1.1142 -r1.1143 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1142 src/doc/3RDPARTY:1.1143 --- src/doc/3RDPARTY:1.1142 Fri Aug 8 11:00:56 2014 +++ src/doc/3RDPARTY Fri Aug 8 19:50:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1142 2014/08/08 11:00:56 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1143 2014/08/08 19:50:45 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -331,6 +331,18 @@ Notes: Use src/gnu/dist/diffutils/diffutils2netbsd for preparing the source tree for the import. +Package: ekermit +Version: 1.7 +Current Vers: 1.7 +Maintainer: Kermit Project +Archive Site: ftp://ftp.kermitproject.org/kermit/ekermit/ +Home Page: http://www.kermitproject.org/ek.html +Mailing List: +Responsible: apb +License: BSD (3 clause) +Location: external/bsd/ekermit +Notes: + Package: expat Version: 2.1.0 Current Vers: 2.1.0 @@ -445,18 +457,6 @@ GNU gettext is used for userland tools l we use BSD-licensed implementation from Citrus project (see entry for Citrus XPG4DL). We hope to replace userland tools with BSD-licensed one. -Package: gkermit -Version: 1.00 -Current Vers: 1.00 -Maintainer: Kermit Project - Columbia University ker...@columbia.edu -Archive Site: ftp://kermit.columbia.edu/kermit/archives/ -Home Page: http://www.columbia.edu/kermit/ -Mailing List: -Responsible: apb -License: GPLv2 -Location: gnu/dist/gkermit -Notes: - Package: grep Version: 2.5.1 Current Vers: 2.19
CVS commit: src/doc
Module Name:src Committed By: apb Date: Fri Aug 8 20:20:43 UTC 2014 Modified Files: src/doc: CHANGES Log Message: gkermit has been replaced by ekermit. To generate a diff of this commit: cvs rdiff -u -r1.1958 -r1.1959 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1958 src/doc/CHANGES:1.1959 --- src/doc/CHANGES:1.1958 Wed Aug 6 19:28:20 2014 +++ src/doc/CHANGES Fri Aug 8 20:20:42 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1958 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1959 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -462,3 +462,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: in /etc/release, as well as in sysctl kern.buildinfo. [apb 20140803] zoneinfo: Import tzdata2014f. [apb 20140806] + ekermit(1): Add BSD-licenced ekermit, and remove GPL-licenced + gkermit. [apb 20140808]
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: joerg
Date: Fri Aug 8 21:13:05 UTC 2014
Modified Files:
src/sys/arch/amiga/dev: kbdmap.c
Log Message:
Avoid non-UTF8 input.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amiga/dev/kbdmap.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/amiga/dev/kbdmap.c
diff -u src/sys/arch/amiga/dev/kbdmap.c:1.12 src/sys/arch/amiga/dev/kbdmap.c:1.13
--- src/sys/arch/amiga/dev/kbdmap.c:1.12 Mon Jan 28 09:57:00 2002
+++ src/sys/arch/amiga/dev/kbdmap.c Fri Aug 8 21:13:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdmap.c,v 1.12 2002/01/28 09:57:00 aymeric Exp $ */
+/* $NetBSD: kbdmap.c,v 1.13 2014/08/08 21:13:05 joerg Exp $ */
/*
* Copyright (c) 1993 Markus Wild
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kbdmap.c,v 1.12 2002/01/28 09:57:00 aymeric Exp $);
+__KERNEL_RCSID(0, $NetBSD: kbdmap.c,v 1.13 2014/08/08 21:13:05 joerg Exp $);
#include amiga/dev/kbdmap.h
@@ -254,46 +254,46 @@ struct kbdmap ascii_kbdmap = {
/* alt map */
{
{ 0, '`' }, /* 0x00 */
- { 0, '¹' },
- { 0, '²' },
- { 0, '³' },
- { 0, '¢' },
- { 0, '¼' },
- { 0, '½' },
- { 0, '¾' },
- { 0, '·' }, /* 0x08 */
- { 0, '«' },
- { 0, '»' },
+ { 0, '\xb9' },
+ { 0, '\xb2' },
+ { 0, '\xb3' },
+ { 0, '\xa2' },
+ { 0, '\xbc' },
+ { 0, '\xbd' },
+ { 0, '\xbe' },
+ { 0, '\xb7' }, /* 0x08 */
+ { 0, '\xab' },
+ { 0, '\xbb' },
{ 0, '-' },
{ 0, '=' },
{ 0, '\\' },
{ 0, 0 },
{ K, '0' },
- { C, 'å' }, /* 0x10 */
- { 0, '°' },
- { 0, '©' },
- { 0, '®' },
- { C, 'þ' },
- { 0, '¤' },
- { 0, 'µ' },
- { 0, '¡' },
- { C, 'ø' }, /* 0x18 */
- { 0, '¶' },
+ { C, '\xe5' }, /* 0x10 */
+ { 0, '\xb0' },
+ { 0, '\xa9' },
+ { 0, '\xae' },
+ { C, '\xfe' },
+ { 0, '\xa4' },
+ { 0, '\xb5' },
+ { 0, '\xa1' },
+ { C, '\xf8' }, /* 0x18 */
+ { 0, '\xb6' },
{ 0, '[' },
{ 0, ']' },
{ 0, 0 },
{ K, '1' },
{ K, '2' },
{ K, '3' },
- { C, 'æ' }, /* 0x20 */
- { 0, 'ß' },
- { C, 'ð' },
- { DA, '´' },
+ { C, '\xe6' }, /* 0x20 */
+ { 0, '\xdf' },
+ { C, '\xf0' },
+ { DA, '\xb4' },
{ DG, '`' },
{ DC, '^' },
{ DT, '~' },
- { DD, '¨' },
- { 0, '£' }, /* 0x28 */
+ { DD, '\xa8' },
+ { 0, '\xa3' }, /* 0x28 */
{ 0, ';' },
{ 0, '\'' },
{ 0, 0 },
@@ -302,13 +302,13 @@ struct kbdmap ascii_kbdmap = {
{ K, '5' },
{ K, '6' },
{ 0, 0 }, /* 0x30 */
- { 0, '±' },
- { 0, '×' },
- { C, 'ç' },
- { 0, 'ª' },
- { 0, 'º' },
- { 0, '' },
- { 0, '¸' },
+ { 0, '\xb1' },
+ { 0, '\xd7' },
+ { C, '\xe7' },
+ { 0, '\xaa' },
+ { 0, '\xba' },
+ { 0, '\xad' },
+ { 0, '\xb8' },
{ 0, ',' }, /* 0x38 */
{ 0, '.' },
{ 0, '/' },
@@ -369,31 +369,31 @@ struct kbdmap ascii_kbdmap = {
{ 0, '|' },
{ 0, 0 },
{ K, '0' },
- { C, 'Å' }, /* 0x10 */
- { 0, '°' },
- { 0, '©' },
- { 0, '®' },
- { C, 'Þ' },
- { 0, '¥' },
- { 0, 'µ' },
- { 0, '¦' },
- { C, 'Ø' }, /* 0x18 */
- { 0, '¶' },
+ { C, '\xc5' }, /* 0x10 */
+ { 0, '\xb0' },
+ { 0, '\xa9' },
+ { 0, '\xae' },
+ { C, '\xde' },
+ { 0, '\xa5' },
+ { 0, '\xb5' },
+ { 0, '\xa6' },
+ { C, '\xd8' }, /* 0x18 */
+ { 0, '\xb6' },
{ 0, '[' },
{ 0, ']' },
{ 0, 0 },
{ K, '1' },
{ K, '2' },
{ K, '3' },
- { C, 'Æ' }, /* 0x20 */
- { 0, '§' },
- { C, 'Ð' },
- { DA, '´' },
+ { C, '\xc6' }, /* 0x20 */
+ { 0, '\xa7' },
+ { C, '\xd0' },
+ { DA, '\xb4' },
{ DG, '`' },
{ DC, '^' },
{ DT, '~' },
- { DD, '¨' },
- { 0, '£' }, /* 0x28 */
+ { DD, '\xa8' },
+ { 0, '\xa3' }, /* 0x28 */
{ 0, ';' },
{ 0, '\'' },
{ 0, 0 },
@@ -402,13 +402,13 @@ struct kbdmap ascii_kbdmap = {
{ K, '5' },
{ K, '6' },
{ 0, 0 }, /* 0x30 */
- { 0, '±' },
- { 0, '×' },
- { C, 'ç' },
- { 0, 'ª' },
- { 0, 'º' },
- { 0, '' },
- { 0, '¸' },
+ { 0, '\xb1' },
+ { 0, '\xd7' },
+ { C, '\xe7' },
+ { 0, '\xaa' },
+ { 0, '\xba' },
+ { 0, '\xad' },
+ { 0, '\xb8' },
{ 0, ',' }, /* 0x38 */
{ 0, '.' },
{ 0, '/' },
@@ -495,19 +495,19 @@ struct kbdmap ascii_kbdmap = {
};
unsigned char acctable[KBD_NUM_ACC][64] = {
- { @ÀBCDÈFGHÌJKLMNÒPQRSTÙVWXYZ[\\]^_
- `àbcdèfghìjklmnòpqrstùvwxyz{|}~\177}, /* KBD_ACC_GRAVE */
+ { @\xc0BCD\xc8FGH\xccJKLMN\xd2PQRST\xd9VWXYZ[\\]^_
+ `\xe0bcd\xe8fgh\xecjklmn\xf2pqrst\xf9vwxyz{|}~\177}, /* KBD_ACC_GRAVE */
- { @ÁBCDÉFGHÍJKLMNÓPQRSTÚVWXYZ[\\]^_
- `ábcdéfghíjklmnópqrstúvwxyz{|}~\177}, /* KBD_ACC_ACUTE */
+ { @\xc1BCD\xc9FGH\xcdJKLMN\xd3PQRST\xdaVWXYZ[\\]^_
+ `\xe1bcd\xe9fgh\xedjklmn\xf3pqrst\xfavwxyz{|}~\177}, /* KBD_ACC_ACUTE */
- {
CVS commit: src/sys/arch/amiga/dev
Module Name:src Committed By: joerg Date: Fri Aug 8 21:13:52 UTC 2014 Modified Files: src/sys/arch/amiga/dev: fd.c Log Message: Fix misspelling of binary and as logical and. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/amiga/dev/fd.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/amiga/dev/fd.c diff -u src/sys/arch/amiga/dev/fd.c:1.91 src/sys/arch/amiga/dev/fd.c:1.92 --- src/sys/arch/amiga/dev/fd.c:1.91 Fri Jul 25 08:10:31 2014 +++ src/sys/arch/amiga/dev/fd.c Fri Aug 8 21:13:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.91 2014/07/25 08:10:31 dholland Exp $ */ +/* $NetBSD: fd.c,v 1.92 2014/08/08 21:13:52 joerg Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.91 2014/07/25 08:10:31 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.92 2014/08/08 21:13:52 joerg Exp $); #include sys/param.h #include sys/systm.h @@ -1851,7 +1851,7 @@ again: * if we are at gap then we can no longer be sure * of correct sync marks */ - if ((info 0xff) == 1) + if ((info 0xff) == 1) doagain = 1; else doagain = 0;
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: joerg Date: Fri Aug 8 21:18:10 UTC 2014 Modified Files: src/sys/arch/sandpoint/stand/altboot: brdsetup.c Log Message: Use __unreachable(). To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sandpoint/stand/altboot/brdsetup.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/sandpoint/stand/altboot/brdsetup.c diff -u src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.34 src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.35 --- src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.34 Tue Aug 5 17:55:20 2014 +++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c Fri Aug 8 21:18:10 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: brdsetup.c,v 1.34 2014/08/05 17:55:20 joerg Exp $ */ +/* $NetBSD: brdsetup.c,v 1.35 2014/08/08 21:18:10 joerg Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -859,7 +859,7 @@ _rtt(void) asm volatile (sync; isync); run(0, 0, 0, 0, (void *)0xFFF00100); /* reset entry */ } - /*NOTREACHED*/ + __unreachable(); } satime_t
CVS commit: src/external/bsd/ekermit/bin/ekermit
Module Name:src Committed By: apb Date: Fri Aug 8 21:38:45 UTC 2014 Added Files: src/external/bsd/ekermit/bin/ekermit: ekermit.1 Log Message: Add a simple man page for ekermit(1). This is derived from the help output and the web page http://www.kermitproject.org/ek.html To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/ekermit/bin/ekermit/ekermit.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/bsd/ekermit/bin/ekermit/ekermit.1 diff -u /dev/null src/external/bsd/ekermit/bin/ekermit/ekermit.1:1.1 --- /dev/null Fri Aug 8 21:38:45 2014 +++ src/external/bsd/ekermit/bin/ekermit/ekermit.1 Fri Aug 8 21:38:45 2014 @@ -0,0 +1,125 @@ +.\ $NetBSD: ekermit.1,v 1.1 2014/08/08 21:38:45 apb Exp $ +.Dd August 8, 2014 +.Os +.Dt MAKE 1 +.\ .Os [OPERATING_SYSTEM] [version/release] +.Sh NAME +.Nm ekermit +.Nd Send or receive files using Kermit file transfer protocol +.Sh SYNOPSIS +.Nm +.Op options +.Sh DESCRIPTION +.Nm +is a simple command line interface to +EK (Embedded Kermit, E-Kermit), +which is an implementation of the Kermit file +transfer protocol written in ANSI C and designed for embedding in devices or +firmware, use in realtime applications, or for construction of DLLs and +libraries. +.Pp +.\ What E-Kermit Does +EK performs just two functions: sending files and receiving files. +.\ What E-Kermit Does NOT Do +EK does not include client/server functions; a command or script +programming language; character-set conversion; transport encryption; +or any form of communications or file input/output. +It does not dial modems, it does not make connections, +it does not have a built-in TCP/IP stack or interface to an external one. +If you need these features, then you should use a full Kermit program, +such as C-Kermit or Kermit 95. +.Pp +The followiong options are available: +.Bl -tag -width XsXfileX... +.It Fl r +Receive files. +.It Fl s Ar file ... +Send files. +.It Fl p Ar neoms +Parity: none, even, odd, mark, space. +.It Fl b Ar 1235 +Block check type: 1, 2, 3, or 5 +.It Fl k +Keep incompletely received files. +.It Fl B +Force binary mode. +.It Fl T +Force text mode. +.It Fl R +Remote mode (vs local). +.It Fl L +Local mode (vs remote). +.It Fl E Ar number +Simulated error rate (0-100). +.It Fl d +Create +.Pa debug.log . +.It Fl h +Display a help message. +.El +. +.Sh IMPLEMENTATION NOTES +EK includes the following Kermit Protocol features: +.Bl -bullet -offset indent -compact +.It +Long packets. +.It +Sliding windows with Go-Back-to-N error recovery. +.It +Repeat-count compression. +.It +Control-character prefixing and unprefixing. +.It +8th-bit prefixing (for transferring 8-bit data on 7-bit links) (= parity). +.It +Attribute packets (type, size, and date). +.It +Sending and receiving single or multiple files. +.It +Automatic per-file text/binary mode switching. +.It +All three block check types (6- and 12-bit checksum, 16-bit CRC). +.It +Status reports (protocol state, file name, size, timestamp, bytes so far). +.It +Transfer cancellation by either party. +.El +.Pp +The following Kermit Protocol features are not implemented: +.Bl -bullet -offset indent -compact +.It +Sliding windows with selective retransmission. +.It +Character sets. +.It +Locking shifts. +.It +Client/server. +.El +.Pp +Because EK is designed primarily for embedding, it does not use +streaming or (except in EKSW) true sliding windows (although much of the +sliding windows code is there). +.Pp +The lack of true sliding windows in EK is compensated by having EK +pretend to support them without really doing so. +This allows its sending partner to stream packets rather than waiting +for ACKs after each one, as long as there isn't an error. +If there is an error, the recovery strategy is go back to n (or +perhaps in some cases error out) rather than selective repeat. +EKSW, a separate program that has not been integrated with EK (but +should be), supports true sliding windows with selective repeat; that +is, only those packets are retransmitted that actually need to be. +.Pp +In any event, since EK is intended primarily for embedding, it is +anticipated that round-trip delays won't be a big factor; connections +will generally be local, short, relatively fast, and if the connection +is effectively flow controlled, error-free. +When effective flow control is lacking, the speed and/or packet length +and/or window size can be set to a combination of values that maximizes +throughput and minimizes data loss. +.Sh SEE ALSO +.Lk http://www.kermitproject.org/ek.html +.Sh HISTORY +Version 1.1 of EK was released in 2002. +A BSD-licenced version 1.6 was released in 2011.
CVS commit: src
Module Name:src
Committed By: apb
Date: Fri Aug 8 21:41:46 UTC 2014
Modified Files:
src/distrib/sets/lists/man: mi
src/external/bsd/ekermit/bin/ekermit: Makefile
Log Message:
Install man page for ekermit(1).
To generate a diff of this commit:
cvs rdiff -u -r1.1483 -r1.1484 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ekermit/bin/ekermit/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/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1483 src/distrib/sets/lists/man/mi:1.1484
--- src/distrib/sets/lists/man/mi:1.1483 Fri Aug 8 19:38:47 2014
+++ src/distrib/sets/lists/man/mi Fri Aug 8 21:41:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1483 2014/08/08 19:38:47 apb Exp $
+# $NetBSD: mi,v 1.1484 2014/08/08 21:41:46 apb Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -155,6 +155,7 @@
./usr/share/man/cat1/ed.0 man-util-catman .cat
./usr/share/man/cat1/egrep.0 man-util-catman .cat
./usr/share/man/cat1/eject.0 man-util-catman .cat
+./usr/share/man/cat1/ekermit.0 man-util-catman .cat
./usr/share/man/cat1/env.0 man-util-catman .cat
./usr/share/man/cat1/error.0 man-util-catman .cat
./usr/share/man/cat1/ex.0 man-util-catman .cat
@@ -3279,6 +3280,7 @@
./usr/share/man/html1/ed.html man-util-htmlman html
./usr/share/man/html1/egrep.html man-util-htmlman html
./usr/share/man/html1/eject.html man-util-htmlman html
+./usr/share/man/html1/ekermit.html man-util-htmlman html
./usr/share/man/html1/env.html man-util-htmlman html
./usr/share/man/html1/error.html man-util-htmlman html
./usr/share/man/html1/ex.html man-util-htmlman html
@@ -6016,6 +6018,7 @@
./usr/share/man/man1/ed.1 man-util-man .man
./usr/share/man/man1/egrep.1 man-util-man .man
./usr/share/man/man1/eject.1 man-util-man .man
+./usr/share/man/man1/ekermit.1 man-util-man .man
./usr/share/man/man1/env.1 man-util-man .man
./usr/share/man/man1/error.1 man-util-man .man
./usr/share/man/man1/ex.1 man-util-man .man
Index: src/external/bsd/ekermit/bin/ekermit/Makefile
diff -u src/external/bsd/ekermit/bin/ekermit/Makefile:1.1 src/external/bsd/ekermit/bin/ekermit/Makefile:1.2
--- src/external/bsd/ekermit/bin/ekermit/Makefile:1.1 Fri Aug 8 19:30:35 2014
+++ src/external/bsd/ekermit/bin/ekermit/Makefile Fri Aug 8 21:41:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/08/08 19:30:35 apb Exp $
+# $NetBSD: Makefile,v 1.2 2014/08/08 21:41:46 apb Exp $
.include ../../Makefile.inc
@@ -6,8 +6,7 @@ BINDIR= /usr/bin
PROG= ekermit
SRCS= main.c kermit.c unixio.c
-#MAN= ekermit.1
-MAN= # XXX no man page
+MAN= ekermit.1
.PATH: ${EKERMITDIST}
CVS commit: src/external/bsd/ekermit/bin/ekermit
Module Name:src Committed By: wiz Date: Fri Aug 8 21:46:36 UTC 2014 Modified Files: src/external/bsd/ekermit/bin/ekermit: ekermit.1 Log Message: Add option list to SYNOPSIS. Sort option descriptions. Use Nm when speaking of itself. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ekermit/bin/ekermit/ekermit.1 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/ekermit/bin/ekermit/ekermit.1 diff -u src/external/bsd/ekermit/bin/ekermit/ekermit.1:1.1 src/external/bsd/ekermit/bin/ekermit/ekermit.1:1.2 --- src/external/bsd/ekermit/bin/ekermit/ekermit.1:1.1 Fri Aug 8 21:38:45 2014 +++ src/external/bsd/ekermit/bin/ekermit/ekermit.1 Fri Aug 8 21:46:36 2014 @@ -1,14 +1,17 @@ -.\ $NetBSD: ekermit.1,v 1.1 2014/08/08 21:38:45 apb Exp $ +.\ $NetBSD: ekermit.1,v 1.2 2014/08/08 21:46:36 wiz Exp $ .Dd August 8, 2014 -.Os .Dt MAKE 1 -.\ .Os [OPERATING_SYSTEM] [version/release] +.Os .Sh NAME .Nm ekermit .Nd Send or receive files using Kermit file transfer protocol .Sh SYNOPSIS .Nm -.Op options +.Op Fl BdhkLRrT +.Op Fl b Ar 1235 +.Op Fl E Ar number +.Op Fl p Ar neoms +.Op Fl s Ar file .Sh DESCRIPTION .Nm is a simple command line interface to @@ -19,47 +22,51 @@ firmware, use in realtime applications, libraries. .Pp .\ What E-Kermit Does -EK performs just two functions: sending files and receiving files. +.Nm +performs just two functions: sending files and receiving files. .\ What E-Kermit Does NOT Do -EK does not include client/server functions; a command or script +.Pp +.Nm +does not include client/server functions; a command or script programming language; character-set conversion; transport encryption; or any form of communications or file input/output. It does not dial modems, it does not make connections, it does not have a built-in TCP/IP stack or interface to an external one. If you need these features, then you should use a full Kermit program, -such as C-Kermit or Kermit 95. +such as C-Kermit or Kermit 95. .Pp The followiong options are available: -.Bl -tag -width XsXfileX... -.It Fl r -Receive files. -.It Fl s Ar file ... -Send files. -.It Fl p Ar neoms -Parity: none, even, odd, mark, space. -.It Fl b Ar 1235 -Block check type: 1, 2, 3, or 5 -.It Fl k -Keep incompletely received files. +.Bl -tag -width XsXfileX... -offset indent .It Fl B Force binary mode. -.It Fl T -Force text mode. -.It Fl R -Remote mode (vs local). -.It Fl L -Local mode (vs remote). -.It Fl E Ar number -Simulated error rate (0-100). +.It Fl b Ar 1235 +Block check type: 1, 2, 3, or 5. .It Fl d Create .Pa debug.log . +.It Fl E Ar number +Simulated error rate (0-100). .It Fl h Display a help message. +.It Fl k +Keep incompletely received files. +.It Fl L +Local mode (vs remote). +.It Fl p Ar neoms +Parity: none, even, odd, mark, space. +.It Fl R +Remote mode (vs local). +.It Fl r +Receive files. +.It Fl s Ar file ... +Send files. +.It Fl T +Force text mode. .El . .Sh IMPLEMENTATION NOTES -EK includes the following Kermit Protocol features: +.Nm +includes the following Kermit Protocol features: .Bl -bullet -offset indent -compact .It Long packets. @@ -82,7 +89,7 @@ All three block check types (6- and 12-b .It Status reports (protocol state, file name, size, timestamp, bytes so far). .It -Transfer cancellation by either party. +Transfer cancellation by either party. .El .Pp The following Kermit Protocol features are not implemented: @@ -97,21 +104,30 @@ Locking shifts. Client/server. .El .Pp -Because EK is designed primarily for embedding, it does not use +Because +.Nm +is designed primarily for embedding, it does not use streaming or (except in EKSW) true sliding windows (although much of the sliding windows code is there). .Pp -The lack of true sliding windows in EK is compensated by having EK +The lack of true sliding windows in +.Nm +is compensated by having +.Nm pretend to support them without really doing so. This allows its sending partner to stream packets rather than waiting for ACKs after each one, as long as there isn't an error. If there is an error, the recovery strategy is go back to n (or perhaps in some cases error out) rather than selective repeat. -EKSW, a separate program that has not been integrated with EK (but +EKSW, a separate program that has not been integrated with +.Nm +(but should be), supports true sliding windows with selective repeat; that is, only those packets are retransmitted that actually need to be. .Pp -In any event, since EK is intended primarily for embedding, it is +In any event, since +.Nm +is intended primarily for embedding, it is anticipated that round-trip delays won't be a big factor; connections will generally be local, short, relatively fast, and if the connection is effectively flow controlled, error-free. @@ -121,5 +137,7 @@ throughput and minimizes data loss. .Sh SEE ALSO .Lk
CVS commit: src/external/bsd/ekermit/bin/ekermit
Module Name:src Committed By: apb Date: Fri Aug 8 21:57:31 UTC 2014 Modified Files: src/external/bsd/ekermit/bin/ekermit: ekermit.1 Log Message: Fix name in .Dt, and fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ekermit/bin/ekermit/ekermit.1 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/ekermit/bin/ekermit/ekermit.1 diff -u src/external/bsd/ekermit/bin/ekermit/ekermit.1:1.2 src/external/bsd/ekermit/bin/ekermit/ekermit.1:1.3 --- src/external/bsd/ekermit/bin/ekermit/ekermit.1:1.2 Fri Aug 8 21:46:36 2014 +++ src/external/bsd/ekermit/bin/ekermit/ekermit.1 Fri Aug 8 21:57:31 2014 @@ -1,6 +1,6 @@ -.\ $NetBSD: ekermit.1,v 1.2 2014/08/08 21:46:36 wiz Exp $ +.\ $NetBSD: ekermit.1,v 1.3 2014/08/08 21:57:31 apb Exp $ .Dd August 8, 2014 -.Dt MAKE 1 +.Dt EKERMIT 1 .Os .Sh NAME .Nm ekermit @@ -35,7 +35,7 @@ it does not have a built-in TCP/IP stack If you need these features, then you should use a full Kermit program, such as C-Kermit or Kermit 95. .Pp -The followiong options are available: +The following options are available: .Bl -tag -width XsXfileX... -offset indent .It Fl B Force binary mode.
CVS commit: src/external/bsd/ekermit/dist
Module Name:src
Committed By: joerg
Date: Fri Aug 8 23:41:53 UTC 2014
Modified Files:
src/external/bsd/ekermit/dist: main.c
Log Message:
Make main() ISO C compliant.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ekermit/dist/main.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/ekermit/dist/main.c
diff -u src/external/bsd/ekermit/dist/main.c:1.1.1.1 src/external/bsd/ekermit/dist/main.c:1.2
--- src/external/bsd/ekermit/dist/main.c:1.1.1.1 Fri Aug 8 19:20:39 2014
+++ src/external/bsd/ekermit/dist/main.c Fri Aug 8 23:41:53 2014
@@ -289,7 +289,7 @@ doarg(char c) {/* Command-line optio
return(action);
}
-void
+int
main(int argc, char ** argv) {
int status, rx_len, i, x;
char c;
CVS commit: src/external/bsd/ekermit/dist
Module Name:src
Committed By: joerg
Date: Fri Aug 8 23:43:10 UTC 2014
Modified Files:
src/external/bsd/ekermit/dist: main.c
Log Message:
Don't dereference pointers without looking at the result.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ekermit/dist/main.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/ekermit/dist/main.c
diff -u src/external/bsd/ekermit/dist/main.c:1.2 src/external/bsd/ekermit/dist/main.c:1.3
--- src/external/bsd/ekermit/dist/main.c:1.2 Fri Aug 8 23:41:53 2014
+++ src/external/bsd/ekermit/dist/main.c Fri Aug 8 23:43:10 2014
@@ -193,7 +193,7 @@ doarg(char c) {/* Command-line optio
fatal(File ',s,' not accessible);
nfils++;
}
- xargc++, *xargv--; /* Adjust argv/argc */
+ xargc++, xargv--; /* Adjust argv/argc */
if (nfils 1)
fatal(Missing filename for -s,(char *)0,(char *)0);
action = A_SEND;
@@ -208,7 +208,7 @@ doarg(char c) {/* Command-line optio
#endif /* DEBUG */
if (*(xp+1))
fatal(Invalid argument bundling,(char *)0,(char *)0);
- *xargv++, xargc--;
+ xargv++, xargc--;
if ((xargc 1) || (**xargv == '-'))
fatal(Missing option argument,(char *)0,(char *)0);
s = *xargv;
@@ -259,7 +259,7 @@ doarg(char c) {/* Command-line optio
case 'p': /* Parity */
if (*(xp+1))
fatal(Invalid argument bundling,(char *)0,(char *)0);
- *xargv++, xargc--;
+ xargv++, xargc--;
if ((xargc 1) || (**xargv == '-'))
fatal(Missing parity,(char *)0,(char *)0);
switch(x = **xargv) {
CVS commit: src/external/bsd/ekermit/bin/ekermit
Module Name:src
Committed By: joerg
Date: Fri Aug 8 23:56:57 UTC 2014
Modified Files:
src/external/bsd/ekermit/bin/ekermit: Makefile
Log Message:
Too many pointer sign issues right now to care, so make it non-fatal for
clang.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ekermit/bin/ekermit/Makefile
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/ekermit/bin/ekermit/Makefile
diff -u src/external/bsd/ekermit/bin/ekermit/Makefile:1.2 src/external/bsd/ekermit/bin/ekermit/Makefile:1.3
--- src/external/bsd/ekermit/bin/ekermit/Makefile:1.2 Fri Aug 8 21:41:46 2014
+++ src/external/bsd/ekermit/bin/ekermit/Makefile Fri Aug 8 23:56:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/08/08 21:41:46 apb Exp $
+# $NetBSD: Makefile,v 1.3 2014/08/08 23:56:57 joerg Exp $
.include ../../Makefile.inc
@@ -10,4 +10,6 @@ MAN= ekermit.1
.PATH: ${EKERMITDIST}
+CWARNFLAGS+= -Wno-error=pointer-sign
+
.include bsd.prog.mk
CVS commit: src/sys/external/bsd/drm2/ttm
Module Name:src Committed By: riastradh Date: Sat Aug 9 00:18:59 UTC 2014 Modified Files: src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c Log Message: Multiply by PAGE_SIZE, not PAGE_SHIFT! To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/external/bsd/drm2/ttm/ttm_bo_vm.c diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.1 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2 --- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.1 Wed Jul 16 20:59:58 2014 +++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Sat Aug 9 00:18:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ttm_bo_vm.c,v 1.1 2014/07/16 20:59:58 riastradh Exp $ */ +/* $NetBSD: ttm_bo_vm.c,v 1.2 2014/08/09 00:18:58 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ttm_bo_vm.c,v 1.1 2014/07/16 20:59:58 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: ttm_bo_vm.c,v 1.2 2014/08/09 00:18:58 riastradh Exp $); #include sys/types.h @@ -183,7 +183,7 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u ((startpage + i) PAGE_SHIFT), vm_prot, 0); else paddr = page_to_phys(u.ttm-pages[startpage + i]); - ret = -pmap_enter(ufi-orig_map-pmap, vaddr + i*PAGE_SHIFT, + ret = -pmap_enter(ufi-orig_map-pmap, vaddr + i*PAGE_SIZE, paddr, vm_prot, (PMAP_CANFAIL | pgprot)); if (ret) goto out3;
CVS commit: src/lib/libperfuse
Module Name:src Committed By: manu Date: Sat Aug 9 03:17:11 UTC 2014 Modified Files: src/lib/libperfuse: ops.c Log Message: Send GETATTR to filesystem for removed but still-open files, as it is the expected behavior (bug caught by glusterFS regression tests) To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/lib/libperfuse/ops.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/libperfuse/ops.c diff -u src/lib/libperfuse/ops.c:1.63 src/lib/libperfuse/ops.c:1.64 --- src/lib/libperfuse/ops.c:1.63 Mon Jan 6 08:56:34 2014 +++ src/lib/libperfuse/ops.c Sat Aug 9 03:17:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ops.c,v 1.63 2014/01/06 08:56:34 manu Exp $ */ +/* $NetBSD: ops.c,v 1.64 2014/08/09 03:17:11 manu Exp $ */ /*- * Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved. @@ -1554,7 +1554,7 @@ perfuse_node_getattr_ttl(struct puffs_us struct fuse_attr_out *fao; int error = 0; - if (pnd-pnd_flags PND_REMOVED) + if ((pnd-pnd_flags PND_REMOVED) !(pnd-pnd_flags PND_OPEN)) return ENOENT; node_ref(opc);
CVS commit: src/sys
Module Name:src
Committed By: rtr
Date: Sat Aug 9 05:33:01 UTC 2014
Modified Files:
src/sys/kern: uipc_socket.c uipc_syscalls.c uipc_usrreq.c
src/sys/miscfs/fifofs: fifo_vnops.c
src/sys/net: if.c link_proto.c raw_usrreq.c rtsock.c
src/sys/netatalk: ddp_usrreq.c
src/sys/netbt: hci_socket.c l2cap_socket.c rfcomm_socket.c sco_socket.c
src/sys/netinet: raw_ip.c tcp_usrreq.c udp_usrreq.c
src/sys/netinet6: raw_ip6.c udp6_usrreq.c
src/sys/netipsec: keysock.c
src/sys/netmpls: mpls_proto.c
src/sys/netnatm: natm.c
src/sys/rump/net/lib/libsockin: sockin.c
src/sys/sys: protosw.h un.h
Log Message:
split PRU_CONNECT2 PRU_PURGEIF function out of pr_generic() usrreq
switches and put into separate functions
- always KASSERT(solocked(so)) even if not implemented
(for PRU_CONNECT2 only)
- replace calls to pr_generic() with req = PRU_CONNECT2 with calls to
pr_connect2()
- replace calls to pr_generic() with req = PRU_PURGEIF with calls to
pr_purgeif()
put common code from unp_connect2() (used by unp_connect() into
unp_connect1() and call out to it when needed
patch only briefly reviewed by rmind@
To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.171 -r1.172 src/sys/kern/uipc_syscalls.c
cvs rdiff -u -r1.168 -r1.169 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.76 -r1.77 src/sys/miscfs/fifofs/fifo_vnops.c
cvs rdiff -u -r1.289 -r1.290 src/sys/net/if.c
cvs rdiff -u -r1.23 -r1.24 src/sys/net/link_proto.c
cvs rdiff -u -r1.51 -r1.52 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.162 -r1.163 src/sys/net/rtsock.c
cvs rdiff -u -r1.62 -r1.63 src/sys/netatalk/ddp_usrreq.c
cvs rdiff -u -r1.39 -r1.40 src/sys/netbt/hci_socket.c
cvs rdiff -u -r1.30 -r1.31 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.32 -r1.33 src/sys/netbt/rfcomm_socket.c \
src/sys/netbt/sco_socket.c
cvs rdiff -u -r1.144 -r1.145 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.199 -r1.200 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.216 -r1.217 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.135 -r1.136 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.114 -r1.115 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.42 -r1.43 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.23 -r1.24 src/sys/netmpls/mpls_proto.c
cvs rdiff -u -r1.44 -r1.45 src/sys/netnatm/natm.c
cvs rdiff -u -r1.57 -r1.58 src/sys/rump/net/lib/libsockin/sockin.c
cvs rdiff -u -r1.59 -r1.60 src/sys/sys/protosw.h
cvs rdiff -u -r1.54 -r1.55 src/sys/sys/un.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_socket.c
diff -u src/sys/kern/uipc_socket.c:1.233 src/sys/kern/uipc_socket.c:1.234
--- src/sys/kern/uipc_socket.c:1.233 Fri Aug 8 03:05:45 2014
+++ src/sys/kern/uipc_socket.c Sat Aug 9 05:33:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.233 2014/08/08 03:05:45 rtr Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.234 2014/08/09 05:33:00 rtr Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.233 2014/08/08 03:05:45 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_socket.c,v 1.234 2014/08/09 05:33:00 rtr Exp $);
#include opt_compat_netbsd.h
#include opt_sock_counters.h
@@ -836,8 +836,7 @@ soconnect2(struct socket *so1, struct so
{
KASSERT(solocked2(so1, so2));
- return (*so1-so_proto-pr_usrreqs-pr_generic)(so1,
- PRU_CONNECT2, NULL, (struct mbuf *)so2, NULL, NULL);
+ return (*so1-so_proto-pr_usrreqs-pr_connect2)(so1, so2);
}
int
Index: src/sys/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.171 src/sys/kern/uipc_syscalls.c:1.172
--- src/sys/kern/uipc_syscalls.c:1.171 Wed Jul 9 04:54:03 2014
+++ src/sys/kern/uipc_syscalls.c Sat Aug 9 05:33:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.171 2014/07/09 04:54:03 rtr Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.172 2014/08/09 05:33:00 rtr Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_syscalls.c,v 1.171 2014/07/09 04:54:03 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_syscalls.c,v 1.172 2014/08/09 05:33:00 rtr Exp $);
#include opt_pipe.h
@@ -1276,7 +1276,7 @@ pipe1(struct lwp *l, register_t *retval,
wf-f_data = wso;
retval[1] = fd;
solock(wso);
- error = unp_connect2(wso, rso, PRU_CONNECT2);
+ error = unp_connect2(wso, rso);
sounlock(wso);
if (error != 0)
goto free4;
Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.168 src/sys/kern/uipc_usrreq.c:1.169
--- src/sys/kern/uipc_usrreq.c:1.168 Fri Aug 8 03:05:45 2014
+++ src/sys/kern/uipc_usrreq.c Sat Aug 9 05:33:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.168 2014/08/08 03:05:45 rtr Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.169
