CVS commit: src/share/man/man4
Module Name:src Committed By: dholland Date: Mon Dec 30 08:42:00 UTC 2013 Modified Files: src/share/man/man4: fd.4 Log Message: Add cross reference to mount_fdesc(8), as noted a while back in PR 45694. Also add a note that the floppy driver is documented in fdc(4). Bump date. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/fd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/fd.4 diff -u src/share/man/man4/fd.4:1.5 src/share/man/man4/fd.4:1.6 --- src/share/man/man4/fd.4:1.5 Thu Aug 7 10:31:02 2003 +++ src/share/man/man4/fd.4 Mon Dec 30 08:42:00 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: fd.4,v 1.5 2003/08/07 10:31:02 agc Exp $ +.\ $NetBSD: fd.4,v 1.6 2013/12/30 08:42:00 dholland Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)fd.4 8.1 (Berkeley) 6/9/93 .\ -.Dd June 9, 1993 +.Dd December 29, 2013 .Dt FD 4 .Os .Sh NAME @@ -86,4 +86,11 @@ are ignored. .It Pa /dev/stderr .El .Sh SEE ALSO -.Xr tty 4 +.Xr tty 4 , +.Xr mount_fdesc 8 +.Ss NOTE +The floppy disk driver on some ports is also called +.Nm fd ; +see +.Xr fdc 4 +for its documentation.
CVS commit: src/sbin/mount_fdesc
Module Name:src Committed By: dholland Date: Mon Dec 30 08:43:22 UTC 2013 Modified Files: src/sbin/mount_fdesc: mount_fdesc.8 Log Message: Add crossreference to fd(4) as noted a while back in PR 45694. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sbin/mount_fdesc/mount_fdesc.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_fdesc/mount_fdesc.8 diff -u src/sbin/mount_fdesc/mount_fdesc.8:1.15 src/sbin/mount_fdesc/mount_fdesc.8:1.16 --- src/sbin/mount_fdesc/mount_fdesc.8:1.15 Mon Jan 31 05:19:19 2005 +++ src/sbin/mount_fdesc/mount_fdesc.8 Mon Dec 30 08:43:22 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount_fdesc.8,v 1.15 2005/01/31 05:19:19 erh Exp $ +.\ $NetBSD: mount_fdesc.8,v 1.16 2013/12/30 08:43:22 dholland Exp $ .\ .\ Copyright (c) 1992, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)mount_fdesc.8 8.2 (Berkeley) 3/27/94 .\ -.Dd March 27, 1994 +.Dd December 29, 2013 .Dt MOUNT_FDESC 8 .Os .Sh NAME @@ -144,6 +144,7 @@ the real controlling terminal device. .Sh SEE ALSO .Xr mount 2 , .Xr unmount 2 , +.Xr fd 4 , .Xr tty 4 , .Xr fstab 5 , .Xr mount 8
CVS commit: src/sys/arch/sparc/stand/common
Module Name:src Committed By: martin Date: Mon Dec 30 08:43:28 UTC 2013 Modified Files: src/sys/arch/sparc/stand/common: promdev.c Log Message: Avoid buffer overruns (no practical difference for any sane firmware properties, but better be safe). To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/stand/common/promdev.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/sparc/stand/common/promdev.c diff -u src/sys/arch/sparc/stand/common/promdev.c:1.26 src/sys/arch/sparc/stand/common/promdev.c:1.27 --- src/sys/arch/sparc/stand/common/promdev.c:1.26 Thu Sep 2 03:14:42 2010 +++ src/sys/arch/sparc/stand/common/promdev.c Mon Dec 30 08:43:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: promdev.c,v 1.26 2010/09/02 03:14:42 uwe Exp $ */ +/* $NetBSD: promdev.c,v 1.27 2013/12/30 08:43:28 martin Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -583,6 +583,8 @@ mygetpropstring(int node, char *name) static char buf[64]; len = prom_proplen(node, name); + if (len sizeof(buf)) + len = sizeof(buf)-1; if (len 0) _prom_getprop(node, name, buf, len); else
CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src
Committed By: martin
Date: Mon Dec 30 08:47:50 UTC 2013
Modified Files:
src/sys/arch/sparc/stand/ofwboot: boot.c
Log Message:
Improve debugging output
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc/stand/ofwboot/boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/stand/ofwboot/boot.c
diff -u src/sys/arch/sparc/stand/ofwboot/boot.c:1.29 src/sys/arch/sparc/stand/ofwboot/boot.c:1.30
--- src/sys/arch/sparc/stand/ofwboot/boot.c:1.29 Mon May 28 19:24:30 2012
+++ src/sys/arch/sparc/stand/ofwboot/boot.c Mon Dec 30 08:47:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.29 2012/05/28 19:24:30 martin Exp $ */
+/* $NetBSD: boot.c,v 1.30 2013/12/30 08:47:50 martin Exp $ */
/*
* Copyright (c) 1997, 1999 Eduardo E. Horvath. All rights reserved.
@@ -478,7 +478,10 @@ check_boot_config(void)
if (!root_fs_quickseekable) return;
DPRINTF((checking for /boot.cfg...\n));
fd = open(/boot.cfg, 0);
- if (fd 0) return;
+ if (fd 0) {
+ DPRINTF((no /boot.cfg found\n));
+ return;
+ }
DPRINTF((found /boot.cfg\n));
if (fstat(fd, st) == -1 || st.st_size 32*1024) {
close(fd);
CVS commit: src/sys/arch/luna68k/dev
Module Name:src
Committed By: tsutsui
Date: Mon Dec 30 13:14:48 UTC 2013
Modified Files:
src/sys/arch/luna68k/dev: lunafb.c
Log Message:
Pull a fix of Bt458 (8bpp framebuffer) initialization from OpenBSD/luna88k.
http://marc.info/?l=openbsd-cvsm=138838884202196
Correct initialization of Bt458, used in LUNA's 8bpp frame buffer.
According to the manual, the address register does not automatically
increment when we access to the control registers. Also we disable
overlay planes, because we do not use them.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/luna68k/dev/lunafb.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/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.29 src/sys/arch/luna68k/dev/lunafb.c:1.30
--- src/sys/arch/luna68k/dev/lunafb.c:1.29 Sat Dec 28 09:17:23 2013
+++ src/sys/arch/luna68k/dev/lunafb.c Mon Dec 30 13:14:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.29 2013/12/28 09:17:23 tsutsui Exp $ */
+/* $NetBSD: lunafb.c,v 1.30 2013/12/30 13:14:48 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1.29 2013/12/28 09:17:23 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1.30 2013/12/30 13:14:48 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -431,11 +431,16 @@ omfb_getdevconfig(paddr_t paddr, struct
} else if (hwplanemask == 0xff) {
struct bt458 *ndac = (struct bt458 *)OMFB_RAMDAC;
+ /* Initialize the Bt458 */
ndac-bt_addr = 0x04;
ndac-bt_ctrl = 0xff; /* all planes will be read */
+ ndac-bt_addr = 0x05;
ndac-bt_ctrl = 0x00; /* all planes have non-blink */
- ndac-bt_ctrl = 0x43; /* pallete enabled, ovly plane */
+ ndac-bt_addr = 0x06;
+ ndac-bt_ctrl = 0x40; /* pallete enabled, ovly plane disabled */
+ ndac-bt_addr = 0x07;
ndac-bt_ctrl = 0x00; /* no test mode */
+
ndac-bt_addr = 0;
ndac-bt_cmap = dc-dc_cmap.r[0] = 0;
ndac-bt_cmap = dc-dc_cmap.g[0] = 0;
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: kiyohara Date: Mon Dec 30 14:17:54 UTC 2013 Modified Files: src/distrib/sets/lists/modules: md.evbppc Log Message: Add ccd, cgd, dk_subr and zlib. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/modules/md.evbppc 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/modules/md.evbppc diff -u src/distrib/sets/lists/modules/md.evbppc:1.39 src/distrib/sets/lists/modules/md.evbppc:1.40 --- src/distrib/sets/lists/modules/md.evbppc:1.39 Tue Dec 17 08:46:37 2013 +++ src/distrib/sets/lists/modules/md.evbppc Mon Dec 30 14:17:54 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc,v 1.39 2013/12/17 08:46:37 njoly Exp $ +# $NetBSD: md.evbppc,v 1.40 2013/12/30 14:17:54 kiyohara Exp $ ./stand/powerpc-4xx base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod,compatmodules @@ -12,8 +12,12 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/aio/aio.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/bpfbase-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/bpf/bpf.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/ccdbase-kernel-modules kmod +./stand/powerpc-4xx/@OSRELEASE@/modules/ccd/ccd.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/cd9660base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/cd9660/cd9660.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/cgdbase-kernel-modules kmod +./stand/powerpc-4xx/@OSRELEASE@/modules/cgd/cgd.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/chfsbase-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/chfs/chfs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/codabase-kernel-modules kmod,compatmodules @@ -30,6 +34,8 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/dbcool/dbcool.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/dirhashbase-obsolete obsolete ./stand/powerpc-4xx/@OSRELEASE@/modules/dirhash/dirhash.kmod base-obsolete obsolete +./stand/powerpc-4xx/@OSRELEASE@/modules/dk_subrbase-kernel-modules kmod +./stand/powerpc-4xx/@OSRELEASE@/modules/dk_subr/dk_subr.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/dmbase-kernel-modules kmod,compatmodules,lvm ./stand/powerpc-4xx/@OSRELEASE@/modules/dm/dm.kmod base-kernel-modules kmod,compatmodules,lvm ./stand/powerpc-4xx/@OSRELEASE@/modules/dtracebase-kernel-modules kmod,compatmodules,dtrace @@ -206,6 +212,8 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/vcoda/vcoda.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/vnd base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/vnd/vnd.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/zlibbase-kernel-modules kmod +./stand/powerpc-4xx/@OSRELEASE@/modules/zlib/zlib.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/zfsbase-kernel-modules kmod,zfs ./stand/powerpc-4xx/@OSRELEASE@/modules/zfs/zfs.kmod base-kernel-modules kmod,zfs ./stand/powerpc-booke base-kernel-modules kmod,compatmodules @@ -221,8 +229,12 @@ ./stand/powerpc-booke/@OSRELEASE@/modules/aio/aio.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/bpfbase-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/bpf/bpf.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-booke/@OSRELEASE@/modules/ccdbase-kernel-modules kmod +./stand/powerpc-booke/@OSRELEASE@/modules/ccd/ccd.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/cd9660base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/cd9660/cd9660.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-booke/@OSRELEASE@/modules/cgdbase-kernel-modules kmod +./stand/powerpc-booke/@OSRELEASE@/modules/cgd/cgd.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/chfsbase-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/chfs/chfs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/codabase-kernel-modules kmod,compatmodules @@ -239,6 +251,8 @@ ./stand/powerpc-booke/@OSRELEASE@/modules/dbcool/dbcool.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/dirhashbase-obsolete obsolete ./stand/powerpc-booke/@OSRELEASE@/modules/dirhash/dirhash.kmod base-obsolete obsolete
CVS commit: src/external/bsd/ntp/dist
Module Name:src
Committed By: christos
Date: Mon Dec 30 17:42:20 UTC 2013
Modified Files:
src/external/bsd/ntp/dist/include: ntp_config.h
src/external/bsd/ntp/dist/ntpd: ntp_config.c ntp_parser.y
Log Message:
put back mdstries
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/include/ntp_config.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpd/ntp_config.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpd/ntp_parser.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/include/ntp_config.h
diff -u src/external/bsd/ntp/dist/include/ntp_config.h:1.4 src/external/bsd/ntp/dist/include/ntp_config.h:1.5
--- src/external/bsd/ntp/dist/include/ntp_config.h:1.4 Fri Dec 27 22:20:13 2013
+++ src/external/bsd/ntp/dist/include/ntp_config.h Mon Dec 30 12:42:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_config.h,v 1.4 2013/12/28 03:20:13 christos Exp $ */
+/* $NetBSD: ntp_config.h,v 1.5 2013/12/30 17:42:19 christos Exp $ */
#ifndef NTP_CONFIG_H
#define NTP_CONFIG_H
@@ -241,6 +241,7 @@ struct config_tree_tag {
int_fifo * reset_counters;
sim_fifo * sim_details;
+ int mdnstries;
};
Index: src/external/bsd/ntp/dist/ntpd/ntp_config.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.7 src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.8
--- src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.7 Sun Dec 29 20:34:22 2013
+++ src/external/bsd/ntp/dist/ntpd/ntp_config.c Mon Dec 30 12:42:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_config.c,v 1.7 2013/12/30 01:34:22 christos Exp $ */
+/* $NetBSD: ntp_config.c,v 1.8 2013/12/30 17:42:19 christos Exp $ */
/* ntp_config.c
*
@@ -316,6 +316,7 @@ static void config_ntpd(config_tree *);
static void config_other_modes(config_tree *);
static void config_auth(config_tree *);
static void config_access(config_tree *);
+static void config_mdnstries(config_tree *);
static void config_phone(config_tree *);
static void config_setvar(config_tree *);
static void config_ttl(config_tree *);
@@ -393,6 +394,7 @@ init_syntax_tree(
)
{
ZERO(*ptree);
+ ptree-mdnstries = 5;
}
@@ -3040,6 +3042,16 @@ config_phone(
}
#endif /* !SIM */
+static void
+config_mdnstries(
+ config_tree *ptree
+ )
+{
+#ifdef HAVE_DNSREGISTRATION
+ extern int mdnstries;
+ mdnstries = ptree-mdnstries;
+#endif /* HAVE_DNSREGISTRATION */
+}
#ifdef FREE_CFG_T
static void
@@ -4268,6 +4280,7 @@ config_ntpd(
config_system_opts(ptree);
config_logconfig(ptree);
config_phone(ptree);
+ config_mdnstries(ptree);
config_setvar(ptree);
config_ttl(ptree);
config_trap(ptree);
Index: src/external/bsd/ntp/dist/ntpd/ntp_parser.y
diff -u src/external/bsd/ntp/dist/ntpd/ntp_parser.y:1.6 src/external/bsd/ntp/dist/ntpd/ntp_parser.y:1.7
--- src/external/bsd/ntp/dist/ntpd/ntp_parser.y:1.6 Fri Dec 27 22:20:14 2013
+++ src/external/bsd/ntp/dist/ntpd/ntp_parser.y Mon Dec 30 12:42:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_parser.y,v 1.6 2013/12/28 03:20:14 christos Exp $ */
+/* $NetBSD: ntp_parser.y,v 1.7 2013/12/30 17:42:19 christos Exp $ */
/* ntp_parser.y
*
@@ -156,6 +156,7 @@
%token Integer T_Maxdist
%token Integer T_Maxmem
%token Integer T_Maxpoll
+%token Integer T_Mdnstries
%token Integer T_Mem
%token Integer T_Memlock
%token Integer T_Minclock
@@ -523,6 +524,8 @@ other_mode_command
{ CONCAT_G_FIFOS(cfgt.manycastserver, $2); }
| T_Multicastclient address_list
{ CONCAT_G_FIFOS(cfgt.multicastclient, $2); }
+ | T_Mdnstries T_Integer
+ { cfgt.mdnstries = $2; }
;
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src
Committed By: christos
Date: Mon Dec 30 17:41:57 UTC 2013
Modified Files:
src/external/bsd/ntp/dist/ntpd: ntp_scanner.c
Log Message:
prevent coredumps from syntax errors in the config file causing negative
include indexes
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpd/ntp_scanner.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/ntpd/ntp_scanner.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_scanner.c:1.5 src/external/bsd/ntp/dist/ntpd/ntp_scanner.c:1.6
--- src/external/bsd/ntp/dist/ntpd/ntp_scanner.c:1.5 Fri Dec 27 22:20:14 2013
+++ src/external/bsd/ntp/dist/ntpd/ntp_scanner.c Mon Dec 30 12:41:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_scanner.c,v 1.5 2013/12/28 03:20:14 christos Exp $ */
+/* $NetBSD: ntp_scanner.c,v 1.6 2013/12/30 17:41:57 christos Exp $ */
/* ntp_scanner.c
@@ -504,7 +504,7 @@ yylex(
if (EOF == ch) {
- if (!input_from_file || !curr_include_level)
+ if (!input_from_file || curr_include_level = 0)
return 0;
FCLOSE(fp[curr_include_level]);
CVS commit: src/external/bsd/ntp/bin/ntpd
Module Name:src
Committed By: christos
Date: Mon Dec 30 17:48:13 UTC 2013
Modified Files:
src/external/bsd/ntp/bin/ntpd: Makefile
Log Message:
find ntp_scanner.h
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/bin/ntpd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.13 src/external/bsd/ntp/bin/ntpd/Makefile:1.14
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.13 Fri Dec 27 22:19:43 2013
+++ src/external/bsd/ntp/bin/ntpd/Makefile Mon Dec 30 12:48:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.14 2013/12/30 17:48:13 christos Exp $
.include bsd.own.mk
@@ -79,7 +79,7 @@ CWARNFLAGS.clang+= -Wno-strncat-size
DIST=${IDIST}/ntpd
-CPPFLAGS+=-I${IDIST}/include -I${IDIST}/sntp/libopts
+CPPFLAGS+=-I${IDIST}/include -I${IDIST}/sntp/libopts -I${IDIST}/ntpd
.PATH: ${DIST}
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Mon Dec 30 19:08:55 UTC 2013 Modified Files: src/external/bsd/byacc/dist: defs.h main.c output.c reader.c skeleton.c Log Message: Add support for %token-table, yytname[] and YYTRANSLATE(). ntpd(8) needs them. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/byacc/dist/defs.h cvs rdiff -u -r1.8 -r1.9 src/external/bsd/byacc/dist/main.c \ src/external/bsd/byacc/dist/reader.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/output.c cvs rdiff -u -r1.13 -r1.14 src/external/bsd/byacc/dist/skeleton.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/byacc/dist/defs.h diff -u src/external/bsd/byacc/dist/defs.h:1.6 src/external/bsd/byacc/dist/defs.h:1.7 --- src/external/bsd/byacc/dist/defs.h:1.6 Sat Apr 6 10:52:24 2013 +++ src/external/bsd/byacc/dist/defs.h Mon Dec 30 14:08:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.6 2013/04/06 14:52:24 christos Exp $ */ +/* $NetBSD: defs.h,v 1.7 2013/12/30 19:08:55 christos Exp $ */ #if HAVE_NBTOOL_CONFIG_H #include nbtool_config.h @@ -109,6 +109,7 @@ #define PARSE_PARAM 13 #define LEX_PARAM 14 #define POSIX_YACC 15 +#define TOKEN_TABLE 16 /* symbol classes */ @@ -253,6 +254,7 @@ extern int lineno; extern int outline; extern int exit_code; extern int pure_parser; +extern int token_table; extern const char *const banner[]; extern const char *const xdecls[]; Index: src/external/bsd/byacc/dist/main.c diff -u src/external/bsd/byacc/dist/main.c:1.8 src/external/bsd/byacc/dist/main.c:1.9 --- src/external/bsd/byacc/dist/main.c:1.8 Sat Apr 6 10:52:24 2013 +++ src/external/bsd/byacc/dist/main.c Mon Dec 30 14:08:55 2013 @@ -1,9 +1,9 @@ -/* $NetBSD: main.c,v 1.8 2013/04/06 14:52:24 christos Exp $ */ +/* $NetBSD: main.c,v 1.9 2013/12/30 19:08:55 christos Exp $ */ #include defs.h #include sys/cdefs.h -__RCSID($NetBSD: main.c,v 1.8 2013/04/06 14:52:24 christos Exp $); +__RCSID($NetBSD: main.c,v 1.9 2013/12/30 19:08:55 christos Exp $); /* Id: main.c,v 1.40 2012/09/29 13:11:00 Adrian.Bunk Exp */ #include signal.h @@ -93,6 +93,7 @@ short *symbol_prec; char *symbol_assoc; int pure_parser; +int token_table; int exit_code; Value_t *ritem; Index: src/external/bsd/byacc/dist/reader.c diff -u src/external/bsd/byacc/dist/reader.c:1.8 src/external/bsd/byacc/dist/reader.c:1.9 --- src/external/bsd/byacc/dist/reader.c:1.8 Sat Apr 6 10:52:24 2013 +++ src/external/bsd/byacc/dist/reader.c Mon Dec 30 14:08:55 2013 @@ -1,11 +1,11 @@ -/* $NetBSD: reader.c,v 1.8 2013/04/06 14:52:24 christos Exp $ */ +/* $NetBSD: reader.c,v 1.9 2013/12/30 19:08:55 christos Exp $ */ /* Id: reader.c,v 1.36 2012/05/26 16:05:41 tom Exp */ #include defs.h #include sys/cdefs.h -__RCSID($NetBSD: reader.c,v 1.8 2013/04/06 14:52:24 christos Exp $); +__RCSID($NetBSD: reader.c,v 1.9 2013/12/30 19:08:55 christos Exp $); /* The line size must be a positive integer. One hundred was chosen */ /* because few lines in Yacc input grammars exceed 100 characters. */ @@ -322,6 +322,8 @@ keyword(void) return (PARSE_PARAM); if (matchec(lex-param)) return (LEX_PARAM); + if (matchec(token-table)) + return (TOKEN_TABLE); if (matchec(yacc)) return (POSIX_YACC); } @@ -1307,6 +1309,10 @@ read_declarations(void) copy_param(k); break; + case TOKEN_TABLE: + token_table = 1; + break; + case POSIX_YACC: /* noop for bison compatibility. byacc is already designed to be posix * yacc compatible. */ Index: src/external/bsd/byacc/dist/output.c diff -u src/external/bsd/byacc/dist/output.c:1.9 src/external/bsd/byacc/dist/output.c:1.10 --- src/external/bsd/byacc/dist/output.c:1.9 Sat Apr 6 10:52:24 2013 +++ src/external/bsd/byacc/dist/output.c Mon Dec 30 14:08:55 2013 @@ -1,11 +1,11 @@ -/* $NetBSD: output.c,v 1.9 2013/04/06 14:52:24 christos Exp $ */ +/* $NetBSD: output.c,v 1.10 2013/12/30 19:08:55 christos Exp $ */ /* Id: output.c,v 1.45 2013/03/05 00:29:17 tom Exp */ #include defs.h #include sys/cdefs.h -__RCSID($NetBSD: output.c,v 1.9 2013/04/06 14:52:24 christos Exp $); +__RCSID($NetBSD: output.c,v 1.10 2013/12/30 19:08:55 christos Exp $); #define StaticOrR (rflag ? : static ) #define CountLine(fp) (!rflag || ((fp) == code_file)) @@ -116,7 +116,7 @@ output_prefix(FILE * fp) define_prefixed(fp, yygindex); define_prefixed(fp, yytable); define_prefixed(fp, yycheck); - define_prefixed(fp, yyname); + define_prefixed(fp, yytname); define_prefixed(fp, yyrule); } if (CountLine(fp)) @@ -926,23 +926,27 @@ output_debug(void) ++outline; fprintf(code_file, #define YYMAXTOKEN %d\n, max); +fprintf(code_file, #define YYTRANSLATE(a) ((a) YYMAXTOKEN ? + (YYMAXTOKEN + 1) : (a))\n); -symnam = TMALLOC(const char *, max + 1); +symnam = TMALLOC(const char *, max + 2);
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src Committed By: jakllsch Date: Mon Dec 30 21:45:51 UTC 2013 Modified Files: src/sys/arch/i386/stand/lib: exec.c Log Message: Zero out on-stack 'marks' array before first use. This is needed so the MARK_DATA index is properly filled in. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/i386/stand/lib/exec.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/i386/stand/lib/exec.c diff -u src/sys/arch/i386/stand/lib/exec.c:1.55 src/sys/arch/i386/stand/lib/exec.c:1.56 --- src/sys/arch/i386/stand/lib/exec.c:1.55 Wed Nov 27 18:29:45 2013 +++ src/sys/arch/i386/stand/lib/exec.c Mon Dec 30 21:45:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: exec.c,v 1.55 2013/11/27 18:29:45 jakllsch Exp $ */ +/* $NetBSD: exec.c,v 1.56 2013/12/30 21:45:51 jakllsch Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -362,6 +362,8 @@ exec_netbsd(const char *file, physaddr_t howto = boothowto; + memset(marks, 0, sizeof(marks)); + if (common_load_kernel(file, basemem, extmem, loadaddr, floppy, marks)) goto out;
CVS commit: src/sys/external/bsd/acpica/dist/compiler
Module Name:src Committed By: christos Date: Mon Dec 30 22:32:45 UTC 2013 Modified Files: src/sys/external/bsd/acpica/dist/compiler: aslcompiler.y dtparser.y prparser.y Log Message: Now that our yacc supports providing yytname[] and does the name protection automatically (as it should, unlike bison), elide the name protection hacks. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y cvs rdiff -u -r1.1.1.2 -r1.2 \ src/sys/external/bsd/acpica/dist/compiler/dtparser.y cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/acpica/dist/compiler/prparser.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y:1.1.1.4 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y:1.2 --- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y:1.1.1.4 Fri Dec 27 13:46:05 2013 +++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y Mon Dec 30 17:32:45 2013 @@ -72,7 +72,9 @@ void * AslLocalAllo #define static #undef alloca #define alloca AslLocalAllocate +#ifndef yytname #define yytname AslCompilername +#endif #define YYINITDEPTH 600 /* State stack depth */ #define YYDEBUG 1 /* Enable debug output */ Index: src/sys/external/bsd/acpica/dist/compiler/dtparser.y diff -u src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.1.1.2 src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.2 --- src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.1.1.2 Fri Dec 27 13:46:09 2013 +++ src/sys/external/bsd/acpica/dist/compiler/dtparser.y Mon Dec 30 17:32:45 2013 @@ -58,7 +58,9 @@ UINT64 DtParserResu /* Bison/yacc configuration */ +#ifndef yytname #define yytname DtParsername +#endif #define YYDEBUG 1 /* Enable debug output */ #define YYERROR_VERBOSE 1 /* Verbose error messages */ #define YYFLAG -32768 Index: src/sys/external/bsd/acpica/dist/compiler/prparser.y diff -u src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.1.1.1 src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.2 --- src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.1.1.1 Fri Dec 27 13:46:10 2013 +++ src/sys/external/bsd/acpica/dist/compiler/prparser.y Mon Dec 30 17:32:45 2013 @@ -57,7 +57,9 @@ UINT64 PrParserResu /* Bison/yacc configuration */ +#ifndef yytname #define yytname PrParsername +#endif #define YYDEBUG 1 /* Enable debug output */ #define YYERROR_VERBOSE 1 /* Verbose error messages */ #define YYFLAG -32768
CVS commit: src/usr.bin/rump_allserver
Module Name:src Committed By: pooka Date: Tue Dec 31 00:23:56 UTC 2013 Modified Files: src/usr.bin/rump_allserver: rump_allserver.c Log Message: Use signal.h instead of sys/signal.h. The latter is not standard and does not exist at least on systems with musl libc. from Justin Cormack To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.bin/rump_allserver/rump_allserver.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/rump_allserver/rump_allserver.c diff -u src/usr.bin/rump_allserver/rump_allserver.c:1.32 src/usr.bin/rump_allserver/rump_allserver.c:1.33 --- src/usr.bin/rump_allserver/rump_allserver.c:1.32 Wed Dec 18 20:56:32 2013 +++ src/usr.bin/rump_allserver/rump_allserver.c Tue Dec 31 00:23:56 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_allserver.c,v 1.32 2013/12/18 20:56:32 pooka Exp $ */ +/* $NetBSD: rump_allserver.c,v 1.33 2013/12/31 00:23:56 pooka Exp $ */ /*- * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -28,17 +28,17 @@ #include rump/rumpuser_port.h #ifndef lint -__RCSID($NetBSD: rump_allserver.c,v 1.32 2013/12/18 20:56:32 pooka Exp $); +__RCSID($NetBSD: rump_allserver.c,v 1.33 2013/12/31 00:23:56 pooka Exp $); #endif /* !lint */ #include sys/types.h -#include sys/signal.h #include sys/stat.h #include dlfcn.h #include errno.h #include fcntl.h #include semaphore.h +#include signal.h #include stdio.h #include stdlib.h #include stdint.h
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Tue Dec 31 00:25:17 UTC 2013
Modified Files:
src/lib/librumpuser: sp_common.c
Log Message:
Do not export symbols which don't need to be exported.
via Justin Cormack
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/lib/librumpuser/sp_common.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/sp_common.c
diff -u src/lib/librumpuser/sp_common.c:1.36 src/lib/librumpuser/sp_common.c:1.37
--- src/lib/librumpuser/sp_common.c:1.36 Mon Jan 14 21:00:16 2013
+++ src/lib/librumpuser/sp_common.c Tue Dec 31 00:25:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sp_common.c,v 1.36 2013/01/14 21:00:16 pooka Exp $ */
+/* $NetBSD: sp_common.c,v 1.37 2013/12/31 00:25:17 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -714,7 +714,7 @@ success(void)
return 0;
}
-struct {
+static struct {
const char *id;
int domain;
socklen_t slen;
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Tue Dec 31 01:55:05 UTC 2013 Modified Files: src/share/man/man9: opencrypto.9 Log Message: Clear up documentation for crypto_unregister() vs crypto_unregister_all() since there is no definition of CRYPTO_ALGORITHM_ALL! XXX The description of the arguments for crypto_register() needs further updates, too, but that will be left for another day. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man9/opencrypto.9 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/man9/opencrypto.9 diff -u src/share/man/man9/opencrypto.9:1.13 src/share/man/man9/opencrypto.9:1.14 --- src/share/man/man9/opencrypto.9:1.13 Sat Jul 20 21:39:59 2013 +++ src/share/man/man9/opencrypto.9 Tue Dec 31 01:55:05 2013 @@ -1,5 +1,5 @@ .\ $OpenBSD: crypto.9,v 1.25 2003/07/11 13:47:41 jmc Exp $ -.\ $NetBSD: opencrypto.9,v 1.13 2013/07/20 21:39:59 wiz Exp $ +.\ $NetBSD: opencrypto.9,v 1.14 2013/12/31 01:55:05 pgoyette Exp $ .\ .\ The author of this man page is Angelos D. Keromytis (ange...@cis.upenn.edu) .\ @@ -16,7 +16,7 @@ .\ MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR .\ PURPOSE. .\ -.Dd September 17, 2011 +.Dd December 30, 2013 .Dt OPENCRYPTO 9 .Os .Sh NAME @@ -25,6 +25,7 @@ .Nm crypto_register , .Nm crypto_kregister , .Nm crypto_unregister , +.Nm crypto_unregister_all , .Nm crypto_done , .Nm crypto_kdone , .Nm crypto_newsession , @@ -44,6 +45,8 @@ .Fn crypto_kregister u_int32_t int u_int32_t int (*)(void *, struct cryptkop *, int) void * .Ft int .Fn crypto_unregister u_int32_t int +.Ft int +.Fn crypto_unregister_all u_int32_t .Ft void .Fn crypto_done struct cryptop * .Ft void @@ -475,6 +478,7 @@ The .Fn crypto_register , .Fn crypto_kregister , .Fn crypto_unregister , +.Fn crypto_unregister_all , and .Fn crypto_done routines are used by drivers that provide support for cryptographic @@ -500,18 +504,13 @@ etc.) .Fn crypto_unregister is called by drivers that wish to withdraw support for an algorithm. The two arguments are the driver and algorithm identifiers, respectively. -Typically, drivers for -.Xr pcmcia 4 -crypto cards that are being ejected will invoke this routine for all algorithms supported by the card. -If called with -.Dv CRYPTO_ALGORITHM_ALL , -all algorithms registered for a driver will be unregistered in one go -and the driver will be disabled (no new sessions will be allocated on -that driver, and any existing sessions will be migrated to other -drivers). -The same will be done if all algorithms associated with a driver are -unregistered one by one. +If all algorithms associated with a driver are unregistered, the +driver will be disabled (no new sessions will be allocated on that +driver, and any existing sessions will be migrated to other drivers). +.Fn crypto_unregister_all +will unregister all registered algorithms, disable the driver, +and migrate existing sessions to other drivers. .Pp The calling convention for the three driver-supplied routines is: .Bd -literal
