svn commit: r462557 - in branches/2018Q1/games/openbor: . files

[Jan Beich]

Author: jbeich
Date: Thu Feb 22 01:01:50 2018
New Revision: 462557
URL: https://svnweb.freebsd.org/changeset/ports/462557

Log:
  MFH: r462552
  
  games/openbor: update to 4604
  
  Changes:	https://github.com/DCurrent/openbor/compare/ab066c1...d73408f
  Approved by:	ports-secteam (feld, implicit for snapshots)

Deleted:
  branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.h
Modified:
  branches/2018Q1/games/openbor/Makefile
  branches/2018Q1/games/openbor/distinfo
  branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/games/openbor/Makefile
==============================================================================
--- branches/2018Q1/games/openbor/Makefile	Thu Feb 22 01:01:03 2018	(r462556)
+++ branches/2018Q1/games/openbor/Makefile	Thu Feb 22 01:01:50 2018	(r462557)
@@ -2,7 +2,7 @@
 
 PORTNAME=	openbor
 # Hint: svn revision is git rev-list --count ${GH_TAGNAME}
-PORTVERSION?=	4601
+PORTVERSION?=	4604
 .ifndef PKGNAMESUFFIX
 PORTREVISION=	0
 .endif
@@ -31,7 +31,7 @@ PORTSCOUT=	ignore:1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DCurrent
-GH_TAGNAME?=	ab066c1
+GH_TAGNAME?=	d73408f
 
 USES+=		gmake pkgconfig
 .if ${PORTVERSION} < 4433

Modified: branches/2018Q1/games/openbor/distinfo
==============================================================================
--- branches/2018Q1/games/openbor/distinfo	Thu Feb 22 01:01:03 2018	(r462556)
+++ branches/2018Q1/games/openbor/distinfo	Thu Feb 22 01:01:50 2018	(r462557)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519052570
-SHA256 (DCurrent-openbor-4601-ab066c1_GH0.tar.gz) = 5ce8ce0d179d82716c5ca4ff4b0ff84a11ede9cf2cdcc62109f81a6c89a2b085
-SIZE (DCurrent-openbor-4601-ab066c1_GH0.tar.gz) = 107146373
+TIMESTAMP = 1519248328
+SHA256 (DCurrent-openbor-4604-d73408f_GH0.tar.gz) = 1827f54f3340782ca11e3c17e3c6623f9fb88112db510e89db917909842de656
+SIZE (DCurrent-openbor-4604-d73408f_GH0.tar.gz) = 107146873

Modified: branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c
==============================================================================
--- branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c	Thu Feb 22 01:01:03 2018	(r462556)
+++ branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c	Thu Feb 22 01:01:50 2018	(r462557)
@@ -1,4 +1,5 @@
 Reset seek position for BGM with more than 128 tracks
+Don't crash with more than 256 tracks.
 
 --- source/gamelib/packfile.c.orig	2018-02-19 15:02:50 UTC
 +++ source/gamelib/packfile.c
@@ -11,3 +12,12 @@ Reset seek position for BGM with more than 128 tracks
              filelist[i].nTracks = 0;
              fd = fopen(packfile, "rb");
              if(fd == NULL)
+@@ -1440,7 +1440,7 @@ void packfile_music_read(fileliststruct *filelist, int
+                     {
+                         goto nextpak;
+                     }
+-                    if(filelist[i].nTracks < PACKFILE_PATH_MAX)
++                    if(filelist[i].nTracks < 256)
+                     {
+                         packfile_get_titlename(pn.namebuf, filelist[i].bgmFileName[filelist[i].nTracks]);
+                         filelist[i].bgmTracks[filelist[i].nTracks] = off;