fixed upstream segfault error

Package-Manager: portage-2.1.4.4

4 files changed, 184 insertions, 2 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 43dbfa98a76d..97e3af93ec8e 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/eternal-lands
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.44 2008/07/17 21:10:03 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.45 2008/07/18 02:54:11 rich0 Exp $
+
+*eternal-lands-1.7.0-r1 (18 Jul 2008)
+
+  18 Jul 2008; Richard Freeman <rich0@gentoo.org>
+  +files/eternal-lands-1.7.0-errors.patch, +eternal-lands-1.7.0-r1.ebuild:
+  fixed upstream segfault error
 
 *eternal-lands-1.7.0 (17 Jul 2008)
 
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 8256066f373a..0d1898d99dda 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,5 +1,7 @@
+AUX eternal-lands-1.7.0-errors.patch 474 RMD160 85af59e9c6e4ca5d3883c04530c13296d1b63f06 SHA1 34b92def42f740177b413a4031491db4c2cc7dfc SHA256 444e3de42e67193d1ab038eecfe8610d52a134d38819f88ea2dc94d46070a748
 DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA1 34ee1c154178090f45ca171509f8ba00d26d6a21 SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb
 EBUILD eternal-lands-1.6.0.ebuild 4036 RMD160 f0600c3010d5b4171f0b05c9b49e70f0f0372cbe SHA1 2a6e2d7f762a6111e30dd1b6015efeb59f00ae0e SHA256 9d32aa31f9246c4a5b3280fc245fde50e01f39499257d119fa8dccd466e0bed8
+EBUILD eternal-lands-1.7.0-r1.ebuild 4098 RMD160 ed5740518e0a331eed7056e44a7c46fbc770ef03 SHA1 a781eae14dfa132c2c2968791faf88ebc8b92ca1 SHA256 cabcbfaccee8fbd5581adc9b29b489c5e7b8f2c88f645d34d7a25be64901eb84
 EBUILD eternal-lands-1.7.0.ebuild 4261 RMD160 51c0c3bfe61008b4c2c8d8fecb859380a99c55f5 SHA1 9e305b6ce548167e2e8123f91b9dc1f4cea66824 SHA256 ce242c19f38fe37be212910de9c429f78623f090b5a0494b0ab22ee8d8fe9684
-MISC ChangeLog 7990 RMD160 b860fcd853de107e038f00bfe909da095a805be4 SHA1 dd7a2ea376cf4e0ef460c0957901d882737a61e1 SHA256 8a4625b76438f8c9e924c068df796a7fa24e8976a6a684a2d4d555acd78fc8b1
+MISC ChangeLog 8187 RMD160 c1d567a47dac4d967885968ed221935a507d7d07 SHA1 cc80b2f29c528489895314223e723a9b6dabfe9e SHA256 551fab0db487ba8c241af192d95039b5915a40aac15f656479c7a67b859d4fbe
 MISC metadata.xml 366 RMD160 ccbe7a2729da6681a8dbcd3d7ea23add0ff18c65 SHA1 667cc0ff9d3cc004febdc7e34903e6d81ad2c68d SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732
