2003-03-28 Joseph S. Myers <[email protected]>

	* Makefile.bsd, Makefile.inc.bsd, adventure/Makefile.bsd,
	arithmetic/arithmetic.6, arithmetic/arithmetic.c, atc/atc.6.in,
	backgammon/backgammon/backgammon.6.in,
	backgammon/common_source/Makefile.bsd,
	backgammon/teachgammon/Makefile.bsd, banner/banner.6,
	battlestar/battlestar.6, bcd/bcd.6, boggle/Makefile.bsd,
	boggle/boggle/boggle.6, boggle/boggle/timer.c,
	boggle/mkdict/Makefile.bsd, boggle/mkindex/Makefile.bsd,
	caesar/caesar.6, canfield/canfield/canfield.6.in,
	canfield/cfscores/Makefile.bsd, countmail/countmail,
	countmail/countmail.6, cribbage/cribbage.6.in,
	cribbage/cribbage.h, cribbage/extern.c, cribbage/io.c,
	cribbage/score.c, cribbage/support.c, dm/Makefile.bsd, dm/dm.8.in,
	dm/dm.c, dm/dm.conf.5.in, factor/Makefile.bsd, factor/factor.6,
	factor/factor.c, fortune/datfiles/Makefile.bsd,
	fortune/datfiles/fortunes, fortune/datfiles/fortunes2,
	fortune/datfiles/fortunes2-o.real, fortune/datfiles/limerick,
	fortune/datfiles/netbsd, fortune/fortune/fortune.6.in,
	fortune/fortune/fortune.c, fortune/strfile/strfile.8,
	fortune/unstr/Makefile.bsd, gomoku/gomoku.6, hack/Makefile.bsd,
	hack/extern.h, hack/hack.6.in, hack/hack.main.c,
	hack/hack.mkshop.c, hack/hack.pri.c, hack/hack.topl.c,
	hack/hack.tty.c, hack/help, hangman/hangman.6.in,
	hunt/Makefile.inc.bsd, hunt/hunt/hunt.6.in, hunt/hunt/hunt.c,
	hunt/hunt/playit.c, hunt/huntd/answer.c, hunt/huntd/bsd.h,
	hunt/huntd/ctl_transact.c, hunt/huntd/driver.c,
	hunt/huntd/extern.c, hunt/huntd/faketalk.c, hunt/huntd/hunt.h,
	hunt/huntd/huntd.6.in, hunt/huntd/terminal.c, mille/mille.6,
	mille/misc.c, monop/Makefile.bsd, monop/cards.c, monop/getinp.c,
	monop/monop.6.in, monop/roll.c, morse/Makefile.bsd,
	phantasia/Makefile.bsd, phantasia/misc.c, phantasia/phantasia.6,
	pom/pom.6, ppt/Makefile.bsd, ppt/ppt.c, primes/Makefile.bsd,
	quiz/datfiles/posneg, quiz/quiz.6.in, quiz/rxp.c, rain/rain.6,
	random/random.6, robots/auto.c, robots/init_field.c,
	robots/move.c, robots/robots.6.in, robots/robots.h,
	rogue/Makefile.bsd, rogue/USD.doc/Makefile.bsd, rogue/hit.c,
	rogue/inventory.c, rogue/level.c, rogue/message.c,
	rogue/rogue.6.in, rogue/rogue.h, rogue/save.c, rogue/score.c,
	sail/sail.6, snake/snake/snake.6.in, snake/snscore/Makefile.bsd,
	tetris/input.c, tetris/scores.c, tetris/screen.c, tetris/shapes.c,
	tetris/tetris.6.in, tetris/tetris.c, trek/USD.doc/Makefile.bsd,
	trek/damage.c, trek/getpar.c, trek/trek.6.in, wargames/wargames.6,
	worm/worm.6, worms/worms.6, wtf/acronyms, wtf/wtf.in,
	wtf/wtf.6.in: Update from NetBSD CVS.
	* include/sys/poll.h: New file.
	* lib/strlcpy.c: New file.
	* configure: Test for strlcpy.
	* include/string.h: New file.
	* exec.objs: Use it for rogue.
	* trek/trek.6.in: Rename to trek.6.
	* substfiles2: Update.
	* COPYING: Update.
	* INSTALL: No longer suggest not using groff's macros.
	* PACKAGING: Update.
	* SECURITY: Update.

