[iortcw] 02/02: Mark patches as applied upstream or Debian-specific, as appropriate
Simon McVittie
smcv at debian.org
Sun Sep 25 14:50:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository iortcw.
commit 78a26b28edf1a05734d101255956dde7f329d754
Author: Simon McVittie <smcv at debian.org>
Date: Sun Sep 25 15:49:37 2016 +0100
Mark patches as applied upstream or Debian-specific, as appropriate
---
debian/changelog | 2 ++
debian/patches/Fix-some-spelling-errors.patch | 2 ++
.../Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch | 6 ++++--
...ick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch | 6 ++++--
debian/patches/{ => debian}/Default-to-non-fullscreen.patch | 0
.../Disable-client-side-auto-download-by-default.patch | 3 +++
.../File-access-methods-prevent-overwriting-DLLs-CVE-201.patch | 2 ++
.../Remove-support-for-downloading-executable-updates.patch | 3 +++
debian/patches/series | 8 ++++----
9 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 25a634e..5fb003a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
iortcw (1.42d+dfsg1-5) UNRELEASED; urgency=medium
* Fix date(1) syntax when using SOURCE_DATE_EPOCH
+ * Mark patches as applied upstream or Debian-specific, as
+ appropriate
-- Simon McVittie <smcv at debian.org> Thu, 22 Sep 2016 09:16:38 +0100
diff --git a/debian/patches/Fix-some-spelling-errors.patch b/debian/patches/Fix-some-spelling-errors.patch
index 04e0e4b..6af7304 100644
--- a/debian/patches/Fix-some-spelling-errors.patch
+++ b/debian/patches/Fix-some-spelling-errors.patch
@@ -5,6 +5,8 @@ Subject: Fix some spelling errors
Detected by Debian's Lintian tool. It also detects "persistant", but
unfortunately that misspelling is API (it's part of a cvar name
and a commonly-used struct member) so it shouldn't be corrected.
+
+Applied-upstream: 1.42e, commit:https://github.com/iortcw/iortcw/commit/267ebc2974e6bfc48c2eed487cfd30b01705ddde
---
MP/code/botlib/be_aas_cluster.c | 2 +-
MP/code/game/ai_cast_characters.c | 2 +-
diff --git a/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch b/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
index cb88b31..a8db417 100644
--- a/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
+++ b/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
@@ -6,13 +6,15 @@ This can be used for LDFLAGS that would be inappropriate for shared
libraries, such as the "-fPIE -pie" used to link position-independent
executables. PIEs make it more difficult to exploit various classes
of security vulnerability.
+
+Applied-upstream: 1.42e, commit:https://github.com/iortcw/iortcw/commit/e5799d7f45d3f252b78eaee8632aaff1b84ab16e
---
MP/Makefile | 8 ++++----
SP/Makefile | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
-index 6bda6f7..cf5effc 100644
+index fc90e86..6c7327b 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -2209,7 +2209,7 @@ endif
@@ -50,7 +52,7 @@ index 6bda6f7..cf5effc 100644
diff --git a/SP/Makefile b/SP/Makefile
-index 5c2f8a3..85d4d92 100644
+index 245f00f..ad078af 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -2180,7 +2180,7 @@ endif
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 59be8c7..b522626 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
@@ -7,6 +7,8 @@ code with the same compiler, libraries, etc. should result in the same
binaries. SOURCE_DATE_EPOCH provides a standard way for build systems
to fill in the date of the latest source change, typically from a git
commit or from metadata like the debian/changelog in Debian packages.
+
+Applied-upstream: 1.42e, commit:https://github.com/iortcw/iortcw/commit/22d1cc9bdc6ab24efff50ec3b6391f337dd944dd
---
MP/Makefile | 5 +++++
MP/code/game/g_main.c | 4 ++--
@@ -21,7 +23,7 @@ commit or from metadata like the debian/changelog in Debian packages.
10 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
-index a921004..6bda6f7 100644
+index a921004..fc90e86 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -1224,6 +1224,11 @@ ifeq ($(USE_PBMD5),1)
@@ -111,7 +113,7 @@ index 78b73d9..68c78a5 100644
fprintf( stdout, Q3_VERSION " dedicated server (%s)\n", date );
#else
diff --git a/SP/Makefile b/SP/Makefile
-index f127b4f..5c2f8a3 100644
+index f127b4f..245f00f 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -1201,6 +1201,11 @@ ifeq ($(USE_BLOOM),1)
diff --git a/debian/patches/Default-to-non-fullscreen.patch b/debian/patches/debian/Default-to-non-fullscreen.patch
similarity index 100%
rename from debian/patches/Default-to-non-fullscreen.patch
rename to debian/patches/debian/Default-to-non-fullscreen.patch
diff --git a/debian/patches/Disable-client-side-auto-download-by-default.patch b/debian/patches/debian/Disable-client-side-auto-download-by-default.patch
similarity index 91%
rename from debian/patches/Disable-client-side-auto-download-by-default.patch
rename to debian/patches/debian/Disable-client-side-auto-download-by-default.patch
index 7e2bcbb..12b7455 100644
--- a/debian/patches/Disable-client-side-auto-download-by-default.patch
+++ b/debian/patches/debian/Disable-client-side-auto-download-by-default.patch
@@ -5,6 +5,9 @@ Subject: Disable client-side auto-download by default
This feature is a security risk: it downloads executable bytecode.
The interpreter is sandboxed, but a reasonably determined attacker
can probably break out.
+
+Upstream rejected changes in this direction, but we want them in Debian
+anyway.
---
MP/code/client/cl_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch b/debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
similarity index 98%
rename from debian/patches/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
rename to debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
index f01a19f..fa1796c 100644
--- a/debian/patches/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
+++ b/debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
@@ -25,6 +25,8 @@ Add the same checks in SP file-copying code, for completeness
(although in practice SP should never execute code not provided by
either the retail RTCW binaries, iortcw or a deliberately-installed
mod, because auto-downloading from a server is not applicable there).
+
+Upstream rejected this change, but we want it in Debian anyway.
---
MP/code/qcommon/files.c | 12 ++++++++----
SP/code/qcommon/files.c | 10 ++++++++++
diff --git a/debian/patches/Remove-support-for-downloading-executable-updates.patch b/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
similarity index 98%
rename from debian/patches/Remove-support-for-downloading-executable-updates.patch
rename to debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
index 0271192..9fc0cca 100644
--- a/debian/patches/Remove-support-for-downloading-executable-updates.patch
+++ b/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
@@ -4,6 +4,9 @@ Subject: Remove support for downloading executable updates
This was off by default, which is good, because downloading
and running unauthenticated code is a serious security issue.
+
+Upstream rejected changes in this direction, but we want them
+in Debian anyway.
---
MP/code/client/cl_main.c | 163 +---------------------------------------------
MP/code/qcommon/qcommon.h | 6 --
diff --git a/debian/patches/series b/debian/patches/series
index fc7903c..39a0d76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
-Disable-client-side-auto-download-by-default.patch
-File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
-Default-to-non-fullscreen.patch
-Remove-support-for-downloading-executable-updates.patch
Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
Fix-some-spelling-errors.patch
Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
+debian/Disable-client-side-auto-download-by-default.patch
+debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
+debian/Default-to-non-fullscreen.patch
+debian/Remove-support-for-downloading-executable-updates.patch
--
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