add patch from upstream to address security bug #124829

Package-Manager: portage-2.1_pre5-r1

4 files changed, 68 insertions, 9 deletions

diff --git a/games-server/monopd/ChangeLog b/games-server/monopd/ChangeLog
index 18af6feee1f1..02b8735ff5de 100644
--- a/games-server/monopd/ChangeLog
+++ b/games-server/monopd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-server/monopd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/ChangeLog,v 1.15 2005/07/14 03:05:45 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/ChangeLog,v 1.16 2006/03/03 19:27:18 mr_bones_ Exp $
+
+  03 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/monopd-0.9.3-dosfix.patch, monopd-0.9.3.ebuild:
+  add patch from upstream to address security bug #124829
 
   14 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org> monopd-0.9.3.ebuild:
   use doinitd as suggested by Nikolas Garofil via bug #98751
diff --git a/games-server/monopd/Manifest b/games-server/monopd/Manifest
index 1a402449f150..f098787f584c 100644
--- a/games-server/monopd/Manifest
+++ b/games-server/monopd/Manifest
@@ -1,5 +1,18 @@
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 915fb1efc5e432c05a2a145865c22558 monopd-0.9.3.ebuild 715
-MD5 8808552b1d2e6d0c1af2d8944711c3cb ChangeLog 2459
-MD5 af1effcb4082455d3db6c37060770717 files/monopd 507
+MD5 a40868e0e8deeb52522a3457eee7b4d0 ChangeLog 2630
+RMD160 7417970e9c32ec17cf21aaf5e5fa855d745cbca2 ChangeLog 2630
+SHA256 150f0fcc6e58e8c28621f100174b40a4c4b15cd2995e9e1ee4521daaa231322b ChangeLog 2630
 MD5 6d12ac5f0eef478a8b245b346f632d0d files/digest-monopd-0.9.3 65
+RMD160 f3f5f1ecfaa09712bd3cb54e5b4d781b58d02069 files/digest-monopd-0.9.3 65
+SHA256 2da10e3aa9621d6cb174647a7938e2a627d847e20bb8a26578c28527259d8e1a files/digest-monopd-0.9.3 65
+MD5 af1effcb4082455d3db6c37060770717 files/monopd 507
+RMD160 e756da77333a0b0b5029751bfc0062b9e7ce25d6 files/monopd 507
+SHA256 4f806016a431f841f711bb9d8d09a78bebcf99a4c455d5d8e607569635f765e2 files/monopd 507
+MD5 55d8773a8a0ee3107ff0272e4b194411 files/monopd-0.9.3-dosfix.patch 1008
+RMD160 52ef7e687f37980114340137055234171b968b8d files/monopd-0.9.3-dosfix.patch 1008
+SHA256 f8f5be9dc78ab881ee8fa9e4865d5cbdd80552ce40ab633e93bcf7704ea754cd files/monopd-0.9.3-dosfix.patch 1008
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 4576f806496fba9d68cfe57312f8ae85 monopd-0.9.3.ebuild 804
+RMD160 003c23aa428c41621d14579a0f40b231b5f89603 monopd-0.9.3.ebuild 804
+SHA256 d6e7b58ce584d90175dae689ab699e867234a64435f86c28a0ee3a8a156af5a2 monopd-0.9.3.ebuild 804
diff --git a/games-server/monopd/files/monopd-0.9.3-dosfix.patch b/games-server/monopd/files/monopd-0.9.3-dosfix.patch
new file mode 100644
index 000000000000..05fabe13bb6d
--- /dev/null
+++ b/games-server/monopd/files/monopd-0.9.3-dosfix.patch
@@ -0,0 +1,36 @@
+--- monopd-0.9.3/src/server.cpp	Sat Jul 17 14:45:47 2004
++++ server.cpp	Fri Mar  3 10:29:06 2006
+@@ -791,7 +791,7 @@
+ 			switch(data[1])
+ 			{
+ 			case 'n':
+-				pNew = newPlayer(socket, data.substr(2));
++				pNew = newPlayer(socket, data.substr(2, 16));
+ 				sendXMLUpdates();
+ 				sendXMLUpdate(pNew, true, true); // give new player a full update (excluding self) so it knows who's in the lounge
+ 				return;
+@@ -832,13 +832,13 @@
+ 	switch(data[0])
+ 	{
+ 	case 'n':
+-		setPlayerName(pInput, std::string(data+1));
++		setPlayerName(pInput, data2.substr(2, 16));
+ 		return;
+ 	case 'p':
+ 		switch(data[1])
+ 		{
+ 			case 'i':
+-				pInput->setProperty("image", data+2, this);
++				pInput->setProperty("image", data2.substr(3, 32), this);
+ 				return;
+ 		}
+ 		break;
+@@ -1132,7 +1132,7 @@
+ 			switch(data[1])
+ 			{
+ 				case 'd':
+-					setGameDescription(pInput, data2.substr(2));
++					setGameDescription(pInput, data2.substr(2, 64));
+ 					return;
+ 				case 'c':
+ 					game->editConfiguration( pInput, data+2 );
diff --git a/games-server/monopd/monopd-0.9.3.ebuild b/games-server/monopd/monopd-0.9.3.ebuild
index 8efdd7d8e049..80fc22e0af24 100644
--- a/games-server/monopd/monopd-0.9.3.ebuild
+++ b/games-server/monopd/monopd-0.9.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/monopd-0.9.3.ebuild,v 1.3 2005/07/14 03:05:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/monopd-0.9.3.ebuild,v 1.4 2006/03/03 19:27:18 mr_bones_ Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="server for atlantik games"
 HOMEPAGE="http://unixcode.org/monopd/"
@@ -16,6 +16,12 @@ IUSE=""
 DEPEND=">=net-libs/libcapsinetwork-0.3.0
 	>=sys-libs/libmath++-0.0.3"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-dosfix.patch"
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc doc/api/gameboard API AUTHORS ChangeLog NEWS README* TODO