COPYING

@@ -160,6 +160,34 @@ Hess:
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    SUCH DAMAGE.
 
+In the case of "lib/strlcpy.c", the copyright is held by Todd
+C. Miller:
+
+   Copyright (c) 1998 Todd C. Miller <[email protected]>
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+   3. The name of the author may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+   AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+   THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 The game "atc" bears additional notices in the name of Ed James:
 
    Copyright (c) 1987 by Ed James, UC Berkeley.  All rights reserved.
@@ -267,7 +295,7 @@ insofar as they get compiled into the games; note that the include
 files are probably irrelevant for this purpose as it is unlikely they
 are significant enough to make any binary a derived work).
 
-   Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 Joseph Samuel Myers.
+   Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Joseph Samuel Myers.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
@@ -315,7 +343,7 @@ the compilation copyright on the package as a whole; ***this has yet
 to be confirmed with Andy Tefft***:
 
    Copyright (c) 1993 Curt Olson, Andy Tefft.
-   Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 Joseph Samuel Myers.
+   Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Joseph Samuel Myers.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without

ChangeLog

@@ -1,3 +1,61 @@
+2003-03-28  Joseph S. Myers  <[email protected]>
+
+	* Makefile.bsd, Makefile.inc.bsd, adventure/Makefile.bsd,
+	arithmetic/arithmetic.6, arithmetic/arithmetic.c, atc/atc.6.in,
+	backgammon/backgammon/backgammon.6.in,
+	backgammon/common_source/Makefile.bsd,
+	backgammon/teachgammon/Makefile.bsd, banner/banner.6,
+	battlestar/battlestar.6, bcd/bcd.6, boggle/Makefile.bsd,
+	boggle/boggle/boggle.6, boggle/boggle/timer.c,
+	boggle/mkdict/Makefile.bsd, boggle/mkindex/Makefile.bsd,
+	caesar/caesar.6, canfield/canfield/canfield.6.in,
+	canfield/cfscores/Makefile.bsd, countmail/countmail,
+	countmail/countmail.6, cribbage/cribbage.6.in,
+	cribbage/cribbage.h, cribbage/extern.c, cribbage/io.c,
+	cribbage/score.c, cribbage/support.c, dm/Makefile.bsd, dm/dm.8.in,
+	dm/dm.c, dm/dm.conf.5.in, factor/Makefile.bsd, factor/factor.6,
+	factor/factor.c, fortune/datfiles/Makefile.bsd,
+	fortune/datfiles/fortunes, fortune/datfiles/fortunes2,
+	fortune/datfiles/fortunes2-o.real, fortune/datfiles/limerick,
+	fortune/datfiles/netbsd, fortune/fortune/fortune.6.in,
+	fortune/fortune/fortune.c, fortune/strfile/strfile.8,
+	fortune/unstr/Makefile.bsd, gomoku/gomoku.6, hack/Makefile.bsd,
+	hack/extern.h, hack/hack.6.in, hack/hack.main.c,
+	hack/hack.mkshop.c, hack/hack.pri.c, hack/hack.topl.c,
+	hack/hack.tty.c, hack/help, hangman/hangman.6.in,
+	hunt/Makefile.inc.bsd, hunt/hunt/hunt.6.in, hunt/hunt/hunt.c,
+	hunt/hunt/playit.c, hunt/huntd/answer.c, hunt/huntd/bsd.h,
+	hunt/huntd/ctl_transact.c, hunt/huntd/driver.c,
+	hunt/huntd/extern.c, hunt/huntd/faketalk.c, hunt/huntd/hunt.h,
+	hunt/huntd/huntd.6.in, hunt/huntd/terminal.c, mille/mille.6,
+	mille/misc.c, monop/Makefile.bsd, monop/cards.c, monop/getinp.c,
+	monop/monop.6.in, monop/roll.c, morse/Makefile.bsd,
+	phantasia/Makefile.bsd, phantasia/misc.c, phantasia/phantasia.6,
+	pom/pom.6, ppt/Makefile.bsd, ppt/ppt.c, primes/Makefile.bsd,
+	quiz/datfiles/posneg, quiz/quiz.6.in, quiz/rxp.c, rain/rain.6,
+	random/random.6, robots/auto.c, robots/init_field.c,
+	robots/move.c, robots/robots.6.in, robots/robots.h,
+	rogue/Makefile.bsd, rogue/USD.doc/Makefile.bsd, rogue/hit.c,
+	rogue/inventory.c, rogue/level.c, rogue/message.c,
+	rogue/rogue.6.in, rogue/rogue.h, rogue/save.c, rogue/score.c,
+	sail/sail.6, snake/snake/snake.6.in, snake/snscore/Makefile.bsd,
+	tetris/input.c, tetris/scores.c, tetris/screen.c, tetris/shapes.c,
+	tetris/tetris.6.in, tetris/tetris.c, trek/USD.doc/Makefile.bsd,
+	trek/damage.c, trek/getpar.c, trek/trek.6.in, wargames/wargames.6,
+	worm/worm.6, worms/worms.6, wtf/acronyms, wtf/wtf.in,
+	wtf/wtf.6.in: Update from NetBSD CVS.
+	* include/sys/poll.h: New file.
+	* lib/strlcpy.c: New file.
+	* configure: Test for strlcpy.
+	* include/string.h: New file.
+	* exec.objs: Use it for rogue.
+	* trek/trek.6.in: Rename to trek.6.
+	* substfiles2: Update.
+	* COPYING: Update.
+	* INSTALL: No longer suggest not using groff's macros.
+	* PACKAGING: Update.
+	* SECURITY: Update.
+
 2002-06-18  Joseph S. Myers  <[email protected]>
 
 	* BUGS, ChangeLog, INSTALL, README, README.non-free, SECURITY,