diff --git a/games-rpg/eternal-lands/eternal-lands-1.7.0-r1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..69e02853c444
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.7.0-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.7.0-r1.ebuild,v 1.1 2008/07/18 02:54:11 rich0 Exp $
+
+inherit cvs eutils flag-o-matic games
+
+DESCRIPTION="An online MMORPG written in C and SDL"
+HOMEPAGE="http://www.eternal-lands.com"
+SRC_URI="mirror://gentoo/eternal-lands.png"
+
+LICENSE="eternal_lands"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="debug doc kernel_linux"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	virtual/opengl
+	virtual/glu
+	media-libs/libsdl
+	media-libs/sdl-net
+	media-libs/sdl-image
+	media-libs/openal
+	media-libs/freealut
+	media-libs/libvorbis
+	dev-libs/libxml2
+	media-libs/cal3d
+	!=media-libs/cal3d-0.11.0_pre20050823
+	media-libs/libpng
+	=games-rpg/eternal-lands-data-1.7.0"
+
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-opengl-1.0.6-r1
+	app-arch/unzip
+	doc? ( app-doc/doxygen
+		media-gfx/graphviz )"
+
+ECVS_SERVER="cvs.elc.berlios.de:/cvsroot/elc"
+ECVS_MODULE="elc"
+ECVS_USER="anonymous"
+#ECVS_LOCALNAME="elc"
+ECVS_PASS=""
+ECVS_CVS_OPTIONS="-dP -z3"
+ECVS_BRANCH="elc_1_7_0"
+
+S="${WORKDIR}/${ECVS_MODULE}"
+
+pkg_setup() {
+	games_pkg_setup
+	if built_with_use media-libs/cal3d 16bit-indices ; then
+		eerror "${PN} won't work if media-libs/cal3d has been built with 16bit-indices"
+		die "re-emerge  media-libs/cal3d without the 16bit-indices USE flag"
+	fi
+}
+
+src_unpack() {
+	cvs_src_unpack
+	OPTIONS="-DDATA_DIR="\\\\\"${GAMES_DATADIR}/${PN}/\\\\\"""
+	S_CLIENT="${WORKDIR}/elc"
+	BROWSER="firefox"
+
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/eternal-lands-1.7.0-errors.patch"
+
+
+	# Add debugging options
+	if use debug ; then
+		OPTIONS="${OPTIONS} -DMEMORY_DEBUG"
+		append-flags -ggdb
+	fi
+
+	# Clean compile flags (make Gentoo friendly)
+	sed -i \
+		-e "s@CFLAGS=\$(PLATFORM) \$(CWARN) -O0 -ggdb -pipe@CFLAGS = ${CFLAGS} ${OPTIONS} @g" \
+		-e "s@CXXFLAGS=\$(PLATFORM) \$(CXXWARN) -O0 -ggdb -pipe@CXXFLAGS = ${CXXFLAGS} ${OPTIONS} @g" \
+		-e 's/lopenal/lopenal -l alut/' \
+		Makefile.linux || die "sed failed"
+
+	sed -i \
+		-e 's/#browser/browser/g' \
+		-e "s/browser = mozilla/#browser = ${BROWSER}/g" \
+		-e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
+		el.ini || die "sed failed"
+
+	# Support BSD in the Linux makefile - it's easier
+	use kernel_linux || sed -i \
+		-e 's/^CFLAGS=.*/& -DBSD/' \
+		Makefile.linux || die "sed failed"
+
+	# Gah (anybody know why this is here?)
+#	sed -i \
+#		-e 's/CXX=g++/CXX=gcc/' \
+#		Makefile.linux || die "sed failed"
+
+	# Finally, update the server
+	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
+		el.ini || die "sed failed"
+
+	sed -i -e 's:FEATURES:EL_FEATURES:' make.defaults
+	sed -i -e 's:FEATURES:EL_FEATURES:' Makefile.linux
+
+	if use debug; then
+		sed -i -e 's/#\(EL_FEATURES += MEMORY_DEBUG\)/\1/' make.defaults
+		sed -i -e 's/#\(EL_FEATURES += MEMORY_DEBUG\)/\1/' Makefile.linux
+	fi
+
+	cp Makefile.linux Makefile
+}
+
+src_compile() {
+	emake || die "make failed"
+
+	if use doc; then
+		emake docs || die "Failed to create documentation, try with USE=-doc"
+		mv ./docs/html/ ../client || die "Failed to move documentation directory"
+	fi
+}
+
+src_install() {
+	doicon "${DISTDIR}/eternal-lands.png" ${PN}.png
+
+	newgamesbin el.x86.linux.bin el \
+		|| die "newgamesbin failed"
+	make_desktop_entry el "Eternal Lands" \
+		|| die "make_desktop_entry failed"
+	insopts -m 0660
+	insinto "${GAMES_DATADIR}/${PN}"
+
+	doins -r *.ini *.txt commands.lst \
+		|| die "doins failed"
+
+	if use doc ; then
+		dohtml -r client/*
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "Auto Update is now enabled in Eternal Lands"
+	elog "If an update occurs then the client will suddenly exit"
+	elog "Updates only happen when the game first loads"
+	elog "Please don't report this behaviour as a bug"
+
+	# Ensure that the files are writable by the game group for auto
+	# updating.
+	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${PN}"
+
+	# Make sure new files stay in games group
+	find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
+
+}
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.7.0-errors.patch b/games-rpg/eternal-lands/files/eternal-lands-1.7.0-errors.patch
new file mode 100644
index 000000000000..7af126db0b9a
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.7.0-errors.patch
@@ -0,0 +1,17 @@
+--- errors.c.orig	2008-07-17 22:43:28.791326638 -0400
++++ errors.c	2008-07-17 22:44:37.258432153 -0400
+@@ -68,12 +68,12 @@
+ 	time(&c_time);
+ 	l_time = localtime(&c_time);
+ 	strftime(logmsg, sizeof(logmsg), "[%H:%M:%S] ", l_time);
+-	strcat(logmsg, errmsg);
++	strncat(logmsg, errmsg, sizeof(logmsg)-strlen(logmsg)-2);
+ 
+ 	if(message[strlen(message)-1] != '\n') {
+ 		strcat(logmsg, "\n");
+ 	}
+-	fprintf(err_file, logmsg);
++	fputs(logmsg, err_file);
+   	fflush (err_file);
+ }
+