Fix overflow & asneeded Bug #423061

Package-Manager: portage-2.1.11.1/cvs/Linux i686

5 files changed, 45 insertions, 10 deletions

diff --git a/games-arcade/fishsupper/ChangeLog b/games-arcade/fishsupper/ChangeLog
index 9035678bdce1..bf62335a2403 100644
--- a/games-arcade/fishsupper/ChangeLog
+++ b/games-arcade/fishsupper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/fishsupper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/fishsupper/ChangeLog,v 1.3 2012/02/24 14:34:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/fishsupper/ChangeLog,v 1.4 2012/06/25 07:44:57 tupone Exp $
+
+  25 Jun 2012; Tupone Alfredo <tupone@gentoo.org> fishsupper-0.1.6.ebuild,
+  +files/fishsupper-0.1.6-asneeded.patch,
+  +files/fishsupper-0.1.6-ovflfix.patch:
+  Fix overflow & asneeded Bug #423061 by flameeyes@gentoo.org
 
   24 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> fishsupper-0.1.6.ebuild:
   x86 stable wrt bug #404159
diff --git a/games-arcade/fishsupper/Manifest b/games-arcade/fishsupper/Manifest
index dfd047155040..df72c71992c6 100644
--- a/games-arcade/fishsupper/Manifest
+++ b/games-arcade/fishsupper/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX fishsupper-0.1.6-asneeded.patch 293 RMD160 0be0ed6da7bcc07189a366c7713e21af1a010441 SHA1 cd0df62533a3994683ae9e7cfc49ce5dbd301b1b SHA256 1db27edb84718c93e8a8f0d68890e1bfdc8fbc248c16934f5dcdff9680562d6f
+AUX fishsupper-0.1.6-ovflfix.patch 304 RMD160 be903437b187aa85234e5fbf7537b3e328eacae4 SHA1 acc55d1bcd6852698c3450df7886780f30d1bfc6 SHA256 8dd598bab65ee5158e8634bc5bf7ef53e540487050fb53477550832a3db7c9aa
 DIST fishsupper-0.1.6.tar.gz 1136893 RMD160 14118b8f25d698e2c934cc1a8e4da52f8b00a554 SHA1 aa4018e1b0cf4dc73b071d833024d93d0e3c0cc4 SHA256 d2d026ce9567fd6a86cb1c81458b540fd511d269d1af37c9e29df145091da3a8
-EBUILD fishsupper-0.1.6.ebuild 948 RMD160 39e260ed02dafa84d6c353bc3be90cc18f6c43ee SHA1 2fcfe3152d9b1bc1e8050f68f903e0bf35bc8ae7 SHA256 9b8388d4067394d2978d7359b33ac64cc8398c118caa7603a1527166e11b8132
-MISC ChangeLog 576 RMD160 00af2a02d4178325db8ecf36caa3c7b29c211415 SHA1 3f43c337f493e238a218b80587f707e546e49c8c SHA256 4f92dc86045be7f401249ed170037372a5ffedd0b81b7861b671920670375d3f
+EBUILD fishsupper-0.1.6.ebuild 1065 RMD160 884afa2d6ad37b5a92e39ee6aecbac551e13f53a SHA1 cf1b96c013dbbb54a645c84c9c88af17cb695471 SHA256 7ae6a0ff0b9b4363658810bb2f04daf32dcbe28a25b37758eae692449bd48102
+MISC ChangeLog 793 RMD160 0ea0937cb653ca30c6ec8f529556ca29b2efc946 SHA1 1eddd6e3926545c9e04b378bacd7d6aa3ab3c276 SHA256 aa902d13a92eaacfb608dbf7d59fbf287038762aa9608c92d7be6957691f5747
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk9HoBMACgkQuUQtlDBCeQIQggCfTdp96F8LbJPRJ5owLD2thBwR
-gcYAn3mhKuvR2Ld11kW6lFhpnvbp3aoO
-=LPGy
+iEYEARECAAYFAk/oFwMACgkQIY77eQFFFC1YwACgvXBT998b98jVGgs96uAvOSnE
+bDEAoL1DJBOCSHeRU8bTLIzFaDeQ+Wpg
+=Rh63
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
new file mode 100644
index 000000000000..2aba6f099e88
--- /dev/null
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am.old	2012-06-24 18:47:58.947143638 +0200
++++ src/Makefile.am	2012-06-24 18:51:35.738921904 +0200
+@@ -1,7 +1,7 @@
+ AM_CPPFLAGS = -DPKG_DATA_DIR=\"$(pkgdatadir)\" \
+ 			  @SDL_CFLAGS@ \
+ 			  -Wall
+-AM_LDFLAGS = @SDL_LIBS@ 
++LDADD = @SDL_LIBS@ 
+ 
+ bin_PROGRAMS = fishsupper
+ 
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
new file mode 100644
index 000000000000..4d5185dae7e9
--- /dev/null
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
@@ -0,0 +1,11 @@
+--- src/main.cpp.old	2012-06-24 18:35:27.661894094 +0200
++++ src/main.cpp	2012-06-24 18:35:41.041954632 +0200
+@@ -293,7 +293,7 @@
+     
+     if (!ok)
+     {
+-        fs_dir = new char[ strlen(".") ];
++        fs_dir = new char[ strlen(".") + 1];
+         strcpy(fs_dir, ".");
+     } // if ... else
+     
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
index 2dbcf1eff30b..be5d5a7b2b7d 100644
--- a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
+++ b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/fishsupper/fishsupper-0.1.6.ebuild,v 1.3 2012/02/24 14:34:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/fishsupper/fishsupper-0.1.6.ebuild,v 1.4 2012/06/25 07:44:57 tupone Exp $
 
 EAPI=2
-inherit eutils games
+inherit eutils autotools games
 
 DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger"
 HOMEPAGE="http://sourceforge.net/projects/fishsupper/"
@@ -21,6 +21,12 @@ RDEPEND="media-libs/libsdl[audio,video,opengl,X]
 DEPEND="${RDEPEND}
 	dev-libs/boost"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ovflfix.patch \
+		"${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
 src_configure() {
 	egamesconf \
 		--disable-dependency-tracking