[pkg-ggz-maintainers] Bug#624580: ggz-server: diff for NMU version 0.0.14.1-1.6
Ansgar Burchardt
ansgar at debian.org
Sat Jan 21 13:55:29 UTC 2012
tags 624580 + pending
thanks
Dear maintainer,
even though I already asked for removal of this package, I've prepared an NMU
for ggz-server (versioned as 0.0.14.1-1.6) and uploaded it to DELAYED/2. Please
feel free to tell me if I should delay it longer.
I fixed the open RC bug for now as it is not clear how long we will need to
keep ggz-server for widelands (#655402).
Regards.
diff -u ggz-server-0.0.14.1/debian/control ggz-server-0.0.14.1/debian/control
--- ggz-server-0.0.14.1/debian/control
+++ ggz-server-0.0.14.1/debian/control
@@ -12,7 +12,7 @@
Package: ggzd
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: ggz-game-servers
Description: GGZ Gaming Zone: main server
The GGZ server (ggzd) is the central part of the server-side
@@ -29,7 +29,7 @@
Package: ggz-game-servers
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: ggzd
Description: GGZ Gaming Zone: game servers collection
A number of games can be played online via GGZ. This package provides
@@ -58,7 +58,7 @@
Package: libggzdmod6
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: GGZ Gaming Zone: game backend library
The ggzdmod library implements the communication between the main GGZ
server (ggzd) and the game servers. Games use it to receive information
@@ -74,7 +74,7 @@
Package: libggzdmod-dev
Architecture: any
Section: libdevel
-Depends: libggzdmod6 (= ${binary:Version}), libggz-dev (>= ${source:Upstream-Version})
+Depends: ${misc:Depends}, libggzdmod6 (= ${binary:Version}), libggz-dev (>= ${source:Upstream-Version})
Description: GGZ Gaming Zone: game backend library - development files
The ggzdmod library implements the communication between the main GGZ
server (ggzd) and the game servers. Games use it to receive information
@@ -90,7 +90,7 @@
Package: libggzdmod++1
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: GGZ Gaming Zone: game backend class library
The ggzdmod library implements the communication between the main GGZ
server (ggzd) and the game servers. Games use it to receive information
@@ -107,7 +107,7 @@
Package: libggzdmod++-dev
Architecture: any
Section: libdevel
-Depends: libggzdmod++1 (= ${binary:Version}), libggzdmod-dev (= ${binary:Version}), libggz-dev (>= ${source:Upstream-Version})
+Depends: ${misc:Depends}, libggzdmod++1 (= ${binary:Version}), libggzdmod-dev (= ${binary:Version}), libggz-dev (>= ${source:Upstream-Version})
Description: GGZ Gaming Zone: game backend class library - development files
The ggzdmod library implements the communication between the main GGZ
server (ggzd) and the game servers. Games use it to receive information
diff -u ggz-server-0.0.14.1/debian/changelog ggz-server-0.0.14.1/debian/changelog
--- ggz-server-0.0.14.1/debian/changelog
+++ ggz-server-0.0.14.1/debian/changelog
@@ -1,3 +1,15 @@
+ggz-server (0.0.14.1-1.6) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix build failure with gcc-4.6. (Closes: #624580) (LP: #770764)
+ Thanks to Andreas Moog <amoog at ubuntu.com> for the patch.
+ + new patch: ftbfs_gcc46.patch
+ * Fix build failure with -Werror=format-security.
+ + new patch: format-security.diff
+ * debian/control: Add ${misc:Depends}.
+
+ -- Ansgar Burchardt <ansgar at debian.org> Sat, 21 Jan 2012 14:50:26 +0100
+
ggz-server (0.0.14.1-1.5) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- ggz-server-0.0.14.1.orig/debian/patches/format-security.diff
+++ ggz-server-0.0.14.1/debian/patches/format-security.diff
@@ -0,0 +1,98 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Subject: fix build failure with -Werror=format-security
+
+--- ggz-server.orig/ggzd/players.c
++++ ggz-server/ggzd/players.c
+@@ -971,7 +971,7 @@
+
+ for (i = first; i < last; i++) {
+ if (table->seat_types[i] == GGZ_SEAT_PLAYER) {
+- snprintf(entry.handle, sizeof(entry.handle), player->name);
++ snprintf(entry.handle, sizeof(entry.handle), "%s", player->name);
+ status = ggzdb_player_get(&entry);
+
+ do_send = 1;
+@@ -982,7 +982,7 @@
+ if (status == GGZDB_NO_ERROR) {
+ realname = ggz_strdup(entry.name);
+
+- snprintf(extentry.handle, sizeof(extentry.handle), player->name);
++ snprintf(extentry.handle, sizeof(extentry.handle), "%s", player->name);
+ status = ggzdb_player_get_extended(&extentry);
+ if (status == GGZDB_NO_ERROR) {
+ photo = ggz_strdup(extentry.photo);
+@@ -1552,7 +1552,7 @@
+ if (ggz_perms_is_set(rcvr->perms, perm) != set) {
+ ggzdbPlayerEntry entry;
+
+- snprintf(entry.handle, sizeof(entry.handle), rcvr->name);
++ snprintf(entry.handle, sizeof(entry.handle), "%s", rcvr->name);
+ if (ggzdb_player_get(&entry) != GGZDB_NO_ERROR) {
+ pthread_rwlock_unlock(&rcvr->lock);
+ if (net_send_admin_result(player->client->net,
+--- ggz-server.orig/ggzd/stats.c
++++ ggz-server/ggzd/stats.c
+@@ -264,7 +264,7 @@
+ return;
+ }
+
+- snprintf(player.handle, sizeof(player.handle),
++ snprintf(player.handle, sizeof(player.handle), "%s",
+ report->names[i]);
+
+ /* Find out player type */
+@@ -306,7 +306,7 @@
+ strcpy(stats[i].game, game_name);
+
+ if (report->types[i] == GGZ_SEAT_PLAYER) {
+- snprintf(stats[i].player, sizeof(stats[i].player),
++ snprintf(stats[i].player, sizeof(stats[i].player), "%s",
+ report->names[i]);
+ } else if (report->types[i] == GGZ_SEAT_BOT) {
+ if(!ggz_strcmp(report->names[i], "AI")) {
+--- ggz-server.orig/ggzd/login.c
++++ ggz-server/ggzd/login.c
+@@ -74,7 +74,7 @@
+
+ new_pw[0] = '\0';
+ if(password)
+- snprintf(new_pw, sizeof(new_pw), password);
++ snprintf(new_pw, sizeof(new_pw), "%s", password);
+
+ dbg_msg(GGZ_DBG_CONNECTION, "Player %p attempting login as %d",
+ player, type);
+--- ggz-server.orig/ggzd/net.c
++++ ggz-server/ggzd/net.c
+@@ -370,7 +370,7 @@
+
+ for (i = 0; i < num; i++) {
+ line = motd_get_line(i);
+- _net_send_line(net, line);
++ _net_send_line(net, "%s", line);
+ ggz_free(line);
+ }
+
+--- ggz-server.orig/game_servers/ggzcards/games/bridge.c
++++ ggz-server/game_servers/ggzcards/games/bridge.c
+@@ -585,7 +585,7 @@
+ /* TODO: vulnerable, etc. */
+
+ set_global_message("", "%s", buf);
+- set_global_message("Hand Score", buf2);
++ set_global_message("Hand Score", "%s", buf2);
+ bridge_set_score_message();
+
+ BRIDGE.declarer = BRIDGE.dummy = -1;
+--- ggz-server.orig/game_servers/ggzcards/games/euchre.c
++++ ggz-server/game_servers/ggzcards/games/euchre.c
+@@ -443,8 +443,8 @@
+
+ snprintf(buf, sizeof(buf), msg, tricks, value);
+ /* This message is quickly overwritten by the up-card message. Ugh. */
+- set_global_message("", buf);
+- set_global_message("Scoring History", buf); /* FIXME: this should
++ set_global_message("", "%s", buf);
++ set_global_message("Scoring History", "%s", buf); /* FIXME: this should
+ be added to the
+ history, not
+ overwrite it. */
only in patch2:
unchanged:
--- ggz-server-0.0.14.1.orig/debian/patches/ftbfs_gcc46.patch
+++ ggz-server-0.0.14.1/debian/patches/ftbfs_gcc46.patch
@@ -0,0 +1,16 @@
+Description: gcc4.6 cleans up some more headers, explicitly add those missing
+Author: Andreas Moog <amoog at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/770764
+Bug: https://bugs.ggzgamingzone.org/mantis/view.php?id=127
+Bug-Debian: http://bugs.debian.org/624580
+
+--- ggz-server//game_servers/muehle/qtserv/qlist.h 2011-04-29 21:36:27.697134000 +0200
++++ ggz-server.new//game_servers/muehle/qtserv/qlist.h 2011-04-29 21:40:15.130858547 +0200
+@@ -2,6 +2,7 @@
+ #define QLIST_H
+
+ #include <list>
++#include <cstdlib>
+
+ template<class T> class QList : public std::list<T>
+ {
More information about the pkg-ggz-maintainers
mailing list