[iortcw] 05/06: Refresh patches
Simon McVittie
smcv at debian.org
Wed Mar 2 09:16:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository iortcw.
commit e99d24a0d032bb220c7f3f788f37dcc11aec5054
Author: Simon McVittie <smcv at debian.org>
Date: Wed Mar 2 08:51:06 2016 +0000
Refresh patches
---
debian/patches/Default-to-non-fullscreen.patch | 8 ++++----
.../Disable-client-side-auto-download-by-default.patch | 4 ++--
...access-methods-prevent-overwriting-DLLs-CVE-201.patch | 16 ++++++++--------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/debian/patches/Default-to-non-fullscreen.patch b/debian/patches/Default-to-non-fullscreen.patch
index 3cb9019..1cee6f4 100644
--- a/debian/patches/Default-to-non-fullscreen.patch
+++ b/debian/patches/Default-to-non-fullscreen.patch
@@ -13,10 +13,10 @@ Forwarded: not-needed, Debian-specific
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MP/code/rend2/tr_init.c b/MP/code/rend2/tr_init.c
-index ffa00b4..564d262 100644
+index 0bae878..758de7f 100644
--- a/MP/code/rend2/tr_init.c
+++ b/MP/code/rend2/tr_init.c
-@@ -1281,7 +1281,7 @@ void R_Register( void ) {
+@@ -1282,7 +1282,7 @@ void R_Register( void ) {
r_overBrightBits = ri.Cvar_Get( "r_overBrightBits", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
@@ -39,10 +39,10 @@ index 25ed2bd..f2b96bb 100644
r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/SP/code/rend2/tr_init.c b/SP/code/rend2/tr_init.c
-index cbd4891..65b35c1 100644
+index 6f41ae5..7b7eb59 100644
--- a/SP/code/rend2/tr_init.c
+++ b/SP/code/rend2/tr_init.c
-@@ -1303,7 +1303,7 @@ void R_Register( void ) {
+@@ -1304,7 +1304,7 @@ void R_Register( void ) {
r_overBrightBits = ri.Cvar_Get( "r_overBrightBits", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/debian/patches/Disable-client-side-auto-download-by-default.patch b/debian/patches/Disable-client-side-auto-download-by-default.patch
index fb9f1ca..7e2bcbb 100644
--- a/debian/patches/Disable-client-side-auto-download-by-default.patch
+++ b/debian/patches/Disable-client-side-auto-download-by-default.patch
@@ -10,10 +10,10 @@ can probably break out.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
-index bba48a2..619d89b 100644
+index c6dea1c..46f6edb 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
-@@ -4037,7 +4037,7 @@ void CL_Init( void ) {
+@@ -4041,7 +4041,7 @@ void CL_Init( void ) {
cl_showMouseRate = Cvar_Get( "cl_showmouserate", "0", 0 );
diff --git a/debian/patches/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch b/debian/patches/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
index 532ae65..f01a19f 100644
--- a/debian/patches/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
+++ b/debian/patches/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
@@ -31,10 +31,10 @@ mod, because auto-downloading from a server is not applicable there).
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
-index 8e55976..39a596c 100644
+index 71cd350..1e37a2f 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
-@@ -681,7 +681,9 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) {
+@@ -685,7 +685,9 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) {
Com_Printf( "FS_SV_FOpenFileWrite: %s\n", ospath );
}
@@ -45,7 +45,7 @@ index 8e55976..39a596c 100644
if( FS_CreatePath( ospath ) ) {
return 0;
-@@ -882,7 +884,9 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) {
+@@ -904,7 +906,9 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) {
Com_Printf( "FS_FOpenFileWrite: %s\n", ospath );
}
@@ -56,7 +56,7 @@ index 8e55976..39a596c 100644
if ( FS_CreatePath( ospath ) ) {
return 0;
-@@ -1526,7 +1530,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
+@@ -1546,7 +1550,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
}
}
@@ -65,7 +65,7 @@ index 8e55976..39a596c 100644
// extract the dlls from the mp_bin.pk3 so
// that they can be referenced
if (Q_stricmp(name, "qagame"))
-@@ -1561,7 +1565,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
+@@ -1581,7 +1585,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
// TTimo
// relevant to client only
@@ -75,7 +75,7 @@ index 8e55976..39a596c 100644
==================
FS_CL_ExtractFromPakFile
diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c
-index 02725a9..8936a59 100644
+index 101c44d..6fa4a41 100644
--- a/SP/code/qcommon/files.c
+++ b/SP/code/qcommon/files.c
@@ -175,6 +175,8 @@ or configs will never get loaded from disk!
@@ -87,7 +87,7 @@ index 02725a9..8936a59 100644
// every time a new demo pk3 file is built, this checksum must be updated.
// the easiest way to get it is to just run the game and see what it spits out
#define DEMO_PAK0_CHECKSUM 2985661941u
-@@ -581,6 +583,10 @@ static void FS_CopyFile( char *fromOSPath, char *toOSPath ) {
+@@ -609,6 +611,10 @@ static void FS_CopyFile( char *fromOSPath, char *toOSPath ) {
return;
}
@@ -98,7 +98,7 @@ index 02725a9..8936a59 100644
f = Sys_FOpen( fromOSPath, "rb" );
if ( !f ) {
return;
-@@ -630,6 +636,10 @@ void FS_CopyFileOS( char *from, char *to ) {
+@@ -658,6 +664,10 @@ void FS_CopyFileOS( char *from, char *to ) {
return;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list