From e92f4598522b6b61832b287f6ca5559b9b01c7c2 Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 22 Nov 2010 13:04:22 +0000 Subject: [PATCH] - update openttd to 1.0.5, which among bugfixes, fixes CVE-2010-4168. with daniel dickman (MAINTAINER) --- games/openttd/Makefile | 31 ++++++------- games/openttd/distinfo | 30 ++++++------- .../openttd/patches/patch-Makefile_bundle_in | 8 ++-- games/openttd/pkg/PLIST | 44 ++++++++++++++++++- games/openttd/pkg/{MESSAGE => README} | 9 +++- 5 files changed, 83 insertions(+), 39 deletions(-) rename games/openttd/pkg/{MESSAGE => README} (69%) diff --git a/games/openttd/Makefile b/games/openttd/Makefile index 1fee69ada61..473b128aa3d 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -1,16 +1,15 @@ -# $OpenBSD: Makefile,v 1.16 2010/11/16 11:23:27 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2010/11/22 13:04:22 jasper Exp $ COMMENT= open source clone of the game Transport Tycoon Deluxe -V= 1.0.3 +V= 1.0.5 DISTNAME= openttd-${V} -REVISION= 1 EXTRACT_SUFX= -source.tar.bz2 -DIST_GFX= opengfx-0.2.4 -DIST_SFX= opensfx-0.2.3 -DIST_MSX= openmsx-0.3.1 +GFX_V= 0.3.1 +SFX_V= 0.2.3 +MSX_V= 0.3.1 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${DIST_GFX}.tar.bz2:0 ${DIST_SFX}.zip:1 ${DIST_MSX}.zip:2 + opengfx-${GFX_V}.zip:0 opensfx-${SFX_V}.zip:1 openmsx-${MSX_V}.zip:2 CATEGORIES= games @@ -28,9 +27,9 @@ WANTLIB += SDL c expat fontconfig freetype icudata icui18n icuuc WANTLIB += lzo2 m png pthread stdc++ z MASTER_SITES= http://cz.binaries.openttd.org/openttd/binaries/releases/${V}/ -MASTER_SITES0= http://bundles.openttdcoop.org/opengfx/releases/ -MASTER_SITES1= http://bundles.openttdcoop.org/opensfx/releases/ -MASTER_SITES2= http://bundles.openttdcoop.org/openmsx/releases/0.3.1/ +MASTER_SITES0= http://bundles.openttdcoop.org/opengfx/releases/${GFX_V}/ +MASTER_SITES1= http://bundles.openttdcoop.org/opensfx/releases/${SFX_V}/ +MASTER_SITES2= http://bundles.openttdcoop.org/openmsx/releases/${MSX_V}/ LIB_DEPENDS= archivers/lzo2 \ devel/sdl \ @@ -40,8 +39,6 @@ LIB_DEPENDS= archivers/lzo2 \ RUN_DEPENDS= devel/desktop-file-utils CONFIGURE_STYLE= simple -USE_GROFF = Yes - CONFIGURE_ARGS+= --prefix-dir=${PREFIX} \ --binary-dir=bin \ --data-dir=share/openttd \ @@ -67,13 +64,13 @@ FAKE_FLAGS=BUNDLE_DIR=${WRKINST}/bundle BUNDLES_DIR=${WRKINST}/bundle post-install: ${INSTALL_DATA_DIR} ${GAMEDIR}/media - ${INSTALL_DATA} ${WRKSRC}/media/* ${GAMEDIR}/media + cd ${WRKSRC}/media/ && umask 022 && pax -rw . ${GAMEDIR}/media ${INSTALL_DATA_DIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${EXAMPLESDIR} ${INSTALL_DATA_DIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${DIST_GFX}/*.{grf,obg} ${GAMEDIR}/data - ${INSTALL_DATA} ${WRKDIR}/${DIST_SFX}/*.{cat,obs} ${GAMEDIR}/data - ${INSTALL_DATA} ${WRKDIR}/${DIST_MSX}/*.{mid,obm} ${GAMEDIR}/gm + cd ${WRKSRC}/docs/ && umask 022 && pax -rw . ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/opengfx-${GFX_V}/*.{grf,obg} ${GAMEDIR}/data + ${INSTALL_DATA} ${WRKDIR}/opensfx-${SFX_V}/*.{cat,obs} ${GAMEDIR}/data + ${INSTALL_DATA} ${WRKDIR}/openmsx-${MSX_V}/*.{mid,obm} ${GAMEDIR}/gm .include diff --git a/games/openttd/distinfo b/games/openttd/distinfo index e084ef323bc..e54f1ac5c28 100644 --- a/games/openttd/distinfo +++ b/games/openttd/distinfo @@ -1,20 +1,20 @@ -MD5 (opengfx-0.2.4.tar.bz2) = JZNw7iugawR5LR9XpNnkPg== +MD5 (opengfx-0.3.1.zip) = R+uynPxDrpReqg/hdphVHQ== MD5 (openmsx-0.3.1.zip) = hYt51ErqbeXhXZ0UOehsww== -MD5 (opensfx-0.2.3.zip) = NgW4LyQVNQDIoYBORCAWig== -MD5 (openttd-1.0.3-source.tar.bz2) = z/YMYkkTpJHtPJFHToRXIg== -RMD160 (opengfx-0.2.4.tar.bz2) = ztaRDqmWQ28GYIN7Syq9QAGjjg8= +MD5 (opensfx-0.2.3.zip) = bjpc+X/mnjo1HD4GFaFLBA== +MD5 (openttd-1.0.5-source.tar.bz2) = /Hn3iOK+FAlIuXLDKw8e7A== +RMD160 (opengfx-0.3.1.zip) = USugw5d1NOSkyje5QCM5Fo7VDko= RMD160 (openmsx-0.3.1.zip) = jv8kbonkT2PKSA6azvlKHaX6gdI= -RMD160 (opensfx-0.2.3.zip) = QmtkG1opVWWY2KMDO0xNxbmGMM4= -RMD160 (openttd-1.0.3-source.tar.bz2) = zwv65zhMllp1XPaVdVs1BDaZGWQ= -SHA1 (opengfx-0.2.4.tar.bz2) = pFlmcX3fiFBZIYYSQLhdcieVej4= +RMD160 (opensfx-0.2.3.zip) = f/fMp9oumCkx0pHXJ0OMmYrNN4c= +RMD160 (openttd-1.0.5-source.tar.bz2) = jXI+jv623phgtiz4Nfo9sJp4SM0= +SHA1 (opengfx-0.3.1.zip) = U3bom1zNP6imHgoYFIJCArt4n7c= SHA1 (openmsx-0.3.1.zip) = 6cQgOSO7nJdKxniGvQC3CQZYuWE= -SHA1 (opensfx-0.2.3.zip) = NoSA9iewVjr4DKckaVh1pKqJjbM= -SHA1 (openttd-1.0.3-source.tar.bz2) = CpxybUhCiN84gGfO7RFMUvsGgtY= -SHA256 (opengfx-0.2.4.tar.bz2) = KxhcLe0erl0YGyhzEXxzKew3U/JWB7b8UBiP3GGtASc= +SHA1 (opensfx-0.2.3.zip) = v7/t25H/MqWKaEiDgmNvOBJcSPQ= +SHA1 (openttd-1.0.5-source.tar.bz2) = Lgz6LW5MS8EjWmDeOZYXKLtyfrg= +SHA256 (opengfx-0.3.1.zip) = Fr6DzQ/Fm6jxqLPz6+JubA3zJcp1k5dt504HPF0e45s= SHA256 (openmsx-0.3.1.zip) = kuKTronxOtZ59DGF6D+4H7jK1H/mP0rz09n5VRMEYPU= -SHA256 (opensfx-0.2.3.zip) = aDG2UbPci0lAJvcneYmh11eWG2fBe3XTwuCXRR91rwI= -SHA256 (openttd-1.0.3-source.tar.bz2) = 9S8jgcZ43gJNJu5GXIIDMj6zSEMAxNwYLA1oxDnujFc= -SIZE (opengfx-0.2.4.tar.bz2) = 3490228 +SHA256 (opensfx-0.2.3.zip) = NXR0WsDBOLrlO1aXJZHbjXeK2fr/1R3q43pIpWPnFmI= +SHA256 (openttd-1.0.5-source.tar.bz2) = w1Niaxa0t4HbPDxh8K1lH1cB5Q+HQ5xABbRFa2PbCfg= +SIZE (opengfx-0.3.1.zip) = 3387182 SIZE (openmsx-0.3.1.zip) = 136981 -SIZE (opensfx-0.2.3.zip) = 11359588 -SIZE (openttd-1.0.3-source.tar.bz2) = 5395672 +SIZE (opensfx-0.2.3.zip) = 11144025 +SIZE (openttd-1.0.5-source.tar.bz2) = 5684796 diff --git a/games/openttd/patches/patch-Makefile_bundle_in b/games/openttd/patches/patch-Makefile_bundle_in index 8fd8da85194..98c96d39c82 100644 --- a/games/openttd/patches/patch-Makefile_bundle_in +++ b/games/openttd/patches/patch-Makefile_bundle_in @@ -1,9 +1,9 @@ -$OpenBSD: patch-Makefile_bundle_in,v 1.1 2010/09/24 10:33:34 jasper Exp $ +$OpenBSD: patch-Makefile_bundle_in,v 1.2 2010/11/22 13:04:22 jasper Exp $ Don't gzip(1) the manual page. ---- Makefile.bundle.in.orig Fri Jun 4 23:14:22 2010 -+++ Makefile.bundle.in Fri Sep 24 11:27:12 2010 +--- Makefile.bundle.in.orig Wed Oct 27 16:17:45 2010 ++++ Makefile.bundle.in Sun Nov 21 19:14:00 2010 @@ -81,7 +81,6 @@ endif ifdef MAN_DIR $(Q)mkdir -p "$(BUNDLE_DIR)/man/" @@ -12,7 +12,7 @@ Don't gzip(1) the manual page. endif $(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/" $(Q)cp "$(ROOT_DIR)/media/openttd."*.png "$(BUNDLE_DIR)/media/" -@@ -208,7 +207,7 @@ else +@@ -215,7 +214,7 @@ else endif ifdef MAN_DIR $(Q)install -d "$(INSTALL_MAN_DIR)" diff --git a/games/openttd/pkg/PLIST b/games/openttd/pkg/PLIST index ce73c8b7015..d12bb1aad44 100644 --- a/games/openttd/pkg/PLIST +++ b/games/openttd/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2010/09/24 10:33:34 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.8 2010/11/22 13:04:22 jasper Exp $ @bin bin/openttd @man man/man6/openttd.6 share/applications/openttd.desktop @@ -23,8 +23,12 @@ share/doc/openttd/obs_format.txt share/doc/openttd/openttd.6 share/doc/openttd/ottd-colour-palette.gif share/doc/openttd/ottd-colourtext-palette.png +share/doc/openttd/palettes/ +share/doc/openttd/palettes/openttd.gpl +share/doc/openttd/palettes/palette.act share/doc/openttd/readme.txt share/doc/openttd/tileh.png +share/doc/pkg-readmes/${FULLPKGNAME} share/examples/openttd/ share/examples/openttd/autoexec.scr.example share/examples/openttd/game_start.scr.example @@ -116,6 +120,7 @@ share/openttd/gm/wood_whistles.mid share/openttd/lang/ share/openttd/lang/afrikaans.lng share/openttd/lang/arabic_egypt.lng +share/openttd/lang/belarusian.lng share/openttd/lang/brazilian_portuguese.lng share/openttd/lang/bulgarian.lng share/openttd/lang/catalan.lng @@ -162,6 +167,43 @@ share/openttd/lang/ukrainian.lng share/openttd/lang/vietnamese.lng share/openttd/lang/welsh.lng share/openttd/media/ +share/openttd/media/extra_grf/ +share/openttd/media/extra_grf/2ccmapd.nfo +share/openttd/media/extra_grf/2ccmapw.nfo +share/openttd/media/extra_grf/airports.nfo +share/openttd/media/extra_grf/airports.pcx +share/openttd/media/extra_grf/aqueduct.nfo +share/openttd/media/extra_grf/aqueduct.pcx +share/openttd/media/extra_grf/autorail.nfo +share/openttd/media/extra_grf/autorail.pcx +share/openttd/media/extra_grf/canals.nfo +share/openttd/media/extra_grf/canals.pcx +share/openttd/media/extra_grf/chars.nfo +share/openttd/media/extra_grf/chars.pcx +share/openttd/media/extra_grf/elrails.nfo +share/openttd/media/extra_grf/elrails.pcx +share/openttd/media/extra_grf/fix_graphics.nfo +share/openttd/media/extra_grf/fix_graphics.pcx +share/openttd/media/extra_grf/flags.nfo +share/openttd/media/extra_grf/flags.pcx +share/openttd/media/extra_grf/foundations.nfo +share/openttd/media/extra_grf/foundations.pcx +share/openttd/media/extra_grf/oneway.nfo +share/openttd/media/extra_grf/oneway.pcx +share/openttd/media/extra_grf/openttd.nfo +share/openttd/media/extra_grf/openttdgui.nfo +share/openttd/media/extra_grf/openttdgui.pcx +share/openttd/media/extra_grf/overrides.nfo +share/openttd/media/extra_grf/roadstops.nfo +share/openttd/media/extra_grf/roadstops.pcx +share/openttd/media/extra_grf/shore.nfo +share/openttd/media/extra_grf/shore.pcx +share/openttd/media/extra_grf/signals.nfo +share/openttd/media/extra_grf/signals.pcx +share/openttd/media/extra_grf/sloped_tracks.nfo +share/openttd/media/extra_grf/sloped_tracks.pcx +share/openttd/media/extra_grf/tramtracks.nfo +share/openttd/media/extra_grf/tramtracks.pcx share/openttd/media/openttd.128.png share/openttd/media/openttd.16.png share/openttd/media/openttd.256.png diff --git a/games/openttd/pkg/MESSAGE b/games/openttd/pkg/README similarity index 69% rename from games/openttd/pkg/MESSAGE rename to games/openttd/pkg/README index 1198faead53..d5a98fafd41 100644 --- a/games/openttd/pkg/MESSAGE +++ b/games/openttd/pkg/README @@ -1,7 +1,12 @@ +$OpenBSD: README,v 1.1 2010/11/22 13:04:22 jasper Exp $ + +Running OpenTTD on OpenBSD +========================== + OpenTTD comes with free data and music. However, if you prefer to play with the original Transport Tycoon Deluxe data files you can copy the following files from either the DOS or Windows versions -into ${PREFIX}/share/openttd/data: +into ${TRUEPREFIX}/share/openttd/data/: - sample.cat - trg1r.grf or TRG1.GRF - trgcr.grf or TRGC.GRF @@ -11,5 +16,5 @@ into ${PREFIX}/share/openttd/data: If you want the original Transport Tycoon Deluxe music, copy the contents of the gm/ folder from the Windows version of Transport -Tycoon Deluxe to ${PREFIX}/share/openttd/gm. The music from the DOS +Tycoon Deluxe to ${TRUEPREFIX}/share/openttd/gm/. The music from the DOS and original Transport Tycoon versions does not work.