[iortcw] 16/17: Fix file-access patch

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository iortcw.

commit c977d674d09e6071445a030a3cd457815b982534
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Aug 16 19:57:33 2015 +0100

    Fix file-access patch
---
 ...ess-methods-prevent-overwriting-DLLs-CVE-201.patch | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

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 7b4998f..532ae65 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
@@ -27,8 +27,8 @@ either the retail RTCW binaries, iortcw or a deliberately-installed
 mod, because auto-downloading from a server is not applicable there).
 ---
  MP/code/qcommon/files.c | 12 ++++++++----
- SP/code/qcommon/files.c |  8 ++++++++
- 2 files changed, 16 insertions(+), 4 deletions(-)
+ SP/code/qcommon/files.c | 10 ++++++++++
+ 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
@@ -75,10 +75,19 @@ index 8e55976..39a596c 100644
  ==================
  FS_CL_ExtractFromPakFile
 diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c
-index 02725a9..d3203ba 100644
+index 02725a9..8936a59 100644
 --- a/SP/code/qcommon/files.c
 +++ b/SP/code/qcommon/files.c
-@@ -581,6 +581,10 @@ static void FS_CopyFile( char *fromOSPath, char *toOSPath ) {
+@@ -175,6 +175,8 @@ or configs will never get loaded from disk!
+ 
+ */
+ 
++static void FS_CheckFilenameIsMutable( const char *filename, const char *function );
++
+ // 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 ) {
  		return;
  	}
  
@@ -89,7 +98,7 @@ index 02725a9..d3203ba 100644
  	f = Sys_FOpen( fromOSPath, "rb" );
  	if ( !f ) {
  		return;
-@@ -630,6 +634,10 @@ void FS_CopyFileOS( char *from, char *to ) {
+@@ -630,6 +636,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