[openjk] 10/11: New upstream snapshot
Simon McVittie
smcv at debian.org
Sun Jan 22 10:23:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openjk.
commit 0b7429ee94bf91b1a00026ed1fc16bc4d07f14c1
Author: Simon McVittie <smcv at debian.org>
Date: Sun Jan 22 10:08:25 2017 +0000
New upstream snapshot
- Drop patches that were applied upstream
---
debian/changelog | 7 ++
...-bounds-check-when-loading-from-savegames.patch | 41 -------
...m-SOURCE_DATE_EPOCH-for-reproducible-buil.patch | 2 +-
...are-too-long-raise-error-instead-of-assum.patch | 131 ---------------------
...oad-if-buffer-would-be-overflowed-don-t-j.patch | 67 -----------
debian/patches/series | 3 -
debian/rules | 4 +-
7 files changed, 10 insertions(+), 245 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 32d8e16..5563a32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openjk (0~20170122+dfsg1-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - Drop patches that were applied upstream
+
+ -- Simon McVittie <smcv at debian.org> Sun, 22 Jan 2017 10:08:02 +0000
+
openjk (0~20170112+dfsg1-1) experimental; urgency=medium
* New upstream snapshot
diff --git a/debian/patches/Icarus-fix-bounds-check-when-loading-from-savegames.patch b/debian/patches/Icarus-fix-bounds-check-when-loading-from-savegames.patch
deleted file mode 100644
index 0b3a127..0000000
--- a/debian/patches/Icarus-fix-bounds-check-when-loading-from-savegames.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sat, 21 Jan 2017 15:06:40 +0000
-Subject: icarus: fix bounds check when loading from savegames
-
-m_byBuffer is a pointer to a fixed amount of dynamically allocated
-memory, not a statically allocated buffer, so sizeof() is the wrong
-tool here. Use the actual size of the buffer instead.
-
-Also, reading the full size of the buffer is fine, because we aren't
-going to append '\0' afterwards like we do in the other places
-touched by #881, so use > instead of >=.
-
-Bug: https://github.com/JACoders/OpenJK/pull/902
-Signed-off-by: Simon McVittie <smcv at debian.org>
-Forwarded: https://github.com/JACoders/OpenJK/pull/905
----
- code/icarus/IcarusImplementation.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/code/icarus/IcarusImplementation.cpp b/code/icarus/IcarusImplementation.cpp
-index 7d2fc8fc..cc893331 100644
---- a/code/icarus/IcarusImplementation.cpp
-+++ b/code/icarus/IcarusImplementation.cpp
-@@ -718,7 +718,7 @@ int CIcarus::Load()
-
- int sg_buffer_size = saved_game.get_buffer_size();
-
-- if (sg_buffer_size < 0 || static_cast<size_t>(sg_buffer_size) >= sizeof(m_byBuffer))
-+ if (sg_buffer_size < 0 || static_cast<size_t>(sg_buffer_size) > MAX_BUFFER_SIZE)
- {
- sg_buffer_size = 0;
- }
-@@ -858,7 +858,7 @@ void CIcarus::BufferRead( void *pDstBuff, unsigned long ulNumBytesToRead )
-
- int sg_buffer_size = saved_game.get_buffer_size();
-
-- if (sg_buffer_size < 0 || static_cast<size_t>(sg_buffer_size) >= sizeof(m_byBuffer))
-+ if (sg_buffer_size < 0 || static_cast<size_t>(sg_buffer_size) > MAX_BUFFER_SIZE)
- {
- sg_buffer_size = 0;
- }
diff --git a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
index cc660ec..6228233 100644
--- a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
+++ b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
@@ -164,7 +164,7 @@ index 525e3d44..3011c8de 100644
SE_Init();
diff --git a/shared/qcommon/q_platform.h b/shared/qcommon/q_platform.h
-index ee5392e8..4f9ee545 100644
+index aa8ff139..8af17226 100644
--- a/shared/qcommon/q_platform.h
+++ b/shared/qcommon/q_platform.h
@@ -358,3 +358,8 @@ typedef union byteAlias_u {
diff --git a/debian/patches/game-If-strings-are-too-long-raise-error-instead-of-assum.patch b/debian/patches/game-If-strings-are-too-long-raise-error-instead-of-assum.patch
deleted file mode 100644
index e5d51a3..0000000
--- a/debian/patches/game-If-strings-are-too-long-raise-error-instead-of-assum.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sat, 21 Jan 2017 15:12:50 +0000
-Subject: game: If strings are too long,
- raise error instead of assuming 0 length
-
-Signed-off-by: Simon McVittie <smcv at debian.org>
----
- code/game/G_Timer.cpp | 14 ++++++--------
- code/game/Q3_Interface.cpp | 6 +++---
- code/game/g_roff.cpp | 4 +++-
- codeJK2/game/Q3_Registers.cpp | 6 +++---
- codeJK2/game/g_roff.cpp | 2 +-
- 5 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/code/game/G_Timer.cpp b/code/game/G_Timer.cpp
-index 192594d1..89ecb94f 100644
---- a/code/game/G_Timer.cpp
-+++ b/code/game/G_Timer.cpp
-@@ -247,16 +247,14 @@ void TIMER_Load( void )
-
- if (sg_buffer_size < 0 || static_cast<size_t>(sg_buffer_size) >= sizeof(tempBuffer))
- {
-- sg_buffer_size = 0;
-- }
-- else
-- {
-- std::uninitialized_copy_n(
-- sg_buffer_data,
-- sg_buffer_size,
-- tempBuffer);
-+ ::G_Error("invalid length for TMID string in saved game: %d\n", sg_buffer_size);
- }
-
-+ std::uninitialized_copy_n(
-+ sg_buffer_data,
-+ sg_buffer_size,
-+ tempBuffer);
-+
- tempBuffer[sg_buffer_size] = '\0';
-
- saved_game.read_chunk<int32_t>(
-diff --git a/code/game/Q3_Interface.cpp b/code/game/Q3_Interface.cpp
-index 2c740d48..585167a2 100644
---- a/code/game/Q3_Interface.cpp
-+++ b/code/game/Q3_Interface.cpp
-@@ -7328,7 +7328,7 @@ void CQuake3GameInterface::VariableLoadFloats( varFloat_m &fmap )
-
- if (idSize < 0 || static_cast<size_t>(idSize) >= sizeof(tempBuffer))
- {
-- idSize = 0;
-+ ::G_Error("invalid length for FIDS string in save game: %d bytes\n", idSize);
- }
-
- saved_game.read_chunk(
-@@ -7378,7 +7378,7 @@ void CQuake3GameInterface::VariableLoadStrings( int type, varString_m &fmap )
-
- if (idSize < 0 || static_cast<size_t>(idSize) >= sizeof(tempBuffer))
- {
-- idSize = 0;
-+ ::G_Error("invalid length for SIDS string in save game: %d bytes\n", idSize);
- }
-
- saved_game.read_chunk(
-@@ -7394,7 +7394,7 @@ void CQuake3GameInterface::VariableLoadStrings( int type, varString_m &fmap )
-
- if (idSize < 0 || static_cast<size_t>(idSize) >= sizeof(tempBuffer2))
- {
-- idSize = 0;
-+ ::G_Error("invalid length for SVAL string in save game: %d bytes\n", idSize);
- }
-
- saved_game.read_chunk(
-diff --git a/code/game/g_roff.cpp b/code/game/g_roff.cpp
-index 9ec25adf..a337b284 100644
---- a/code/game/g_roff.cpp
-+++ b/code/game/g_roff.cpp
-@@ -704,7 +704,9 @@ void G_LoadCachedRoffs()
- len);
-
- if (len < 0 || static_cast<size_t>(len) >= sizeof(buffer))
-- len = 0;
-+ {
-+ ::G_Error("invalid length for RSTR string in save game: %d bytes\n", len);
-+ }
-
- saved_game.read_chunk(
- INT_ID('R', 'S', 'T', 'R'),
-diff --git a/codeJK2/game/Q3_Registers.cpp b/codeJK2/game/Q3_Registers.cpp
-index 25c99cd1..f278c090 100644
---- a/codeJK2/game/Q3_Registers.cpp
-+++ b/codeJK2/game/Q3_Registers.cpp
-@@ -410,7 +410,7 @@ void Q3_VariableLoadFloats( varFloat_m &fmap )
-
- if (idSize < 0 || static_cast<size_t>(idSize) >= sizeof(tempBuffer))
- {
-- idSize = 0;
-+ ::G_Error("invalid length for FIDS string in save game: %d bytes\n", idSize);
- }
-
- saved_game.read_chunk(
-@@ -460,7 +460,7 @@ void Q3_VariableLoadStrings( int type, varString_m &fmap )
-
- if (idSize < 0 || static_cast<size_t>(idSize) >= sizeof(tempBuffer))
- {
-- idSize = 0;
-+ ::G_Error("invalid length for SIDS string in save game: %d bytes\n", idSize);
- }
-
- saved_game.read_chunk(
-@@ -476,7 +476,7 @@ void Q3_VariableLoadStrings( int type, varString_m &fmap )
-
- if (idSize < 0 || static_cast<size_t>(idSize) >= sizeof(tempBuffer2))
- {
-- idSize = 0;
-+ ::G_Error("invalid length for SVAL string in save game: %d bytes\n", idSize);
- }
-
- saved_game.read_chunk(
-diff --git a/codeJK2/game/g_roff.cpp b/codeJK2/game/g_roff.cpp
-index b5c0240f..b1c9539e 100644
---- a/codeJK2/game/g_roff.cpp
-+++ b/codeJK2/game/g_roff.cpp
-@@ -680,7 +680,7 @@ void G_LoadCachedRoffs()
-
- if (len < 0 || static_cast<size_t>(len) >= sizeof(buffer))
- {
-- len = 0;
-+ ::G_Error("invalid length for RSTR string in save game: %d bytes\n", len);
- }
-
- saved_game.read_chunk(
diff --git a/debian/patches/icarus-Fail-to-load-if-buffer-would-be-overflowed-don-t-j.patch b/debian/patches/icarus-Fail-to-load-if-buffer-would-be-overflowed-don-t-j.patch
deleted file mode 100644
index cb0b479..0000000
--- a/debian/patches/icarus-Fail-to-load-if-buffer-would-be-overflowed-don-t-j.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sat, 21 Jan 2017 15:10:39 +0000
-Subject: icarus: Fail to load if buffer would be overflowed, don't just skip
-
-Unfortunately CIcarus::BufferRead returns void, so we can't
-return a failure state from here, but we can at least print an
-error message.
-
-Signed-off-by: Simon McVittie <smcv at debian.org>
-Forwarded: https://github.com/JACoders/OpenJK/pull/905
----
- code/icarus/IcarusImplementation.cpp | 31 +++++++++++++++----------------
- 1 file changed, 15 insertions(+), 16 deletions(-)
-
-diff --git a/code/icarus/IcarusImplementation.cpp b/code/icarus/IcarusImplementation.cpp
-index cc893331..c4e4f1fc 100644
---- a/code/icarus/IcarusImplementation.cpp
-+++ b/code/icarus/IcarusImplementation.cpp
-@@ -720,16 +720,16 @@ int CIcarus::Load()
-
- if (sg_buffer_size < 0 || static_cast<size_t>(sg_buffer_size) > MAX_BUFFER_SIZE)
- {
-- sg_buffer_size = 0;
-- }
-- else
-- {
-- std::uninitialized_copy_n(
-- sg_buffer_data,
-- sg_buffer_size,
-- m_byBuffer);
-+ DestroyBuffer();
-+ game->DebugPrint( IGameInterface::WL_ERROR, "invalid ISEQ length: %d bytes\n", sg_buffer_size);
-+ return false;
- }
-
-+ std::uninitialized_copy_n(
-+ sg_buffer_data,
-+ sg_buffer_size,
-+ m_byBuffer);
-+
- //Load all signals
- if ( LoadSignals() == false )
- {
-@@ -860,16 +860,15 @@ void CIcarus::BufferRead( void *pDstBuff, unsigned long ulNumBytesToRead )
-
- if (sg_buffer_size < 0 || static_cast<size_t>(sg_buffer_size) > MAX_BUFFER_SIZE)
- {
-- sg_buffer_size = 0;
-- }
-- else
-- {
-- std::uninitialized_copy_n(
-- sg_buffer_data,
-- sg_buffer_size,
-- m_byBuffer);
-+ IGameInterface::GetGame()->DebugPrint( IGameInterface::WL_ERROR, "invalid ISEQ length: %d bytes\n", sg_buffer_size);
-+ return;
- }
-
-+ std::uninitialized_copy_n(
-+ sg_buffer_data,
-+ sg_buffer_size,
-+ m_byBuffer);
-+
- m_ulBytesRead = 0; //reset buffer
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index af92b1f..858ce4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-Icarus-fix-bounds-check-when-loading-from-savegames.patch
-icarus-Fail-to-load-if-buffer-would-be-overflowed-don-t-j.patch
-game-If-strings-are-too-long-raise-error-instead-of-assum.patch
Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
diff --git a/debian/rules b/debian/rules
index c95496e..bbb749b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -161,10 +161,10 @@ ORIG_SOURCE = openjk
ORIG_REPO ?= https://github.com/JACoders/OpenJK
ORIG_REL =
# Empty if it's a release
-ORIG_REV = 82d82094e8c53657f9f57ba8740496c2cc5ba204
+ORIG_REV = 7b5f79adb24f5d9f3c9f93f0760bb7afc8acbf61
# Use the date of the ORIG_REV, or 20130426.1 if you snapshot twice in a day,
# or empty if ORIG_REV is
-ORIG_DATE = 20170112
+ORIG_DATE = 20170122
ORIG_SUFFIX = +dfsg1
ifeq (${ORIG_REV},)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list