packages: quake3/quake3.spec, quake3/quake3-strcpy-abuse.patch (NEW) - rel ...

[baggins]

Author: baggins                      Date: Wed May 12 10:40:36 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- fix strcpy abuse causing bots not working on 64bit intel cpus with recent glibc
  (see: https://bugzilla.icculus.org/show_bug.cgi?id=4331)

---- Files affected:
packages/quake3:
   quake3.spec (1.87 -> 1.88) , quake3-strcpy-abuse.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/quake3/quake3.spec
diff -u packages/quake3/quake3.spec:1.87 packages/quake3/quake3.spec:1.88
--- packages/quake3/quake3.spec:1.87	Sat Nov 28 16:45:06 2009
+++ packages/quake3/quake3.spec	Wed May 12 12:40:31 2010
@@ -2,7 +2,7 @@
 
 %define		dataver	1.32b3-1
 %define		snap	20090430
-%define		rel	2
+%define		rel	3
 Summary:	Quake3 for Linux
 Summary(de.UTF-8):	Quake3 für Linux
 Summary(pl.UTF-8):	Quake3 dla Linuksa
@@ -20,6 +20,7 @@
 Source5:	%{name}-smp.desktop
 Patch0:		%{name}-QUAKELIBDIR.patch
 Patch1:		%{name}-alpha.patch
+Patch2:		%{name}-strcpy-abuse.patch
 URL:		http://ioquake3.org/
 BuildRequires:	OpenAL-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -124,6 +125,7 @@
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cat << 'EOF' > Makefile.local
@@ -271,6 +273,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2010/05/12 10:40:31  baggins
+- rel 3
+- fix strcpy abuse causing bots not working on 64bit intel cpus with recent glibc
+  (see: https://bugzilla.icculus.org/show_bug.cgi?id=4331)
+
 Revision 1.87  2009/11/28 15:45:06  sparky
 - BR: OpenGL-GLU-devel, pkgconfig, which
 

================================================================
Index: packages/quake3/quake3-strcpy-abuse.patch
diff -u /dev/null packages/quake3/quake3-strcpy-abuse.patch:1.1
--- /dev/null	Wed May 12 12:40:36 2010
+++ packages/quake3/quake3-strcpy-abuse.patch	Wed May 12 12:40:31 2010
@@ -0,0 +1,31 @@
+--- quake3-1.36/code/botlib/l_precomp.c~	2009-04-27 08:42:37.000000000 +0200
++++ quake3-1.36/code/botlib/l_precomp.c~	2009-11-03 21:03:08.000000000 +0100
+@@ -948,7 +948,7 @@ void PC_ConvertPath(char *path)
+ 		if ((*ptr == '\\' || *ptr == '/') &&
+ 				(*(ptr+1) == '\\' || *(ptr+1) == '/'))
+ 		{
+-			strcpy(ptr, ptr+1);
++			memmove(ptr, ptr+1, strlen(ptr));
+ 		} //end if
+ 		else
+ 		{
+--- quake3-1.36/code/botlib/l_script.c~	2009-04-27 08:42:37.000000000 +0200
++++ quake3-1.36/code/botlib/l_script.c~	2009-11-03 21:06:11.000000000 +0100
+@@ -1118,7 +1118,7 @@ void StripDoubleQuotes(char *string)
+ {
+ 	if (*string == '\"')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\"')
+ 	{
+@@ -1135,7 +1135,7 @@ void StripSingleQuotes(char *string)
+ {
+ 	if (*string == '\'')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\'')
+ 	{
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/quake3/quake3.spec?r1=1.87&r2=1.88&f=u