CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Wed Jan 7 09:50:05 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: enable genfb at sbus output may not be pretty but it has a halfway decent chance to work at least to some degree on otherwise unsupported graphics hardware To generate a diff of this commit: cvs rdiff -u -r1.178 -r1.179 src/sys/arch/sparc64/conf/GENERIC 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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.178 src/sys/arch/sparc64/conf/GENERIC:1.179 --- src/sys/arch/sparc64/conf/GENERIC:1.178 Tue Jan 6 17:51:57 2015 +++ src/sys/arch/sparc64/conf/GENERIC Wed Jan 7 09:50:05 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.178 2015/01/06 17:51:57 macallan Exp $ +# $NetBSD: GENERIC,v 1.179 2015/01/07 09:50:05 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/sparc64/conf/std.sparc64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.178 $ +#ident GENERIC-$Revision: 1.179 $ maxusers 64 @@ -913,6 +913,7 @@ wcfb* at pci? # generic PCI framebuffers genfb* at pci? +genfb* at sbus? slot ? offset ? # make sure the console display is always wsdisplay0 wsdisplay0 at wsemuldisplaydev? console 1
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Wed Jan 7 09:50:05 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: enable genfb at sbus output may not be pretty but it has a halfway decent chance to work at least to some degree on otherwise unsupported graphics hardware To generate a diff of this commit: cvs rdiff -u -r1.178 -r1.179 src/sys/arch/sparc64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/distrib/sets/lists/xdebug
Module Name:src Committed By: martin Date: Wed Jan 7 10:05:01 UTC 2015 Modified Files: src/distrib/sets/lists/xdebug [netbsd-7]: md.i386 Log Message: Pull up following revision(s) (requested by htodd in ticket #385): distrib/sets/lists/xdebug/md.i386: revision 1.9 Fix debug build. To generate a diff of this commit: cvs rdiff -u -r1.6.4.1 -r1.6.4.2 src/distrib/sets/lists/xdebug/md.i386 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/xdebug/md.i386 diff -u src/distrib/sets/lists/xdebug/md.i386:1.6.4.1 src/distrib/sets/lists/xdebug/md.i386:1.6.4.2 --- src/distrib/sets/lists/xdebug/md.i386:1.6.4.1 Mon Jan 5 21:23:50 2015 +++ src/distrib/sets/lists/xdebug/md.i386 Wed Jan 7 10:05:01 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.6.4.1 2015/01/05 21:23:50 martin Exp $ +# $NetBSD: md.i386,v 1.6.4.2 2015/01/07 10:05:01 martin Exp $ ./usr/X11R6/lib/modules/extensions/libGLcore_g.a -unknown- debuglib,x11 ./usr/X11R6/lib/modules/extensions/libdbe_g.a -unknown- debuglib,x11 ./usr/X11R6/lib/modules/extensions/libextmod_g.a -unknown- debuglib,x11 @@ -125,7 +125,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/dri/sis_dri.so.0.debug -unknown- obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/dri/trident_dri.so.0.debug -unknown- obsolete -./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug -unknown- xorg,debug,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.0.debug -unknown- xorg,debug
CVS commit: [netbsd-7] src/distrib/sets/lists/xdebug
Module Name:src Committed By: martin Date: Wed Jan 7 10:05:01 UTC 2015 Modified Files: src/distrib/sets/lists/xdebug [netbsd-7]: md.i386 Log Message: Pull up following revision(s) (requested by htodd in ticket #385): distrib/sets/lists/xdebug/md.i386: revision 1.9 Fix debug build. To generate a diff of this commit: cvs rdiff -u -r1.6.4.1 -r1.6.4.2 src/distrib/sets/lists/xdebug/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/fs/v7fs
Module Name:src
Committed By: martin
Date: Wed Jan 7 10:08:15 UTC 2015
Modified Files:
src/sys/fs/v7fs [netbsd-7]: v7fs_file.c v7fs_vfsops.c v7fs_vnops.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #386):
sys/fs/v7fs/v7fs_file.c: revision 1.6
sys/fs/v7fs/v7fs_vnops.c: revision 1.18
sys/fs/v7fs/v7fs_vnops.c: revision 1.19
sys/fs/v7fs/v7fs_vfsops.c: revision 1.11
v7fs_getattr: adjust size of symlinks by -1 to compensate the trailing NUL.
Should fix the v7fs part of PR kern/48864.
Defer deallocating unlinked inodes to v7fs_reclaim().
Remove v7fs_vnode_reload() and always use v7fs_inode_load(). No need
to search for a vnode we already hold a reference on.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.12.1 src/sys/fs/v7fs/v7fs_file.c
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/fs/v7fs/v7fs_vfsops.c
cvs rdiff -u -r1.17 -r1.17.2.1 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_file.c
diff -u src/sys/fs/v7fs/v7fs_file.c:1.5 src/sys/fs/v7fs/v7fs_file.c:1.5.12.1
--- src/sys/fs/v7fs/v7fs_file.c:1.5 Fri Dec 7 06:50:15 2012
+++ src/sys/fs/v7fs/v7fs_file.c Wed Jan 7 10:08:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_file.c,v 1.5 2012/12/07 06:50:15 msaitoh Exp $ */
+/* $NetBSD: v7fs_file.c,v 1.5.12.1 2015/01/07 10:08:15 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: v7fs_file.c,v 1.5 2012/12/07 06:50:15 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: v7fs_file.c,v 1.5.12.1 2015/01/07 10:08:15 martin Exp $);
#if defined _KERNEL_OPT
#include opt_v7fs.h
#endif
@@ -259,6 +259,9 @@ v7fs_file_deallocate(struct v7fs_self *f
DPRINTF(directory not empty.\n);
return ENOTEMPTY;/* t_vnops dir_noempty, rename_dir(6)*/
}
+ error = v7fs_datablock_size_change(fs, 0, inode);
+ if (error)
+ return error;
inode.nlink = 0; /* remove this. */
} else {
/* Decrement reference count. */
@@ -271,14 +274,7 @@ v7fs_file_deallocate(struct v7fs_self *f
return error;
DPRINTF(remove dirent\n);
- if (inode.nlink == 0) {
- v7fs_datablock_contract(fs, inode, inode.filesize);
- DPRINTF(remove datablock\n);
- v7fs_inode_deallocate(fs, ino);
- DPRINTF(remove inode\n);
- } else {
- v7fs_inode_writeback(fs, inode);
- }
+ v7fs_inode_writeback(fs, inode);
return 0;
}
Index: src/sys/fs/v7fs/v7fs_vfsops.c
diff -u src/sys/fs/v7fs/v7fs_vfsops.c:1.10 src/sys/fs/v7fs/v7fs_vfsops.c:1.10.2.1
--- src/sys/fs/v7fs/v7fs_vfsops.c:1.10 Wed Apr 16 18:55:19 2014
+++ src/sys/fs/v7fs/v7fs_vfsops.c Wed Jan 7 10:08:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_vfsops.c,v 1.10 2014/04/16 18:55:19 maxv Exp $ */
+/* $NetBSD: v7fs_vfsops.c,v 1.10.2.1 2015/01/07 10:08:15 martin Exp $ */
/*-
* Copyright (c) 2004, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: v7fs_vfsops.c,v 1.10 2014/04/16 18:55:19 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: v7fs_vfsops.c,v 1.10.2.1 2015/01/07 10:08:15 martin Exp $);
#if defined _KERNEL_OPT
#include opt_v7fs.h
#endif
@@ -74,7 +74,6 @@ static int v7fs_openfs(struct vnode *, s
static void v7fs_closefs(struct vnode *, struct mount *);
static int is_v7fs_partition(struct vnode *);
static enum vtype v7fs_mode_to_vtype(v7fs_mode_t mode);
-int v7fs_vnode_reload(struct mount *, struct vnode *);
int
v7fs_mount(struct mount *mp, const char *path, void *data, size_t *data_len)
@@ -586,34 +585,3 @@ v7fs_mountroot(void)
return 0;
}
-
-/* Reload disk inode information */
-int
-v7fs_vnode_reload(struct mount *mp, struct vnode *vp)
-{
- struct v7fs_mount *v7fsmount = mp-mnt_data;
- struct v7fs_self *fs = v7fsmount-core;
- struct v7fs_node *v7fs_node;
- struct v7fs_inode *inode = ((struct v7fs_node *)vp-v_data)-inode;
- int target_ino = inode-inode_number;
- int error = 0;
-
- DPRINTF(#%d\n, target_ino);
- mutex_enter(mntvnode_lock);
- for (v7fs_node = LIST_FIRST(v7fsmount-v7fs_node_head);
- v7fs_node != NULL; v7fs_node = LIST_NEXT(v7fs_node, link)) {
- inode = v7fs_node-inode;
- if (!v7fs_inode_allocated(inode)) {
- continue;
- }
- if (inode-inode_number == target_ino) {
- error = v7fs_inode_load(fs, v7fs_node-inode,
- target_ino);
- DPRINTF(sync #%d error=%d\n, target_ino, error);
- break;
- }
- }
- mutex_exit(mntvnode_lock);
-
- return error;
-}
Index: src/sys/fs/v7fs/v7fs_vnops.c
diff -u src/sys/fs/v7fs/v7fs_vnops.c:1.17 src/sys/fs/v7fs/v7fs_vnops.c:1.17.2.1
--- src/sys/fs/v7fs/v7fs_vnops.c:1.17 Fri Aug 8 19:15:33 2014
+++ src/sys/fs/v7fs/v7fs_vnops.c Wed Jan 7 10:08:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_vnops.c,v 1.17 2014/08/08 19:15:33 gson Exp $ */
+/* $NetBSD: v7fs_vnops.c,v 1.17.2.1 2015/01/07 10:08:15 martin Exp $ */
/*-
* Copyright (c) 2004, 2011 The NetBSD
CVS commit: [netbsd-7] src/sys/fs/v7fs
Module Name:src Committed By: martin Date: Wed Jan 7 10:08:15 UTC 2015 Modified Files: src/sys/fs/v7fs [netbsd-7]: v7fs_file.c v7fs_vfsops.c v7fs_vnops.c Log Message: Pull up following revision(s) (requested by hannken in ticket #386): sys/fs/v7fs/v7fs_file.c: revision 1.6 sys/fs/v7fs/v7fs_vnops.c: revision 1.18 sys/fs/v7fs/v7fs_vnops.c: revision 1.19 sys/fs/v7fs/v7fs_vfsops.c: revision 1.11 v7fs_getattr: adjust size of symlinks by -1 to compensate the trailing NUL. Should fix the v7fs part of PR kern/48864. Defer deallocating unlinked inodes to v7fs_reclaim(). Remove v7fs_vnode_reload() and always use v7fs_inode_load(). No need to search for a vnode we already hold a reference on. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.12.1 src/sys/fs/v7fs/v7fs_file.c cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/fs/v7fs/v7fs_vfsops.c cvs rdiff -u -r1.17 -r1.17.2.1 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.
CVS commit: src/distrib/notes/common
Module Name:src
Committed By: knakahara
Date: Wed Jan 7 10:22:54 UTC 2015
Modified Files:
src/distrib/notes/common: main
Log Message:
Added myself.
To generate a diff of this commit:
cvs rdiff -u -r1.513 -r1.514 src/distrib/notes/common/main
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.513 src/distrib/notes/common/main:1.514
--- src/distrib/notes/common/main:1.513 Tue Jan 6 06:31:31 2015
+++ src/distrib/notes/common/main Wed Jan 7 10:22:54 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.513 2015/01/06 06:31:31 nils Exp $
+.\ $NetBSD: main,v 1.514 2015/01/07 10:22:54 knakahara Exp $
.\
.\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -1305,6 +1305,7 @@ If you're one of them, and would like to
.It Ta Joseph Myers Ta Mt j...@netbsd.org
.It Ta Tuomo M\(:akinen Ta Mt t...@netbsd.org
.It Ta Zolt\('an Arnold NAGY Ta Mt zol...@netbsd.org
+.It Ta Kengo NAKAHARA Ta Mt knakah...@netbsd.org
.It Ta Ken Nakata Ta Mt k...@netbsd.org
.It Ta Takeshi Nakayama Ta Mt nakay...@netbsd.org
.It Ta Alexander Nasonov Ta Mt al...@netbsd.org
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Jan 7 10:17:45 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #385 and #386 To generate a diff of this commit: cvs rdiff -u -r1.1.2.148 -r1.1.2.149 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.148 src/doc/CHANGES-7.0:1.1.2.149 --- src/doc/CHANGES-7.0:1.1.2.148 Tue Jan 6 11:02:01 2015 +++ src/doc/CHANGES-7.0 Wed Jan 7 10:17:45 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.148 2015/01/06 11:02:01 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.149 2015/01/07 10:17:45 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -13083,3 +13083,21 @@ external/mit/xorg/lib/libmesa.mk 1.1 fix build problems. [mrg, ticket #381] +distrib/sets/lists/xdebug/md.i386 1.9 + + Fix debug build. + [htodd, ticket #385] + +sys/fs/v7fs/v7fs_file.c1.6 +sys/fs/v7fs/v7fs_vfsops.c 1.11 +sys/fs/v7fs/v7fs_vnops.c 1.18-1.19 + + v7fs_getattr: adjust size of symlinks by -1 to compensate the + trailing NUL. + + Defer deallocating unlinked inodes to v7fs_reclaim(). + + Remove v7fs_vnode_reload() and always use v7fs_inode_load(). No need + to search for a vnode we already hold a reference on. + [hannken, ticket #386] +
CVS commit: src/distrib/notes/common
Module Name:src Committed By: knakahara Date: Wed Jan 7 10:22:54 UTC 2015 Modified Files: src/distrib/notes/common: main Log Message: Added myself. To generate a diff of this commit: cvs rdiff -u -r1.513 -r1.514 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Jan 7 10:17:45 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #385 and #386 To generate a diff of this commit: cvs rdiff -u -r1.1.2.148 -r1.1.2.149 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/if_bridge
Module Name:src
Committed By: ozaki-r
Date: Wed Jan 7 08:55:01 UTC 2015
Modified Files:
src/tests/net/if_bridge: t_bridge.sh
Log Message:
Add some tests for rtable operations of if_bridge
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/if_bridge/t_bridge.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/if_bridge/t_bridge.sh
diff -u src/tests/net/if_bridge/t_bridge.sh:1.1 src/tests/net/if_bridge/t_bridge.sh:1.2
--- src/tests/net/if_bridge/t_bridge.sh:1.1 Thu Sep 18 15:13:27 2014
+++ src/tests/net/if_bridge/t_bridge.sh Wed Jan 7 08:55:01 2015
@@ -1,5 +1,5 @@
#! /usr/bin/atf-sh
-# $NetBSD: t_bridge.sh,v 1.1 2014/09/18 15:13:27 ozaki-r Exp $
+# $NetBSD: t_bridge.sh,v 1.2 2015/01/07 08:55:01 ozaki-r Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,6 +39,7 @@ IP62=fc00::2
atf_test_case basic cleanup
atf_test_case basic6 cleanup
+atf_test_case rtable cleanup
basic_head()
{
@@ -52,6 +53,12 @@ basic6_head()
atf_set require.progs rump_server
}
+rtable_head()
+{
+ atf_set descr Tests route table operations of if_bridge
+ atf_set require.progs rump_server
+}
+
setup_endpoint()
{
sock=${1}
@@ -293,6 +300,76 @@ basic6_body()
#test_ping6_failure
}
+rtable_body()
+{
+ addr1= addr3=
+
+ setup
+ setup_bridge
+
+ # Get MAC addresses of the endpoints.
+ export RUMP_SERVER=$SOCK1
+ addr1=$(rump.ifconfig shmif0 |awk '/address:/ { print $2;}')
+ export RUMP_SERVER=$SOCK3
+ addr3=$(rump.ifconfig shmif0 |awk '/address:/ { print $2;}')
+ unset RUMP_SERVER
+
+ # Confirm there is no MAC address caches.
+ export RUMP_SERVER=$SOCK2
+ export LD_PRELOAD=/usr/lib/librumphijack.so
+ /sbin/brconfig bridge0
+ atf_check -s exit:0 -o not-match:$addr1 /sbin/brconfig bridge0
+ atf_check -s exit:0 -o not-match:$addr3 /sbin/brconfig bridge0
+ unset LD_PRELOAD
+
+ # Make the bridge learn the MAC addresses of the endpoints.
+ export RUMP_SERVER=$SOCK1
+ atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 $IP2
+ unset RUMP_SERVER
+
+ # Tests the addresses are in the cache.
+ export RUMP_SERVER=$SOCK2
+ export LD_PRELOAD=/usr/lib/librumphijack.so
+ /sbin/brconfig bridge0
+ atf_check -s exit:0 -o match:$addr1 shmif0 /sbin/brconfig bridge0
+ atf_check -s exit:0 -o match:$addr3 shmif1 /sbin/brconfig bridge0
+
+ # Tests brconfig deladdr
+ atf_check -s exit:0 -o ignore /sbin/brconfig bridge0 deladdr $addr1
+ atf_check -s exit:0 -o not-match:$addr1 shmif0 /sbin/brconfig bridge0
+ atf_check -s exit:0 -o ignore /sbin/brconfig bridge0 deladdr $addr3
+ atf_check -s exit:0 -o not-match:$addr3 shmif1 /sbin/brconfig bridge0
+ unset LD_PRELOAD
+
+ # Refill the MAC addresses of the endpoints.
+ export RUMP_SERVER=$SOCK1
+ atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 $IP2
+ unset RUMP_SERVER
+ export RUMP_SERVER=$SOCK2
+ export LD_PRELOAD=/usr/lib/librumphijack.so
+ /sbin/brconfig bridge0
+ atf_check -s exit:0 -o match:$addr1 shmif0 /sbin/brconfig bridge0
+ atf_check -s exit:0 -o match:$addr3 shmif1 /sbin/brconfig bridge0
+
+ # Tests brconfig flush.
+ atf_check -s exit:0 -o ignore /sbin/brconfig bridge0 flush
+ atf_check -s exit:0 -o not-match:$addr1 shmif0 /sbin/brconfig bridge0
+ atf_check -s exit:0 -o not-match:$addr3 shmif1 /sbin/brconfig bridge0
+ unset LD_PRELOAD
+
+ # Tests brconfig timeout.
+ export RUMP_SERVER=$SOCK2
+ export LD_PRELOAD=/usr/lib/librumphijack.so
+ atf_check -s exit:0 -o match:timeout: 1200 /sbin/brconfig bridge0
+ atf_check -s exit:0 -o ignore /sbin/brconfig bridge0 timeout 10
+ atf_check -s exit:0 -o match:timeout: 10 /sbin/brconfig bridge0
+ unset LD_PRELOAD
+
+ # TODO: brconfig static/flushall/discover/learn
+ # TODO: cache expiration; it takes 5 minutes at least and we want to
+ # wait here so long. Should we have a sysctl to change the period?
+}
+
basic_cleanup()
{
dump_bus
@@ -305,8 +382,15 @@ basic6_cleanup()
cleanup
}
+rtable_cleanup()
+{
+ dump_bus
+ cleanup
+}
+
atf_init_test_cases()
{
atf_add_test_case basic
atf_add_test_case basic6
+ atf_add_test_case rtable
}
CVS commit: src/tests/net/if_bridge
Module Name:src Committed By: ozaki-r Date: Wed Jan 7 08:55:01 UTC 2015 Modified Files: src/tests/net/if_bridge: t_bridge.sh Log Message: Add some tests for rtable operations of if_bridge To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/net/if_bridge/t_bridge.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/arch/arm/arm
Module Name:src Committed By: msaitoh Date: Wed Jan 7 13:03:42 UTC 2015 Modified Files: src/sys/arch/arm/arm [netbsd-5]: disassem.c Log Message: Pull up following revision(s) (requested by hick in ticket #1939): sys/arch/arm/arm/disassem.c: revision 1.26 The mode synonyms are different for stm and ldm - handle this. PR/49520: arm/disassem.c doesn't use proper address mode name for loads To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.10.1 src/sys/arch/arm/arm/disassem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/arch/arm/arm
Module Name:src
Committed By: msaitoh
Date: Wed Jan 7 13:03:42 UTC 2015
Modified Files:
src/sys/arch/arm/arm [netbsd-5]: disassem.c
Log Message:
Pull up following revision(s) (requested by hick in ticket #1939):
sys/arch/arm/arm/disassem.c: revision 1.26
The mode synonyms are different for stm and ldm - handle this.
PR/49520: arm/disassem.c doesn't use proper address mode name for loads
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.10.1 src/sys/arch/arm/arm/disassem.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/arm/disassem.c
diff -u src/sys/arch/arm/arm/disassem.c:1.18 src/sys/arch/arm/arm/disassem.c:1.18.10.1
--- src/sys/arch/arm/arm/disassem.c:1.18 Sun Apr 27 18:58:43 2008
+++ src/sys/arch/arm/arm/disassem.c Wed Jan 7 13:03:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disassem.c,v 1.18 2008/04/27 18:58:43 matt Exp $ */
+/* $NetBSD: disassem.c,v 1.18.10.1 2015/01/07 13:03:42 msaitoh Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -49,7 +49,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: disassem.c,v 1.18 2008/04/27 18:58:43 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: disassem.c,v 1.18.10.1 2015/01/07 13:03:42 msaitoh Exp $);
#include sys/systm.h
#include arch/arm/arm/disassem.h
@@ -233,7 +233,8 @@ static char const insn_block_transfers[]
};
static char const insn_stack_block_transfers[][4] = {
- ed, ea, fd, fa
+ ed, ea, fd, fa, /* stm */
+ fa, fd, ea, ed, /* ldm */
};
static char const op_shifts[][4] = {
@@ -255,7 +256,7 @@ static char const insn_fpaconstants[][8]
#define insn_condition(x) arm32_insn_conditions[(x 28) 0x0f]
#define insn_blktrans(x) insn_block_transfers[(x 23) 3]
-#define insn_stkblktrans(x) insn_stack_block_transfers[(x 23) 3]
+#define insn_stkblktrans(x) insn_stack_block_transfers[((x (20 - 2)) 4)|((x 23) 3)]
#define op2_shift(x) op_shifts[(x 5) 3]
#define insn_fparnd(x) insn_fpa_rounding[(x 5) 0x03]
#define insn_fpaprec(x) insn_fpa_precision[(((x 18) 2)|(x 7)) 1]
CVS commit: src/tests/fs/nfs
Module Name:src Committed By: pooka Date: Thu Jan 8 03:50:56 UTC 2015 Modified Files: src/tests/fs/nfs: Makefile Log Message: fix MKZFS=yes ports To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/fs/nfs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/nfs
Module Name:src Committed By: pooka Date: Thu Jan 8 03:50:56 UTC 2015 Modified Files: src/tests/fs/nfs: Makefile Log Message: fix MKZFS=yes ports To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/fs/nfs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/fs/nfs/Makefile diff -u src/tests/fs/nfs/Makefile:1.9 src/tests/fs/nfs/Makefile:1.10 --- src/tests/fs/nfs/Makefile:1.9 Tue Jun 10 04:28:39 2014 +++ src/tests/fs/nfs/Makefile Thu Jan 8 03:50:56 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/06/10 04:28:39 he Exp $ +# $NetBSD: Makefile,v 1.10 2015/01/08 03:50:56 pooka Exp $ # .include bsd.own.mk @@ -22,7 +22,8 @@ LDADD+=-lrumpfs_ffs -lrumpvfs LDADD+=-lrumpdev_disk -lrumpdev # disk device LDADD+=-lrumpnet_shmif # shmif LDADD+=-lrumpnet_netinet -lrumpnet_net -lrumpnet -LDADD+=-lrump -lrumpuser -lrump -lpthread # base +LDADD+=-lrumpkern_sysproxy -lrump -lrumpuser # base +LDADD+=-lpthread LDADD+=-lutil
CVS commit: src/usr.bin/cal
Module Name:src
Committed By: christos
Date: Thu Jan 8 03:56:33 UTC 2015
Modified Files:
src/usr.bin/cal: cal.1 cal.c
Log Message:
Provide -C == -A + -B like fgrep, from Anon Ymous
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/cal/cal.1
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/cal/cal.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/cal/cal.1
diff -u src/usr.bin/cal/cal.1:1.20 src/usr.bin/cal/cal.1:1.21
--- src/usr.bin/cal/cal.1:1.20 Mon Dec 24 08:56:00 2007
+++ src/usr.bin/cal/cal.1 Wed Jan 7 22:56:33 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: cal.1,v 1.20 2007/12/24 13:56:00 wiz Exp $
+.\ $NetBSD: cal.1,v 1.21 2015/01/08 03:56:33 christos Exp $
.\
.\ Copyright (c) 1989, 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\
.\ @(#)cal.1 8.2 (Berkeley) 4/28/95
.\
-.Dd December 21, 2007
+.Dd January 7, 2015
.Dt CAL 1
.Os
.Sh NAME
@@ -43,6 +43,7 @@
.Op Fl 3hjry
.Op Fl A Ar after
.Op Fl B Ar before
+.Op Fl C Ar context
.Op Fl d Ar day-of-week
.Op Fl R Ar reform-spec
.Op Oo Ar month Oc Ar year
@@ -64,6 +65,10 @@ months after the specified month.
Display
.Ar before
months before the specified month.
+.It Fl C Ar context
+Display
+.Ar context
+months before and after the specified month.
.It Fl d Ar day-of-week
Specifies the day of the week on which the calendar should start.
Valid values are 0 through 6, presenting Sunday through Saturday,
Index: src/usr.bin/cal/cal.c
diff -u src/usr.bin/cal/cal.c:1.27 src/usr.bin/cal/cal.c:1.28
--- src/usr.bin/cal/cal.c:1.27 Mon Aug 29 09:55:22 2011
+++ src/usr.bin/cal/cal.c Wed Jan 7 22:56:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cal.c,v 1.27 2011/08/29 13:55:22 joerg Exp $ */
+/* $NetBSD: cal.c,v 1.28 2015/01/08 03:56:33 christos Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = @(#)cal.c 8.4 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: cal.c,v 1.27 2011/08/29 13:55:22 joerg Exp $);
+__RCSID($NetBSD: cal.c,v 1.28 2015/01/08 03:56:33 christos Exp $);
#endif
#endif /* not lint */
@@ -227,7 +227,7 @@ main(int argc, char **argv)
before = after = 0;
use_reform = yflag = year = 0;
when = NULL;
- while ((ch = getopt(argc, argv, A:B:d:hjR:ry3)) != -1) {
+ while ((ch = getopt(argc, argv, A:B:C:d:hjR:ry3)) != -1) {
switch (ch) {
case 'A':
after = getnum(optarg);
@@ -239,6 +239,11 @@ main(int argc, char **argv)
if (before 0)
errx(1, Argument to -B must be positive);
break;
+ case 'C':
+ after = before = getnum(optarg);
+ if (after 0)
+errx(1, Argument to -C must be positive);
+ break;
case 'd':
dow = getnum(optarg);
if (dow 0 || dow 6)
@@ -764,7 +769,7 @@ gregorian_reform(const char *p)
errx(1, reform name %s invalid, p);
/*
- *
+ *
*/
reform-missing_days =
j_leap_days(reform-year, reform-month, reform-date) -
@@ -913,7 +918,7 @@ usage(void)
{
(void)fprintf(stderr,
- usage: cal [-3hjry] [-A after] [-B before] [-d day-of-week]
+ usage: cal [-3hjry] [-A after] [-B before] [-C context] [-d day-of-week]
[-R reform-spec]\n [[month] year]\n);
exit(1);
}
CVS commit: src/usr.bin/cal
Module Name:src Committed By: christos Date: Thu Jan 8 03:56:33 UTC 2015 Modified Files: src/usr.bin/cal: cal.1 cal.c Log Message: Provide -C == -A + -B like fgrep, from Anon Ymous To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.bin/cal/cal.1 cvs rdiff -u -r1.27 -r1.28 src/usr.bin/cal/cal.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libXt/dist/util
Module Name:xsrc Committed By: christos Date: Thu Jan 8 03:45:40 UTC 2015 Modified Files: xsrc/external/mit/libXt/dist/util: makestrs.c Log Message: don't bring in all the x crap for string.h To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/libXt/dist/util/makestrs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXt/dist/util/makestrs.c diff -u xsrc/external/mit/libXt/dist/util/makestrs.c:1.1.1.4 xsrc/external/mit/libXt/dist/util/makestrs.c:1.2 --- xsrc/external/mit/libXt/dist/util/makestrs.c:1.1.1.4 Fri May 31 05:19:54 2013 +++ xsrc/external/mit/libXt/dist/util/makestrs.c Wed Jan 7 22:45:40 2015 @@ -27,7 +27,7 @@ in this Software without prior written a /* Constructs string definitions */ #include stdio.h -#include X11/Xos.h +#include string.h #include stdlib.h #include unistd.h
CVS commit: xsrc/external/mit/libXt/dist/util
Module Name:xsrc Committed By: christos Date: Thu Jan 8 03:45:40 UTC 2015 Modified Files: xsrc/external/mit/libXt/dist/util: makestrs.c Log Message: don't bring in all the x crap for string.h To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/libXt/dist/util/makestrs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/makestrs
Module Name:src
Committed By: christos
Date: Thu Jan 8 03:47:32 UTC 2015
Modified Files:
src/external/mit/xorg/tools/makestrs: Makefile
Log Message:
no need for the X headers anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/makestrs/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/mit/xorg/tools/makestrs/Makefile
diff -u src/external/mit/xorg/tools/makestrs/Makefile:1.2 src/external/mit/xorg/tools/makestrs/Makefile:1.3
--- src/external/mit/xorg/tools/makestrs/Makefile:1.2 Wed Jan 7 15:42:02 2015
+++ src/external/mit/xorg/tools/makestrs/Makefile Wed Jan 7 22:47:32 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/01/07 20:42:02 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2015/01/08 03:47:32 christos Exp $
NOMAN= 1
@@ -9,18 +9,4 @@ NOMAN= 1
HOSTPROG= makestrs
HOST_CPPFLAGS+= -I.
-.for header in Xos.h Xosdefs.h Xarch.h
-realdepend realall: X11/${header}
-
-X11/${header}:
- mkdir -p X11
- rm -f ${header}
- ln -s ${X11SRCDIR.xproto}/${header} X11/${header}
-.endfor
-
-clean_headers: .PHONY
- rm -rf X11
-
-cleandir: clean_headers
-
.include bsd.hostprog.mk
CVS commit: src/external/mit/xorg/tools/makestrs
Module Name:src Committed By: christos Date: Thu Jan 8 03:47:32 UTC 2015 Modified Files: src/external/mit/xorg/tools/makestrs: Makefile Log Message: no need for the X headers anymore. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/makestrs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/nfs/nfsservice
Module Name:src Committed By: pooka Date: Thu Jan 8 04:00:31 UTC 2015 Modified Files: src/tests/fs/nfs/nfsservice: Makefile Log Message: one more MKZFS fix (how many subdirs does this place have?) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/fs/nfs/nfsservice/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/fs/nfs/nfsservice/Makefile diff -u src/tests/fs/nfs/nfsservice/Makefile:1.7 src/tests/fs/nfs/nfsservice/Makefile:1.8 --- src/tests/fs/nfs/nfsservice/Makefile:1.7 Wed Mar 6 13:35:22 2013 +++ src/tests/fs/nfs/nfsservice/Makefile Thu Jan 8 04:00:31 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/03/06 13:35:22 christos Exp $ +# $NetBSD: Makefile,v 1.8 2015/01/08 04:00:31 pooka Exp $ # NOMAN= 1 @@ -23,7 +23,7 @@ LDADD+= -lrumpdev_disk -lrumpdev# di LDADD+= -lrumpfs_ffs -lrumpvfs # FFS LDADD+= -lrumpnet_netinet -lrumpnet_net -lrumpnet_local # TCP/IP LDADD+= -lrumpnet_shmif # shmif -LDADD+= -lrumpnet -lrump -lrumpuser# base +LDADD+= -lrumpnet -lrumpkern_sysproxy -lrump -lrumpuser # base LDADD+= -lpthread -lutil CPPFLAGS+= -DDEBUG -DMOUNT_NOMAIN -D_REENTRANT
CVS commit: src/tests/fs/nfs/nfsservice
Module Name:src Committed By: pooka Date: Thu Jan 8 04:00:31 UTC 2015 Modified Files: src/tests/fs/nfs/nfsservice: Makefile Log Message: one more MKZFS fix (how many subdirs does this place have?) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/fs/nfs/nfsservice/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/if_bridge
Module Name:src Committed By: ozaki-r Date: Thu Jan 8 06:33:11 UTC 2015 Modified Files: src/tests/net/if_bridge: t_bridge.sh Log Message: Add tests for brconfig maxaddr To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/net/if_bridge/t_bridge.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/if_bridge
Module Name:src
Committed By: ozaki-r
Date: Thu Jan 8 06:33:11 UTC 2015
Modified Files:
src/tests/net/if_bridge: t_bridge.sh
Log Message:
Add tests for brconfig maxaddr
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/if_bridge/t_bridge.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/if_bridge/t_bridge.sh
diff -u src/tests/net/if_bridge/t_bridge.sh:1.2 src/tests/net/if_bridge/t_bridge.sh:1.3
--- src/tests/net/if_bridge/t_bridge.sh:1.2 Wed Jan 7 08:55:01 2015
+++ src/tests/net/if_bridge/t_bridge.sh Thu Jan 8 06:33:11 2015
@@ -1,5 +1,5 @@
#! /usr/bin/atf-sh
-# $NetBSD: t_bridge.sh,v 1.2 2015/01/07 08:55:01 ozaki-r Exp $
+# $NetBSD: t_bridge.sh,v 1.3 2015/01/08 06:33:11 ozaki-r Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -268,6 +268,66 @@ test_ping6_success()
rump.ifconfig -v shmif0
}
+get_number_of_caches()
+{
+ export RUMP_SERVER=$SOCK2
+ export LD_PRELOAD=/usr/lib/librumphijack.so
+ echo $(($(/sbin/brconfig bridge0 |grep -A 100 Address cache |wc -l) - 1))
+ unset LD_PRELOAD
+}
+
+test_brconfig_maxaddr()
+{
+ addr1= addr3= n=
+
+ # Get MAC addresses of the endpoints.
+ export RUMP_SERVER=$SOCK1
+ addr1=$(rump.ifconfig shmif0 |awk '/address:/ { print $2;}')
+ export RUMP_SERVER=$SOCK3
+ addr3=$(rump.ifconfig shmif0 |awk '/address:/ { print $2;}')
+ unset RUMP_SERVER
+
+ # Refill the MAC addresses of the endpoints.
+ export RUMP_SERVER=$SOCK1
+ atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 $IP2
+ export RUMP_SERVER=$SOCK2
+ export LD_PRELOAD=/usr/lib/librumphijack.so
+ /sbin/brconfig bridge0
+ atf_check -s exit:0 -o match:$addr1 shmif0 /sbin/brconfig bridge0
+ atf_check -s exit:0 -o match:$addr3 shmif1 /sbin/brconfig bridge0
+
+ # Check the default # of caches is 100
+ atf_check -s exit:0 -o match:max cache: 100 /sbin/brconfig bridge0
+
+ # Test two MAC addresses are cached
+ n=$(get_number_of_caches)
+ atf_check_equal $n 2
+
+ # Limit # of caches to one
+ atf_check -s exit:0 -o ignore /sbin/brconfig bridge0 maxaddr 1
+ atf_check -s exit:0 -o match:max cache: 1 /sbin/brconfig bridge0
+ /sbin/brconfig bridge0
+
+ # Test just one address is cached
+ n=$(get_number_of_caches)
+ atf_check_equal $n 1
+
+ # Increase # of caches to two
+ atf_check -s exit:0 -o ignore /sbin/brconfig bridge0 maxaddr 2
+ atf_check -s exit:0 -o match:max cache: 2 /sbin/brconfig bridge0
+ unset LD_PRELOAD
+
+ # Test we can cache two addresses again
+ export RUMP_SERVER=$SOCK1
+ atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 $IP2
+ export RUMP_SERVER=$SOCK2
+ export LD_PRELOAD=/usr/lib/librumphijack.so
+ /sbin/brconfig bridge0
+ atf_check -s exit:0 -o match:$addr1 shmif0 /sbin/brconfig bridge0
+ atf_check -s exit:0 -o match:$addr3 shmif1 /sbin/brconfig bridge0
+ unset LD_PRELOAD
+}
+
basic_body()
{
setup
@@ -365,6 +425,9 @@ rtable_body()
atf_check -s exit:0 -o match:timeout: 10 /sbin/brconfig bridge0
unset LD_PRELOAD
+ # Tests brconfig maxaddr.
+ test_brconfig_maxaddr
+
# TODO: brconfig static/flushall/discover/learn
# TODO: cache expiration; it takes 5 minutes at least and we want to
# wait here so long. Should we have a sysctl to change the period?
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: christos
Date: Wed Jan 7 22:43:01 UTC 2015
Modified Files:
src/usr.bin/netstat: if.c
Log Message:
adjust to the netname4 prototype.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/usr.bin/netstat/if.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/netstat/if.c
diff -u src/usr.bin/netstat/if.c:1.80 src/usr.bin/netstat/if.c:1.81
--- src/usr.bin/netstat/if.c:1.80 Thu Nov 6 16:30:09 2014
+++ src/usr.bin/netstat/if.c Wed Jan 7 17:43:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.80 2014/11/06 21:30:09 christos Exp $ */
+/* $NetBSD: if.c,v 1.81 2015/01/07 22:43:01 christos Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)if.c 8.2 (Berkeley) 2/21/94;
#else
-__RCSID($NetBSD: if.c,v 1.80 2014/11/06 21:30:09 christos Exp $);
+__RCSID($NetBSD: if.c,v 1.81 2015/01/07 22:43:01 christos Exp $);
#endif
#endif /* not lint */
@@ -337,7 +337,7 @@ print_addr(struct sockaddr *sa, struct s
const int niflag = NI_NUMERICHOST;
struct sockaddr_in6 *sin6, *netmask6;
#endif
- in_addr_t netmask;
+ struct sockaddr_in netmask;
struct sockaddr_in *sin;
char *cp;
int n, m;
@@ -349,24 +349,13 @@ print_addr(struct sockaddr *sa, struct s
break;
case AF_INET:
sin = (struct sockaddr_in *)sa;
-#ifdef notdef
- /*
- * can't use inet_makeaddr because kernel
- * keeps nets unshifted.
- */
- in = inet_makeaddr(ifaddr.in.ia_subnet,
- INADDR_ANY);
- cp = netname4(in.s_addr,
- ifaddr.in.ia_subnetmask, nflag);
-#else
if (use_sysctl) {
- netmask = ((struct sockaddr_in *)rtinfo[RTAX_NETMASK])-sin_addr.s_addr;
+ netmask = *((struct sockaddr_in *)rtinfo[RTAX_NETMASK]);
} else {
struct in_ifaddr *ifaddr_in = (void *)rtinfo;
- netmask = ifaddr_in-ia_subnetmask;
+ netmask.sin_addr.s_addr = ifaddr_in-ia_subnetmask;
}
- cp = netname4(sin-sin_addr.s_addr, netmask, nflag);
-#endif
+ cp = netname4(sin, netmask, nflag);
if (vflag)
n = strlen(cp) 13 ? 13 : strlen(cp);
else
CVS commit: src/usr.bin/netstat
Module Name:src Committed By: christos Date: Wed Jan 7 22:43:01 UTC 2015 Modified Files: src/usr.bin/netstat: if.c Log Message: adjust to the netname4 prototype. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/usr.bin/netstat/if.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/msdosfs
Module Name:src Committed By: pooka Date: Wed Jan 7 23:12:31 UTC 2015 Modified Files: src/tests/fs/msdosfs: Makefile Log Message: edit one more particularly well-hidden site needing -lrumpkern_sysproxy To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/fs/msdosfs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/msdosfs
Module Name:src
Committed By: pooka
Date: Wed Jan 7 23:12:31 UTC 2015
Modified Files:
src/tests/fs/msdosfs: Makefile
Log Message:
edit one more particularly well-hidden site needing -lrumpkern_sysproxy
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/msdosfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/msdosfs/Makefile
diff -u src/tests/fs/msdosfs/Makefile:1.1 src/tests/fs/msdosfs/Makefile:1.2
--- src/tests/fs/msdosfs/Makefile:1.1 Tue Apr 13 10:21:47 2010
+++ src/tests/fs/msdosfs/Makefile Wed Jan 7 23:12:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/04/13 10:21:47 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/07 23:12:31 pooka Exp $
#
TESTSDIR= ${TESTSBASE}/fs/msdosfs
@@ -9,6 +9,7 @@ TESTS_C= t_snapshot
LDADD+=-lrumpfs_msdos -lrumpfs_tmpfs# fs drivers
LDADD+=-lrumpdev_fss # snapshot dev
LDADD+=-lrumpdev_disk -lrumpdev # disk device
-LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+=-lrumpvfs -lrumpkern_sysproxy -lrump -lrumpuser # base
+LDADD+=-lpthread
.include bsd.test.mk
CVS commit: [netbsd-7] src/sys/arch/evbarm/awin
Module Name:src Committed By: msaitoh Date: Wed Jan 7 21:08:06 UTC 2015 Modified Files: src/sys/arch/evbarm/awin [netbsd-7]: awin_machdep.c Log Message: Pull up following revision(s) (requested by martin in ticket #382): sys/arch/evbarm/awin/awin_machdep.c: revision 1.38 Fix typo in BPI specific setup, spotted by Jared. Now awge works with the official sunxi-linux u-boot versions as well. To generate a diff of this commit: cvs rdiff -u -r1.8.2.9 -r1.8.2.10 src/sys/arch/evbarm/awin/awin_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src
Module Name:src Committed By: msaitoh Date: Wed Jan 7 21:15:30 UTC 2015 Modified Files: src/distrib/cobalt/ramdisk [netbsd-7]: Makefile src/sys/arch/cobalt/conf [netbsd-7]: RAMDISK Log Message: Pull up following revision(s) (requested by martin in ticket #388): sys/arch/cobalt/conf/RAMDISK: revision 1.6 distrib/cobalt/ramdisk/Makefile: revision 1.9 Increase ramdisk size. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.10.1 src/distrib/cobalt/ramdisk/Makefile cvs rdiff -u -r1.5 -r1.5.30.1 src/sys/arch/cobalt/conf/RAMDISK Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src
Module Name:src
Committed By: msaitoh
Date: Wed Jan 7 21:15:30 UTC 2015
Modified Files:
src/distrib/cobalt/ramdisk [netbsd-7]: Makefile
src/sys/arch/cobalt/conf [netbsd-7]: RAMDISK
Log Message:
Pull up following revision(s) (requested by martin in ticket #388):
sys/arch/cobalt/conf/RAMDISK: revision 1.6
distrib/cobalt/ramdisk/Makefile: revision 1.9
Increase ramdisk size.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.10.1 src/distrib/cobalt/ramdisk/Makefile
cvs rdiff -u -r1.5 -r1.5.30.1 src/sys/arch/cobalt/conf/RAMDISK
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cobalt/ramdisk/Makefile
diff -u src/distrib/cobalt/ramdisk/Makefile:1.8 src/distrib/cobalt/ramdisk/Makefile:1.8.10.1
--- src/distrib/cobalt/ramdisk/Makefile:1.8 Fri Mar 22 10:52:20 2013
+++ src/distrib/cobalt/ramdisk/Makefile Wed Jan 7 21:15:30 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2013/03/22 10:52:20 tsutsui Exp $
+# $NetBSD: Makefile,v 1.8.10.1 2015/01/07 21:15:30 msaitoh Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 3072k
+IMAGESIZE= 3328k
MAKEFS_FLAGS= -f 15
WARNS= 1
Index: src/sys/arch/cobalt/conf/RAMDISK
diff -u src/sys/arch/cobalt/conf/RAMDISK:1.5 src/sys/arch/cobalt/conf/RAMDISK:1.5.30.1
--- src/sys/arch/cobalt/conf/RAMDISK:1.5 Tue May 3 09:15:20 2011
+++ src/sys/arch/cobalt/conf/RAMDISK Wed Jan 7 21:15:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.5 2011/05/03 09:15:20 tsutsui Exp $
+# $NetBSD: RAMDISK,v 1.5.30.1 2015/01/07 21:15:30 msaitoh Exp $
#
# memory disk based configuration file
#
@@ -9,7 +9,7 @@ include arch/cobalt/conf/GENERIC
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace md(4) support
-options MEMORY_DISK_ROOT_SIZE=6144 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=6656 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
makeoptions COPTS=-Os -mmemcpy # generates smaller code than -O2, -O1
CVS commit: src/usr.sbin/mtree
Module Name:src Committed By: joerg Date: Wed Jan 7 20:50:36 UTC 2015 Modified Files: src/usr.sbin/mtree: specspec.c Log Message: st_nlink on Linux is not int, so add an explicit cast. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mtree/specspec.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.sbin/mtree/specspec.c diff -u src/usr.sbin/mtree/specspec.c:1.2 src/usr.sbin/mtree/specspec.c:1.3 --- src/usr.sbin/mtree/specspec.c:1.2 Fri Oct 5 01:27:29 2012 +++ src/usr.sbin/mtree/specspec.c Wed Jan 7 20:50:36 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: specspec.c,v 1.2 2012/10/05 01:27:29 christos Exp $ */ +/* $NetBSD: specspec.c,v 1.3 2015/01/07 20:50:36 joerg Exp $ */ /*- * Copyright (c) 2003 Poul-Henning Kamp @@ -31,7 +31,7 @@ #endif #include sys/cdefs.h -__RCSID($NetBSD: specspec.c,v 1.2 2012/10/05 01:27:29 christos Exp $); +__RCSID($NetBSD: specspec.c,v 1.3 2015/01/07 20:50:36 joerg Exp $); #include err.h #include grp.h @@ -73,7 +73,7 @@ shownode(NODE *n, int f, char const *pat if (f F_MODE) printf( mode=%o, n-st_mode); if (f F_NLINK) - printf( nlink=%d, n-st_nlink); + printf( nlink=%d, (int)n-st_nlink); if (f F_SIZE) printf( size=%jd, (intmax_t)n-st_size); if (f F_UID)
CVS commit: src/usr.sbin/mtree
Module Name:src Committed By: joerg Date: Wed Jan 7 20:50:36 UTC 2015 Modified Files: src/usr.sbin/mtree: specspec.c Log Message: st_nlink on Linux is not int, so add an explicit cast. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mtree/specspec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/evbarm/awin
Module Name:src Committed By: msaitoh Date: Wed Jan 7 21:08:06 UTC 2015 Modified Files: src/sys/arch/evbarm/awin [netbsd-7]: awin_machdep.c Log Message: Pull up following revision(s) (requested by martin in ticket #382): sys/arch/evbarm/awin/awin_machdep.c: revision 1.38 Fix typo in BPI specific setup, spotted by Jared. Now awge works with the official sunxi-linux u-boot versions as well. To generate a diff of this commit: cvs rdiff -u -r1.8.2.9 -r1.8.2.10 src/sys/arch/evbarm/awin/awin_machdep.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/evbarm/awin/awin_machdep.c diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.8.2.9 src/sys/arch/evbarm/awin/awin_machdep.c:1.8.2.10 --- src/sys/arch/evbarm/awin/awin_machdep.c:1.8.2.9 Sat Jan 3 05:52:09 2015 +++ src/sys/arch/evbarm/awin/awin_machdep.c Wed Jan 7 21:08:06 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_machdep.c,v 1.8.2.9 2015/01/03 05:52:09 snj Exp $ */ +/* $NetBSD: awin_machdep.c,v 1.8.2.10 2015/01/07 21:08:06 msaitoh Exp $ */ /* * Machine dependent functions for kernel setup for TI OSK5912 board. @@ -125,7 +125,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.8.2.9 2015/01/03 05:52:09 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.8.2.10 2015/01/07 21:08:06 msaitoh Exp $); #include opt_machdep.h #include opt_ddb.h @@ -745,7 +745,7 @@ awin_device_register(device_t self, void prop_dictionary_set_cstring(dict, phy-type, mii); } #endif -#if AWIN_BOARD == AWIN_bpi +#if AWIN_board == AWIN_bpi prop_dictionary_set_cstring(dict, phy-power, gmacpwren); prop_dictionary_set_cstring(dict, phy-type, rgmii-bpi); prop_dictionary_set_uint8(dict, pinset-func, 3);
CVS commit: [netbsd-7] src/sys/arch/bebox/stand/boot
Module Name:src Committed By: msaitoh Date: Wed Jan 7 21:13:28 UTC 2015 Modified Files: src/sys/arch/bebox/stand/boot [netbsd-7]: fd.c siop.c vreset.c Log Message: Pull up following revision(s) (requested by martin in ticket #387): sys/arch/bebox/stand/boot/vreset.c: revision 1.14 sys/arch/bebox/stand/boot/fd.c: revision 1.11 sys/arch/bebox/stand/boot/siop.c: revision 1.5 Fix all warnings when compiling with gcc 4.8. BeBox should be ready for 4.8 now. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.34.1 src/sys/arch/bebox/stand/boot/fd.c cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/bebox/stand/boot/siop.c cvs rdiff -u -r1.13 -r1.13.34.1 src/sys/arch/bebox/stand/boot/vreset.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/bebox/stand/boot
Module Name:src
Committed By: msaitoh
Date: Wed Jan 7 21:13:28 UTC 2015
Modified Files:
src/sys/arch/bebox/stand/boot [netbsd-7]: fd.c siop.c vreset.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #387):
sys/arch/bebox/stand/boot/vreset.c: revision 1.14
sys/arch/bebox/stand/boot/fd.c: revision 1.11
sys/arch/bebox/stand/boot/siop.c: revision 1.5
Fix all warnings when compiling with gcc 4.8.
BeBox should be ready for 4.8 now.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.34.1 src/sys/arch/bebox/stand/boot/fd.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/bebox/stand/boot/siop.c
cvs rdiff -u -r1.13 -r1.13.34.1 src/sys/arch/bebox/stand/boot/vreset.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/fd.c
diff -u src/sys/arch/bebox/stand/boot/fd.c:1.10 src/sys/arch/bebox/stand/boot/fd.c:1.10.34.1
--- src/sys/arch/bebox/stand/boot/fd.c:1.10 Thu Oct 14 06:39:52 2010
+++ src/sys/arch/bebox/stand/boot/fd.c Wed Jan 7 21:13:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.10 2010/10/14 06:39:52 kiyohara Exp $ */
+/* $NetBSD: fd.c,v 1.10.34.1 2015/01/07 21:13:28 msaitoh Exp $ */
/*-
* Copyright (C) 1997-1998 Kazuki Sakamoto (sakam...@netbsd.org)
@@ -297,7 +297,7 @@ fdstrategy(void *devdata, int func, dadd
int ctlr = un-ctlr;
int unit = un-unit;
int *stat = un-stat;
- long nblock, blknum;
+ long blknum;
int fd_skip = 0;
u_char *cbuf = (u_char *)buf;
@@ -306,7 +306,6 @@ fdstrategy(void *devdata, int func, dadd
}
fdDriveStatus(ctlr, unit, 0, stat);
- nblock = un-un_type-maxseccount;
sectrac = un-un_type-seccount; /* sector per track */
*rsize = 0;
Index: src/sys/arch/bebox/stand/boot/siop.c
diff -u src/sys/arch/bebox/stand/boot/siop.c:1.4 src/sys/arch/bebox/stand/boot/siop.c:1.4.2.1
--- src/sys/arch/bebox/stand/boot/siop.c:1.4 Sat Jun 14 20:50:12 2014
+++ src/sys/arch/bebox/stand/boot/siop.c Wed Jan 7 21:13:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.4 2014/06/14 20:50:12 phx Exp $ */
+/* $NetBSD: siop.c,v 1.4.2.1 2015/01/07 21:13:28 msaitoh Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -625,7 +625,7 @@ siop_start(struct siop_adapter *adp, str
{
struct siop_xfer *siop_xfer = adp-xfer;
uint32_t dsa, *script = adp-script;
- int target, lun, slot;
+ int slot;
void *scriptaddr = (void *)local_to_PCI((u_long)script);
const int siop_common_xfer_size = sizeof(struct siop_common_xfer);
@@ -652,8 +652,6 @@ siop_start(struct siop_adapter *adp, str
} else {
slot++;
}
- target = xs-target;
- lun = xs-lun;
/*
* find a free scheduler slot and load it.
*/
Index: src/sys/arch/bebox/stand/boot/vreset.c
diff -u src/sys/arch/bebox/stand/boot/vreset.c:1.13 src/sys/arch/bebox/stand/boot/vreset.c:1.13.34.1
--- src/sys/arch/bebox/stand/boot/vreset.c:1.13 Fri Oct 15 20:01:03 2010
+++ src/sys/arch/bebox/stand/boot/vreset.c Wed Jan 7 21:13:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vreset.c,v 1.13 2010/10/15 20:01:03 he Exp $ */
+/* $NetBSD: vreset.c,v 1.13.34.1 2015/01/07 21:13:28 msaitoh Exp $ */
/*
* Copyright (C) 1995-1997 Gary Thomas (g...@linuxppc.org)
@@ -547,8 +547,8 @@ delayLoop(int k)
static void
writeAttr(u_char index, u_char data, u_char videoOn)
{
- u_char v;
- v = inb(0x3da); /* reset attr. address toggle */
+
+ (void)inb(0x3da); /* reset attr. address toggle */
if (videoOn)
outb(0x3c0, (index 0x1F) | 0x20);
else
CVS commit: src
Module Name:src
Committed By: joerg
Date: Wed Jan 7 20:42:02 UTC 2015
Modified Files:
src: Makefile
src/external/mit: Makefile
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/tools: Makefile
src/external/mit/xorg/tools/makestrs: Makefile
src/tools: Makefile
Log Message:
Reorganise the way xorg is build. Move build of makestrs into src/tools
as it is needed for the includes phase. Make it symlink all necessary
headers in obj to decouple it from includes itself, breaking the
dependency cycle. Move the do-x11 target between do-lib and do-build, so
that libraries can get the benefit of build_install (correct .WAIT
behavior) and everything else like includes uses the plain SUBDIR
entry in external/mit.
To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 src/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/tools/makestrs/Makefile
cvs rdiff -u -r1.179 -r1.180 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.311 src/Makefile:1.312
--- src/Makefile:1.311 Wed Nov 5 08:19:17 2014
+++ src/Makefile Wed Jan 7 20:42:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.311 2014/11/05 08:19:17 snj Exp $
+# $NetBSD: Makefile,v 1.312 2015/01/07 20:42:01 joerg Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -231,10 +231,10 @@ BUILDTARGETS+= includes
.endif
BUILDTARGETS+= do-lib
BUILDTARGETS+= do-compat-lib
-BUILDTARGETS+= do-build
.if ${MKX11} != no
BUILDTARGETS+= do-x11
.endif
+BUILDTARGETS+= do-build
.if ${MKEXTSRC} != no
BUILDTARGETS+= do-extsrc
.endif
@@ -479,7 +479,8 @@ do-build: .PHONY .MAKE
do-x11: .PHONY .MAKE
.if ${MKX11} != no
.if ${X11FLAVOUR} == Xorg
- ${MAKEDIRTARGET} external/mit/xorg build
+ ${MAKEDIRTARGET} external/mit/xorg/tools all
+ ${MAKEDIRTARGET} external/mit/xorg/lib build_install
.else
${MAKEDIRTARGET} x11 build
.endif
Index: src/external/mit/Makefile
diff -u src/external/mit/Makefile:1.2 src/external/mit/Makefile:1.3
--- src/external/mit/Makefile:1.2 Wed Feb 29 20:07:55 2012
+++ src/external/mit/Makefile Wed Jan 7 20:42:01 2015
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2012/02/29 20:07:55 tron Exp $
+# $NetBSD: Makefile,v 1.3 2015/01/07 20:42:01 joerg Exp $
+
+.include bsd.own.mk
SUBDIR+= expat lua
+.if ${MKX11} != no ${X11FLAVOUR} == Xorg
+SUBDIR+= xorg
+.endif
+
.include bsd.subdir.mk
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.31 src/external/mit/xorg/lib/Makefile:1.32
--- src/external/mit/xorg/lib/Makefile:1.31 Mon Jan 5 03:45:31 2015
+++ src/external/mit/xorg/lib/Makefile Wed Jan 7 20:42:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/01/05 03:45:31 mrg Exp $
+# $NetBSD: Makefile,v 1.32 2015/01/07 20:42:01 joerg Exp $
# build libraries for xorg
@@ -35,4 +35,5 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
libXdmGreet \
xcb-util
+.include bsd.buildinstall.mk
.include bsd.subdir.mk
Index: src/external/mit/xorg/tools/Makefile
diff -u src/external/mit/xorg/tools/Makefile:1.4 src/external/mit/xorg/tools/Makefile:1.5
--- src/external/mit/xorg/tools/Makefile:1.4 Wed Jul 9 20:22:56 2014
+++ src/external/mit/xorg/tools/Makefile Wed Jan 7 20:42:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/07/09 20:22:56 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2015/01/07 20:42:01 joerg Exp $
.include bsd.own.mk
@@ -14,4 +14,5 @@ SUBDIR+= makestrs .WAIT
SUBDIR+=bdftopcf fc-cache ucs2any
SUBDIR+=makekeys mkfontscale .WAIT xkbcomp
+.include bsd.buildinstall.mk
.include bsd.subdir.mk
Index: src/external/mit/xorg/tools/makestrs/Makefile
diff -u src/external/mit/xorg/tools/makestrs/Makefile:1.1.1.1 src/external/mit/xorg/tools/makestrs/Makefile:1.2
--- src/external/mit/xorg/tools/makestrs/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/tools/makestrs/Makefile Wed Jan 7 20:42:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/07 20:42:02 joerg Exp $
NOMAN= 1
@@ -7,12 +7,20 @@ NOMAN= 1
.PATH: ${X11SRCDIR.Xt}/util
HOSTPROG= makestrs
-HOST_CPPFLAGS+= -I. -I${DESTDIR}${X11INCDIR}
+HOST_CPPFLAGS+= -I.
-# Can't use -I${DESTDIR}${X11INCDIR} since pswrap is needed
-# to create some header files.
-#
-BUILDSYMLINKS= ${X11SRCDIR.Xt}/include/X11 X11
-DPSRCS+= X11
+.for header in Xos.h Xosdefs.h Xarch.h
+realdepend realall: X11/${header}
+
+X11/${header}:
+ mkdir -p X11
+ rm -f ${header}
+ ln -s ${X11SRCDIR.xproto}/${header} X11/${header}
+.endfor
+
+clean_headers: .PHONY
+ rm -rf X11
+
+cleandir: clean_headers
.include bsd.hostprog.mk
Index: src/tools/Makefile
diff -u
CVS commit: src
Module Name:src Committed By: joerg Date: Wed Jan 7 20:42:02 UTC 2015 Modified Files: src: Makefile src/external/mit: Makefile src/external/mit/xorg/lib: Makefile src/external/mit/xorg/tools: Makefile src/external/mit/xorg/tools/makestrs: Makefile src/tools: Makefile Log Message: Reorganise the way xorg is build. Move build of makestrs into src/tools as it is needed for the includes phase. Make it symlink all necessary headers in obj to decouple it from includes itself, breaking the dependency cycle. Move the do-x11 target between do-lib and do-build, so that libraries can get the benefit of build_install (correct .WAIT behavior) and everything else like includes uses the plain SUBDIR entry in external/mit. To generate a diff of this commit: cvs rdiff -u -r1.311 -r1.312 src/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/Makefile cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/tools/makestrs/Makefile cvs rdiff -u -r1.179 -r1.180 src/tools/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/ic
Module Name:src
Committed By: msaitoh
Date: Wed Jan 7 21:12:04 UTC 2015
Modified Files:
src/sys/dev/ic [netbsd-7]: dwc_gmac.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #383):
sys/dev/ic/dwc_gmac.c: revision 1.30
Fix index vs. count confusion when syncing a range of newly queued TX
descriptors. Pointed out by FUKAUMI Naoki in private chat.
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.4 -r1.24.2.5 src/sys/dev/ic/dwc_gmac.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/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.24.2.4 src/sys/dev/ic/dwc_gmac.c:1.24.2.5
--- src/sys/dev/ic/dwc_gmac.c:1.24.2.4 Tue Dec 9 19:17:50 2014
+++ src/sys/dev/ic/dwc_gmac.c Wed Jan 7 21:12:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.24.2.4 2014/12/09 19:17:50 martin Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.24.2.5 2015/01/07 21:12:04 msaitoh Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.24.2.4 2014/12/09 19:17:50 martin Exp $);
+__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.24.2.5 2015/01/07 21:12:04 msaitoh Exp $);
/* #define DWC_GMAC_DEBUG 1 */
@@ -772,6 +772,7 @@ dwc_gmac_start(struct ifnet *ifp)
{
struct dwc_gmac_softc *sc = ifp-if_softc;
int old = sc-sc_txq.t_queued;
+ int start = sc-sc_txq.t_cur;
struct mbuf *m0;
if ((ifp-if_flags (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
@@ -791,7 +792,7 @@ dwc_gmac_start(struct ifnet *ifp)
if (sc-sc_txq.t_queued != old) {
/* packets have been queued, kick it off */
- dwc_gmac_txdesc_sync(sc, old, sc-sc_txq.t_cur,
+ dwc_gmac_txdesc_sync(sc, start, sc-sc_txq.t_cur,
BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
bus_space_write_4(sc-sc_bst, sc-sc_bsh,
CVS commit: [netbsd-7] src/sys/dev/ic
Module Name:src Committed By: msaitoh Date: Wed Jan 7 21:12:04 UTC 2015 Modified Files: src/sys/dev/ic [netbsd-7]: dwc_gmac.c Log Message: Pull up following revision(s) (requested by martin in ticket #383): sys/dev/ic/dwc_gmac.c: revision 1.30 Fix index vs. count confusion when syncing a range of newly queued TX descriptors. Pointed out by FUKAUMI Naoki in private chat. To generate a diff of this commit: cvs rdiff -u -r1.24.2.4 -r1.24.2.5 src/sys/dev/ic/dwc_gmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 21:36:29 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket 382, 383, 387 and 388. To generate a diff of this commit: cvs rdiff -u -r1.1.2.150 -r1.1.2.151 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: pooka
Date: Wed Jan 7 22:24:04 UTC 2015
Modified Files:
src/sys/rump/kern: Makefile.rumpkerncomp
src/sys/rump/librump/rumpkern: Makefile.rumpkern rump.c rump_private.h
src/tests/dev/md: Makefile
src/tests/fs/ffs: Makefile
src/tests/fs/vfs: Makefile
src/tests/rump/rumpkern/h_server: Makefile
src/usr.bin/rump_server: Makefile
Added Files:
src/sys/rump/kern/lib/libsysproxy: Makefile sysproxy.c
Removed Files:
src/sys/rump/librump/rumpkern: sysproxy.c
Log Message:
Move sysproxy support into a separate component, rumpkern_sysproxy,
instead of it being always provided by the rump kernel base. This
move accomplishes two things:
1) it is no longer necessary to provide sysproxy hypercall stubs for
platforms which do not want to use sysproxy
2) it is easier to reason about the security aspects, since configurations
not linking the sysproxy component simply do not support remote
system calls
discussed on rumpkernel-users
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/kern/Makefile.rumpkerncomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/lib/libsysproxy/Makefile \
src/sys/rump/kern/lib/libsysproxy/sysproxy.c
cvs rdiff -u -r1.152 -r1.153 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.314 -r1.315 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.86 -r1.87 src/sys/rump/librump/rumpkern/rump_private.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpkern/sysproxy.c
cvs rdiff -u -r1.4 -r1.5 src/tests/dev/md/Makefile
cvs rdiff -u -r1.17 -r1.18 src/tests/fs/ffs/Makefile
cvs rdiff -u -r1.19 -r1.20 src/tests/fs/vfs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/rump/rumpkern/h_server/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/rump_server/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/rump/kern/Makefile.rumpkerncomp
diff -u src/sys/rump/kern/Makefile.rumpkerncomp:1.10 src/sys/rump/kern/Makefile.rumpkerncomp:1.11
--- src/sys/rump/kern/Makefile.rumpkerncomp:1.10 Wed Apr 2 19:37:17 2014
+++ src/sys/rump/kern/Makefile.rumpkerncomp Wed Jan 7 22:24:03 2015
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.rumpkerncomp,v 1.10 2014/04/02 19:37:17 pooka Exp $
+# $NetBSD: Makefile.rumpkerncomp,v 1.11 2015/01/07 22:24:03 pooka Exp $
#
.include bsd.own.mk
-RUMPKERNCOMPS= crypto tty z
+RUMPKERNCOMPS= crypto sysproxy tty z
.if ${MKSLJIT} != no
RUMPKERNCOMPS+= sljit
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.152 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.153
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.152 Sat Jan 3 17:23:51 2015
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Wed Jan 7 22:24:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.152 2015/01/03 17:23:51 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.153 2015/01/07 22:24:04 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -28,7 +28,7 @@ MAN= rump.3 rump_lwproc.3
SRCS+= rump.c rumpcopy.c cons.c emul.c etfs_wrap.c intr.c \
lwproc.c klock.c kobj_rename.c ltsleep.c scheduler.c \
signals.c sleepq.c threads.c vm.c hyperentropy.c \
- accessors.c sysproxy.c
+ accessors.c
SRCS+= rumpkern_syscalls.c
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.314 src/sys/rump/librump/rumpkern/rump.c:1.315
--- src/sys/rump/librump/rumpkern/rump.c:1.314 Sun Jan 4 22:11:40 2015
+++ src/sys/rump/librump/rumpkern/rump.c Wed Jan 7 22:24:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.314 2015/01/04 22:11:40 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.315 2015/01/07 22:24:04 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.314 2015/01/04 22:11:40 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.315 2015/01/07 22:24:04 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -149,6 +149,21 @@ mksysctls(void)
CTL_HW, HW_PAGESIZE, CTL_EOL);
}
+static pid_t rspo_wrap_getpid(void) {
+ return rump_sysproxy_hyp_getpid();
+}
+static int rspo_wrap_syscall(int num, void *arg, long *retval) {
+ return rump_sysproxy_hyp_syscall(num, arg, retval);
+}
+static int rspo_wrap_rfork(void *priv, int flag, const char *comm) {
+ return rump_sysproxy_hyp_rfork(priv, flag, comm);
+}
+static void rspo_wrap_lwpexit(void) {
+ rump_sysproxy_hyp_lwpexit();
+}
+static void rspo_wrap_execnotify(const char *comm) {
+ rump_sysproxy_hyp_execnotify(comm);
+}
static const struct rumpuser_hyperup hyp = {
.hyp_schedule = rump_schedule,
.hyp_unschedule = rump_unschedule,
@@ -156,13 +171,28 @@ static const struct rumpuser_hyperup hyp
.hyp_backend_schedule = rump_user_schedule,
.hyp_lwproc_switch = rump_lwproc_switch,
.hyp_lwproc_release =
CVS commit: src
Module Name:src Committed By: pooka Date: Wed Jan 7 22:24:04 UTC 2015 Modified Files: src/sys/rump/kern: Makefile.rumpkerncomp src/sys/rump/librump/rumpkern: Makefile.rumpkern rump.c rump_private.h src/tests/dev/md: Makefile src/tests/fs/ffs: Makefile src/tests/fs/vfs: Makefile src/tests/rump/rumpkern/h_server: Makefile src/usr.bin/rump_server: Makefile Added Files: src/sys/rump/kern/lib/libsysproxy: Makefile sysproxy.c Removed Files: src/sys/rump/librump/rumpkern: sysproxy.c Log Message: Move sysproxy support into a separate component, rumpkern_sysproxy, instead of it being always provided by the rump kernel base. This move accomplishes two things: 1) it is no longer necessary to provide sysproxy hypercall stubs for platforms which do not want to use sysproxy 2) it is easier to reason about the security aspects, since configurations not linking the sysproxy component simply do not support remote system calls discussed on rumpkernel-users To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/rump/kern/Makefile.rumpkerncomp cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/lib/libsysproxy/Makefile \ src/sys/rump/kern/lib/libsysproxy/sysproxy.c cvs rdiff -u -r1.152 -r1.153 src/sys/rump/librump/rumpkern/Makefile.rumpkern cvs rdiff -u -r1.314 -r1.315 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r1.86 -r1.87 src/sys/rump/librump/rumpkern/rump_private.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpkern/sysproxy.c cvs rdiff -u -r1.4 -r1.5 src/tests/dev/md/Makefile cvs rdiff -u -r1.17 -r1.18 src/tests/fs/ffs/Makefile cvs rdiff -u -r1.19 -r1.20 src/tests/fs/vfs/Makefile cvs rdiff -u -r1.4 -r1.5 src/tests/rump/rumpkern/h_server/Makefile cvs rdiff -u -r1.7 -r1.8 src/usr.bin/rump_server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/route
Module Name:src
Committed By: christos
Date: Wed Jan 7 22:38:32 UTC 2015
Modified Files:
src/sbin/route: rtutil.c rtutil.h
Log Message:
make netname4 match the netname6 signature avoiding a NULL pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sbin/route/rtutil.c
cvs rdiff -u -r1.2 -r1.3 src/sbin/route/rtutil.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/route/rtutil.c
diff -u src/sbin/route/rtutil.c:1.3 src/sbin/route/rtutil.c:1.4
--- src/sbin/route/rtutil.c:1.3 Tue Nov 11 22:34:08 2014
+++ src/sbin/route/rtutil.c Wed Jan 7 17:38:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtutil.c,v 1.3 2014/11/12 03:34:08 christos Exp $ */
+/* $NetBSD: rtutil.c,v 1.4 2015/01/07 22:38:32 christos Exp $ */
/* $OpenBSD: show.c,v 1.1 2006/05/27 19:16:37 claudio Exp $ */
/*
@@ -552,21 +552,27 @@ routename6(const struct sockaddr_in6 *si
* The address is assumed to be that of a net or subnet, not a host.
*/
char *
-netname4(in_addr_t in, in_addr_t mask, int flags)
+netname4(const struct sockaddr_in* sa4, const struct sockaddr_in *mask, int flags)
{
const char *cp = NULL;
struct netent *np = NULL;
int mbits;
+ in_addr_t in = sa4-sin_addr.s_addr;
+
+ if (mask) {
+ in_addr_t m = mask-sin_addr.s_addr ;
+ m = ntohl(m);
+ mbits = m ? 33 - ffs(m) : 0;
+ } else
+ mbits = 0;
in = ntohl(in);
- mask = ntohl(mask);
- if (!(flags RT_NFLAG) in != INADDR_ANY) {
+ if (in == INADDR_ANY !mbits)
+ cp = default;
+ else if (!(flags RT_NFLAG) in != INADDR_ANY) {
if ((np = getnetbyaddr(in, AF_INET)) != NULL)
cp = np-n_name;
}
- mbits = mask ? 33 - ffs(mask) : 0;
- if (in == INADDR_ANY !mbits)
- cp = default;
if (cp)
strlcpy(line, cp, sizeof(line));
#define C(x) ((x) 0xff)
@@ -582,7 +588,7 @@ netname4(in_addr_t in, in_addr_t mask, i
snprintf(line, sizeof(line), %u.%u.%u.%u/%d, C(in 24),
C(in 16), C(in 8), C(in), mbits);
#undef C
- return (line);
+ return line;
}
#ifdef INET6
@@ -693,8 +699,8 @@ netname(const struct sockaddr *sa, const
switch (sa-sa_family) {
case AF_INET:
- return netname4(((const struct sockaddr_in *)sa)-sin_addr.s_addr,
- ((const struct sockaddr_in *)mask)-sin_addr.s_addr, flags);
+ return netname4((const struct sockaddr_in *)sa,
+ (const struct sockaddr_in *)mask, flags);
#ifdef INET6
case AF_INET6:
return netname6((const struct sockaddr_in6 *)sa,
Index: src/sbin/route/rtutil.h
diff -u src/sbin/route/rtutil.h:1.2 src/sbin/route/rtutil.h:1.3
--- src/sbin/route/rtutil.h:1.2 Tue Nov 11 22:34:08 2014
+++ src/sbin/route/rtutil.h Wed Jan 7 17:38:32 2015
@@ -53,7 +53,7 @@ char *routename6(const struct sockaddr_i
char *netname6(const struct sockaddr_in6 *, const struct sockaddr_in6 *, int);
#endif
char *netname(const struct sockaddr *, const struct sockaddr *, int);
-char *netname4(in_addr_t, in_addr_t, int);
+char *netname4(const struct sockaddr_in *, const struct sockaddr_in *, int);
char *mpls_ntoa(const struct sockaddr *);
char *any_ntoa(const struct sockaddr *);
CVS commit: src/sbin/route
Module Name:src Committed By: christos Date: Wed Jan 7 22:38:32 UTC 2015 Modified Files: src/sbin/route: rtutil.c rtutil.h Log Message: make netname4 match the netname6 signature avoiding a NULL pointer. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sbin/route/rtutil.c cvs rdiff -u -r1.2 -r1.3 src/sbin/route/rtutil.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 21:36:29 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket 382, 383, 387 and 388. To generate a diff of this commit: cvs rdiff -u -r1.1.2.150 -r1.1.2.151 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.150 src/doc/CHANGES-7.0:1.1.2.151 --- src/doc/CHANGES-7.0:1.1.2.150 Wed Jan 7 18:08:58 2015 +++ src/doc/CHANGES-7.0 Wed Jan 7 21:36:29 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.150 2015/01/07 18:08:58 msaitoh Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.151 2015/01/07 21:36:29 msaitoh Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -13103,3 +13103,28 @@ sys/fs/v7fs/v7fs_vnops.c 1.18-1.19 to search for a vnode we already hold a reference on. [hannken, ticket #386] + +sys/arch/evbarm/awin/awin_machdep.c 1.38 + + Fix typo in BPI specific setup, spotted by Jared McNeill. + Now awge works with the official sunxi-linux u-boot versions as well. + [martin, ticket #382] + +sys/dev/ic/dwc_gmac.c1.30 + + Fix index vs. count confusion when syncing a range of newly queued TX + descriptors. Pointed out by FUKAUMI Naoki in private chat. + [martin, ticket #383] + +sys/arch/bebox/stand/boot/fd.c 1.11 +sys/arch/bebox/stand/boot/siop.c 1.5 +sys/arch/bebox/stand/boot/vreset.c 1.14 + + Fix all warnings for bebox when compiling with gcc 4.8. + [martin, ticket #387] + +distrib/cobalt/ramdisk/Makefile 1.9 +sys/arch/cobalt/conf/RAMDISK 1.6 + + Increase ramdisk size. + [martin, ticket #388]
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pooka Date: Wed Jan 7 22:26:51 UTC 2015 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi src/distrib/sets/lists/debug: mi shl.mi Log Message: +rumpkern_sysproxy to setlists To generate a diff of this commit: cvs rdiff -u -r1.728 -r1.729 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1937 -r1.1938 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.271 -r1.272 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pooka Date: Wed Jan 7 22:26:51 UTC 2015 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi src/distrib/sets/lists/debug: mi shl.mi Log Message: +rumpkern_sysproxy to setlists To generate a diff of this commit: cvs rdiff -u -r1.728 -r1.729 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1937 -r1.1938 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.271 -r1.272 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.728 src/distrib/sets/lists/base/shl.mi:1.729 --- src/distrib/sets/lists/base/shl.mi:1.728 Fri Jan 2 21:18:51 2015 +++ src/distrib/sets/lists/base/shl.mi Wed Jan 7 22:26:50 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.728 2015/01/02 21:18:51 christos Exp $ +# $NetBSD: shl.mi,v 1.729 2015/01/07 22:26:50 pooka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -661,6 +661,9 @@ ./usr/lib/librumpkern_solaris.so base-rump-shlib zfs,rump ./usr/lib/librumpkern_solaris.so.0 base-rump-shlib zfs,rump ./usr/lib/librumpkern_solaris.so.0.0 base-rump-shlib zfs,rump +./usr/lib/librumpkern_sysproxy.so base-rump-shlib rump +./usr/lib/librumpkern_sysproxy.so.0 base-rump-shlib rump +./usr/lib/librumpkern_sysproxy.so.0.0 base-rump-shlib rump ./usr/lib/librumpkern_time.so base-obsolete obsolete ./usr/lib/librumpkern_time.so.0 base-obsolete obsolete ./usr/lib/librumpkern_time.so.0.0 base-obsolete obsolete Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1937 src/distrib/sets/lists/comp/mi:1.1938 --- src/distrib/sets/lists/comp/mi:1.1937 Wed Jan 7 02:53:41 2015 +++ src/distrib/sets/lists/comp/mi Wed Jan 7 22:26:50 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1937 2015/01/07 02:53:41 christos Exp $ +# $NetBSD: mi,v 1.1938 2015/01/07 22:26:50 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3870,6 +3870,8 @@ ./usr/lib/librumpkern_sljit_p.a comp-c-proflib profile,sljit,rump ./usr/lib/librumpkern_solaris.a comp-c-lib zfs,rump ./usr/lib/librumpkern_solaris_p.a comp-c-proflib profile,zfs,rump +./usr/lib/librumpkern_sysproxy.a comp-c-lib rump +./usr/lib/librumpkern_sysproxy_p.a comp-c-proflib profile,rump ./usr/lib/librumpkern_time.a comp-obsolete obsolete ./usr/lib/librumpkern_time_p.a comp-obsolete obsolete ./usr/lib/librumpkern_tty.a comp-c-lib rump Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.271 src/distrib/sets/lists/comp/shl.mi:1.272 --- src/distrib/sets/lists/comp/shl.mi:1.271 Wed Nov 19 01:08:42 2014 +++ src/distrib/sets/lists/comp/shl.mi Wed Jan 7 22:26:50 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.271 2014/11/19 01:08:42 pooka Exp $ +# $NetBSD: shl.mi,v 1.272 2015/01/07 22:26:50 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -210,6 +210,7 @@ ./usr/lib/librumpkern_ksem_pic.a comp-obsolete obsolete ./usr/lib/librumpkern_sljit_pic.a comp-c-piclib sljit,rump,picinstall ./usr/lib/librumpkern_solaris_pic.a comp-c-piclib zfs,rump,picinstall +./usr/lib/librumpkern_sysproxy_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpkern_time_pic.a comp-obsolete obsolete ./usr/lib/librumpkern_tty_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpkern_z_pic.a comp-c-piclib rump,picinstall Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.101 src/distrib/sets/lists/debug/mi:1.102 --- src/distrib/sets/lists/debug/mi:1.101 Wed Jan 7 02:53:42 2015 +++ src/distrib/sets/lists/debug/mi Wed Jan 7 22:26:50 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.101 2015/01/07 02:53:42 christos Exp $ +# $NetBSD: mi,v 1.102 2015/01/07 22:26:50 pooka Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -198,6 +198,7 @@ ./usr/lib/librumpkern_ksem_g.a comp-obsolete obsolete ./usr/lib/librumpkern_sljit_g.a comp-c-debuglib debuglib,sljit,rump ./usr/lib/librumpkern_solaris_g.a comp-c-debuglib debuglib,zfs,rump +./usr/lib/librumpkern_sysproxy_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpkern_time_g.a comp-obsolete obsolete ./usr/lib/librumpkern_tty_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpkern_z_g.a comp-c-debuglib debuglib,rump Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.89 src/distrib/sets/lists/debug/shl.mi:1.90 --- src/distrib/sets/lists/debug/shl.mi:1.89 Fri Jan 2 21:18:51 2015 +++ src/distrib/sets/lists/debug/shl.mi Wed Jan 7
CVS commit: src/sys/arch/zaurus/include
Module Name:src
Committed By: christos
Date: Thu Jan 8 01:52:42 UTC 2015
Modified Files:
src/sys/arch/zaurus/include: bootconfig.h
Log Message:
merge common information (fix build)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/include/bootconfig.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/zaurus/include/bootconfig.h
diff -u src/sys/arch/zaurus/include/bootconfig.h:1.1 src/sys/arch/zaurus/include/bootconfig.h:1.2
--- src/sys/arch/zaurus/include/bootconfig.h:1.1 Sat Dec 16 00:43:15 2006
+++ src/sys/arch/zaurus/include/bootconfig.h Wed Jan 7 20:52:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bootconfig.h,v 1.1 2006/12/16 05:43:15 ober Exp $ */
+/* $NetBSD: bootconfig.h,v 1.2 2015/01/08 01:52:42 christos Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -41,6 +41,10 @@
*
* Based on kate/boot/bootconfig.h
*/
+#ifndef _ZAURUS_BOOTCONFIG_H_
+#define _ZAURUS_BOOTCONFIG_H_
+
+#include arm/bootconfig.h
typedef struct _PhysMem {
u_int address;
@@ -59,17 +63,8 @@ typedef struct _BootConfig {
extern BootConfig bootconfig;
#define MAX_BOOT_STRING 255
-#define BOOTOPT_TYPE_BOOLEAN 0
-#define BOOTOPT_TYPE_STRING 1
-#define BOOTOPT_TYPE_INT 2
-#define BOOTOPT_TYPE_BININT 3
-#define BOOTOPT_TYPE_HEXINT 4
-#define BOOTOPT_TYPE_MASK 7
-
-int get_bootconf_option(char *, const char *, int, void *);
-
-extern char *boot_args;
extern char *boot_file;
#endif /* _KERNEL */
-/* End of bootconfig.h */
+#endif /* _ZAURUS_BOOTCONFIG_H_ */
+
CVS commit: src/sys/arch/zaurus/include
Module Name:src Committed By: christos Date: Thu Jan 8 01:52:42 UTC 2015 Modified Files: src/sys/arch/zaurus/include: bootconfig.h Log Message: merge common information (fix build) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/include/bootconfig.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:08:58 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: - Add note about CVE-2014-9293, CVE-2014-9294, CVE-2014-9295 and CVE-2014-9296 for ntpd 4.2.8 (ticket #351) - Add PR number and the submitter's name (ticket #375). To generate a diff of this commit: cvs rdiff -u -r1.1.2.149 -r1.1.2.150 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.149 src/doc/CHANGES-7.0:1.1.2.150 --- src/doc/CHANGES-7.0:1.1.2.149 Wed Jan 7 10:17:45 2015 +++ src/doc/CHANGES-7.0 Wed Jan 7 18:08:58 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.149 2015/01/07 10:17:45 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.150 2015/01/07 18:08:58 msaitoh Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -6712,7 +6712,8 @@ external/bsd/ntp/lib/libntp/Makefile pat external/bsd/ntp/lib/libopts/Makefile patch external/bsd/ntp/scripts/mkver patch - Update ntp to version 4.2.8. + Update ntp to version 4.2.8. CVE-2014-9293, CVE-2014-9294, + CVE-2014-9295 and CVE-2014-9296. [christos, ticket #351] external/bsd/dhcpcd/dist/arp.c (patch) @@ -6999,6 +7000,7 @@ sys/net/npf/npf_nat.c1.39 sys/arch/arm/arm/disassem.c 1.26 The mode synonyms are different for stm and ldm - handle this. + Fixes PR#49520 reported by Paul Guyot. [skrll, ticket #375] sys/arch/arm/arm/disassem.c 1.27-1.28
CVS commit: [netbsd-5] src/etc/rc.d
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:18:45 UTC 2015 Modified Files: src/etc/rc.d [netbsd-5]: ntpd Log Message: Pull up following revision(s) (requested by he in ticket #1940): etc/rc.d/ntpd: revision 1.15 new ntpd wants to be able to translate ntp into a port number after chr= oot, so give it its own small copy of /etc/services in the chroot To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.34.1 src/etc/rc.d/ntpd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-2] src/etc/rc.d
Module Name:src
Committed By: msaitoh
Date: Wed Jan 7 18:41:06 UTC 2015
Modified Files:
src/etc/rc.d [netbsd-5-2]: ntpd
Log Message:
Pull up following revision(s) (requested by he in ticket #1940):
etc/rc.d/ntpd: revision 1.15
new ntpd wants to be able to translate ntp into a port number after chroot,
so give it its own small copy of /etc/services in the chroot
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.60.1 src/etc/rc.d/ntpd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ntpd
diff -u src/etc/rc.d/ntpd:1.13 src/etc/rc.d/ntpd:1.13.60.1
--- src/etc/rc.d/ntpd:1.13 Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/ntpd Wed Jan 7 18:41:06 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ntpd,v 1.13 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: ntpd,v 1.13.60.1 2015/01/07 18:41:06 msaitoh Exp $
#
# PROVIDE: ntpd
@@ -49,6 +49,21 @@ ntpd_precmd()
fi
ln -fs ${ntpd_chrootdir}/var/db/ntp.drift /var/db/ntp.drift
+ if [ ! -d ${ntpd_chrootdir}/etc ]; then
+ mkdir ${ntpd_chrootdir}/etc
+ fi
+ if [ ! -f ${ntpd_chrootdir}/etc/services ]; then
+ getent services ntp/udp ntp/tcp \
+ ${ntpd_chrootdir}/etc/services
+ fi
+ if [ ! -d ${ntpd_chrootdir}/var/db ]; then
+ mkdir -p ${ntpd_chrootdir}/var/db
+ fi
+ if [ ! -f ${ntpd_chrootdir}/var/db/services.cdb ]; then
+ services_mkdb -o ${ntpd_chrootdir}/var/db/services.cdb \
+ ${ntpd_chrootdir}/etc/services
+ fi
+
# Change run_rc_commands()'s internal copy of $ntpd_flags
#
rc_flags=-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags
CVS commit: [netbsd-5-1] src/etc/rc.d
Module Name:src
Committed By: msaitoh
Date: Wed Jan 7 18:42:14 UTC 2015
Modified Files:
src/etc/rc.d [netbsd-5-1]: ntpd
Log Message:
Pull up following revision(s) (requested by he in ticket #1940):
etc/rc.d/ntpd: revision 1.15
new ntpd wants to be able to translate ntp into a port number after chroot,
so give it its own small copy of /etc/services in the chroot
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.42.1 src/etc/rc.d/ntpd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ntpd
diff -u src/etc/rc.d/ntpd:1.13 src/etc/rc.d/ntpd:1.13.42.1
--- src/etc/rc.d/ntpd:1.13 Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/ntpd Wed Jan 7 18:42:14 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ntpd,v 1.13 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: ntpd,v 1.13.42.1 2015/01/07 18:42:14 msaitoh Exp $
#
# PROVIDE: ntpd
@@ -49,6 +49,21 @@ ntpd_precmd()
fi
ln -fs ${ntpd_chrootdir}/var/db/ntp.drift /var/db/ntp.drift
+ if [ ! -d ${ntpd_chrootdir}/etc ]; then
+ mkdir ${ntpd_chrootdir}/etc
+ fi
+ if [ ! -f ${ntpd_chrootdir}/etc/services ]; then
+ getent services ntp/udp ntp/tcp \
+ ${ntpd_chrootdir}/etc/services
+ fi
+ if [ ! -d ${ntpd_chrootdir}/var/db ]; then
+ mkdir -p ${ntpd_chrootdir}/var/db
+ fi
+ if [ ! -f ${ntpd_chrootdir}/var/db/services.cdb ]; then
+ services_mkdb -o ${ntpd_chrootdir}/var/db/services.cdb \
+ ${ntpd_chrootdir}/etc/services
+ fi
+
# Change run_rc_commands()'s internal copy of $ntpd_flags
#
rc_flags=-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags
CVS commit: [netbsd-5-1] src/etc/rc.d
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:42:14 UTC 2015 Modified Files: src/etc/rc.d [netbsd-5-1]: ntpd Log Message: Pull up following revision(s) (requested by he in ticket #1940): etc/rc.d/ntpd: revision 1.15 new ntpd wants to be able to translate ntp into a port number after chroot, so give it its own small copy of /etc/services in the chroot To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.42.1 src/etc/rc.d/ntpd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:44:13 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: Ticket 1938 and 1940. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.1.6 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.6 diff -u src/doc/CHANGES-5.1.6:1.1.2.11 src/doc/CHANGES-5.1.6:1.1.2.12 --- src/doc/CHANGES-5.1.6:1.1.2.11 Mon Jan 5 23:33:45 2015 +++ src/doc/CHANGES-5.1.6 Wed Jan 7 18:44:13 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.11 2015/01/05 23:33:45 msaitoh Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.12 2015/01/07 18:44:13 msaitoh Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -151,3 +151,2301 @@ usr.sbin/bind/include/isc/platform.h 1. setup can cause BIND to issue an unlimited sequence of queries to follow a delegation. [spz, ticket #1937] + +dist/ntp/COPYRIGHT delete +dist/ntp/ChangeLog delete +dist/ntp/CommitLog delete +dist/ntp/CommitLog-4.1.0 delete +dist/ntp/ElectricFence/CHANGES delete +dist/ntp/ElectricFence/COPYING delete +dist/ntp/ElectricFence/Makefile.amdelete +dist/ntp/ElectricFence/Makefile.indelete +dist/ntp/ElectricFence/README delete +dist/ntp/ElectricFence/efence.c delete +dist/ntp/ElectricFence/efence.h delete +dist/ntp/ElectricFence/eftest.c delete +dist/ntp/ElectricFence/libefence.3delete +dist/ntp/ElectricFence/page.c delete +dist/ntp/ElectricFence/print.c delete +dist/ntp/ElectricFence/tstheap.cdelete +dist/ntp/INSTALL delete +dist/ntp/Makefile.am delete +dist/ntp/Makefile.in delete +dist/ntp/NEWS delete +dist/ntp/NOTES.y2kfixes delete +dist/ntp/README delete +dist/ntp/README.bk delete +dist/ntp/README.hackers delete +dist/ntp/README.patches delete +dist/ntp/README.refclocks delete +dist/ntp/README.versions delete +dist/ntp/TODO delete +dist/ntp/WHERE-TO-START delete +dist/ntp/aclocal.m4 delete +dist/ntp/adjtimed/Makefile.am delete +dist/ntp/adjtimed/Makefile.in delete +dist/ntp/adjtimed/README delete +dist/ntp/adjtimed/adjtimed.c delete +dist/ntp/arlib/COPYING delete +dist/ntp/arlib/INSTALL delete +dist/ntp/arlib/Makefile.am delete +dist/ntp/arlib/Makefile.in delete +dist/ntp/arlib/README delete +dist/ntp/arlib/UNSHAR.HDR delete +dist/ntp/arlib/aclocal.m4 delete +dist/ntp/arlib/arlib.3 delete +dist/ntp/arlib/arlib.c delete +dist/ntp/arlib/arlib.h delete +dist/ntp/arlib/arplib.h delete +dist/ntp/arlib/configure delete +dist/ntp/arlib/configure.in delete +dist/ntp/arlib/depcomp delete +dist/ntp/arlib/install-sh delete +dist/ntp/arlib/missing delete +dist/ntp/arlib/sample.c delete +dist/ntp/bincheck.mf delete +dist/ntp/bootstrap delete +dist/ntp/build delete +dist/ntp/clockstuff/Makefile.am delete +dist/ntp/clockstuff/Makefile.in delete +dist/ntp/clockstuff/README delete +dist/ntp/clockstuff/chutest.c delete +dist/ntp/clockstuff/clktest.c delete +dist/ntp/clockstuff/propdelay.c delete +dist/ntp/compile delete +dist/ntp/conf/README delete +dist/ntp/conf/baldwin.conf delete +dist/ntp/conf/beauregard.conf delete +dist/ntp/conf/grundoon.conf delete +dist/ntp/conf/malarky.conf delete +dist/ntp/conf/pogo.conf delete +dist/ntp/conf/rackety.conf delete +dist/ntp/config.guess delete +dist/ntp/config.h.in delete +dist/ntp/config.sub delete +dist/ntp/configure delete +dist/ntp/configure.ac delete +dist/ntp/depcomp delete +dist/ntp/dot.emacs delete +dist/ntp/excludes delete +dist/ntp/flock-build delete +dist/ntp/html/accopt.html delete +dist/ntp/html/assoc.html delete +dist/ntp/html/audio.html delete +dist/ntp/html/authopt.html delete +dist/ntp/html/build/build.html delete +dist/ntp/html/build/config.html delete +dist/ntp/html/build/hints.html delete +dist/ntp/html/build/hints/a-ux delete +dist/ntp/html/build/hints/aix delete +dist/ntp/html/build/hints/bsdi delete +dist/ntp/html/build/hints/changesdelete +dist/ntp/html/build/hints/decosf1delete +dist/ntp/html/build/hints/decosf2delete +dist/ntp/html/build/hints/freebsddelete +dist/ntp/html/build/hints/hpux delete +dist/ntp/html/build/hints/linux delete +dist/ntp/html/build/hints/mpeix delete +dist/ntp/html/build/hints/netbsddelete +dist/ntp/html/build/hints/notes-xntp-v3delete +dist/ntp/html/build/hints/parse delete +dist/ntp/html/build/hints/refclocksdelete +dist/ntp/html/build/hints/rs6000delete +dist/ntp/html/build/hints/sco.htmldelete +dist/ntp/html/build/hints/sgi delete
CVS commit: src/share/man/man4
Module Name:src Committed By: riastradh Date: Wed Jan 7 18:50:18 UTC 2015 Modified Files: src/share/man/man4: rnd.4 Log Message: Rewrite /dev/random man page. - Describe application usage up front. - State the security model. - Explain entropy. - Describe current implementation strategy near the bottom. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/rnd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:44:13 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: Ticket 1938 and 1940. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: riastradh Date: Wed Jan 7 18:50:18 UTC 2015 Modified Files: src/share/man/man4: rnd.4 Log Message: Rewrite /dev/random man page. - Describe application usage up front. - State the security model. - Explain entropy. - Describe current implementation strategy near the bottom. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/rnd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/rnd.4 diff -u src/share/man/man4/rnd.4:1.20 src/share/man/man4/rnd.4:1.21 --- src/share/man/man4/rnd.4:1.20 Tue Apr 17 08:28:20 2012 +++ src/share/man/man4/rnd.4 Wed Jan 7 18:50:18 2015 @@ -1,8 +1,11 @@ -.\ $NetBSD: rnd.4,v 1.20 2012/04/17 08:28:20 wiz Exp $ +.\ $NetBSD: rnd.4,v 1.21 2015/01/07 18:50:18 riastradh Exp $ .\ -.\ Copyright (c) 1997 Michael Graff +.\ Copyright (c) 2014 The NetBSD Foundation, Inc. .\ All rights reserved. .\ +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Taylor R. Campbell. +.\ .\ Redistribution and use in source and binary forms, with or without .\ modification, are permitted provided that the following conditions .\ are met: @@ -11,340 +14,596 @@ .\ 2. Redistributions in binary form must reproduce the above copyright .\notice, this list of conditions and the following disclaimer in the .\documentation and/or other materials provided with the distribution. -.\ 3. The name of the author may not be used to endorse or promote products -.\derived from this software without specific prior written permission. .\ -.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -.\ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -.\ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -.\ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -.\ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -.\ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -.\ AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -.\ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\ SUCH DAMAGE. +.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 17, 2012 +.Dd November 16, 2014 .Dt RND 4 .Os .Sh NAME .Nm rnd -.Nd in kernel entropy collection and random number generation -.Sh SYNOPSIS -.Cd pseudo-device rnd +.Nd random number generator .Sh DESCRIPTION The -.Nm -pseudo-device has three purposes. -On read, it returns cryptographically -strong random data from a generator keyed from the kernel entropy pool. -On write, data may be added to the entropy pool. -By ioctl, the behavior of the entropy pool (which sources are used; -how their entropy is estimated, etc.) may be controlled. -.Pp -The kernel uses event timing information collected from many -devices, and mixes this into an entropy pool. -This pool is used to -key a stream generator (the CTR_DRBG generator specified by NIST -SP 800-90) which is used to generate values returned to userspace when -the pseudo-device is read. -.Pp -The pseudodevice is cloning, which means that each time it is opened, -a new instance of the stream generator may be created. -Interposing a stream -generator between the entropy pool and readers in this manner protects -readers from each other (each reader's random stream is generated from a -unique key) and protects all users of the entropy pool from any attack -which might correlate its successive outputs to each other, such as -iterative guessing attacks. -.Pp -Certain programs make very short reads from -.Pa /dev/urandom -each time they begin execution. -One program with this behavior is -.Xr perl 1 . -If such a program is run repeatedly (for example from a network -service or shell script), the resulting repeated keying of the stream -generator can quickly drain the entropy pool dry. -As an optimization for such cases, a separate per-CPU instance of -the stream generator
CVS commit: [netbsd-5-2] src/etc/rc.d
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:41:06 UTC 2015 Modified Files: src/etc/rc.d [netbsd-5-2]: ntpd Log Message: Pull up following revision(s) (requested by he in ticket #1940): etc/rc.d/ntpd: revision 1.15 new ntpd wants to be able to translate ntp into a port number after chroot, so give it its own small copy of /etc/services in the chroot To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.60.1 src/etc/rc.d/ntpd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:43:14 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1938-1940. To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 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.90 src/doc/CHANGES-5.3:1.1.2.91 --- src/doc/CHANGES-5.3:1.1.2.90 Mon Jan 5 23:33:10 2015 +++ src/doc/CHANGES-5.3 Wed Jan 7 18:43:14 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.90 2015/01/05 23:33:10 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.91 2015/01/07 18:43:14 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -1302,3 +1302,2307 @@ usr.sbin/bind/include/isc/platform.h 1. setup can cause BIND to issue an unlimited sequence of queries to follow a delegation. [spz, ticket #1937] + +dist/ntp/COPYRIGHT delete +dist/ntp/ChangeLog delete +dist/ntp/CommitLog delete +dist/ntp/CommitLog-4.1.0 delete +dist/ntp/ElectricFence/CHANGES delete +dist/ntp/ElectricFence/COPYING delete +dist/ntp/ElectricFence/Makefile.amdelete +dist/ntp/ElectricFence/Makefile.indelete +dist/ntp/ElectricFence/README delete +dist/ntp/ElectricFence/efence.c delete +dist/ntp/ElectricFence/efence.h delete +dist/ntp/ElectricFence/eftest.c delete +dist/ntp/ElectricFence/libefence.3delete +dist/ntp/ElectricFence/page.c delete +dist/ntp/ElectricFence/print.c delete +dist/ntp/ElectricFence/tstheap.cdelete +dist/ntp/INSTALL delete +dist/ntp/Makefile.am delete +dist/ntp/Makefile.in delete +dist/ntp/NEWS delete +dist/ntp/NOTES.y2kfixes delete +dist/ntp/README delete +dist/ntp/README.bk delete +dist/ntp/README.hackers delete +dist/ntp/README.patches delete +dist/ntp/README.refclocks delete +dist/ntp/README.versions delete +dist/ntp/TODO delete +dist/ntp/WHERE-TO-START delete +dist/ntp/aclocal.m4 delete +dist/ntp/adjtimed/Makefile.am delete +dist/ntp/adjtimed/Makefile.in delete +dist/ntp/adjtimed/README delete +dist/ntp/adjtimed/adjtimed.c delete +dist/ntp/arlib/COPYING delete +dist/ntp/arlib/INSTALL delete +dist/ntp/arlib/Makefile.am delete +dist/ntp/arlib/Makefile.in delete +dist/ntp/arlib/README delete +dist/ntp/arlib/UNSHAR.HDR delete +dist/ntp/arlib/aclocal.m4 delete +dist/ntp/arlib/arlib.3 delete +dist/ntp/arlib/arlib.c delete +dist/ntp/arlib/arlib.h delete +dist/ntp/arlib/arplib.h delete +dist/ntp/arlib/configure delete +dist/ntp/arlib/configure.in delete +dist/ntp/arlib/depcomp delete +dist/ntp/arlib/install-sh delete +dist/ntp/arlib/missing delete +dist/ntp/arlib/sample.c delete +dist/ntp/bincheck.mf delete +dist/ntp/bootstrap delete +dist/ntp/build delete +dist/ntp/clockstuff/Makefile.am delete +dist/ntp/clockstuff/Makefile.in delete +dist/ntp/clockstuff/README delete +dist/ntp/clockstuff/chutest.c delete +dist/ntp/clockstuff/clktest.c delete +dist/ntp/clockstuff/propdelay.c delete +dist/ntp/compile delete +dist/ntp/conf/README delete +dist/ntp/conf/baldwin.conf delete +dist/ntp/conf/beauregard.conf delete +dist/ntp/conf/grundoon.conf delete +dist/ntp/conf/malarky.conf delete +dist/ntp/conf/pogo.conf delete +dist/ntp/conf/rackety.conf delete +dist/ntp/config.guess delete +dist/ntp/config.h.in delete +dist/ntp/config.sub delete +dist/ntp/configure delete +dist/ntp/configure.ac delete +dist/ntp/depcomp delete +dist/ntp/dot.emacs delete +dist/ntp/excludes delete +dist/ntp/flock-build delete +dist/ntp/html/accopt.html delete +dist/ntp/html/assoc.html delete +dist/ntp/html/audio.html delete +dist/ntp/html/authopt.html delete +dist/ntp/html/build/build.html delete +dist/ntp/html/build/config.html delete +dist/ntp/html/build/hints.html delete +dist/ntp/html/build/hints/a-ux delete +dist/ntp/html/build/hints/aix delete +dist/ntp/html/build/hints/bsdi delete +dist/ntp/html/build/hints/changesdelete +dist/ntp/html/build/hints/decosf1delete +dist/ntp/html/build/hints/decosf2delete +dist/ntp/html/build/hints/freebsddelete +dist/ntp/html/build/hints/hpux delete +dist/ntp/html/build/hints/linux delete +dist/ntp/html/build/hints/mpeix delete +dist/ntp/html/build/hints/netbsddelete +dist/ntp/html/build/hints/notes-xntp-v3delete +dist/ntp/html/build/hints/parse delete +dist/ntp/html/build/hints/refclocksdelete +dist/ntp/html/build/hints/rs6000delete +dist/ntp/html/build/hints/sco.htmldelete +dist/ntp/html/build/hints/sgi delete +dist/ntp/html/build/hints/solaris-dosynctodr.html delete
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:43:39 UTC 2015 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: Ticket 1938 and 1940. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.2.4 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.4 diff -u src/doc/CHANGES-5.2.4:1.1.2.11 src/doc/CHANGES-5.2.4:1.1.2.12 --- src/doc/CHANGES-5.2.4:1.1.2.11 Mon Jan 5 23:33:26 2015 +++ src/doc/CHANGES-5.2.4 Wed Jan 7 18:43:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.4,v 1.1.2.11 2015/01/05 23:33:26 msaitoh Exp $ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.12 2015/01/07 18:43:39 msaitoh Exp $ A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 release: @@ -151,3 +151,2301 @@ usr.sbin/bind/include/isc/platform.h 1. setup can cause BIND to issue an unlimited sequence of queries to follow a delegation. [spz, ticket #1937] + +dist/ntp/COPYRIGHT delete +dist/ntp/ChangeLog delete +dist/ntp/CommitLog delete +dist/ntp/CommitLog-4.1.0 delete +dist/ntp/ElectricFence/CHANGES delete +dist/ntp/ElectricFence/COPYING delete +dist/ntp/ElectricFence/Makefile.amdelete +dist/ntp/ElectricFence/Makefile.indelete +dist/ntp/ElectricFence/README delete +dist/ntp/ElectricFence/efence.c delete +dist/ntp/ElectricFence/efence.h delete +dist/ntp/ElectricFence/eftest.c delete +dist/ntp/ElectricFence/libefence.3delete +dist/ntp/ElectricFence/page.c delete +dist/ntp/ElectricFence/print.c delete +dist/ntp/ElectricFence/tstheap.cdelete +dist/ntp/INSTALL delete +dist/ntp/Makefile.am delete +dist/ntp/Makefile.in delete +dist/ntp/NEWS delete +dist/ntp/NOTES.y2kfixes delete +dist/ntp/README delete +dist/ntp/README.bk delete +dist/ntp/README.hackers delete +dist/ntp/README.patches delete +dist/ntp/README.refclocks delete +dist/ntp/README.versions delete +dist/ntp/TODO delete +dist/ntp/WHERE-TO-START delete +dist/ntp/aclocal.m4 delete +dist/ntp/adjtimed/Makefile.am delete +dist/ntp/adjtimed/Makefile.in delete +dist/ntp/adjtimed/README delete +dist/ntp/adjtimed/adjtimed.c delete +dist/ntp/arlib/COPYING delete +dist/ntp/arlib/INSTALL delete +dist/ntp/arlib/Makefile.am delete +dist/ntp/arlib/Makefile.in delete +dist/ntp/arlib/README delete +dist/ntp/arlib/UNSHAR.HDR delete +dist/ntp/arlib/aclocal.m4 delete +dist/ntp/arlib/arlib.3 delete +dist/ntp/arlib/arlib.c delete +dist/ntp/arlib/arlib.h delete +dist/ntp/arlib/arplib.h delete +dist/ntp/arlib/configure delete +dist/ntp/arlib/configure.in delete +dist/ntp/arlib/depcomp delete +dist/ntp/arlib/install-sh delete +dist/ntp/arlib/missing delete +dist/ntp/arlib/sample.c delete +dist/ntp/bincheck.mf delete +dist/ntp/bootstrap delete +dist/ntp/build delete +dist/ntp/clockstuff/Makefile.am delete +dist/ntp/clockstuff/Makefile.in delete +dist/ntp/clockstuff/README delete +dist/ntp/clockstuff/chutest.c delete +dist/ntp/clockstuff/clktest.c delete +dist/ntp/clockstuff/propdelay.c delete +dist/ntp/compile delete +dist/ntp/conf/README delete +dist/ntp/conf/baldwin.conf delete +dist/ntp/conf/beauregard.conf delete +dist/ntp/conf/grundoon.conf delete +dist/ntp/conf/malarky.conf delete +dist/ntp/conf/pogo.conf delete +dist/ntp/conf/rackety.conf delete +dist/ntp/config.guess delete +dist/ntp/config.h.in delete +dist/ntp/config.sub delete +dist/ntp/configure delete +dist/ntp/configure.ac delete +dist/ntp/depcomp delete +dist/ntp/dot.emacs delete +dist/ntp/excludes delete +dist/ntp/flock-build delete +dist/ntp/html/accopt.html delete +dist/ntp/html/assoc.html delete +dist/ntp/html/audio.html delete +dist/ntp/html/authopt.html delete +dist/ntp/html/build/build.html delete +dist/ntp/html/build/config.html delete +dist/ntp/html/build/hints.html delete +dist/ntp/html/build/hints/a-ux delete +dist/ntp/html/build/hints/aix delete +dist/ntp/html/build/hints/bsdi delete +dist/ntp/html/build/hints/changesdelete +dist/ntp/html/build/hints/decosf1delete +dist/ntp/html/build/hints/decosf2delete +dist/ntp/html/build/hints/freebsddelete +dist/ntp/html/build/hints/hpux delete +dist/ntp/html/build/hints/linux delete +dist/ntp/html/build/hints/mpeix delete +dist/ntp/html/build/hints/netbsddelete +dist/ntp/html/build/hints/notes-xntp-v3delete +dist/ntp/html/build/hints/parse delete +dist/ntp/html/build/hints/refclocksdelete +dist/ntp/html/build/hints/rs6000delete +dist/ntp/html/build/hints/sco.htmldelete +dist/ntp/html/build/hints/sgi delete
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:08:58 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: - Add note about CVE-2014-9293, CVE-2014-9294, CVE-2014-9295 and CVE-2014-9296 for ntpd 4.2.8 (ticket #351) - Add PR number and the submitter's name (ticket #375). To generate a diff of this commit: cvs rdiff -u -r1.1.2.149 -r1.1.2.150 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/etc/rc.d
Module Name:src
Committed By: msaitoh
Date: Wed Jan 7 18:18:45 UTC 2015
Modified Files:
src/etc/rc.d [netbsd-5]: ntpd
Log Message:
Pull up following revision(s) (requested by he in ticket #1940):
etc/rc.d/ntpd: revision 1.15
new ntpd wants to be able to translate ntp into a port number after chr=
oot,
so give it its own small copy of /etc/services in the chroot
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.34.1 src/etc/rc.d/ntpd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ntpd
diff -u src/etc/rc.d/ntpd:1.13 src/etc/rc.d/ntpd:1.13.34.1
--- src/etc/rc.d/ntpd:1.13 Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/ntpd Wed Jan 7 18:18:45 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ntpd,v 1.13 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: ntpd,v 1.13.34.1 2015/01/07 18:18:45 msaitoh Exp $
#
# PROVIDE: ntpd
@@ -49,6 +49,21 @@ ntpd_precmd()
fi
ln -fs ${ntpd_chrootdir}/var/db/ntp.drift /var/db/ntp.drift
+ if [ ! -d ${ntpd_chrootdir}/etc ]; then
+ mkdir ${ntpd_chrootdir}/etc
+ fi
+ if [ ! -f ${ntpd_chrootdir}/etc/services ]; then
+ getent services ntp/udp ntp/tcp \
+ ${ntpd_chrootdir}/etc/services
+ fi
+ if [ ! -d ${ntpd_chrootdir}/var/db ]; then
+ mkdir -p ${ntpd_chrootdir}/var/db
+ fi
+ if [ ! -f ${ntpd_chrootdir}/var/db/services.cdb ]; then
+ services_mkdb -o ${ntpd_chrootdir}/var/db/services.cdb \
+ ${ntpd_chrootdir}/etc/services
+ fi
+
# Change run_rc_commands()'s internal copy of $ntpd_flags
#
rc_flags=-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:43:39 UTC 2015 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: Ticket 1938 and 1940. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-5.2.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 18:43:14 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1938-1940. To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 19:23:14 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: s/nick/skrll/ To generate a diff of this commit: cvs rdiff -u -r1.1.2.91 -r1.1.2.92 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Wed Jan 7 19:23:14 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: s/nick/skrll/ To generate a diff of this commit: cvs rdiff -u -r1.1.2.91 -r1.1.2.92 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.91 src/doc/CHANGES-5.3:1.1.2.92 --- src/doc/CHANGES-5.3:1.1.2.91 Wed Jan 7 18:43:14 2015 +++ src/doc/CHANGES-5.3 Wed Jan 7 19:23:14 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.91 2015/01/07 18:43:14 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.92 2015/01/07 19:23:14 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -3599,7 +3599,7 @@ sys/arch/arm/arm/disassem.c 1.26 The mode synonyms are different for stm and ldm - handle this. Fixes PR#49520 reported by Paul Guyot. - [nick, ticket #1939] + [skrll, ticket #1939] etc/rc.d/ntpd 1.15
