add bounds patch from Ewgenij Starostin (bug #197556); QA fixes; patch name standardizing

Package-Manager: portage-2.1.3.19

7 files changed, 96 insertions, 41 deletions

diff --git a/games-action/0verkill/0verkill-0.16-r3.ebuild b/games-action/0verkill/0verkill-0.16-r3.ebuild
index 870fd36065b5..e01ef08c8996 100644
--- a/games-action/0verkill/0verkill-0.16-r3.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 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.3 2007/08/08 22:02:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/0verkill-0.16-r3.ebuild,v 1.4 2007/11/16 06:33:01 mr_bones_ Exp $
 
-inherit eutils games
+inherit autotools eutils games
 
 DESCRIPTION="a bloody 2D action deathmatch-like game in ASCII-ART"
 HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/"
@@ -18,16 +18,22 @@ DEPEND="X? ( x11-libs/libXpm )"
 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
+	epatch \
+		"${FILESDIR}"/${P}-docs.patch \
+		"${FILESDIR}"/${P}-home-overflow.patch \
+		"${FILESDIR}"/${P}-segv.patch \
+		"${FILESDIR}"/${P}-gentoo-paths.patch \
+		"${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"
+	sed -i \
+		-e "/gettimeofday/s/getopt/getopt calloc/" configure.in \
+		|| die "sed failed"
+	eautoreconf
 }
 
 src_compile() {
diff --git a/games-action/0verkill/ChangeLog b/games-action/0verkill/ChangeLog
index 588745cdcab6..289820656187 100644
--- a/games-action/0verkill/ChangeLog
+++ b/games-action/0verkill/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-action/0verkill
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/ChangeLog,v 1.14 2006/12/01 19:49:07 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/ChangeLog,v 1.15 2007/11/16 06:33:01 mr_bones_ Exp $
+
+  16 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0verkill-0.16-docs.patch, -files/0.16-docs.patch,
+  +files/0verkill-0.16-gentoo-paths.patch, -files/0.16-gentoo-paths.patch,
+  +files/0verkill-0.16-home-overflow.patch, -files/0.16-home-overflow.patch,
+  +files/0verkill-0.16-segv.patch, 0verkill-0.16-r3.ebuild:
+  add bounds patch from Ewgenij Starostin (bug #197556); QA fixes; patch name
+  standardizing
 
   01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   0verkill-0.16-r3.ebuild:
diff --git a/games-action/0verkill/Manifest b/games-action/0verkill/Manifest
index d9da16ada386..61cbc32c77e7 100644
--- a/games-action/0verkill/Manifest
+++ b/games-action/0verkill/Manifest
@@ -1,31 +1,32 @@
------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
-RMD160 6bb85c426570813b0f6d35fa0085562b28930fa8 files/0.16-home-overflow.patch 725
-SHA256 9e0261f16dad0623c955026d777e1872eac4017e34ed66b02a8c8ef977a9f69d files/0.16-home-overflow.patch 725
+AUX 0verkill-0.16-docs.patch 1477 RMD160 697fc37a2ae76ec58ddd8f40873ec33da3567eb1 SHA1 b0655ae1e29ab7bfce19d1c5dcfa02cf7aa07a3b SHA256 aa866aa38f93ac4fee8fe72f58dfd7ce6311780303169917a79fdc479ed2d1b6
+MD5 04be3e21d009bd5a35960e2b1a5f3493 files/0verkill-0.16-docs.patch 1477
+RMD160 697fc37a2ae76ec58ddd8f40873ec33da3567eb1 files/0verkill-0.16-docs.patch 1477
+SHA256 aa866aa38f93ac4fee8fe72f58dfd7ce6311780303169917a79fdc479ed2d1b6 files/0verkill-0.16-docs.patch 1477
+AUX 0verkill-0.16-gentoo-paths.patch 531 RMD160 14f6a75ed034f3aa7547b9d5ddc92b3511ca4a90 SHA1 b8d2e9e3284bb38604b75be8c8e8ec412c13f03c SHA256 d89de2a05ffd6480d7b76d0256d1ab5670561e68d9476d1d03772f54929110c9
+MD5 994c62248fe5bf5642ee8ba49db61e2d files/0verkill-0.16-gentoo-paths.patch 531
+RMD160 14f6a75ed034f3aa7547b9d5ddc92b3511ca4a90 files/0verkill-0.16-gentoo-paths.patch 531
+SHA256 d89de2a05ffd6480d7b76d0256d1ab5670561e68d9476d1d03772f54929110c9 files/0verkill-0.16-gentoo-paths.patch 531
+AUX 0verkill-0.16-home-overflow.patch 725 RMD160 6bb85c426570813b0f6d35fa0085562b28930fa8 SHA1 cb4798c87de055dd4b205fef2542bb455e576f87 SHA256 9e0261f16dad0623c955026d777e1872eac4017e34ed66b02a8c8ef977a9f69d
+MD5 c4401c96f138fbc30fa5b9884febb7ab files/0verkill-0.16-home-overflow.patch 725
+RMD160 6bb85c426570813b0f6d35fa0085562b28930fa8 files/0verkill-0.16-home-overflow.patch 725
+SHA256 9e0261f16dad0623c955026d777e1872eac4017e34ed66b02a8c8ef977a9f69d files/0verkill-0.16-home-overflow.patch 725
+AUX 0verkill-0.16-segv.patch 1560 RMD160 a3a244821dc9882692a7c5dd13ddd1e5c7c02163 SHA1 4c82c1c80a91ffb6800c8aecaa43078d0ce1fc1d SHA256 b49cb1a14667cc4033e6094f99a9ddc1ef242381acac83a3abdeebf208724291
+MD5 0a6e36023cdeb7242fec16f9c99fd6cd files/0verkill-0.16-segv.patch 1560
+RMD160 a3a244821dc9882692a7c5dd13ddd1e5c7c02163 files/0verkill-0.16-segv.patch 1560
+SHA256 b49cb1a14667cc4033e6094f99a9ddc1ef242381acac83a3abdeebf208724291 files/0verkill-0.16-segv.patch 1560
 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 RMD160 fdf7a132dfa0312d8d732b2bf2999e7264685eec SHA1 6ce4152f20709175e0bad80cc79ec00e2064a100 SHA256 8091261c3fef3535edb97ab46cb48c067befb329e951bfa3f1b54ae6b7e1dadf
-EBUILD 0verkill-0.16-r3.ebuild 1551 RMD160 66a8d0a7a5052f7e41666001118d8793e2af941b SHA1 01276f29ac7ad08f08656a1d6e55fd1c4d560d99 SHA256 ab98918a9f16b8cd6e3fdff0e840b772953ecbc84d06ccb37b895803b6b3be12
-MD5 884c613887b730ccf3d097bee1532d90 0verkill-0.16-r3.ebuild 1551
-RMD160 66a8d0a7a5052f7e41666001118d8793e2af941b 0verkill-0.16-r3.ebuild 1551
-SHA256 ab98918a9f16b8cd6e3fdff0e840b772953ecbc84d06ccb37b895803b6b3be12 0verkill-0.16-r3.ebuild 1551
-MISC ChangeLog 1689 RMD160 c96d078ce3afb383c8b4d366a6ca8dfb6eee1c63 SHA1 403ee1361acdf794d0f0901559878bbc052508c3 SHA256 c1b4ac19e70001489646ebb087b25b24a790b9cfbdab8c82a1a090525ed4d672
-MD5 4b8c3498318ad3eb504be17e0813aaa0 ChangeLog 1689
-RMD160 c96d078ce3afb383c8b4d366a6ca8dfb6eee1c63 ChangeLog 1689
-SHA256 c1b4ac19e70001489646ebb087b25b24a790b9cfbdab8c82a1a090525ed4d672 ChangeLog 1689
+EBUILD 0verkill-0.16-r3.ebuild 1692 RMD160 4b4e6247922ed2fd6e24a8f7c21418951102bf4a SHA1 3bcc89a80d168901be14e9e3eb4cd980de9f2f99 SHA256 4a898c7d95a8433077a0a258363cb261681d195a18d911ffac9010e81cbc46d7
+MD5 422100cbb387b2cd59f6d8d84e391ccc 0verkill-0.16-r3.ebuild 1692
+RMD160 4b4e6247922ed2fd6e24a8f7c21418951102bf4a 0verkill-0.16-r3.ebuild 1692
+SHA256 4a898c7d95a8433077a0a258363cb261681d195a18d911ffac9010e81cbc46d7 0verkill-0.16-r3.ebuild 1692
+MISC ChangeLog 2111 RMD160 b2d33d8aa50fd8c903a2c5a39b14072d4a72e2c4 SHA1 2d9ea1c487d4782cbe6c7fee86d36ebf630659f7 SHA256 13f1202ce13034773c42f1c133ff0b212962b23e0653552bba7d1cfd6606ed72
+MD5 0d3b2e87f222dd86de9e84cbb26ad78a ChangeLog 2111
+RMD160 b2d33d8aa50fd8c903a2c5a39b14072d4a72e2c4 ChangeLog 2111
+SHA256 13f1202ce13034773c42f1c133ff0b212962b23e0653552bba7d1cfd6606ed72 ChangeLog 2111
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -33,10 +34,3 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 dcb2423f66201d2eafcc5f28c8dff4c9 files/digest-0verkill-0.16-r3 232
 RMD160 457e353a59c7e68d13c3c38be29059a65f3b9bcb files/digest-0verkill-0.16-r3 232
 SHA256 ddaf5c4ae28a814dc8a83c371166895290ca91b5de2283bf9a17e690b34ab2d7 files/digest-0verkill-0.16-r3 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGuj3op/wUKkr7RBoRAoCgAKCIb+JuVnvJAOTozXWK46kaGsXrmQCgzv4j
-mlE2Nm7XiUpGuzK7oFhC3b0=
-=xUeV
------END PGP SIGNATURE-----
diff --git a/games-action/0verkill/files/0.16-docs.patch b/games-action/0verkill/files/0verkill-0.16-docs.patch
index 90d049309f4d..90d049309f4d 100644
--- a/games-action/0verkill/files/0.16-docs.patch
+++ b/games-action/0verkill/files/0verkill-0.16-docs.patch
diff --git a/games-action/0verkill/files/0.16-gentoo-paths.patch b/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch
index 63b77e0ffb7e..a5ecaec01684 100644
--- a/games-action/0verkill/files/0.16-gentoo-paths.patch
+++ b/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch
@@ -1,6 +1,14 @@
---- sprite.c.orig	2004-01-08 00:42:51.897946128 -0500
-+++ sprite.c	2004-01-08 00:43:10.986044296 -0500
-@@ -188,6 +188,12 @@
+--- sprite.c.orig	2007-11-15 18:26:30.000000000 -0500
++++ sprite.c	2007-11-15 18:26:57.000000000 -0500
+@@ -2,6 +2,7 @@
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #ifndef WIN32
+ #include "config.h"
+@@ -188,6 +189,12 @@
   
  	if (!(f=fopen(filename,"rb")))
  	{
diff --git a/games-action/0verkill/files/0.16-home-overflow.patch b/games-action/0verkill/files/0verkill-0.16-home-overflow.patch
index ec9b7efb36e7..ec9b7efb36e7 100644
--- a/games-action/0verkill/files/0.16-home-overflow.patch
+++ b/games-action/0verkill/files/0verkill-0.16-home-overflow.patch
diff --git a/games-action/0verkill/files/0verkill-0.16-segv.patch b/games-action/0verkill/files/0verkill-0.16-segv.patch
new file mode 100644
index 000000000000..9f9656dfd9fa
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-segv.patch
@@ -0,0 +1,39 @@
+diff -Naurp 0verkill-0.16.old/data.c 0verkill-0.16/data.c
+--- 0verkill-0.16.old/data.c	2007-10-30 19:49:59.000000000 +0100
++++ 0verkill-0.16/data.c	2007-10-30 20:25:08.000000000 +0100
+@@ -471,7 +471,7 @@ my_double can_go_x(my_double old_x,my_do
+ 		for (x=double2int(old_x)+1;x<=round_up(new_x);x++)  /* go to the right */
+ 		{
+ 			if (x>AREA_X-1) return int2double(AREA_X-1);
+-			for (y=yh;y<=yl;y++)
++			for (y=(yh>=0?yh:0);y<=yl;y++)
+ 				if ((area_a[x+y*AREA_X]&240)==TYPE_WALL)
+ 					return int2double(x-1);
+ 		}
+@@ -479,7 +479,7 @@ my_double can_go_x(my_double old_x,my_do
+ 		for (x=round_up(old_x)-1;x>=double2int(new_x);x--)  /* go to the left */
+ 		{
+ 			if (x<0) return 0;
+-			for (y=yh;y<=yl;y++)
++			for (y=(yh>=0?yh:0);y<=yl;y++)
+ 				if ((area_a[x+y*AREA_X]&240)==TYPE_WALL) return int2double(x+1);
+ 		}
+ 	if(flag)*flag=0;
+@@ -501,7 +501,7 @@ my_double can_go_y(my_double old_y, my_d
+ 		for (y=double2int(old_y)+1;y<=round_up(new_y);y++)  /* go down */
+ 		{
+ 			if (y>AREA_Y-1) return int2double(AREA_Y-1);
+-			for (x=xl;x<=xr;x++)
++			for (x=(xl>=0?xl:0);x<=xr;x++)
+ 				if ((area_a[x+y*AREA_X]&240)==TYPE_WALL||(!down_ladder&&((area_a[x+y*AREA_X]&240)==TYPE_JUMP||(area_a[x+y*AREA_X]&240)==TYPE_JUMP_FOREGROUND))) return int2double(y-1);
+ 		}
+ 	else
+@@ -510,7 +510,7 @@ my_double can_go_y(my_double old_y, my_d
+ 		for (y=round_up(old_y)-1;y>=double2int(new_y);y--)  /* go up */
+ 		{
+ 			if (y<0) return 0;
+-			for (x=xl;x<=xr;x++)
++			for (x=(xl>=0?xl:0);x<=xr;x++)
+ 				if ((area_a[x+y*AREA_X]&240)==TYPE_WALL) return int2double(y+1);
+ 		}
+ 	}