crispy-doom: Update to 5.9.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: crispy-doom: Update to 5.9.0
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Fri, 21 Aug 2020 16:45:13 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Aug 21 18:45:13 2020 +0200
Changeset:	5c934107c3b4300cbbbd6dc44844f8cc7805a251

Modified Files:
	crispy-doom/Makefile
	crispy-doom/TODO
	crispy-doom/distinfo
Added Files:
	crispy-doom/patches/patch-src_d__iwad.c
Removed Files:
	crispy-doom/patches/patch-Source_d__iwad.c
	crispy-doom/patches/patch-src_doom_p__extnodes.c

Log Message:
crispy-doom: Update to 5.9.0

CVE-2020-14983 is fixed.

pkgsrc patch for extended nodes with big endian machines removed
(merged upstream).

Bug Fix list from upstream release page:
- The sky in NRFTL Maps 04-08 is now fixed if loaded from command line
  (thanks @Zodomaniac).
- HUD texts are now printed up to the right screen edge again
  (thanks Grizzly).
- The DSSECRET fallback sound is now checked for availability.
  This fixes a crash when playing with a v1.2 or earlier IWAD (thanks @zx64).
- The HUD widget coordinate re-calculation has been moved from thinker to
  drawer functions. This should fix the racing condition that caused the wide
  status bar widget alignment being drawn to the automap status bar with the
  brick border (thanks @kitchen-ace).
- The IDCLEV cheat has been fixed for the Master Levels (thanks @buvk).
- Thing coordinates in the rotated automap have been fixed when the "extended
  automap colors" feature is disabled (thanks @icecreamoverlord).
- A segmentation fault has been fixed when changing episodes during the
  intermission screen (thanks @icecreamoverlord).
- The "go to next level" cheat key for the Master Levels has been fixed.
- Endianess issues when loading extended nodes have been fixed
  (thanks Michael Bäuerle).
- The IDDT cheat is now reset when restarting a map during demo recording,
  but not each time the Automap is opened (thanks galileo31dos01).
- Missing server-side num_players validation (CVE-2020-14983) and missing
  client-side ticdup validation have been fixed (found by Micha# Dardas from
  LogicalTrust, fixes inherited from Chocolate Doom).
- Automap panning by keyboard and mouse is now accumulated
  (thanks @kitchen-ace).
- Invalid texture/flat animation sequences are now skipped instead of erroring
  out (thanks @kitchen-ace).
- The Automap shaking for one frame after changing the view angle has been
  fixed (thanks @JNechaevsky).
- The top-right HU widgets have been moved one char to the left to allow for
  display of multi-thousand FPS (thanks @JNechaevsky).

See Github release page for new features:
https://github.com/fabiangreffrath/crispy-doom/releases

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5c934107c3b4300cbbbd6dc44844f8cc7805a251

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 crispy-doom/Makefile                             |   2 +-
 crispy-doom/TODO                                 |   3 +
 crispy-doom/distinfo                             |  11 +-
 crispy-doom/patches/patch-Source_d__iwad.c       |  16 ---
 crispy-doom/patches/patch-src_d__iwad.c          |  16 +++
 crispy-doom/patches/patch-src_doom_p__extnodes.c | 145 -----------------------
 6 files changed, 25 insertions(+), 168 deletions(-)

diffs:
diff --git a/crispy-doom/Makefile b/crispy-doom/Makefile
index 9261fb1ac6..af5699ecb3 100644
--- a/crispy-doom/Makefile
+++ b/crispy-doom/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	crispy-doom-5.8.0
+DISTNAME=	crispy-doom-5.9.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fabiangreffrath/}
 GITHUB_TAG=	${DISTNAME}
diff --git a/crispy-doom/TODO b/crispy-doom/TODO
index 79bc4d216c..bd1aa9952e 100644
--- a/crispy-doom/TODO
+++ b/crispy-doom/TODO
@@ -1,2 +1,5 @@
 Vulnerabilites to investigate:
 - CVE-2020-14983
+  => Fixed in 5.9.0
+
+Package has Python problems.
diff --git a/crispy-doom/distinfo b/crispy-doom/distinfo
index c71d53eb9b..ef54e13b8a 100644
--- a/crispy-doom/distinfo
+++ b/crispy-doom/distinfo
@@ -1,8 +1,7 @@
 $NetBSD$
 