INSTALL

@@ -72,12 +72,6 @@ versions may produce many warnings in the system headers; these
 generally represent bugs in the headers whose only impact is cosmetic,
 and can be ignored.
 
-Some man pages may look better with the tmac.doc macros from NetBSD,
-rather than the older ones distributed with groff.  If any man pages
-look funny or appear to have words missing (especially the program
-name or a reference to NetBSD), having older tmac.doc may be the
-cause.
-
 Security
 ========
 

Makefile.bsd

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 1999/07/22 01:09:00 mrg Exp $
+#	$NetBSD: Makefile,v 1.20 2002/06/16 22:24:00 itojun Exp $
 #	@(#)Makefile	8.3 (Berkeley) 7/24/94
 
 # Missing: ching dungeon warp

Makefile.inc.bsd

@@ -1,16 +1,22 @@
-#	$NetBSD: Makefile.inc,v 1.9 1997/11/20 00:12:30 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.11 2002/01/27 00:35:16 perry Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
 
-.if defined(HIDEGAME) && defined(PROG)
-BINDIR?=	/usr/games/hide
-BINGRP?=	games
+MKHIDEGAME?=	no
+
+.if defined(HIDEGAME) && (MKHIDEGAME!=no) && defined(PROG)
+BINDIR=		/usr/games/hide
+BINGRP=		games
 .if defined(SETGIDGAME)
-BINMODE?=	2550
+BINMODE=	2550
 .else
-BINMODE?=	550
+BINMODE=	550
 .endif
 SYMLINKS+=	dm /usr/games/${PROG}
 .else
-BINDIR?=	/usr/games
+BINDIR=		/usr/games
+.if defined(SETGIDGAME)
+BINGRP=		games
+BINMODE=	2555
+.endif
 .endif
 WARNS?=		1

PACKAGING

