patch from Daniel Santos to fix segfault (bug #422915)

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 39 insertions, 10 deletions

diff --git a/games-action/powermanga/ChangeLog b/games-action/powermanga/ChangeLog
index 9c1255010d22..87fc5dc18466 100644
--- a/games-action/powermanga/ChangeLog
+++ b/games-action/powermanga/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/powermanga
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/powermanga/ChangeLog,v 1.21 2011/06/06 21:06:24 mr_bones_ Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/powermanga/ChangeLog,v 1.22 2012/08/03 04:25:58 mr_bones_ Exp $
+
+  03 Aug 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/powermanga-0.90-segfault.patch, powermanga-0.90.ebuild:
+  patch from Daniel Santos to fix segfault (bug #422915)
 
   06 Jun 2011; Michael Sterrett <mr_bones_@gentoo.org> powermanga-0.90.ebuild:
   update libsdl dep to match the README
diff --git a/games-action/powermanga/Manifest b/games-action/powermanga/Manifest
index 79917c2572f6..c0072732737f 100644
--- a/games-action/powermanga/Manifest
+++ b/games-action/powermanga/Manifest
@@ -1,5 +1,6 @@
-AUX powermanga-0.90-underlink.patch 1082 RMD160 79ad5c3300a56c58cbcff13281e996c1390ece90 SHA1 6929343e4e3c3e6c300ab5469a5d2554e01e2c70 SHA256 5dcb7d1d390c1e593fff2c0ebc698027cc040f4a41c567c23d40f881a3b8c5e3
-DIST powermanga-0.90.tgz 11496484 RMD160 8bc937fab37b267b26c18689450028d217cd002a SHA1 d3fbe77f13b8e808cf2cecb8799309625e278179 SHA256 9537b99cdb860711612ce119a2da7b6f1407c1a2511cf056b0846dbf11b6ff0c
-EBUILD powermanga-0.90.ebuild 1811 RMD160 65f76fb41888355ccef932f47811abb3c6a7b67a SHA1 b99bb73f1b7c8d7a2da83215e4739b7f46e40dcc SHA256 58ece98d2b2b87e9b48803475e1da5bc4db04d733a22505cd110eae01a1b5783
-MISC ChangeLog 2941 RMD160 693ddf50d15d6a55c4df3d67bd1837fda289587f SHA1 c20ceb72b31c2bede4b5257ab3e73023813206b7 SHA256 352d6840ccbbd2c9328cb4c1067e4592ddfc3df18ce2d598991d79002ddab9de
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+AUX powermanga-0.90-segfault.patch 968 SHA256 e8d3e6447481271a2f6953836e8f607c1f017b1be1620b7b43134d18b3c6ae94 SHA512 1c9efe5086200aef00e9d0b2e95ca4259e70309cda348362d1739c23ac245d322ac48935e29900ac4fbc164a4ffb36c6649d5c80fa9de03f3eb287c2688194be WHIRLPOOL 2f426c33fd80d19289c5e07f5ebf3b302f5181a202e3f5349a5b1092f1cb51284881eecef2ae27f91c1830f16315893d144fe41a882c42025a982249c9601259
+AUX powermanga-0.90-underlink.patch 1082 SHA256 5dcb7d1d390c1e593fff2c0ebc698027cc040f4a41c567c23d40f881a3b8c5e3 SHA512 cd1e4f64477a6a87d8669904c4e7ccc0a2d7f7f6f07f5ca2255439dd8eef521e23c19e3a009d69d46ae5cc78ad5035238adf9b81fb8809432218e225bb0a2894 WHIRLPOOL 55d3c157a8e6d731f6b801ec8dd6fe55746a1cb754f233b081d6ebea406815fe78fbfd57d03be6277f9535efaabec061114afeffe664d8c23cb0f4a6436328af
+DIST powermanga-0.90.tgz 11496484 SHA256 9537b99cdb860711612ce119a2da7b6f1407c1a2511cf056b0846dbf11b6ff0c SHA512 e744c374dea075b076a2aa910dca37b2c4db77984e0714dafd0a621c6321ff0810ce7b7c321e5ef9f477adbf9a8774427f336b75e82529299ccd1fc2901c956d WHIRLPOOL 07f268e3f608964cf25cac5e616ccd183e30a0de5f7deaae5ce466d37933b1fe1cda8bc0e57e6f4f0a37ef276f35a527faa6d66c58d23e2a2d6ecaea97cd46f0
+EBUILD powermanga-0.90.ebuild 1853 SHA256 63592d3145c05a69d1dc3aacc823443f82ff2af2828606fcd2df3928a74ec8da SHA512 70588998474e5fc3e3aef6690f71c035c5c6921fc64c42c9a404dd6e020aa1855aa896316aef6d8385099b9ca0b56219f66465478ec2265da94d6a0f26766bbc WHIRLPOOL a75e076593986f594b5521b1c264ca01b6ad3bb7f0ed405c6282bd755a8dbfbe64be56d23b9c5684d8dcd496a8d4390112b8980b1dc60764adfbb3cf0ccbe6f2
+MISC ChangeLog 3119 SHA256 36cc0cd36da8834fe0a48fe48dbf0af9b5ba92a345eca943f11de65af870101e SHA512 561244019f5f699f8f0c39c9384c9dd1551882a598987064b8607423f23c73088c33c4d3d94f0b8b9e5b2926417dbf75c5bc2ed9ba691db4de62b4efc195aad1 WHIRLPOOL ada81126fda16280942ddfc65b45900e85216e33ed37a535ff59d17697af198a1add2b6123fc8835eb003f77423f763a2c644c3ca73659a3d2a8309c2018fdba
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-action/powermanga/files/powermanga-0.90-segfault.patch b/games-action/powermanga/files/powermanga-0.90-segfault.patch
new file mode 100644
index 000000000000..573a5794e399
--- /dev/null
+++ b/games-action/powermanga/files/powermanga-0.90-segfault.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/show_bug.cgi?id=422915
+
+--- tmp/powermanga-0.90.orig/src/shots.c	2007-08-24 00:55:17.000000000 -0700
++++ powermanga-0.90-dfsg/src/shots.c	2011-12-26 21:10:28.000000000 -0800
+@@ -447,8 +447,6 @@
+           {
+             bullet->img_angle = (Sint16) (bullet->angle / PI_SUR_16);
+           }
+-        /* save current angle for the calculation of the next angle */
+-        bullet->img_old_angle = bullet->img_angle;
+         /* avoid negative indexes */
+         bullet->img_angle = (Sint16) abs (bullet->img_angle);
+         /* avoid a shot angle higher than the number of images */
+@@ -456,6 +454,8 @@
+           {
+             bullet->img_angle = (Sint16) (bullet->spr.numof_images - 1);
+           }
++        /* save current angle for the calculation of the next angle */
++        bullet->img_old_angle = bullet->img_angle;
+         /* draw the shot sprite */
+         draw_sprite (bullet->spr.
+                      img[bullet->img_angle],
diff --git a/games-action/powermanga/powermanga-0.90.ebuild b/games-action/powermanga/powermanga-0.90.ebuild
index 69187d38a62f..0f40e24c50b8 100644
--- a/games-action/powermanga/powermanga-0.90.ebuild
+++ b/games-action/powermanga/powermanga-0.90.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/powermanga/powermanga-0.90.ebuild,v 1.10 2011/06/06 21:06:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/powermanga/powermanga-0.90.ebuild,v 1.11 2012/08/03 04:25:58 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils autotools games
@@ -32,7 +32,9 @@ src_prepare() {
 		#endif
 		EOF
 	done
-	epatch "${FILESDIR}"/${P}-underlink.patch
+	epatch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-segfault.patch
 	eautoreconf
 }