CVS commit: src/usr.bin/quota
Module Name:src Committed By: bouyer Date: Mon Mar 7 11:46:55 UTC 2011 Modified Files: src/usr.bin/quota: printquota.c Log Message: Properly evaluate the space needed to print "unlimited" in an human-readable way. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/quota/printquota.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/quota/printquota.c diff -u src/usr.bin/quota/printquota.c:1.4 src/usr.bin/quota/printquota.c:1.5 --- src/usr.bin/quota/printquota.c:1.4 Sun Mar 6 22:36:07 2011 +++ src/usr.bin/quota/printquota.c Mon Mar 7 11:46:55 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: printquota.c,v 1.4 2011/03/06 22:36:07 christos Exp $ */ +/* $NetBSD: printquota.c,v 1.5 2011/03/07 11:46:55 bouyer Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)quota.c 8.4 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: printquota.c,v 1.4 2011/03/06 22:36:07 christos Exp $"); +__RCSID("$NetBSD: printquota.c,v 1.5 2011/03/07 11:46:55 bouyer Exp $"); #endif #endif /* not lint */ @@ -68,7 +68,7 @@ intprt(char *buf, size_t len, uint64_t val, int flags, int hflag) { if (val == UQUAD_MAX) - return (len >= sizeof("unlimited")) ? "unlimited" : "-"; + return (len > sizeof("unlimited")) ? "unlimited" : "-"; if (flags & HN_B) val = dbtob(val);
CVS commit: src/usr.sbin/repquota
Module Name:src Committed By: bouyer Date: Mon Mar 7 11:56:31 UTC 2011 Modified Files: src/usr.sbin/repquota: repquota.c Log Message: Don't use the same char b0[] for BLOCK and FILE timeprt(), they would override each others. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/repquota/repquota.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/repquota/repquota.c diff -u src/usr.sbin/repquota/repquota.c:1.28 src/usr.sbin/repquota/repquota.c:1.29 --- src/usr.sbin/repquota/repquota.c:1.28 Sun Mar 6 23:25:42 2011 +++ src/usr.sbin/repquota/repquota.c Mon Mar 7 11:56:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: repquota.c,v 1.28 2011/03/06 23:25:42 christos Exp $ */ +/* $NetBSD: repquota.c,v 1.29 2011/03/07 11:56:31 bouyer Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)repquota.c 8.2 (Berkeley) 11/22/94"; #else -__RCSID("$NetBSD: repquota.c,v 1.28 2011/03/06 23:25:42 christos Exp $"); +__RCSID("$NetBSD: repquota.c,v 1.29 2011/03/07 11:56:31 bouyer Exp $"); #endif #endif /* not lint */ @@ -387,7 +387,7 @@ const char *timemsg[N_QL]; char overchar[N_QL]; time_t now; - char b0[20], b1[20], b2[20], b3[20]; + char b0[2][20], b1[20], b2[20], b3[20]; switch(type) { case GRPQUOTA: @@ -435,12 +435,13 @@ case QL_S_DENY_HARD: case QL_S_DENY_GRACE: case QL_S_ALLOW_SOFT: -timemsg[i] = timeprt(b0, 8, now, q[i].q2v_time); +timemsg[i] = timeprt(b0[i], 8, now, +q[i].q2v_time); overchar[i] = '+'; break; default: timemsg[i] = (vflag && version == 2) ? -timeprt(b0, 8, 0, q[i].q2v_grace) : ""; +timeprt(b0[i], 8, 0, q[i].q2v_grace) : ""; overchar[i] = '-'; break; }
CVS commit: src/tools/makefs
Module Name:src Committed By: he Date: Mon Mar 7 13:28:06 UTC 2011 Modified Files: src/tools/makefs: Makefile Log Message: This tool now depends on updated target includes in the tools build for an UPDATE build to succeed; ensure that by including ${.CURDIR}/../Makefile.nbincludes. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tools/makefs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/makefs/Makefile diff -u src/tools/makefs/Makefile:1.8 src/tools/makefs/Makefile:1.9 --- src/tools/makefs/Makefile:1.8 Sun Mar 6 18:15:30 2011 +++ src/tools/makefs/Makefile Mon Mar 7 13:28:06 2011 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2011/03/06 18:15:30 bouyer Exp $ +# $NetBSD: Makefile,v 1.9 2011/03/07 13:28:06 he Exp $ HOSTPROGNAME= ${_TOOL_PREFIX}makefs HOST_SRCDIR= usr.sbin/makefs HOST_CPPFLAGS+= -I. -I${TOOLDIR}/include/nbinclude +.include "${.CURDIR}/../Makefile.nbincludes" .include "${.CURDIR}/../Makefile.host" -
CVS commit: src/sys/dev/marvell
Module Name:src Committed By: christos Date: Mon Mar 7 13:58:32 UTC 2011 Modified Files: src/sys/dev/marvell: if_mvgbe.c Log Message: fix typo, and use the parent to determine the offset. From Dave Mills To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/marvell/if_mvgbe.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/marvell/if_mvgbe.c diff -u src/sys/dev/marvell/if_mvgbe.c:1.7 src/sys/dev/marvell/if_mvgbe.c:1.8 --- src/sys/dev/marvell/if_mvgbe.c:1.7 Sun Mar 6 12:00:16 2011 +++ src/sys/dev/marvell/if_mvgbe.c Mon Mar 7 08:58:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mvgbe.c,v 1.7 2011/03/06 17:00:16 christos Exp $ */ +/* $NetBSD: if_mvgbe.c,v 1.8 2011/03/07 13:58:32 christos Exp $ */ /* * Copyright (c) 2007, 2008 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.7 2011/03/06 17:00:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.8 2011/03/07 13:58:32 christos Exp $"); #include "rnd.h" @@ -619,7 +619,6 @@ mvgbe_attach(device_t parent, device_t self, void *aux) { struct mvgbe_softc *sc = device_private(self); - struct mvgbec_softc *csc = device_private(parent); struct marvell_attach_args *mva = aux; struct mvgbe_txmap_entry *entry; struct ifnet *ifp; @@ -767,7 +766,7 @@ ifmedia_init(&sc->sc_mii.mii_media, 0, mvgbe_mediachange, mvgbe_mediastatus); mii_attach(self, &sc->sc_mii, 0x, - parent == mvgebc0 ? 0 : 1, MII_OFFSET_ANY, 0); + MII_PHY_ANY, parent == mvgbec0 ? 0 : 1, 0); if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { aprint_error_dev(self, "no PHY found!\n"); ifmedia_add(&sc->sc_mii.mii_media,
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: jakllsch Date: Mon Mar 7 15:37:46 UTC 2011 Modified Files: src/sys/arch/evbmips/conf: ALCHEMY Log Message: Bump SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbmips/conf/ALCHEMY 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/evbmips/conf/ALCHEMY diff -u src/sys/arch/evbmips/conf/ALCHEMY:1.32 src/sys/arch/evbmips/conf/ALCHEMY:1.33 --- src/sys/arch/evbmips/conf/ALCHEMY:1.32 Sun Mar 6 17:08:23 2011 +++ src/sys/arch/evbmips/conf/ALCHEMY Mon Mar 7 15:37:46 2011 @@ -1,11 +1,11 @@ -# $NetBSD: ALCHEMY,v 1.32 2011/03/06 17:08:23 bouyer Exp $ +# $NetBSD: ALCHEMY,v 1.33 2011/03/07 15:37:46 jakllsch Exp $ # # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500, # DBAu1000 and DBAu1500 evaluation boards. include "arch/evbmips/conf/std.alchemy" -#ident "ALCHEMY-$Revision: 1.32 $" +#ident "ALCHEMY-$Revision: 1.33 $" maxusers 32 @@ -46,7 +46,7 @@ options DDB # kernel dynamic debugger options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG="-g" # compile full symbol table -options SYMTAB_SPACE=47 # size for embedded symbol table +options SYMTAB_SPACE=48 # size for embedded symbol table # Compatibility options #options COMPAT_43 # compatibility with 4.3BSD binaries
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: jakllsch Date: Mon Mar 7 15:49:50 UTC 2011 Modified Files: src/sys/arch/evbppc/conf: EV64260 EXPLORA451 WALNUT Log Message: Bump SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbppc/conf/EV64260 cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbppc/conf/EXPLORA451 cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbppc/conf/WALNUT 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/evbppc/conf/EV64260 diff -u src/sys/arch/evbppc/conf/EV64260:1.46 src/sys/arch/evbppc/conf/EV64260:1.47 --- src/sys/arch/evbppc/conf/EV64260:1.46 Sun Mar 6 17:08:23 2011 +++ src/sys/arch/evbppc/conf/EV64260 Mon Mar 7 15:49:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: EV64260,v 1.46 2011/03/06 17:08:23 bouyer Exp $ +# $NetBSD: EV64260,v 1.47 2011/03/07 15:49:50 jakllsch Exp $ # # MVP -- Motorola's Multiprocessing Verification Platform # @@ -57,7 +57,7 @@ #options DEBUG # expensive debugging checks/support options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB -options SYMTAB_SPACE=30 # size for embedded symbol table +options SYMTAB_SPACE=32 # size for embedded symbol table #makeoptions DEFCOPTS="-g" # compile full symbol table makeoptions DEBUG="-g" Index: src/sys/arch/evbppc/conf/EXPLORA451 diff -u src/sys/arch/evbppc/conf/EXPLORA451:1.42 src/sys/arch/evbppc/conf/EXPLORA451:1.43 --- src/sys/arch/evbppc/conf/EXPLORA451:1.42 Sun Mar 6 17:08:23 2011 +++ src/sys/arch/evbppc/conf/EXPLORA451 Mon Mar 7 15:49:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: EXPLORA451,v 1.42 2011/03/06 17:08:23 bouyer Exp $ +# $NetBSD: EXPLORA451,v 1.43 2011/03/07 15:49:50 jakllsch Exp $ # # GENERIC -- everything that's currently supported # @@ -52,7 +52,7 @@ #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 makeoptions DEBUG="-g" # compile full symbol table -options SYMTAB_SPACE=40 +options SYMTAB_SPACE=41 # Compatibility options options COMPAT_NOMID # compatibility with 386BSD, BSDI, NetBSD 0.8, Index: src/sys/arch/evbppc/conf/WALNUT diff -u src/sys/arch/evbppc/conf/WALNUT:1.50 src/sys/arch/evbppc/conf/WALNUT:1.51 --- src/sys/arch/evbppc/conf/WALNUT:1.50 Sun Mar 6 17:08:23 2011 +++ src/sys/arch/evbppc/conf/WALNUT Mon Mar 7 15:49:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: WALNUT,v 1.50 2011/03/06 17:08:23 bouyer Exp $ +# $NetBSD: WALNUT,v 1.51 2011/03/07 15:49:50 jakllsch Exp $ # # GENERIC -- everything that's currently supported # @@ -39,7 +39,7 @@ options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB options TRAP_PANICWAIT -options SYMTAB_SPACE=42 # size for embedded symbol table +options SYMTAB_SPACE=45 # size for embedded symbol table makeoptions DEBUG="-g" # compile full symbol table
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: njoly Date: Mon Mar 7 15:49:57 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: +quotactl.debug To generate a diff of this commit: cvs rdiff -u -r1.1593 -r1.1594 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1593 src/distrib/sets/lists/comp/mi:1.1594 --- src/distrib/sets/lists/comp/mi:1.1593 Sun Mar 6 17:08:10 2011 +++ src/distrib/sets/lists/comp/mi Mon Mar 7 15:49:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1593 2011/03/06 17:08:10 bouyer Exp $ +# $NetBSD: mi,v 1.1594 2011/03/07 15:49:56 njoly Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3798,6 +3798,7 @@ ./usr/libdata/debug/usr/sbin/pwd_mkdb.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/quot.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/quotacheck.debug comp-sysutil-debug debug +./usr/libdata/debug/usr/sbin/quotactl.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/quotaon.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/racoon.debug comp-netutil-debug crypto,debug ./usr/libdata/debug/usr/sbin/racoonctl.debug comp-netutil-debug crypto,debug
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: njoly Date: Mon Mar 7 15:51:40 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add quota tests debug objects. To generate a diff of this commit: cvs rdiff -u -r1.259 -r1.260 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.259 src/distrib/sets/lists/tests/mi:1.260 --- src/distrib/sets/lists/tests/mi:1.259 Sun Mar 6 17:08:12 2011 +++ src/distrib/sets/lists/tests/mi Mon Mar 7 15:51:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.259 2011/03/06 17:08:12 bouyer Exp $ +# $NetBSD: mi,v 1.260 2011/03/07 15:51:40 njoly Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -225,8 +225,16 @@ ./usr/libdata/debug/usr/tests/dev/sysmon tests-fs-debug ./usr/libdata/debug/usr/tests/dev/sysmon/t_swwdog.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs tests-fs-debug +./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_server.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_tests.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/rump_edquota.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/rump_quota.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/rump_quotactl.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/rump_repquota.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_fifos.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_mount.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/t_quota2_1.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/t_quota2_remount.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_renamerace.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/fs/ffs/t_snapshot.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_snapshot_log.debug tests-fs-debug debug,atf
CVS commit: src/sys/arch
Module Name:src Committed By: jakllsch Date: Mon Mar 7 15:56:26 UTC 2011 Modified Files: src/sys/arch/algor/conf: P5064 src/sys/arch/iyonix/conf: GENERIC src/sys/arch/netwinder/conf: GENERIC Log Message: Bump SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/algor/conf/P5064 cvs rdiff -u -r1.62 -r1.63 src/sys/arch/iyonix/conf/GENERIC cvs rdiff -u -r1.103 -r1.104 src/sys/arch/netwinder/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/algor/conf/P5064 diff -u src/sys/arch/algor/conf/P5064:1.62 src/sys/arch/algor/conf/P5064:1.63 --- src/sys/arch/algor/conf/P5064:1.62 Sun Feb 20 07:51:21 2011 +++ src/sys/arch/algor/conf/P5064 Mon Mar 7 15:56:26 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.62 2011/02/20 07:51:21 matt Exp $ +# $NetBSD: P5064,v 1.63 2011/03/07 15:56:26 jakllsch Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "P5064-$Revision: 1.62 $" +#ident "P5064-$Revision: 1.63 $" maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG="-g" #makeoptions DEBUGLIST="pattern1 pattern2 ..." -options SYMTAB_SPACE=45 +options SYMTAB_SPACE=46 # File systems file-system FFS # Fast file system Index: src/sys/arch/iyonix/conf/GENERIC diff -u src/sys/arch/iyonix/conf/GENERIC:1.62 src/sys/arch/iyonix/conf/GENERIC:1.63 --- src/sys/arch/iyonix/conf/GENERIC:1.62 Sun Mar 6 17:08:26 2011 +++ src/sys/arch/iyonix/conf/GENERIC Mon Mar 7 15:56:26 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.62 2011/03/06 17:08:26 bouyer Exp $ +# $NetBSD: GENERIC,v 1.63 2011/03/07 15:56:26 jakllsch Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.62 $" +#ident "GENERIC-$Revision: 1.63 $" maxusers 32 # estimated number of users @@ -87,7 +87,7 @@ #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 makeoptions DEBUG="-g" # compile full symbol table -options SYMTAB_SPACE=40 +options SYMTAB_SPACE=58 options PERFCTRS # performance counters #options PMAP_DEBUG # Enable pmap_debug_level code #options VERBOSE_INIT_ARM # verbose bootstraping messages Index: src/sys/arch/netwinder/conf/GENERIC diff -u src/sys/arch/netwinder/conf/GENERIC:1.103 src/sys/arch/netwinder/conf/GENERIC:1.104 --- src/sys/arch/netwinder/conf/GENERIC:1.103 Sun Mar 6 17:08:28 2011 +++ src/sys/arch/netwinder/conf/GENERIC Mon Mar 7 15:56:26 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.103 2011/03/06 17:08:28 bouyer Exp $ +# $NetBSD: GENERIC,v 1.104 2011/03/07 15:56:26 jakllsch Exp $ # # GENERIC machine description file # @@ -172,7 +172,7 @@ options DDB # in-kernel debugger options DDB_HISTORY_SIZE=100 # Enable history editing in DDB makeoptions DEBUG="-g" # compile full symbol table -options SYMTAB_SPACE=48 +options SYMTAB_SPACE=59 config netbsd root on ? type ?
CVS commit: [netbsd-4] src/sys/kern
Module Name:src Committed By: snj Date: Mon Mar 7 17:07:17 UTC 2011 Modified Files: src/sys/kern [netbsd-4]: init_sysctl.c Log Message: Apply patch (requested by joerg in ticket 1419): Sanitize arguments before memory allocation. To generate a diff of this commit: cvs rdiff -u -r1.93.2.2 -r1.93.2.3 src/sys/kern/init_sysctl.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/init_sysctl.c diff -u src/sys/kern/init_sysctl.c:1.93.2.2 src/sys/kern/init_sysctl.c:1.93.2.3 --- src/sys/kern/init_sysctl.c:1.93.2.2 Fri Mar 20 15:06:17 2009 +++ src/sys/kern/init_sysctl.c Mon Mar 7 17:07:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl.c,v 1.93.2.2 2009/03/20 15:06:17 msaitoh Exp $ */ +/* $NetBSD: init_sysctl.c,v 1.93.2.3 2011/03/07 17:07:17 snj Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.93.2.2 2009/03/20 15:06:17 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.93.2.3 2011/03/07 17:07:17 snj Exp $"); #include "opt_sysv.h" #include "opt_multiprocessor.h" @@ -2296,6 +2296,11 @@ #endif len = sizeof(char *) * nargv; + if (nargv < 0 || len > ARG_MAX || len < (size_t)nargv) { + error = EINVAL; + goto done; + } + argv = malloc(len, M_TEMP, M_WAITOK); aiov.iov_base = argv;
CVS commit: [netbsd-4-0] src/sys/kern
Module Name:src Committed By: snj Date: Mon Mar 7 17:07:27 UTC 2011 Modified Files: src/sys/kern [netbsd-4-0]: init_sysctl.c Log Message: Apply patch (requested by joerg in ticket 1419): Sanitize arguments before memory allocation. To generate a diff of this commit: cvs rdiff -u -r1.93.2.1.6.1 -r1.93.2.1.6.2 src/sys/kern/init_sysctl.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/init_sysctl.c diff -u src/sys/kern/init_sysctl.c:1.93.2.1.6.1 src/sys/kern/init_sysctl.c:1.93.2.1.6.2 --- src/sys/kern/init_sysctl.c:1.93.2.1.6.1 Fri Mar 27 03:43:59 2009 +++ src/sys/kern/init_sysctl.c Mon Mar 7 17:07:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl.c,v 1.93.2.1.6.1 2009/03/27 03:43:59 msaitoh Exp $ */ +/* $NetBSD: init_sysctl.c,v 1.93.2.1.6.2 2011/03/07 17:07:26 snj Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.93.2.1.6.1 2009/03/27 03:43:59 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.93.2.1.6.2 2011/03/07 17:07:26 snj Exp $"); #include "opt_sysv.h" #include "opt_multiprocessor.h" @@ -2296,6 +2296,11 @@ #endif len = sizeof(char *) * nargv; + if (nargv < 0 || len > ARG_MAX || len < (size_t)nargv) { + error = EINVAL; + goto done; + } + argv = malloc(len, M_TEMP, M_WAITOK); aiov.iov_base = argv;
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src Committed By: snj Date: Mon Mar 7 17:07:56 UTC 2011 Modified Files: src/sys/kern [netbsd-5-0]: init_sysctl.c Log Message: Apply patch (requested by joerg in ticket 1575): Sanitize arguments before memory allocation. To generate a diff of this commit: cvs rdiff -u -r1.149.4.4.2.3 -r1.149.4.4.2.4 src/sys/kern/init_sysctl.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/init_sysctl.c diff -u src/sys/kern/init_sysctl.c:1.149.4.4.2.3 src/sys/kern/init_sysctl.c:1.149.4.4.2.4 --- src/sys/kern/init_sysctl.c:1.149.4.4.2.3 Wed Jul 1 22:42:38 2009 +++ src/sys/kern/init_sysctl.c Mon Mar 7 17:07:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl.c,v 1.149.4.4.2.3 2009/07/01 22:42:38 snj Exp $ */ +/* $NetBSD: init_sysctl.c,v 1.149.4.4.2.4 2011/03/07 17:07:56 snj Exp $ */ /*- * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.149.4.4.2.3 2009/07/01 22:42:38 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.149.4.4.2.4 2011/03/07 17:07:56 snj Exp $"); #include "opt_sysv.h" #include "opt_compat_netbsd32.h" @@ -2528,6 +2528,11 @@ #endif len = sizeof(char *) * nargv; + if (nargv < 0 || len > ARG_MAX || len < (size_t)nargv) { + error = EINVAL; + goto done; + } + if ((argvlen = len) != 0) argv = kmem_alloc(len, KM_SLEEP);
CVS commit: [netbsd-5-1] src/sys/kern
Module Name:src Committed By: snj Date: Mon Mar 7 17:08:18 UTC 2011 Modified Files: src/sys/kern [netbsd-5-1]: init_sysctl.c Log Message: Apply patch (requested by joerg in ticket 1575): Sanitize arguments before memory allocation. To generate a diff of this commit: cvs rdiff -u -r1.149.4.7 -r1.149.4.7.2.1 src/sys/kern/init_sysctl.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/init_sysctl.c diff -u src/sys/kern/init_sysctl.c:1.149.4.7 src/sys/kern/init_sysctl.c:1.149.4.7.2.1 --- src/sys/kern/init_sysctl.c:1.149.4.7 Wed Jul 1 22:42:28 2009 +++ src/sys/kern/init_sysctl.c Mon Mar 7 17:08:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl.c,v 1.149.4.7 2009/07/01 22:42:28 snj Exp $ */ +/* $NetBSD: init_sysctl.c,v 1.149.4.7.2.1 2011/03/07 17:08:18 snj Exp $ */ /*- * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.149.4.7 2009/07/01 22:42:28 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.149.4.7.2.1 2011/03/07 17:08:18 snj Exp $"); #include "opt_sysv.h" #include "opt_compat_netbsd32.h" @@ -2528,6 +2528,11 @@ #endif len = sizeof(char *) * nargv; + if (nargv < 0 || len > ARG_MAX || len < (size_t)nargv) { + error = EINVAL; + goto done; + } + if ((argvlen = len) != 0) argv = kmem_alloc(len, KM_SLEEP);
CVS commit: [netbsd-5] src/sys/kern
Module Name:src Committed By: snj Date: Mon Mar 7 17:08:28 UTC 2011 Modified Files: src/sys/kern [netbsd-5]: init_sysctl.c Log Message: Apply patch (requested by joerg in ticket 1575): Sanitize arguments before memory allocation. To generate a diff of this commit: cvs rdiff -u -r1.149.4.7 -r1.149.4.8 src/sys/kern/init_sysctl.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/init_sysctl.c diff -u src/sys/kern/init_sysctl.c:1.149.4.7 src/sys/kern/init_sysctl.c:1.149.4.8 --- src/sys/kern/init_sysctl.c:1.149.4.7 Wed Jul 1 22:42:28 2009 +++ src/sys/kern/init_sysctl.c Mon Mar 7 17:08:28 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl.c,v 1.149.4.7 2009/07/01 22:42:28 snj Exp $ */ +/* $NetBSD: init_sysctl.c,v 1.149.4.8 2011/03/07 17:08:28 snj Exp $ */ /*- * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.149.4.7 2009/07/01 22:42:28 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.149.4.8 2011/03/07 17:08:28 snj Exp $"); #include "opt_sysv.h" #include "opt_compat_netbsd32.h" @@ -2528,6 +2528,11 @@ #endif len = sizeof(char *) * nargv; + if (nargv < 0 || len > ARG_MAX || len < (size_t)nargv) { + error = EINVAL; + goto done; + } + if ((argvlen = len) != 0) argv = kmem_alloc(len, KM_SLEEP);
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: snj Date: Mon Mar 7 17:08:58 UTC 2011 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: 1419 To generate a diff of this commit: cvs rdiff -u -r1.1.2.215 -r1.1.2.216 src/doc/CHANGES-4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.215 src/doc/CHANGES-4.1:1.1.2.216 --- src/doc/CHANGES-4.1:1.1.2.215 Sun Jan 23 21:55:04 2011 +++ src/doc/CHANGES-4.1 Mon Mar 7 17:08:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.215 2011/01/23 21:55:04 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.216 2011/03/07 17:08:58 snj Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4324,3 +4324,8 @@ Update bind to 9.4-ESV-R4, latest version of the 9.4 line. [spz, ticket #1413] +sys/kern/init_sysctl.c1.15 + + Sanitize arguments before memory allocation. + [joerg, ticket #1419] +
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: snj Date: Mon Mar 7 17:09:32 UTC 2011 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: 1419 To generate a diff of this commit: cvs rdiff -u -r1.1.2.79 -r1.1.2.80 src/doc/CHANGES-4.0.2 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-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.79 src/doc/CHANGES-4.0.2:1.1.2.80 --- src/doc/CHANGES-4.0.2:1.1.2.79 Sun Jan 23 21:54:39 2011 +++ src/doc/CHANGES-4.0.2 Mon Mar 7 17:09:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.79 2011/01/23 21:54:39 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.80 2011/03/07 17:09:32 snj Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1114,3 +1114,8 @@ Update bind to 9.4-ESV-R4, latest version of the 9.4 line. [spz, ticket #1413] +sys/kern/init_sysctl.c1.15 + + Sanitize arguments before memory allocation. + [joerg, ticket #1419] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Mon Mar 7 17:10:13 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: 1575 To generate a diff of this commit: cvs rdiff -u -r1.1.2.61 -r1.1.2.62 src/doc/CHANGES-5.2 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 diff -u src/doc/CHANGES-5.2:1.1.2.61 src/doc/CHANGES-5.2:1.1.2.62 --- src/doc/CHANGES-5.2:1.1.2.61 Mon Mar 7 04:20:09 2011 +++ src/doc/CHANGES-5.2 Mon Mar 7 17:10:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.61 2011/03/07 04:20:09 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.62 2011/03/07 17:10:13 snj Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -4765,3 +4765,8 @@ Prevent dom0 pool corruption. [bouyer, ticket #1573] +sys/kern/init_sysctl.c1.15 + + Sanitize arguments before memory allocation. + [joerg, ticket #1575] +
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: snj Date: Mon Mar 7 17:11:52 UTC 2011 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.1 Log Message: 1575 To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-5.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.1 diff -u src/doc/CHANGES-5.1.1:1.1.2.13 src/doc/CHANGES-5.1.1:1.1.2.14 --- src/doc/CHANGES-5.1.1:1.1.2.13 Mon Mar 7 04:20:00 2011 +++ src/doc/CHANGES-5.1.1 Mon Mar 7 17:11:52 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.1,v 1.1.2.13 2011/03/07 04:20:00 riz Exp $ +# $NetBSD: CHANGES-5.1.1,v 1.1.2.14 2011/03/07 17:11:52 snj Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.1.1 release: @@ -2269,3 +2269,8 @@ Prevent dom0 pool corruption. [bouyer, ticket #1573] +sys/kern/init_sysctl.cpatch + + Sanitize arguments before memory allocation. + [joerg, ticket #1575] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Mon Mar 7 17:12:40 UTC 2011 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: 1575 To generate a diff of this commit: cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.27 src/doc/CHANGES-5.0.3:1.1.2.28 --- src/doc/CHANGES-5.0.3:1.1.2.27 Wed Feb 16 21:24:15 2011 +++ src/doc/CHANGES-5.0.3 Mon Mar 7 17:12:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.27 2011/02/16 21:24:15 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.28 2011/03/07 17:12:40 snj Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -2577,3 +2577,8 @@ patch taken from http://www.openssl.org/news/secadv_20110208.txt [spz, ticket #1545] +sys/kern/init_sysctl.cpatch + + Sanitize arguments before memory allocation. + [joerg, ticket #1575] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Mon Mar 7 17:13:18 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: fix last To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 src/doc/CHANGES-5.2 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 diff -u src/doc/CHANGES-5.2:1.1.2.62 src/doc/CHANGES-5.2:1.1.2.63 --- src/doc/CHANGES-5.2:1.1.2.62 Mon Mar 7 17:10:13 2011 +++ src/doc/CHANGES-5.2 Mon Mar 7 17:13:18 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.62 2011/03/07 17:10:13 snj Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.63 2011/03/07 17:13:18 snj Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -4765,7 +4765,7 @@ Prevent dom0 pool corruption. [bouyer, ticket #1573] -sys/kern/init_sysctl.c1.15 +sys/kern/init_sysctl.cpatch Sanitize arguments before memory allocation. [joerg, ticket #1575]
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: snj Date: Mon Mar 7 17:14:24 UTC 2011 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: fix last To generate a diff of this commit: cvs rdiff -u -r1.1.2.80 -r1.1.2.81 src/doc/CHANGES-4.0.2 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-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.80 src/doc/CHANGES-4.0.2:1.1.2.81 --- src/doc/CHANGES-4.0.2:1.1.2.80 Mon Mar 7 17:09:32 2011 +++ src/doc/CHANGES-4.0.2 Mon Mar 7 17:14:24 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.80 2011/03/07 17:09:32 snj Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.81 2011/03/07 17:14:24 snj Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1114,7 +1114,7 @@ Update bind to 9.4-ESV-R4, latest version of the 9.4 line. [spz, ticket #1413] -sys/kern/init_sysctl.c1.15 +sys/kern/init_sysctl.cpatch Sanitize arguments before memory allocation. [joerg, ticket #1419]
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: snj Date: Mon Mar 7 17:14:41 UTC 2011 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: fix last To generate a diff of this commit: cvs rdiff -u -r1.1.2.216 -r1.1.2.217 src/doc/CHANGES-4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.216 src/doc/CHANGES-4.1:1.1.2.217 --- src/doc/CHANGES-4.1:1.1.2.216 Mon Mar 7 17:08:58 2011 +++ src/doc/CHANGES-4.1 Mon Mar 7 17:14:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.216 2011/03/07 17:08:58 snj Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.217 2011/03/07 17:14:41 snj Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4324,7 +4324,7 @@ Update bind to 9.4-ESV-R4, latest version of the 9.4 line. [spz, ticket #1413] -sys/kern/init_sysctl.c1.15 +sys/kern/init_sysctl.cpatch Sanitize arguments before memory allocation. [joerg, ticket #1419]
CVS commit: [netbsd-5] src/sys/dev/raidframe
Module Name:src Committed By: snj Date: Mon Mar 7 17:38:23 UTC 2011 Modified Files: src/sys/dev/raidframe [netbsd-5]: rf_paritymap.c Log Message: Pull up following revision(s) (requested by riz in ticket #1569): sys/dev/raidframe/rf_paritymap.c: revision 1.6 Always return at least one parity region. Fixes PR#44239. Fix from oster@, code (such as it is) by me. To generate a diff of this commit: cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/sys/dev/raidframe/rf_paritymap.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/raidframe/rf_paritymap.c diff -u src/sys/dev/raidframe/rf_paritymap.c:1.3.2.3 src/sys/dev/raidframe/rf_paritymap.c:1.3.2.4 --- src/sys/dev/raidframe/rf_paritymap.c:1.3.2.3 Sat Mar 6 21:05:29 2010 +++ src/sys/dev/raidframe/rf_paritymap.c Mon Mar 7 17:38:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_paritymap.c,v 1.3.2.3 2010/03/06 21:05:29 sborrill Exp $ */ +/* $NetBSD: rf_paritymap.c,v 1.3.2.4 2011/03/07 17:38:22 snj Exp $ */ /*- * Copyright (c) 2009 Jed Davis. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rf_paritymap.c,v 1.3.2.3 2010/03/06 21:05:29 sborrill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_paritymap.c,v 1.3.2.4 2011/03/07 17:38:22 snj Exp $"); #include #include @@ -409,6 +409,8 @@ nreg = bytes_per_disk / REGION_MINSIZE; if (nreg > RF_PARITYMAP_NREG) nreg = RF_PARITYMAP_NREG; + if (nreg < 1) + nreg = 1; return (u_int)nreg; }
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Mon Mar 7 17:39:10 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: 1569 To generate a diff of this commit: cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-5.2 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 diff -u src/doc/CHANGES-5.2:1.1.2.63 src/doc/CHANGES-5.2:1.1.2.64 --- src/doc/CHANGES-5.2:1.1.2.63 Mon Mar 7 17:13:18 2011 +++ src/doc/CHANGES-5.2 Mon Mar 7 17:39:10 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.63 2011/03/07 17:13:18 snj Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.64 2011/03/07 17:39:10 snj Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -4770,3 +4770,8 @@ Sanitize arguments before memory allocation. [joerg, ticket #1575] +sys/dev/raidframe/rf_paritymap.c 1.6 + + Always return at least one parity region. Fixes PR#44239. + [riz, ticket #1569] +
CVS commit: src/usr.sbin/quotactl
Module Name:src Committed By: njoly Date: Mon Mar 7 17:44:37 UTC 2011 Modified Files: src/usr.sbin/quotactl: quotactl.8 Log Message: - Protect flags to avoid macro expansion by mandoc. - Explicitely close display block. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/quotactl/quotactl.8 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/quotactl/quotactl.8 diff -u src/usr.sbin/quotactl/quotactl.8:1.3 src/usr.sbin/quotactl/quotactl.8:1.4 --- src/usr.sbin/quotactl/quotactl.8:1.3 Sun Mar 6 17:34:57 2011 +++ src/usr.sbin/quotactl/quotactl.8 Mon Mar 7 17:44:37 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: quotactl.8,v 1.3 2011/03/06 17:34:57 wiz Exp $ +.\" $NetBSD: quotactl.8,v 1.4 2011/03/07 17:44:37 njoly Exp $ .\" .\" Copyright (c) 2011 Manuel Bouyer .\" All rights reserved. @@ -32,7 +32,7 @@ .Nd send commands to the kernel disk quota subsystem .Sh SYNOPSIS .Nm -.Op Fl Dx +.Op Fl \&Dx .Ar file-system .Op Ar plist .Sh DESCRIPTION @@ -123,7 +123,7 @@ EOF - +.Ed .Sh SEE ALSO .Xr quota 1 , .Xr quotactl 2 ,
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Mon Mar 7 18:37:46 UTC 2011 Modified Files: src/distrib/sets/lists/xcomp: mi src/distrib/sets/lists/xserver: mi Log Message: move xorg-server.m4 into the xserver set, and mark it 'xorg'. fixes non-xorg-server builds. To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xserver/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/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.125 src/distrib/sets/lists/xcomp/mi:1.126 --- src/distrib/sets/lists/xcomp/mi:1.125 Sun Mar 6 22:15:30 2011 +++ src/distrib/sets/lists/xcomp/mi Mon Mar 7 18:37:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.125 2011/03/06 22:15:30 mrg Exp $ +# $NetBSD: mi,v 1.126 2011/03/07 18:37:46 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -9225,7 +9225,6 @@ ./usr/X11R7/man/man3/XvUngrabPort.3 -unknown- .man,xorg ./usr/X11R7/man/man3/XvVideoNotify.3 -unknown- .man,xorg ./usr/X11R7/man/man3/libXp.3-obsolete- obsolete -./usr/X11R7/share/aclocal/xorg-server.m4 -unknown- xorg ./usr/X11R7/share/xcb/bigreq.xml -unknown- xorg ./usr/X11R7/share/xcb/composite.xml -unknown- xorg ./usr/X11R7/share/xcb/damage.xml -unknown- xorg Index: src/distrib/sets/lists/xserver/mi diff -u src/distrib/sets/lists/xserver/mi:1.30 src/distrib/sets/lists/xserver/mi:1.31 --- src/distrib/sets/lists/xserver/mi:1.30 Thu Aug 27 04:59:15 2009 +++ src/distrib/sets/lists/xserver/mi Mon Mar 7 18:37:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.30 2009/08/27 04:59:15 mrg Exp $ +# $NetBSD: mi,v 1.31 2011/03/07 18:37:46 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -73,3 +73,4 @@ ./usr/X11R7/man/man1/Xserver.1-unknown- .man,xorg ./usr/X11R7/man/man1/Xvfb.1-unknown- .man,xorg ./usr/X11R7/man/man5/SecurityPolicy.5 -unknown- obsolete +./usr/X11R7/share/aclocal/xorg-server.m4 -unknown- xorg
CVS commit: [netbsd-5] xsrc/external/mit/libpciaccess/dist/src
Module Name:xsrc Committed By: riz Date: Mon Mar 7 18:45:47 UTC 2011 Modified Files: xsrc/external/mit/libpciaccess/dist/src [netbsd-5]: netbsd_pci.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #1557): xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c: revision 1.8 external/mit/xorg/lib/libpciaccess/Makefile: revision 1.5 external/mit/xorg/lib/libpciaccess/Makefile: revision 1.6 Fix compilation with HAVE_MTRR HAVE_MMTR -> HAVE_MTRR only define HAVE_MTRR on x86 To generate a diff of this commit: cvs rdiff -u -r1.4.2.3 -r1.4.2.4 \ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.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/libpciaccess/dist/src/netbsd_pci.c diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.4.2.3 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.4.2.4 --- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.4.2.3 Sat Jan 9 01:59:59 2010 +++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c Mon Mar 7 18:45:46 2011 @@ -135,7 +135,7 @@ if (map->flags & PCI_DEV_MAP_FLAG_WRITABLE) prot |= PROT_WRITE; - map->memory = mmap(NULL, map->size, prot, MAP_SHARED, + map->memory = mmap(NULL, (size_t)map->size, prot, MAP_SHARED, buses[dev->domain].fd, (off_t)map->base); if (map->memory == MAP_FAILED) return errno; @@ -146,17 +146,19 @@ /* No need to set an MTRR if it's the default mode. */ if ((map->flags & PCI_DEV_MAP_FLAG_CACHABLE) || (map->flags & PCI_DEV_MAP_FLAG_WRITE_COMBINE)) { - m.base = base; + m.base = map->base; m.flags = MTRR_VALID | MTRR_PRIVATE; - m.len = size; + m.len = map->size; m.owner = getpid(); - if (map->flags & PCI_DEV_MAP_FLAG_CACHEABLE) + if (map->flags & PCI_DEV_MAP_FLAG_CACHABLE) m.type = MTRR_TYPE_WB; if (map->flags & PCI_DEV_MAP_FLAG_WRITE_COMBINE) m.type = MTRR_TYPE_WC; - if ((netbsd_set_mtrr(&m, &n)) == -1) - ret = errno; + if ((netbsd_set_mtrr(&m, &n)) == -1) { + fprintf(stderr, "mtrr set failed: %s\n", + strerror(errno)); + } } #endif @@ -177,7 +179,7 @@ (map->flags & PCI_DEV_MAP_FLAG_WRITE_COMBINE)) { m.base = map->base; m.flags = 0; - m.len = size; + m.len = map->size; m.type = MTRR_TYPE_UC; (void)netbsd_set_mtrr(&m, &n); }
CVS commit: [netbsd-5] src/external/mit/xorg/lib/libpciaccess
Module Name:src Committed By: riz Date: Mon Mar 7 18:46:09 UTC 2011 Modified Files: src/external/mit/xorg/lib/libpciaccess [netbsd-5]: Makefile Log Message: Pull up following revision(s) (requested by jmcneill in ticket #1557): xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c: revision 1.8 external/mit/xorg/lib/libpciaccess/Makefile: revision 1.5 external/mit/xorg/lib/libpciaccess/Makefile: revision 1.6 Fix compilation with HAVE_MTRR HAVE_MMTR -> HAVE_MTRR only define HAVE_MTRR on x86 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/mit/xorg/lib/libpciaccess/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/lib/libpciaccess/Makefile diff -u src/external/mit/xorg/lib/libpciaccess/Makefile:1.1.2.2 src/external/mit/xorg/lib/libpciaccess/Makefile:1.1.2.3 --- src/external/mit/xorg/lib/libpciaccess/Makefile:1.1.2.2 Thu Sep 17 04:24:32 2009 +++ src/external/mit/xorg/lib/libpciaccess/Makefile Mon Mar 7 18:46:08 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2009/09/17 04:24:32 snj Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2011/03/07 18:46:08 riz Exp $ .include @@ -15,8 +15,7 @@ common_map.c \ netbsd_pci.c -CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include \ - -DHAVE_MMTR -DHAVE_ZLIB \ +CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include -DHAVE_ZLIB \ -DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H \ -DPCIIDS_PATH=\"${X11ROOTDIR}/share/pciids\" @@ -30,6 +29,10 @@ LDADD+= -lpci DPADD+= ${LIBPCI} +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +CPPFLAGS+= -DHAVE_MTRR +.endif + .if ${MACHINE_ARCH} == "i386" LDADD+= -li386 DPADD+= ${LIBI386}
CVS commit: [netbsd-5] src/external/mit/xorg/server/xorg-server
Module Name:src Committed By: riz Date: Mon Mar 7 18:50:49 UTC 2011 Modified Files: src/external/mit/xorg/server/xorg-server/damageext [netbsd-5]: Makefile src/external/mit/xorg/server/xorg-server/dbe [netbsd-5]: Makefile.dbe src/external/mit/xorg/server/xorg-server/exa [netbsd-5]: Makefile.exa src/external/mit/xorg/server/xorg-server/glx [netbsd-5]: Makefile.glx Log Message: Pull up following revision(s) (requested by jmcneill in ticket #1558): external/mit/xorg/server/xorg-server/glx/Makefile.glx: revision 1.8 external/mit/xorg/server/xorg-server/damageext/Makefile: revision 1.3 external/mit/xorg/server/xorg-server/dbe/Makefile.dbe: revision 1.6 external/mit/xorg/server/xorg-server/exa/Makefile.exa: revision 1.5 Ensure that HAVE_DIX_CONFIG_H is defined for damageext, dbe, exa, and glx builds. Fixes recent trouble with the Composite extension, and should fix some problems with the DAMAGE extension and who knows what else. To generate a diff of this commit: cvs rdiff -u -r1.1.8.1 -r1.1.8.2 \ src/external/mit/xorg/server/xorg-server/damageext/Makefile cvs rdiff -u -r1.4.8.1 -r1.4.8.2 \ src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe cvs rdiff -u -r1.2.8.1 -r1.2.8.2 \ src/external/mit/xorg/server/xorg-server/exa/Makefile.exa cvs rdiff -u -r1.3.2.3 -r1.3.2.4 \ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx 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/server/xorg-server/damageext/Makefile diff -u src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.1.8.1 src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.1.8.2 --- src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.1.8.1 Thu Sep 17 04:24:37 2009 +++ src/external/mit/xorg/server/xorg-server/damageext/Makefile Mon Mar 7 18:50:48 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.8.1 2009/09/17 04:24:37 snj Exp $ +# $NetBSD: Makefile,v 1.1.8.2 2011/03/07 18:50:48 riz Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" @@ -15,7 +15,8 @@ -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/xorg \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ - -I${X11SRCDIR.xorg-server}/../include + -I${X11SRCDIR.xorg-server}/../include \ + ${X11FLAGS.DIX} ${X11INCS.DIX} COPTS.damageext.c+= -Wno-error Index: src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe diff -u src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.4.8.1 src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.4.8.2 --- src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe:1.4.8.1 Thu Sep 17 04:24:38 2009 +++ src/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe Mon Mar 7 18:50:49 2011 @@ -1,11 +1,13 @@ -# $NetBSD: Makefile.dbe,v 1.4.8.1 2009/09/17 04:24:38 snj Exp $ +# $NetBSD: Makefile.dbe,v 1.4.8.2 2011/03/07 18:50:49 riz Exp $ .PATH: ${X11SRCDIR.xorg-server}/dbe SRCS.dbe= dbe.c midbe.c CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ -I${X11SRCDIR.xorg-server}/Xext \ - -I${DESTDIR}${X11INCDIR}/pixman-1 + -I${DESTDIR}${X11INCDIR}/pixman-1 \ + -I${X11SRCDIR.xorg-server}/../include \ + ${X11FLAGS.DIX} ${X11INCS.DIX} .include LIBDIR= ${XMODULEDIR} Index: src/external/mit/xorg/server/xorg-server/exa/Makefile.exa diff -u src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.2.8.1 src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.2.8.2 --- src/external/mit/xorg/server/xorg-server/exa/Makefile.exa:1.2.8.1 Thu Sep 17 04:24:38 2009 +++ src/external/mit/xorg/server/xorg-server/exa/Makefile.exa Mon Mar 7 18:50:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.exa,v 1.2.8.1 2009/09/17 04:24:38 snj Exp $ +# $NetBSD: Makefile.exa,v 1.2.8.2 2011/03/07 18:50:49 riz Exp $ .PATH: ${X11SRCDIR.xorg-server}/exa @@ -13,7 +13,8 @@ -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/xorg \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ - -I${X11SRCDIR.xorg-server}/../include + -I${X11SRCDIR.xorg-server}/../include \ + ${X11FLAGS.DIX} ${X11INCS.DIX} .if !defined(XMODULEDIR) .include Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3.2.3 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3.2.4 --- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3.2.3 Sat Oct 10 19:53:24 2009 +++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Mon Mar 7 18:50:48 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.glx,v 1.3.2.3 2009/10/10 19:53:24 sborrill Exp $ +# $NetBSD: Makefile.glx,v 1.3.2.4 2011/03/07 18:50:48 riz Exp $ .PATH: ${X11SRCDIR.xorg-server}/glx .PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi @@ -59,7 +59,8 @@ CPPFLAGS+= \ -DGLXEXT \ -DGLX_USE_MESA \ - ${X11FLAGS.DIX} + -I${X11SRCDIR.xorg-server}/../include \ + ${X11FLAGS.DIX} ${X11INCS.DIX} .include LIBDIR=
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Mon Mar 7 18:58:30 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1557, 1558. To generate a diff of this commit: cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-5.2 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 diff -u src/doc/CHANGES-5.2:1.1.2.64 src/doc/CHANGES-5.2:1.1.2.65 --- src/doc/CHANGES-5.2:1.1.2.64 Mon Mar 7 17:39:10 2011 +++ src/doc/CHANGES-5.2 Mon Mar 7 18:58:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.64 2011/03/07 17:39:10 snj Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.65 2011/03/07 18:58:30 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -4775,3 +4775,17 @@ Always return at least one parity region. Fixes PR#44239. [riz, ticket #1569] +external/mit/xorg/lib/libpciaccess/Makefile 1.5-1.6 +xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c 1.8 + + Make MTRRs work with Xorg again. + [jmcneill, ticket #1557] + +external/mit/xorg/server/xorg-server/damageext/Makefile 1.3 +external/mit/xorg/server/xorg-server/dbe/Makefile.dbe 1.6 +external/mit/xorg/server/xorg-server/exa/Makefile.exa 1.5 +external/mit/xorg/server/xorg-server/glx/Makefile.glx 1.8 + + Fix trouble with Composite and DAMAGE extensions. + [jmcneill, ticket #1558] +
CVS commit: src/share/mk
Module Name:src Committed By: jmmv Date: Mon Mar 7 19:05:04 UTC 2011 Modified Files: src/share/mk: bsd.prog.mk Log Message: Always convert PROG to its plural form independently of whether PROG_CXX is defined or not. From Garrett Cooper in private mail. To generate a diff of this commit: cvs rdiff -u -r1.260 -r1.261 src/share/mk/bsd.prog.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.prog.mk diff -u src/share/mk/bsd.prog.mk:1.260 src/share/mk/bsd.prog.mk:1.261 --- src/share/mk/bsd.prog.mk:1.260 Sun Feb 20 20:16:01 2011 +++ src/share/mk/bsd.prog.mk Mon Mar 7 19:05:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.260 2011/02/20 20:16:01 jmmv Exp $ +# $NetBSD: bsd.prog.mk,v 1.261 2011/03/07 19:05:03 jmmv Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -262,7 +262,8 @@ .if !defined(RUMPPRG) . if defined(PROG_CXX) && !defined(PROGS_CXX) PROGS_CXX= ${PROG_CXX} -. elif defined(PROG) && !defined(PROGS) +. endif +. if defined(PROG) && !defined(PROGS) PROGS= ${PROG} . endif .endif
CVS commit: src/sys/compat/aoutm68k
Module Name:src Committed By: bouyer Date: Mon Mar 7 19:26:35 UTC 2011 Modified Files: src/sys/compat/aoutm68k: syscalls.master Log Message: Use the COMPAT_50 quotactl, not the native one. Should fix build of COMPAT_AOUT_M68K To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/compat/aoutm68k/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/aoutm68k/syscalls.master diff -u src/sys/compat/aoutm68k/syscalls.master:1.36 src/sys/compat/aoutm68k/syscalls.master:1.37 --- src/sys/compat/aoutm68k/syscalls.master:1.36 Tue Mar 2 21:07:21 2010 +++ src/sys/compat/aoutm68k/syscalls.master Mon Mar 7 19:26:35 2011 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.36 2010/03/02 21:07:21 pooka Exp $ + $NetBSD: syscalls.master,v 1.37 2011/03/07 19:26:35 bouyer Exp $ ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -402,7 +402,7 @@ 146 EXCL compat_43_sys_killpg #endif 147 NOARGS { int|sys||setsid(void); } -148 NOARGS { int|sys||quotactl(const char *path, \ +148 NOARGS { int|compat_50_sys||quotactl(const char *path, \ int cmd, int uid, void *arg); } #if defined(COMPAT_43) || !defined(_KERNEL) 149 NOARGS { int|compat_43_sys||quota(void); } oquota
CVS commit: src/sys/compat/aoutm68k
Module Name:src Committed By: bouyer Date: Mon Mar 7 19:27:27 UTC 2011 Modified Files: src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c Log Message: Regen: use COMPAT_50 quotactl, not the native one To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/compat/aoutm68k/aoutm68k_syscall.h cvs rdiff -u -r1.39 -r1.40 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h cvs rdiff -u -r1.38 -r1.39 src/sys/compat/aoutm68k/aoutm68k_syscalls.c cvs rdiff -u -r1.43 -r1.44 src/sys/compat/aoutm68k/aoutm68k_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/aoutm68k/aoutm68k_syscall.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.41 src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.42 --- src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.41 Tue Mar 2 21:14:43 2010 +++ src/sys/compat/aoutm68k/aoutm68k_syscall.h Mon Mar 7 19:27:27 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscall.h,v 1.41 2010/03/02 21:14:43 pooka Exp $ */ +/* $NetBSD: aoutm68k_syscall.h,v 1.42 2011/03/07 19:27:27 bouyer Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.36 2010/03/02 21:07:21 pooka Exp + * created from NetBSD: syscalls.master,v 1.37 2011/03/07 19:26:35 bouyer Exp */ #ifndef _AOUTM68K_SYS_SYSCALL_H_ Index: src/sys/compat/aoutm68k/aoutm68k_syscallargs.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.39 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.40 --- src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.39 Tue Mar 2 21:14:43 2010 +++ src/sys/compat/aoutm68k/aoutm68k_syscallargs.h Mon Mar 7 19:27:27 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscallargs.h,v 1.39 2010/03/02 21:14:43 pooka Exp $ */ +/* $NetBSD: aoutm68k_syscallargs.h,v 1.40 2011/03/07 19:27:27 bouyer Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.36 2010/03/02 21:07:21 pooka Exp + * created from NetBSD: syscalls.master,v 1.37 2011/03/07 19:26:35 bouyer Exp */ #ifndef _AOUTM68K_SYS_SYSCALLARGS_H_ @@ -27,7 +27,7 @@ } #undef check_syscall_args -#define check_syscall_args(call) \ +#define check_syscall_args(call) /*LINTED*/ \ typedef char call##_check_args[sizeof (struct call##_args) \ <= AOUTM68K_SYS_MAXSYSARGS * sizeof (register_t) ? 1 : -1]; @@ -358,7 +358,7 @@ #else #endif -struct sys_quotactl_args; +struct compat_50_sys_quotactl_args; #if defined(COMPAT_43) || !defined(_KERNEL) struct compat_43_sys_getsockname_args; @@ -1000,7 +1000,7 @@ #endif int sys_setsid(struct lwp *, const void *, register_t *); -int sys_quotactl(struct lwp *, const struct sys_quotactl_args *, register_t *); +int compat_50_sys_quotactl(struct lwp *, const struct compat_50_sys_quotactl_args *, register_t *); #if defined(COMPAT_43) || !defined(_KERNEL) int compat_43_sys_quota(struct lwp *, const void *, register_t *); Index: src/sys/compat/aoutm68k/aoutm68k_syscalls.c diff -u src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.38 src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.39 --- src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.38 Tue Mar 2 21:14:43 2010 +++ src/sys/compat/aoutm68k/aoutm68k_syscalls.c Mon Mar 7 19:27:27 2011 @@ -1,14 +1,14 @@ -/* $NetBSD: aoutm68k_syscalls.c,v 1.38 2010/03/02 21:14:43 pooka Exp $ */ +/* $NetBSD: aoutm68k_syscalls.c,v 1.39 2011/03/07 19:27:27 bouyer Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.36 2010/03/02 21:07:21 pooka Exp + * created from NetBSD: syscalls.master,v 1.37 2011/03/07 19:26:35 bouyer Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.38 2010/03/02 21:14:43 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.39 2011/03/07 19:27:27 bouyer Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -567,4 +567,208 @@ /* 305 */ "issetugid", /* 306 */ "getcontext", /* 307 */ "setcontext", + /* 308 */ "# filler", + /* 309 */ "# filler", + /* 310 */ "# filler", + /* 311 */ "# filler", + /* 312 */ "# filler", + /* 313 */ "# filler", + /* 314 */ "# filler", + /* 315 */ "# filler", + /* 316 */ "# filler", + /* 317 */ "# filler", + /* 318 */ "# filler", + /* 319 */ "# filler", + /* 320 */ "# filler", + /* 321 */ "# filler", + /* 322 */ "# filler", + /* 323 */ "# filler", + /* 324 */ "# filler", + /* 325 */ "# filler", + /* 326 */ "# filler", + /* 327 */ "# filler", + /* 328 */ "# filler", + /* 329 */ "# filler", + /* 330 */ "# filler", + /* 331 */ "# filler", + /* 332 */ "# filler", + /* 333 */ "# filler", + /* 334 */ "# filler", + /* 335 */ "# filler", + /* 336 */ "# filler", + /* 337 */ "# filler", + /* 338 */ "# filler", + /* 339 */ "# filler", + /* 340 */
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Mon Mar 7 21:04:47 UTC 2011 Modified Files: src/sys/rump/librump/rumpkern: lwproc.c Log Message: Fill in a functional struct lwp (especially l_mutex) before exposing it on p_lwps. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/rump/librump/rumpkern/lwproc.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/rumpkern/lwproc.c diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.15 src/sys/rump/librump/rumpkern/lwproc.c:1.16 --- src/sys/rump/librump/rumpkern/lwproc.c:1.15 Thu Feb 10 13:40:35 2011 +++ src/sys/rump/librump/rumpkern/lwproc.c Mon Mar 7 21:04:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lwproc.c,v 1.15 2011/02/10 13:40:35 pooka Exp $ */ +/* $NetBSD: lwproc.c,v 1.16 2011/03/07 21:04:47 pooka Exp $ */ /* * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.15 2011/02/10 13:40:35 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.16 2011/03/07 21:04:47 pooka Exp $"); #include #include @@ -229,9 +229,6 @@ l->l_lid = p->p_nlwpid++; LIST_INSERT_HEAD(&p->p_lwps, l, l_sibling); - mutex_exit(p->p_lock); - - lwp_update_creds(l); l->l_fd = p->p_fd; l->l_cpu = rump_cpu; @@ -239,7 +236,9 @@ l->l_stat = LSRUN; l->l_mutex = &unruntime_lock; TAILQ_INIT(&l->l_ld_locks); + mutex_exit(p->p_lock); + lwp_update_creds(l); lwp_initspecific(l); if (doswitch) {
CVS commit: src/lib/librumpuser
Module Name:src Committed By: pooka Date: Mon Mar 7 21:57:15 UTC 2011 Modified Files: src/lib/librumpuser: rumpuser_sp.c Log Message: use nwork-adjusted amount of idle workers to decide is they are truly idle. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/lib/librumpuser/rumpuser_sp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpuser/rumpuser_sp.c diff -u src/lib/librumpuser/rumpuser_sp.c:1.42 src/lib/librumpuser/rumpuser_sp.c:1.43 --- src/lib/librumpuser/rumpuser_sp.c:1.42 Tue Feb 15 16:10:41 2011 +++ src/lib/librumpuser/rumpuser_sp.c Mon Mar 7 21:57:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_sp.c,v 1.42 2011/02/15 16:10:41 pooka Exp $ */ +/* $NetBSD: rumpuser_sp.c,v 1.43 2011/03/07 21:57:15 pooka Exp $ */ /* * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -35,7 +35,7 @@ */ #include -__RCSID("$NetBSD: rumpuser_sp.c,v 1.42 2011/02/15 16:10:41 pooka Exp $"); +__RCSID("$NetBSD: rumpuser_sp.c,v 1.43 2011/03/07 21:57:15 pooka Exp $"); #include #include @@ -623,7 +623,7 @@ for (;;) { pthread_mutex_lock(&sbamtx); - if (__predict_false(idleworker >= rumpsp_idleworker)) { + if (__predict_false(idleworker - nwork >= rumpsp_idleworker)) { nworker--; pthread_mutex_unlock(&sbamtx); break;
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: phx Date: Mon Mar 7 22:18:46 UTC 2011 Modified Files: src/sys/arch/sandpoint/stand/altboot: printf.c Log Message: mkdigit() didn't work with values which have bit 31 set (>=0x8000). Do not cast to (int). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sandpoint/stand/altboot/printf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sandpoint/stand/altboot/printf.c diff -u src/sys/arch/sandpoint/stand/altboot/printf.c:1.3 src/sys/arch/sandpoint/stand/altboot/printf.c:1.4 --- src/sys/arch/sandpoint/stand/altboot/printf.c:1.3 Sun Jan 23 02:08:24 2011 +++ src/sys/arch/sandpoint/stand/altboot/printf.c Mon Mar 7 22:18:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: printf.c,v 1.3 2011/01/23 02:08:24 nisimura Exp $ */ +/* $NetBSD: printf.c,v 1.4 2011/03/07 22:18:46 phx Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -255,7 +255,7 @@ t = ptmp; *t++ = '\0'; do { - int d = (int)llval % base; + int d = llval % base; *t++ = hexdigit[d]; llval /= base; } while (llval != 0 && ++n < sizeof(ptmp));
CVS commit: src/etc/rc.d
Module Name:src Committed By: jmcneill Date: Mon Mar 7 23:21:13 UTC 2011 Modified Files: src/etc/rc.d: npf Log Message: put a : in an otherwise empty function, makes this script work with bash To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/npf 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/npf diff -u src/etc/rc.d/npf:1.1 src/etc/rc.d/npf:1.2 --- src/etc/rc.d/npf:1.1 Wed Feb 2 02:20:28 2011 +++ src/etc/rc.d/npf Mon Mar 7 23:21:13 2011 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: npf,v 1.1 2011/02/02 02:20:28 rmind Exp $ +# $NetBSD: npf,v 1.2 2011/03/07 23:21:13 jmcneill Exp $ # # Public Domain. # @@ -55,6 +55,7 @@ npf_status() { + : } load_rc_config $name
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: macallan Date: Tue Mar 8 02:57:01 UTC 2011 Modified Files: src/sys/arch/x86/x86: x86_autoconf.c Log Message: if we know the framebuffer's virtual address pass it to the fb driver To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/x86/x86/x86_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/arch/x86/x86/x86_autoconf.c diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.58 src/sys/arch/x86/x86/x86_autoconf.c:1.59 --- src/sys/arch/x86/x86/x86_autoconf.c:1.58 Tue Feb 22 06:33:33 2011 +++ src/sys/arch/x86/x86/x86_autoconf.c Tue Mar 8 02:57:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: x86_autoconf.c,v 1.58 2011/02/22 06:33:33 dholland Exp $ */ +/* $NetBSD: x86_autoconf.c,v 1.59 2011/03/08 02:57:00 macallan Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.58 2011/02/22 06:33:33 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.59 2011/03/08 02:57:00 macallan Exp $"); #include #include @@ -676,6 +676,9 @@ if (PCI_CLASS(pa->pa_class) == PCI_CLASS_DISPLAY) { #if NWSDISPLAY > 0 && NGENFB > 0 extern struct vcons_screen x86_genfb_console_screen; + struct rasops_info *ri; + + ri = &x86_genfb_console_screen.scr_ri; #endif fbinfo = lookup_bootinfo(BTINFO_FRAMEBUFFER); @@ -695,8 +698,15 @@ prop_dictionary_set_uint16(dict, "linebytes", fbinfo->stride); +prop_dictionary_set_uint64(dict, "address", +fbinfo->physaddr); +#if NWSDISPLAY > 0 && NGENFB > 0 +if (ri->ri_bits != NULL) { prop_dictionary_set_uint64(dict, - "address", fbinfo->physaddr); + "virtual_address", + (vaddr_t)ri->ri_bits); +} +#endif } #if notyet prop_dictionary_set_bool(dict, "splash",
CVS commit: src/sys/dev/wsfb
Module Name:src Committed By: macallan Date: Tue Mar 8 03:16:31 UTC 2011 Modified Files: src/sys/dev/wsfb: genfb.c Log Message: look for a 'virtual_address' property and use it as fb address To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/dev/wsfb/genfb.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/wsfb/genfb.c diff -u src/sys/dev/wsfb/genfb.c:1.38 src/sys/dev/wsfb/genfb.c:1.39 --- src/sys/dev/wsfb/genfb.c:1.38 Tue Feb 22 01:26:14 2011 +++ src/sys/dev/wsfb/genfb.c Tue Mar 8 03:16:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.38 2011/02/22 01:26:14 jmcneill Exp $ */ +/* $NetBSD: genfb.c,v 1.39 2011/03/08 03:16:30 macallan Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.38 2011/02/22 01:26:14 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.39 2011/03/08 03:16:30 macallan Exp $"); #include #include @@ -102,7 +102,7 @@ genfb_init(struct genfb_softc *sc) { prop_dictionary_t dict; - uint64_t cmap_cb, pmf_cb, mode_cb, bl_cb; + uint64_t cmap_cb, pmf_cb, mode_cb, bl_cb, fbaddr; uint32_t fboffset; bool console; @@ -133,6 +133,11 @@ sc->sc_fboffset = fboffset; + sc->sc_fbaddr = NULL; + if (prop_dictionary_get_uint64(dict, "virtual_address", &fbaddr)) { + sc->sc_fbaddr = (void *)fbaddr; + } + if (!prop_dictionary_get_uint32(dict, "linebytes", &sc->sc_stride)) sc->sc_stride = (sc->sc_width * sc->sc_depth) >> 3;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Tue Mar 8 03:22:30 UTC 2011 Modified Files: src/sys/dev/pci: genfb_pci.c Log Message: only try to map the framebuffer if we don't already have an address With this radeondrm works with genfb and r6xx. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/genfb_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/genfb_pci.c diff -u src/sys/dev/pci/genfb_pci.c:1.31 src/sys/dev/pci/genfb_pci.c:1.32 --- src/sys/dev/pci/genfb_pci.c:1.31 Sun Feb 13 11:00:58 2011 +++ src/sys/dev/pci/genfb_pci.c Tue Mar 8 03:22:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb_pci.c,v 1.31 2011/02/13 11:00:58 phx Exp $ */ +/* $NetBSD: genfb_pci.c,v 1.32 2011/03/08 03:22:29 macallan Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.31 2011/02/13 11:00:58 phx Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.32 2011/03/08 03:22:29 macallan Exp $"); #include #include @@ -131,14 +131,22 @@ return; } - if (bus_space_map(sc->sc_memt, sc->sc_gen.sc_fboffset, - sc->sc_gen.sc_fbsize, - BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE, - &sc->sc_memh) != 0) { - aprint_error_dev(self, "unable to map the framebuffer\n"); - return; - } - sc->sc_gen.sc_fbaddr = bus_space_vaddr(sc->sc_memt, sc->sc_memh); + /* + * if some MD code handed us a framebuffer VA we use that instead of + * mapping our own + */ + if (sc->sc_gen.sc_fbaddr == NULL) { + if (bus_space_map(sc->sc_memt, sc->sc_gen.sc_fboffset, + sc->sc_gen.sc_fbsize, + BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE, + &sc->sc_memh) != 0) { + aprint_error_dev(self, "unable to map the framebuffer\n"); + return; + } + sc->sc_gen.sc_fbaddr = bus_space_vaddr(sc->sc_memt, sc->sc_memh); + } else + aprint_debug("%s: recycling existing fb mapping at %lx\n", + device_xname(sc->sc_gen.sc_dev), (unsigned long)sc->sc_gen.sc_fbaddr); /* mmap()able bus ranges */ idx = 0;
CVS commit: src/sys/dev/wsfb
Module Name:src Committed By: macallan Date: Tue Mar 8 04:47:10 UTC 2011 Modified Files: src/sys/dev/wsfb: genfb.c Log Message: fix build for LP32 thanks to uebayasi@ To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/dev/wsfb/genfb.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/wsfb/genfb.c diff -u src/sys/dev/wsfb/genfb.c:1.39 src/sys/dev/wsfb/genfb.c:1.40 --- src/sys/dev/wsfb/genfb.c:1.39 Tue Mar 8 03:16:30 2011 +++ src/sys/dev/wsfb/genfb.c Tue Mar 8 04:47:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.39 2011/03/08 03:16:30 macallan Exp $ */ +/* $NetBSD: genfb.c,v 1.40 2011/03/08 04:47:10 macallan Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.39 2011/03/08 03:16:30 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.40 2011/03/08 04:47:10 macallan Exp $"); #include #include @@ -135,7 +135,7 @@ sc->sc_fbaddr = NULL; if (prop_dictionary_get_uint64(dict, "virtual_address", &fbaddr)) { - sc->sc_fbaddr = (void *)fbaddr; + sc->sc_fbaddr = (void *)(uintptr_t)fbaddr; } if (!prop_dictionary_get_uint32(dict, "linebytes", &sc->sc_stride))
CVS commit: src/sys/dev
Module Name:src Committed By: kiyohara Date: Tue Mar 8 04:58:21 UTC 2011 Modified Files: src/sys/dev/isa: slhci_isa.c src/sys/dev/pcmcia: slhci_pcmcia.c Log Message: Fix hci_private data. slhci(4) is assuming, it is slhci_softc. not device_t. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/dev/isa/slhci_isa.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pcmcia/slhci_pcmcia.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/isa/slhci_isa.c diff -u src/sys/dev/isa/slhci_isa.c:1.11 src/sys/dev/isa/slhci_isa.c:1.12 --- src/sys/dev/isa/slhci_isa.c:1.11 Tue May 12 09:10:16 2009 +++ src/sys/dev/isa/slhci_isa.c Tue Mar 8 04:58:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: slhci_isa.c,v 1.11 2009/05/12 09:10:16 cegger Exp $ */ +/* $NetBSD: slhci_isa.c,v 1.12 2011/03/08 04:58:21 kiyohara Exp $ */ /* * Copyright (c) 2001 Kiyoshi Ikehara. All rights reserved. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: slhci_isa.c,v 1.11 2009/05/12 09:10:16 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: slhci_isa.c,v 1.12 2011/03/08 04:58:21 kiyohara Exp $"); #include #include @@ -98,7 +98,7 @@ bus_space_handle_t ioh; sc->sc_dev = self; - sc->sc_bus.hci_private = self; + sc->sc_bus.hci_private = sc; printf("\n"); /* XXX still needed? */ Index: src/sys/dev/pcmcia/slhci_pcmcia.c diff -u src/sys/dev/pcmcia/slhci_pcmcia.c:1.7 src/sys/dev/pcmcia/slhci_pcmcia.c:1.8 --- src/sys/dev/pcmcia/slhci_pcmcia.c:1.7 Thu Nov 4 13:13:43 2010 +++ src/sys/dev/pcmcia/slhci_pcmcia.c Tue Mar 8 04:58:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: slhci_pcmcia.c,v 1.7 2010/11/04 13:13:43 pgoyette Exp $ */ +/* $NetBSD: slhci_pcmcia.c,v 1.8 2011/03/08 04:58:21 kiyohara Exp $ */ /* * Not (c) 2007 Matthew Orgass * This file is public domain, meaning anyone can make any use of part or all @@ -11,7 +11,7 @@ /* Glue for RATOC USB HOST CF+ Card (SL811HS chip) */ #include -__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.7 2010/11/04 13:13:43 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.8 2011/03/08 04:58:21 kiyohara Exp $"); #include #include @@ -89,6 +89,7 @@ struct pcmcia_function *pf = pa->pf; psc->sc_slhci.sc_dev = self; + psc->sc_slhci.sc_bus.hci_private = &psc->sc_slhci; psc->sc_pf = pf; psc->sc_flags = 0;
CVS commit: src/share/man/man5
Module Name:src Committed By: snj Date: Tue Mar 8 07:40:37 UTC 2011 Modified Files: src/share/man/man5: rc.conf.5 Log Message: mention mdnsd(8), and fix a typo while here To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/share/man/man5/rc.conf.5 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/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.143 src/share/man/man5/rc.conf.5:1.144 --- src/share/man/man5/rc.conf.5:1.143 Tue Apr 20 12:09:05 2010 +++ src/share/man/man5/rc.conf.5 Tue Mar 8 07:40:37 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.conf.5,v 1.143 2010/04/20 12:09:05 wiz Exp $ +.\" $NetBSD: rc.conf.5,v 1.144 2011/03/08 07:40:37 snj Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -55,7 +55,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 19, 2010 +.Dd March 8, 2010 .Dt RC.CONF 5 .Os .Sh NAME @@ -905,7 +905,7 @@ .Xr wpa_supplicant 8 , WPA/802.11i Supplicant for wireless network devices. If you set -.Sy wpa_suplicant +.Sy wpa_supplicant true, then .Pa /usr must be in @@ -995,6 +995,10 @@ The .Dq Li -l flag will turn on extra logging. +.It Sy mdnsd +Boolean value. +Runs +.Xr mdnsd 8 . .It Sy named Boolean value. Runs
CVS commit: src/share/man/man5
Module Name:src Committed By: snj Date: Tue Mar 8 07:44:39 UTC 2011 Modified Files: src/share/man/man5: rc.conf.5 Log Message: bah! it's 2011 already? To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/share/man/man5/rc.conf.5 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/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.144 src/share/man/man5/rc.conf.5:1.145 --- src/share/man/man5/rc.conf.5:1.144 Tue Mar 8 07:40:37 2011 +++ src/share/man/man5/rc.conf.5 Tue Mar 8 07:44:39 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.conf.5,v 1.144 2011/03/08 07:40:37 snj Exp $ +.\" $NetBSD: rc.conf.5,v 1.145 2011/03/08 07:44:39 snj Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -55,7 +55,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 8, 2010 +.Dd March 8, 2011 .Dt RC.CONF 5 .Os .Sh NAME
CVS commit: src/share/mk
Module Name:src Committed By: jmmv Date: Tue Mar 8 07:53:43 UTC 2011 Modified Files: src/share/mk: bsd.prog.mk Log Message: Revert previous (revision 1.261): it broke the build because PROG_CXX is defined in terms of PROG, so later on we would end up with target duplicates because both PROG_CXX and PROG were being converted to PROGS_CXX and PROGS. Did not catch this earlier because the test build I did was not clean and thus the duplicate targets did not have nasty effects. To generate a diff of this commit: cvs rdiff -u -r1.261 -r1.262 src/share/mk/bsd.prog.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.prog.mk diff -u src/share/mk/bsd.prog.mk:1.261 src/share/mk/bsd.prog.mk:1.262 --- src/share/mk/bsd.prog.mk:1.261 Mon Mar 7 19:05:03 2011 +++ src/share/mk/bsd.prog.mk Tue Mar 8 07:53:43 2011 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.261 2011/03/07 19:05:03 jmmv Exp $ +# $NetBSD: bsd.prog.mk,v 1.262 2011/03/08 07:53:43 jmmv Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -262,8 +262,7 @@ .if !defined(RUMPPRG) . if defined(PROG_CXX) && !defined(PROGS_CXX) PROGS_CXX= ${PROG_CXX} -. endif -. if defined(PROG) && !defined(PROGS) +. elif defined(PROG) && !defined(PROGS) PROGS= ${PROG} . endif .endif