CVS commit: src/doc
Module Name:src Committed By: wiz Date: Tue Jul 9 08:57:16 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: libcap-1.4.0 and tcpdump-4.4.0 out. To generate a diff of this commit: cvs rdiff -u -r1.1040 -r1.1041 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1040 src/doc/3RDPARTY:1.1041 --- src/doc/3RDPARTY:1.1040 Sun Jul 7 10:52:52 2013 +++ src/doc/3RDPARTY Tue Jul 9 08:57:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1040 2013/07/07 10:52:52 apb Exp $ +# $NetBSD: 3RDPARTY,v 1.1041 2013/07/09 08:57:16 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -685,7 +685,7 @@ should test it before import. Talk to ha Package: libpcap Version: 1.3.0 -Current Vers: 1.3.0 +Current Vers: 1.4.0 Maintainer: tcpdump-work...@tcpdump.org Archive Site: http://www.tcpdump.org/release/ Home Page: http://www.tcpdump.org/ @@ -1172,7 +1172,7 @@ unnecessary local changes. Package: tcpdump Version: 4.3.0 -Current Vers: 4.3.0 +Current Vers: 4.4.0 Maintainer: tcpdump-work...@lists.tcpdump.org Archive Site: http://www.tcpdump.org/release/ Home Page: http://www.tcpdump.org/
CVS commit: src
Module Name:src
Committed By: roy
Date: Tue Jul 9 09:34:59 UTC 2013
Modified Files:
src/etc: group master.passwd
src/etc/mtree: special
src/etc/rc.d: rtadvd
src/usr.sbin/rtadvd: dump.c rtadvd.c rtadvd.h
Log Message:
Add _rtadvd user and group.
Add a chroot dir for the _rtadvd user.
Drop privs to the user _rtadvd after acquiring our socket.
When rc.d/rtadvd starts or reloads, the rtadvd config file is copied
into the chroot before starting or reloading rtadvd itself.
Create a symlink from /var/run/rtadvd.dump to the chroot
Inital idea from OpenBSD patch rtadvd.c r1.36
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/etc/group
cvs rdiff -u -r1.46 -r1.47 src/etc/master.passwd
cvs rdiff -u -r1.145 -r1.146 src/etc/mtree/special
cvs rdiff -u -r1.7 -r1.8 src/etc/rc.d/rtadvd
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/rtadvd/dump.c
cvs rdiff -u -r1.43 -r1.44 src/usr.sbin/rtadvd/rtadvd.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/rtadvd/rtadvd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/group
diff -u src/etc/group:1.31 src/etc/group:1.32
--- src/etc/group:1.31 Fri Jun 7 06:35:11 2013
+++ src/etc/group Tue Jul 9 09:34:58 2013
@@ -25,6 +25,7 @@ _tests:*:26:
_tcpdump:*:27:
_tss:*:28:
_gpio:*:29:
+_rtadvd:*:30:
guest:*:31:root
nobody:*:39:
utmp:*:45:
Index: src/etc/master.passwd
diff -u src/etc/master.passwd:1.46 src/etc/master.passwd:1.47
--- src/etc/master.passwd:1.46 Wed Apr 25 16:11:26 2012
+++ src/etc/master.passwd Tue Jul 9 09:34:58 2013
@@ -18,5 +18,6 @@ _mdnsd:*:25:25::0:0: pseudo-user:/nonex
_tests:*:26:26::0:0: pseudo-user:/nonexistent:/sbin/nologin
_tcpdump:*:27:27::0:0: pseudo-user:/var/chroot/tcpdump:/sbin/nologin
_tss:*:28:28::0:0: pseudo-user:/var/tpm:/sbin/nologin
+_rtadvd:*:30:30::0:0: pseudo-user:/var/chroot/rtadvd:/sbin/nologin
uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/nonexistent:/sbin/nologin
nobody:*:32767:39::0:0:Unprivileged user:/nonexistent:/sbin/nologin
Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.145 src/etc/mtree/special:1.146
--- src/etc/mtree/special:1.145 Thu May 16 07:37:05 2013
+++ src/etc/mtree/special Tue Jul 9 09:34:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: special,v 1.145 2013/05/16 07:37:05 yamt Exp $
+# $NetBSD: special,v 1.146 2013/07/09 09:34:58 roy Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@@ -395,6 +395,10 @@
./var/chroot/ntpd/var/db type=dir mode=0775 gname=ntpd
./var/chroot/ntpd/var/run type=dir mode=0775 gname=ntpd
./var/chroot/pflogd type=dir mode=0755
+./var/chroot/rtadvd type=dir mode=0755
+./var/chroot/rtadvd/etc type=dir mode=0755
+./var/chroot/rtadvd/var type=dir mode=0755
+./var/chroot/rtadvd/var/run type=dir mode=0775 gname=_rtadvd
./var/chroot/sshd type=dir mode=0755
./var/chroot/tcpdump type=dir mode=0755
./var/chroot/tftp-proxy type=dir mode=0755
Index: src/etc/rc.d/rtadvd
diff -u src/etc/rc.d/rtadvd:1.7 src/etc/rc.d/rtadvd:1.8
--- src/etc/rc.d/rtadvd:1.7 Thu Dec 13 15:51:17 2012
+++ src/etc/rc.d/rtadvd Tue Jul 9 09:34:58 2013
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: rtadvd,v 1.7 2012/12/13 15:51:17 roy Exp $
+# $NetBSD: rtadvd,v 1.8 2013/07/09 09:34:58 roy Exp $
#
# PROVIDE: rtadvd
@@ -9,20 +9,51 @@
$_rc_subr_loaded . /etc/rc.subr
-name=rtadvd
+name=rtadvd
rcvar=$name
-command=/usr/sbin/${name}
+command=/usr/sbin/$name
pidfile=/var/run/$name.pid
-extra_commands=reload
-start_precmd=rtadvd_precmd
+extra_commands=reload
+start_precmd=rtadvd_prestart
+reload_precmd=rtadvd_prereload
-rtadvd_precmd()
+rtadvd_prereload()
{
- if [ $ip6mode != router ]; then
+ local chdir=$(getent passwd _rtadvd | cut -d: -f6)
+ local conf=/etc/rtadvd.conf myflags o confdir
+
+ [ -z $chdir -o $chdir = / ] return 0
+
+ if [ -n $flags ]; then
+ myflags=$flags
+ else
+ eval myflags=\$${name}_flags
+ fi
+ set -- ${myflags}
+ while getopts c:dDfM:Rs o; do
+ case $1 in
+ -c) conf=$OPTARG;;
+ esac
+ shift
+ done
+ confdir=$(dirname $conf)
+
+ echo $name: copying $conf to $chdir$conf
+ cp $conf $chdir$conf
+
+ # Provide a link to the chrooted dump file
+ ln -snf $chdir/var/run/$name.dump /var/run
+}
+
+rtadvd_prestart()
+{
+ if [ $ip6mode != router ]; then
warn \
${name} cannot be used on IPv6 host, only on an IPv6 router.
return 1
fi
+
+ rtadvd_prereload
}
load_rc_config $name
Index: src/usr.sbin/rtadvd/dump.c
diff -u src/usr.sbin/rtadvd/dump.c:1.10 src/usr.sbin/rtadvd/dump.c:1.11
--- src/usr.sbin/rtadvd/dump.c:1.10 Thu Dec 13 15:36:36 2012
+++ src/usr.sbin/rtadvd/dump.c Tue Jul 9 09:34:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dump.c,v 1.10 2012/12/13 15:36:36 roy Exp $ */
+/* $NetBSD: dump.c,v 1.11 2013/07/09 09:34:59 roy Exp $ */
/* $KAME: dump.c,v 1.34 2004/06/14 05:35:59 itojun Exp $ */
/*
@@ -269,7 +269,7 @@ rtadvd_dump_file(const char *dumpfile)
dumpfile);
if ((fp =
CVS commit: src
Module Name:src Committed By: njoly Date: Tue Jul 9 09:41:30 UTC 2013 Modified Files: src/games/hunt/huntd: huntd.6 src/libexec/mail.local: mail.local.8 src/share/man/man5: forward.5 passwd.5 src/share/man/man7: hier.7 Log Message: Fix sendmail section (8 - 1) in xrefs. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/games/hunt/huntd/huntd.6 cvs rdiff -u -r1.11 -r1.12 src/libexec/mail.local/mail.local.8 cvs rdiff -u -r1.2 -r1.3 src/share/man/man5/forward.5 cvs rdiff -u -r1.30 -r1.31 src/share/man/man5/passwd.5 cvs rdiff -u -r1.103 -r1.104 src/share/man/man7/hier.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/hunt/huntd/huntd.6 diff -u src/games/hunt/huntd/huntd.6:1.9 src/games/hunt/huntd/huntd.6:1.10 --- src/games/hunt/huntd/huntd.6:1.9 Wed Mar 11 13:01:49 2009 +++ src/games/hunt/huntd/huntd.6 Tue Jul 9 09:41:30 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: huntd.6,v 1.9 2009/03/11 13:01:49 joerg Exp $ +.\ $NetBSD: huntd.6,v 1.10 2013/07/09 09:41:30 njoly Exp $ .\ .\ huntd .\ @@ -49,7 +49,7 @@ game. When it starts up, it tries to notify all members of the .Em hunt-players mailing list (see -.Xr sendmail 8 ) +.Xr sendmail 1 ) by faking a .Xr talk 1 request from user @@ -116,9 +116,9 @@ process starts up a .Nm on the local machine and tries to rendezvous with it. .Sh SEE ALSO +.Xr sendmail 1 , .Xr talk 1 , -.Xr hunt 6 , -.Xr sendmail 8 +.Xr hunt 6 .Sh AUTHORS Conrad Huang, Ken Arnold, and Greg Couch; .br Index: src/libexec/mail.local/mail.local.8 diff -u src/libexec/mail.local/mail.local.8:1.11 src/libexec/mail.local/mail.local.8:1.12 --- src/libexec/mail.local/mail.local.8:1.11 Thu Aug 7 09:46:44 2003 +++ src/libexec/mail.local/mail.local.8 Tue Jul 9 09:41:30 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: mail.local.8,v 1.11 2003/08/07 09:46:44 agc Exp $ +.\ $NetBSD: mail.local.8,v 1.12 2013/07/09 09:41:30 njoly Exp $ .\ .\ Copyright (c) 1990 The Regents of the University of California. .\ All rights reserved. @@ -98,10 +98,10 @@ user's mailbox directory .El .Sh SEE ALSO .Xr mail 1 , +.Xr sendmail 1 , .Xr flock 2 , .Xr getservbyname 3 , -.Xr comsat 8 , -.Xr sendmail 8 +.Xr comsat 8 .Sh HISTORY A superset of .Nm Index: src/share/man/man5/forward.5 diff -u src/share/man/man5/forward.5:1.2 src/share/man/man5/forward.5:1.3 --- src/share/man/man5/forward.5:1.2 Mon Aug 16 12:54:20 2010 +++ src/share/man/man5/forward.5 Tue Jul 9 09:41:30 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: forward.5,v 1.2 2010/08/16 12:54:20 pooka Exp $ +.\ $NetBSD: forward.5,v 1.3 2013/07/09 09:41:30 njoly Exp $ .\ .\ Copyright (c) 1996 .\ Mike Pritchard m...@freebsd.org. All rights reserved. @@ -94,6 +94,6 @@ and another copy would be retained as ma The user's forwarding instructions. .El .Sh SEE ALSO +.Xr sendmail 1 , .Xr aliases 5 , -.Xr mailaddr 7 , -.Xr sendmail 8 +.Xr mailaddr 7 Index: src/share/man/man5/passwd.5 diff -u src/share/man/man5/passwd.5:1.30 src/share/man/man5/passwd.5:1.31 --- src/share/man/man5/passwd.5:1.30 Sun Apr 22 10:19:00 2012 +++ src/share/man/man5/passwd.5 Tue Jul 9 09:41:30 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: passwd.5,v 1.30 2012/04/22 10:19:00 wiz Exp $ +.\ $NetBSD: passwd.5,v 1.31 2013/07/09 09:41:30 njoly Exp $ .\ .\ Copyright (c) 1988, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -242,7 +242,7 @@ which will be replaced by the capitalized login name when the gecos field is displayed or used by various programs such as .Xr finger 1 , -.Xr sendmail 8 , +.Xr sendmail 1 , etc. .Pp The office and phone number subfields are used by the Index: src/share/man/man7/hier.7 diff -u src/share/man/man7/hier.7:1.103 src/share/man/man7/hier.7:1.104 --- src/share/man/man7/hier.7:1.103 Thu Mar 14 19:16:52 2013 +++ src/share/man/man7/hier.7 Tue Jul 9 09:41:30 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: hier.7,v 1.103 2013/03/14 19:16:52 njoly Exp $ +.\ $NetBSD: hier.7,v 1.104 2013/07/09 09:41:30 njoly Exp $ .\ .\ Copyright (c) 1990, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -208,13 +208,13 @@ see .Xr ctime 3 .It Sy mail/ configuration files for -.Xr sendmail 8 +.Xr sendmail 1 .Pp .Bl -tag -width sendmail.* -compact .It Sy aliases* name alias files .It Sy sendmail.* -.Xr sendmail 8 +.Xr sendmail 1 configuration information .El .It Sy mail.rc @@ -1117,7 +1117,7 @@ system last time logged in log; see printer daemon error logs; see .Xr lpd 8 .It Sy maillog.* -.Xr sendmail 8 +.Xr sendmail 1 log files .It Sy messages.* general system information log @@ -1128,7 +1128,7 @@ script .It Sy secure sensitive security information log .It Sy sendmail.st -.Xr sendmail 8 +.Xr sendmail 1 statistics .It Sy timed.* .Xr timed 8 @@ -1183,7 +1183,7 @@ the anonymous ftp root directory; see .It Sy mqueue/ sendmail mail queue; see -.Xr sendmail 8 +.Xr sendmail 1 .It
CVS commit: src/sys/arch/powerpc/stand/mkbootimage
Module Name:src
Committed By: joerg
Date: Tue Jul 9 13:10:55 UTC 2013
Modified Files:
src/sys/arch/powerpc/stand/mkbootimage: Makefile
Log Message:
Don't depend on libz.a for the tools build, /usr/lib/libz.a might not
exist.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/stand/mkbootimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/stand/mkbootimage/Makefile
diff -u src/sys/arch/powerpc/stand/mkbootimage/Makefile:1.4 src/sys/arch/powerpc/stand/mkbootimage/Makefile:1.5
--- src/sys/arch/powerpc/stand/mkbootimage/Makefile:1.4 Wed Jan 26 21:35:14 2011
+++ src/sys/arch/powerpc/stand/mkbootimage/Makefile Tue Jul 9 13:10:55 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/01/26 21:35:14 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2013/07/09 13:10:55 joerg Exp $
BINDIR= /usr/mdec
PROG= mkbootimage
@@ -15,7 +15,9 @@ LIBSA=${.CURDIR}/../../../../lib/libsa
CPPFLAGS= -I${LIBSA} -I${.CURDIR} -I${BFDTOP}/include
CPPFLAGS+= -DATTRIBUTE_PACKED=
+.if !defined(HOSTPROGNAME)
DPADD+= ${LIBZ}
+.endif
LDADD+= -lz
.include bsd.prog.mk
CVS commit: src/sys/arch/powerpc/stand/mkbootimage
Module Name:src Committed By: joerg Date: Tue Jul 9 13:10:33 UTC 2013 Modified Files: src/sys/arch/powerpc/stand/mkbootimage: mkbootimage.c Log Message: Fix format string. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 \ src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.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/powerpc/stand/mkbootimage/mkbootimage.c diff -u src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.16 src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.17 --- src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.16 Wed Dec 19 13:47:20 2012 +++ src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c Tue Jul 9 13:10:33 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: mkbootimage.c,v 1.16 2012/12/19 13:47:20 kiyohara Exp $ */ +/* $NetBSD: mkbootimage.c,v 1.17 2013/07/09 13:10:33 joerg Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -396,7 +396,7 @@ prep_build_image(char *kernel, char *boo else flength -= (2880 * 512); if (flength 0 !saloneflag) - fprintf(stderr, %s: Image %s is %d bytes larger than single + fprintf(stderr, %s: Image %s is %ld bytes larger than single floppy. Can only be used for netboot.\n, getprogname(), outname, flength);
CVS commit: src/common/lib/libutil
Module Name:src
Committed By: uwe
Date: Tue Jul 9 16:10:17 UTC 2013
Modified Files:
src/common/lib/libutil: snprintb.c
Log Message:
Use unsigned int instead of u_int to make it easier to steal.
u_int is out of fashion anyway...
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libutil/snprintb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libutil/snprintb.c
diff -u src/common/lib/libutil/snprintb.c:1.7 src/common/lib/libutil/snprintb.c:1.8
--- src/common/lib/libutil/snprintb.c:1.7 Mon Jan 23 03:22:41 2012
+++ src/common/lib/libutil/snprintb.c Tue Jul 9 16:10:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: snprintb.c,v 1.7 2012/01/23 03:22:41 christos Exp $ */
+/* $NetBSD: snprintb.c,v 1.8 2013/07/09 16:10:17 uwe Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
# include sys/cdefs.h
# if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: snprintb.c,v 1.7 2012/01/23 03:22:41 christos Exp $);
+__RCSID($NetBSD: snprintb.c,v 1.8 2013/07/09 16:10:17 uwe Exp $);
# endif
# include sys/types.h
@@ -51,7 +51,7 @@ __RCSID($NetBSD: snprintb.c,v 1.7 2012/
# include errno.h
# else
# include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: snprintb.c,v 1.7 2012/01/23 03:22:41 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: snprintb.c,v 1.8 2013/07/09 16:10:17 uwe Exp $);
# include sys/param.h
# include sys/inttypes.h
# include sys/systm.h
@@ -193,7 +193,7 @@ snprintb_m(char *buf, size_t buflen, con
bit = *bitfmt++; /* now 0-origin */
switch (ch) {
case 'b':
-if (((u_int)(val bit) 1) == 0)
+if (((unsigned int)(val bit) 1) == 0)
goto skip;
cur_fmt = c_fmt;
PUTSEP;
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: njoly Date: Tue Jul 9 17:14:37 UTC 2013 Modified Files: src/distrib/sets/lists/debug: md.sparc64 Log Message: +./usr/libdata/debug/usr/libexec/ld.elf_so-sparc.debug and restrict ld.elf_so-sparc.debug to compat builds. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/debug/md.sparc64 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/debug/md.sparc64 diff -u src/distrib/sets/lists/debug/md.sparc64:1.24 src/distrib/sets/lists/debug/md.sparc64:1.25 --- src/distrib/sets/lists/debug/md.sparc64:1.24 Sun Apr 28 04:05:40 2013 +++ src/distrib/sets/lists/debug/md.sparc64 Tue Jul 9 17:14:37 2013 @@ -1,10 +1,11 @@ -# $NetBSD: md.sparc64,v 1.24 2013/04/28 04:05:40 joerg Exp $ +# $NetBSD: md.sparc64,v 1.25 2013/07/09 17:14:37 njoly Exp $ ./usr/libdata/debug/lib/sparc/npf/ext_log.so.0.0.debug comp-npf-debug debug,compat ./usr/libdata/debug/lib/sparc/npf/ext_normalize.so.0.0.debug comp-npf-debug debug,compat ./usr/libdata/debug/lib/sparc/npf/ext_rndblock.so.0.0.debug comp-npf-debug debug,compat -./usr/libdata/debug/libexec/ld.elf_so-sparc.debug comp-sys-debug debug +./usr/libdata/debug/libexec/ld.elf_so-sparc.debug comp-sys-debug debug,compat ./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug obsolete ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug +./usr/libdata/debug/usr/libexec/ld.elf_so-sparc.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/libexec/ld.elf_so.sparc comp-obsolete obsolete ./usr/libdata/debug/usr/lib/sparc/i18n/libBIG5.so.5.0.debug comp-i18n-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/sparc/i18n/libDECHanyu.so.5.0.debug comp-i18n-shlib compat,pic,debug
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Tue Jul 9 17:49:37 UTC 2013
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Fix pasto: BUILDRUMP_CPPFLAGS was used twice.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/rump/Makefile.rump
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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.82 src/sys/rump/Makefile.rump:1.83
--- src/sys/rump/Makefile.rump:1.82 Thu Jul 4 10:14:04 2013
+++ src/sys/rump/Makefile.rump Tue Jul 9 17:49:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.82 2013/07/04 10:14:04 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.83 2013/07/09 17:49:37 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -108,7 +108,7 @@ rumpcomp_user.pico: rumpcomp_user.c
rumpcomp_user.po: rumpcomp_user.c
${_MKTARGET_COMPILE}
- ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${RUMPCOMP_USER_WERROR} -Wall -Wmissing-prototypes ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*rumpcomp_user.c}
+ ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${RUMPCOMP_USER_WERROR} -Wall -Wmissing-prototypes ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*rumpcomp_user.c}
RUMPCOMP_USEROBJ=rumpcomp_user.*o
SRCS+=rumpcomp_user.c
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Tue Jul 9 18:13:14 UTC 2013 Modified Files: src/usr.bin/make: main.c Log Message: Set .MAKE.LEVEL.ENV to the name of the env variable used to communicate the recursion level to sub-makes. To generate a diff of this commit: cvs rdiff -u -r1.216 -r1.217 src/usr.bin/make/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/main.c diff -u src/usr.bin/make/main.c:1.216 src/usr.bin/make/main.c:1.217 --- src/usr.bin/make/main.c:1.216 Sat Jul 6 18:19:17 2013 +++ src/usr.bin/make/main.c Tue Jul 9 18:13:14 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.216 2013/07/06 18:19:17 sjg Exp $ */ +/* $NetBSD: main.c,v 1.217 2013/07/09 18:13:14 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = $NetBSD: main.c,v 1.216 2013/07/06 18:19:17 sjg Exp $; +static char rcsid[] = $NetBSD: main.c,v 1.217 2013/07/09 18:13:14 sjg Exp $; #else #include sys/cdefs.h #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94; #else -__RCSID($NetBSD: main.c,v 1.216 2013/07/06 18:19:17 sjg Exp $); +__RCSID($NetBSD: main.c,v 1.217 2013/07/09 18:13:14 sjg Exp $); #endif #endif /* not lint */ #endif @@ -932,6 +932,8 @@ main(int argc, char **argv) Var_Set(MAKEOVERRIDES, , VAR_GLOBAL, 0); Var_Set(MFLAGS, , VAR_GLOBAL, 0); Var_Set(.ALLTARGETS, , VAR_GLOBAL, 0); + /* some makefiles need to know this */ + Var_Set(MAKE_LEVEL .ENV, MAKE_LEVEL_ENV, VAR_GLOBAL, 0); /* * Set some other useful macros
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Tue Jul 9 18:44:41 UTC 2013 Modified Files: src/usr.bin/make: main.c Log Message: For .MAKE.LEVEL.ENV use VAR_CMD so updates are ignored To generate a diff of this commit: cvs rdiff -u -r1.217 -r1.218 src/usr.bin/make/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/main.c diff -u src/usr.bin/make/main.c:1.217 src/usr.bin/make/main.c:1.218 --- src/usr.bin/make/main.c:1.217 Tue Jul 9 18:13:14 2013 +++ src/usr.bin/make/main.c Tue Jul 9 18:44:41 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.217 2013/07/09 18:13:14 sjg Exp $ */ +/* $NetBSD: main.c,v 1.218 2013/07/09 18:44:41 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = $NetBSD: main.c,v 1.217 2013/07/09 18:13:14 sjg Exp $; +static char rcsid[] = $NetBSD: main.c,v 1.218 2013/07/09 18:44:41 sjg Exp $; #else #include sys/cdefs.h #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94; #else -__RCSID($NetBSD: main.c,v 1.217 2013/07/09 18:13:14 sjg Exp $); +__RCSID($NetBSD: main.c,v 1.218 2013/07/09 18:44:41 sjg Exp $); #endif #endif /* not lint */ #endif @@ -933,7 +933,7 @@ main(int argc, char **argv) Var_Set(MFLAGS, , VAR_GLOBAL, 0); Var_Set(.ALLTARGETS, , VAR_GLOBAL, 0); /* some makefiles need to know this */ - Var_Set(MAKE_LEVEL .ENV, MAKE_LEVEL_ENV, VAR_GLOBAL, 0); + Var_Set(MAKE_LEVEL .ENV, MAKE_LEVEL_ENV, VAR_CMD, 0); /* * Set some other useful macros
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: martin
Date: Tue Jul 9 20:32:11 UTC 2013
Modified Files:
src/sys/arch/sparc64/sparc64: ofw_machdep.c
Log Message:
Make dubious code that skips a few interrupts hardcoded print a verbose
message asking the user to mail us details. This will also alarm us
should the strange test sometimes in the future trigger eroneously
on newer hardware.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sparc64/sparc64/ofw_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/sparc64/sparc64/ofw_machdep.c
diff -u src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.39 src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.40
--- src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.39 Mon Jul 8 17:01:05 2013
+++ src/sys/arch/sparc64/sparc64/ofw_machdep.c Tue Jul 9 20:32:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_machdep.c,v 1.39 2013/07/08 17:01:05 mhitch Exp $ */
+/* $NetBSD: ofw_machdep.c,v 1.40 2013/07/09 20:32:11 martin Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -34,7 +34,7 @@
#include opt_multiprocessor.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ofw_machdep.c,v 1.39 2013/07/08 17:01:05 mhitch Exp $);
+__KERNEL_RCSID(0, $NetBSD: ofw_machdep.c,v 1.40 2013/07/09 20:32:11 martin Exp $);
#include sys/param.h
#include sys/buf.h
@@ -701,9 +701,20 @@ OF_mapintr(int node, int *interrupt, int
/*
* Don't try to map interrupts for onboard devices, or if the
* interrupt is already fully specified.
+ * XXX This should be done differently (i.e. by matching
+ * the node name) - but we need access to a machine where
+ * a change is testable - hence the printf below.
*/
- if (*interrupt 0x20 || *interrupt 0x7c0)
+ if (*interrupt 0x20 || *interrupt 0x7c0) {
+ char name[40];
+
+ OF_getprop(node, name, name, sizeof(name));
+ printf(\nATTENTION: if you see this message, please mail
+ the output of \dmesg\ and \ofctl -p\ to
+ port-spar...@netbsd.org!\n
+ Not mapping interrupt for node %s (%x)\n, name, node);
return validlen;
+ }
/*
* If there is no interrupt map in the bus node, we
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: matt
Date: Tue Jul 9 20:33:03 UTC 2013
Modified Files:
src/sys/arch/powerpc/powerpc: bus_space.c
Log Message:
Fix typo (pa instead of va).
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/powerpc/powerpc/bus_space.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/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.35 src/sys/arch/powerpc/powerpc/bus_space.c:1.36
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.35 Thu Apr 11 18:20:33 2013
+++ src/sys/arch/powerpc/powerpc/bus_space.c Tue Jul 9 20:33:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.35 2013/04/11 18:20:33 macallan Exp $ */
+/* $NetBSD: bus_space.c,v 1.36 2013/07/09 20:33:03 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.35 2013/04/11 18:20:33 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.36 2013/07/09 20:33:03 matt Exp $);
#define _POWERPC_BUS_SPACE_PRIVATE
@@ -639,8 +639,8 @@ memio_unmap(bus_space_tag_t t, bus_space
#ifdef PPC_OEA601
if ((mfpvr() 16) == MPC601) {
register_t sr = iosrtable[va ADDR_SR_SHFT];
- if (SR601_VALID_P(sr) ((pa ADDR_SR_SHFT) ==
- ((pa + size - 1) ADDR_SR_SHFT))) {
+ if (SR601_VALID_P(sr) ((va ADDR_SR_SHFT) ==
+ ((va + size - 1) ADDR_SR_SHFT))) {
pa = va;
va = 0;
} else {
