r11013 - in packages/trunk/openarena/debian: . patches

Ansgar Burchardt ansgar-guest at alioth.debian.org
Mon Jun 7 04:02:56 UTC 2010 

Author: ansgar-guest
Date: 2010-06-07 04:02:53 +0000 (Mon, 07 Jun 2010)
New Revision: 11013

Added:
   packages/trunk/openarena/debian/patches/memmove.patch
   packages/trunk/openarena/debian/patches/spelling.patch
Modified:
   packages/trunk/openarena/debian/changelog
   packages/trunk/openarena/debian/control
   packages/trunk/openarena/debian/patches/series
Log:
* Use memmove instead of strcpy for overlapping memory regions.
  (LP: #554748)
  + new patch: memmove.patch
* debian/control: Add ${misc:Depends} to binary package dependencies.
* Bump Standards-Version to 3.8.4 (no changes).

Modified: packages/trunk/openarena/debian/changelog
===================================================================
--- packages/trunk/openarena/debian/changelog	2010-06-01 13:40:15 UTC (rev 11012)
+++ packages/trunk/openarena/debian/changelog	2010-06-07 04:02:53 UTC (rev 11013)
@@ -1,3 +1,13 @@
+openarena (0.8.1-6) UNRELEASED; urgency=low
+
+  * Use memmove instead of strcpy for overlapping memory regions.
+    (LP: #554748)
+    + new patch: memmove.patch
+  * debian/control: Add ${misc:Depends} to binary package dependencies.
+  * Bump Standards-Version to 3.8.4 (no changes).
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Mon, 07 Jun 2010 12:43:43 +0900
+
 openarena (0.8.1-5) unstable; urgency=low
 
   [ Gonéri Le Bouder ]

Modified: packages/trunk/openarena/debian/control
===================================================================
--- packages/trunk/openarena/debian/control	2010-06-01 13:40:15 UTC (rev 11012)
+++ packages/trunk/openarena/debian/control	2010-06-07 04:02:53 UTC (rev 11013)
@@ -4,14 +4,14 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>, Ansgar Burchardt <ansgar at 43-1.org>
 Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl4-gnutls-dev, sharutils, quilt, libvorbis-dev, libjpeg62-dev, libspeexdsp-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openarena/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/openarena/?op=log
 Homepage: http://openarena.ws/
 
 Package: openarena
 Architecture: any
-Depends: ${shlibs:Depends}, openarena-data (>= 0.7.7)
+Depends: ${misc:Depends}, ${shlibs:Depends}, openarena-data (>= 0.7.7)
 Description: fast-paced 3D first-person shooter
  OpenArena is an open-source content package for ioQuake3 licensed under the
  GPL, effectively creating a free stand-alone game. Though OpenArena is a free
@@ -24,7 +24,7 @@
 
 Package: openarena-server
 Architecture: any
-Depends: ${shlibs:Depends}, openarena-data (>= 0.7.7)
+Depends: ${misc:Depends}, ${shlibs:Depends}, openarena-data (>= 0.7.7)
 Description: game server for the game OpenArena
  OpenArena is an open-source content package for ioQuake3 licensed under the
  GPL, effectively creating a free stand-alone game. Though OpenArena is a free

Added: packages/trunk/openarena/debian/patches/memmove.patch
===================================================================
--- packages/trunk/openarena/debian/patches/memmove.patch	                        (rev 0)
+++ packages/trunk/openarena/debian/patches/memmove.patch	2010-06-07 04:02:53 UTC (rev 11013)
@@ -0,0 +1,37 @@
+From: Andreas Bierfert <andreas.bierfert at lowlatency.de>
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4331
+Bug-Ubuntu: http://bugs.launchpad.net/bugs/554748
+Bug-Fedora: http://bugzilla.icculus.org/show_bug.cgi?id=4331
+Subject: Use memmove instead of strcpy for overlapping memory regions
+
+--- openarena.orig/code/botlib/l_precomp.c
++++ openarena/code/botlib/l_precomp.c
+@@ -948,7 +948,7 @@
+ 		if ((*ptr == '\\' || *ptr == '/') &&
+ 				(*(ptr+1) == '\\' || *(ptr+1) == '/'))
+ 		{
+-			strcpy(ptr, ptr+1);
++			memmove(ptr, ptr+1, strlen(ptr));
+ 		} //end if
+ 		else
+ 		{
+--- openarena.orig/code/botlib/l_script.c
++++ openarena/code/botlib/l_script.c
+@@ -1118,7 +1118,7 @@
+ {
+ 	if (*string == '\"')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\"')
+ 	{
+@@ -1135,7 +1135,7 @@
+ {
+ 	if (*string == '\'')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\'')
+ 	{

Modified: packages/trunk/openarena/debian/patches/series
===================================================================
--- packages/trunk/openarena/debian/patches/series	2010-06-01 13:40:15 UTC (rev 11012)
+++ packages/trunk/openarena/debian/patches/series	2010-06-07 04:02:53 UTC (rev 11013)
@@ -4,3 +4,5 @@
 #20_dont_build_shipped_jpeg.diff
 30_link_against_local_libspeex.diff
 40_kfreebsd.diff
+memmove.patch
+spelling.patch

Added: packages/trunk/openarena/debian/patches/spelling.patch
===================================================================
--- packages/trunk/openarena/debian/patches/spelling.patch	                        (rev 0)
+++ packages/trunk/openarena/debian/patches/spelling.patch	2010-06-07 04:02:53 UTC (rev 11013)
@@ -0,0 +1,66 @@
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Mon, 07 Jun 2010 12:55:35 +0900
+Subject: Fix spelling error
+
+--- openarena.orig/code/botlib/be_aas_main.c
++++ openarena/code/botlib/be_aas_main.c
+@@ -216,7 +216,7 @@
+ 		//save the AAS file
+ 		if (AAS_WriteAASFile(aasworld.filename))
+ 		{
+-			botimport.Print(PRT_MESSAGE, "%s written succesfully\n", aasworld.filename);
++			botimport.Print(PRT_MESSAGE, "%s written successfully\n", aasworld.filename);
+ 		} //end if
+ 		else
+ 		{
+--- openarena.orig/code/botlib/be_ai_chat.c
++++ openarena/code/botlib/be_ai_chat.c
+@@ -2198,7 +2198,7 @@
+ #ifdef DEBUG
+ 	botimport.Print(PRT_MESSAGE, "initial chats loaded in %d msec\n", Sys_MilliSeconds() - starttime);
+ #endif //DEBUG
+-	//character was read succesfully
++	//character was read successfully
+ 	return chat;
+ } //end of the function BotLoadInitialChat
+ //===========================================================================
+--- openarena.orig/code/botlib/l_precomp.c
++++ openarena/code/botlib/l_precomp.c
+@@ -1362,7 +1362,7 @@
+ #endif //DEFINEHASHING
+ 	//
+ 	FreeScript(script);
+-	//if the define was created succesfully
++	//if the define was created successfully
+ 	if (res > 0) return def;
+ 	//free the define is created
+ 	if (src.defines) PC_FreeDefine(def);
+--- openarena.orig/code/botlib/l_script.c
++++ openarena/code/botlib/l_script.c
+@@ -421,7 +421,7 @@
+ 	script->script_p++;
+ 	//store the escape character
+ 	*ch = c;
+-	//succesfully read escape character
++	//successfully read escape character
+ 	return 1;
+ } //end of the function PS_ReadEscapeCharacter
+ //============================================================================
+@@ -431,7 +431,7 @@
+ //
+ // Parameter:				script		: script to read from
+ //								token			: buffer to store the string
+-// Returns:					qtrue when a string was read succesfully
++// Returns:					qtrue when a string was read successfully
+ // Changes Globals:		-
+ //============================================================================
+ int PS_ReadString(script_t *script, token_t *token, int quote)
+@@ -912,7 +912,7 @@
+ 	} //end if
+ 	//copy the token into the script structure
+ 	Com_Memcpy(&script->token, token, sizeof(token_t));
+-	//succesfully read a token
++	//successfully read a token
+ 	return 1;
+ } //end of the function PS_ReadToken
+ //============================================================================

More information about the Pkg-games-commits mailing list