@@ -55,8 +55,7 @@ BSD Users' Supplementary Documents for trek and rogue
 versions thereof), the AUTHORS and THANKS files, and the year 2000
 statement YEAR2000.  Note that the trek manpage contains a reference
 to /usr/doc/trek, which should be updated to point to where you put
-trek.me or a formatted version.  As noted below, it is better to
-update trek.6.in (before configure) than trek.6.
+trek.me or a formatted version.
 
 Assuming you distribute source for your package (I do not believe any
 of the games have licences requiring this), and separate your patches

SECURITY

@@ -22,7 +22,8 @@ sail, rogue, hack and tetris do not currently handle their score files
 in the above way, and so should be considered the most dangerous to
 install setgid.  If you are auditing these games, phantasia, sail,
 rogue, hack and tetris should be considered the most important to
-audit.
+audit.  In versions before 2.14, rogue had an exploitable buffer
+overrun (see NetBSD Security Advisory 2002-021).
 
 An effect of this security policy is that in some cases the score
 files need to be world-readable so that they can be opened for reading

adventure/Makefile.bsd

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2000/04/24 15:15:05 pk Exp $
+#	$NetBSD: Makefile,v 1.9 2002/03/05 21:28:12 thorpej Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/12/93
 
 PROG=	adventure
@@ -8,7 +8,7 @@ HIDEGAME=hidegame
 CLEANFILES+=setup data.c
 
 data.c: glorkz setup
-	${.OBJDIR}/setup ${.CURDIR}/glorkz > data.c
+	./setup ${.CURDIR}/glorkz > data.c
 
 setup: setup.c hdr.h
 	${HOST_LINK.c} -o setup ${.CURDIR}/setup.c

arithmetic/arithmetic.6

@@ -1,4 +1,4 @@
-.\"	$NetBSD: arithmetic.6,v 1.8 2001/04/02 22:42:37 wiz Exp $
+.\"	$NetBSD: arithmetic.6,v 1.9 2002/09/26 18:31:58 wiz Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -81,7 +81,8 @@ divide by or subtract will be between 0 and
 .Ar range .
 (Of course,
 .Nm
-will not ask you to divide by 0.)  The default
+will not ask you to divide by 0.)
+The default
 .I range
 is 10.
 .El

arithmetic/arithmetic.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: arithmetic.c,v 1.17 2001/02/19 22:41:45 cgd Exp $	*/
+/*	$NetBSD: arithmetic.c,v 1.18 2002/03/31 04:07:22 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)arithmetic.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: arithmetic.c,v 1.17 2001/02/19 22:41:45 cgd Exp $");
+__RCSID("$NetBSD: arithmetic.c,v 1.18 2002/03/31 04:07:22 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -94,7 +94,7 @@ int	main __P((int, char *[]));
 int	opnum __P((int));
 void	penalise __P((int, int, int));
 int	problem __P((void));
-void	showstats __P((void));
+void	showstats __P((int));
 void	usage __P((void)) __attribute__((__noreturn__));
 
 const char keylist[] = "+-x/";
@@ -157,7 +157,7 @@ main(argc, argv)
 		for (cnt = NQUESTS; cnt--;)
 			if (problem() == EOF)
 				exit(0);
-		showstats();
+		showstats(0);
 	}
 	/* NOTREACHED */
 }
@@ -167,13 +167,14 @@ void
 intr(dummy)
 	int dummy __attribute__((__unused__));
 {
-	showstats();
+	showstats(1);
 	exit(0);
 }
 
 /* Print score.  Original `arithmetic' had a delay after printing it. */
 void
-showstats()
+showstats(bool_sigint)
+	int bool_sigint;
 {
 	if (nright + nwrong > 0) {
 		(void)printf("\n\nRights %d; Wrongs %d; Score %d%%",
@@ -182,6 +183,10 @@ showstats()
 	(void)printf("\nTotal time %ld seconds; %.1f seconds per problem\n\n",
 			    (long)qtime, (float)qtime / nright);
 	}
+	if(!bool_sigint) {
+		(void)printf("Press RETURN to continue...\n");
+		while(!getchar()) ;
+	}
 	(void)printf("\n");
 }