aniani/bsdgames
1
0
Fork 0
mirror of https://salsa.debian.org/games-team/bsdgames synced 2024-12-04 14:46:22 -05:00
Code

Imported Debian patch 2.17-20

Browse Source
This commit is contained in:
Tobias Quathamer 2012-02-25 17:11:48 +01:00
parent 67c3580fe1
commit a4f6c1fa94
29 changed files with 1224 additions and 1157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/changelog vendored
View File

@ -1,3 +1,23 @@
bsdgames (2.17-20) unstable; urgency=low
* Set maintainer to Debian Games Team, add myself as uploader
* Add git repository to debian/control
* rain: Update default delay. Closes: #579062
* quiz: Add answers to adults/babies. Closes: #659528
* primes: Document maximum number in manpage. Closes: #636569
* primes: Updated to NetBSD CVS as of 2012-02-16
* wtf: Add NMU. Closes: #574036
* hangman: Error out on 1000 unsuitable words. Closes: #610270
* Rename files in debian/patches, managed now with gbp-pq
* Remove Conflicts/Replaces on bsdgames-nonfree (<< 2.14) from
debian/control, that version is long gone now
* Remove Build-Depends on dpkg-dev (>= 1.9.0)
* Use set -e in postinst, postrm, and preinst
* Fix some typos spotted by Lintian
* Update to Standards-Version 3.9.3
-- Tobias Quathamer <toddy@debian.org> Sat, 25 Feb 2012 17:11:48 +0100
bsdgames (2.17-19) unstable; urgency=low
* debian/patches/define-dead.diff:

2
debian/compat vendored
View File

@ -1 +1 @@
7
8

13
debian/control vendored
View File

@ -1,16 +1,17 @@
Source: bsdgames
Section: games
Priority: optional
Build-Depends: debhelper (>= 7), libncurses5-dev, flex, bison,
wamerican, wbritish, dpkg-dev (>= 1.9.0)
Maintainer: Tobias Quathamer <toddy@debian.org>
Standards-Version: 3.8.3
Build-Depends: debhelper (>= 8), libncurses5-dev, flex, bison,
wamerican, wbritish
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Uploaders: Tobias Quathamer <toddy@debian.org>
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-games/bsdgames.git
Vcs-Browser: http://git.debian.org/?p=pkg-games/bsdgames.git
Package: bsdgames
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, wamerican | wordlist
Conflicts: bsdgames-nonfree (<< 2.14)
Replaces: bsdgames-nonfree (<< 2.14)
Description: collection of classic textual unix games
This is a collection of some of the text-based games and amusements that
have been enjoyed for decades on unix systems.

4
debian/gbp.conf vendored Normal file
View File

@ -0,0 +1,4 @@
[DEFAULT]
pristine-tar=True
pbuilder=True
export-dir=../build

21
debian/patches/Define-__dead-for-GNU-GCC.patch vendored Normal file
View File

@ -0,0 +1,21 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 11:26:51 +0100
Subject: Define __dead for GNU GCC
---
include/sys/cdefs.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
index 138eaa8..f6e87c2 100644
--- a/include/sys/cdefs.h
+++ b/include/sys/cdefs.h
@@ -40,3 +40,7 @@
#ifndef __COPYRIGHT
#define __COPYRIGHT(arg) static const char copyright[] __attribute__((__unused__)) = arg
#endif
+
+#ifndef __dead
+#define __dead __attribute__((__noreturn__))
+#endif
--

36
debian/patches/Fix-typos-spotted-by-Lintian.patch vendored Normal file
View File

