Fix remote crash #136222.

Package-Manager: portage-2.1

5 files changed, 132 insertions, 5 deletions

diff --git a/games-action/0verkill/0verkill-0.16-r3.ebuild b/games-action/0verkill/0verkill-0.16-r3.ebuild
new file mode 100644
index 000000000000..caa220763fed
--- /dev/null
+++ b/games-action/0verkill/0verkill-0.16-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/0verkill-0.16-r3.ebuild,v 1.1 2006/06/10 12:49:56 vapier Exp $
+
+inherit eutils games
+
+DESCRIPTION="A bloody 2D action deathmatch-like game in ASCII-ART"
+HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/"
+SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="X"
+
+DEPEND="X? ( || ( x11-libs/libXpm virtual/x11 ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-docs.patch
+	epatch "${FILESDIR}"/${PV}-home-overflow.patch
+	epatch "${FILESDIR}"/${PV}-gentoo-paths.patch
+	epatch "${FILESDIR}"/${P}-underflow-check.patch #136222
+	sed -i \
+		-e "s:data/:${GAMES_DATADIR}/${PN}/data/:" cfg.h \
+		|| die "sed failed"
+	sed -i \
+		-e "s:@CFLAGS@ -O3 :@CFLAGS@ :" Makefile.in \
+		|| die "sed failed"
+}
+
+src_compile() {
+	egamesconf $(use_with X x) || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	local x
+	dogamesbin 0verkill || die
+	for x in avi bot editor server test_server ; do
+		newgamesbin ${x} 0verkill-${x} || die ${x}
+	done
+	if use X ; then
+		dogamesbin x0verkill || die
+		for x in avi editor ; do
+			newgamesbin ${x} 0verkill-${x} || die ${x}
+		done
+	fi
+
+	insinto ${GAMES_DATADIR}/${PN}/data
+	doins data/* || die
+	insinto ${GAMES_DATADIR}/${PN}/grx
+	doins grx/* || die
+
+	dohtml doc/*.htm
+	rm doc/*.html doc/README.OS2 doc/Readme\ Win32.txt doc/COPYING
+	dodoc doc/*
+
+	prepgamesdirs
+}
diff --git a/games-action/0verkill/ChangeLog b/games-action/0verkill/ChangeLog
index a9e57fe8cf63..6eacb2a94a63 100644
--- a/games-action/0verkill/ChangeLog
+++ b/games-action/0verkill/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/0verkill
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/ChangeLog,v 1.12 2006/04/30 16:31:32 bazik Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/ChangeLog,v 1.13 2006/06/10 12:49:56 vapier Exp $
+
+*0verkill-0.16-r3 (10 Jun 2006)
+
+  10 Jun 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/0verkill-0.16-underflow-check.patch, +0verkill-0.16-r3.ebuild:
+  Fix remote crash #136222.
 
   30 Apr 2006; Sven Blumenstein <bazik@gentoo.org> 0verkill-0.16-r2.ebuild:
   Added sparc keyword.
diff --git a/games-action/0verkill/Manifest b/games-action/0verkill/Manifest
index 13516c4c7138..4f7293f01e16 100644
--- a/games-action/0verkill/Manifest
+++ b/games-action/0verkill/Manifest
@@ -1,7 +1,49 @@
-MD5 201460db6904bcdc2f3099dc8e70836f 0verkill-0.16-r2.ebuild 1572
-MD5 aeab0544c72e49c16cc8b2bef2983d5d ChangeLog 1381
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.16-docs.patch 1477 RMD160 697fc37a2ae76ec58ddd8f40873ec33da3567eb1 SHA1 b0655ae1e29ab7bfce19d1c5dcfa02cf7aa07a3b SHA256 aa866aa38f93ac4fee8fe72f58dfd7ce6311780303169917a79fdc479ed2d1b6
 MD5 04be3e21d009bd5a35960e2b1a5f3493 files/0.16-docs.patch 1477
+RMD160 697fc37a2ae76ec58ddd8f40873ec33da3567eb1 files/0.16-docs.patch 1477
+SHA256 aa866aa38f93ac4fee8fe72f58dfd7ce6311780303169917a79fdc479ed2d1b6 files/0.16-docs.patch 1477
+AUX 0.16-gentoo-paths.patch 395 RMD160 30b38408a86c8917884f9b01874badbba3cdf3ef SHA1 7334411f165c50212097bd3f9b98eaa85bfe37ee SHA256 ea365e05bf9fac9e2f43778775b0cc60c0fa5525c9adbf7a326fb123ec69cfc6
 MD5 d8950100087c6833b0b5f3db66162b99 files/0.16-gentoo-paths.patch 395
+RMD160 30b38408a86c8917884f9b01874badbba3cdf3ef files/0.16-gentoo-paths.patch 395
+SHA256 ea365e05bf9fac9e2f43778775b0cc60c0fa5525c9adbf7a326fb123ec69cfc6 files/0.16-gentoo-paths.patch 395
+AUX 0.16-home-overflow.patch 725 RMD160 6bb85c426570813b0f6d35fa0085562b28930fa8 SHA1 cb4798c87de055dd4b205fef2542bb455e576f87 SHA256 9e0261f16dad0623c955026d777e1872eac4017e34ed66b02a8c8ef977a9f69d
 MD5 c4401c96f138fbc30fa5b9884febb7ab files/0.16-home-overflow.patch 725
-MD5 032b2b4357f281b2da9c0046ada0a03a files/digest-0verkill-0.16-r2 62
+RMD160 6bb85c426570813b0f6d35fa0085562b28930fa8 files/0.16-home-overflow.patch 725
+SHA256 9e0261f16dad0623c955026d777e1872eac4017e34ed66b02a8c8ef977a9f69d files/0.16-home-overflow.patch 725
+AUX 0verkill-0.16-underflow-check.patch 675 RMD160 cff920abbc084cfb4632cca17791a3fdf6228f49 SHA1 2c00a18d15e5a0afa3b2f6f433ba58790fef918e SHA256 e918e3b2b632632cca8c337caf019b0c2565ded120b8055a4d31677d446ef8e5
+MD5 e4ea6addca252136730df42c0368209b files/0verkill-0.16-underflow-check.patch 675
+RMD160 cff920abbc084cfb4632cca17791a3fdf6228f49 files/0verkill-0.16-underflow-check.patch 675
+SHA256 e918e3b2b632632cca8c337caf019b0c2565ded120b8055a4d31677d446ef8e5 files/0verkill-0.16-underflow-check.patch 675
+DIST 0verkill-0.16.tgz 276579
+EBUILD 0verkill-0.16-r2.ebuild 1572 RMD160 36827f4c0147c2c59aa3002da06ade6559a7215e SHA1 58a282fcc844fce523c266ea54d9d6a98773b1bc SHA256 05012ec63c1d54e29c5d566a0f6a341ebabc8f7faadf2dc5a96207b98ea7c626
+MD5 201460db6904bcdc2f3099dc8e70836f 0verkill-0.16-r2.ebuild 1572
+RMD160 36827f4c0147c2c59aa3002da06ade6559a7215e 0verkill-0.16-r2.ebuild 1572
+SHA256 05012ec63c1d54e29c5d566a0f6a341ebabc8f7faadf2dc5a96207b98ea7c626 0verkill-0.16-r2.ebuild 1572
+EBUILD 0verkill-0.16-r3.ebuild 1565 RMD160 44f7618ebc3788eb18e8895ccd2c206f79d17375 SHA1 9c764b50decd547e3e7d15ed2c11984833616c45 SHA256 c7fb94e492a6c09894e38a730933f07d9f62fee1e182bbef1b3e4238fae09a29
+MD5 a3c522ee240edcbae2bdaaf8ec04a449 0verkill-0.16-r3.ebuild 1565
+RMD160 44f7618ebc3788eb18e8895ccd2c206f79d17375 0verkill-0.16-r3.ebuild 1565
+SHA256 c7fb94e492a6c09894e38a730933f07d9f62fee1e182bbef1b3e4238fae09a29 0verkill-0.16-r3.ebuild 1565
+MISC ChangeLog 1566 RMD160 545e4c3f43ac584d8d77c241762d2da24b725f72 SHA1 3fc713b028a048bdf6c1b6f5b35dcb0d2cae63d4 SHA256 c84f57067e9d678591cfbfc0fd7aec33f5193c9418e38751f341f6a7cfbf9879
+MD5 19dee5e1c8e635c5daba4a59aa3d974f ChangeLog 1566
+RMD160 545e4c3f43ac584d8d77c241762d2da24b725f72 ChangeLog 1566
+SHA256 c84f57067e9d678591cfbfc0fd7aec33f5193c9418e38751f341f6a7cfbf9879 ChangeLog 1566
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 032b2b4357f281b2da9c0046ada0a03a files/digest-0verkill-0.16-r2 62
+RMD160 94483173c2c0bd99e4352a42df9c5ad981eb7256 files/digest-0verkill-0.16-r2 62
+SHA256 57dd1007a2b3fcf2881c6b07abbf24e9c732e53e5845d4552ad5ca040a45b2e2 files/digest-0verkill-0.16-r2 62
+MD5 032b2b4357f281b2da9c0046ada0a03a files/digest-0verkill-0.16-r3 62
+RMD160 94483173c2c0bd99e4352a42df9c5ad981eb7256 files/digest-0verkill-0.16-r3 62
+SHA256 57dd1007a2b3fcf2881c6b07abbf24e9c732e53e5845d4552ad5ca040a45b2e2 files/digest-0verkill-0.16-r3 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEisD42+ySkm8kpY0RAv/dAJ0b1jXLA4X6lI3/xoVGqJg5rNbCKwCgs6Ue
+E6piYgIGf1XtAN+Jo4twr1c=
+=2YFb
+-----END PGP SIGNATURE-----
diff --git a/games-action/0verkill/files/0verkill-0.16-underflow-check.patch b/games-action/0verkill/files/0verkill-0.16-underflow-check.patch
new file mode 100644
index 000000000000..d0af396deafd
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-underflow-check.patch
@@ -0,0 +1,17 @@
+The vulnerability is cause due to an integer underflow error in "recv_packet()"
+within the handling of a received UDP packet. This can be exploited to cause
+out-of-bounds memory access which crashes the server process via a UDP packet
+that is smaller than 12 bytes in size.
+
+http://bugs.gentoo.org/136222
+
+--- 0verkill-0.16/net.c
++++ 0verkill-0.16/net.c
+@@ -84,6 +84,7 @@
+ 	p=mem_alloc(max_len+12);
+ 	if (!p)return -1;  /* not enough memory */
+ 	retval=recvfrom(fd,p,max_len+12,0,addr,addr_len);
++	if (retval<12)return -1; /* not enough data from network */
+ 	memcpy(packet,p+12,max_len);
+ 	crc=p[0]+(p[1]<<8)+(p[2]<<16)+(p[3]<<24);
+ 	s=p[4]+(p[5]<<8)+(p[6]<<16)+(p[7]<<24);
diff --git a/games-action/0verkill/files/digest-0verkill-0.16-r3 b/games-action/0verkill/files/digest-0verkill-0.16-r3
new file mode 100644
index 000000000000..d7375b8806ba
--- /dev/null
+++ b/games-action/0verkill/files/digest-0verkill-0.16-r3
@@ -0,0 +1 @@
+MD5 814097fc21a82723a40ec8ae5dd792a7 0verkill-0.16.tgz 276579