[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-8-48-g9372e3f

[Simon McVittie]

The following commit has been merged in the master branch:
commit 35c48444fb6bdbd0fb914ba403b5c597e697147d
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 29 03:51:25 2010 +0100

    Replace OA patches to knock out the CD-key check with one from ioquake3 svn

diff --git a/debian/patches/0012-enable-dummy-cdkey-calls-in-standalone-mode-to-preve.patch b/debian/patches/0012-enable-dummy-cdkey-calls-in-standalone-mode-to-preve.patch
new file mode 100644
index 0000000..e5ee5ea
--- /dev/null
+++ b/debian/patches/0012-enable-dummy-cdkey-calls-in-standalone-mode-to-preve.patch
@@ -0,0 +1,104 @@
+From: ludwig <unknown>
+Date: Sun, 28 Feb 2010 08:58:03 +0000
+Subject: [PATCH] enable (dummy) cdkey calls in standalone mode to prevents mods from crashing
+
+Origin: upstream, svn://svn.icculus.org/quake3/trunk@1777
+git-svn-id: svn://svn.icculus.org/quake3/trunk@1777 edf5b092-35ff-0310-97b2-ce42778d08ea
+---
+ code/client/cl_main.c |    6 ++++--
+ code/client/cl_ui.c   |   13 +++++++------
+ 2 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/engine/code/client/cl_main.c b/engine/code/client/cl_main.c
+index 7b19ff0..2b4be3a 100644
+--- a/engine/code/client/cl_main.c
++++ b/engine/code/client/cl_main.c
+@@ -4162,13 +4162,15 @@ void CL_ShowIP_f(void) {
+ 	Sys_ShowIP();
+ }
+ 
+-#ifndef STANDALONE
+ /*
+ =================
+ bool CL_CDKeyValidate
+ =================
+ */
+ qboolean CL_CDKeyValidate( const char *key, const char *checksum ) {
++#ifdef STANDALONE
++	return qtrue;
++#else
+ 	char	ch;
+ 	byte	sum;
+ 	char	chs[3];
+@@ -4225,5 +4227,5 @@ qboolean CL_CDKeyValidate( const char *key, const char *checksum ) {
+ 	}
+ 
+ 	return qfalse;
+-}
+ #endif
++}
+diff --git a/engine/code/client/cl_ui.c b/engine/code/client/cl_ui.c
+index ed32313..adda0db 100644
+--- a/engine/code/client/cl_ui.c
++++ b/engine/code/client/cl_ui.c
+@@ -625,8 +625,8 @@ static void Key_GetBindingBuf( int keynum, char *buf, int buflen ) {
+ CLUI_GetCDKey
+ ====================
+ */
+-#ifndef STANDALONE
+ static void CLUI_GetCDKey( char *buf, int buflen ) {
++#ifndef STANDALONE
+ 	cvar_t	*fs;
+ 	fs = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
+ 	if (UI_usesUniqueCDKey() && fs && fs->string[0] != 0) {
+@@ -636,6 +636,9 @@ static void CLUI_GetCDKey( char *buf, int buflen ) {
+ 		Com_Memcpy( buf, cl_cdkey, 16);
+ 		buf[16] = 0;
+ 	}
++#else
++	*buf = 0;
++#endif
+ }
+ 
+ 
+@@ -644,6 +647,7 @@ static void CLUI_GetCDKey( char *buf, int buflen ) {
+ CLUI_SetCDKey
+ ====================
+ */
++#ifndef STANDALONE
+ static void CLUI_SetCDKey( char *buf ) {
+ 	cvar_t	*fs;
+ 	fs = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
+@@ -963,15 +967,15 @@ intptr_t CL_UISystemCalls( intptr_t *args ) {
+ 	case UI_MEMORY_REMAINING:
+ 		return Hunk_MemoryRemaining();
+ 
+-#ifndef STANDALONE
+ 	case UI_GET_CDKEY:
+ 		CLUI_GetCDKey( VMA(1), args[2] );
+ 		return 0;
+ 
+ 	case UI_SET_CDKEY:
++#ifndef STANDALONE
+ 		CLUI_SetCDKey( VMA(1) );
+-		return 0;
+ #endif
++		return 0;
+ 	
+ 	case UI_SET_PBCLSTATUS:
+ 		return 0;	
+@@ -1053,11 +1057,8 @@ intptr_t CL_UISystemCalls( intptr_t *args ) {
+ 		re.RemapShader( VMA(1), VMA(2), VMA(3) );
+ 		return 0;
+ 
+-#ifndef STANDALONE
+ 	case UI_VERIFY_CDKEY:
+ 		return CL_CDKeyValidate(VMA(1), VMA(2));
+-#endif
+-
+ 		
+ 	default:
+ 		Com_Error( ERR_DROP, "Bad UI system trap: %ld", (long int) args[0] );
+-- 
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index c0c7e80..c41e6f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,8 +8,7 @@
 0009-Remove-remnants-of-sv_strictAuth.patch
 0010-Include-g_needpass-and-g_humanplayers-in-server-info.patch
 0011-CL_MouseMove-some-sort-of-mouse-acceleration-tweak.patch
-0013-CL_CDKeyValidate-turn-into-a-stub.patch
-0014-UI_VERIFY_CDKEY-syscall-always-return-1.patch
+0012-enable-dummy-cdkey-calls-in-standalone-mode-to-preve.patch
 0015-S_CodecLoad-if-a-.wav-audio-file-isn-t-found-load-a-.patch
 0016-Use-silence-as-the-default-sound.patch
 0017-Increase-command-buffer-to-128K.patch
diff --git a/debian/patches/0013-CL_CDKeyValidate-turn-into-a-stub.patch b/debian/unapplied/0013-CL_CDKeyValidate-turn-into-a-stub.patch
similarity index 100%
rename from debian/patches/0013-CL_CDKeyValidate-turn-into-a-stub.patch
rename to debian/unapplied/0013-CL_CDKeyValidate-turn-into-a-stub.patch
diff --git a/debian/patches/0014-UI_VERIFY_CDKEY-syscall-always-return-1.patch b/debian/unapplied/0014-UI_VERIFY_CDKEY-syscall-always-return-1.patch
similarity index 100%
rename from debian/patches/0014-UI_VERIFY_CDKEY-syscall-always-return-1.patch
rename to debian/unapplied/0014-UI_VERIFY_CDKEY-syscall-always-return-1.patch

-- 
Packaging for the OpenArena engine