@ -0,0 +1,36 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Fri, 24 Feb 2012 14:29:11 +0100
Subject: Fix typos spotted by Lintian
---
atc/update.c | 2 +-
hack/hack.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/atc/update.c b/atc/update.c
index 3a145e5..39bbf2a 100644
--- a/atc/update.c
+++ b/atc/update.c
@@ -153,7 +153,7 @@ update(dummy)
}
if (pp->altitude > 9)
/* "this is impossible" */
- loser(pp, "exceded flight ceiling.");
+ loser(pp, "exceeded flight ceiling.");
if (pp->altitude <= 0) {
for (i = 0; i < sp->num_airports; i++)
if (pp->xpos == sp->airport[i].x &&
diff --git a/hack/hack.c b/hack/hack.c
index 05141af..6e5028e 100644
--- a/hack/hack.c
+++ b/hack/hack.c
@@ -527,7 +527,7 @@ pickup(int all)
}
lift_some:
if (inv_cnt() >= 52) {
- pline("Your knapsack cannot accomodate anymore items.");
+ pline("Your knapsack cannot accommodate anymore items.");
break;
}
if (wt > -5)
--

69
debian/patches/replace-getline.diff → debian/patches/Replace-getline-with-get_line.patch vendored
View File

@ -1,6 +1,24 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 11:26:00 +0100
Subject: Replace getline() with get_line()
---
boggle/boggle/bog.c | 2 +-
boggle/boggle/extern.h | 2 +-
boggle/boggle/mach.c | 2 +-
cribbage/crib.c | 4 ++--
cribbage/cribbage.h | 2 +-
cribbage/io.c | 8 ++++----
gomoku/bdisp.c | 2 +-
gomoku/gomoku.h | 2 +-
gomoku/main.c | 14 +++++++-------
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/boggle/boggle/bog.c b/boggle/boggle/bog.c
index 276969b..0aaa086 100644
--- a/boggle/boggle/bog.c
+++ b/boggle/boggle/bog.c
@@ -336,7 +336,7 @@
@@ -336,7 +336,7 @@ playgame()
}
while (1) {
@ -9,9 +27,11 @@
if (feof(stdin))
clearerr(stdin);
break;
diff --git a/boggle/boggle/extern.h b/boggle/boggle/extern.h
index ba36561..734a4b9 100644
--- a/boggle/boggle/extern.h
+++ b/boggle/boggle/extern.h
@@ -43,7 +43,7 @@
@@ -43,7 +43,7 @@ void delay(int);
long dictseek(FILE *, long, int);
void findword(void);
void flushin(FILE *);
@ -20,9 +40,11 @@
void getword(char *);
int help(void);
int inputch(void);
diff --git a/boggle/boggle/mach.c b/boggle/boggle/mach.c
index b511296..dd89578 100644
--- a/boggle/boggle/mach.c
+++ b/boggle/boggle/mach.c
@@ -168,7 +168,7 @@
@@ -168,7 +168,7 @@ prwidth(base, indx)
* - doesn't accept words longer than MAXWORDLEN or containing caps
*/
char *
@ -31,9 +53,11 @@
char *q;
{
int ch, done;
diff --git a/cribbage/crib.c b/cribbage/crib.c
index 5fc53b3..9340126 100644
--- a/cribbage/crib.c
+++ b/cribbage/crib.c
@@ -221,7 +221,7 @@
@@ -221,7 +221,7 @@ game()
if (!rflag) { /* player cuts deck */
msg(quiet ? "Cut for crib? " :
"Cut to see whose crib it is -- low card wins? ");
@ -42,7 +66,7 @@
}
i = (rand() >> 4) % CARDS; /* random cut */
do { /* comp cuts deck */
@@ -397,7 +397,7 @@
@@ -397,7 +397,7 @@ cut(mycrib, pos)
if (!rflag) { /* random cut */
msg(quiet ? "Cut the deck? " :
"How many cards down do you wish to cut the deck? ");
@ -51,9 +75,11 @@
}
i = (rand() >> 4) % (CARDS - pos);
turnover = deck[i + pos];
diff --git a/cribbage/cribbage.h b/cribbage/cribbage.h
index ce2eecb..3187457 100644
--- a/cribbage/cribbage.h
+++ b/cribbage/cribbage.h
@@ -77,7 +77,7 @@
@@ -77,7 +77,7 @@ int eq(CARD, CARD);
int fifteens(const CARD [], int);
void game(void);
void gamescore(void);
@ -62,9 +88,11 @@
int getuchar(void);
int incard(CARD *);
int infrom(const CARD [], int, const char *);
diff --git a/cribbage/io.c b/cribbage/io.c
index 3d69257..8100ddd 100644
--- a/cribbage/io.c
+++ b/cribbage/io.c
@@ -245,7 +245,7 @@
@@ -245,7 +245,7 @@ incard(crd)
retval = FALSE;
rnk = sut = EMPTY;
@ -73,7 +101,7 @@
goto gotit;
p = p1 = line;
while (*p1 != ' ' && *p1 != '\0')
@@ -346,7 +346,7 @@
@@ -346,7 +346,7 @@ number(lo, hi, prompt)
for (sum = 0;;) {
msg(prompt);
@ -82,7 +110,7 @@
msg(quiet ? "Not a number" :
"That doesn't look like a number");
continue;
@@ -528,12 +528,12 @@
@@ -528,12 +528,12 @@ over:
}
/*
@ -97,9 +125,11 @@
{
char *sp;
int c, oy, ox;
diff --git a/gomoku/bdisp.c b/gomoku/bdisp.c
index 522d92f..d2de746 100644
--- a/gomoku/bdisp.c
+++ b/gomoku/bdisp.c
@@ -241,7 +241,7 @@
@@ -241,7 +241,7 @@ ask(str)
}
int
@ -108,9 +138,11 @@
char *buf;
int size;
{
diff --git a/gomoku/gomoku.h b/gomoku/gomoku.h
index 0d9ff6e..3ebb42e 100644
--- a/gomoku/gomoku.h
+++ b/gomoku/gomoku.h
@@ -263,7 +263,7 @@
@@ -263,7 +263,7 @@ extern int debug;
void bdinit(struct spotstr *);
void init_overlap(void);
@ -119,9 +151,11 @@
void ask(const char *);
void dislog(const char *);
void bdump(FILE *);
diff --git a/gomoku/main.c b/gomoku/main.c
index 299dee1..3ff4750 100644
--- a/gomoku/main.c
+++ b/gomoku/main.c
@@ -155,7 +155,7 @@
@@ -155,7 +155,7 @@ again:
if (inputfp == NULL && test == 0) {
for (;;) {
ask("black or white? ");
@ -130,7 +164,7 @@
if (buf[0] == 'b' || buf[0] == 'B') {
color = BLACK;
break;
@@ -172,7 +172,7 @@
@@ -172,7 +172,7 @@ again:
}
} else {
setbuf(stdout, 0);
@ -139,7 +173,7 @@
if (strcmp(buf, "black") == 0)
color = BLACK;
else if (strcmp(buf, "white") == 0)
@@ -244,7 +244,7 @@
@@ -244,7 +244,7 @@ again:
getinput:
if (interactive)
ask("move? ");
@ -148,7 +182,7 @@
curmove = RESIGN;
break;
}
@@ -256,7 +256,7 @@
@@ -256,7 +256,7 @@ again:
FILE *fp;
ask("save file name? ");
@ -157,7 +191,7 @@
if ((fp = fopen(buf, "w")) == NULL) {
glog("cannot create save file");
goto getinput;
@@ -309,14 +309,14 @@
@@ -309,14 +309,14 @@ again:
if (i != RESIGN) {
replay:
ask("replay? ");
@ -174,7 +208,7 @@
if ((fp = fopen(buf, "w")) == NULL) {
glog("cannot create save file");
goto replay;
@@ -367,7 +367,7 @@
@@ -367,7 +367,7 @@ whatsup(signum)
quit();
top:
ask("cmd? ");
@ -183,3 +217,4 @@
quit();
switch (*fmtbuf) {
case '\0':
--

693
debian/patches/debian-changes-2.17-19 → debian/patches/Unsorted-Debian-patches.patch vendored
View File

@ -1,35 +1,129 @@
Description: Upstream changes introduced in version 2.17-19
This patch has been created by dpkg-source during the package build.
Here's the last changelog entry, hopefully it gives details on why
those changes were made:
.
bsdgames (2.17-19) unstable; urgency=low
.
* debian/patches/define-dead.diff:
- Define __dead in include/sys/cdefs.h
* debian/patches/wump-update.diff:
- Update wump sources to NetBSD CVS as of 2010-01-14. This fixes
several bugs, including the over-crowded cave. Thanks to
Jörg Neulist for the bug report and patch. Closes: #564891
.
The person named in the Author field signed this changelog entry.
Author: Tobias Quathamer <toddy@debian.org>
Bug-Debian: http://bugs.debian.org/564891
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 11:26:54 +0100
Subject: Unsorted Debian patches
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
adventure/crc.c | 4 ++-
arithmetic/arithmetic.6 | 2 +-
backgammon/backgammon/move.c | 3 ++
backgammon/common_source/allow.c | 4 ++-
backgammon/teachgammon/ttext1.c | 2 +-
backgammon/teachgammon/ttext2.c | 2 +-
config.params | 42 +++++++++++++++++++++++++++++++++
dab/gamescreen.h | 6 ++--
dm/dm.c | 6 ++--
fish/Makefrag | 8 ++++--
fish/fish.6 | 4 +-
gomoku/gomoku.6 | 2 +-
hack/Makefrag | 3 +-
hack/config.h | 15 ++++++++----
hunt/hunt/hunt.6.in | 2 +-
hunt/hunt/hunt.c | 6 +++-
hunt/hunt/playit.c | 4 +-
number/number.c | 47 +++++++++++++++++++++++++-------------
sail/pl_main.c | 2 +-
tests/number.-0.1 | 2 +-
tetris/scores.c | 17 ++++++++-----
trek/setup.c | 5 +++-
22 files changed, 134 insertions(+), 54 deletions(-)
create mode 100644 config.params
diff --git a/adventure/crc.c b/adventure/crc.c
index 66504f1..c6ee5f1 100644
--- a/adventure/crc.c
+++ b/adventure/crc.c
@@ -42,6 +42,8 @@ __RCSID("$NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 agc Exp $");
#endif
#endif /* not lint */
+#include <limits.h>
+
#include "extern.h"
const unsigned long crctab[] = {
@@ -125,7 +127,7 @@ crc(ptr, nr) /* Process nr bytes at a time; ptr points to them */
while (nr > 0)
for (p = ptr; nr--; ++p) {
- if (!(i = crcval >> 24 ^ *p)) {
+ if (!(i = crcval >> (sizeof(crcval) * CHAR_BIT - 8) ^ *p)) {
i = step++;
if (step >= sizeof(crctab) / sizeof(crctab[0]))
step = 0;
diff --git a/arithmetic/arithmetic.6 b/arithmetic/arithmetic.6
index b8d4d8f..bc41bca 100644
--- a/arithmetic/arithmetic.6
+++ b/arithmetic/arithmetic.6
@@ -79,7 +79,7 @@ divide by or subtract will be between 0 and
.Nm
will not ask you to divide by 0.)
The default
-.I range
+.It range
is 10.
.El
.Pp
diff --git a/backgammon/backgammon/move.c b/backgammon/backgammon/move.c
index 9fd81f1..027cab5 100644
--- a/backgammon/backgammon/move.c
+++ b/backgammon/backgammon/move.c
@@ -152,6 +152,9 @@ move(okay)
trymove(0, 0);
pickmove();
+ if (d0)
+ swap;
+
/* print move */
writel(" and moves ");
for (i = 0; i < mvlim; i++) {
diff --git a/backgammon/common_source/allow.c b/backgammon/common_source/allow.c
index f6bae78..8189f07 100644
--- a/backgammon/common_source/allow.c
+++ b/backgammon/common_source/allow.c
@@ -83,8 +83,10 @@ movallow()
p[i--] = bar;
if (p[i] != bar)
continue;
- else
+ else if (d0)
break;
+ swap;
+ continue;
}
if (d0 || m == 4)
break;
diff --git a/backgammon/teachgammon/ttext1.c b/backgammon/teachgammon/ttext1.c
index 82db223..73ea6ee 100644
--- a/backgammon/teachgammon/ttext1.c
+++ b/backgammon/teachgammon/ttext1.c
@@ -94,7 +94,7 @@ const char *const intro2[] = {
"\n Although not indicated on the board, the players' homes are",
"located just to the right of the board. A player's men are placed",
"there when they are removed from the board. The board you just",
- "saw was in it's initial position. All games start with the board",
+ "saw was in its initial position. All games start with the board",
"looking like this. Notice that red's pieces are represented by the",
"letter 'r' and white's pieces are represented by the letter 'w'.",
"Also, a position may have zero or more pieces on it, e.g. posi-",
diff --git a/backgammon/teachgammon/ttext2.c b/backgammon/teachgammon/ttext2.c
index 5e827d7..eb9a083 100644
--- a/backgammon/teachgammon/ttext2.c
+++ b/backgammon/teachgammon/ttext2.c
@@ -65,7 +65,7 @@ const char *const stragy[] = {
"points in a row) are difficult to form, many points nestled close-",
"ly together produce a formidable barrier. Also, while it is good",
"to move back men forward, doing so lessens the opportunity for you",
- "to hit men. Finally, remember that once the two player's have",
+ "to hit men. Finally, remember that once the two players have",
"passed each other on the board, there is no chance of either team",
"being hit, so the game reduces to a race off the board. Addi-",
"tional hints on strategy are presented in the practice game.",
diff --git a/config.params b/config.params
new file mode 100644
index 0000000..aaea598
--- /dev/null
+++ bsdgames-2.17/config.params
+++ b/config.params
@@ -0,0 +1,42 @@
+# This file is read by configure and is used during the build of the
+# Debian package.
@ -43,7 +137,7 @@ Last-Update: <YYYY-MM-DD>
+# Do not build or install these games:
+bsd_games_cfg_no_build_dirs="dm banner fortune factor"
+
+# Keep huntd in /usr/sbin as it was in the past. I may
+# Keep huntd in /usr/sbin as it was in the past. I may
+# change this later.
+bsd_games_cfg_sbindir=/usr/sbin
+
@ -73,19 +167,27 @@ Last-Update: <YYYY-MM-DD>
+bsd_games_cfg_wtf_acronymfile=/usr/share/games/bsdgames/acronyms
+
+bsd_games_cfg_docdir=/usr/share/doc/bsdgames
--- bsdgames-2.17.orig/arithmetic/arithmetic.6
+++ bsdgames-2.17/arithmetic/arithmetic.6
@@ -79,7 +79,7 @@ divide by or subtract will be between 0
.Nm
will not ask you to divide by 0.)
The default
-.I range
+.It range
is 10.
.El
.Pp
--- bsdgames-2.17.orig/dm/dm.c
+++ bsdgames-2.17/dm/dm.c
diff --git a/dab/gamescreen.h b/dab/gamescreen.h
index ca90cb3..b3db2ea 100644
--- a/dab/gamescreen.h
+++ b/dab/gamescreen.h
@@ -70,9 +70,9 @@ class GAMESCREEN {
virtual void redraw(void) = 0; // Refresh
virtual int getinput(void) = 0; // Get user input
virtual void bell(void) = 0; // Beep
- virtual void score(size_t p, const PLAYER& p) = 0; // Post current score
- virtual void games(size_t p, const PLAYER& p) = 0; // Post games won
- virtual void total(size_t p, const PLAYER& p) = 0; // Post total score
+ virtual void score(size_t s, const PLAYER& p) = 0; // Post current score
+ virtual void games(size_t s, const PLAYER& p) = 0; // Post games won
+ virtual void total(size_t s, const PLAYER& p) = 0; // Post total score
virtual void ties(const PLAYER& p) = 0; // Post tie games
};
diff --git a/dm/dm.c b/dm/dm.c
index c131904..16129d8 100644
--- a/dm/dm.c
+++ b/dm/dm.c
@@ -134,19 +134,19 @@ read_config()
while (fgets(lbuf, sizeof(lbuf), cfp))
switch (*lbuf) {
@ -109,43 +211,158 @@ Last-Update: <YYYY-MM-DD>
strcasecmp(f1, "time"))
break;
c_day(f2, f3, f4);
--- bsdgames-2.17.orig/dab/gamescreen.h
+++ bsdgames-2.17/dab/gamescreen.h
@@ -70,9 +70,9 @@ class GAMESCREEN {
virtual void redraw(void) = 0; // Refresh
virtual int getinput(void) = 0; // Get user input
virtual void bell(void) = 0; // Beep
- virtual void score(size_t p, const PLAYER& p) = 0; // Post current score
- virtual void games(size_t p, const PLAYER& p) = 0; // Post games won
- virtual void total(size_t p, const PLAYER& p) = 0; // Post total score
+ virtual void score(size_t s, const PLAYER& p) = 0; // Post current score
+ virtual void games(size_t s, const PLAYER& p) = 0; // Post games won
+ virtual void total(size_t s, const PLAYER& p) = 0; // Post total score
virtual void ties(const PLAYER& p) = 0; // Post tie games
};
diff --git a/fish/Makefrag b/fish/Makefrag
index 1039af5..1fec493 100644
--- a/fish/Makefrag
+++ b/fish/Makefrag
@@ -31,7 +31,9 @@ fish_DIRS := $(GAMESDIR) $(MAN6DIR) $(shell dirname $(FISH_INSTRFILE))
fish_all: fish/fish fish/fish.instr fish/fish.6
--- bsdgames-2.17.orig/adventure/crc.c
+++ bsdgames-2.17/adventure/crc.c
@@ -42,6 +42,8 @@ __RCSID("$NetBSD: crc.c,v 1.8 2003/08/07
#endif
#endif /* not lint */
fish_install: fish_all
- $(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/fish
- $(HIDE_GAME) fish
+ $(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/go-fish
+ $(HIDE_GAME) go-fish
$(INSTALL_DATA) fish/fish.instr $(INSTALL_PREFIX)$(FISH_INSTRFILE)
- $(INSTALL_MANUAL) fish/fish.6
+ ln -sf fish.6 fish/go-fish.6 # hack for rename
+ $(INSTALL_MANUAL) fish/go-fish.6
+ rm -f fish/go-fish.6
diff --git a/fish/fish.6 b/fish/fish.6
index 398c55f..46eef2b 100644
--- a/fish/fish.6
+++ b/fish/fish.6
@@ -30,10 +30,10 @@
.\" @(#)fish.6 8.1 (Berkeley) 5/31/93
.\"
.Dd May 31, 1993
-.Dt FISH 6
+.Dt GO-FISH 6
.Os
.Sh NAME
-.Nm fish
+.Nm go-fish
.Nd play
.Dq Go Fish
.Sh SYNOPSIS
diff --git a/gomoku/gomoku.6 b/gomoku/gomoku.6
index f78eb0e..024da85 100644
--- a/gomoku/gomoku.6
+++ b/gomoku/gomoku.6
@@ -45,7 +45,7 @@
.Op Ar inputfile
.Sh DESCRIPTION
.Nm
-is a two player game were the object is to get 5 in a row horizontally,
+is a two player game where the object is to get 5 in a row horizontally,
vertically or diagonally on a 19 by 19 grid.
By convention, black always moves first.
With no arguments,
diff --git a/hack/Makefrag b/hack/Makefrag
index eabbd2a..5807ef0 100644
--- a/hack/Makefrag
+++ b/hack/Makefrag
@@ -56,7 +56,8 @@ hack_install: hack_all
$(INSTALL_SCORE_GAME) hack/hack $(INSTALL_PREFIX)$(GAMESDIR)/hack
$(HIDE_GAME) hack
$(INSTALL_HACK_DIR) $(INSTALL_PREFIX)$(HACK_DIR)
- set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)$(HACK_DIR)/$$f; done
+ install -d $(INSTALL_PREFIX)/usr/share/games/bsdgames/hack
+ set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)/usr/share/games/bsdgames/hack/$$f; done
$(INSTALL_SCORE_FILE) $(HACK_DIR)/perm
$(INSTALL_SCORE_FILE) $(HACK_DIR)/record
$(INSTALL_MANUAL) hack/hack.6
diff --git a/hack/config.h b/hack/config.h
index ad3bbcf..03a8b02 100644
--- a/hack/config.h
+++ b/hack/config.h
@@ -88,13 +88,18 @@
/* #define PYRAMID_BUG */ /* avoid a bug on the Pyramid */
/* #define NOWAITINCLUDE */ /* neither <wait.h> nor <sys/wait.h> exists */
+#include <limits.h>
+
#include "extern.h"
-#define WIZARD "bruno" /* the person allowed to use the -D option */
+/*
+ * Debian mods: use root for WIZARD, and move files that are static to
+ * /usr/share/ -- JEH
+ */
+#define WIZARD "root" /* the person allowed to use the -D option */
+#define SHAREDIR "/usr/share/games/bsdgames/hack/"
#define RECORD "record"/* the file containing the list of topscorers */
#define NEWS "news" /* the file containing the latest hack news */
-#define HELP "help" /* the file containing a description of the commands */
-#define SHELP "hh" /* abbreviated form of the same */
-#define RUMORFILE "rumors" /* a file with fortune cookies */
-#define DATAFILE "data" /* a file giving the meaning of symbols used */
+#define HELP SHAREDIR "help" /* the file containing a description of the commands */
+#define SHELP SHAREDIR "hh" /* abbreviated form of the same */
+#define RUMORFILE SHAREDIR "rumors" /* a file with fortune cookies */
+#define DATAFILE SHAREDIR "data" /* a file giving the meaning of symbols used */
#define FMASK 0660 /* file creation mask */
#define HLOCK "perm" /* an empty file used for locking purposes */
#define LLOCK "safelock" /* link to previous */
diff --git a/hunt/hunt/hunt.6.in b/hunt/hunt/hunt.6.in
index 406296e..22e45ec 100644
--- a/hunt/hunt/hunt.6.in
+++ b/hunt/hunt/hunt.6.in
@@ -387,7 +387,7 @@ how many of player's shots were ducked
how many slime kills player had
.It enemy
how many enemies were killed
-.tI friend
+.It friend
how many friends were killed (self and same team)
.It deaths
how many times player died
diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c
index 11f4c44..28321bc 100644
--- a/hunt/hunt/hunt.c
+++ b/hunt/hunt/hunt.c
@@ -394,7 +394,8 @@ broadcast_vec(s, vector)
const unsigned long crctab[] = {
@@ -125,7 +127,7 @@ crc(ptr, nr) /* Process nr bytes at a t
vec_cnt = 0;
for (ip = ifp; ip; ip = ip->ifa_next)
- if ((ip->ifa_addr->sa_family == AF_INET) &&
+ if (ip->ifa_addr &&
+ (ip->ifa_addr->sa_family == AF_INET) &&
(ip->ifa_flags & IFF_BROADCAST))
vec_cnt++;
while (nr > 0)
for (p = ptr; nr--; ++p) {
- if (!(i = crcval >> 24 ^ *p)) {
+ if (!(i = crcval >> (sizeof(crcval) * CHAR_BIT - 8) ^ *p)) {
i = step++;
if (step >= sizeof(crctab) / sizeof(crctab[0]))
step = 0;
--- bsdgames-2.17.orig/number/number.c
+++ bsdgames-2.17/number/number.c
@@ -405,7 +406,8 @@ broadcast_vec(s, vector)
vec_cnt = 0;
for (ip = ifp; ip; ip = ip->ifa_next)
- if ((ip->ifa_addr->sa_family == AF_INET) &&
+ if (ip->ifa_addr &&
+ (ip->ifa_addr->sa_family == AF_INET) &&
(ip->ifa_flags & IFF_BROADCAST))
memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr,
sizeof(struct sockaddr_in));
diff --git a/hunt/hunt/playit.c b/hunt/hunt/playit.c
index 9acf86e..881a4e7 100644
--- a/hunt/hunt/playit.c
+++ b/hunt/hunt/playit.c
@@ -114,7 +114,7 @@ playit()
bad_con();
/* NOTREACHED */
}
- if (ntohl(version) != (unsigned long)HUNT_VERSION) {
+ if (ntohl(version) != (uint32_t)HUNT_VERSION) {
bad_ver();
/* NOTREACHED */
}
@@ -649,7 +649,7 @@ do_message()
bad_con();
/* NOTREACHED */
}
- if (ntohl(version) != (unsigned long)HUNT_VERSION) {
+ if (ntohl(version) != (uint32_t)HUNT_VERSION) {
bad_ver();
/* NOTREACHED */
}
diff --git a/number/number.c b/number/number.c
index c7559e1..3086a86 100644
--- a/number/number.c
+++ b/number/number.c
@@ -78,9 +78,9 @@ static const char *const name1[] = {
void convert(char *);
@ -168,7 +385,7 @@ Last-Update: <YYYY-MM-DD>
char *p, *fraction;
flen = 0;
@@ -174,7 +174,7 @@ badnum: errx(1, "illegal number: %s",
@@ -174,7 +174,7 @@ badnum: errx(1, "illegal number: %s", line);
--len;
}
@ -177,7 +394,7 @@ Last-Update: <YYYY-MM-DD>
if (fraction != NULL && flen != 0)
for (p = fraction; *p != '\0'; ++p)
if (*p != '0') {
@@ -182,10 +182,10 @@ badnum: errx(1, "illegal number: %s",
@@ -182,10 +182,10 @@ badnum: errx(1, "illegal number: %s", line);
(void)printf("%sand%s",
lflag ? " " : "",
lflag ? " " : "\n");
@ -190,7 +407,7 @@ Last-Update: <YYYY-MM-DD>
rval = 1;
}
break;
@@ -197,9 +197,10 @@ badnum: errx(1, "illegal number: %s",
@@ -197,9 +197,10 @@ badnum: errx(1, "illegal number: %s", line);
}
int
@ -299,78 +516,74 @@ Last-Update: <YYYY-MM-DD>
}
void
--- bsdgames-2.17.orig/backgammon/teachgammon/ttext1.c
+++ bsdgames-2.17/backgammon/teachgammon/ttext1.c
@@ -94,7 +94,7 @@ const char *const intro2[] = {
"\n Although not indicated on the board, the players' homes are",
"located just to the right of the board. A player's men are placed",
"there when they are removed from the board. The board you just",
- "saw was in it's initial position. All games start with the board",
+ "saw was in its initial position. All games start with the board",
"looking like this. Notice that red's pieces are represented by the",
"letter 'r' and white's pieces are represented by the letter 'w'.",
"Also, a position may have zero or more pieces on it, e.g. posi-",
--- bsdgames-2.17.orig/backgammon/teachgammon/ttext2.c
+++ bsdgames-2.17/backgammon/teachgammon/ttext2.c
@@ -65,7 +65,7 @@ const char *const stragy[] = {
"points in a row) are difficult to form, many points nestled close-",
"ly together produce a formidable barrier. Also, while it is good",
"to move back men forward, doing so lessens the opportunity for you",
- "to hit men. Finally, remember that once the two player's have",
+ "to hit men. Finally, remember that once the two players have",
"passed each other on the board, there is no chance of either team",
"being hit, so the game reduces to a race off the board. Addi-",
"tional hints on strategy are presented in the practice game.",
--- bsdgames-2.17.orig/backgammon/backgammon/move.c
+++ bsdgames-2.17/backgammon/backgammon/move.c
@@ -152,6 +152,9 @@ move(okay)
trymove(0, 0);
pickmove();
+ if (d0)
+ swap;
+
/* print move */
writel(" and moves ");
for (i = 0; i < mvlim; i++) {
--- bsdgames-2.17.orig/backgammon/common_source/allow.c
+++ bsdgames-2.17/backgammon/common_source/allow.c
@@ -83,8 +83,10 @@ movallow()
p[i--] = bar;
if (p[i] != bar)
continue;
- else
+ else if (d0)
break;
+ swap;
+ continue;
diff --git a/sail/pl_main.c b/sail/pl_main.c
index 6183420..b8b26b1 100644
--- a/sail/pl_main.c
+++ b/sail/pl_main.c
@@ -219,7 +219,7 @@ reprint:
printf("\nInitial broadside %s (grape, chain, round, double): ",
n ? "right" : "left");
fflush(stdout);
- scanf("%s", buf);
+ scanf("%9s", buf);
switch (*buf) {
case 'g':
load = L_GRAPE;
diff --git a/tests/number.-0.1 b/tests/number.-0.1
index fea1e89..69c365b 100644
--- a/tests/number.-0.1
+++ b/tests/number.-0.1
@@ -1,3 +1,3 @@
minus
one.
-tenths.
+tenth.
diff --git a/tetris/scores.c b/tetris/scores.c
index d731e25..c2d36c9 100644
--- a/tetris/scores.c
+++ b/tetris/scores.c
@@ -335,7 +335,8 @@ checkscores(hs, num)
continue;
}
if (d0 || m == 4)
break;
--- bsdgames-2.17.orig/quiz/datfiles/poetry
+++ bsdgames-2.17/quiz/datfiles/poetry
@@ -64,7 +64,7 @@ Drink deep{,} or taste not the Pierian s
{Alexander }Pope
The curfew tolls the knell of parting day{,}:\
The lowing herd wind slowly o'er the lea:\
-Elegy{ Written in a Country Church{-| }Yard:\
+Elegy{ Written in a Country Church{-| }Yard}:\
{Thomas }Gray
The best laid schemes o' mice an' men gang aft a-gley{,}:\
An{'|d} lea{'|v}e us nought but grief an{'|d} pain for promised joy{.}:\
--- bsdgames-2.17.orig/gomoku/gomoku.6
+++ bsdgames-2.17/gomoku/gomoku.6
@@ -45,7 +45,7 @@
.Op Ar inputfile
.Sh DESCRIPTION
.Nm
-is a two player game were the object is to get 5 in a row horizontally,
+is a two player game where the object is to get 5 in a row horizontally,
vertically or diagonally on a 19 by 19 grid.
By convention, black always moves first.
With no arguments,
--- bsdgames-2.17.orig/trek/setup.c
+++ bsdgames-2.17/trek/setup.c
}
- levelfound[sp->hs_level] = 1;
+ if (sp->hs_level < NLEVELS && sp->hs_level >= 0)
+ levelfound[sp->hs_level] = 1;
i++, sp++;
}
return (num > MAXHISCORES ? MAXHISCORES : num);
@@ -374,11 +375,13 @@ showscores(level)
for (i = MINLEVEL; i < NLEVELS; i++)
levelfound[i] = 0;
for (i = 0, sp = scores; i < nscores; i++, sp++) {
- if (levelfound[sp->hs_level])
- sp->hs_time = 0;
- else {
- sp->hs_time = 1;
- levelfound[sp->hs_level] = 1;
+ if (sp->hs_level < NLEVELS && sp->hs_level >= 0) {
+ if (levelfound[sp->hs_level])
+ sp->hs_time = 0;
+ else {
+ sp->hs_time = 1;
+ levelfound[sp->hs_level] = 1;
+ }
}
}
@@ -433,7 +436,7 @@ printem(level, offset, hs, n, me)
continue;
}
sp = &hs[item];
- (void)sprintf(buf,
+ (void)snprintf(buf, sizeof(buf),
"%3d%c %6d %-11s (%6d on %d)",
item + offset, sp->hs_time ? '*' : ' ',
sp->hs_score * sp->hs_level,
diff --git a/trek/setup.c b/trek/setup.c
index 1f14f27..fab5136 100644
--- a/trek/setup.c
+++ b/trek/setup.c
@@ -234,11 +234,14 @@ setup()
for (i = 0; i < NQUADS; i++)
for (j = 0; j < NQUADS; j++)
@ -387,184 +600,4 @@ Last-Update: <YYYY-MM-DD>
q->qsystemname = 0;
}
--- bsdgames-2.17.orig/fish/Makefrag
+++ bsdgames-2.17/fish/Makefrag
@@ -31,7 +31,9 @@ fish_DIRS := $(GAMESDIR) $(MAN6DIR) $(sh
fish_all: fish/fish fish/fish.instr fish/fish.6
fish_install: fish_all
- $(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/fish
- $(HIDE_GAME) fish
+ $(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/go-fish
+ $(HIDE_GAME) go-fish
$(INSTALL_DATA) fish/fish.instr $(INSTALL_PREFIX)$(FISH_INSTRFILE)
- $(INSTALL_MANUAL) fish/fish.6
+ ln -sf fish.6 fish/go-fish.6 # hack for rename
+ $(INSTALL_MANUAL) fish/go-fish.6
+ rm -f fish/go-fish.6
--- bsdgames-2.17.orig/fish/fish.6
+++ bsdgames-2.17/fish/fish.6
@@ -30,10 +30,10 @@
.\" @(#)fish.6 8.1 (Berkeley) 5/31/93
.\"
.Dd May 31, 1993
-.Dt FISH 6
+.Dt GO-FISH 6
.Os
.Sh NAME
-.Nm fish
+.Nm go-fish
.Nd play
.Dq Go Fish
.Sh SYNOPSIS
--- bsdgames-2.17.orig/hunt/hunt/hunt.c
+++ bsdgames-2.17/hunt/hunt/hunt.c
@@ -394,7 +394,8 @@ broadcast_vec(s, vector)
vec_cnt = 0;
for (ip = ifp; ip; ip = ip->ifa_next)
- if ((ip->ifa_addr->sa_family == AF_INET) &&
+ if (ip->ifa_addr &&
+ (ip->ifa_addr->sa_family == AF_INET) &&
(ip->ifa_flags & IFF_BROADCAST))
vec_cnt++;
@@ -405,7 +406,8 @@ broadcast_vec(s, vector)
vec_cnt = 0;
for (ip = ifp; ip; ip = ip->ifa_next)
- if ((ip->ifa_addr->sa_family == AF_INET) &&
+ if (ip->ifa_addr &&
+ (ip->ifa_addr->sa_family == AF_INET) &&
(ip->ifa_flags & IFF_BROADCAST))
memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr,
sizeof(struct sockaddr_in));
--- bsdgames-2.17.orig/hunt/hunt/hunt.6.in
+++ bsdgames-2.17/hunt/hunt/hunt.6.in
@@ -387,7 +387,7 @@ how many of player's shots were ducked
how many slime kills player had
.It enemy
how many enemies were killed
-.tI friend
+.It friend
how many friends were killed (self and same team)
.It deaths
how many times player died
--- bsdgames-2.17.orig/hunt/hunt/playit.c
+++ bsdgames-2.17/hunt/hunt/playit.c
@@ -114,7 +114,7 @@ playit()
bad_con();
/* NOTREACHED */
}
- if (ntohl(version) != (unsigned long)HUNT_VERSION) {
+ if (ntohl(version) != (uint32_t)HUNT_VERSION) {
bad_ver();
/* NOTREACHED */
}
@@ -649,7 +649,7 @@ do_message()
bad_con();
/* NOTREACHED */
}
- if (ntohl(version) != (unsigned long)HUNT_VERSION) {
+ if (ntohl(version) != (uint32_t)HUNT_VERSION) {
bad_ver();
/* NOTREACHED */
}
--- bsdgames-2.17.orig/tetris/scores.c
+++ bsdgames-2.17/tetris/scores.c
@@ -335,7 +335,8 @@ checkscores(hs, num)
continue;
}
}
- levelfound[sp->hs_level] = 1;
+ if (sp->hs_level < NLEVELS && sp->hs_level >= 0)
+ levelfound[sp->hs_level] = 1;
i++, sp++;
}
return (num > MAXHISCORES ? MAXHISCORES : num);
@@ -374,12 +375,14 @@ showscores(level)
for (i = MINLEVEL; i < NLEVELS; i++)
levelfound[i] = 0;
for (i = 0, sp = scores; i < nscores; i++, sp++) {
- if (levelfound[sp->hs_level])
- sp->hs_time = 0;
- else {
- sp->hs_time = 1;
- levelfound[sp->hs_level] = 1;
- }
+ if (sp->hs_level < NLEVELS && sp->hs_level >= 0) {
+ if (levelfound[sp->hs_level])
+ sp->hs_time = 0;
+ else {
+ sp->hs_time = 1;
+ levelfound[sp->hs_level] = 1;
+ }
+ }
}
/*
@@ -433,7 +436,7 @@ printem(level, offset, hs, n, me)
continue;
}
sp = &hs[item];
- (void)sprintf(buf,
+ (void)snprintf(buf, sizeof(buf),
"%3d%c %6d %-11s (%6d on %d)",
item + offset, sp->hs_time ? '*' : ' ',
sp->hs_score * sp->hs_level,
--- bsdgames-2.17.orig/hack/Makefrag
+++ bsdgames-2.17/hack/Makefrag
@@ -56,7 +56,8 @@ hack_install: hack_all
$(INSTALL_SCORE_GAME) hack/hack $(INSTALL_PREFIX)$(GAMESDIR)/hack
$(HIDE_GAME) hack
$(INSTALL_HACK_DIR) $(INSTALL_PREFIX)$(HACK_DIR)
- set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)$(HACK_DIR)/$$f; done
+ install -d $(INSTALL_PREFIX)/usr/share/games/bsdgames/hack
+ set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)/usr/share/games/bsdgames/hack/$$f; done
$(INSTALL_SCORE_FILE) $(HACK_DIR)/perm
$(INSTALL_SCORE_FILE) $(HACK_DIR)/record
$(INSTALL_MANUAL) hack/hack.6
--- bsdgames-2.17.orig/hack/config.h
+++ bsdgames-2.17/hack/config.h
@@ -88,13 +88,18 @@
/* #define PYRAMID_BUG */ /* avoid a bug on the Pyramid */
/* #define NOWAITINCLUDE */ /* neither <wait.h> nor <sys/wait.h> exists */
-#define WIZARD "bruno" /* the person allowed to use the -D option */
+/*
+ * Debian mods: use root for WIZARD, and move files that are static to
+ * /usr/share/ -- JEH
+ */
+#define WIZARD "root" /* the person allowed to use the -D option */
+#define SHAREDIR "/usr/share/games/bsdgames/hack/"
#define RECORD "record"/* the file containing the list of topscorers */
#define NEWS "news" /* the file containing the latest hack news */
-#define HELP "help" /* the file containing a description of the commands */
-#define SHELP "hh" /* abbreviated form of the same */
-#define RUMORFILE "rumors" /* a file with fortune cookies */
-#define DATAFILE "data" /* a file giving the meaning of symbols used */
+#define HELP SHAREDIR "help" /* the file containing a description of the commands */
+#define SHELP SHAREDIR "hh" /* abbreviated form of the same */
+#define RUMORFILE SHAREDIR "rumors" /* a file with fortune cookies */
+#define DATAFILE SHAREDIR "data" /* a file giving the meaning of symbols used */
#define FMASK 0660 /* file creation mask */
#define HLOCK "perm" /* an empty file used for locking purposes */
#define LLOCK "safelock" /* link to previous */
--- bsdgames-2.17.orig/sail/pl_main.c
+++ bsdgames-2.17/sail/pl_main.c
@@ -219,7 +219,7 @@ reprint:
printf("\nInitial broadside %s (grape, chain, round, double): ",
n ? "right" : "left");
fflush(stdout);
- scanf("%s", buf);
+ scanf("%9s", buf);
switch (*buf) {
case 'g':
load = L_GRAPE;
--- bsdgames-2.17.orig/tests/number.-0.1
+++ bsdgames-2.17/tests/number.-0.1
@@ -1,3 +1,3 @@
minus
one.
-tenths.
+tenth.
--

134
debian/patches/add-acronyms.diff vendored
View File

@ -1,134 +0,0 @@
--- a/wtf/acronyms
+++ b/wtf/acronyms
@@ -87,6 +87,7 @@
HICA here it comes again
HTH hope this helps
IAC in any case
+IANADD I am not a Debian developer
IANAL I am not a lawyer
IC I see
ICBW I could be wrong
@@ -139,6 +140,8 @@
NFI no fucking idea
NFW no fucking way
NIH not invented here
+NIMB not in my backyard
+NIMBY not in my backyard
NMF not my fault
NMP not my problem
NOYB none of your business
@@ -146,6 +149,7 @@
NP no problem
NRFPT not ready for prime time
NRN no reply necessary
+NSFW not safe for work
OIC oh, I see
OMG oh, my god
OT off topic
@@ -187,6 +191,7 @@
SFA sweet fuck all
SHID slaps head in disgust
SIMCA sitting in my chair amused
+SIYH sooner if you help
SMLSFB so many losers, so few bullets
SMOP simple matter of programming
SNAFU situation normal, all fucked up
@@ -212,7 +217,9 @@
THNX thanks
THX thanks
TIA thanks in advance
+TINASOTODP this is not a statement of the official Debian position
TINC there is no cabal
+TINLA this is not legal advice
TLA three letter acronym
TLB translation lookaside buffer
TMA too many abbreviations
@@ -237,6 +244,7 @@
WFM works for me
WIBNI wouldn't it be nice if
WIP work in progress
+WIR when it's ready
WOFTAM waste of fucking time and money
WOMBAT waste of money, brain, and time
WRT with respect to
--- a/wtf/acronyms.comp
+++ b/wtf/acronyms.comp
@@ -62,7 +62,9 @@
DCE data control equipment
DCE distributed computing environment
DCT discrete cosine transform
+DD Debian developer
DDC display data channel
+DDPO Debian developer's package overview (http://qa.debian.org/developer.php)
DDR double data rate
DDWG digital display working group
DER distinguished encoding rules
@@ -108,12 +110,14 @@
FM frequency modulation
FPM fast page mode
FQDN fully qualified domain name
+FTBFS fails to build from source
FTP file transfer protocol
GC garbage collector
GCR group-coded recording
GIF graphics interchange format
-GNU gnu's not unix
-GPL gnu/general public license
+GIYF google is your friend
+GNU GNU's not unix
+GPL GNU general public license
GPU graphics processing unit
GRE generic routing encapsulation
GUI graphics user interface
@@ -160,6 +164,7 @@
LCP link control protocol
LDAP lightweight directory access protocol
LED light emitting diode
+LGPL GNU lesser general public license
LIR local internet registry
LLC logical link control
LRC longitudinal redundancy check
@@ -174,7 +179,9 @@
MIME multipurpose internet mail extensions
MIPS million instructions per second
MMU memory management unit
+MOTU masters of the universe (Ubuntu developer)
MPEG moving picture experts group
+MPL Mozilla public license
MSB most significant bit [or: byte]
MSF minutes seconds frames
MSS maximum segment size
@@ -236,6 +243,7 @@
RAM random access memory
RCS revision control system
RFC request for comments
+RFS request for sponsorship
RGB red green blue
RIP routing information protocol
RIR regional internet registry
@@ -246,6 +254,9 @@
RPM revolutions per minute
RTF rich text format
RTS request to send
+RTSL read the source, Luke (open source programming)
+RTSL real-time systems laboratory
+RTSL real-time shading language (Stanford University)
RTT round time trip
S/PDIF sony/phillips digital interface
SACD super audio compact disc
@@ -265,6 +276,7 @@
SNMP simple network management protocol
SPD serial presence detect
SRAM static random access memory
+SRU stable release update
SSFDC solid state floppy disc card
SSH secure shell
SSL secure sockets layer
@@ -296,6 +308,7 @@
USB universal serial bus
USWC uncacheable speculative write combining
UTP unshielded twisted pair
+UTSL use the source, Luke (open source programming)
UUCP unix-to-unix copy protocol
VAX virtual address extension
VCM virtual channel memory

11
debian/patches/anne-boleyn.diff vendored
View File

@ -1,11 +0,0 @@
--- a/quiz/datfiles/murders
+++ b/quiz/datfiles/murders
@@ -19,7 +19,7 @@
{Yukio }Mishima:{Yukio }Mishima
{Alexander }Hamilton:{Aaron }Burr
Cleopatra:{the |an }asp
-[Ann Boleyn|Catharine Howard]:Henry{ VIII}
+[Anne Boleyn|Catharine Howard]:Henry{ VIII}
vaudeville:{the }movies|film
{the }movies|film:TV|television
{the }VA patients:{the }nurses

10
debian/patches/define-dead.diff vendored
View File

@ -1,10 +0,0 @@
--- a/include/sys/cdefs.h
+++ b/include/sys/cdefs.h
@@ -40,3 +40,7 @@
#ifndef __COPYRIGHT
#define __COPYRIGHT(arg) static const char copyright[] __attribute__((__unused__)) = arg
#endif
+
+#ifndef __dead
+#define __dead __attribute__((__noreturn__))
+#endif

47
debian/patches/hangman-Error-out-on-1000-unsuitable-words.-Closes-6.patch vendored Normal file
View File

@ -0,0 +1,47 @@
From: Peter Pentchev <roam@ringlet.net>
Date: Thu, 16 Feb 2012 22:37:50 +0100
Subject: hangman: Error out on 1000 unsuitable words. Closes: #610270
---
hangman/getword.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/hangman/getword.c b/hangman/getword.c
index 1b5396a..dc42a53 100644
--- a/hangman/getword.c
+++ b/hangman/getword.c
@@ -50,8 +50,10 @@ getword()
FILE *inf;
char *wp, *gp;
long pos;
+ int tries;
inf = Dict;
+ tries = 0;
for (;;) {
pos = (double) rand() / (RAND_MAX + 1.0) * (double) Dict_size;
fseek(inf, pos, SEEK_SET);
@@ -66,7 +68,21 @@ getword()
if (!islower((unsigned char)*wp))
goto cont;
break;
-cont: ;
+cont:
+ if (++tries >= 1000) {
+ move(MESGY, MESGX);
+ deleteln();
+ deleteln();
+ deleteln();
+ move(MESGY, MESGX);
+ printw("No suitable word found, try using "
+ "another dictionary!");
+ leaveok(stdscr, FALSE);
+ refresh();
+ readch();
+ leaveok(stdscr, TRUE);
+ die(0);
+ }
}
gp = Known;
wp = Word;
--

38
debian/patches/primes-Document-maximum-number-in-manpage.-Closes-63.patch vendored Normal file
View File

@ -0,0 +1,38 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 13:17:13 +0100
Subject: primes: Document maximum number in manpage. Closes: #636569
---
primes/primes.6 | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/primes/primes.6 b/primes/primes.6
index 9499398..ac100c6 100644
--- a/primes/primes.6
+++ b/primes/primes.6
@@ -61,10 +61,13 @@ value must be at least 0 and not greater than
.Ar stop .
The
.Ar stop
-value must not be greater than 4294967295.
+value must not be greater than
+the maximum possible value of unsigned integer types on your system
+(4294967295 for 32-bit systems and
+18446744073709551615 for 64-bit systems).
The default value of
.Ar stop
-is 4294967295.
+is 4294967295 on 32-bit and 18446744073709551615 on 64-bit.
.Pp
When the
.Nm
@@ -72,7 +75,7 @@ utility is invoked with no arguments,
.Ar start
is read from standard input.
.Ar stop
-is taken to be 4294967295.
+is taken to be 4294967295 on 32-bit and 18446744073709551615 on 64-bit.
The
.Ar start
value may be preceded by a single
--

228
debian/patches/primes-Update-to-NetBSD-CVS-2012-02-16.patch vendored Normal file
View File

@ -0,0 +1,228 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 13:05:28 +0100
Subject: primes: Update to NetBSD CVS, 2012-02-16
---
primes/primes.6 | 10 ++++++-
primes/primes.c | 67 +++++++++++++++++++++++++++++++++---------------------
2 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/primes/primes.6 b/primes/primes.6
index 14d5101..9499398 100644
--- a/primes/primes.6
+++ b/primes/primes.6
@@ -1,4 +1,4 @@
-.\" $NetBSD: primes.6,v 1.2 2004/02/09 23:25:47 wiz Exp $
+.\" $NetBSD: primes.6,v 1.3 2008/02/03 03:29:17 wiz Exp $
.\"
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -37,7 +37,7 @@
.\"
.\" chongo <for a good prime call: 391581 * 2^216193 - 1> /\oo/\
.\"
-.Dd February 8, 2004
+.Dd February 3, 2008
.Dt PRIMES 6
.Os
.Sh NAME
@@ -45,6 +45,7 @@
.Nd generate primes
.Sh SYNOPSIS
.Nm primes
+.Op Fl d
.Op Ar start Op Ar stop
.Sh DESCRIPTION
The
@@ -80,6 +81,11 @@ The
.Ar start
value is terminated by a non-digit character (such as a newline).
The input line must not be longer than 255 characters.
+When given the
+.Fl d
+argument,
+.Nm
+prints the difference between the current and the previous prime.
.Sh DIAGNOSTICS
Out of range or invalid input results in
an appropriate error message
diff --git a/primes/primes.c b/primes/primes.c
index 2d93594..4693968 100644
--- a/primes/primes.c
+++ b/primes/primes.c
@@ -1,4 +1,4 @@
-/* $NetBSD: primes.c,v 1.12 2004/01/27 20:30:30 jsm Exp $ */
+/* $NetBSD: primes.c,v 1.19 2011/08/30 02:58:04 jakllsch Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,15 +34,15 @@
#include <sys/cdefs.h>
#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993\
+ The Regents of the University of California. All rights reserved.");
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)primes.c 8.5 (Berkeley) 5/10/95";
#else
-__RCSID("$NetBSD: primes.c,v 1.12 2004/01/27 20:30:30 jsm Exp $");
+__RCSID("$NetBSD: primes.c,v 1.19 2011/08/30 02:58:04 jakllsch Exp $");
#endif
#endif /* not lint */
@@ -84,7 +84,7 @@ __RCSID("$NetBSD: primes.c,v 1.12 2004/01/27 20:30:30 jsm Exp $");
*
* We make TABSIZE large to reduce the overhead of inner loop setup.
*/
-char table[TABSIZE]; /* Eratosthenes sieve of odd numbers */
+static char table[TABSIZE]; /* Eratosthenes sieve of odd numbers */
/*
* prime[i] is the (i-1)th prime.
@@ -103,15 +103,14 @@ extern const ubig *pr_limit; /* largest prime in the prime array */
extern const char pattern[];
extern const int pattern_size; /* length of pattern array */
-int main(int, char *[]);
-void primes(ubig, ubig);
-ubig read_num_buf(void);
-void usage(void) __attribute__((__noreturn__));
+static int dflag;
+
+static void primes(ubig, ubig);
+static ubig read_num_buf(void);
+static void usage(void) __dead;
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
ubig start; /* where to start generating */
ubig stop; /* don't generate at or above this value */
@@ -121,8 +120,11 @@ main(argc, argv)
/* Revoke setgid privileges */
setregid(getgid(), getgid());
- while ((ch = getopt(argc, argv, "")) != -1)
+ while ((ch = getopt(argc, argv, "d")) != -1)
switch (ch) {
+ case 'd':
+ dflag++;
+ break;
case '?':
default:
usage();
@@ -189,7 +191,7 @@ main(argc, argv)
* This routine returns a number n, where 0 <= n && n <= BIG.
*/
ubig
-read_num_buf()
+read_num_buf(void)
{
ubig val;
char *p, buf[100]; /* > max number of digits. */
@@ -200,7 +202,7 @@ read_num_buf()
err(1, "stdin");
exit(0);
}
- for (p = buf; isblank(*p); ++p);
+ for (p = buf; isblank((unsigned char)*p); ++p);
if (*p == '\n' || *p == '\0')
continue;
if (*p == '-')
@@ -217,11 +219,12 @@ read_num_buf()
/*
* primes - sieve and print primes from start up to and but not including stop
+ *
+ * start where to start generating
+ * stop don't generate at or above this value
*/
void
-primes(start, stop)
- ubig start; /* where to start generating */
- ubig stop; /* don't generate at or above this value */
+primes(ubig start, ubig stop)
{
char *q; /* sieve spot */
ubig factor; /* index and factor */
@@ -229,6 +232,7 @@ primes(start, stop)
const ubig *p; /* prime table pointer */
ubig fact_lim; /* highest prime for current block */
ubig mod; /* temp storage for mod */
+ ubig prev = 0;
/*
* A number of systems can not convert double values into unsigned
@@ -263,8 +267,14 @@ primes(start, stop)
for (p = &prime[0], factor = prime[0];
factor < stop && p <= pr_limit; factor = *(++p)) {
if (factor >= start) {
- printf("%lu\n", (unsigned long) factor);
+ printf("%lu", (unsigned long) factor);
+ if (dflag) {
+ printf(" (%lu)",
+ (unsigned long) factor - prev);
+ }
+ putchar('\n');
}
+ prev = factor;
}
/* return early if we are done */
if (p <= pr_limit) {
@@ -298,11 +308,10 @@ primes(start, stop)
/* note highest useful factor and sieve spot */
if (stop-start > TABSIZE+TABSIZE) {
tab_lim = &table[TABSIZE]; /* sieve it all */
- fact_lim = (int)sqrt(
- (double)(start)+TABSIZE+TABSIZE+1.0);
+ fact_lim = sqrt((double)(start)+TABSIZE+TABSIZE+1.0);
} else {
tab_lim = &table[(stop-start)/2]; /* partial sieve */
- fact_lim = (int)sqrt((double)(stop)+1.0);
+ fact_lim = sqrt((double)(stop)+1.0);
}
/* sieve for factors >= 17 */
factor = 17; /* 17 is first prime to use */
@@ -315,7 +324,7 @@ primes(start, stop)
} else {
q = &table[mod ? factor-(mod/2) : 0];
}
- /* sive for our current factor */
+ /* sieve for our current factor */
for ( ; q < tab_lim; q += factor) {
*q = '\0'; /* sieve out a spot */
}
@@ -326,15 +335,21 @@ primes(start, stop)
*/
for (q = table; q < tab_lim; ++q, start+=2) {
if (*q) {
- printf("%lu\n", (unsigned long) start);
+ printf("%lu", (unsigned long) start);
+ if (dflag) {
+ printf(" (%lu)",
+ (unsigned long) start - prev);
+ prev = start;
+ }
+ putchar('\n');
}
}
}
}
void
-usage()
+usage(void)
{
- (void)fprintf(stderr, "usage: primes [start [stop]]\n");
+ (void)fprintf(stderr, "usage: primes [-d] [start [stop]]\n");
exit(1);
}
--

22
debian/patches/quiz-Add-answers-to-adults-babies.-Closes-659528.patch vendored Normal file
View File

@ -0,0 +1,22 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 12:53:51 +0100
Subject: quiz: Add answers to adults/babies. Closes: #659528
---
quiz/datfiles/babies | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/quiz/datfiles/babies b/quiz/datfiles/babies
index 5305c0c..45c4bb3 100644
--- a/quiz/datfiles/babies
+++ b/quiz/datfiles/babies
@@ -3,7 +3,7 @@ kitten:cat|fox|skunk|rabbit|bobcat|panther
gosling:goose
colt|foal:horse|donkey|zebra
puppy:dog
-pup:seal|fox|beaver
+pup:seal|fox|beaver|dog|shark|rat
duckling:duck
fawn:deer
piglet|shoat:pig
--

65
debian/patches/capitals.diff → debian/patches/quiz-Update-presidents-capitals-fix-typos-in-murders.patch vendored
View File

@ -1,3 +1,19 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 11:26:50 +0100
Subject: quiz: Update presidents, capitals, fix typos in murders, poetry
---
quiz/datfiles/africa | 51 ++++++++++++++++++++++++++++++------------------
quiz/datfiles/america | 45 ++++++++++++++++++++++++++++++++++--------
quiz/datfiles/asia | 40 ++++++++++++++++++++++++--------------
quiz/datfiles/europe | 44 ++++++++++++++++++++++++++++-------------
quiz/datfiles/murders | 2 +-
quiz/datfiles/poetry | 2 +-
quiz/datfiles/pres | 6 +++-
7 files changed, 129 insertions(+), 61 deletions(-)
diff --git a/quiz/datfiles/africa b/quiz/datfiles/africa
index 6e74550..a2eeeaf 100644
--- a/quiz/datfiles/africa
+++ b/quiz/datfiles/africa
@@ -1,43 +1,56 @@
@ -76,6 +92,8 @@
{Rep{ublic} of }South Africa:Pretoria
-{The }Gambia:Bathurst
+{The }Gambia:Banjul|Bathurst
diff --git a/quiz/datfiles/america b/quiz/datfiles/america
index 7f8fee1..5c9e321 100644
--- a/quiz/datfiles/america
+++ b/quiz/datfiles/america
@@ -1,27 +1,54 @@
@ -142,6 +160,8 @@
Uruguay:Montevideo
Venezuela:Caracas
+{The }Bahamas:Nassau
diff --git a/quiz/datfiles/asia b/quiz/datfiles/asia
index b9449f4..8c8ee55 100644
--- a/quiz/datfiles/asia
+++ b/quiz/datfiles/asia
@@ -1,12 +1,16 @@
@ -167,7 +187,7 @@
India:New Delhi
Indonesia:Jakarta|Djakarta
Iran:Tehran
@@ -14,28 +18,34 @@
@@ -14,28 +18,34 @@ Iraq:Baghdad
Israel:Jerusalem
Japan:Tokyo
Jordan:Amman
@ -211,6 +231,8 @@
Vietnam:Hanoi
+{Republic of }Yemen:Sana'a
+{{People's }Republic of }China:Beijing|Peking
diff --git a/quiz/datfiles/europe b/quiz/datfiles/europe
index 91176e5..d089f41 100644
--- a/quiz/datfiles/europe
+++ b/quiz/datfiles/europe
@@ -1,44 +1,60 @@
@ -288,3 +310,44 @@
+United Kingdom|England|Great Britain|UK:London
+Vatican City:Vatican City
+[°A|A°|A]land Islands:Mariehamn
diff --git a/quiz/datfiles/murders b/quiz/datfiles/murders
index 30cf324..b1070ce 100644
--- a/quiz/datfiles/murders
+++ b/quiz/datfiles/murders
@@ -19,7 +19,7 @@ Pompeii:Vesuvius
{Yukio }Mishima:{Yukio }Mishima
{Alexander }Hamilton:{Aaron }Burr
Cleopatra:{the |an }asp
-[Ann Boleyn|Catharine Howard]:Henry{ VIII}
+[Anne Boleyn|Catharine Howard]:Henry{ VIII}
vaudeville:{the }movies|film
{the }movies|film:TV|television
{the }VA patients:{the }nurses
diff --git a/quiz/datfiles/poetry b/quiz/datfiles/poetry
index f4c07d6..78d117a 100644
--- a/quiz/datfiles/poetry
+++ b/quiz/datfiles/poetry
@@ -64,7 +64,7 @@ Drink deep{,} or taste not the Pierian spring{.}:\
{Alexander }Pope
The curfew tolls the knell of parting day{,}:\
The lowing herd wind slowly o'er the lea:\
-Elegy{ Written in a Country Church{-| }Yard:\
+Elegy{ Written in a Country Church{-| }Yard}:\
{Thomas }Gray
The best laid schemes o' mice an' men gang aft a-gley{,}:\
An{'|d} lea{'|v}e us nought but grief an{'|d} pain for promised joy{.}:\
diff --git a/quiz/datfiles/pres b/quiz/datfiles/pres
index 6f81228..4ce5862 100644
--- a/quiz/datfiles/pres
+++ b/quiz/datfiles/pres
@@ -79,5 +79,7 @@
{J{ames} }{D{anforth|an} }Quayle:{W{illiam|m} }{J{efferson} }Clinton
{W{illiam|m} }{J{efferson} }Clinton:1993-2001:\
{A{lbert} }{A{rnold} }Gore{{,} J{unio}r}:{G{eorge} }{W{alker} }Bush{{,} J{unio}r}
-{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-:\
-{R{ichard} }{B{ruce} }Cheney:
+{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-{{20}0}9:\
+{R{ichard} }{B{ruce} }Cheney:{B{arack} }{H{ussein} }Obama{ II}
+{B{arack} }{H{ussein} }Obama{ II}:2009-:\
+{J{oe{seph}} }{R{obinette} }{Biden}{{,} J{unio}r}:
--

12
debian/patches/quiz-presidents.diff vendored
View File

@ -1,12 +0,0 @@
--- a/quiz/datfiles/pres
+++ b/quiz/datfiles/pres
@@ -79,5 +79,7 @@
{J{ames} }{D{anforth|an} }Quayle:{W{illiam|m} }{J{efferson} }Clinton
{W{illiam|m} }{J{efferson} }Clinton:1993-2001:\
{A{lbert} }{A{rnold} }Gore{{,} J{unio}r}:{G{eorge} }{W{alker} }Bush{{,} J{unio}r}
-{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-:\
-{R{ichard} }{B{ruce} }Cheney:
+{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-{{20}0}9:\
+{R{ichard} }{B{ruce} }Cheney:{B{arack} }{H{ussein} }Obama{ II}
+{B{arack} }{H{ussein} }Obama{ II}:2009-:\
+{J{oe{seph}} }{R{obinette} }{Biden}{{,} J{unio}r}:

35
debian/patches/rain-Update-default-delay.-Closes-579062.patch vendored Normal file
View File

@ -0,0 +1,35 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 11:26:53 +0100
Subject: rain: Update default delay. Closes: #579062
---
rain/rain.6 | 2 +-
rain/rain.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rain/rain.6 b/rain/rain.6
index 9fb0f0e..c6515e9 100644
--- a/rain/rain.6
+++ b/rain/rain.6
@@ -49,6 +49,6 @@ baud or the
.Fl d
option must be used to specify a delay, in milliseconds, between each
update.
-A reasonable delay is 120; the default is 0.
+The default delay is 120.
.Sh AUTHOR
.An Eric P. Scott
diff --git a/rain/rain.c b/rain/rain.c
index e388f46..63e6276 100644
--- a/rain/rain.c
+++ b/rain/rain.c
@@ -70,7 +70,7 @@ main(int argc, char **argv)
{
int x, y, j;
long cols, lines;
- unsigned int delay = 0;
+ unsigned int delay = 120;
unsigned long val = 0;
int ch;
char *ep;
--

10
debian/patches/refresh-robots-screen.diff vendored
View File

@ -1,10 +0,0 @@
--- a/robots/move.c
+++ b/robots/move.c
@@ -185,6 +185,7 @@
flush_in();
goto ret;
case CTRL('L'):
+ redrawwin(curscr);
refresh();
break;
case EOF:

21
debian/patches/robots-Refresh-screen.patch vendored Normal file
View File

@ -0,0 +1,21 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 11:26:49 +0100
Subject: robots: Refresh screen
---
robots/move.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/robots/move.c b/robots/move.c
index 7edaae3..b2703c5 100644
--- a/robots/move.c
+++ b/robots/move.c
@@ -185,6 +185,7 @@ teleport:
flush_in();
goto ret;
case CTRL('L'):
+ redrawwin(curscr);
refresh();
break;
case EOF:
--

23
debian/patches/series vendored
View File

@ -1,10 +1,13 @@
replace-getline.diff
quiz-presidents.diff
add-acronyms.diff
sort-acronyms.comp.diff
refresh-robots-screen.diff
anne-boleyn.diff
capitals.diff
define-dead.diff
wump-update.diff
debian-changes-2.17-19
Replace-getline-with-get_line.patch
wtf-Add-acronyms-and-sort-them-alphabetically.patch
robots-Refresh-screen.patch
quiz-Update-presidents-capitals-fix-typos-in-murders.patch
Define-__dead-for-GNU-GCC.patch
rain-Update-default-delay.-Closes-579062.patch
Unsorted-Debian-patches.patch
quiz-Add-answers-to-adults-babies.-Closes-659528.patch
primes-Update-to-NetBSD-CVS-2012-02-16.patch
primes-Document-maximum-number-in-manpage.-Closes-63.patch
wtf-Add-NMU.-Closes-574036.patch
hangman-Error-out-on-1000-unsuitable-words.-Closes-6.patch
Fix-typos-spotted-by-Lintian.patch

80
debian/patches/sort-acronyms.comp.diff vendored
View File

@ -1,80 +0,0 @@
--- a/wtf/acronyms.comp
+++ b/wtf/acronyms.comp
@@ -17,8 +17,8 @@
ARP address resolution protocol
ARQ automatic repeat request
AS autonomous system
-ASN autonomous system number
ASCII american standard code for information interchange
+ASN autonomous system number
AT advanced technology
ATA advanced technology attachment
ATAPI advanced technology attachment packet interface
@@ -85,6 +85,7 @@
DTE dumb terminal emulator
DVD digital versatile disc
DVI digital visual interface
+E-XER extended XML encoding rules
ECP enhanced capability port
EDID extended display identification data
EDO extended data out
@@ -98,7 +99,6 @@
EPRML extended partial response, maximum likelihood
EPROM erasable programmable read only memory
ESDRAM enhanced synchronous dynamic random access memory
-E-XER extended XML encoding rules
FAT file allocation table
FBRAM frame buffer random access memory
FCS frame check sequence
@@ -139,10 +139,10 @@
IKE internet key exchange
IMAP internet mail access protocol
INCITS international committee on information technology standards
-IPC interprocess communication
IO input/output
IOCTL input/output control
IP internet protocol
+IPC interprocess communication
IPNG internet protocol, next generation
IPSEC internet protocol security
IRC internet relay chat
@@ -156,6 +156,7 @@
ISO international standards organization
ISOC internet society
ISP internet service provider
+JFGI just fucking google it
JPEG joint photographic experts group
KVA kernel virtual address
LAN local area network
@@ -212,8 +213,8 @@
PCI peripheral component interconnect
PCM pulse code modulation
PCMCIA personal computer memory card international association
-PDU protocol data unit
PDP page descriptor page
+PDU protocol data unit
PER packed encoding rules
PERL practical extraction [and] report language
PGP pretty good privacy
@@ -233,10 +234,10 @@
PPPOE point-to-point protocol over ethernet
PRML partial response, maximum likelihood
PROM programmable read only memory
+PSTN public switched telephone network
PTE page table entry
PTLA pseudo top level aggregator
PTP page table page
-PSTN public switched telephone network
PWM pulse width modulation
QOS quality of service
RAID redundant array of inexpensive disks
@@ -255,8 +256,8 @@
RTF rich text format
RTS request to send
RTSL read the source, Luke (open source programming)
-RTSL real-time systems laboratory
RTSL real-time shading language (Stanford University)
+RTSL real-time systems laboratory
RTT round time trip
S/PDIF sony/phillips digital interface
SACD super audio compact disc

21
debian/patches/wtf-Add-NMU.-Closes-574036.patch vendored Normal file
View File

@ -0,0 +1,21 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 13:26:25 +0100
Subject: wtf: Add NMU. Closes: #574036
---
wtf/acronyms.comp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/wtf/acronyms.comp b/wtf/acronyms.comp
index c5283c4..e365d72 100644
--- a/wtf/acronyms.comp
+++ b/wtf/acronyms.comp
@@ -196,6 +196,7 @@ NCP network control protocol
NFS network file system
NIC network interface card
NIS network information service
+NMU Non-maintainer upload
NRZ non-return to zero
NUMA non uniform memory access
OCL object constraint language
--

215
debian/patches/wtf-Add-acronyms-and-sort-them-alphabetically.patch vendored Normal file
View File

@ -0,0 +1,215 @@
From: Tobias Quathamer <toddy@debian.org>
Date: Thu, 16 Feb 2012 11:26:48 +0100
Subject: wtf: Add acronyms and sort them alphabetically
---
wtf/acronyms | 8 ++++++++
wtf/acronyms.comp | 28 +++++++++++++++++++++-------
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/wtf/acronyms b/wtf/acronyms
index 5baeef2..202bf15 100644
--- a/wtf/acronyms
+++ b/wtf/acronyms
@@ -87,6 +87,7 @@ HHIS hanging head in shame
HICA here it comes again
HTH hope this helps
IAC in any case
+IANADD I am not a Debian developer
IANAL I am not a lawyer
IC I see
ICBW I could be wrong
@@ -139,6 +140,8 @@ NFC no fucking clue
NFI no fucking idea
NFW no fucking way
NIH not invented here
+NIMB not in my backyard
+NIMBY not in my backyard
NMF not my fault
NMP not my problem
NOYB none of your business
@@ -146,6 +149,7 @@ NOYFB none of your fucking business
NP no problem
NRFPT not ready for prime time
NRN no reply necessary
+NSFW not safe for work
OIC oh, I see
OMG oh, my god
OT off topic
@@ -187,6 +191,7 @@ SEP someone else's problem
SFA sweet fuck all
SHID slaps head in disgust
SIMCA sitting in my chair amused
+SIYH sooner if you help
SMLSFB so many losers, so few bullets
SMOP simple matter of programming
SNAFU situation normal, all fucked up
@@ -212,7 +217,9 @@ TBOMK the best of my knowledge
THNX thanks
THX thanks
TIA thanks in advance
+TINASOTODP this is not a statement of the official Debian position
TINC there is no cabal
+TINLA this is not legal advice
TLA three letter acronym
TLB translation lookaside buffer
TMA too many abbreviations
@@ -237,6 +244,7 @@ WB welcome back
WFM works for me
WIBNI wouldn't it be nice if
WIP work in progress
+WIR when it's ready
WOFTAM waste of fucking time and money
WOMBAT waste of money, brain, and time
WRT with respect to
diff --git a/wtf/acronyms.comp b/wtf/acronyms.comp
index 6f2b66f..c5283c4 100644
--- a/wtf/acronyms.comp
+++ b/wtf/acronyms.comp
@@ -17,8 +17,8 @@ APIC advanced programmable interrupt controller
ARP address resolution protocol
ARQ automatic repeat request
AS autonomous system
-ASN autonomous system number
ASCII american standard code for information interchange
+ASN autonomous system number
AT advanced technology
ATA advanced technology attachment
ATAPI advanced technology attachment packet interface
@@ -62,7 +62,9 @@ DAC digital [to] analog converter
DCE data control equipment
DCE distributed computing environment
DCT discrete cosine transform
+DD Debian developer
DDC display data channel
+DDPO Debian developer's package overview (http://qa.debian.org/developer.php)
DDR double data rate
DDWG digital display working group
DER distinguished encoding rules
@@ -83,6 +85,7 @@ DTE data terminal equipment
DTE dumb terminal emulator
DVD digital versatile disc
DVI digital visual interface
+E-XER extended XML encoding rules
ECP enhanced capability port
EDID extended display identification data
EDO extended data out
@@ -96,7 +99,6 @@ EPP enhanced parallel port
EPRML extended partial response, maximum likelihood
EPROM erasable programmable read only memory
ESDRAM enhanced synchronous dynamic random access memory
-E-XER extended XML encoding rules
FAT file allocation table
FBRAM frame buffer random access memory
FCS frame check sequence
@@ -108,12 +110,14 @@ FLOPS floating [point] operations per second
FM frequency modulation
FPM fast page mode
FQDN fully qualified domain name
+FTBFS fails to build from source
FTP file transfer protocol
GC garbage collector
GCR group-coded recording
GIF graphics interchange format
-GNU gnu's not unix
-GPL gnu/general public license
+GIYF google is your friend
+GNU GNU's not unix
+GPL GNU general public license
GPU graphics processing unit
GRE generic routing encapsulation
GUI graphics user interface
@@ -135,10 +139,10 @@ IGP interior gateway protocol
IKE internet key exchange
IMAP internet mail access protocol
INCITS international committee on information technology standards
-IPC interprocess communication
IO input/output
IOCTL input/output control
IP internet protocol
+IPC interprocess communication
IPNG internet protocol, next generation
IPSEC internet protocol security
IRC internet relay chat
@@ -152,6 +156,7 @@ ISN initial serial number
ISO international standards organization
ISOC internet society
ISP internet service provider
+JFGI just fucking google it
JPEG joint photographic experts group
KVA kernel virtual address
LAN local area network
@@ -160,6 +165,7 @@ LCD liquid crystal display
LCP link control protocol
LDAP lightweight directory access protocol
LED light emitting diode
+LGPL GNU lesser general public license
LIR local internet registry
LLC logical link control
LRC longitudinal redundancy check
@@ -174,7 +180,9 @@ MIDI musical instrument digital interface
MIME multipurpose internet mail extensions
MIPS million instructions per second
MMU memory management unit
+MOTU masters of the universe (Ubuntu developer)
MPEG moving picture experts group
+MPL Mozilla public license
MSB most significant bit [or: byte]
MSF minutes seconds frames
MSS maximum segment size
@@ -205,8 +213,8 @@ PC personal computer
PCI peripheral component interconnect
PCM pulse code modulation
PCMCIA personal computer memory card international association
-PDU protocol data unit
PDP page descriptor page
+PDU protocol data unit
PER packed encoding rules
PERL practical extraction [and] report language
PGP pretty good privacy
@@ -226,16 +234,17 @@ PPPOA point-to-point protocol over ATM
PPPOE point-to-point protocol over ethernet
PRML partial response, maximum likelihood
PROM programmable read only memory
+PSTN public switched telephone network
PTE page table entry
PTLA pseudo top level aggregator
PTP page table page
-PSTN public switched telephone network
PWM pulse width modulation
QOS quality of service
RAID redundant array of inexpensive disks
RAM random access memory
RCS revision control system
RFC request for comments
+RFS request for sponsorship
RGB red green blue
RIP routing information protocol
RIR regional internet registry
@@ -246,6 +255,9 @@ ROM read only memory
RPM revolutions per minute
RTF rich text format
RTS request to send
+RTSL read the source, Luke (open source programming)
+RTSL real-time shading language (Stanford University)
+RTSL real-time systems laboratory
RTT round time trip
S/PDIF sony/phillips digital interface
SACD super audio compact disc
@@ -265,6 +277,7 @@ SMTP simple mail transfer protocol
SNMP simple network management protocol
SPD serial presence detect
SRAM static random access memory
+SRU stable release update
SSFDC solid state floppy disc card
SSH secure shell
SSL secure sockets layer
@@ -296,6 +309,7 @@ USART universal synchronous/asynchronous receiver/transmitter
USB universal serial bus
USWC uncacheable speculative write combining
UTP unshielded twisted pair
+UTSL use the source, Luke (open source programming)
UUCP unix-to-unix copy protocol
VAX virtual address extension
VCM virtual channel memory
--

521
debian/patches/wump-update.diff vendored
View File

@ -1,521 +0,0 @@
Update wump directory to NetBSD CVS as of 2010-01-14
This fixes Debian bug #564891
--- a/wump/Makefile.bsd
+++ b/wump/Makefile.bsd
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:22 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2008/01/28 07:04:00 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include <bsd.own.mk>
--- a/wump/wump.6
+++ b/wump/wump.6
@@ -1,4 +1,4 @@
-.\" $NetBSD: wump.6,v 1.6 2003/08/07 09:37:57 agc Exp $
+.\" $NetBSD: wump.6,v 1.8 2006/01/22 21:22:30 wiz Exp $
.\"
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)wump.6 8.1 (Berkeley) 5/31/93
.\"
-.Dd May 31, 1993
+.Dd January 19, 2006
.Dt WUMP 6
.Os
.Sh NAME
@@ -74,7 +74,7 @@
The default is three.
.It Fl r
Specifies the number of rooms in the cave.
-The default cave size is twenty-five rooms.
+The default cave size is twenty rooms.
.It Fl t
Specifies the number of tunnels connecting each room in the cave to
another room.
--- a/wump/wump.c
+++ b/wump/wump.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wump.c,v 1.17 2005/02/15 12:56:20 jsm Exp $ */
+/* $NetBSD: wump.c,v 1.25 2009/08/27 00:19:52 dholland Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,15 +35,15 @@
#include <sys/cdefs.h>
#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993\
+ The Regents of the University of California. All rights reserved.");
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)wump.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: wump.c,v 1.17 2005/02/15 12:56:20 jsm Exp $");
+__RCSID("$NetBSD: wump.c,v 1.25 2009/08/27 00:19:52 dholland Exp $");
#endif
#endif /* not lint */
@@ -86,7 +86,7 @@
#define plural(n) (n == 1 ? "" : "s")
/* simple cave data structure; +1 so we can index from '1' not '0' */
-struct room_record {
+static struct room_record {
int tunnel[MAX_LINKS_IN_ROOM];
int has_a_pit, has_a_bat;
} cave[MAX_ROOMS_IN_CAVE+1];
@@ -95,57 +95,57 @@
* global variables so we can keep track of where the player is, how
* many arrows they still have, where el wumpo is, and so on...
*/
-int player_loc = -1; /* player location */
-int wumpus_loc = -1; /* The Bad Guy location */
-int level = EASY; /* level of play */
-int arrows_left; /* arrows unshot */
+static int player_loc = -1; /* player location */
+static int wumpus_loc = -1; /* The Bad Guy location */
+static int level = EASY; /* level of play */
+static int arrows_left; /* arrows unshot */
#ifdef DEBUG
-int debug = 0;
+static int debug = 0;
#endif
-int pit_num = PIT_COUNT; /* # pits in cave */
-int bat_num = BAT_COUNT; /* # bats */
-int room_num = ROOMS_IN_CAVE; /* # rooms in cave */
-int link_num = LINKS_IN_ROOM; /* links per room */
-int arrow_num = NUMBER_OF_ARROWS; /* arrow inventory */
-
-char answer[20]; /* user input */
-
-int bats_nearby(void);
-void cave_init(void);
-void clear_things_in_cave(void);
-void display_room_stats(void);
-int gcd(int, int);
-int getans(const char *);
-void initialize_things_in_cave(void);
-void instructions(void);
-int int_compare(const void *, const void *);
-void jump(int);
-void kill_wump(void);
+static int pit_num = PIT_COUNT; /* # pits in cave */
+static int bat_num = BAT_COUNT; /* # bats */
+static int room_num = ROOMS_IN_CAVE; /* # rooms in cave */
+static int link_num = LINKS_IN_ROOM; /* links per room */
+static int arrow_num = NUMBER_OF_ARROWS;/* arrow inventory */
+
+static char answer[20]; /* user input */
+
int main(int, char **);
-int move_to(const char *);
-void move_wump(void);
-void no_arrows(void);
-void pit_kill(void);
-int pit_nearby(void);
-void pit_survive(void);
-int shoot(char *);
-void shoot_self(void);
-int take_action(void);
-void usage(void) __attribute__((__noreturn__));
-void wump_kill(void);
-int wump_nearby(void);
+static int bats_nearby(void);
+static void cave_init(void);
+static void clear_things_in_cave(void);
+static void display_room_stats(void);
+static int gcd(int, int);
+static int getans(const char *);
+static void initialize_things_in_cave(void);
+static void instructions(void);
+static int int_compare(const void *, const void *);
+static void jump(int);
+static void kill_wump(void);
+static int move_to(const char *);
+static void move_wump(void);
+static void no_arrows(void);
+static void pit_kill(void);
+static int pit_nearby(void);
+static void pit_survive(void);
+static int shoot(char *);
+static void shoot_self(void);
+static int take_action(void);
+static void usage(void) __dead;
+static void wump_kill(void);
+static int wump_nearby(void);
int
main(argc, argv)
int argc;
char **argv;
{
- int c;
+ int c, e=0;
/* Revoke setgid privileges */
- setregid(getgid(), getgid());
+ setgid(getgid());
#ifdef DEBUG
while ((c = getopt(argc, argv, "a:b:hp:r:t:d")) != -1)
@@ -232,28 +232,29 @@
plural(pit_num), arrow_num);
for (;;) {
+ clear_things_in_cave();
initialize_things_in_cave();
arrows_left = arrow_num;
do {
display_room_stats();
(void)printf("Move or shoot? (m-s) ");
(void)fflush(stdout);
- if (!fgets(answer, sizeof(answer), stdin))
+ if (!fgets(answer, sizeof(answer), stdin)) {
+ e=2;
break;
- } while (!take_action());
+ }
+ } while (!(e = take_action()));
- if (!getans("\nCare to play another game? (y-n) "))
+ if (e == 2 || !getans("\nCare to play another game? (y-n) "))
exit(0);
- if (getans("In the same cave? (y-n) "))
- clear_things_in_cave();
- else
+ if (getans("In the same cave? (y-n) ") == 0)
cave_init();
}
/* NOTREACHED */
return (0);
}
-void
+static void
display_room_stats()
{
int i;
@@ -283,7 +284,7 @@
(void)printf("and %d.\n", cave[player_loc].tunnel[link_num - 1]);
}
-int
+static int
take_action()
{
/*
@@ -312,7 +313,7 @@
return(0);
}
-int
+static int
move_to(room_number)
const char *room_number;
{
@@ -404,12 +405,12 @@
return(0);
}
-int
+static int
shoot(room_list)
char *room_list;
{
int chance, next, roomcnt;
- int j, arrow_location, link, ok;
+ int j, arrow_location, lnk, ok;
char *p;
/*
@@ -450,24 +451,24 @@
} else
arrow_location = next;
} else {
- link = (random() % link_num);
- if (link == player_loc)
+ lnk = (random() % link_num);
+ if (lnk == player_loc)
(void)printf(
"*thunk* The arrow can't find a way from %d to %d and flys back into\n\
your room!\n",
arrow_location, next);
- else if (cave[arrow_location].tunnel[link] > room_num)
+ else if (cave[arrow_location].tunnel[lnk] > room_num)
(void)printf(
"*thunk* The arrow flys randomly into a magic tunnel, thence into\n\
room %d!\n",
- cave[arrow_location].tunnel[link]);
+ cave[arrow_location].tunnel[lnk]);
else
(void)printf(
"*thunk* The arrow can't find a way from %d to %d and flys randomly\n\
into room %d!\n",
arrow_location, next,
- cave[arrow_location].tunnel[link]);
- arrow_location = cave[arrow_location].tunnel[link];
+ cave[arrow_location].tunnel[lnk]);
+ arrow_location = cave[arrow_location].tunnel[lnk];
break;
}
chance = random() % 10;
@@ -506,7 +507,7 @@
/* each time you shoot, it's more likely the wumpus moves */
static int lastchance = 2;
- if (random() % level == EASY ? 12 : 9 < (lastchance += 2)) {
+ if (random() % (level == EASY ? 12 : 9) < (lastchance += 2)) {
move_wump();
if (wumpus_loc == player_loc)
wump_kill();
@@ -517,7 +518,7 @@
return(0);
}
-int
+static int
gcd(a, b)
int a, b;
{
@@ -529,10 +530,10 @@
return (gcd(b, r));
}
-void
+static void
cave_init()
{
- int i, j, k, link;
+ int i, j, k, lnk;
int delta;
/*
@@ -561,31 +562,31 @@
} while (gcd(room_num, delta + 1) != 1);
for (i = 1; i <= room_num; ++i) {
- link = ((i + delta) % room_num) + 1; /* connection */
- cave[i].tunnel[0] = link; /* forw link */
- cave[link].tunnel[1] = i; /* back link */
+ lnk = ((i + delta) % room_num) + 1; /* connection */
+ cave[i].tunnel[0] = lnk; /* forw link */
+ cave[lnk].tunnel[1] = i; /* back link */
}
/* now fill in the rest of the cave with random connections */
for (i = 1; i <= room_num; i++)
for (j = 2; j < link_num ; j++) {
if (cave[i].tunnel[j] != -1)
continue;
-try_again: link = (random() % room_num) + 1;
+try_again: lnk = (random() % room_num) + 1;
/* skip duplicates */
for (k = 0; k < j; k++)
- if (cave[i].tunnel[k] == link)
+ if (cave[i].tunnel[k] == lnk)
goto try_again;
- cave[i].tunnel[j] = link;
+ cave[i].tunnel[j] = lnk;
if (random() % 2 == 1)
continue;
for (k = 0; k < link_num; ++k) {
/* if duplicate, skip it */
- if (cave[link].tunnel[k] == i)
+ if (cave[lnk].tunnel[k] == i)
k = link_num;
/* if open link, use it, force exit */
- if (cave[link].tunnel[k] == -1) {
- cave[link].tunnel[k] = i;
+ if (cave[lnk].tunnel[k] == -1) {
+ cave[lnk].tunnel[k] = i;
k = link_num;
}
}
@@ -595,7 +596,7 @@
* make it easier on the intrepid adventurer.
*/
for (i = 1; i <= room_num; ++i)
- qsort(cave[i].tunnel, (u_int)link_num,
+ qsort(cave[i].tunnel, link_num,
sizeof(cave[i].tunnel[0]), int_compare);
#ifdef DEBUG
@@ -609,7 +610,7 @@
#endif
}
-void
+static void
clear_things_in_cave()
{
int i;
@@ -622,7 +623,7 @@
cave[i].has_a_bat = cave[i].has_a_pit = 0;
}
-void
+static void
initialize_things_in_cave()
{
int i, loc;
@@ -642,7 +643,7 @@
for (i = 0; i < pit_num; ++i) {
do {
loc = (random() % room_num) + 1;
- } while (cave[loc].has_a_pit && cave[loc].has_a_bat);
+ } while (cave[loc].has_a_pit || cave[loc].has_a_bat);
cave[loc].has_a_pit = 1;
#ifdef DEBUG
if (debug)
@@ -656,13 +657,17 @@
(void)printf("<wumpus in room %d>\n", loc);
#endif
+ i = 0;
do {
player_loc = (random() % room_num) + 1;
- } while (player_loc == wumpus_loc || (level == HARD ?
- (link_num / room_num < 0.4 ? wump_nearby() : 0) : 0));
+ i++;
+ } while (player_loc == wumpus_loc || cave[player_loc].has_a_pit ||
+ cave[player_loc].has_a_bat || (level == HARD ?
+ (link_num / room_num < 0.4 ? wump_nearby() : 0) : 0) ||
+ (i > 100 && player_loc != wumpus_loc));
}
-int
+static int
getans(prompt)
const char *prompt;
{
@@ -688,7 +693,7 @@
/* NOTREACHED */
}
-int
+static int
bats_nearby()
{
int i;
@@ -700,7 +705,7 @@
return(0);
}
-int
+static int
pit_nearby()
{
int i;
@@ -712,7 +717,7 @@
return(0);
}
-int
+static int
wump_nearby()
{
int i, j;
@@ -729,20 +734,20 @@
return(0);
}
-void
+static void
move_wump()
{
wumpus_loc = cave[wumpus_loc].tunnel[random() % link_num];
}
-int
+static int
int_compare(a, b)
const void *a, *b;
{
return(*(const int *)a < *(const int *)b ? -1 : 1);
}
-void
+static void
instructions()
{
const char *pager;
@@ -786,7 +791,7 @@
}
}
-void
+static void
usage()
{
(void)fprintf(stderr,
@@ -796,7 +801,7 @@
/* messages */
-void
+static void
wump_kill()
{
(void)printf(
@@ -808,7 +813,7 @@
passed out from the stench!\n");
}
-void
+static void
kill_wump()
{
(void)printf(
@@ -820,7 +825,7 @@
mightiest adventurer at a single whiff!!\n");
}
-void
+static void
no_arrows()
{
(void)printf(
@@ -830,7 +835,7 @@
you, and with a mighty *ROAR* eats you alive!\n");
}
-void
+static void
shoot_self()
{
(void)printf(
@@ -841,7 +846,7 @@
(*CHOMP*)\n");
}
-void
+static void
jump(where)
int where;
{
@@ -851,7 +856,7 @@
a very curious, warm sensation and find yourself in room %d!!\n", where);
}
-void
+static void
pit_kill()
{
(void)printf(
@@ -863,7 +868,7 @@
you can at least find out if Jules Verne was right...\n");
}
-void
+static void
pit_survive()
{
(void)printf(

4
debian/postinst vendored
View File

@ -1,4 +1,6 @@
#!/bin/sh -e
#!/bin/sh
set -e
SCOREFILES="
/var/games/bsdgames/atc_score

4
debian/postrm vendored
View File

@ -1,4 +1,6 @@
#!/bin/sh -e
#!/bin/sh
set -e
SCOREFILES="
/var/games/bsdgames/atc_score

4
debian/preinst vendored
View File

@ -1,4 +1,6 @@
#!/bin/sh -e
#!/bin/sh
set -e
SCOREFILES="
/var/games/bsdgames/atc_score

18
debian/rules vendored
View File

@ -2,16 +2,14 @@
%:
dh $@
build: build-stamp
build-stamp:
override_dh_auto_build:
# Set up wordlist
cat /usr/share/dict/american-english /usr/share/dict/british-english | \
sort | uniq > temp-dictionary
dh build
touch build-stamp
dh_auto_build
binary-arch: build
dh binary-arch --until dh_installdocs
override_dh_installdocs:
dh_installdocs
cp atc/BUGS debian/bsdgames/usr/share/doc/bsdgames/BUGS.atc
cp hunt/README debian/bsdgames/usr/share/doc/bsdgames/README.hunt
cp phantasia/README debian/bsdgames/usr/share/doc/bsdgames/README.phantasia
@ -24,8 +22,9 @@ binary-arch: build
debian/bsdgames/var/games/bsdgames/phantasia/void \
debian/bsdgames/usr/share/games/bsdgames/phantasia/
cat COPYING >> debian/bsdgames/usr/share/doc/bsdgames/copyright
dh binary-arch --until dh_fixperms
override_dh_fixperms:
dh_fixperms
chmod -R u+rw debian/bsdgames/usr/
# Games with score files need to be set up sgid games.
chown root:games debian/bsdgames/usr/games/atc \
@ -61,6 +60,3 @@ binary-arch: build
debian/bsdgames/var/games/bsdgames/hack \
debian/bsdgames/var/games/bsdgames/hack/save
find debian/bsdgames/var/games/bsdgames -size 0 -exec rm {} \;
dh binary-arch --remaining
binary: binary-indep binary-arch