Fix for bug #125647.

(Portage version: 2.1_pre6-r2)

5 files changed, 130 insertions, 6 deletions

diff --git a/games-action/bzflag/ChangeLog b/games-action/bzflag/ChangeLog
index fff997f76c3b..a099f673ccf6 100644
--- a/games-action/bzflag/ChangeLog
+++ b/games-action/bzflag/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-action/bzflag
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/ChangeLog,v 1.19 2005/10/30 08:27:49 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/ChangeLog,v 1.20 2006/03/19 21:34:29 tupone Exp $
+
+*bzflag-2.0.4.20050930-r1 (19 Mar 2006)
+
+  19 Mar 2006; <Tupone@gentoo.org>
+  +files/bzflag-2.0.4.20050930-callsignfix.patch,
+  +bzflag-2.0.4.20050930-r1.ebuild:
+  Fix for bug #125647 - server can be crashed remotely. Thanks Carlsten Lohrke
 
 *bzflag-2.0.4.20050930 (30 Oct 2005)
 
diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
index 16235803da04..ceacc7fe0187 100644
--- a/games-action/bzflag/Manifest
+++ b/games-action/bzflag/Manifest
@@ -1,10 +1,39 @@
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 bd5071da486fa00e232d8db00354e31e bzflag-2.0.0.20050117.ebuild 1513
+MD5 6d2a71a13d40b2ebe83a19e4f694c070 ChangeLog 4574
+RMD160 d3ad03a0b0964dab43228aa2f8968a0b103ce8a5 ChangeLog 4574
+SHA256 8c126442e13b4bfa9bdd700de61ba14429b75df2cff4a1869d6cfd05429ec6ef ChangeLog 4574
 MD5 6d70b2af734b80cf89594fc21825085d bzflag-1.10.8.20041007.ebuild 1237
+RMD160 8c1c01a3c329717c6d5fe900241960832c61e6e3 bzflag-1.10.8.20041007.ebuild 1237
+SHA256 ee977777e2ebf91a74a4d55626e28eec8c9cfad703eedb1bc2ea0b78e9faaec7 bzflag-1.10.8.20041007.ebuild 1237
+MD5 bd5071da486fa00e232d8db00354e31e bzflag-2.0.0.20050117.ebuild 1513
+RMD160 2cdb04c468f353d39c7858b81b004a2da8bd0ffa bzflag-2.0.0.20050117.ebuild 1513
+SHA256 0f690f0e0f09d528bc2d029162d8621590f3af399ef11952c78a4a15b3ceece4 bzflag-2.0.0.20050117.ebuild 1513
 MD5 aa1b3a2446c4080826653860672f2415 bzflag-2.0.2.20050318.ebuild 1513
-MD5 37e1ea49126b0e9a68d2e55cf92cc090 ChangeLog 4332
+RMD160 4162183f33b16b3d4a7da2422ae8a88c787f92a2 bzflag-2.0.2.20050318.ebuild 1513
+SHA256 a4941c034bd9b99b995af9a91505a0eb37ef1ba9c935155805f3e58c1176c29b bzflag-2.0.2.20050318.ebuild 1513
+MD5 81c9b2356ceb58eba585d51cc911a658 bzflag-2.0.4.20050930-r1.ebuild 1651
+RMD160 62851583c80e80d59eef0f855ddb52ecd6b95018 bzflag-2.0.4.20050930-r1.ebuild 1651
+SHA256 76cfdf4e0702abc9a63b86add378e49ef13346069c4e8c726e1ed873d771a0bd bzflag-2.0.4.20050930-r1.ebuild 1651
 MD5 861e911fa29d7f641dcc3438f49ba83e bzflag-2.0.4.20050930.ebuild 1726
-MD5 d7c7be8382d3a2ffe1f07394b05b1552 files/digest-bzflag-2.0.2.20050318 75
+RMD160 e1eabfea27170acdc974140e5e3ac022cb01f718 bzflag-2.0.4.20050930.ebuild 1726
+SHA256 c82ebb8e146bfefcba048613d09f4ea04b6a728b8980a0efb06d2a0f600cc99c bzflag-2.0.4.20050930.ebuild 1726
+MD5 5cc604a1e5554c4a7bd2a11d9a7ad0d0 files/bzflag-2.0.4.20050930-callsignfix.patch 555
+RMD160 0b5b2275eb39f7a1211e5f48455e3dc906548328 files/bzflag-2.0.4.20050930-callsignfix.patch 555
+SHA256 19df8e50d3f4a09025201699472498f64ec2c3d112cef79791180caf1dec2e3a files/bzflag-2.0.4.20050930-callsignfix.patch 555
 MD5 fe41525284965b2043cd849635f9f085 files/digest-bzflag-1.10.8.20041007 76
+RMD160 e6ee916a10425a3451c794f95a6e25e477295024 files/digest-bzflag-1.10.8.20041007 76
+SHA256 4cb7dbb75aea60dd4ea147ac52d538006d7b8c4c2797d8cdac1b88da3f691290 files/digest-bzflag-1.10.8.20041007 76
 MD5 8e85604e31f5c039ff7b200107918c95 files/digest-bzflag-2.0.0.20050117 75
