diff --git a/NEWS b/NEWS index 0a90e21..df85351 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,24 @@ changes in installation instructions. Packagers should also reread the PACKAGING file each version (or do a diff between the old and new versions of the package and read that). +Version 2.10 (2000-02-12) +============ + +* Avoid world-readable characs file in phantasia. Note the new +configuration question which will need an appropriate answer, +especially if packaging for a distribution. + +* Various minor bugfixes. + +* Essentially all relevant changes, except to hunt (which will +eventually be replaced by the OpenBSD version), now merged back into +NetBSD. + +* Some minor changes from NetBSD CVS of 2000-02-12. + +* No new bsd-games-non-free version; bsd-games-non-free 2.8 is still +current. + Version 2.9 (1999-11-12) =========== diff --git a/THANKS b/THANKS index fc2dd77..3213503 100644 --- a/THANKS +++ b/THANKS @@ -46,6 +46,10 @@ Stuart Lamble For a bug report and analysis (with patch) about scoring in backgammon. +Malcolm Parsons + + For several bug reports and fixes. + For the original bsd-games package (versions up to 1.3): Special Thanks to: diff --git a/configure b/configure index 7a5d216..f90a91d 100755 --- a/configure +++ b/configure @@ -283,6 +283,8 @@ askperms "Manpage" manpage root root 0644 askperms "Constant data" constdata root root 0644 askperms "Variable data" vardata root root 0644 # or 0666? +ask "Permissions on variable data that should not be world readable" vardata_perms_priv 0640 + use_dot_so= while test x$use_dot_so = x; do ask "Use .so or symlinks for manpages" use_dot_so .so diff --git a/debian/changelog b/debian/changelog index 9f93bd5..4d6ad48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bsdgames (2.10-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Sat, 12 Feb 2000 16:35:11 -0800 + bsdgames (2.9-4) unstable; urgency=low * Built with ncurses5, Closes: #55448 diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c index 877d243..dc0e130 100644 --- a/hunt/hunt/hunt.c +++ b/hunt/hunt/hunt.c @@ -1,4 +1,4 @@ -/* $NetBSD: hunt.c,v 1.8 1998/09/13 15:27:28 hubertf Exp $ */ +/* $NetBSD: hunt.c,v 1.9 2000/01/21 17:08:33 mycroft Exp $ */ /* * Hunt * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold @@ -7,7 +7,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hunt.c,v 1.8 1998/09/13 15:27:28 hubertf Exp $"); +__RCSID("$NetBSD: hunt.c,v 1.9 2000/01/21 17:08:33 mycroft Exp $"); #endif /* not lint */ # include diff --git a/random/random.c b/random/random.c index 3e3b5ec..381daa8 100644 --- a/random/random.c +++ b/random/random.c @@ -1,4 +1,4 @@ -/* $NetBSD: random.c,v 1.6 1999/09/08 21:45:29 jsm Exp $ */ +/* $NetBSD: random.c,v 1.7 2000/01/18 16:12:25 jsm Exp $ */ /* * Copyright (c) 1994 @@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\n\ #if 0 static char sccsid[] = "@(#)random.c 8.6 (Berkeley) 6/1/94"; #else -__RCSID("$NetBSD: random.c,v 1.6 1999/09/08 21:45:29 jsm Exp $"); +__RCSID("$NetBSD: random.c,v 1.7 2000/01/18 16:12:25 jsm Exp $"); #endif #endif /* not lint */ @@ -61,6 +61,8 @@ __RCSID("$NetBSD: random.c,v 1.6 1999/09/08 21:45:29 jsm Exp $"); #include #include +#define MAXRANDOM 2147483647 + int main __P((int, char **)); void usage __P((void)) __attribute__((__noreturn__)); @@ -118,7 +120,7 @@ main(argc, argv) /* Compute a random exit status between 0 and denom - 1. */ if (random_exit) - return ((denom * random()) / RAND_MAX); + return ((denom * random()) / MAXRANDOM); /* * Act as a filter, randomly choosing lines of the standard input @@ -133,7 +135,7 @@ main(argc, argv) * 0 (which has a 1 / denom chance of being true), we select the * line. */ - selected = (int)(denom * random() / RAND_MAX) == 0; + selected = (int)(denom * random() / MAXRANDOM) == 0; while ((ch = getchar()) != EOF) { if (selected) (void)putchar(ch); @@ -143,7 +145,7 @@ main(argc, argv) err(2, "stdout"); /* Now see if the next line is to be printed. */ - selected = (int)(denom * random() / RAND_MAX) == 0; + selected = (int)(denom * random() / MAXRANDOM) == 0; } } if (ferror(stdin)) diff --git a/robots/main.c b/robots/main.c index 8a2ddc4..b585040 100644 --- a/robots/main.c +++ b/robots/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.12 1999/10/04 23:27:02 lukem Exp $ */ +/* $NetBSD: main.c,v 1.15 2000/01/19 19:43:42 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.12 1999/10/04 23:27:02 lukem Exp $"); +__RCSID("$NetBSD: main.c,v 1.15 2000/01/19 19:43:42 jsm Exp $"); #endif #endif /* not lint */ diff --git a/robots/score.c b/robots/score.c index ba40bac..cd6542a 100644 --- a/robots/score.c +++ b/robots/score.c @@ -1,4 +1,4 @@ -/* $NetBSD: score.c,v 1.11 1999/09/18 19:38:54 jsm Exp $ */ +/* $NetBSD: score.c,v 1.12 2000/01/20 13:24:11 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: score.c,v 1.11 1999/09/18 19:38:54 jsm Exp $"); +__RCSID("$NetBSD: score.c,v 1.12 2000/01/20 13:24:11 jsm Exp $"); #endif #endif /* not lint */ diff --git a/sail/sync.c b/sail/sync.c index d36b323..b9e825d 100644 --- a/sail/sync.c +++ b/sail/sync.c @@ -1,4 +1,4 @@ -/* $NetBSD: sync.c,v 1.13 1999/09/09 17:30:20 jsm Exp $ */ +/* $NetBSD: sync.c,v 1.14 2000/02/09 22:27:56 jsm Exp $ */ /* * Copyright (c) 1983, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)sync.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: sync.c,v 1.13 1999/09/09 17:30:20 jsm Exp $"); +__RCSID("$NetBSD: sync.c,v 1.14 2000/02/09 22:27:56 jsm Exp $"); #endif #endif /* not lint */ diff --git a/tetris/scores.c b/tetris/scores.c index 891478e..131291e 100644 --- a/tetris/scores.c +++ b/tetris/scores.c @@ -1,4 +1,4 @@ -/* $NetBSD: scores.c,v 1.8 1999/09/18 19:38:55 jsm Exp $ */ +/* $NetBSD: scores.c,v 1.10 2000/01/21 02:10:56 jsm Exp $ */ /*- * Copyright (c) 1992, 1993 diff --git a/tetris/tetris.c b/tetris/tetris.c index 2bddf2c..1a2e0eb 100644 --- a/tetris/tetris.c +++ b/tetris/tetris.c @@ -1,4 +1,4 @@ -/* $NetBSD: tetris.c,v 1.12 1999/09/12 09:02:24 jsm Exp $ */ +/* $NetBSD: tetris.c,v 1.14 2000/01/21 02:10:57 jsm Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -50,6 +50,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\ #include +#include #include #include #include @@ -159,10 +160,8 @@ main(argc, argv) case 'l': level = atoi(optarg); if (level < MINLEVEL || level > MAXLEVEL) { - (void)fprintf(stderr, - "tetris-bsd: level must be from %d to %d\n", - MINLEVEL, MAXLEVEL); - exit(1); + errx(1, "tetris-bsd: level must be from %d to %d", + MINLEVEL, MAXLEVEL); } break; case 'p': @@ -187,10 +186,7 @@ main(argc, argv) for (i = 0; i <= 5; i++) { for (j = i+1; j <= 5; j++) { if (keys[i] == keys[j]) { - (void)fprintf(stderr, - "%s: duplicate command keys specified.\n", - argv[0]); - exit (1); + errx(1, "duplicate command keys specified."); } } if (keys[i] == ' ')