CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Thu Oct 1 07:42:45 UTC 2009 Modified Files: src/sys/kern: vfs_wapbl.c Log Message: Turn a KASSERT into a panic. I don't want us to be randomly overwriting memory on non-DIAGNOSTIC kernels if resource estimation fails. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/kern/vfs_wapbl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/vfs_wapbl.c diff -u src/sys/kern/vfs_wapbl.c:1.26 src/sys/kern/vfs_wapbl.c:1.27 --- src/sys/kern/vfs_wapbl.c:1.26 Tue Jul 14 20:59:00 2009 +++ src/sys/kern/vfs_wapbl.c Thu Oct 1 07:42:45 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_wapbl.c,v 1.26 2009/07/14 20:59:00 apb Exp $ */ +/* $NetBSD: vfs_wapbl.c,v 1.27 2009/10/01 07:42:45 pooka Exp $ */ /*- * Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #define WAPBL_INTERNAL #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_wapbl.c,v 1.26 2009/07/14 20:59:00 apb Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_wapbl.c,v 1.27 2009/10/01 07:42:45 pooka Exp $); #include sys/param.h @@ -1668,8 +1668,14 @@ wapbl_jlock_assert(wl); /* XXX should eventually instead tie this into resource estimation */ - /* XXX this KASSERT needs locking/mutex analysis */ - KASSERT(wl-wl_dealloccnt wl-wl_dealloclim); + /* + * XXX this panic needs locking/mutex analysis and the + * ability to cope with the failure. + */ + /* XXX this XXX doesn't have enough XXX */ + if (__predict_false(wl-wl_dealloccnt = wl-wl_dealloclim)) + panic(wapbl_register_deallocation: out of resources); + wl-wl_deallocblks[wl-wl_dealloccnt] = blk; wl-wl_dealloclens[wl-wl_dealloccnt] = len; wl-wl_dealloccnt++;
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Thu Oct 1 09:12:44 UTC 2009
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch amd64 to binutils 2.19.1.
To generate a diff of this commit:
cvs rdiff -u -r1.583 -r1.584 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.583 src/share/mk/bsd.own.mk:1.584
--- src/share/mk/bsd.own.mk:1.583 Tue Sep 29 23:56:34 2009
+++ src/share/mk/bsd.own.mk Thu Oct 1 09:12:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.583 2009/09/29 23:56:34 tsarna Exp $
+# $NetBSD: bsd.own.mk,v 1.584 2009/10/01 09:12:44 skrll Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -58,7 +58,8 @@
${MACHINE_ARCH} == sh3eb || ${MACHINE_ARCH} == sh3el || \
${MACHINE_ARCH} == sparc || \
${MACHINE_ARCH} == sparc64 || \
-${MACHINE_ARCH} == vax
+${MACHINE_ARCH} == vax || \
+${MACHINE_ARCH} == x86_64
HAVE_BINUTILS?= 219
.else
HAVE_BINUTILS?= 216
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: skrll Date: Thu Oct 1 09:13:54 UTC 2009 Modified Files: src/sys/arch/amd64/amd64: cpufunc.S Log Message: Fix up mwait/monitor now that gas has been fixed. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amd64/amd64/cpufunc.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/cpufunc.S diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.15 src/sys/arch/amd64/amd64/cpufunc.S:1.16 --- src/sys/arch/amd64/amd64/cpufunc.S:1.15 Tue Jun 24 16:32:53 2008 +++ src/sys/arch/amd64/amd64/cpufunc.S Thu Oct 1 09:13:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.S,v 1.15 2008/06/24 16:32:53 ad Exp $ */ +/* $NetBSD: cpufunc.S,v 1.16 2009/10/01 09:13:54 skrll Exp $ */ /*- * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc. @@ -333,7 +333,7 @@ ENTRY(x86_monitor) movq %rdi, %rax movq %rsi, %rcx - monitor %eax, %ecx, %edx /* XXXgas %rax */ + monitor %rax, %rcx, %rdx ret /* Waits - set up stack frame. */ @@ -342,7 +342,7 @@ movq %rsp, %rbp movq %rdi, %rax movq %rsi, %rcx - mwait %eax, %ecx + mwait %rax, %rcx leave ret
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: skrll
Date: Thu Oct 1 09:15:19 UTC 2009
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
MAXPAGESIZE got bumped to 0x20. Use -z maxpagesize=0x10 until
someone(tm) decides that kernels should have that alignment, etc.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amd64/conf/Makefile.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.26 src/sys/arch/amd64/conf/Makefile.amd64:1.27
--- src/sys/arch/amd64/conf/Makefile.amd64:1.26 Thu Dec 11 05:27:42 2008
+++ src/sys/arch/amd64/conf/Makefile.amd64 Thu Oct 1 09:15:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.26 2008/12/11 05:27:42 alc Exp $
+# $NetBSD: Makefile.amd64,v 1.27 2009/10/01 09:15:19 skrll Exp $
# Makefile for NetBSD
#
@@ -66,6 +66,7 @@
## (5) link settings
##
TEXTADDR?= 0x8010
+EXTRA_LINKFLAGS= -z maxpagesize=0x10
LINKFLAGS_NORMAL= -X
KERN_LDSCRIPT?= kern.ldscript
LINKFORMAT= -T ${AMD64}/conf/${KERN_LDSCRIPT}
CVS commit: src/bin/kill
Module Name:src
Committed By: spz
Date: Thu Oct 1 09:24:38 UTC 2009
Modified Files:
src/bin/kill: kill.c
Log Message:
Make sure that numerical signals and pids are in range for their types.
Fixes PR bin/42143
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/bin/kill/kill.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/kill/kill.c
diff -u src/bin/kill/kill.c:1.25 src/bin/kill/kill.c:1.26
--- src/bin/kill/kill.c:1.25 Sun Jul 20 00:52:40 2008
+++ src/bin/kill/kill.c Thu Oct 1 09:24:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kill.c,v 1.25 2008/07/20 00:52:40 lukem Exp $ */
+/* $NetBSD: kill.c,v 1.26 2009/10/01 09:24:38 spz Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)kill.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: kill.c,v 1.25 2008/07/20 00:52:40 lukem Exp $);
+__RCSID($NetBSD: kill.c,v 1.26 2009/10/01 09:24:38 spz Exp $);
#endif
#endif /* not lint */
@@ -49,6 +49,8 @@
#include signal.h
#include stdio.h
#include stdlib.h
+#include limits.h
+#include inttypes.h
#include string.h
#include termios.h
#include unistd.h
@@ -69,7 +71,8 @@
int
main(int argc, char *argv[])
{
- int errors, numsig, pid;
+ int errors;
+ intmax_t numsig, pid;
char *ep;
setprogname(argv[0]);
@@ -87,17 +90,19 @@
if (argc == 1) {
if (isdigit((unsigned char)**argv) == 0)
usage();
- numsig = strtol(*argv, ep, 10);
- if (*ep != '\0') {
+ numsig = strtoimax(*argv, ep, 10);
+ /* check for correctly parsed number */
+ if (*ep != '\0' || numsig == INTMAX_MIN || numsig == INTMAX_MAX) {
errx(EXIT_FAILURE, illegal signal number: %s,
*argv);
/* NOTREACHED */
}
if (numsig = 128)
numsig -= 128;
+ /* and whether it fits into signals range */
if (numsig = 0 || numsig = NSIG)
nosig(*argv);
- printf(%s\n, sys_signame[numsig]);
+ printf(%s\n, sys_signame[(int) numsig]);
exit(0);
}
printsignals(stdout);
@@ -122,12 +127,14 @@
if ((numsig = signame_to_signum(sn)) 0)
nosig(sn);
} else if (isdigit((unsigned char)*sn)) {
- numsig = strtol(sn, ep, 10);
- if (*ep) {
+ numsig = strtoimax(sn, ep, 10);
+ /* check for correctly parsed number */
+ if (*ep || numsig == INTMAX_MIN || numsig == INTMAX_MAX ) {
errx(EXIT_FAILURE, illegal signal number: %s,
sn);
/* NOTREACHED */
}
+ /* and whether it fits into signals range */
if (numsig 0 || numsig = NSIG)
nosig(sn);
} else
@@ -151,14 +158,17 @@
} else
#endif
{
- pid = strtol(*argv, ep, 10);
- if (!**argv || *ep) {
+ pid = strtoimax(*argv, ep, 10);
+ /* make sure the pid is a number and fits into pid_t */
+ if (!**argv || *ep || pid == INTMAX_MIN ||
+pid == INTMAX_MAX || pid != (pid_t) pid) {
+
warnx(illegal process id: %s, *argv);
errors = 1;
continue;
}
}
- if (kill(pid, numsig) == -1) {
+ if (kill((pid_t) pid, (int) numsig) == -1) {
warn(%s, *argv);
errors = 1;
}
@@ -166,7 +176,7 @@
/* Wakeup the process if it was suspended, so it can
exit without an explicit 'fg'. */
if (numsig == SIGTERM || numsig == SIGHUP)
- kill(pid, SIGCONT);
+ kill((pid_t) pid, SIGCONT);
#endif
}
CVS commit: src/external/apache2/mDNSResponder/lib
Module Name:src
Committed By: tron
Date: Thu Oct 1 09:35:08 UTC 2009
Modified Files:
src/external/apache2/mDNSResponder/lib: Makefile
Log Message:
Disable stack protection warnings for dnssd_clientstub.c which allocates
variable sized buffers on the stack.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/apache2/mDNSResponder/lib/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/apache2/mDNSResponder/lib/Makefile
diff -u src/external/apache2/mDNSResponder/lib/Makefile:1.1 src/external/apache2/mDNSResponder/lib/Makefile:1.2
--- src/external/apache2/mDNSResponder/lib/Makefile:1.1 Tue Sep 29 23:56:28 2009
+++ src/external/apache2/mDNSResponder/lib/Makefile Thu Oct 1 09:35:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/09/29 23:56:28 tsarna Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/01 09:35:08 tron Exp $
.include bsd.init.mk
@@ -7,6 +7,8 @@
SRCS= dnssd_clientlib.c dnssd_clientstub.c dnssd_ipc.c
CPPFLAGS+=-I${DIST}/mDNSShared
+COPTS.dnssd_clientstub.c += -Wno-stack-protector
+
INCS= dns_sd.h
INCSDIR=/usr/include
CVS commit: src/external/apache2/mDNSResponder/usr.sbin/mdnsd
Module Name:src Committed By: tron Date: Thu Oct 1 10:01:14 UTC 2009 Modified Files: src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile Log Message: Disable stack protection warnings for uds_daemon.c which allocates variable sized buffers on the stack. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/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/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile diff -u src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.2 src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.3 --- src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.2 Thu Oct 1 00:22:03 2009 +++ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile Thu Oct 1 10:01:14 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2009/10/01 00:22:03 tsarna Exp $ +# $NetBSD: Makefile,v 1.3 2009/10/01 10:01:14 tron Exp $ PROG= mdnsd @@ -11,6 +11,8 @@ DNSCommon.c uds_daemon.c mDNSDebug.c dnssd_ipc.c GenLinkedList.c \ PlatformCommon.c +COPTS.uds_daemon.c += -Wno-stack-protector + MAN= mdnsd.8 mdnsd.8: mDNSResponder.8
CVS commit: src/distrib/utils/sysinst
Module Name:src Committed By: jmcneill Date: Thu Oct 1 10:41:03 UTC 2009 Modified Files: src/distrib/utils/sysinst: disks.c Log Message: In get_descr(), initialize dd_descr to an empty string before probing ATA and SCSI identification. Fixes issues with xbd and raid. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/distrib/utils/sysinst/disks.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/sysinst/disks.c diff -u src/distrib/utils/sysinst/disks.c:1.106 src/distrib/utils/sysinst/disks.c:1.107 --- src/distrib/utils/sysinst/disks.c:1.106 Sun Aug 23 18:43:33 2009 +++ src/distrib/utils/sysinst/disks.c Thu Oct 1 10:41:03 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: disks.c,v 1.106 2009/08/23 18:43:33 jmcneill Exp $ */ +/* $NetBSD: disks.c,v 1.107 2009/10/01 10:41:03 jmcneill Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -288,6 +288,8 @@ if (fd 0) goto done; + dd-dd_descr[0] = '\0'; + /* try ATA */ if (get_descr_ata(dd, fd)) goto done;
CVS commit: src
Module Name:src
Committed By: tron
Date: Thu Oct 1 11:51:04 UTC 2009
Modified Files:
src/distrib/notes/common: contents
src/etc/etc.i386: Makefile.inc
Log Message:
Build the MONOLITHIC kernel configuration by default and include
in the release.
Using the modularise GENERIC kernel on an existing NetBSD 5.0 system
is difficult and error-prone. The MONOLITHIC kernel provides an
easy way to test a new kernel or to upgrade an existing system.
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/distrib/notes/common/contents
cvs rdiff -u -r1.63 -r1.64 src/etc/etc.i386/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/contents
diff -u src/distrib/notes/common/contents:1.157 src/distrib/notes/common/contents:1.158
--- src/distrib/notes/common/contents:1.157 Thu Jul 16 10:43:22 2009
+++ src/distrib/notes/common/contents Thu Oct 1 11:51:03 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: contents,v 1.157 2009/07/16 10:43:22 tsutsui Exp $
+.\ $NetBSD: contents,v 1.158 2009/10/01 11:51:03 tron Exp $
.\
.\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -87,6 +87,8 @@
.\}
.
.if \n[i386] \{\
+. It Pa netbsd-MONOLITHIC.gz
+The monolithic kernel which doesn't use kernel modules.
. It Pa netbsd-INSTALL.gz
The installation kernel.
.
Index: src/etc/etc.i386/Makefile.inc
diff -u src/etc/etc.i386/Makefile.inc:1.63 src/etc/etc.i386/Makefile.inc:1.64
--- src/etc/etc.i386/Makefile.inc:1.63 Thu Jul 16 10:43:23 2009
+++ src/etc/etc.i386/Makefile.inc Thu Oct 1 11:51:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.63 2009/07/16 10:43:23 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.64 2009/10/01 11:51:04 tron Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -7,6 +7,7 @@
# to update the release documentation in distrib/notes/common/contents
KERNEL_SETS= GENERIC
+KERNEL_SETS+= MONOLITHIC
KERNEL_SETS+= XEN3_DOM0
KERNEL_SETS+= XEN3_DOMU
KERNEL_SETS+= XEN3PAE_DOM0
CVS commit: src/sys/rump/librump/rumpdev
Module Name:src
Committed By: pooka
Date: Thu Oct 1 15:21:38 UTC 2009
Modified Files:
src/sys/rump/librump/rumpdev: autoconf.c
Log Message:
children of mainbus, attach (well, one child, iff it happens to be around)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpdev/autoconf.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/rump/librump/rumpdev/autoconf.c
diff -u src/sys/rump/librump/rumpdev/autoconf.c:1.2 src/sys/rump/librump/rumpdev/autoconf.c:1.3
--- src/sys/rump/librump/rumpdev/autoconf.c:1.2 Sun Sep 20 23:16:09 2009
+++ src/sys/rump/librump/rumpdev/autoconf.c Thu Oct 1 15:21:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.2 2009/09/20 23:16:09 pooka Exp $ */
+/* $NetBSD: autoconf.c,v 1.3 2009/10/01 15:21:38 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,20 +26,32 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.2 2009/09/20 23:16:09 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.3 2009/10/01 15:21:38 pooka Exp $);
#include sys/param.h
#include sys/device.h
#include sys/kernel.h
-int mainbus_match(struct device *, struct cfdata *, void *);
-void mainbus_attach(struct device *, struct device *, void *);
+static int mainbus_match(struct device *, struct cfdata *, void *);
+static void mainbus_attach(struct device *, struct device *, void *);
+static int mainbus_search(struct device *, struct cfdata *,
+ const int *, void *);
struct mainbus_softc {
int mb_nada;
};
-CFDRIVER_DECL(mainbus, DV_DULL, NULL);
+static const struct cfiattrdata mainbus_iattrdata = {
+mainbus, 0, {
+ { NULL, NULL, 0 },
+ }
+};
+static const struct cfiattrdata * const mainbus_attrs[] = {
+ mainbus_iattrdata,
+ NULL,
+};
+
+CFDRIVER_DECL(mainbus, DV_DULL, mainbus_attrs);
CFATTACH_DECL_NEW(mainbus, sizeof(struct mainbus_softc),
mainbus_match, mainbus_attach, NULL, NULL);
@@ -106,4 +118,16 @@
{
aprint_normal(\n);
+ config_search_ia(mainbus_search, self, mainbus, NULL);
+}
+
+static int
+mainbus_search(struct device *parent, struct cfdata *cf,
+ const int *ldesc, void *aux)
+{
+
+ if (config_match(parent, cf, NULL) 0)
+ config_attach(parent, cf, NULL, NULL);
+
+ return 0;
}
CVS commit: src
Module Name:src
Committed By: tsarna
Date: Thu Oct 1 16:36:21 UTC 2009
Modified Files:
src/etc/defaults: rc.conf
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
mDNSPosix.c
src/external/apache2/mDNSResponder/usr.sbin: Makefile.inc
Log Message:
mdnsd enhancements and fixes:
- Enhance the built-in drop-privs support and use it instead of
having the rc.conf do it. Avoids log error on startup.
From OpenSolaris, with enhancements.
- Add dumping of the unicast server list to the DumpStateLog
debugging output, a'la Mac OS X.
- Fix a locking botch that caused warnings in the log.
- Fix FILE leak. From OpenSolaris.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/etc/defaults/rc.conf
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/apache2/mDNSResponder/usr.sbin/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.108 src/etc/defaults/rc.conf:1.109
--- src/etc/defaults/rc.conf:1.108 Tue Sep 29 23:56:27 2009
+++ src/etc/defaults/rc.conf Thu Oct 1 16:36:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.108 2009/09/29 23:56:27 tsarna Exp $
+# $NetBSD: rc.conf,v 1.109 2009/10/01 16:36:20 tsarna Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -160,7 +160,7 @@
# Networking startup.
#
-mdnsd=NO mdnsd_user=_mdnsd
+mdnsd=NO
ipfilter=NO ipfilter_flags= # uses /etc/ipf.conf
ipnat=NO # uses /etc/ipnat.conf
ipfs=NO ipfs_flags= # save/load ipnat and ipf states
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.1.1.1 Tue Sep 29 22:14:13 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Thu Oct 1 16:36:20 2009
@@ -101,8 +101,13 @@
#include mDNSPosix.h
#include mDNSUNP.h // For daemon()
#include uds_daemon.h
+#include DNSCommon.h
#include PlatformCommon.h
+#ifndef MDNSD_USER
+#define MDNSD_USER nobody
+#endif
+
#define CONFIG_FILE /etc/mdnsd.conf
static domainname DynDNSZone;// Default wide-area zone for service registration
static domainname DynDNSHostname;
@@ -143,8 +148,10 @@
mDNSAddr DynDNSIP;
const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 1, 1, 1, 1 } } } };;
mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL);
+mDNS_Lock(m);
if (ParseDNSServers(m, uDNS_SERVERS_FILE) 0)
LogMsg(Unable to parse DNS server list. Unicast DNS-SD unavailable);
+mDNS_Unlock(m);
ReadDDNSSettingsFromConfFile(m, CONFIG_FILE, DynDNSHostname, DynDNSZone, NULL);
mDNSPlatformSourceAddrForDest(DynDNSIP, dummy);
if (DynDNSHostname.c[0]) mDNS_AddDynDNSHostName(m, DynDNSHostname, NULL, NULL);
@@ -175,8 +182,26 @@
mDNSlocal void DumpStateLog(mDNS *const m)
// Dump a little log of what we've been up to.
{
+ DNSServer *s;
+
LogMsg( BEGIN STATE LOG );
udsserver_info(m);
+
+LogMsgNoIdent(- DNS Servers --);
+if (!mDNSStorage.DNSServers) LogMsgNoIdent(None);
+else
+{
+for (s = m-DNSServers; s; s = s-next)
+{
+LogMsgNoIdent(DNS Server %##s %#a:%d %s,
+s-domain.c, s-addr, mDNSVal16(s-port),
+s-teststate == DNSServer_Untested ? (Untested) :
+s-teststate == DNSServer_Passed ?:
+s-teststate == DNSServer_Failed ? (Failed) :
+s-teststate == DNSServer_Disabled ? (Disabled) : (Unknown state));
+}
+}
+
LogMsg( END STATE LOG );
}
@@ -241,11 +266,21 @@
// Now that we're finished with anything privileged, switch over to running as nobody
if (mStatus_NoError == err)
{
- const struct passwd *pw = getpwnam(nobody);
+ const struct passwd *pw = getpwnam(MDNSD_USER);
if (pw != NULL)
+ {
+ setgid(pw-pw_gid);
setuid(pw-pw_uid);
+ }
else
- LogMsg(WARNING: mdnsd continuing as root because user \nobody\ does not exist);
+#ifdef MDNSD_NOROOT
+{
+ LogMsg(WARNING: mdnsd exiting because user \MDNSD_USER\ does not exist);
+err = mStatus_Invalid;
+}
+#else
+ LogMsg(WARNING: mdnsd continuing as root because user \MDNSD_USER\ does not exist);
+#endif
}
if (mStatus_NoError ==
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jmmv Date: Thu Oct 1 19:02:27 UTC 2009 Modified Files: src/sys/dev/pci: r128fb.c Log Message: Recognize PCI_PRODUCT_ATI_RAGEGLPCI. Works on a PowerMac G3 BW running NetBSD/macppc. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/r128fb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/r128fb.c diff -u src/sys/dev/pci/r128fb.c:1.9 src/sys/dev/pci/r128fb.c:1.10 --- src/sys/dev/pci/r128fb.c:1.9 Thu Aug 20 02:40:57 2009 +++ src/sys/dev/pci/r128fb.c Thu Oct 1 19:02:27 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: r128fb.c,v 1.9 2009/08/20 02:40:57 macallan Exp $ */ +/* $NetBSD: r128fb.c,v 1.10 2009/10/01 19:02:27 jmmv Exp $ */ /* * Copyright (c) 2007 Michael Lorenz @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: r128fb.c,v 1.9 2009/08/20 02:40:57 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: r128fb.c,v 1.10 2009/10/01 19:02:27 jmmv Exp $); #include sys/param.h #include sys/systm.h @@ -173,6 +173,7 @@ /* only cards tested on so far - likely need a list */ if ((PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_ATI_RAGE1AGP4XT) || (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_ATI_RAGE3AGP4XT) || + (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_ATI_RAGEGLPCI) || (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_ATI_RAGE_MOB_M3_AGP)) return 100; return (0);
CVS commit: src/gnu
Module Name:src
Committed By: martin
Date: Thu Oct 1 20:07:09 UTC 2009
Modified Files:
src/gnu/dist/gcc4/gcc: libgcc2.c
src/gnu/lib/libgcc4: Makefile.inc
Log Message:
If TARGET_FLOAT_FORMAT is not IEEE_FLOAT_FORMAT (i.e. we have no NaNs),
do not compile special code to fix up different NaN values.
Re-enable complex support functions in libgcc for vax.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/gnu/dist/gcc4/gcc/libgcc2.c
cvs rdiff -u -r1.13 -r1.14 src/gnu/lib/libgcc4/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gcc4/gcc/libgcc2.c
diff -u src/gnu/dist/gcc4/gcc/libgcc2.c:1.1.1.3 src/gnu/dist/gcc4/gcc/libgcc2.c:1.2
--- src/gnu/dist/gcc4/gcc/libgcc2.c:1.1.1.3 Thu Jan 11 02:35:28 2007
+++ src/gnu/dist/gcc4/gcc/libgcc2.c Thu Oct 1 20:07:09 2009
@@ -1618,7 +1618,9 @@
#define isfinite(x) __builtin_expect (!isnan((x) - (x)), 1)
#define isinf(x) __builtin_expect (!isnan(x) !isfinite(x), 0)
+#if TARGET_FLOAT_FORMAT == IEEE_FLOAT_FORMAT
#define INFINITY CONCAT2(__builtin_inf, CEXT) ()
+#endif
#define I 1i
/* Helpers to make the following code slightly less gross. */
@@ -1626,7 +1628,9 @@
#define FABS CONCAT2(__builtin_fabs, CEXT)
/* Verify that MTYPE matches up with CEXT. */
+#ifdef INFINITY
extern void *compile_type_assert[sizeof(INFINITY) == sizeof(MTYPE) ? 1 : -1];
+#endif
/* Ensure that we've lost any extra precision. */
#if NOTRUNC
@@ -1656,6 +1660,7 @@
x = ac - bd;
y = ad + bc;
+#ifdef INFINITY
if (isnan (x) isnan (y))
{
/* Recover infinities that computed as NaN + iNaN. */
@@ -1697,6 +1702,7 @@
y = INFINITY * (a * d + b * c);
}
}
+#endif
return x + I * y;
}
@@ -1731,6 +1737,7 @@
/* Recover infinities and zeros that computed as NaN+iNaN; the only cases
are nonzero/zero, infinite/finite, and finite/infinite. */
+#ifdef INFINITY
if (isnan (x) isnan (y))
{
if (c == 0.0 d == 0.0 (!isnan (a) || !isnan (b)))
@@ -1753,11 +1760,12 @@
y = 0.0 * (b * c - a * d);
}
}
+#endif
return x + I * y;
}
#endif /* complex divide */
-
+#undef INFINITY
#endif /* all complex float routines */
/* From here on down, the routines use normal data types. */
Index: src/gnu/lib/libgcc4/Makefile.inc
diff -u src/gnu/lib/libgcc4/Makefile.inc:1.13 src/gnu/lib/libgcc4/Makefile.inc:1.14
--- src/gnu/lib/libgcc4/Makefile.inc:1.13 Thu Sep 18 12:20:19 2008
+++ src/gnu/lib/libgcc4/Makefile.inc Thu Oct 1 20:07:09 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2008/09/18 12:20:19 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.14 2009/10/01 20:07:09 martin Exp $
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk) ${MKGCC} != no
.include ${.CURDIR}/../arch/${MACHINE_ARCH}.mk
@@ -27,10 +27,8 @@
_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \
_powixf2 _powitf2 \
-.if ${MACHINE_ARCH} != vax
LIB2FUNCS_ALL+= \
_mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 _divxc3 _divtc3
-.endif
LIB2FUNCS_SHORT:=${LIB2FUNCS_ALL}
LIB2_DIVMOD_FUNCS:=${G_LIB2_DIVMOD_FUNCS}
CVS commit: src/usr.bin/make
Module Name:src
Committed By: dsl
Date: Thu Oct 1 21:40:31 UTC 2009
Modified Files:
src/usr.bin/make: make.1
Log Message:
Add example of how to use the ?: modifier properly.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/usr.bin/make/make.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.161 src/usr.bin/make/make.1:1.162
--- src/usr.bin/make/make.1:1.161 Tue Sep 8 17:29:20 2009
+++ src/usr.bin/make/make.1 Thu Oct 1 21:40:31 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: make.1,v 1.161 2009/09/08 17:29:20 sjg Exp $
+.\ $NetBSD: make.1,v 1.162 2009/10/01 21:40:31 dsl Exp $
.\
.\ Copyright (c) 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ from: @(#)make.1 8.4 (Berkeley) 3/19/94
.\
-.Dd September 7, 2009
+.Dd October 1, 2009
.Dt MAKE 1
.Os
.Sh NAME
@@ -1061,8 +1061,11 @@
Since the variable name is used as the expression, \:\? must be the
first modifier after the variable name itself - which will, of course,
usually contain variable expansions.
-If the expression is a single token, it will likely be treated as a check
-for the name being defined.
+A common error is trying to use expressions like
+.Dl ${NUMBERS:M42:?match:no}
+which actually tests defined(NUMBERS),
+to determine is any words match 42 you need to use something like:
+.Dl ${${NUMBERS:M42} != :?match:no} .
.It Ar :old_string=new_string
This is the
.At V
CVS commit: src/sys/rump/librump/rumpdev
Module Name:src
Committed By: pooka
Date: Thu Oct 1 21:43:29 UTC 2009
Modified Files:
src/sys/rump/librump/rumpdev: rump_dev.c rump_dev_private.h
Log Message:
add a new init-related calls
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpdev/rump_dev.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpdev/rump_dev_private.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/rump/librump/rumpdev/rump_dev.c
diff -u src/sys/rump/librump/rumpdev/rump_dev.c:1.5 src/sys/rump/librump/rumpdev/rump_dev.c:1.6
--- src/sys/rump/librump/rumpdev/rump_dev.c:1.5 Mon Sep 21 12:14:47 2009
+++ src/sys/rump/librump/rumpdev/rump_dev.c Thu Oct 1 21:43:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_dev.c,v 1.5 2009/09/21 12:14:47 pooka Exp $ */
+/* $NetBSD: rump_dev.c,v 1.6 2009/10/01 21:43:29 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_dev.c,v 1.5 2009/09/21 12:14:47 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_dev.c,v 1.6 2009/10/01 21:43:29 pooka Exp $);
#include sys/param.h
#include sys/device.h
@@ -39,10 +39,14 @@
__weak_alias(rump_dev_raidframe_init,nocomponent);
__weak_alias(rump_dev_netsmb_init,nocomponent);
__weak_alias(rump_dev_rnd_init,nocomponent);
+__weak_alias(rump_dev_rumpusbhc_init,nocomponent);
+
+__weak_alias(rump_device_configuration,nocomponent);
void
rump_dev_init(void)
{
+ extern int cold;
config_init_mi();
@@ -50,9 +54,13 @@
rump_dev_raidframe_init();
rump_dev_netsmb_init();
rump_dev_rnd_init();
+ rump_dev_rumpusbhc_init();
rump_pdev_finalize();
+ rump_device_configuration();
+
+ cold = 0;
if (config_rootfound(mainbus, NULL) == NULL)
panic(no mainbus);
Index: src/sys/rump/librump/rumpdev/rump_dev_private.h
diff -u src/sys/rump/librump/rumpdev/rump_dev_private.h:1.4 src/sys/rump/librump/rumpdev/rump_dev_private.h:1.5
--- src/sys/rump/librump/rumpdev/rump_dev_private.h:1.4 Tue Sep 8 20:15:51 2009
+++ src/sys/rump/librump/rumpdev/rump_dev_private.h Thu Oct 1 21:43:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_dev_private.h,v 1.4 2009/09/08 20:15:51 pooka Exp $ */
+/* $NetBSD: rump_dev_private.h,v 1.5 2009/10/01 21:43:29 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -37,5 +37,8 @@
void rump_dev_raidframe_init(void);
void rump_dev_netsmb_init(void);
void rump_dev_rnd_init(void);
+void rump_dev_rumpusbhc_init(void);
+
+void rump_device_configuration(void);
#endif /* _SYS_RUMP_DEV_PRIVATE_H_ */
CVS commit: src/sys/rump/dev/wip
Module Name:src
Committed By: pooka
Date: Thu Oct 1 21:46:31 UTC 2009
Added Files:
src/sys/rump/dev/wip: Makefile.inc
src/sys/rump/dev/wip/libumass: Makefile locators.h
sd_at_scsibus_at_umass.c shlib_version
src/sys/rump/dev/wip/libumass/opt: atapibus.h opt_compat_freebsd.h
opt_scsi.h scsibus.h wd.h
src/sys/rump/dev/wip/libusb: Makefile bus_dma.c locators.h
shlib_version
src/sys/rump/dev/wip/libusb/opt: ohci.h opt_usbverbose.h uhci.h
Log Message:
Checkpoint some work-in-progress for USB support in rump (currently
with limited s...@umass support). However, not useful for anything
before I get the ugen-to-rump usb host controller cleaned up and
checkpointed.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/wip/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/wip/libumass/Makefile \
src/sys/rump/dev/wip/libumass/locators.h \
src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c \
src/sys/rump/dev/wip/libumass/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/wip/libumass/opt/atapibus.h \
src/sys/rump/dev/wip/libumass/opt/opt_compat_freebsd.h \
src/sys/rump/dev/wip/libumass/opt/opt_scsi.h \
src/sys/rump/dev/wip/libumass/opt/scsibus.h \
src/sys/rump/dev/wip/libumass/opt/wd.h
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/wip/libusb/Makefile \
src/sys/rump/dev/wip/libusb/bus_dma.c \
src/sys/rump/dev/wip/libusb/locators.h \
src/sys/rump/dev/wip/libusb/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/wip/libusb/opt/ohci.h \
src/sys/rump/dev/wip/libusb/opt/opt_usbverbose.h \
src/sys/rump/dev/wip/libusb/opt/uhci.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/wip/Makefile.inc
diff -u /dev/null src/sys/rump/dev/wip/Makefile.inc:1.1
--- /dev/null Thu Oct 1 21:46:31 2009
+++ src/sys/rump/dev/wip/Makefile.inc Thu Oct 1 21:46:30 2009
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/10/01 21:46:30 pooka Exp $
+#
+
+RUMPTOP= ${.CURDIR}/../../..
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpdev
+
+.include ${RUMPTOP}/Makefile.rump
Index: src/sys/rump/dev/wip/libumass/Makefile
diff -u /dev/null src/sys/rump/dev/wip/libumass/Makefile:1.1
--- /dev/null Thu Oct 1 21:46:31 2009
+++ src/sys/rump/dev/wip/libumass/Makefile Thu Oct 1 21:46:30 2009
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2009/10/01 21:46:30 pooka Exp $
+#
+#
+# umass. includes scsibus+sd for simplicity due to the umass code
+# needing compile time knowledge of its presence. fixxxme
+#
+
+.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../dev/scsipi
+
+LIB= rumpdev_umass
+
+SRCS= umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
+SRCS+= scsipiconf.c scsipi_base.c scsipi_ioctl.c scsi_base.c scsiconf.c sd.c
+
+SRCS+= sd_at_scsibus_at_umass.c
+
+CFLAGS+= -Wno-pointer-sign
+CPPFLAGS+= -I${.CURDIR}/opt
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/wip/libumass/locators.h
diff -u /dev/null src/sys/rump/dev/wip/libumass/locators.h:1.1
--- /dev/null Thu Oct 1 21:46:31 2009
+++ src/sys/rump/dev/wip/libumass/locators.h Thu Oct 1 21:46:30 2009
@@ -0,0 +1,38 @@
+/* $NetBSD: locators.h,v 1.1 2009/10/01 21:46:30 pooka Exp $ */
+
+/* locators borrowed from config. redo properly some day */
+
+#define SCSIBUSCF_TARGET 0
+#define SCSIBUSCF_TARGET_DEFAULT -1
+#define SCSIBUSCF_LUN 1
+#define SCSIBUSCF_LUN_DEFAULT -1
+#define SCSIBUSCF_NLOCS 2
+#define USBIFIFCF_PORT 0
+#define USBIFIFCF_PORT_DEFAULT -1
+#define USBIFIFCF_CONFIGURATION 1
+#define USBIFIFCF_CONFIGURATION_DEFAULT -1
+#define USBIFIFCF_INTERFACE 2
+#define USBIFIFCF_INTERFACE_DEFAULT -1
+#define USBIFIFCF_VENDOR 3
+#define USBIFIFCF_VENDOR_DEFAULT -1
+#define USBIFIFCF_PRODUCT 4
+#define USBIFIFCF_PRODUCT_DEFAULT -1
+#define USBIFIFCF_RELEASE 5
+#define USBIFIFCF_RELEASE_DEFAULT -1
+#define USBIFIFCF_NLOCS 6
+#define USBDEVIFCF_PORT 0
+#define USBDEVIFCF_PORT_DEFAULT -1
+#define USBDEVIFCF_CONFIGURATION 1
+#define USBDEVIFCF_CONFIGURATION_DEFAULT -1
+#define USBDEVIFCF_INTERFACE 2
+#define USBDEVIFCF_INTERFACE_DEFAULT -1
+#define USBDEVIFCF_VENDOR 3
+#define USBDEVIFCF_VENDOR_DEFAULT -1
+#define USBDEVIFCF_PRODUCT 4
+#define USBDEVIFCF_PRODUCT_DEFAULT -1
+#define USBDEVIFCF_RELEASE 5
+#define USBDEVIFCF_RELEASE_DEFAULT -1
+#define USBDEVIFCF_NLOCS 6
+#define SCSICF_CHANNEL 0
+#define SCSICF_CHANNEL_DEFAULT -1
+#define SCSICF_NLOCS 1
Index: src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c
diff -u /dev/null src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c:1.1
--- /dev/null Thu Oct 1 21:46:31 2009
+++ src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c Thu Oct 1 21:46:30 2009
@@ -0,0 +1,154 @@
+/* $NetBSD: sd_at_scsibus_at_umass.c,v 1.1 2009/10/01 21:46:30 pooka Exp $ */
+
+#include sys/param.h
+#include sys/types.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/kmem.h
+
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Fri Oct 2 00:00:59 UTC 2009 Modified Files: src/etc/mtree: NetBSD.dist.Xorg Log Message: don't create xkb/compiled as a directory any more. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/etc/mtree/NetBSD.dist.Xorg Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.Xorg diff -u src/etc/mtree/NetBSD.dist.Xorg:1.1 src/etc/mtree/NetBSD.dist.Xorg:1.2 --- src/etc/mtree/NetBSD.dist.Xorg:1.1 Mon Sep 7 19:34:30 2009 +++ src/etc/mtree/NetBSD.dist.Xorg Fri Oct 2 00:00:59 2009 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.Xorg,v 1.1 2009/09/07 19:34:30 mrg Exp $ +# $NetBSD: NetBSD.dist.Xorg,v 1.2 2009/10/02 00:00:59 mrg Exp $ ./usr/X11R7 ./usr/X11R7/bin @@ -116,7 +116,6 @@ ./usr/X11R7/lib/X11/xedit/lisp/progmodes ./usr/X11R7/lib/X11/xkb ./usr/X11R7/lib/X11/xkb/compat -./usr/X11R7/lib/X11/xkb/compiled ./usr/X11R7/lib/X11/xkb/geometry ./usr/X11R7/lib/X11/xkb/geometry/digital_vndr ./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr
CVS commit: src
Module Name:src Committed By: tsarna Date: Fri Oct 2 02:45:30 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: mi src/include: netdb.h src/lib/libc: shlib_version src/lib/libc/net: Makefile.inc getaddrinfo.3 getaddrinfo.c Log Message: Introduce allocaddrinfo(3) to make writing getaddrinfo() nss plugins easier. Discussed on tech-net. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.493 -r1.494 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1314 -r1.1315 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.61 -r1.62 src/include/netdb.h cvs rdiff -u -r1.214 -r1.215 src/lib/libc/shlib_version cvs rdiff -u -r1.77 -r1.78 src/lib/libc/net/Makefile.inc cvs rdiff -u -r1.46 -r1.47 src/lib/libc/net/getaddrinfo.3 cvs rdiff -u -r1.92 -r1.93 src/lib/libc/net/getaddrinfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.68 src/distrib/sets/lists/base/md.amd64:1.69 --- src/distrib/sets/lists/base/md.amd64:1.68 Fri Sep 11 16:01:59 2009 +++ src/distrib/sets/lists/base/md.amd64 Fri Oct 2 02:45:28 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.68 2009/09/11 16:01:59 mrg Exp $ +# $NetBSD: md.amd64,v 1.69 2009/10/02 02:45:28 tsarna Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -67,7 +67,7 @@ ./usr/lib/i386/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/i386/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/i386/libc.so.12 base-compat-shlib compat,pic -./usr/lib/i386/libc.so.12.170 base-compat-shlib compat,pic +./usr/lib/i386/libc.so.12.171 base-compat-shlib compat,pic ./usr/lib/i386/libcom_err.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/i386/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/i386/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.61 src/distrib/sets/lists/base/md.sparc64:1.62 --- src/distrib/sets/lists/base/md.sparc64:1.61 Fri Sep 11 22:36:53 2009 +++ src/distrib/sets/lists/base/md.sparc64 Fri Oct 2 02:45:28 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.61 2009/09/11 22:36:53 mrg Exp $ +# $NetBSD: md.sparc64,v 1.62 2009/10/02 02:45:28 tsarna Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin @@ -65,7 +65,7 @@ ./usr/lib/sparc/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/sparc/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/sparc/libc.so.12 base-compat-shlib compat,pic -./usr/lib/sparc/libc.so.12.170 base-compat-shlib compat,pic +./usr/lib/sparc/libc.so.12.171 base-compat-shlib compat,pic ./usr/lib/sparc/libcom_err.so.6 base-compat-shlib compat,pic ./usr/lib/sparc/libcom_err.so.6.0 base-compat-shlib compat,pic ./usr/lib/sparc/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.493 src/distrib/sets/lists/base/shl.mi:1.494 --- src/distrib/sets/lists/base/shl.mi:1.493 Wed Sep 30 03:41:12 2009 +++ src/distrib/sets/lists/base/shl.mi Fri Oct 2 02:45:28 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.493 2009/09/30 03:41:12 tsarna Exp $ +# $NetBSD: shl.mi,v 1.494 2009/10/02 02:45:28 tsarna Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -13,7 +13,7 @@ # # Note: libtermcap and libtermlib are hardlinked and share the same version. # -./lib/libc.so.12.170base-sys-shlib dynamicroot +./lib/libc.so.12.171base-sys-shlib dynamicroot ./lib/libcrypt.so.1.0base-sys-shlib dynamicroot ./lib/libcrypto.so.6.0base-crypto-shlib crypto,dynamicroot ./lib/libdevmapper.so.1.0 base-lvm-shlib lvm,dynamicroot @@ -61,7 +61,7 @@ ./usr/lib/libbluetooth.so.4.2 base-sys-shlib ./usr/lib/libbsdmalloc.so.0.0 base-sys-shlib ./usr/lib/libbz2.so.1.1base-sys-shlib -./usr/lib/libc.so.12.170 base-sys-shlib +./usr/lib/libc.so.12.171 base-sys-shlib ./usr/lib/libcom_err.so.6.0 base-krb5-shlib kerberos ./usr/lib/libcrypt.so.1.0 base-sys-shlib ./usr/lib/libcrypto.so.6.0 base-crypto-shlib crypto Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1314 src/distrib/sets/lists/comp/mi:1.1315 --- src/distrib/sets/lists/comp/mi:1.1314 Tue Sep 29 23:56:26 2009 +++ src/distrib/sets/lists/comp/mi Fri Oct 2 02:45:29 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1314 2009/09/29 23:56:26 tsarna Exp $ +# $NetBSD: mi,v 1.1315 2009/10/02 02:45:29 tsarna Exp $ # # Note: don't delete
CVS commit: src
Module Name:src Committed By: mrg Date: Fri Oct 2 03:13:23 UTC 2009 Modified Files: src: UPDATING Log Message: add a note about accidental compiled/xkb symlinks appearing To generate a diff of this commit: cvs rdiff -u -r1.201 -r1.202 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.201 src/UPDATING:1.202 --- src/UPDATING:1.201 Sat Jul 18 09:50:32 2009 +++ src/UPDATING Fri Oct 2 03:13:23 2009 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.201 2009/07/18 09:50:32 dsl Exp $ +$NetBSD: UPDATING,v 1.202 2009/10/02 03:13:23 mrg Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -16,6 +16,11 @@ Recent changes: ^^^ +20091001: + An error will create a ./usr/X11R7/lib/X11/xkb/compiled/xkb + symlink, failing the build. Delete the link, and the subdir + it is in, and retry your build. + 20090718: libc build changed so that strchr() provides the extra entry point for index(). Update build of libc.a (and libc_pic.a)
CVS commit: src/doc
Module Name:src Committed By: tsarna Date: Fri Oct 2 04:26:52 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Missed name and date on last To generate a diff of this commit: cvs rdiff -u -r1.1296 -r1.1297 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1296 src/doc/CHANGES:1.1297 --- src/doc/CHANGES:1.1296 Thu Oct 1 00:25:14 2009 +++ src/doc/CHANGES Fri Oct 2 04:26:52 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1296 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1297 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -408,3 +408,4 @@ wb(4): Add a driver for Winbond W83L518D SD/MMC readers. [jmcneill 20090930] mdnsd(8), dns-sd(1), libdns_sd: import mDNSResponder 212.1 + [tsarna 20090929]
CVS commit: src/sys/dev/sdmmc
Module Name:src Committed By: uebayasi Date: Fri Oct 2 04:33:59 UTC 2009 Modified Files: src/sys/dev/sdmmc: sdhc.c Log Message: Typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c diff -u src/sys/dev/sdmmc/sdhc.c:1.2 src/sys/dev/sdmmc/sdhc.c:1.3 --- src/sys/dev/sdmmc/sdhc.c:1.2 Sun May 17 14:36:46 2009 +++ src/sys/dev/sdmmc/sdhc.c Fri Oct 2 04:33:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: sdhc.c,v 1.2 2009/05/17 14:36:46 cegger Exp $ */ +/* $NetBSD: sdhc.c,v 1.3 2009/10/02 04:33:58 uebayasi Exp $ */ /* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */ /* @@ -23,7 +23,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.2 2009/05/17 14:36:46 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.3 2009/10/02 04:33:58 uebayasi Exp $); #include sys/param.h #include sys/device.h @@ -199,7 +199,7 @@ cv_init(hp-intr_cv, sdhcintr); /* - * eset the host controller and enable interrupts. + * Reset the host controller and enable interrupts. */ (void)sdhc_host_reset(hp);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: uebayasi
Date: Fri Oct 2 04:38:47 UTC 2009
Modified Files:
src/sys/dev/pci: sdhc_pci.c
Log Message:
Pass not (struct sdhc_pci_softc *) but (struct sdhc_softc *) to sdhc_intr().
No functional change because struct sdhc_pci_softc has struct sdhc_softc as
the 1st member.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/sdhc_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/sdhc_pci.c
diff -u src/sys/dev/pci/sdhc_pci.c:1.2 src/sys/dev/pci/sdhc_pci.c:1.3
--- src/sys/dev/pci/sdhc_pci.c:1.2 Mon Jun 29 11:05:12 2009
+++ src/sys/dev/pci/sdhc_pci.c Fri Oct 2 04:38:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc_pci.c,v 1.2 2009/06/29 11:05:12 hubertf Exp $ */
+/* $NetBSD: sdhc_pci.c,v 1.3 2009/10/02 04:38:47 uebayasi Exp $ */
/* $OpenBSD: sdhc_pci.c,v 1.7 2007/10/30 18:13:45 chl Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc_pci.c,v 1.2 2009/06/29 11:05:12 hubertf Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc_pci.c,v 1.3 2009/10/02 04:38:47 uebayasi Exp $);
#include sys/param.h
#include sys/device.h
@@ -221,7 +221,7 @@
}
intrstr = pci_intr_string(pc, ih);
- sc-sc_ih = pci_intr_establish(pc, ih, IPL_SDMMC, sdhc_intr, sc);
+ sc-sc_ih = pci_intr_establish(pc, ih, IPL_SDMMC, sdhc_intr, sc-sc);
if (sc-sc_ih == NULL) {
aprint_error_dev(self, couldn't establish interrupt\n);
goto err;
