From owner-svn-ports-all@freebsd.org Thu Feb 22 01:01:52 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9220F1339E; Thu, 22 Feb 2018 01:01:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6CDB27D954; Thu, 22 Feb 2018 01:01:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67D202017B; Thu, 22 Feb 2018 01:01:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1M11pwW024587; Thu, 22 Feb 2018 01:01:51 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1M11pNu024584; Thu, 22 Feb 2018 01:01:51 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802220101.w1M11pNu024584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 22 Feb 2018 01:01:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r462557 - in branches/2018Q1/games/openbor: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/games/openbor: . files X-SVN-Commit-Revision: 462557 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Feb 2018 01:01:52 -0000 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;