-SHA1 (crispy-doom-5.8.0.tar.gz) = 3b4b4873783d4414ddc4a2d3de08e83b42ecde98
-RMD160 (crispy-doom-5.8.0.tar.gz) = 4f4dc7d28d67279dfe501125bdb2fc1eccbb24ae
-SHA512 (crispy-doom-5.8.0.tar.gz) = c6a4833c27b81e9808565b352214001a0d621f8bf6dbb7f4235d2bedaa35db68a1cf2567f77e7139da29df1d56a1097419e16791d1b49e5882674e33ce8c4649
-Size (crispy-doom-5.8.0.tar.gz) = 2627570 bytes
-SHA1 (patch-Source_d__iwad.c) = 96a2ea9bba5a62431f99e3b35b7bd8bba36b34ff
-SHA1 (patch-src_doom_p__extnodes.c) = d749ae8f9ca21898171e72b95df127c6a51e1dc7
+SHA1 (crispy-doom-5.9.0.tar.gz) = ec75ae8500fd45d5a77dff9f922f0beadf42a90d
+RMD160 (crispy-doom-5.9.0.tar.gz) = 87cd359b51bd2b895c4d4f648450bed1a41e8f9b
+SHA512 (crispy-doom-5.9.0.tar.gz) = 9970291f374003ac2a1d9e4c44db18b97a41ae3348a5e100ec369affc162d681d15ce61846480667c8a7418700b78a4380bedab1e3acae77976eb4271a22b644
+Size (crispy-doom-5.9.0.tar.gz) = 2641211 bytes
+SHA1 (patch-src_d__iwad.c) = 96a2ea9bba5a62431f99e3b35b7bd8bba36b34ff
diff --git a/crispy-doom/patches/patch-Source_d__iwad.c b/crispy-doom/patches/patch-Source_d__iwad.c
deleted file mode 100644
index 6709513972..0000000000
--- a/crispy-doom/patches/patch-Source_d__iwad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Add pkgsrc ${PREFIX}/share/doom to WAD file search path.
-
---- src/d_iwad.c.orig	2020-04-14 06:39:44.000000000 +0000
-+++ src/d_iwad.c
-@@ -653,6 +653,9 @@ static void AddXdgDirs(void)
-         env = "/usr/local/share:/usr/share";
-     }
- 
-+    // Add pkgsrc location for WADs
-+    AddIWADPath(PKGSRC_PREFIX, PKGSRC_DOOMWADDIR);
-+
-     // The "standard" location for IWADs on Unix that is supported by most
-     // source ports is /usr/share/games/doom - we support this through the
-     // XDG_DATA_DIRS mechanism, through which it can be overridden.
diff --git a/crispy-doom/patches/patch-src_d__iwad.c b/crispy-doom/patches/patch-src_d__iwad.c
new file mode 100644
index 0000000000..6709513972
--- /dev/null
+++ b/crispy-doom/patches/patch-src_d__iwad.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Add pkgsrc ${PREFIX}/share/doom to WAD file search path.
+
+--- src/d_iwad.c.orig	2020-04-14 06:39:44.000000000 +0000
++++ src/d_iwad.c
+@@ -653,6 +653,9 @@ static void AddXdgDirs(void)
+         env = "/usr/local/share:/usr/share";
+     }
+ 
++    // Add pkgsrc location for WADs
++    AddIWADPath(PKGSRC_PREFIX, PKGSRC_DOOMWADDIR);
++
+     // The "standard" location for IWADs on Unix that is supported by most
+     // source ports is /usr/share/games/doom - we support this through the
+     // XDG_DATA_DIRS mechanism, through which it can be overridden.
diff --git a/crispy-doom/patches/patch-src_doom_p__extnodes.c b/crispy-doom/patches/patch-src_doom_p__extnodes.c
deleted file mode 100644
index 31fea0bf89..0000000000
--- a/crispy-doom/patches/patch-src_doom_p__extnodes.c
+++ /dev/null
@@ -1,145 +0,0 @@
-$NetBSD$
-
-Fix endianess for import of extended nodes.
-Merged in git commit 565f85dd0f224a6de805ec83d12665fdc96534bc.
-https://github.com/fabiangreffrath/crispy-doom/commit/565f85dd0f224a6de805ec83d12665fdc96534bc
-
---- src/doom/p_extnodes.c.orig	2020-04-16 07:24:32.000000000 +0000
-+++ src/doom/p_extnodes.c
-@@ -102,9 +102,14 @@ void P_LoadSegs_DeePBSP (int lump)
- 	mapseg_deepbsp_t *ml = data + i;
- 	int side, linedef;
- 	line_t *ldef;
-+	int vn1, vn2;
- 
--	li->v1 = &vertexes[ml->v1];
--	li->v2 = &vertexes[ml->v2];
-+	// [MB] 2020-04-30: Fix endianess for DeePBSDP V4 nodes
-+	vn1 = LONG(ml->v1);
-+	vn2 = LONG(ml->v2);
-+
-+	li->v1 = &vertexes[vn1];
-+	li->v2 = &vertexes[vn2];
- 
- 	li->angle = (SHORT(ml->angle))<<FRACBITS;
- 
-@@ -167,8 +172,9 @@ void P_LoadSubsectors_DeePBSP (int lump)
- 
-     for (i = 0; i < numsubsectors; i++)
-     {
--	subsectors[i].numlines = (int)data[i].numsegs;
--	subsectors[i].firstline = (int)data[i].firstseg;
-+	// [MB] 2020-04-30: Fix endianess for DeePBSDP V4 nodes
-+	subsectors[i].numlines = (unsigned short)SHORT(data[i].numsegs);
-+	subsectors[i].firstline = LONG(data[i].firstseg);
-     }
- 
-     W_ReleaseLumpNum(lump);
-@@ -210,7 +216,8 @@ void P_LoadNodes_DeePBSP (int lump)
- 	for (j = 0; j < 2; j++)
- 	{
- 	    int k;
--	    no->children[j] = (unsigned int)(mn->children[j]);
-+	    // [MB] 2020-04-30: Fix endianess for DeePBSDP V4 nodes
-+	    no->children[j] = LONG(mn->children[j]);
- 
- 	    for (k = 0; k < 4; k++)
- 		no->bbox[j][k] = SHORT(mn->bbox[j][k])<<FRACBITS;
-@@ -228,6 +235,7 @@ void P_LoadNodes_DeePBSP (int lump)
- // - inlined P_LoadZSegs()
- // - added support for compressed ZDBSP nodes
- // - added support for flipped levels
-+// [MB] 2020-04-30: Fix endianess for ZDoom extended nodes
- void P_LoadNodes_ZDBSP (int lump, boolean compressed)
- {
-     byte *data;
-@@ -305,10 +313,10 @@ void P_LoadNodes_ZDBSP (int lump, boolea
- 
-     // 1. Load new vertices added during node building
- 
--    orgVerts = *((unsigned int*)data);
-+    orgVerts = LONG(*((unsigned int*)data));
-     data += sizeof(orgVerts);
- 
--    newVerts = *((unsigned int*)data);
-+    newVerts = LONG(*((unsigned int*)data));
-     data += sizeof(newVerts);
- 
-     if (orgVerts + newVerts == (unsigned int)numvertexes)
-@@ -325,11 +333,11 @@ void P_LoadNodes_ZDBSP (int lump, boolea
-     for (i = 0; i < newVerts; i++)
-     {
- 	newvertarray[i + orgVerts].r_x =
--	newvertarray[i + orgVerts].x = *((unsigned int*)data);
-+	newvertarray[i + orgVerts].x = LONG(*((unsigned int*)data));
- 	data += sizeof(newvertarray[0].x);
- 
- 	newvertarray[i + orgVerts].r_y =
--	newvertarray[i + orgVerts].y = *((unsigned int*)data);
-+	newvertarray[i + orgVerts].y = LONG(*((unsigned int*)data));
- 	data += sizeof(newvertarray[0].y);
-     }
- 
-@@ -348,7 +356,7 @@ void P_LoadNodes_ZDBSP (int lump, boolea
- 
-     // 2. Load subsectors
- 
--    numSubs = *((unsigned int*)data);
-+    numSubs = LONG(*((unsigned int*)data));
-     data += sizeof(numSubs);
- 
-     if (numSubs < 1)
-@@ -362,15 +370,15 @@ void P_LoadNodes_ZDBSP (int lump, boolea
- 	mapsubsector_zdbsp_t *mseg = (mapsubsector_zdbsp_t*) data + i;
- 
- 	subsectors[i].firstline = currSeg;
--	subsectors[i].numlines = mseg->numsegs;
--	currSeg += mseg->numsegs;
-+	subsectors[i].numlines = LONG(mseg->numsegs);
-+	currSeg += LONG(mseg->numsegs);
-     }
- 
-     data += numsubsectors * sizeof(mapsubsector_zdbsp_t);
- 
-     // 3. Load segs
- 
--    numSegs = *((unsigned int*)data);
-+    numSegs = LONG(*((unsigned int*)data));
-     data += sizeof(numSegs);
- 
-     // The number of stored segs should match the number of segs used by subsectors
-@@ -389,9 +397,12 @@ void P_LoadNodes_ZDBSP (int lump, boolea
- 	unsigned char side;
- 	seg_t *li = segs + i;
- 	mapseg_zdbsp_t *ml = (mapseg_zdbsp_t *) data + i;
-+	unsigned int v1, v2;
- 
--	li->v1 = &vertexes[ml->v1];
--	li->v2 = &vertexes[ml->v2];
-+	v1 = LONG(ml->v1);
-+	v2 = LONG(ml->v2);
-+	li->v1 = &vertexes[v1];
-+	li->v2 = &vertexes[v2];
- 
- 	linedef = (unsigned short)SHORT(ml->linedef);
- 	ldef = &lines[linedef];
-@@ -437,7 +448,7 @@ void P_LoadNodes_ZDBSP (int lump, boolea
- 
-     // 4. Load nodes
- 
--    numNodes = *((unsigned int*)data);
-+    numNodes = LONG(*((unsigned int*)data));
-     data += sizeof(numNodes);
- 
-     numnodes = numNodes;
-@@ -456,8 +467,8 @@ void P_LoadNodes_ZDBSP (int lump, boolea
- 
- 	for (j = 0; j < 2; j++)
- 	{
--	    no->children[j] = (unsigned int)(mn->children[j]);
--
-+	    no->children[j] = LONG(mn->children[j]);
-+	
- 	    for (k = 0; k < 4; k++)
- 		no->bbox[j][k] = SHORT(mn->bbox[j][k])<<FRACBITS;
- 	}
Prev by Date: dwarf fortress: update to 0.47.04
Next by Date: patches for bamf
Previous by Thread: dwarf fortress: update to 0.47.04
Next by Thread: patches for bamf
Indexes:
Home | Main Index | Thread Index | Old Index