[pkg-ggz-commits] r397 - in branches/ggz-server/0.0.14.1-lenny/debian: . patches
josef-guest at alioth.debian.org
josef-guest at alioth.debian.org
Tue Jan 6 08:32:49 UTC 2009
Author: josef-guest
Date: 2009-01-06 08:32:49 +0000 (Tue, 06 Jan 2009)
New Revision: 397
Added:
branches/ggz-server/0.0.14.1-lenny/debian/patches/database-m4.patch
branches/ggz-server/0.0.14.1-lenny/debian/patches/snprintf.diff
Modified:
branches/ggz-server/0.0.14.1-lenny/debian/changelog
branches/ggz-server/0.0.14.1-lenny/debian/control
branches/ggz-server/0.0.14.1-lenny/debian/rules
branches/ggz-server/0.0.14.1-lenny/debian/svn-deblayout
Log:
- integrate Neil's NMU stuff
- new patch for sn?printf issues
Modified: branches/ggz-server/0.0.14.1-lenny/debian/changelog
===================================================================
--- branches/ggz-server/0.0.14.1-lenny/debian/changelog 2009-01-05 22:29:58 UTC (rev 396)
+++ branches/ggz-server/0.0.14.1-lenny/debian/changelog 2009-01-06 08:32:49 UTC (rev 397)
@@ -1,3 +1,18 @@
+ggz-server (0.0.14.1-2) UNRELEASED; urgency=low
+
+ * Acknowledge NMU.
+ * Fix snprintf buffer dependency issue discovered by Kees Cook
+
+ -- Josef Spillner <josef at ggzgamingzone.org> Tue, 06 Jan 2008 09:20:15 +0100
+
+ggz-server (0.0.14.1-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Improve the database.m4 fix to migrate to libdb4.6
+ instead of 4.4 {request from Steve Langasek.}
+
+ -- Neil Williams <codehelp at debian.org> Sat, 30 Aug 2008 22:28:31 +0100
+
ggz-server (0.0.14.1-1) unstable; urgency=low
* New upstream release
Modified: branches/ggz-server/0.0.14.1-lenny/debian/control
===================================================================
--- branches/ggz-server/0.0.14.1-lenny/debian/control 2009-01-05 22:29:58 UTC (rev 396)
+++ branches/ggz-server/0.0.14.1-lenny/debian/control 2009-01-06 08:32:49 UTC (rev 397)
@@ -4,7 +4,8 @@
Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
Standards-Version: 3.7.3
-Build-Depends: cdbs, debhelper (>= 5), libavahi-client-dev, libggz-dev (>= 0.0.14), libexpat1-dev (>= 1.95.6), libdb-dev, libfam-dev, lsb-base (>= 3.0-3)
+Build-Depends: autoconf, automake | automake1.9, cdbs, debhelper (>= 5), libtool, libavahi-client-dev, libggz-dev (>= 0.0.14),
+ libexpat1-dev (>= 1.95.6), libdb-dev, libfam-dev, lsb-base (>= 3.0-3)
Vcs-Svn: svn://svn.debian.org/pkg-ggz/trunk/ggz-server/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ggz/trunk/ggz-server/
Homepage: http://www.ggzgamingzone.org/
Added: branches/ggz-server/0.0.14.1-lenny/debian/patches/database-m4.patch
===================================================================
--- branches/ggz-server/0.0.14.1-lenny/debian/patches/database-m4.patch (rev 0)
+++ branches/ggz-server/0.0.14.1-lenny/debian/patches/database-m4.patch 2009-01-06 08:32:49 UTC (rev 397)
@@ -0,0 +1,119 @@
+--- ggz-server-0.0.14.1/m4/database.m4 2008-08-29 21:40:35.000000000 +0100
++++ ggz-server.new/m4/database.m4 2008-08-29 21:41:17.000000000 +0100
+@@ -128,9 +128,78 @@
+ minor=$(grep DB_VERSION_MINOR /usr/include/$db4inc 2>/dev/null | cut -f 3)
+
+ dnl Check for db4 libraries
+- dnl Version priority: db4.4, db4.3, db4.2, db4.1, db4.0, db (unversioned)
++ dnl Version priority: db4.7, db4.6, db4.5, db4.4, db4.3, db4.2, db4.1, db4.0, db (unversioned)
+
+- if test "$db4lib" = "" || test "$minor" = "4"; then
++ if test "$db4lib" = "" && test "$minor" = "7"; then
++ AC_CHECK_LIB(db-4.7, db_env_create_4007,
++ [
++ db4lib="-ldb-4.7"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db-4.7, db_env_create,
++ [
++ db4lib="-ldb-4.7"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db, db_env_create_4007,
++ [
++ db4lib="-ldb"
++ database=db4
++ ],
++ [])
++ ])
++ ])
++ fi
++
++ if test "$db4lib" = "" && test "$minor" = "6"; then
++ AC_CHECK_LIB(db-4.6, db_env_create_4006,
++ [
++ db4lib="-ldb-4.6"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db-4.6, db_env_create,
++ [
++ db4lib="-ldb-4.6"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db, db_env_create_4006,
++ [
++ db4lib="-ldb"
++ database=db4
++ ],
++ [])
++ ])
++ ])
++ fi
++
++ if test "$db4lib" = "" && test "$minor" = "5"; then
++ AC_CHECK_LIB(db-4.5, db_env_create_4005,
++ [
++ db4lib="-ldb-4.5"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db-4.5, db_env_create,
++ [
++ db4lib="-ldb-4.5"
++ database=db4
++ ],
++ [
++ AC_CHECK_LIB(db, db_env_create_4005,
++ [
++ db4lib="-ldb"
++ database=db4
++ ],
++ [])
++ ])
++ ])
++ fi
++
++ if test "$db4lib" = "" && test "$minor" = "4"; then
+ AC_CHECK_LIB(db-4.4, db_env_create_4004,
+ [
+ db4lib="-ldb-4.4"
+@@ -153,7 +222,7 @@
+ ])
+ fi
+
+- if test "$db4lib" = "" || test "$minor" = "3"; then
++ if test "$db4lib" = "" && test "$minor" = "3"; then
+ AC_CHECK_LIB(db-4.3, db_env_create_4003,
+ [
+ db4lib="-ldb-4.3"
+@@ -176,7 +245,7 @@
+ ])
+ fi
+
+- if test "$db4lib" = "" || test "$minor" = "2"; then
++ if test "$db4lib" = "" && test "$minor" = "2"; then
+ AC_CHECK_LIB(db-4.2, db_env_create_4002,
+ [
+ db4lib="-ldb-4.2"
+@@ -199,7 +268,7 @@
+ ])
+ fi
+
+- if test "$db4lib" = "" || test "$minor" = "1"; then
++ if test "$db4lib" = "" && test "$minor" = "1"; then
+ AC_CHECK_LIB(db-4.1, db_env_create_4001,
+ [
+ db4lib="-ldb-4.1"
+@@ -222,7 +291,7 @@
+ ])
+ fi
+
+- if test "$db4lib" = "" || test "$minor" = "0"; then
++ if test "$db4lib" = "" && test "$minor" = "0"; then
+ AC_CHECK_LIB(db-4.0, db_env_create_4000,
+ [
+ db4lib="-ldb-4.0"
Added: branches/ggz-server/0.0.14.1-lenny/debian/patches/snprintf.diff
===================================================================
--- branches/ggz-server/0.0.14.1-lenny/debian/patches/snprintf.diff (rev 0)
+++ branches/ggz-server/0.0.14.1-lenny/debian/patches/snprintf.diff 2009-01-06 08:32:49 UTC (rev 397)
@@ -0,0 +1,15 @@
+Index: ai-velena.c
+===================================================================
+--- ggz-server-0.0.14.1.orig/game_servers/connectx/ai-velena.c (Revision 10820)
++++ ggz-server-0.0.14.1/game_servers/connectx/ai-velena.c (Revision 10821)
+@@ -55,7 +55,9 @@
+
+ int velena_ai_move(int column)
+ {
+- snprintf(board, sizeof(board), "%s%i", board, column);
++ char boardcpy[256];
++ strncpy(boardcpy, board, sizeof(board));
++ snprintf(board, sizeof(board), "%s%i", boardcpy, column);
+
+ /* FIXME: how can we know if a player move succeeded? */
+ /* -> check min/max column at least */
Modified: branches/ggz-server/0.0.14.1-lenny/debian/rules
===================================================================
--- branches/ggz-server/0.0.14.1-lenny/debian/rules 2009-01-05 22:29:58 UTC (rev 396)
+++ branches/ggz-server/0.0.14.1-lenny/debian/rules 2009-01-06 08:32:49 UTC (rev 397)
@@ -14,8 +14,16 @@
DEB_FIXPERMS_EXCLUDE = /var/lib/ggzd
+post-patches::
+ cp INSTALL INSTALL.upstream
+ autoreconf -if
+ mv INSTALL.upstream INSTALL
+
install/ggzd::
install -d -o games -g games debian/ggzd/var/lib/ggzd
binary-install/ggz-game-servers::
rm debian/$(cdbs_curpkg)/etc/ggzd/rooms/entry.room
+
+clean::
+ rm -f config.sub config.guess config.log
Modified: branches/ggz-server/0.0.14.1-lenny/debian/svn-deblayout
===================================================================
--- branches/ggz-server/0.0.14.1-lenny/debian/svn-deblayout 2009-01-05 22:29:58 UTC (rev 396)
+++ branches/ggz-server/0.0.14.1-lenny/debian/svn-deblayout 2009-01-06 08:32:49 UTC (rev 397)
@@ -1 +1 @@
-origDir=../../upstream
+origDir=../../../upstream
More information about the pkg-ggz-commits
mailing list