Apply patch to fix remote DoS in the dedicated server, bug #239557

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 152 insertions, 3 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index 2d286b101ac4..e985af31c317 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/ut2004
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.64 2009/02/05 16:56:21 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.65 2009/09/03 13:35:31 nyhm Exp $
+
+*ut2004-3369.3 (03 Sep 2009)
+
+  03 Sep 2009; Tristan Heaven <nyhm@gentoo.org> +ut2004-3369.3.ebuild:
+  Apply patch to fix remote DoS in the dedicated server, bug #239557
 
   05 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
   ut2004-3369-r4.ebuild:
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 3dd16f3fade9..cd25f1045682 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ut2004.xml 370 RMD160 f54254f4af9422b72e93b9f4e2aa126b828c34f4 SHA1 53be0a7e6cd5ea1c5329fee791e527b9f8edf29a SHA256 69d2ad349f8b0464157979518ca3482b6b8bbc34f25d710668775f36581be34c
 DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 RMD160 af632d8cd1f05e36e861eb3fab927ffc8ae3f59d SHA1 a8cc33877a02a0a09c288b5fc248efde282f7bdf SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3
+DIST ut2004-v3369-3-linux-dedicated.7z 5013927 RMD160 4326acaeca0e40185a5f8321330188fc34ab7920 SHA1 db5cccc4b08e6314f203e8f036adf8421861c501 SHA256 799f00deccb7ee1e3db3963deeb50a41b05a262e6f7363654c4f0438e06d7192
 EBUILD ut2004-3369-r4.ebuild 4868 RMD160 fb993f2e0419c27fa53b70259c0d3fd45eadb2f6 SHA1 a62ec6e83c60adc10dbec603ca5020e855ade42a SHA256 efac56efc354465292484cfb9ccd00a47aa3704d23514f4d7c9ce82e18f8e3cb
