rpms/quake3/F-12 quake3-1.36-botlib-strcpy-abuse.patch, NONE, 1.1 quake3.spec, 1.12, 1.13

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14078

Modified Files:
	quake3.spec 
Added Files:
	quake3-1.36-botlib-strcpy-abuse.patch 
Log Message:
* Wed Nov  4 2009 Hans de Goede <hdegoede at redhat.com> 1.36-4
- Fix bots not working on Intel 64 bit CPU's (#526338)


quake3-1.36-botlib-strcpy-abuse.patch:
 l_precomp.c |    2 +-
 l_script.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE quake3-1.36-botlib-strcpy-abuse.patch ---
diff -up quake3-1.36/code/botlib/l_precomp.c~ quake3-1.36/code/botlib/l_precomp.c
--- 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
 		{
diff -up quake3-1.36/code/botlib/l_script.c~ quake3-1.36/code/botlib/l_script.c
--- 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] == '\'')
 	{


Index: quake3.spec
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-12/quake3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- quake3.spec	16 Aug 2009 09:42:58 -0000	1.12
+++ quake3.spec	4 Nov 2009 12:12:45 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           quake3
 Version:        1.36
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -34,6 +34,8 @@ Patch2:         quake3-1.34-fix-empty-fs
 Patch3:         quake3-1.34-dont-ask-openarena-cdkey.patch
 Patch4:         quake3-1.34-no-pak0-check.patch
 Patch5:         quake3-1.34-rc4-demo-pak.patch
+# http://bugzilla.icculus.org/show_bug.cgi?id=4331
+Patch6:         quake3-1.36-botlib-strcpy-abuse.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel libXt-devel openal-soft-devel libjpeg-devel
 BuildRequires:  speex-devel libvorbis-devel curl-devel desktop-file-utils
@@ -135,6 +137,7 @@ Padman menu entry, which will automatica
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 
 %build
@@ -267,6 +270,9 @@ fi
 
 
 %changelog
+* Wed Nov  4 2009 Hans de Goede <hdegoede at redhat.com> 1.36-4
+- Fix bots not working on Intel 64 bit CPU's (#526338)
+
 * Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 1.36-3
 - Switch to openal-soft