+RMD160 64425210d40e4900acb33053b5f85d2ddcce4ead files/digest-bzflag-2.0.0.20050117 75
+SHA256 85074bdc533574e74d46425991e65bdc512fe6cd4c08f163568ae63b298a4b27 files/digest-bzflag-2.0.0.20050117 75
+MD5 d7c7be8382d3a2ffe1f07394b05b1552 files/digest-bzflag-2.0.2.20050318 75
+RMD160 5aef48eb0626ca2a2749ef2afbb0aaaa76a99b2f files/digest-bzflag-2.0.2.20050318 75
+SHA256 27a1cb8666f6f9a4d75cd066765889d5e039e3a2d2cee949e92eaaeea8343b0a files/digest-bzflag-2.0.2.20050318 75
 MD5 7ec840e308a59cb5288c44206c2abdf7 files/digest-bzflag-2.0.4.20050930 76
+RMD160 169440e955d46d431e4dd2ba133be793b175f84d files/digest-bzflag-2.0.4.20050930 76
+SHA256 da9d312212bc997b75d3eb824e4b40f4cad0d973f6f27b19b04c073506064e9c files/digest-bzflag-2.0.4.20050930 76
+MD5 5e41d4854b38f35142da9f395be27e89 files/digest-bzflag-2.0.4.20050930-r1 274
+RMD160 4c8ee239ee608d895ee43bd641b5cd389b5fc8f5 files/digest-bzflag-2.0.4.20050930-r1 274
+SHA256 2f7e0cb15316e7a6343ad6feb935e3d1ed276429c3f52cb39806fea2dd383231 files/digest-bzflag-2.0.4.20050930-r1 274
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-action/bzflag/bzflag-2.0.4.20050930-r1.ebuild b/games-action/bzflag/bzflag-2.0.4.20050930-r1.ebuild
new file mode 100644
index 000000000000..e703c06f9c9b
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.0.4.20050930-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/bzflag-2.0.4.20050930-r1.ebuild,v 1.1 2006/03/19 21:34:29 tupone Exp $
+
+inherit eutils flag-o-matic games
+
+DESCRIPTION="OpenGL accelerated 3d tank combat simulator game"
+HOMEPAGE="http://www.BZFlag.org/"
+SRC_URI="mirror://sourceforge/bzflag/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dedicated"
+
+DEPEND=">=net-misc/curl-7.15.0
+	sys-libs/ncurses
+	net-dns/c-ares
+	!dedicated? (
+		virtual/opengl
+		media-libs/libsdl )"
+
+pkg_setup() {
+	# comment in bug #107792
+	# only do the libsdl checks for !dedicated
+	use dedicated || GAMES_USE_SDL="nojoystick"
+	games_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-callsignfix.patch
+	sed -i \
+		-e 's:^CFLAGS=.*::' \
+		-e 's:^CXXFLAGS=.*::' \
+		-e 's:-mcpu=$host_cpu::' \
+		-e 's:-mtune=$host_cpu::' \
+		-e 's:-ffast-math -fno-exceptions -fsigned-char::' \
+		configure \
+		|| die "sed failed"
+	filter-flags -fno-default-inline
+}
+
+src_compile() {
+	local myconf
+
+	if use dedicated ; then
+		ewarn
+		ewarn "You are building a server-only copy of BZFlag"
+		ewarn
+		myconf="--disable-client --without-SDL"
+	fi
+	egamesconf \
+		--disable-dependency-tracking \
+		${myconf} \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS TODO ChangeLog BUGS PORTING DEVINFO NEWS README* RELNOTES
+
+	if ! use dedicated ; then
+		doicon "data/bzflag-48x48.png"
+		make_desktop_entry ${PN} "BZFlag" ${PN}-48x48.png
+	fi
+	prepgamesdirs
+}
diff --git a/games-action/bzflag/files/bzflag-2.0.4.20050930-callsignfix.patch b/games-action/bzflag/files/bzflag-2.0.4.20050930-callsignfix.patch
new file mode 100644
index 000000000000..2a0d0a1411b2
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.0.4.20050930-callsignfix.patch
@@ -0,0 +1,15 @@
+--- src/game/PlayerInfo.cxx.original	2006-03-14 20:33:53.000000000 +0100
++++ src/game/PlayerInfo.cxx	2006-03-14 20:36:43.000000000 +0100
+@@ -108,6 +108,12 @@
+   buf = nboUnpackString(buf, email, EmailLen);
+   buf = nboUnpackString(buf, token, TokenLen);
+   buf = nboUnpackString(buf, clientVersion, VersionLen);
++
++  // terminate the strings
++  callSign[CallSignLen - 1] = '\0';
++  email[EmailLen - 1] = '\0';
++  token[TokenLen - 1] = '\0';
++  clientVersion[VersionLen - 1] = '\0';
+   cleanEMail();
+ 
+   DEBUG2("Player %s [%d] sent version string: %s\n",
diff --git a/games-action/bzflag/files/digest-bzflag-2.0.4.20050930-r1 b/games-action/bzflag/files/digest-bzflag-2.0.4.20050930-r1
new file mode 100644
index 000000000000..0edf52f758da
--- /dev/null
+++ b/games-action/bzflag/files/digest-bzflag-2.0.4.20050930-r1
@@ -0,0 +1,3 @@
+MD5 b91444c788996902b799f9b64efddd8f bzflag-2.0.4.20050930.tar.bz2 11251394
+RMD160 0f3b352c1f276ec53990367fff51d674c69e2402 bzflag-2.0.4.20050930.tar.bz2 11251394
+SHA256 496e8ea90bd2ae0e1f76cf160ab4c219f579d118edad345b33b3b085747e5e69 bzflag-2.0.4.20050930.tar.bz2 11251394