-MISC ChangeLog 11414 RMD160 6367a8a3a76d138b50a08c19ebeb65687862ac50 SHA1 1d755b321bc7885f27a4ae6b3a965f1bf6cde8c2 SHA256 fa0fe482897400c2b1b8d69f060eb59a4d6f83ff5afa4f9d19775db724539a30
+EBUILD ut2004-3369.3.ebuild 3886 RMD160 c4ca39ae20d84a22d97cb69f088ed0d8c1ca7ddc SHA1 2e8440fc7681508b699ed78a2549668c6ce46c64 SHA256 f4516f1b9a8bd4de198b5cc47217fdd91bbc32ca0709edc249b3b51283b83c0a
+MISC ChangeLog 11580 RMD160 6baca71107e7b3aba993f47df45bda391c50e8e9 SHA1 eb889b51385b02ce526fe8e486a73027e0c93644 SHA256 435083d15096b7bed830b46a93388cde1b0eeb272ee87cb6da38331b398fec59
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqfxikACgkQdz7hIScOURHemQCfZcxU2J3Eici5/Y4z+fERjKrV
+v/AAoJkgnP7bxXxZv4sU4kBum0uZfj2E
+=FbxN
+-----END PGP SIGNATURE-----
diff --git a/games-fps/ut2004/ut2004-3369.3.ebuild b/games-fps/ut2004/ut2004-3369.3.ebuild
new file mode 100644
index 000000000000..3a97ea9ea3ff
--- /dev/null
+++ b/games-fps/ut2004/ut2004-3369.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369.3.ebuild,v 1.1 2009/09/03 13:35:31 nyhm Exp $
+
+inherit eutils multilib games
+
+MY_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
+DESCRIPTION="Editor's Choice Edition plus Mega Pack for the critically-acclaimed first-person shooter"
+HOMEPAGE="http://www.unrealtournament2004.com/"
+SRC_URI="mirror://3dgamers/unrealtourn2k4/${MY_P}
+	http://speculum.twistedgamer.com/pub/0day.icculus.org/${PN}/${MY_P}
+	http://treefort.icculus.org/${PN}/${MY_P}
+	http://sonic-lux.net/data/mirror/ut2004/${MY_P}
+	mirror://gentoo/ut2004-v${PV/./-}-linux-dedicated.7z"
+
+LICENSE="ut2003"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated opengl"
+RESTRICT="mirror strip"
+PROPERTIES="interactive"
+
+RDEPEND=">=games-fps/ut2004-data-3186-r2
+	>=games-fps/ut2004-bonuspack-ece-1-r1
+	>=games-fps/ut2004-bonuspack-mega-1-r1
+	=virtual/libstdc++-3.3
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	media-libs/libsdl
+	media-libs/openal
+	opengl? ( virtual/opengl )"
+DEPEND="app-arch/p7zip"
+
+S=${WORKDIR}/UT2004-Patch
+
+GAMES_CHECK_LICENSE="yes"
+dir=${GAMES_PREFIX_OPT}/${PN}
+
+# The executable pages are required #114733
+QA_EXECSTACK_x86="${dir:1}/System/ut2004-bin
+	${dir:1}/System/ucc-bin"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/System
+
+	# These files are owned by ut2004-bonuspack-mega
+	rm -f Manifest.in{i,t} Packages.md5
+
+	rm -f ucc-bin*
+
+	if use amd64 ; then
+		mv -f ut2004-bin-linux-amd64 ut2004-bin || die
+	else
+		rm -f ut2004-bin-linux-amd64
+	fi
+
+	cd "${WORKDIR}"/ut2004-ucc-bin-09192008
+	if use amd64 ; then
+		mv -f ucc-bin-linux-amd64 "${S}"/System/ucc-bin || die
+	else
+		mv -f ucc-bin "${S}"/System/ || die
+	fi
+}
+
+src_install() {
+	insinto "${dir}"
+	doins -r * || die "doins failed"
+	fperms +x "${dir}"/System/{ucc-bin,ut2004-bin} || die
+
+	dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so || die
+	dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0 \
+		|| die
+
+	games_make_wrapper ut2004 ./ut2004 "${dir}" "${dir}"
+	make_desktop_entry ut2004 "Unreal Tournament 2004"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	# Here is where we check for the existence of a cdkey...
+	# If we don't find one, we ask the user for it
+	if [[ -f ${dir}/System/cdkey ]] ; then
+		einfo "A cdkey file is already present in ${dir}/System"
+	else
+		ewarn "You MUST run this before playing the game:"
+		ewarn "emerge --config =${CATEGORY}/${PF}"
+		ewarn "That way you can [re]enter your cdkey."
+	fi
+	elog "Starting with 3369, the game supports render-to-texture. To enable"
+	elog "it, you will need the Nvidia drivers of at least version 7676 and"
+	elog "you should edit the following:"
+	elog 'Set "UseRenderTargets=True" in the "[OpenGLDrv.OpenGLRenderDevice]"'
+	elog 'section of your UT2004.ini or Default.ini and set "bPlayerShadows=True"'
+	elog 'and "bBlobShadow=False" in the "[UnrealGame.UnrealPawn]" section of'
+	elog 'your User.ini or DefUser.ini.'
+}
+
+pkg_postrm() {
+	ewarn "This package leaves a cdkey file in ${dir}/System that you need"
+	ewarn "to remove to completely get rid of this game's files."
+}
+
+pkg_config() {
+	ewarn "Your CD key is NOT checked for validity here so"
+	ewarn "make sure you type it in correctly."
+	ewarn "If you CTRL+C out of this, the game will not run!"
+	echo
+	einfo "CD key format is: XXXXX-XXXXX-XXXXX-XXXXX"
+	while true ; do
+		einfo "Please enter your CD key:"
+		read CDKEY1
+		einfo "Please re-enter your CD key:"
+		read CDKEY2
+		if [[ -z ${CDKEY1} ]] || [[ -z ${CDKEY2} ]] ; then
+			echo "You entered a blank CD key. Try again."
+		else
+			if [[ ${CDKEY1} == ${CDKEY2} ]] ; then
+				echo "${CDKEY1}" | tr [:lower:] [:upper:] > "${dir}"/System/cdkey
+				einfo "Thank you!"
+				break
+			else
+				eerror "Your CD key entries do not match. Try again."
+			fi
+		fi
+	done
+}