[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn2224-5-7-g595bd05
Simon McVittie
smcv at debian.org
Sat Jun 23 00:26:09 UTC 2012
The following commit has been merged in the master branch:
commit e497f7b9da9c568baffd7cbecaad3321cf1ee068
Author: Simon McVittie <smcv at debian.org>
Date: Fri Jun 22 21:20:20 2012 +0100
adapt to the new upstream snapshot
- reverts a change that caused a 25% framerate loss on the proprietary
nVidia driver (Closes: #677647)
- drop patches for CVE-2012-3345, applied upstream
- drop patches excluding qagame.qvm from checksums, applied upstream
diff --git a/debian/changelog b/debian/changelog
index 0d439f4..9accce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
ioquake3 (1.36+svn2287-1) UNRELEASED; urgency=low
* New upstream snapshot
+ - reverts a change that caused a 25% framerate loss on the proprietary
+ nVidia driver (Closes: #677647)
+ - drop patches for CVE-2012-3345, applied upstream
+ - drop patches excluding qagame.qvm from checksums, applied upstream
-- Simon McVittie <smcv at debian.org> Fri, 22 Jun 2012 21:07:05 +0100
diff --git a/debian/patches/0009-FS_GamePureChecksum-remove-never-called.patch b/debian/patches/0009-FS_GamePureChecksum-remove-never-called.patch
deleted file mode 100644
index a11003a..0000000
--- a/debian/patches/0009-FS_GamePureChecksum-remove-never-called.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Fri, 24 Feb 2012 09:43:13 +0000
-Subject: FS_GamePureChecksum: remove, never called
-
-Origin: OpenArena
----
- code/qcommon/files.c | 25 -------------------------
- code/qcommon/qcommon.h | 3 ---
- 2 files changed, 0 insertions(+), 28 deletions(-)
-
-diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index ce525cf..e2db430 100644
---- a/code/qcommon/files.c
-+++ b/code/qcommon/files.c
-@@ -3439,31 +3439,6 @@ static void FS_CheckPak0( void )
-
- /*
- =====================
--FS_GamePureChecksum
--
--Returns the checksum of the pk3 from which the server loaded the qagame.qvm
--=====================
--*/
--const char *FS_GamePureChecksum( void ) {
-- static char info[MAX_STRING_TOKENS];
-- searchpath_t *search;
--
-- info[0] = 0;
--
-- for ( search = fs_searchpaths ; search ; search = search->next ) {
-- // is the element a pak file?
-- if ( search->pack ) {
-- if (search->pack->referenced & FS_QAGAME_REF) {
-- Com_sprintf(info, sizeof(info), "%d", search->pack->checksum);
-- }
-- }
-- }
--
-- return info;
--}
--
--/*
--=====================
- FS_LoadedPakChecksums
-
- Returns a space separated string containing the checksums of all loaded pk3 files.
-diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index ee5c714..22e2d63 100644
---- a/code/qcommon/qcommon.h
-+++ b/code/qcommon/qcommon.h
-@@ -700,9 +700,6 @@ int FS_Seek( fileHandle_t f, long offset, int origin );
-
- qboolean FS_FilenameCompare( const char *s1, const char *s2 );
-
--const char *FS_GamePureChecksum( void );
--// Returns the checksum of the pk3 from which the server loaded the qagame.qvm
--
- const char *FS_LoadedPakNames( void );
- const char *FS_LoadedPakChecksums( void );
- const char *FS_LoadedPakPureChecksums( void );
diff --git a/debian/patches/0010-Do-not-reference-a-pak-file-just-because-it-contains.patch b/debian/patches/0010-Do-not-reference-a-pak-file-just-because-it-contains.patch
deleted file mode 100644
index d23b244..0000000
--- a/debian/patches/0010-Do-not-reference-a-pak-file-just-because-it-contains.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Fri, 24 Feb 2012 09:51:25 +0000
-Subject: Do not reference a pak file just because it contains qagame.qvm
-
-This allows for server-side-only code mods. Clients don't need to execute
-qagame.qvm, so it doesn't matter whether they have the same one as the
-server. FS_ReferencedPakPureChecksums only respects flags numerically
-less than FS_QAGAME_REF anyway, so this doesn't change the checksums.
-
-Origin: OpenArena
----
- code/qcommon/files.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index e2db430..83f1e95 100644
---- a/code/qcommon/files.c
-+++ b/code/qcommon/files.c
-@@ -1222,14 +1222,13 @@ long FS_FOpenFileReadDir(const char *filename, searchpath_t *search, fileHandle_
- !FS_IsExt(filename, ".bot", len) &&
- !FS_IsExt(filename, ".arena", len) &&
- !FS_IsExt(filename, ".menu", len) &&
-+ Q_stricmp(filename, "qagame.qvm") != 0 &&
- !strstr(filename, "levelshots"))
- {
- pak->referenced |= FS_GENERAL_REF;
- }
- }
-
-- if(strstr(filename, "qagame.qvm"))
-- pak->referenced |= FS_QAGAME_REF;
- if(strstr(filename, "cgame.qvm"))
- pak->referenced |= FS_CGAME_REF;
- if(strstr(filename, "ui.qvm"))
diff --git a/debian/patches/0011-CVE-2012-3345-write-ioq3.pid-to-home-path-not-temp-d.patch b/debian/patches/0011-CVE-2012-3345-write-ioq3.pid-to-home-path-not-temp-d.patch
deleted file mode 100644
index 307d1f6..0000000
--- a/debian/patches/0011-CVE-2012-3345-write-ioq3.pid-to-home-path-not-temp-d.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 443bdd8c3d6c92a0ad2d5f6da0aaead992e50f0d Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv at debian.org>
-Date: Mon, 11 Jun 2012 10:55:33 +0100
-Subject: [PATCH 1/2] CVE-2012-3345: write ioq3.pid to home path, not temp
- directory
-
-On a multi-user system, an attacker could create a symbolic link
-/tmp/ioq3.pid pointing to any file owned by a user who plays an
-ioquake3-based game. When the victim runs ioquake3, the target file
-will be overwritten and replaced with the process ID of ioquake3.
-
-To avoid this, write the pid to the home path (e.g. ~/.q3a on Unix).
-
-Signed-off-by: Simon McVittie <smcv at debian.org>
-Forwarded: yes, likely to be upstream r2253
-Reviewed-by: Ludwig Nussel <ludwig.nussel at suse.de>
-Reviewed-by: Zack Middleton <zturtleman gmail com>
----
- code/sys/sys_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
-index ed00b65..dae8e8f 100644
---- a/code/sys/sys_main.c
-+++ b/code/sys/sys_main.c
-@@ -140,7 +140,7 @@ Sys_PIDFileName
- */
- static char *Sys_PIDFileName( void )
- {
-- return va( "%s/%s", Sys_TempPath( ), PID_FILENAME );
-+ return va( "%s/%s", Sys_DefaultHomePath( ), PID_FILENAME );
- }
-
- /*
---
-1.7.10
-
diff --git a/debian/patches/0012-CVE-2012-3345-remove-Sys_TempPath-altogether-to-avoi.patch b/debian/patches/0012-CVE-2012-3345-remove-Sys_TempPath-altogether-to-avoi.patch
deleted file mode 100644
index 8c824af..0000000
--- a/debian/patches/0012-CVE-2012-3345-remove-Sys_TempPath-altogether-to-avoi.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 6da2182c852b9ea685aff8d4925abd94aa1400cd Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv at debian.org>
-Date: Mon, 11 Jun 2012 10:56:33 +0100
-Subject: [PATCH 2/2] CVE-2012-3345: remove Sys_TempPath() altogether, to
- avoid misuse
-
-Writing to a predictable filename in /tmp is not safe.
-
-Signed-off-by: Simon McVittie <smcv at debian.org>
-Forwarded: yes, likely to be upstream r2254
-Reviewed-by: Ludwig Nussel <ludwig.nussel at suse.de>
-Reviewed-by: Zack Middleton <zturtleman gmail com>
----
- code/qcommon/qcommon.h | 1 -
- code/sys/sys_osx.m | 22 ----------------------
- code/sys/sys_unix.c | 17 -----------------
- code/sys/sys_win32.c | 18 ------------------
- 4 files changed, 58 deletions(-)
-
-diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index 8d36231..389c4f1 100644
---- a/code/qcommon/qcommon.h
-+++ b/code/qcommon/qcommon.h
-@@ -1120,7 +1120,6 @@ char *Sys_DefaultAppPath(void);
-
- void Sys_SetDefaultHomePath(const char *path);
- char *Sys_DefaultHomePath(void);
--const char *Sys_TempPath(void);
- const char *Sys_Dirname( char *path );
- const char *Sys_Basename( char *path );
- char *Sys_ConsoleInput(void);
-diff --git a/code/sys/sys_osx.m b/code/sys/sys_osx.m
-index a26d8a2..30bf932 100644
---- a/code/sys/sys_osx.m
-+++ b/code/sys/sys_osx.m
-@@ -35,28 +35,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- #import <Cocoa/Cocoa.h>
-
- /*
--================
--Sys_TempPath
--================
--*/
--const char *Sys_TempPath( void )
--{
-- static UInt8 posixPath[ MAX_OSPATH ];
-- FSRef ref;
-- if( FSFindFolder( kOnAppropriateDisk,
-- kTemporaryFolderType, kCreateFolder, &ref ) == noErr )
-- {
-- if( FSRefMakePath( &ref, posixPath,
-- sizeof( posixPath ) - 1 ) == noErr )
-- {
-- return (const char *)posixPath;
-- }
-- }
--
-- return "/tmp";
--}
--
--/*
- ==============
- Sys_Dialog
-
-diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c
-index e88465d..a60b086 100644
---- a/code/sys/sys_unix.c
-+++ b/code/sys/sys_unix.c
-@@ -78,23 +78,6 @@ char *Sys_DefaultHomePath(void)
- return homePath;
- }
-
--#ifndef MACOS_X
--/*
--================
--Sys_TempPath
--================
--*/
--const char *Sys_TempPath( void )
--{
-- const char *TMPDIR = getenv( "TMPDIR" );
--
-- if( TMPDIR == NULL || TMPDIR[ 0 ] == '\0' )
-- return "/tmp";
-- else
-- return TMPDIR;
--}
--#endif
--
- /*
- ================
- Sys_Milliseconds
-diff --git a/code/sys/sys_win32.c b/code/sys/sys_win32.c
-index 241fc92..58fd9ab 100644
---- a/code/sys/sys_win32.c
-+++ b/code/sys/sys_win32.c
-@@ -129,24 +129,6 @@ char *Sys_DefaultHomePath( void )
-
- /*
- ================
--Sys_TempPath
--================
--*/
--const char *Sys_TempPath( void )
--{
-- static TCHAR path[ MAX_PATH ];
-- DWORD length;
--
-- length = GetTempPath( sizeof( path ), path );
--
-- if( length > sizeof( path ) || length == 0 )
-- return Sys_DefaultHomePath( );
-- else
-- return path;
--}
--
--/*
--================
- Sys_Milliseconds
- ================
- */
---
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
index 2181792..9f83811 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,8 +5,4 @@
0006-Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
0007-Increase-maximum-number-of-flares-to-256.patch
0008-Let-servers-set-sv_fps-too.patch
-0009-FS_GamePureChecksum-remove-never-called.patch
-0010-Do-not-reference-a-pak-file-just-because-it-contains.patch
-0011-CVE-2012-3345-write-ioq3.pid-to-home-path-not-temp-d.patch
-0012-CVE-2012-3345-remove-Sys_TempPath-altogether-to-avoi.patch
0013-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
--
Quake 3 engine
More information about the Pkg-games-commits
mailing list