summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2020-01-19 15:41:32 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2020-01-19 17:57:20 +0100
commitb74f7f06aceae986878966b92cbada6f91c9617c (patch)
tree37bb5cebb06d3af7783ce7cfb651f25a380dd674 /gnu/packages/patches
parent5448b16e81e573808821a8244f52065fda6eccad (diff)
downloadguix-b74f7f06aceae986878966b92cbada6f91c9617c.tar.gz
gnu: teeworlds: Update to 0.7.4 [security fixes]
This fixes CVE-2019-10877, CVE-2019-10878, and CVE-2019-10879.

* gnu/packages/games.scm (teeworlds): Update to 0.7.4.
[source]: Remove patch.
[arguments]: Remove use-latest-json-parser substitution.
* gnu/packages/patches/teeworlds-use-latest-wavpack.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/teeworlds-use-latest-wavpack.patch126
1 files changed, 0 insertions, 126 deletions
diff --git a/gnu/packages/patches/teeworlds-use-latest-wavpack.patch b/gnu/packages/patches/teeworlds-use-latest-wavpack.patch
deleted file mode 100644
index 3ad1340d2e..0000000000
--- a/gnu/packages/patches/teeworlds-use-latest-wavpack.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Downloaded from https://salsa.debian.org/games-team/teeworlds/raw/master/debian/patches/new-wavpack.patch.
-
-From: Markus Koschany <apo@debian.org>
-Date: Thu, 25 Oct 2018 20:52:27 +0200
-Subject: new-wavpack
-
-Make wavpack compatible with Debian's version.
----
- src/engine/client/sound.cpp | 33 +++++++++++++++------------------
- src/engine/client/sound.h   |  4 ----
- 2 files changed, 15 insertions(+), 22 deletions(-)
-
-diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
-index 048ec24..80de3c5 100644
---- a/src/engine/client/sound.cpp
-+++ b/src/engine/client/sound.cpp
-@@ -325,10 +325,6 @@ void CSound::RateConvert(int SampleID)
- 	pSample->m_NumFrames = NumFrames;
- }
- 
--int CSound::ReadData(void *pBuffer, int Size)
--{
--	return io_read(ms_File, pBuffer, Size);
--}
- 
- ISound::CSampleHandle CSound::LoadWV(const char *pFilename)
- {
-@@ -336,6 +332,8 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename)
- 	int SampleID = -1;
- 	char aError[100];
- 	WavpackContext *pContext;
-+	char aWholePath[1024];
-+	IOHANDLE File;
- 
- 	// don't waste memory on sound when we are stress testing
- 	if(g_Config.m_DbgStress)
-@@ -349,25 +347,29 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename)
- 		return CSampleHandle();
- 
- 	lock_wait(m_SoundLock);
--	ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL);
--	if(!ms_File)
-+	File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL, aWholePath, sizeof(aWholePath));
-+	if(!File)
- 	{
- 		dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
- 		lock_unlock(m_SoundLock);
- 		return CSampleHandle();
- 	}
-+	else
-+	{
-+		io_close(File);
-+	}
- 
- 	SampleID = AllocID();
- 	if(SampleID < 0)
- 	{
--		io_close(ms_File);
--		ms_File = 0;
-+		io_close(File);
-+		File = 0;
- 		lock_unlock(m_SoundLock);
- 		return CSampleHandle();
- 	}
- 	pSample = &m_aSamples[SampleID];
- 
--	pContext = WavpackOpenFileInput(ReadData, aError);
-+	pContext = WavpackOpenFileInput(aWholePath, aError, OPEN_2CH_MAX, 0);
- 	if (pContext)
- 	{
- 		int m_aSamples = WavpackGetNumSamples(pContext);
-@@ -385,8 +387,8 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename)
- 		if(pSample->m_Channels > 2)
- 		{
- 			dbg_msg("sound/wv", "file is not mono or stereo. filename='%s'", pFilename);
--			io_close(ms_File);
--			ms_File = 0;
-+			io_close(File);
-+			File = 0;
- 			lock_unlock(m_SoundLock);
- 			return CSampleHandle();
- 		}
-@@ -401,8 +403,8 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename)
- 		if(BitsPerSample != 16)
- 		{
- 			dbg_msg("sound/wv", "bps is %d, not 16, filname='%s'", BitsPerSample, pFilename);
--			io_close(ms_File);
--			ms_File = 0;
-+			io_close(File);
-+			File = 0;
- 			lock_unlock(m_SoundLock);
- 			return CSampleHandle();
- 		}
-@@ -429,9 +431,6 @@ ISound::CSampleHandle CSound::LoadWV(const char *pFilename)
- 		dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError);
- 	}
- 
--	io_close(ms_File);
--	ms_File = NULL;
--
- 	if(g_Config.m_Debug)
- 		dbg_msg("sound/wv", "loaded %s", pFilename);
- 
-@@ -560,7 +559,5 @@ bool CSound::IsPlaying(CSampleHandle SampleID)
- 	return Ret;
- }
- 
--IOHANDLE CSound::ms_File = 0;
--
- IEngineSound *CreateEngineSound() { return new CSound; }
- 
-diff --git a/src/engine/client/sound.h b/src/engine/client/sound.h
-index ff357c0..cec2cde 100644
---- a/src/engine/client/sound.h
-+++ b/src/engine/client/sound.h
-@@ -21,10 +21,6 @@ public:
- 
- 	static void RateConvert(int SampleID);
- 
--	// TODO: Refactor: clean this mess up
--	static IOHANDLE ms_File;
--	static int ReadData(void *pBuffer, int Size);
--
- 	virtual bool IsSoundEnabled() { return m_SoundEnabled != 0; }
- 
- 	virtual CSampleHandle LoadWV(const char *pFilename);