[iortcw] 04/07: New upstream release
Simon McVittie
smcv at debian.org
Thu Jun 15 11:03:48 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository iortcw.
commit a04e94a337113d69ddb9b744098de8474d11539b
Author: Simon McVittie <smcv at debian.org>
Date: Thu Jun 15 08:42:18 2017 +0100
New upstream release
- drop patches that came from upstream
---
debian/changelog | 4 +-
.../Don-t-require-.git-index-to-exist.patch | 43 -------
...able-client-side-auto-download-by-default.patch | 4 +-
...-methods-prevent-overwriting-DLLs-CVE-201.patch | 22 ++--
...upport-for-downloading-executable-updates.patch | 28 ++--
...pk3s-as-.dlls-and-don-t-load-user-config-.patch | 142 ---------------------
...l-Don-t-open-.pk3-files-as-OpenAL-drivers.patch | 57 ---------
...-Merge-some-file-writing-extension-checks.patch | 81 ------------
debian/patches/series | 4 -
debian/rules | 4 +-
10 files changed, 31 insertions(+), 358 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c7ef404..6f61fba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-iortcw (1.50a+dfsg1-4) UNRELEASED; urgency=medium
+iortcw (1.51+dfsg1-1) UNRELEASED; urgency=medium
* Reference CVE-2017-6903 in previous changelog entry
* Reset git branch to debian/master
+ * New upstream release
+ - drop patches that came from upstream
-- Simon McVittie <smcv at debian.org> Tue, 14 Mar 2017 22:36:22 +0000
diff --git a/debian/patches/Don-t-require-.git-index-to-exist.patch b/debian/patches/Don-t-require-.git-index-to-exist.patch
deleted file mode 100644
index f199031..0000000
--- a/debian/patches/Don-t-require-.git-index-to-exist.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 20 Nov 2016 22:26:30 +0000
-Subject: Don't require .git/index to exist
-
-This is normally conditional on ../.git existing, but that check was
-(mistakenly?) removed when releasing v1.5a.
----
- MP/Makefile | 2 ++
- SP/Makefile | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/MP/Makefile b/MP/Makefile
-index 6bb0174..eba717c 100644
---- a/MP/Makefile
-+++ b/MP/Makefile
-@@ -2692,9 +2692,11 @@ $(B)/ded/%.o: $(NDIR)/%.c
- $(DO_DED_CC)
-
- # Extra dependencies to ensure the git version is incorporated
-+ifeq ($(USE_GIT),1)
- $(B)/client/cl_console.o : ../.git/index
- $(B)/client/common.o : ../.git/index
- $(B)/ded/common.o : ../.git/index
-+endif
-
-
- #############################################################################
-diff --git a/SP/Makefile b/SP/Makefile
-index fd2a6ea..2e5b739 100644
---- a/SP/Makefile
-+++ b/SP/Makefile
-@@ -2658,9 +2658,11 @@ $(B)/ded/%.o: $(NDIR)/%.c
- $(DO_DED_CC)
-
- # Extra dependencies to ensure the git version is incorporated
-+ifeq ($(USE_GIT),1)
- $(B)/client/cl_console.o : ../.git/index
- $(B)/client/common.o : ../.git/index
- $(B)/ded/common.o : ../.git/index
-+endif
-
-
- #############################################################################
diff --git a/debian/patches/debian/Disable-client-side-auto-download-by-default.patch b/debian/patches/debian/Disable-client-side-auto-download-by-default.patch
index 0ce846a..319bf11 100644
--- a/debian/patches/debian/Disable-client-side-auto-download-by-default.patch
+++ b/debian/patches/debian/Disable-client-side-auto-download-by-default.patch
@@ -13,10 +13,10 @@ anyway.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
-index 5023874..28a2f5a 100644
+index d479de4..db8a9fc 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
-@@ -4046,7 +4046,7 @@ void CL_Init( void ) {
+@@ -4013,7 +4013,7 @@ void CL_Init( void ) {
cl_showMouseRate = Cvar_Get( "cl_showmouserate", "0", 0 );
diff --git a/debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch b/debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
index bab95ad..6ab66ce 100644
--- a/debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
+++ b/debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
@@ -33,10 +33,10 @@ Upstream rejected this change, but we want it in Debian anyway.
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
-index 3ade653..e303a58 100644
+index 6bb2260..b92cc33 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
-@@ -687,7 +687,9 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) {
+@@ -701,7 +701,9 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) {
Com_Printf( "FS_SV_FOpenFileWrite: %s\n", ospath );
}
@@ -47,7 +47,7 @@ index 3ade653..e303a58 100644
if( FS_CreatePath( ospath ) ) {
return 0;
-@@ -906,7 +908,9 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) {
+@@ -935,7 +937,9 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) {
Com_Printf( "FS_FOpenFileWrite: %s\n", ospath );
}
@@ -58,16 +58,16 @@ index 3ade653..e303a58 100644
if ( FS_CreatePath( ospath ) ) {
return 0;
-@@ -1554,7 +1558,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
- }
- }
+@@ -1590,7 +1594,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
+ return VMI_COMPILED;
+ }
-#ifndef DEDICATED
+#if defined( I_WANT_CVE_2011_3012 ) && !defined( DEDICATED )
// extract the dlls from the mp_bin.pk3 so
// that they can be referenced
if (Q_stricmp(name, "qagame"))
-@@ -1589,7 +1593,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
+@@ -1634,7 +1638,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
// TTimo
// relevant to client only
@@ -77,7 +77,7 @@ index 3ade653..e303a58 100644
==================
FS_CL_ExtractFromPakFile
diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c
-index 1215cfe..6d584ef 100644
+index 30b7805..a9fa9df 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!
@@ -88,8 +88,8 @@ index 1215cfe..6d584ef 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
-@@ -611,6 +613,10 @@ static void FS_CopyFile( char *fromOSPath, char *toOSPath ) {
+ #ifndef STANDALONE
+@@ -613,6 +615,10 @@ static void FS_CopyFile( char *fromOSPath, char *toOSPath ) {
return;
}
@@ -100,7 +100,7 @@ index 1215cfe..6d584ef 100644
f = Sys_FOpen( fromOSPath, "rb" );
if ( !f ) {
return;
-@@ -660,6 +666,10 @@ void FS_CopyFileOS( char *from, char *to ) {
+@@ -662,6 +668,10 @@ void FS_CopyFileOS( char *from, char *to ) {
return;
}
diff --git a/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch b/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
index a76ef3f..e74cdc3 100644
--- a/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
+++ b/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
@@ -10,14 +10,14 @@ in Debian anyway.
---
MP/code/client/cl_main.c | 163 +---------------------------------------------
MP/code/qcommon/qcommon.h | 6 --
- MP/code/sys/sys_unix.c | 22 -------
- 3 files changed, 2 insertions(+), 189 deletions(-)
+ MP/code/sys/sys_unix.c | 20 ------
+ 3 files changed, 2 insertions(+), 187 deletions(-)
diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
-index 28a2f5a..e5298b6 100644
+index db8a9fc..9421c68 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
-@@ -2199,24 +2199,7 @@ void CL_DownloadsComplete( void ) {
+@@ -2194,24 +2194,7 @@ void CL_DownloadsComplete( void ) {
// DHM - Nerve :: Auto-update (not finished yet)
if ( autoupdateStarted ) {
@@ -43,7 +43,7 @@ index 28a2f5a..e5298b6 100644
}
#ifdef USE_CURL
-@@ -2911,14 +2894,6 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
+@@ -2904,14 +2887,6 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
}
}
@@ -58,7 +58,7 @@ index 28a2f5a..e5298b6 100644
#ifdef LEGACY_PROTOCOL
Netchan_Setup(NS_CLIENT, &clc.netchan, from, Cvar_VariableValue("net_qport"),
clc.challenge, clc.compat);
-@@ -3527,119 +3502,9 @@ void CL_StartHunkUsers( qboolean rendererOnly ) {
+@@ -3518,119 +3493,9 @@ int CL_ScaledMilliseconds( void ) {
// DHM - Nerve
void CL_CheckAutoUpdate( void ) {
@@ -178,7 +178,7 @@ index 28a2f5a..e5298b6 100644
}
// DHM - Nerve
-@@ -3995,7 +3860,7 @@ void CL_Init( void ) {
+@@ -3962,7 +3827,7 @@ void CL_Init( void ) {
#ifdef UPDATE_SERVER_NAME
cl_motd = Cvar_Get( "cl_motd", "1", 0 );
#endif
@@ -187,7 +187,7 @@ index 28a2f5a..e5298b6 100644
cl_timeout = Cvar_Get( "cl_timeout", "200", 0 );
-@@ -4523,30 +4388,6 @@ CL_UpdateInfoPacket
+@@ -4487,30 +4352,6 @@ CL_UpdateInfoPacket
===================
*/
void CL_UpdateInfoPacket( netadr_t from ) {
@@ -219,10 +219,10 @@ index 28a2f5a..e5298b6 100644
// DHM - Nerve
diff --git a/MP/code/qcommon/qcommon.h b/MP/code/qcommon/qcommon.h
-index 1f23d0f..b1fff59 100644
+index 699ed5f..004b81e 100644
--- a/MP/code/qcommon/qcommon.h
+++ b/MP/code/qcommon/qcommon.h
-@@ -1258,12 +1258,6 @@ void Sys_StartProcess( char *cmdline, qboolean doexit ); // NERVE - S
+@@ -1260,12 +1260,6 @@ void Sys_StartProcess( char *cmdline, qboolean doexit ); // NERVE - S
void Sys_OpenURL( const char *url, qboolean doexit ); // NERVE - SMF
int Sys_GetHighQualityCPU( void );
@@ -236,15 +236,13 @@ index 1f23d0f..b1fff59 100644
{
DR_YES = 0,
diff --git a/MP/code/sys/sys_unix.c b/MP/code/sys/sys_unix.c
-index 941b689..8edf719 100644
+index acd3bc2..ff76dfc 100644
--- a/MP/code/sys/sys_unix.c
+++ b/MP/code/sys/sys_unix.c
-@@ -935,28 +935,6 @@ qboolean Sys_PIDIsRunning( int pid )
- return kill( pid, 0 ) == 0;
+@@ -1008,26 +1008,6 @@ int Sys_GetHighQualityCPU() {
+ return 1;
}
--
--
-/*
-==================
-chmod OR on a file
diff --git a/debian/patches/security/All-Don-t-load-.pk3s-as-.dlls-and-don-t-load-user-config-.patch b/debian/patches/security/All-Don-t-load-.pk3s-as-.dlls-and-don-t-load-user-config-.patch
deleted file mode 100644
index eb29d04..0000000
--- a/debian/patches/security/All-Don-t-load-.pk3s-as-.dlls-and-don-t-load-user-config-.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
-Date: Mon, 13 Mar 2017 19:37:39 -0400
-Subject: All: Don't load .pk3s as .dlls,
- and don't load user config files from .pk3s
-
-Origin: upstream, 1.51, commit:b6ff2bcb1e4e6976d61e316175c6d7c99860fe20
-Bug-Debian: https://bugs.debian.org/857714
----
- MP/code/client/cl_main.c | 4 ++--
- MP/code/qcommon/files.c | 6 ++++++
- MP/code/sys/sys_main.c | 7 +++++++
- SP/code/client/cl_main.c | 4 ++--
- SP/code/qcommon/files.c | 6 ++++++
- SP/code/sys/sys_main.c | 7 +++++++
- 6 files changed, 30 insertions(+), 4 deletions(-)
-
-diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
-index bbdd4f4..5023874 100644
---- a/MP/code/client/cl_main.c
-+++ b/MP/code/client/cl_main.c
-@@ -3688,7 +3688,7 @@ void CL_InitRef( void ) {
- Com_Printf( "----- Initializing Renderer ----\n" );
-
- #ifdef USE_RENDERER_DLOPEN
-- cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE | CVAR_LATCH);
-+ cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE | CVAR_LATCH | CVAR_PROTECTED);
-
- Com_sprintf(dllName, sizeof(dllName), "renderer_mp_%s_" ARCH_STRING DLL_EXT, cl_renderer->string);
-
-@@ -4048,7 +4048,7 @@ void CL_Init( void ) {
-
- cl_allowDownload = Cvar_Get( "cl_allowDownload", "1", CVAR_ARCHIVE );
- #ifdef USE_CURL_DLOPEN
-- cl_cURLLib = Cvar_Get("cl_cURLLib", DEFAULT_CURL_LIB, CVAR_ARCHIVE);
-+ cl_cURLLib = Cvar_Get("cl_cURLLib", DEFAULT_CURL_LIB, CVAR_ARCHIVE | CVAR_PROTECTED);
- #endif
-
- // init autoswitch so the ui will have it correctly even
-diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
-index 603550e..3ade653 100644
---- a/MP/code/qcommon/files.c
-+++ b/MP/code/qcommon/files.c
-@@ -1424,12 +1424,18 @@ long FS_FOpenFileRead(const char *filename, fileHandle_t *file, qboolean uniqueF
- {
- searchpath_t *search;
- long len;
-+ qboolean isLocalConfig;
-
- if(!fs_searchpaths)
- Com_Error(ERR_FATAL, "Filesystem call made without initialization");
-
-+ isLocalConfig = !strcmp(filename, "autoexec.cfg") || !strcmp(filename, Q3CONFIG_CFG);
- for(search = fs_searchpaths; search; search = search->next)
- {
-+ // autoexec.cfg and wolfconfig_mp.cfg can only be loaded outside of pk3 files.
-+ if (isLocalConfig && search->pack)
-+ continue;
-+
- len = FS_FOpenFileReadDir(filename, search, file, uniqueFILE, qfalse);
-
- if(file == NULL)
-diff --git a/MP/code/sys/sys_main.c b/MP/code/sys/sys_main.c
-index b4181da..f3dc2e9 100644
---- a/MP/code/sys/sys_main.c
-+++ b/MP/code/sys/sys_main.c
-@@ -499,6 +499,13 @@ from executable path, then fs_basepath.
- void *Sys_LoadDll(const char *name, qboolean useSystemLib)
- {
- void *dllhandle;
-+
-+ // Don't load any DLLs that end with the pk3 extension
-+ if (COM_CompareExtension(name, ".pk3"))
-+ {
-+ Com_Printf("Rejecting DLL named \"%s\"", name);
-+ return NULL;
-+ }
-
- if(useSystemLib)
- Com_Printf("Trying to load \"%s\"...\n", name);
-diff --git a/SP/code/client/cl_main.c b/SP/code/client/cl_main.c
-index d5f4a44..6306235 100644
---- a/SP/code/client/cl_main.c
-+++ b/SP/code/client/cl_main.c
-@@ -3367,7 +3367,7 @@ void CL_InitRef( void ) {
- Com_Printf( "----- Initializing Renderer ----\n" );
-
- #ifdef USE_RENDERER_DLOPEN
-- cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE | CVAR_LATCH);
-+ cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE | CVAR_LATCH | CVAR_PROTECTED);
-
- Com_sprintf(dllName, sizeof(dllName), "renderer_sp_%s_" ARCH_STRING DLL_EXT, cl_renderer->string);
-
-@@ -3712,7 +3712,7 @@ void CL_Init( void ) {
-
- cl_allowDownload = Cvar_Get( "cl_allowDownload", "0", CVAR_ARCHIVE );
- #ifdef USE_CURL_DLOPEN
-- cl_cURLLib = Cvar_Get("cl_cURLLib", DEFAULT_CURL_LIB, CVAR_ARCHIVE);
-+ cl_cURLLib = Cvar_Get("cl_cURLLib", DEFAULT_CURL_LIB, CVAR_ARCHIVE | CVAR_PROTECTED);
- #endif
-
- // init autoswitch so the ui will have it correctly even
-diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c
-index 340b105..1215cfe 100644
---- a/SP/code/qcommon/files.c
-+++ b/SP/code/qcommon/files.c
-@@ -1591,12 +1591,18 @@ long FS_FOpenFileRead(const char *filename, fileHandle_t *file, qboolean uniqueF
- {
- searchpath_t *search;
- long len;
-+ qboolean isLocalConfig;
-
- if(!fs_searchpaths)
- Com_Error(ERR_FATAL, "Filesystem call made without initialization");
-
-+ isLocalConfig = !strcmp(filename, "autoexec.cfg") || !strcmp(filename, Q3CONFIG_CFG);
- for(search = fs_searchpaths; search; search = search->next)
- {
-+ // autoexec.cfg and wolfconfig.cfg can only be loaded outside of pk3 files.
-+ if (isLocalConfig && search->pack)
-+ continue;
-+
- len = FS_FOpenFileReadDir(filename, search, file, uniqueFILE, qfalse);
-
- if(file == NULL)
-diff --git a/SP/code/sys/sys_main.c b/SP/code/sys/sys_main.c
-index d24f402..e591d98 100644
---- a/SP/code/sys/sys_main.c
-+++ b/SP/code/sys/sys_main.c
-@@ -499,6 +499,13 @@ from executable path, then fs_basepath.
- void *Sys_LoadDll(const char *name, qboolean useSystemLib)
- {
- void *dllhandle;
-+
-+ // Don't load any DLLs that end with the pk3 extension
-+ if (COM_CompareExtension(name, ".pk3"))
-+ {
-+ Com_Printf("Rejecting DLL named \"%s\"", name);
-+ return NULL;
-+ }
-
- if(useSystemLib)
- Com_Printf("Trying to load \"%s\"...\n", name);
diff --git a/debian/patches/security/All-Don-t-open-.pk3-files-as-OpenAL-drivers.patch b/debian/patches/security/All-Don-t-open-.pk3-files-as-OpenAL-drivers.patch
deleted file mode 100644
index ed85675..0000000
--- a/debian/patches/security/All-Don-t-open-.pk3-files-as-OpenAL-drivers.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
-Date: Tue, 14 Mar 2017 03:25:17 -0400
-Subject: All: Don't open .pk3 files as OpenAL drivers
-
-Origin: upstream, 1.51, commit:b248763e4878ef12d5835ece6600be8334f67da1
-Bug-Debian: https://bugs.debian.org/857714
----
- MP/code/client/snd_openal.c | 8 +++++++-
- SP/code/client/snd_openal.c | 8 +++++++-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c
-index 900dc5e..91a61bc 100644
---- a/MP/code/client/snd_openal.c
-+++ b/MP/code/client/snd_openal.c
-@@ -2618,11 +2618,17 @@ qboolean S_AL_Init( soundInterface_t *si )
- s_alRolloff = Cvar_Get( "s_alRolloff", "2", CVAR_CHEAT);
- s_alGraceDistance = Cvar_Get("s_alGraceDistance", "512", CVAR_CHEAT);
-
-- s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH );
-+ s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH | CVAR_PROTECTED );
-
- s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ARCHIVE | CVAR_LATCH );
- s_alDevice = Cvar_Get("s_alDevice", "", CVAR_ARCHIVE | CVAR_LATCH);
-
-+ if ( COM_CompareExtension( s_alDriver->string, ".pk3" ) )
-+ {
-+ Com_Printf( "Rejecting DLL named \"%s\"", s_alDriver->string );
-+ return qfalse;
-+ }
-+
- // Load QAL
- if( !QAL_Init( s_alDriver->string ) )
- {
-diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c
-index 27ea5ed..6e1b34f 100644
---- a/SP/code/client/snd_openal.c
-+++ b/SP/code/client/snd_openal.c
-@@ -2677,11 +2677,17 @@ qboolean S_AL_Init( soundInterface_t *si )
- s_alGraceDistance = Cvar_Get("s_alGraceDistance", "512", CVAR_ARCHIVE);
- s_alTalkAnims = Cvar_Get("s_alTalkAnims", "160", CVAR_ARCHIVE);
-
-- s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH );
-+ s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH | CVAR_PROTECTED );
-
- s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ARCHIVE | CVAR_LATCH );
- s_alDevice = Cvar_Get("s_alDevice", "", CVAR_ARCHIVE | CVAR_LATCH);
-
-+ if ( COM_CompareExtension( s_alDriver->string, ".pk3" ) )
-+ {
-+ Com_Printf( "Rejecting DLL named \"%s\"", s_alDriver->string );
-+ return qfalse;
-+ }
-+
- // Load QAL
- if( !QAL_Init( s_alDriver->string ) )
- {
diff --git a/debian/patches/security/All-Merge-some-file-writing-extension-checks.patch b/debian/patches/security/All-Merge-some-file-writing-extension-checks.patch
deleted file mode 100644
index f77f83b..0000000
--- a/debian/patches/security/All-Merge-some-file-writing-extension-checks.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
-Date: Tue, 14 Mar 2017 03:26:09 -0400
-Subject: All: Merge some file writing extension checks
-
-Origin: upstream, 1.51, commit:11a83410153756ae350a82ed41b08d128ff7f998
-Bug-Debian: https://bugs.debian.org/857714
----
- MP/code/client/cl_console.c | 6 ++++++
- MP/code/qcommon/common.c | 6 ++++++
- SP/code/client/cl_console.c | 6 ++++++
- SP/code/qcommon/common.c | 6 ++++++
- 4 files changed, 24 insertions(+)
-
-diff --git a/MP/code/client/cl_console.c b/MP/code/client/cl_console.c
-index 795fb11..f4eecda 100644
---- a/MP/code/client/cl_console.c
-+++ b/MP/code/client/cl_console.c
-@@ -227,6 +227,12 @@ void Con_Dump_f( void ) {
- Q_strncpyz( filename, Cmd_Argv( 1 ), sizeof( filename ) );
- COM_DefaultExtension( filename, sizeof( filename ), ".txt" );
-
-+ if (!COM_CompareExtension(filename, ".txt"))
-+ {
-+ Com_Printf("Con_Dump_f: Only the \".txt\" extension is supported by this command!\n");
-+ return;
-+ }
-+
- f = FS_FOpenFileWrite( filename );
- if ( !f ) {
- Com_Printf ("ERROR: couldn't open %s.\n", filename);
-diff --git a/MP/code/qcommon/common.c b/MP/code/qcommon/common.c
-index 76547f2..649890e 100644
---- a/MP/code/qcommon/common.c
-+++ b/MP/code/qcommon/common.c
-@@ -3058,6 +3058,12 @@ void Com_WriteConfig_f( void ) {
- return;
- }
-
-+ if (!COM_CompareExtension(filename, ".cfg"))
-+ {
-+ Com_Printf("Com_WriteConfig_f: Only the \".cfg\" extension is supported by this command!\n");
-+ return;
-+ }
-+
- Q_strncpyz( filename, Cmd_Argv( 1 ), sizeof( filename ) );
- COM_DefaultExtension( filename, sizeof( filename ), ".cfg" );
- Com_Printf( "Writing %s.\n", filename );
-diff --git a/SP/code/client/cl_console.c b/SP/code/client/cl_console.c
-index ebcb9d7..16739cf 100644
---- a/SP/code/client/cl_console.c
-+++ b/SP/code/client/cl_console.c
-@@ -237,6 +237,12 @@ void Con_Dump_f( void ) {
- Q_strncpyz( filename, Cmd_Argv( 1 ), sizeof( filename ) );
- COM_DefaultExtension( filename, sizeof( filename ), ".txt" );
-
-+ if (!COM_CompareExtension(filename, ".txt"))
-+ {
-+ Com_Printf("Con_Dump_f: Only the \".txt\" extension is supported by this command!\n");
-+ return;
-+ }
-+
- f = FS_FOpenFileWrite( filename );
- if ( !f ) {
- Com_Printf ("ERROR: couldn't open %s.\n", filename);
-diff --git a/SP/code/qcommon/common.c b/SP/code/qcommon/common.c
-index 20f871d..5a8a4f7 100644
---- a/SP/code/qcommon/common.c
-+++ b/SP/code/qcommon/common.c
-@@ -2601,6 +2601,12 @@ void Com_WriteConfig_f( void ) {
- return;
- }
-
-+ if (!COM_CompareExtension(filename, ".cfg"))
-+ {
-+ Com_Printf("Com_WriteConfig_f: Only the \".cfg\" extension is supported by this command!\n");
-+ return;
-+ }
-+
- Q_strncpyz( filename, Cmd_Argv( 1 ), sizeof( filename ) );
- COM_DefaultExtension( filename, sizeof( filename ), ".cfg" );
- Com_Printf( "Writing %s.\n", filename );
diff --git a/debian/patches/series b/debian/patches/series
index fdea571..68767f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-security/All-Don-t-load-.pk3s-as-.dlls-and-don-t-load-user-config-.patch
-security/All-Don-t-open-.pk3-files-as-OpenAL-drivers.patch
-security/All-Merge-some-file-writing-extension-checks.patch
-Don-t-require-.git-index-to-exist.patch
debian/Disable-client-side-auto-download-by-default.patch
debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
debian/Remove-support-for-downloading-executable-updates.patch
diff --git a/debian/rules b/debian/rules
index 232b98b..4b9406e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,8 +125,8 @@ maintainer-update-icons: \
ORIG_SOURCE = iortcw
ORIG_REPO ?= https://github.com/iortcw/iortcw
-ORIG_REL = 1.50a
-ORIG_REV = 1.5a
+ORIG_REL = 1.51
+ORIG_REV = $(ORIG_REL)
ORIG_DATE =
ORIG_SUFFIX = +dfsg1
--
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