Hello community,
here is the log from the commit of package bsd-games
checked in at Fri Aug 3 21:55:18 CEST 2007.
--------
--- bsd-games/bsd-games.changes 2007-03-30 15:40:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/bsd-games/bsd-games.changes 2007-08-03 15:48:24.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 3 15:40:30 CEST 2007 - anosek@suse.cz
+
+- updated to version 2.17
+ - added new game dab (Dots and Boxes)
+ - bugfixes
+
+-------------------------------------------------------------------
Old:
----
bsd-games-2.13-codecleanup.diff
bsd-games-2.13.diff
bsd-games-2.13-execl.diff
bsd-games-2.13-inc.diff
bsd-games-2.13-overflow.diff
bsd-games-2.13-ppc64.diff
bsd-games-2.13-strictaliasing.diff
bsd-games-2.13.tar.bz2
New:
----
bsd-games-2.17-codecleanup.diff
bsd-games-2.17-dab.patch
bsd-games-2.17.diff
bsd-games-2.17-execl.diff
bsd-games-2.17-inc.diff
bsd-games-2.17-ppc64.diff
bsd-games-2.17-strictaliasing.diff
bsd-games-2.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bsd-games.spec ++++++
--- /var/tmp/diff_new_pack.q16349/_old 2007-08-03 21:54:40.000000000 +0200
+++ /var/tmp/diff_new_pack.q16349/_new 2007-08-03 21:54:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package bsd-games (Version 2.13)
+# spec file for package bsd-games (Version 2.17)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,15 +11,16 @@
# norootforbuild
Name: bsd-games
-BuildRequires: bison flex ncurses-devel words
-License: BSD License and BSD-like
+URL: http://www.advogato.org/proj/bsd-games/
+BuildRequires: bison flex gcc-c++ libopenssl-devel ncurses-devel words
+License: BSD 3-Clause
Group: Amusements/Games/Other
Provides: bsdgames
Obsoletes: bsdgames
PreReq: permissions
Autoreqprov: on
-Version: 2.13
-Release: 396
+Version: 2.17
+Release: 1
Summary: Several Text-Mode Games
Source: %{name}-%{version}.tar.bz2
Patch0: %{name}-%{version}.diff
@@ -28,8 +29,8 @@
Patch3: %{name}-%{version}-strictaliasing.diff
Patch4: %{name}-%{version}-execl.diff
Patch5: %{name}-%{version}-codecleanup.diff
-Patch6: %{name}-%{version}-overflow.diff
Patch7: hunt-64bit.patch
+Patch8: %{name}-%{version}-dab.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -54,12 +55,12 @@
%patch3 -p1
%patch4 -p1
%patch5
-%patch6
%patch7
+%patch8
%build
(echo $RPM_BUILD_ROOT
-echo "fortune"
+echo "fortune dab dm"
for i in {1,2}{1,2,3,4,5}; do echo; done; # 10 times default
echo "n"
yes "") | ./configure
@@ -75,7 +76,8 @@
echo $i
case $i in
atc|battlestar|cfscores|cribbage|phantasia|robots|sail|snake|tetris-bsd|\
- adventure|arithmetic|backgammon|boggle|caesar|canfield|dm|fish|gomoku|hangman|\
+ # adventure|arithmetic|backgammon|boggle|caesar|canfield|dm|fish|gomoku|hangman|\
+ adventure|arithmetic|backgammon|boggle|caesar|canfield|fish|gomoku|hangman|\
hunt|huntd|mille|monop|pig|pom|ppt|primes|quiz|rain|snscore|teachgammon|\
trek|worm|worms|wump)
echo "/usr/games/$i" >> $RPM_BUILD_ROOT/usr/share/games/sgidlist
@@ -105,6 +107,10 @@
%attr(-,games,games) /usr/share/misc/*
%changelog
+* Fri Aug 03 2007 - anosek@suse.cz
+- updated to version 2.17
+ - added new game dab (Dots and Boxes)
+ - bugfixes
* Fri Mar 30 2007 - rguenther@suse.de
- add bison, flex and ncurses-devel BuildRequires
* Tue Aug 15 2006 - anosek@suse.cz
++++++ bsd-games-2.13-codecleanup.diff -> bsd-games-2.17-codecleanup.diff ++++++
--- bsd-games/bsd-games-2.13-codecleanup.diff 2005-04-12 15:47:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/bsd-games/bsd-games-2.17-codecleanup.diff 2007-07-26 14:46:52.000000000 +0200
@@ -1,6 +1,6 @@
--- canfield/cfscores/cfscores.c
+++ canfield/cfscores/cfscores.c
-@@ -127,10 +127,13 @@
+@@ -123,10 +123,13 @@
struct betinfo total;
int i;
@@ -14,147 +14,9 @@
i = lseek(dbfd, pw->pw_uid * sizeof(struct betinfo), SEEK_SET);
if (i < 0)
warn("lseek %s", _PATH_SCORE);
---- cribbage/crib.c
-+++ cribbage/crib.c
-@@ -111,7 +111,7 @@
- }
-
- initscr();
-- (void)signal(SIGINT, rint);
-+ (void)signal(SIGINT, quit);
- crmode();
- noecho();
-
---- cribbage/cribbage.h
-+++ cribbage/cribbage.h
-@@ -59,7 +59,7 @@
- extern BOOLEAN quiet; /* if suppress random mess */
- extern BOOLEAN playing; /* currently playing game */
-
--extern char expl[]; /* string for explanation */
-+extern char explanation[]; /* string for explanation */
-
- void addmsg __P((const char *, ...))
- __attribute__((__format__(__printf__, 1, 2)));
-@@ -108,7 +108,7 @@
- void prpeg __P((int, int, BOOLEAN));
- void prtable __P((int));
- int readchar __P((void));
--void rint __P((int)) __attribute__((__noreturn__));
-+void quit __P((int)) __attribute__((__noreturn__));
- int score __P((BOOLEAN));
- int scorehand __P((const CARD [], CARD, int, BOOLEAN, BOOLEAN));
- void shuffle __P((CARD []));
---- cribbage/extern.c
-+++ cribbage/extern.c
-@@ -52,7 +52,7 @@
- BOOLEAN quiet = FALSE; /* if suppress random mess */
- BOOLEAN rflag = FALSE; /* if all cuts random */
-
--char expl[128]; /* explanation */
-+char explanation[128]; /* explanation */
-
- int cgames = 0; /* number games comp won */
- int cscore = 0; /* comp score in this game */
---- cribbage/io.c
-+++ cribbage/io.c
-@@ -611,7 +611,7 @@
- }
-
- void
--rint(signo)
-+quit(signo)
- int signo __attribute__((__unused__));
- {
- bye();
---- cribbage/score.c
-+++ cribbage/score.c
-@@ -122,7 +122,7 @@
- CARD h[(CINHAND + 1)];
- char buf[32];
-
-- expl[0] = '\0'; /* initialize explanation */
-+ explanation[0] = '\0'; /* initialize explanation */
- score = 0;
- flag = TRUE;
- k = hand[0].suit;
-@@ -132,29 +132,29 @@
- if (hand[i].suit == starter.suit) {
- score++;
- if (do_explain)
-- strcat(expl, "His Nobs");
-+ strcat(explanation, "His Nobs");
- }
- h[i] = hand[i];
- }
-
- if (flag && n >= CINHAND) {
-- if (do_explain && expl[0] != '\0')
-- strcat(expl, ", ");
-+ if (do_explain && explanation[0] != '\0')
-+ strcat(explanation, ", ");
- if (starter.suit == k) {
- score += 5;
- if (do_explain)
-- strcat(expl, "Five-flush");
-+ strcat(explanation, "Five-flush");
- } else
- if (!crb) {
- score += 4;
-- if (do_explain && expl[0] != '\0')
-- strcat(expl, ", Four-flush");
-+ if (do_explain && explanation[0] != '\0')
-+ strcat(explanation, ", Four-flush");
- else
-- strcpy(expl, "Four-flush");
-+ strcpy(explanation, "Four-flush");
- }
- }
-- if (do_explain && expl[0] != '\0')
-- strcat(expl, ", ");
-+ if (do_explain && explanation[0] != '\0')
-+ strcat(explanation, ", ");
- h[n] = starter;
- sorthand(h, n + 1); /* sort by rank */
- i = 2 * fifteens(h, n + 1);
-@@ -162,9 +162,9 @@
- if (do_explain) {
- if (i > 0) {
- (void) sprintf(buf, "%d points in fifteens", i);
-- strcat(expl, buf);
-+ strcat(explanation, buf);
- } else
-- strcat(expl, "No fifteens");
-+ strcat(explanation, "No fifteens");
- }
- i = pairuns(h, n + 1);
- score += i;
-@@ -172,9 +172,9 @@
- if (i > 0) {
- (void) sprintf(buf, ", %d points in pairs, %d in runs",
- pairpoints, runpoints);
-- strcat(expl, buf);
-+ strcat(explanation, buf);
- } else
-- strcat(expl, ", No pairs/runs");
-+ strcat(explanation, ", No pairs/runs");
- }
- return (score);
- }
---- cribbage/support.c
-+++ cribbage/support.c
-@@ -152,7 +152,7 @@
- msg("You should have taken %d, not %d!", i, j);
- }
- if (explain)
-- msg("Explanation: %s", expl);
-+ msg("Explanation: %s", explanation);
- do_wait();
- } else
- win = chkscr(&pscore, i);
--- gomoku/makemove.c
+++ gomoku/makemove.c
-@@ -228,7 +228,7 @@
+@@ -224,7 +224,7 @@
int i, f, r, r1, d, d1, n;
int a, b, bmask, bmask1;
struct spotstr *esp;
@@ -176,7 +38,7 @@
--- hunt/hunt/hunt.c
+++ hunt/hunt/hunt.c
-@@ -396,7 +396,7 @@
+@@ -423,7 +423,7 @@
u_short port_num;
static SOCKET test;
int test_socket;
@@ -187,18 +49,18 @@
static struct in_addr local_address;
--- hunt/huntd/answer.c
+++ hunt/huntd/answer.c
-@@ -31,7 +31,7 @@
+@@ -56,7 +56,7 @@
static char name[NAMELEN];
static char team;
static int enter_status;
- static int socklen;
+ static socklen_t socklen;
static u_long machine;
- static u_long uid;
+ static u_int32_t uid;
static SOCKET sockstruct;
--- hunt/huntd/ctl.c
+++ hunt/huntd/ctl.c
-@@ -44,7 +44,7 @@
+@@ -69,7 +69,7 @@
void
open_ctl()
{
@@ -209,9 +71,9 @@
ctl_addr.sin_addr = my_machine_addr;
--- hunt/huntd/driver.c
+++ hunt/huntd/driver.c
-@@ -65,10 +65,10 @@
+@@ -89,10 +89,10 @@
+ {
PLAYER *pp;
- int had_char;
# ifdef INTERNET
- u_short msg;
- short port_num, reply;
@@ -222,9 +84,9 @@
+ socklen_t namelen;
+ SOCKET test;
# endif
- static fd_set read_fds;
static FLAG first = TRUE;
-@@ -245,11 +245,11 @@
+ static FLAG server = FALSE;
+@@ -258,11 +258,11 @@
static void
init()
{
@@ -240,7 +102,7 @@
# endif
# ifndef DEBUG
-@@ -899,11 +899,11 @@
+@@ -901,11 +901,11 @@
static void
send_stats()
{
@@ -257,52 +119,6 @@
/*
* Get the output stream ready
---- monop/misc.c
-+++ monop/misc.c
-@@ -57,7 +57,7 @@
- int com;
-
- for (;;)
-- if ((com=getinp(prompt, yn)) < 2)
-+ if ((com=getinp(prompt, yesno)) < 2)
- return com;
- else
- (*func[com-2])();
---- monop/monop.def
-+++ monop/monop.def
-@@ -56,7 +56,7 @@
- "", /* 16 */
- 0
- },
-- *const yn[] = { /* list of commands for yes/no answers */
-+ *const yesno[] = { /* list of commands for yes/no answers */
- "yes", /* 0 */ "no", /* 1 */
- "quit", /* 2 */ "print", /* 3 */
- "where", /* 4 */ "own holdings", /* 5 */
---- monop/monop.ext
-+++ monop/monop.ext
-@@ -40,7 +40,7 @@
-
- extern bool trading, spec, fixing, told_em;
-
--extern const char *const yn[], *const comlist[], *name_list[], *const lucky_mes[];
-+extern const char *const yesno[], *const comlist[], *name_list[], *const lucky_mes[];
-
- extern int num_play, player, num_doub, num_luck;
-
---- phantasia/fight.c
-+++ phantasia/fight.c
-@@ -10,8 +10,8 @@
- encounter(particular)
- int particular;
- {
-- bool firsthit = Player.p_blessing; /* set if player gets the
-- * first hit */
-+ volatile bool firsthit = Player.p_blessing; /* set if player gets the
-+ * first hit */
- int flockcnt = 1; /* how many time flocked */
-
- /* let others know what we are doing */
--- trek/cvntab.h
+++ trek/cvntab.h
@@ -0,0 +1,49 @@
@@ -357,12 +173,12 @@
+#endif
--- trek/getpar.h
+++ trek/getpar.h
-@@ -35,14 +35,7 @@
+@@ -31,14 +31,7 @@
* @(#)getpar.h 8.1 (Berkeley) 5/31/93
*/
--typedef void (*cmdfun) __P((int));
--struct cvntab /* used for getcodpar() paramater list */
+-typedef void (*cmdfun)(int);
+-struct cvntab /* used for getcodpar() parameter list */
-{
- const char *abrev;
- const char *full;
@@ -371,11 +187,11 @@
-};
+#include "cvntab.h"
- int getintpar __P((const char *));
- double getfltpar __P((const char *));
+ extern const struct cvntab Skitab[];
+ extern const struct cvntab Lentab[];
--- trek/trek.h
+++ trek/trek.h
-@@ -47,6 +47,8 @@
+@@ -43,6 +43,8 @@
** zero.
*/
@@ -384,11 +200,11 @@
/* external function definitions */
/********************* GALAXY **************************/
-@@ -208,6 +210,7 @@
+@@ -204,6 +206,7 @@
unsigned char x, y; /* coordinates */
};
+struct cvntab;
- extern const struct cvntab Skitab[];
- extern const struct cvntab Lentab[];
+ /*
+ * note that much of the stuff in the following structs CAN NOT
++++++ bsd-games-2.17-dab.patch ++++++
--- dab/box.cc
+++ dab/box.cc
@@ -45,7 +45,6 @@
#include "box.h"
#include "board.h"
#include "gamescreen.h"
-#include
const POINT BOX::edges[BOX::last] =
{ { 0, -1 }, { 0, 1 }, { -1, 0 }, { 1, 0 } };
++++++ bsd-games-2.13-codecleanup.diff -> bsd-games-2.17.diff ++++++
--- bsd-games/bsd-games-2.13-codecleanup.diff 2005-04-12 15:47:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/bsd-games/bsd-games-2.17.diff 2007-07-26 08:59:56.000000000 +0200
@@ -1,394 +1,24 @@
---- canfield/cfscores/cfscores.c
-+++ canfield/cfscores/cfscores.c
-@@ -127,10 +127,13 @@
- struct betinfo total;
- int i;
+--- hunt/huntd/ctl_transact.c
++++ hunt/huntd/ctl_transact.c
+@@ -48,6 +48,10 @@
+ #include "hunt.h"
+ #include "talk_ctl.h"
-+/* useless test as pw_uid is an unsigned type */
-+#if 0
- if (pw->pw_uid < 0) {
- printf("Bad uid %d\n", pw->pw_uid);
- return;
- }
++#ifndef timerclear
++#define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
+#endif
- i = lseek(dbfd, pw->pw_uid * sizeof(struct betinfo), SEEK_SET);
- if (i < 0)
- warn("lseek %s", _PATH_SCORE);
---- cribbage/crib.c
-+++ cribbage/crib.c
-@@ -111,7 +111,7 @@
- }
-
- initscr();
-- (void)signal(SIGINT, rint);
-+ (void)signal(SIGINT, quit);
- crmode();
- noecho();
-
---- cribbage/cribbage.h
-+++ cribbage/cribbage.h
-@@ -59,7 +59,7 @@
- extern BOOLEAN quiet; /* if suppress random mess */
- extern BOOLEAN playing; /* currently playing game */
-
--extern char expl[]; /* string for explanation */
-+extern char explanation[]; /* string for explanation */
-
- void addmsg __P((const char *, ...))
- __attribute__((__format__(__printf__, 1, 2)));
-@@ -108,7 +108,7 @@
- void prpeg __P((int, int, BOOLEAN));
- void prtable __P((int));
- int readchar __P((void));
--void rint __P((int)) __attribute__((__noreturn__));
-+void quit __P((int)) __attribute__((__noreturn__));
- int score __P((BOOLEAN));
- int scorehand __P((const CARD [], CARD, int, BOOLEAN, BOOLEAN));
- void shuffle __P((CARD []));
---- cribbage/extern.c
-+++ cribbage/extern.c
-@@ -52,7 +52,7 @@
- BOOLEAN quiet = FALSE; /* if suppress random mess */
- BOOLEAN rflag = FALSE; /* if all cuts random */
-
--char expl[128]; /* explanation */
-+char explanation[128]; /* explanation */
-
- int cgames = 0; /* number games comp won */
- int cscore = 0; /* comp score in this game */
---- cribbage/io.c
-+++ cribbage/io.c
-@@ -611,7 +611,7 @@
- }
-
- void
--rint(signo)
-+quit(signo)
- int signo __attribute__((__unused__));
- {
- bye();
---- cribbage/score.c
-+++ cribbage/score.c
-@@ -122,7 +122,7 @@
- CARD h[(CINHAND + 1)];
- char buf[32];
-
-- expl[0] = '\0'; /* initialize explanation */
-+ explanation[0] = '\0'; /* initialize explanation */
- score = 0;
- flag = TRUE;
- k = hand[0].suit;
-@@ -132,29 +132,29 @@
- if (hand[i].suit == starter.suit) {
- score++;
- if (do_explain)
-- strcat(expl, "His Nobs");
-+ strcat(explanation, "His Nobs");
- }
- h[i] = hand[i];
- }
-
- if (flag && n >= CINHAND) {
-- if (do_explain && expl[0] != '\0')
-- strcat(expl, ", ");
-+ if (do_explain && explanation[0] != '\0')
-+ strcat(explanation, ", ");
- if (starter.suit == k) {
- score += 5;
- if (do_explain)
-- strcat(expl, "Five-flush");
-+ strcat(explanation, "Five-flush");
- } else
- if (!crb) {
- score += 4;
-- if (do_explain && expl[0] != '\0')
-- strcat(expl, ", Four-flush");
-+ if (do_explain && explanation[0] != '\0')
-+ strcat(explanation, ", Four-flush");
- else
-- strcpy(expl, "Four-flush");
-+ strcpy(explanation, "Four-flush");
- }
- }
-- if (do_explain && expl[0] != '\0')
-- strcat(expl, ", ");
-+ if (do_explain && explanation[0] != '\0')
-+ strcat(explanation, ", ");
- h[n] = starter;
- sorthand(h, n + 1); /* sort by rank */
- i = 2 * fifteens(h, n + 1);
-@@ -162,9 +162,9 @@
- if (do_explain) {
- if (i > 0) {
- (void) sprintf(buf, "%d points in fifteens", i);
-- strcat(expl, buf);
-+ strcat(explanation, buf);
- } else
-- strcat(expl, "No fifteens");
-+ strcat(explanation, "No fifteens");
- }
- i = pairuns(h, n + 1);
- score += i;
-@@ -172,9 +172,9 @@
- if (i > 0) {
- (void) sprintf(buf, ", %d points in pairs, %d in runs",
- pairpoints, runpoints);
-- strcat(expl, buf);
-+ strcat(explanation, buf);
- } else
-- strcat(expl, ", No pairs/runs");
-+ strcat(explanation, ", No pairs/runs");
- }
- return (score);
- }
---- cribbage/support.c
-+++ cribbage/support.c
-@@ -152,7 +152,7 @@
- msg("You should have taken %d, not %d!", i, j);
- }
- if (explain)
-- msg("Explanation: %s", expl);
-+ msg("Explanation: %s", explanation);
- do_wait();
- } else
- win = chkscr(&pscore, i);
---- gomoku/makemove.c
-+++ gomoku/makemove.c
-@@ -228,7 +228,7 @@
- int i, f, r, r1, d, d1, n;
- int a, b, bmask, bmask1;
- struct spotstr *esp;
-- char *str;
-+ u_char *str;
-
- esp = NULL;
- for (r = 4; --r >= 0; ) { /* for each direction */
---- hunt/Makeconfig
-+++ hunt/Makeconfig
-@@ -57,7 +57,7 @@
- hunt_DEFS_SGI := -DINTERNET -DLOG -DBSD_RELEASE=43 -DTERMINFO -DSIGNAL_TYPE=void
- hunt_DEFS_NEXT := $(DEFS_43) -bsd -traditional -Dconst= -DSIGNAL_TYPE=int
- hunt_DEFS_OSF1 := -DINTERNET -DLOG -DBSD_RELEASE=43 -DSIGNAL_TYPE=void -D_BSD
--hunt_DEFS_LINUX := -DINTERNET -DLOG -DBSD_RELEASE=44 -DUSE_CURSES -DSIGNAL_TYPE=void
-+hunt_DEFS_LINUX := -DINTERNET -DLOG -DBSD_RELEASE=44 -DUSE_CURSES -DSIGNAL_TYPE=void -D_BSD_SOURCE
-
- hunt_DEFS := $(hunt_GAME_PARAM) $(hunt_DEFS_LINUX) -DHUNTD=\"$(SBINDIR)/huntd\"
-
---- hunt/hunt/hunt.c
-+++ hunt/hunt/hunt.c
-@@ -396,7 +396,7 @@
- u_short port_num;
- static SOCKET test;
- int test_socket;
-- int namelen;
-+ socklen_t namelen;
- char local_name[MAXHOSTNAMELEN + 1];
- static int initial = TRUE;
- static struct in_addr local_address;
---- hunt/huntd/answer.c
-+++ hunt/huntd/answer.c
-@@ -31,7 +31,7 @@
- static char name[NAMELEN];
- static char team;
- static int enter_status;
-- static int socklen;
-+ static socklen_t socklen;
- static u_long machine;
- static u_long uid;
- static SOCKET sockstruct;
---- hunt/huntd/ctl.c
-+++ hunt/huntd/ctl.c
-@@ -44,7 +44,7 @@
- void
- open_ctl()
- {
-- int length;
-+ socklen_t length;
-
- ctl_addr.sin_port = 0;
- ctl_addr.sin_addr = my_machine_addr;
---- hunt/huntd/driver.c
-+++ hunt/huntd/driver.c
-@@ -65,10 +65,10 @@
- PLAYER *pp;
- int had_char;
- # ifdef INTERNET
-- u_short msg;
-- short port_num, reply;
-- int namelen;
-- SOCKET test;
-+ u_short msg;
-+ short port_num, reply;
-+ socklen_t namelen;
-+ SOCKET test;
- # endif
- static fd_set read_fds;
- static FLAG first = TRUE;
-@@ -245,11 +245,11 @@
- static void
- init()
- {
-- int i;
-+ int i;
- # ifdef INTERNET
-- SOCKET test_port;
-- int msg;
-- int len;
-+ SOCKET test_port;
-+ int msg;
-+ socklen_t len;
- # endif
-
- # ifndef DEBUG
-@@ -899,11 +899,11 @@
- static void
- send_stats()
- {
-- IDENT *ip;
-- FILE *fp;
-- int s;
-- SOCKET sockstruct;
-- int socklen;
-+ IDENT *ip;
-+ FILE *fp;
-+ int s;
-+ SOCKET sockstruct;
-+ socklen_t socklen;
-
- /*
- * Get the output stream ready
---- monop/misc.c
-+++ monop/misc.c
-@@ -57,7 +57,7 @@
- int com;
-
- for (;;)
-- if ((com=getinp(prompt, yn)) < 2)
-+ if ((com=getinp(prompt, yesno)) < 2)
- return com;
- else
- (*func[com-2])();
---- monop/monop.def
-+++ monop/monop.def
-@@ -56,7 +56,7 @@
- "", /* 16 */
- 0
- },
-- *const yn[] = { /* list of commands for yes/no answers */
-+ *const yesno[] = { /* list of commands for yes/no answers */
- "yes", /* 0 */ "no", /* 1 */
- "quit", /* 2 */ "print", /* 3 */
- "where", /* 4 */ "own holdings", /* 5 */
---- monop/monop.ext
-+++ monop/monop.ext
-@@ -40,7 +40,7 @@
-
- extern bool trading, spec, fixing, told_em;
-
--extern const char *const yn[], *const comlist[], *name_list[], *const lucky_mes[];
-+extern const char *const yesno[], *const comlist[], *name_list[], *const lucky_mes[];
-
- extern int num_play, player, num_doub, num_luck;
-
---- phantasia/fight.c
-+++ phantasia/fight.c
-@@ -10,8 +10,8 @@
- encounter(particular)
- int particular;
- {
-- bool firsthit = Player.p_blessing; /* set if player gets the
-- * first hit */
-+ volatile bool firsthit = Player.p_blessing; /* set if player gets the
-+ * first hit */
- int flockcnt = 1; /* how many time flocked */
-
- /* let others know what we are doing */
---- trek/cvntab.h
-+++ trek/cvntab.h
-@@ -0,0 +1,49 @@
-+/* $NetBSD: cvntab.h,v 1.6 1999/09/08 21:18:01 jsm Exp $ */
-+
-+/*
-+ * Copyright (c) 1980, 1993
-+ * The Regents of the University of California. 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. All advertising materials mentioning features or use of this software
-+ * must display the following acknowledgement:
-+ * This product includes software developed by the University of
-+ * California, Berkeley and its contributors.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-+ *
-+ * @(#)cvntab.h 8.1 (Berkeley) 5/31/93
-+ */
-+
-+#ifndef CVNTAB_H
-+#define CVNTAB_H
+
-+typedef void (*cmdfun) __P((int));
-+struct cvntab /* used for getcodpar() paramater list */
-+{
-+ const char *abrev;
-+ const char *full;
-+ cmdfun value;
-+ int value2;
-+};
-+#endif
---- trek/getpar.h
-+++ trek/getpar.h
-@@ -35,14 +35,7 @@
- * @(#)getpar.h 8.1 (Berkeley) 5/31/93
- */
-
--typedef void (*cmdfun) __P((int));
--struct cvntab /* used for getcodpar() paramater list */
--{
-- const char *abrev;
-- const char *full;
-- cmdfun value;
-- int value2;
--};
-+#include "cvntab.h"
-
- int getintpar __P((const char *));
- double getfltpar __P((const char *));
---- trek/trek.h
-+++ trek/trek.h
-@@ -47,6 +47,8 @@
- ** zero.
- */
-
-+#include "cvntab.h"
-+
- /* external function definitions */
-
- /********************* GALAXY **************************/
-@@ -208,6 +210,7 @@
- unsigned char x, y; /* coordinates */
- };
+ #define CTL_WAIT 2 /* time to wait for a response, in seconds */
+ #define MAX_RETRY 5
-+struct cvntab;
-
- extern const struct cvntab Skitab[];
- extern const struct cvntab Lentab[];
+--- phantasia/Makefrag
++++ phantasia/Makefrag
+@@ -44,7 +44,7 @@
+ cp phantasia/$$f $(INSTALL_PREFIX)$(PHANTASIA_DIR)/$$f; \
+ $(INSTALL_SCORE_FILE) $(PHANTASIA_DIR)/$$f; done)
+ (set -e; for f in $(phantasia_VFILES2); do \
+- if [ ! -e $(PHANTASIA_DIR)/$$f ]; then \
++ if [ ! -e $(INSTALL_PREFIX)$(PHANTASIA_DIR)/$$f ]; then \
+ cp phantasia/$$f $(INSTALL_PREFIX)$(PHANTASIA_DIR)/$$f; fi; done; \
+ $(INSTALL_SCORE_FILE) $(PHANTASIA_DIR)/scoreboard; \
+ $(INSTALL_SCORE_FILE) -p $(PHANTASIA_DIR)/characs)
++++++ bsd-games-2.13-execl.diff -> bsd-games-2.17-execl.diff ++++++
--- bsd-games/bsd-games-2.13-execl.diff 2005-01-23 17:29:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/bsd-games/bsd-games-2.17-execl.diff 2007-07-26 14:33:37.000000000 +0200
@@ -1,48 +1,22 @@
---- bsd-games-2.13/atc/input.c.xx 2005-01-23 17:27:19.955300223 +0100
-+++ bsd-games-2.13/atc/input.c 2005-01-23 17:27:54.439140918 +0100
-@@ -326,10 +326,10 @@
- base = shell;
- else
- base++;
-- execl(shell, base, 0);
-+ execl(shell, base, NULL);
- }
- else
-- execl(_PATH_BSHELL, "sh", 0);
-+ execl(_PATH_BSHELL, "sh", NULL);
-
- exit(0); /* oops */
- }
---- bsd-games-2.13/backgammon/backgammon/main.c.xx 2005-01-23 17:26:58.630649163 +0100
-+++ bsd-games-2.13/backgammon/backgammon/main.c 2005-01-23 17:27:07.994986288 +0100
-@@ -157,7 +157,7 @@
+--- bsd-games-2.17/backgammon/backgammon/main.c
++++ bsd-games-2.17/backgammon/backgammon/main.c
+@@ -153,7 +153,7 @@
if (yorn(0)) {
fixtty(&old); /* restore tty */
-- execl(TEACH, "teachgammon", args[1]?args:0, 0);
-+ execl(TEACH, "teachgammon", args[1]?args:NULL, NULL);
+- execl(TEACH, "teachgammon", args[1]?args:0,
++ execl(TEACH, "teachgammon", args[1]?args:NULL,
+ (char *) 0);
tflag = 0; /* error! */
- writel(noteach);
---- bsd-games-2.13/backgammon/teachgammon/teach.c.xx 2005-01-23 17:28:09.867257150 +0100
-+++ bsd-games-2.13/backgammon/teachgammon/teach.c 2005-01-23 17:28:23.374501855 +0100
-@@ -156,7 +156,7 @@
+--- bsd-games-2.17/backgammon/teachgammon/teach.c
++++ bsd-games-2.17/backgammon/teachgammon/teach.c
+@@ -152,7 +152,7 @@
else
writec('\n');
fixtty(&old);
-- execl(EXEC, "backgammon", "-n", args[1]?args:0, 0);
-+ execl(EXEC, "backgammon", "-n", args[1]?args:NULL, NULL);
+- execl(EXEC, "backgammon", "-n", args[1]?args:0, (char *) 0);
++ execl(EXEC, "backgammon", "-n", args[1]?args:NULL, (char *) 0);
writel("Help! Backgammon program is missing\007!!\n");
exit(1);
}
---- bsd-games-2.13/phantasia/misc.c.xx 2005-01-23 17:28:41.003406322 +0100
-+++ bsd-games-2.13/phantasia/misc.c 2005-01-23 17:28:51.298681074 +0100
-@@ -671,7 +671,7 @@
- if (ch == 'Y') {
- cleanup(FALSE);
- execl(_PATH_GAMEPROG, "phantasia", "-s",
-- (Wizard ? "-S" : (char *) NULL), 0);
-+ (Wizard ? "-S" : (char *) NULL), NULL);
- exit(0);
- /* NOTREACHED */
- }
++++++ bsd-games-2.13-inc.diff -> bsd-games-2.17-inc.diff ++++++
++++++ bsd-games-2.13-ppc64.diff -> bsd-games-2.17-ppc64.diff ++++++
--- bsd-games/bsd-games-2.13-ppc64.diff 2003-05-27 16:34:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/bsd-games/bsd-games-2.17-ppc64.diff 2007-07-26 09:06:23.000000000 +0200
@@ -1,6 +1,6 @@
---- bsd-games-2.13/backgammon/backgammon/main.c
-+++ bsd-games-2.13/backgammon/backgammon/main.c
-@@ -103,6 +103,7 @@
+--- bsd-games-2.17/backgammon/backgammon/main.c
++++ bsd-games-2.17/backgammon/backgammon/main.c
+@@ -99,6 +99,7 @@
char c; /* non-descript character storage */
long t; /* time for random num generator */
@@ -8,7 +8,7 @@
/* revoke setgid privileges */
setregid(getgid(), getgid());
-@@ -141,15 +142,15 @@
+@@ -137,15 +138,15 @@
/* check if restored game and save flag for later */
if ((rfl = rflag) != 0) {
@@ -27,7 +27,7 @@
if (aflag) { /* print rules */
writel(rules);
-@@ -165,7 +166,7 @@
+@@ -162,7 +163,7 @@
writel(need);
if (yorn(0)) { /* print instructions */
clear();
@@ -36,7 +36,7 @@
}
}
}
-@@ -230,7 +231,7 @@
+@@ -227,7 +228,7 @@
} else
if (!aflag)
/* pause to read message */
@@ -45,7 +45,7 @@
wrboard(); /* print board */
-@@ -423,7 +424,7 @@
+@@ -420,7 +421,7 @@
curmove(20, 0);
else
writec('\n');
@@ -54,9 +54,9 @@
if (tflag)
curmove(cturn == -1 ? 18 : 19, 0);
else
---- bsd-games-2.13/backgammon/backgammon/text.c
-+++ bsd-games-2.13/backgammon/backgammon/text.c
-@@ -111,7 +111,7 @@
+--- bsd-games-2.17/backgammon/backgammon/text.c
++++ bsd-games-2.17/backgammon/backgammon/text.c
+@@ -107,7 +107,7 @@
0};
int
@@ -65,20 +65,20 @@
const char *const *t;
{
int i;
---- bsd-games-2.13/backgammon/common_source/back.h
-+++ bsd-games-2.13/backgammon/common_source/back.h
-@@ -178,7 +178,7 @@
- void roll __P((void));
- int rsetbrd __P((void));
- void save __P((int));
--int text __P((const char *const *));
-+int backgammon_text __P((const char *const *));
- void wrboard __P((void));
- void wrbsub __P((void));
- void wrhit __P((int));
---- bsd-games-2.13/backgammon/common_source/table.c
-+++ bsd-games-2.13/backgammon/common_source/table.c
-@@ -266,7 +266,7 @@
+--- bsd-games-2.17/backgammon/common_source/back.h
++++ bsd-games-2.17/backgammon/common_source/back.h
+@@ -174,7 +174,7 @@
+ void roll(void);
+ int rsetbrd(void);
+ void save(int);
+-int text(const char *const *);
++int backgammon_text(const char *const *);
+ void wrboard(void);
+ void wrbsub(void);
+ void wrhit(int);
+--- bsd-games-2.17/backgammon/common_source/table.c
++++ bsd-games-2.17/backgammon/common_source/table.c
+@@ -262,7 +262,7 @@
curmove(20, 0);
else
writec('\n');
@@ -87,9 +87,9 @@
if (tflag) {
curmove(cturn == -1 ? 18 : 19, 39);
} else {
---- bsd-games-2.13/backgammon/teachgammon/teach.c
-+++ bsd-games-2.13/backgammon/teachgammon/teach.c
-@@ -93,9 +93,9 @@
+--- bsd-games-2.17/backgammon/teachgammon/teach.c
++++ bsd-games-2.17/backgammon/teachgammon/teach.c
+@@ -89,9 +89,9 @@
bg_raw.c_oflag &= ~(ONLCR | OXTABS);
clear();
}
@@ -102,7 +102,7 @@
if (i == 0)
i = 2;
init();
-@@ -105,42 +105,42 @@
+@@ -101,42 +101,42 @@
leave();
case 2:
@@ -155,9 +155,9 @@
break;
}
tutor();
---- bsd-games-2.13/backgammon/teachgammon/ttext2.c
-+++ bsd-games-2.13/backgammon/teachgammon/ttext2.c
-@@ -131,7 +131,7 @@
+--- bsd-games-2.17/backgammon/teachgammon/ttext2.c
++++ bsd-games-2.17/backgammon/teachgammon/ttext2.c
+@@ -127,7 +127,7 @@
int
@@ -166,7 +166,7 @@
const char *const *txt;
{
const char *const *begin;
-@@ -162,7 +162,7 @@
+@@ -158,7 +158,7 @@
clear();
} else
writec('\n');
@@ -175,9 +175,9 @@
writel(prompt);
continue;
}
---- bsd-games-2.13/backgammon/teachgammon/tutor.c
-+++ bsd-games-2.13/backgammon/teachgammon/tutor.c
-@@ -89,7 +89,7 @@
+--- bsd-games-2.17/backgammon/teachgammon/tutor.c
++++ bsd-games-2.17/backgammon/teachgammon/tutor.c
+@@ -85,7 +85,7 @@
}
if (tflag)
curmove(18, 0);
++++++ bsd-games-2.13-strictaliasing.diff -> bsd-games-2.17-strictaliasing.diff ++++++
--- bsd-games/bsd-games-2.13-strictaliasing.diff 2005-10-11 11:08:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/bsd-games/bsd-games-2.17-strictaliasing.diff 2007-07-26 14:29:22.000000000 +0200
@@ -1,62 +1,31 @@
---- bsd-games-2.13/hunt/hunt/hunt.c
-+++ bsd-games-2.13/hunt/hunt/hunt.c
-@@ -362,7 +362,7 @@
+--- bsd-games-2.17/hunt/hunt/hunt.c
++++ bsd-games-2.17/hunt/hunt/hunt.c
+@@ -383,7 +383,7 @@
int
broadcast_vec(s, vector)
int s; /* socket */
- struct sockaddr **vector;
+ SOCKET **vector;
{
- char if_buf[BUFSIZ];
- struct ifconf ifc;
-@@ -377,7 +377,7 @@
- return 0;
- vec_cnt = 0;
- n = ifc.ifc_len / sizeof (struct ifreq);
-- *vector = (struct sockaddr *) malloc(n * sizeof (struct sockaddr));
-+ *vector = (SOCKET *) malloc(n * sizeof (struct sockaddr));
+ int vec_cnt;
+ struct ifaddrs *ifp, *ip;
+@@ -398,7 +398,7 @@
+ (ip->ifa_flags & IFF_BROADCAST))
+ vec_cnt++;
+
+- *vector = (struct sockaddr *)
++ *vector = (SOCKET *)
+ malloc(vec_cnt * sizeof(struct sockaddr_in));
if (*vector == NULL)
leave(1, "Out of memory!");
- for (ifr = ifc.ifc_req; n != 0; n--, ifr++)
-@@ -465,7 +465,7 @@
-
- # ifdef BROADCAST
- if (initial)
-- brdc = broadcast_vec(test_socket, (struct sockaddr **) &brdv);
-+ brdc = broadcast_vec(test_socket, &brdv);
-
- if (brdc <= 0) {
- initial = FALSE;
---- bsd-games-2.13/tetris/input.c
-+++ bsd-games-2.13/tetris/input.c
-@@ -79,6 +79,10 @@
- register struct timeval *tvp;
- {
- int i;
-+ union {
-+ int *int_p;
-+ fd_set *fd_set_p;
-+ } unp = { &i };
- struct timeval starttv, endtv, *s;
- #define NILTZ ((struct timezone *)0)
-
-@@ -95,7 +99,7 @@
- s = 0;
- again:
- i = 1;
-- switch (select(1, (fd_set *)&i, (fd_set *)0, (fd_set *)0, s)) {
-+ switch (select(1, unp.fd_set_p, NULL, NULL, s)) {
-
- case -1:
- if (tvp == 0)
---- bsd-games-2.13/hunt/huntd/hunt.h
-+++ bsd-games-2.13/hunt/huntd/hunt.h
-@@ -395,7 +395,7 @@
- int answer __P((void));
- void bad_con __P((void)) __attribute__((__noreturn__));
- void bad_ver __P((void)) __attribute__((__noreturn__));
--int broadcast_vec __P((int, struct sockaddr **));
-+int broadcast_vec __P((int, SOCKET **));
- void ce __P((PLAYER *));
- void cgoto __P((PLAYER *, int, int));
- void check __P((PLAYER *, int, int));
+--- bsd-games-2.17/hunt/huntd/hunt.h
++++ bsd-games-2.17/hunt/huntd/hunt.h
+@@ -420,7 +420,7 @@
+ int answer(void);
+ void bad_con(void) __attribute__((__noreturn__));
+ void bad_ver(void) __attribute__((__noreturn__));
+-int broadcast_vec(int, struct sockaddr **);
++int broadcast_vec(int, SOCKET **);
+ void ce(PLAYER *);
+ void cgoto(PLAYER *, int, int);
+ void check(PLAYER *, int, int);
++++++ bsd-games-2.13.tar.bz2 -> bsd-games-2.17.tar.bz2 ++++++
++++ 82797 lines of diff (skipped)
++++++ hunt-64bit.patch ++++++
--- /var/tmp/diff_new_pack.q16349/_old 2007-08-03 21:54:46.000000000 +0200
+++ /var/tmp/diff_new_pack.q16349/_new 2007-08-03 21:54:46.000000000 +0200
@@ -1,10 +1,10 @@
--- hunt/hunt/playit.c
+++ hunt/hunt/playit.c
-@@ -82,13 +82,13 @@
+@@ -108,13 +108,13 @@
{
int ch;
int y, x;
-- long version;
+- u_int32_t version;
+ uint32_t version;
if (read(Socket, (char *) &version, LONGLEN) != LONGLEN) {
@@ -16,12 +16,12 @@
bad_ver();
/* NOTREACHED */
}
-@@ -620,13 +620,13 @@
+@@ -643,13 +643,13 @@
void
do_message()
{
-- long version;
-+ uint32_t version;
+- u_int32_t version;
++ uint32_t version;
if (read(Socket, (char *) &version, LONGLEN) != LONGLEN) {
bad_con();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org