Version bump.

(Portage version: 2.1.2.4)

4 files changed, 205 insertions, 201 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 16c65b5b052b..e1f63bb1a651 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.38 2007/03/04 14:40:36 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.39 2007/04/21 11:50:51 pylon Exp $
+
+*openttd-0.5.1 (21 Apr 2007)
+
+  21 Apr 2007; Lars Weiler <pylon@gentoo.org>
+  -files/openttd-0.4.0.1-buffer-checks.patch, +openttd-0.5.1.ebuild:
+  Version bump.
 
   04 Mar 2007; Tony Vroon <chainsaw@gentoo.org> openttd-0.5.0.ebuild:
   Add ~ppc64 keyword. Tested on 64UL with GCC 4.1.2
diff --git a/games-simulation/openttd/files/digest-openttd-0.5.1 b/games-simulation/openttd/files/digest-openttd-0.5.1
new file mode 100644
index 000000000000..fcf7a3020167
--- /dev/null
+++ b/games-simulation/openttd/files/digest-openttd-0.5.1
@@ -0,0 +1,9 @@
+MD5 34e8cb13ce1d4e6b5b24887c628c1ac8 openttd-0.4.8-scenarios.tar.bz2 5000799
+RMD160 a6c2fa9f81e4e4628adb9c3932dec46ab4789777 openttd-0.4.8-scenarios.tar.bz2 5000799
+SHA256 61788035bd78a3c0e393d5992432c37e0b6036d19a960543f26d43a46e39e6ca openttd-0.4.8-scenarios.tar.bz2 5000799
+MD5 37892f1fdded957f956766642a9e877d openttd-0.5.0-scenarios.tar.bz2 917117
+RMD160 f6ea4a4004bb0c90de9283a92b14da4bd99bc33c openttd-0.5.0-scenarios.tar.bz2 917117
+SHA256 c89e652aca1a9ad9f0f4936dd99cd8a9c96f4c53450990ff87d87483f8e74a31 openttd-0.5.0-scenarios.tar.bz2 917117
+MD5 6f517a28c866f4a9029c0c005d868502 openttd-0.5.1-source.tar.bz2 3033665
+RMD160 e3faad8b8ed697aeb705af90d673b61370e02b6f openttd-0.5.1-source.tar.bz2 3033665
+SHA256 476eed7f6a45c06b193cdf5143e33056272f8bc197aa7903d17403f34a0faf5f openttd-0.5.1-source.tar.bz2 3033665
diff --git a/games-simulation/openttd/files/openttd-0.4.0.1-buffer-checks.patch b/games-simulation/openttd/files/openttd-0.4.0.1-buffer-checks.patch
deleted file mode 100644
index ffebb6c05603..000000000000
--- a/games-simulation/openttd/files/openttd-0.4.0.1-buffer-checks.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-Fix remote buffer overflows and format string attacks.
-
-Patch by Alexey Dobriyan, diffs taken from upstream svn.
-
-http://svn.openttd.org/cgi-bin/viewcvs.cgi?rev=2899&view=rev
-http://bugs.gentoo.org/show_bug.cgi?id=102631
-
-Log Message:
-Fix: Several format string vulnerabilities and buffer overflows in the network code
-
---- /trunk/console_cmds.c	2005/08/28 10:59:34	2898
-+++ trunk/console_cmds.c	2005/08/28 12:24:57	2899
-@@ -1132,7 +1132,7 @@
- 			SEND_COMMAND(PACKET_CLIENT_SET_NAME)(_network_player_name);
- 		} else {
- 			if (NetworkFindName(_network_player_name)) {
--				NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, _network_player_name);
-+				NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", _network_player_name);
- 				ttd_strlcpy(ci->client_name, _network_player_name, sizeof(ci->client_name));
- 				NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
- 			}
---- /trunk/network.c	2005/08/28 10:59:34	2898
-+++ trunk/network.c	2005/08/28 12:24:57	2899
-@@ -100,7 +100,7 @@
- 	char temp[1024];
- 
- 	va_start(va, str);
--	vsprintf(buf, str, va);
-+	vsnprintf(buf, lengthof(buf), str, va);
- 	va_end(va);
- 
- 	switch (action) {
-@@ -499,7 +499,7 @@
- 
- 		GetString(str, STR_NETWORK_ERR_CLIENT_GENERAL + errorno);
- 
--		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
- 
- 		// Inform other clients of this... strange leaving ;)
- 		FOR_ALL_CLIENTS(new_cs) {
---- /trunk/network_client.c	2005/08/28 10:59:34	2898
-+++ trunk/network_client.c	2005/08/28 12:24:57	2899
-@@ -349,7 +349,7 @@
- 	if (ci != NULL) {
- 		if (playas == ci->client_playas && strcmp(name, ci->client_name) != 0) {
- 			// Client name changed, display the change
--			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, name);
-+			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", name);
- 		} else if (playas != ci->client_playas) {
- 			// The player changed from client-player..
- 			// Do not display that for now
-@@ -666,7 +666,7 @@
- 
- 	ci = NetworkFindClientInfoFromIndex(index);
- 	if (ci != NULL) {
--		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, str);
-+		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str);
- 
- 		// The client is gone, give the NetworkClientInfo free
- 		ci->client_index = NETWORK_EMPTY_INDEX;
-@@ -684,11 +684,11 @@
- 	NetworkClientInfo *ci;
- 
- 	index = NetworkRecv_uint16(MY_CLIENT, p);
--	NetworkRecv_string(MY_CLIENT, p, str, 100);
-+	NetworkRecv_string(MY_CLIENT, p, str, lengthof(str));
- 
- 	ci = NetworkFindClientInfoFromIndex(index);
- 	if (ci != NULL) {
--		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, str);
-+		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str);
- 
- 		// The client is gone, give the NetworkClientInfo free
- 		ci->client_index = NETWORK_EMPTY_INDEX;
---- /trunk/network_server.c	2005/08/28 10:59:34	2898
-+++ trunk/network_server.c	2005/08/28 12:24:57	2899
-@@ -162,7 +162,7 @@
- 
- 		DEBUG(net, 2)("[NET] %s made an error (%s) and his connection is closed", client_name, str);
- 
--		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
- 
- 		FOR_ALL_CLIENTS(new_cs) {
- 			if (new_cs->status > STATUS_AUTH && new_cs != cs) {
-@@ -904,7 +904,7 @@
- 
- 	DEBUG(net, 2)("[NET] %s reported an error and is closing his connection (%s)", client_name, str);
- 
--	NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+	NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
- 
- 	FOR_ALL_CLIENTS(new_cs) {
- 		if (new_cs->status > STATUS_AUTH) {
-@@ -929,11 +929,11 @@
- 		return;
- 	}
- 
--	NetworkRecv_string(cs, p, str, 100);
-+	NetworkRecv_string(cs, p, str, lengthof(str));
- 
- 	NetworkGetClientName(client_name, sizeof(client_name), cs);
- 
--	NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+	NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
- 
- 	FOR_ALL_CLIENTS(new_cs) {
- 		if (new_cs->status > STATUS_AUTH) {
-@@ -1108,7 +1108,7 @@
- 	if (ci != NULL) {
- 		// Display change
- 		if (NetworkFindName(client_name)) {
--			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, client_name);
-+			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", client_name);
- 			ttd_strlcpy(ci->client_name, client_name, sizeof(ci->client_name));
- 			NetworkUpdateClientInfo(ci->client_index);
- 		}
---- /trunk/texteff.c	2005/08/28 10:59:34	2898
-+++ trunk/texteff.c	2005/08/28 12:24:57	2899
-@@ -62,7 +62,7 @@
- 	int length;
- 
- 	va_start(va, message);
--	vsprintf(buf, message, va);
-+	vsnprintf(buf, lengthof(buf), message, va);
- 	va_end(va);
- 
- 	/* Special color magic */
---- openttd/os2.c
-+++ openttd/os2.c
-@@ -642,7 +642,7 @@ static long CDECL MidiSendCommand(const 
- 	va_list va;
- 	char buf[512];
- 	va_start(va, cmd);
--	vsprintf(buf, cmd, va);
-+	vsnprintf(buf, sizeof(buf), cmd, va);
- 	va_end(va);
- 	return mciSendString(buf, NULL, 0, NULL, 0);
- }
---- openttd/strgen/strgen.c
-+++ openttd/strgen/strgen.c
-@@ -84,7 +84,7 @@ void warning(const char *s, ...) {
- 	char buf[1024];
- 	va_list va;
- 	va_start(va, s);
--	vsprintf(buf, s, va);
-+	vsnprintf(buf, sizeof(buf), s, va);
- 	va_end(va);
- 	fprintf(stderr, "%d: ERROR: %s\n", _cur_line, buf);
- 	_warnings = true;
-@@ -94,7 +94,7 @@ void NORETURN error(const char *s, ...) 
- 	char buf[1024];
- 	va_list va;
- 	va_start(va, s);
--	vsprintf(buf, s, va);
-+	vsnprintf(buf, sizeof(buf), s, va);
- 	va_end(va);
- 	fprintf(stderr, "%d: FATAL: %s\n", _cur_line, buf);
- 	exit(1);
---- openttd/ttd.c
-+++ openttd/ttd.c
-@@ -70,7 +70,7 @@ void CDECL error(const char *s, ...) {
- 	va_list va;
- 	char buf[512];
- 	va_start(va, s);
--	vsprintf(buf, s, va);
-+	vsnprintf(buf, sizeof(buf), s, va);
- 	va_end(va);
- 
- 	ShowOSErrorBox(buf);
-@@ -86,7 +86,7 @@ void CDECL ShowInfoF(const char *str, ..
- 	va_list va;
- 	char buf[1024];
- 	va_start(va, str);
--	vsprintf(buf, str, va);
-+	vsnprintf(buf, sizeof(buf), str, va);
- 	va_end(va);
- 	ShowInfo(buf);
- }
-@@ -99,7 +99,7 @@ char * CDECL str_fmt(const char *str, ..
- 	char *p;
- 
- 	va_start(va, str);
--	len = vsprintf(buf, str, va);
-+	len = vsnprintf(buf, sizeof(buf), str, va);
- 	va_end(va);
- 	p = malloc(len + 1);
- 	if (p)
---- openttd/win32.c
-+++ openttd/win32.c
-@@ -841,7 +841,7 @@ static long CDECL MidiSendCommand(const 
- 	char buf[512];
- 
- 	va_start(va, cmd);
--	vsprintf(buf, cmd, va);
-+	vsnprintf(buf, sizeof(buf), cmd, va);
- 	va_end(va);
- 	return mciSendStringA(buf, NULL, 0, 0);
- }
diff --git a/games-simulation/openttd/openttd-0.5.1.ebuild b/games-simulation/openttd/openttd-0.5.1.ebuild
new file mode 100644
index 000000000000..9bc1bec5fdfc
--- /dev/null
+++ b/games-simulation/openttd/openttd-0.5.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.5.1.ebuild,v 1.1 2007/04/21 11:50:51 pylon Exp $
+
+inherit eutils games
+
+SCENARIOS_048="${PN}-0.4.8-scenarios.tar.bz2"
+SCENARIOS_050="${PN}-0.5.0-scenarios.tar.bz2"
+
+DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
+HOMEPAGE="http://www.openttd.com/"
+SB="mirror://sourceforge/openttd"
+SRC_URI="${SB}/${P}-source.tar.bz2
+		scenarios? ( ${SB}/${SCENARIOS_048}
+			${SB}/${SCENARIOS_050} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
+IUSE="alsa debug dedicated png scenarios timidity unicode zlib"
+
+DEPEND="!dedicated? ( media-libs/libsdl >=media-libs/fontconfig-2.3.2 )
+	png? ( media-libs/libpng )
+	zlib? ( sys-libs/zlib )
+	unicode? ( virtual/libiconv )"
+RDEPEND="${DEPEND}
+	!dedicated? (
+		timidity? ( media-sound/timidity++ )
+		!timidity? ( alsa? ( media-sound/alsa-utils ) )
+	)"
+
+pkg_setup() {
+	if ! use dedicated && ! built_with_use media-libs/libsdl X ; then
+		die "Please emerge media-libs/libsdl with USE=X"
+	fi
+	games_pkg_setup
+}
+
+src_unpack() {
+	unpack ${P}-source.tar.bz2
+	if use scenarios ; then
+		cd ${S}/scenario/
+		unpack ${SCENARIOS_048}
+		unpack ${SCENARIOS_050}
+	fi
+	cd ${S}
+	# Don't pre-strip binaries (bug #137822)
+	sed -i -e '/+= -s$/s/-s//' Makefile || die "sed failed"
+	# Don't install into prefixed DATA_DIR
+	sed -i -e \
+		's#DATA_DIR_PREFIXED:=$(PREFIX)/$(DATA_DIR)#DATA_DIR_PREFIXED:=$(DATA_DIR)#' \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	local myopts=""
+	use debug && myopts="${myopts} DEBUG=1"
+	use dedicated && myopts="${myopts} DEDICATED=1"
+	use png && myopts="${myopts} WITH_PNG=1"
+	use zlib && myopts="${myopts} WITH_ZLIB=1"
+	use unicode && myopts="${myopts} WITH_ICONV=1"
+	if ! use dedicated ; then
+		myopts="${myopts} WITH_SDL=1"
+		if ! use timidity; then
+			use alsa && myopts="${myopts} MIDI=/usr/bin/aplaymidi"
+		fi
+	fi
+
+	# parallel build not supported
+	emake -j1 \
+		MANUAL_CONFIG=1 \
+		UNIX=1 \
+		WITH_NETWORK=1 \
+		INSTALL=1 \
+		RELEASE=${PV} \
+		USE_HOMEDIR=1 \
+		DEST_DIR=${D} \
+		PERSONAL_DIR=.openttd \
+		PREFIX=${GAMES_PREFIX} \
+		DATA_DIR=${GAMES_DATADIR}/${PN} \
+		CUSTOM_LANG_DIR=${GAMES_DATADIR}/${PN}/lang \
+		${myopts} \
+		|| die "emake failed"
+}
+
+src_install() {
+	dogamesbin openttd || die "dogamesbin failed"
+
+	insinto "${GAMES_DATADIR}/${PN}/data"
+	doins data/* || die "doins failed (data)"
+
+	insinto "${GAMES_DATADIR}/${PN}/lang"
+	doins lang/*.lng || die "doins failed (lang)"
+
+	if use scenarios ; then
+		insinto "${GAMES_DATADIR}/${PN}/scenario"
+		doins scenario/*.scn || die "doins failed (scenario)"
+		doins scenario/*/*.scn || die "doins failed (scenario)"
+	fi
+
+	insinto "${GAMES_DATADIR}/${PN}/scripts"
+	doins scripts/*.example || die "doins failed (scripts)"
+
+	for i in {16,32,48,64,128}; do
+		insinto /usr/share/icons/hicolor/${i}x${i}/apps
+		newins media/openttd.${i}.png openttd.png
+	done
+
+	if ! use dedicated ; then
+		if use timidity || use alsa ; then
+			make_desktop_entry "openttd -m extmidi" "OpenTTD" openttd
+		else
+			make_desktop_entry openttd "OpenTTD" openttd
+		fi
+	else
+		newinitd "${FILESDIR}"/openttd.initd openttd
+	fi
+
+	dodoc readme.txt known-bugs.txt changelog.txt docs/Manual.txt docs/console.txt docs/multiplayer.txt
+	dohtml -a html,gif,png,svg docs/*
+	newdoc scripts/readme.txt readme_scripts.txt
+	doman docs/openttd.6
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	echo
+	einfo "In order to play, you must copy the following 6 files from "
+	einfo "a version of TTD to ${GAMES_DATADIR}/${PN}/data/."
+	echo
+	einfo "From the WINDOWS version you need: "
+	einfo "  sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
+	einfo "OR from the DOS version you need: "
+	einfo "  SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
+	echo
+	einfo "File names are case sensitive so make sure they are "
+	einfo "correct for whichever version you have."
+	echo
+
+	if ! use scenarios ; then
+		einfo "Scenarios are now included in a seperate package. To "
+		einfo "install them as well please remerge with the "
+		einfo "\"scenarios\" USE flag."
+		echo
+	else
+		einfo "Scenarios are installed to ${GAMES_DATADIR}/${PN}/scenario,"
+		einfo "you will have to symlink them to ~/.openttd/scenario in order"
+		einfo "to use them."
+		einfo "Example:"
+		einfo "  mkdir -p ~/.openttd/scenario"
+		einfo "  ln -s ${GAMES_DATADIR}/${PN}/scenario/* ~/.openttd/scenario/"
+		echo
+	fi
+
+	if use dedicated ; then
+		einfo "You have chosen the dedicated USE flag which builds a "
+		einfo "version of OpenTTD to be used as a game server which "
+		einfo "does not require SDL. You will not be able to play the "
+		einfo "game, but if you don't pass this flag you can still use "
+		einfo "it as a server in the same way, but SDL will be required."
+		echo
+		ewarn "Warning: The init script will kill all running openttd"
+		ewarn "processes when run, including any running client sessions!"
+		echo
+	else
+		if use timidity || use alsa ; then
+			einfo "If you want music, you must copy the gm/ directory"
+			einfo "to ${GAMES_DATADIR}/${PN}/"
+			einfo "You can enable MIDI by running:"
+			einfo "  openttd -m extmidi"
+			echo
+			if use timidity ; then
+				einfo "You also need soundfonts for timidity, if you don't"
+				einfo "know what that is, do:"
+				echo
+				einfo "emerge media-sound/timidity-eawpatches"
+			else
+				einfo "You have emerged with 'aplaymidi' for playing MIDI."
+				einfo "You have to set the environment variable ALSA_OUTPUT_PORTS."
+				einfo "Available ports can be listed by using 'aplaymidi -l'."
+			fi
+		else
+			einfo "timidity and/or alsa not in USE so music will not be played during the game."
+		fi
+		echo
+	fi
+}