Bug#690325: unblock: darkplaces/0~20110628+svn11619-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider:
unblock darkplaces/0~20110628+svn11619-3
It fixes an important-severity bug affecting quake (contrib) and potentially
also nexuiz (main), and has a one-line change to enable
"fortified" string functions for the hardening release goal.
darkplaces (0~20110628+svn11619-3) unstable; urgency=low
* Apply upstream r11796 to fix certain teleport triggers, notably
making Quake multiplayer map dm6 playable again (Closes: #688359)
* Apply security-hardening CPPFLAGS in CFLAGS since darkplaces can be used
by nexuiz-server and quake-server, which are network-exposed, and its
makefile does not respect external CPPFLAGS
-- Simon McVittie <smcv@debian.org> Fri, 12 Oct 2012 09:44:26 +0100
diffstat for darkplaces-0~20110628+svn11619 darkplaces-0~20110628+svn11619
changelog | 10 +
patches/0022-fix-two-bugs-introduced-in-r11402-that-broke-dm6-tel.patch | 51 ++++++++++
patches/series | 1
rules | 1
4 files changed, 63 insertions(+)
diff -Nru darkplaces-0~20110628+svn11619/debian/changelog darkplaces-0~20110628+svn11619/debian/changelog
--- darkplaces-0~20110628+svn11619/debian/changelog 2012-01-21 22:45:14.000000000 +0000
+++ darkplaces-0~20110628+svn11619/debian/changelog 2012-10-12 09:44:31.000000000 +0100
@@ -1,3 +1,13 @@
+darkplaces (0~20110628+svn11619-3) unstable; urgency=low
+
+ * Apply upstream r11796 to fix certain teleport triggers, notably
+ making Quake multiplayer map dm6 playable again (Closes: #688359)
+ * Apply security-hardening CPPFLAGS in CFLAGS since darkplaces can be used
+ by nexuiz-server and quake-server, which are network-exposed, and its
+ makefile does not respect external CPPFLAGS
+
+ -- Simon McVittie <smcv@debian.org> Fri, 12 Oct 2012 09:44:26 +0100
+
darkplaces (0~20110628+svn11619-2) unstable; urgency=low
* Conditionalize more references to the software rasterizer, fixing
diff -Nru darkplaces-0~20110628+svn11619/debian/patches/0022-fix-two-bugs-introduced-in-r11402-that-broke-dm6-tel.patch darkplaces-0~20110628+svn11619/debian/patches/0022-fix-two-bugs-introduced-in-r11402-that-broke-dm6-tel.patch
--- darkplaces-0~20110628+svn11619/debian/patches/0022-fix-two-bugs-introduced-in-r11402-that-broke-dm6-tel.patch 1970-01-01 01:00:00.000000000 +0100
+++ darkplaces-0~20110628+svn11619/debian/patches/0022-fix-two-bugs-introduced-in-r11402-that-broke-dm6-tel.patch 2012-10-12 09:44:31.000000000 +0100
@@ -0,0 +1,51 @@
+From: LordHavoc <havoc>
+Date: Tue, 17 Apr 2012 21:29:58 +0000
+Subject: fix two bugs introduced in r11402 that broke dm6 teleporters
+ and many other triggers (was using overly padded mins and
+ maxs)
+
+Origin: upstream, commit:11796
+---
+ sv_phys.c | 7 +++++--
+ world.c | 7 +++++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/sv_phys.c b/sv_phys.c
+index f05cad8..4e7d276 100644
+--- a/sv_phys.c
++++ b/sv_phys.c
+@@ -723,8 +723,11 @@ int SV_EntitiesInBox(const vec3_t mins, const vec3_t maxs, int maxedicts, prvm_e
+ vec3_t paddedmins, paddedmaxs;
+ if (maxedicts < 1 || resultedicts == NULL)
+ return 0;
+- VectorSet(paddedmins, mins[0] - 10, mins[1] - 10, mins[2] - 1);
+- VectorSet(paddedmaxs, maxs[0] + 10, maxs[1] + 10, maxs[2] + 1);
++ // LordHavoc: discovered this actually causes its own bugs (dm6 teleporters being too close to info_teleport_destination)
++ //VectorSet(paddedmins, mins[0] - 10, mins[1] - 10, mins[2] - 1);
++ //VectorSet(paddedmaxs, maxs[0] + 10, maxs[1] + 10, maxs[2] + 1);
++ VectorCopy(mins, paddedmins);
++ VectorCopy(maxs, paddedmaxs);
+ if (sv_areadebug.integer)
+ {
+ int numresultedicts = 0;
+diff --git a/world.c b/world.c
+index ffa54d1..87f901b 100644
+--- a/world.c
++++ b/world.c
+@@ -185,8 +185,11 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
+ vec3_t paddedmins, paddedmaxs;
+ int igrid[3], igridmins[3], igridmaxs[3];
+
+- VectorSet(paddedmins, requestmins[0] - 1.0f, requestmins[1] - 1.0f, requestmins[2] - 1.0f);
+- VectorSet(paddedmaxs, requestmaxs[0] + 1.0f, requestmaxs[1] + 1.0f, requestmaxs[2] + 1.0f);
++ // LordHavoc: discovered this actually causes its own bugs (dm6 teleporters being too close to info_teleport_destination)
++ //VectorSet(paddedmins, requestmins[0] - 1.0f, requestmins[1] - 1.0f, requestmins[2] - 1.0f);
++ //VectorSet(paddedmaxs, requestmaxs[0] + 1.0f, requestmaxs[1] + 1.0f, requestmaxs[2] + 1.0f);
++ VectorCopy(requestmins, paddedmins);
++ VectorCopy(requestmaxs, paddedmaxs);
+
+ // FIXME: if areagrid_marknumber wraps, all entities need their
+ // ent->priv.server->areagridmarknumber reset
+--
+1.7.10.4
+
diff -Nru darkplaces-0~20110628+svn11619/debian/patches/series darkplaces-0~20110628+svn11619/debian/patches/series
--- darkplaces-0~20110628+svn11619/debian/patches/series 2012-01-21 22:45:14.000000000 +0000
+++ darkplaces-0~20110628+svn11619/debian/patches/series 2012-10-12 09:44:31.000000000 +0100
@@ -19,3 +19,4 @@
0019-If-linking-libpng-conventionally-use-the-png_jmpbuf-.patch
0020-If-linking-libpng-normally-use-its-header-to-get-the.patch
0021-If-linking-libpng-in-the-normal-way-use-its-actual-v.patch
+0022-fix-two-bugs-introduced-in-r11402-that-broke-dm6-tel.patch
diff -Nru darkplaces-0~20110628+svn11619/debian/rules darkplaces-0~20110628+svn11619/debian/rules
--- darkplaces-0~20110628+svn11619/debian/rules 2012-01-21 22:45:14.000000000 +0000
+++ darkplaces-0~20110628+svn11619/debian/rules 2012-10-12 09:44:31.000000000 +0100
@@ -7,6 +7,7 @@
debian_version := $(shell dpkg-parsechangelog -c1 | sed -ne 's/^Version: //p')
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) \
+ $(shell dpkg-buildflags --get CPPFLAGS) \
-Wall \
-Wextra \
-Wstrict-prototypes \
Reply to: