r3599 - in packages/trunk/openarena/debian: . patches
Bruno Fuddl-guestquot; Fuddl" Kleinert
fuddl-guest at alioth.debian.org
Fri Aug 10 18:03:45 UTC 2007
Author: fuddl-guest
Date: 2007-08-10 18:03:44 +0000 (Fri, 10 Aug 2007)
New Revision: 3599
Removed:
packages/trunk/openarena/debian/patches/10_fix-gcc4.2-compilation.dpatch
packages/trunk/openarena/debian/patches/10_fix_buffer_overflow_and_format_string_bug_in_auth_server_response.dpatch
Modified:
packages/trunk/openarena/debian/changelog
packages/trunk/openarena/debian/control
packages/trunk/openarena/debian/patches/00list
Log:
remove out-dated patches
Modified: packages/trunk/openarena/debian/changelog
===================================================================
--- packages/trunk/openarena/debian/changelog 2007-08-09 22:32:57 UTC (rev 3598)
+++ packages/trunk/openarena/debian/changelog 2007-08-10 18:03:44 UTC (rev 3599)
@@ -6,11 +6,15 @@
* Adjuste Debian menu file to the new menu structure
* Improved README.Debian
* Unified any kind of "Open Arena" spelling to "OpenArena"
+ * 10_fix_buffer_overflow_and_format_string_bug_in_auth_server_response.dpatch
+ merged with upstream
+ * 10_fix-gcc4.2-compilation.dpatch fixed by upstream
+ * Add build dependency libvorbis-dev
[ Cyril Brulebois ]
* Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
- -- Bruno "Fuddl" Kleinert <fuddl at gmx.de> Sun, 8 Jul 2007 11:55:56 +0200
+ -- Bruno "Fuddl" Kleinert <fuddl at gmx.de> Fri, 10 Aug 2007 19:54:35 +0200
openarena (0.6.0-4) unstable; urgency=low
Modified: packages/trunk/openarena/debian/control
===================================================================
--- packages/trunk/openarena/debian/control 2007-08-09 22:32:57 UTC (rev 3598)
+++ packages/trunk/openarena/debian/control 2007-08-10 18:03:44 UTC (rev 3599)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Bruno "Fuddl" Kleinert <fuddl at gmx.de>
-Build-Depends: debhelper (>= 5), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl3-dev, sharutils, dpatch
+Build-Depends: debhelper (>= 5), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl3-dev, sharutils, dpatch, libvorbis-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openarena/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/openarena/?op=log
Modified: packages/trunk/openarena/debian/patches/00list
===================================================================
--- packages/trunk/openarena/debian/patches/00list 2007-08-09 22:32:57 UTC (rev 3598)
+++ packages/trunk/openarena/debian/patches/00list 2007-08-10 18:03:44 UTC (rev 3599)
@@ -1,3 +1 @@
-10_fix_buffer_overflow_and_format_string_bug_in_auth_server_response.dpatch
10_fix_build_and_binary_on_alpha.dpatch
-10_fix-gcc4.2-compilation.dpatch
Deleted: packages/trunk/openarena/debian/patches/10_fix-gcc4.2-compilation.dpatch
===================================================================
--- packages/trunk/openarena/debian/patches/10_fix-gcc4.2-compilation.dpatch 2007-08-09 22:32:57 UTC (rev 3598)
+++ packages/trunk/openarena/debian/patches/10_fix-gcc4.2-compilation.dpatch 2007-08-10 18:03:44 UTC (rev 3599)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix-gcc4.2-compilation.dpatch by Bruno "Fuddl" Kleinert <fuddl at gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes compilation error introduced by gcc4.2
-
- at DPATCH@
-diff -urNad openarena-0.6.0~/code/tools/asm/cmdlib.c openarena-0.6.0/code/tools/asm/cmdlib.c
---- openarena-0.6.0~/code/tools/asm/cmdlib.c 2007-06-22 17:41:00.000000000 +0200
-+++ openarena-0.6.0/code/tools/asm/cmdlib.c 2007-06-22 17:44:14.038546232 +0200
-@@ -312,8 +312,6 @@
- char *ExpandPath (const char *path)
- {
- static char full[1024];
-- if (!qdir)
-- Error ("ExpandPath called without qdir set");
- if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
- strcpy( full, path );
- return full;
-@@ -325,8 +323,6 @@
- char *ExpandGamePath (const char *path)
- {
- static char full[1024];
-- if (!qdir)
-- Error ("ExpandGamePath called without qdir set");
- if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
- strcpy( full, path );
- return full;
Deleted: packages/trunk/openarena/debian/patches/10_fix_buffer_overflow_and_format_string_bug_in_auth_server_response.dpatch
===================================================================
--- packages/trunk/openarena/debian/patches/10_fix_buffer_overflow_and_format_string_bug_in_auth_server_response.dpatch 2007-08-09 22:32:57 UTC (rev 3598)
+++ packages/trunk/openarena/debian/patches/10_fix_buffer_overflow_and_format_string_bug_in_auth_server_response.dpatch 2007-08-10 18:03:44 UTC (rev 3599)
@@ -1,51 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix_buffer_overflow_and_format_string_bug_in_auth_server_response.dpatch by Bruno "Fuddl" Kleinert <fuddl at gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch fixes a buffer overflow in auth server response processing.
-## The patch is derived from the ioquake3 project's svn repository
-
- at DPATCH@
-diff -urNad openarena-0.6.0~/code/qcommon/net_chan.c openarena-0.6.0/code/qcommon/net_chan.c
---- openarena-0.6.0~/code/qcommon/net_chan.c 2006-12-13 00:02:30.000000000 +0100
-+++ openarena-0.6.0/code/qcommon/net_chan.c 2006-12-31 17:16:12.963347000 +0100
-@@ -720,7 +720,7 @@
- string[3] = -1;
-
- va_start( argptr, format );
-- vsprintf( string+4, format, argptr );
-+ vsnprintf( string+4, sizeof(string)-4, format, argptr );
- va_end( argptr );
-
- // send the datagram
-diff -urNad openarena-0.6.0~/code/server/sv_client.c openarena-0.6.0/code/server/sv_client.c
---- openarena-0.6.0~/code/server/sv_client.c 2006-12-13 00:02:29.000000000 +0100
-+++ openarena-0.6.0/code/server/sv_client.c 2006-12-31 17:23:24.742331500 +0100
-@@ -158,7 +158,6 @@
- int i;
- char *s;
- char *r;
-- char ret[1024];
-
- if ( !NET_CompareBaseAdr( from, svs.authorizeAddress ) ) {
- Com_Printf( "SV_AuthorizeIpPacket: not from authorize server\n" );
-@@ -204,8 +203,7 @@
- if (!r) {
- NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\nAwaiting CD key authorization\n" );
- } else {
-- sprintf(ret, "print\n%s\n", r);
-- NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, ret );
-+ NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\n%s\n", r);
- }
- // clear the challenge record so it won't timeout and let them through
- Com_Memset( &svs.challenges[i], 0, sizeof( svs.challenges[i] ) );
-@@ -216,8 +214,7 @@
- if (!r) {
- NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\nSomeone is using this CD Key\n" );
- } else {
-- sprintf(ret, "print\n%s\n", r);
-- NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, ret );
-+ NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\n%s\n", r );
- }
-
- // clear the challenge record so it won't timeout and let them through
More information about the Pkg-games-commits
mailing list