Fix overflow. Bug #339122

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

4 files changed, 28 insertions, 23 deletions

diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index a5c6814defce..002fe3287020 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/visualboyadvance
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.35 2009/06/13 15:50:14 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.36 2010/11/02 14:48:59 tupone Exp $
+
+  02 Nov 2010; Tupone Alfredo <tupone@gentoo.org>
+  visualboyadvance-1.7.2-r2.ebuild,
+  +files/visualboyadvance-1.7.2-ovflfix.patch:
+  Fix overflow. Bug #339122 by flameeyes@gentoo.org
 
   13 Jun 2009; Tristan Heaven <nyhm@gentoo.org>
   visualboyadvance-1.7.2-r2.ebuild,
diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
index 05faa07c517b..f7f0ef352fe2 100644
--- a/games-emulation/visualboyadvance/Manifest
+++ b/games-emulation/visualboyadvance/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.7.2-gcc34.patch 1354 RMD160 6a3764040df0e166ca7c9e984bd6553264685460 SHA1 8e4b8f2abb93119c0fd7576bff981cf0d771076c SHA256 82c4ec3170fc982eaf5665c44ce2b767868d81f522adf45325df4a7a680d9ac5
 AUX 1.7.2-gcc41.patch 1441 RMD160 bb1ddefb515022876c1ad7479b4308be4b77fab7 SHA1 531384f5d8e7f6c39951a5c946de12de618a309e SHA256 ec5f42182e6daabe560d3437ca0f95054dc5355dd32a972f923d8ba98bba88e6
 AUX 1.7.2-homedir.patch 415 RMD160 c617252b5cf61a829bd25c4821c684791ac9c58e SHA1 4458dbb1b111356c22b46c84266c48cab5238c00 SHA256 c49ac18ac3a71355bc7fb790da176a45fe558d4e4f08366045d34f8c801cc05c
 AUX visualboyadvance-1.7.2-glibc2.10.patch 1827 RMD160 0d1d604dae7fd8e577eb594ca89706e9bfdd5380 SHA1 d6edb74cd539813b2899c5e1bd950e44f8fae2d9 SHA256 74d202288274b21210cbde5a59c56d92562151c8871223ae38f0497e69e950bc
+AUX visualboyadvance-1.7.2-ovflfix.patch 368 RMD160 696033358f8a5ab02d7b4cea0a69297524d27cca SHA1 8db91f206ddf22e07dfdd6c8457cce1e2e4d193c SHA256 8768ed788210362a367b13cff2794379ec2b2058ba5cc61228bae0519c80277a
 AUX visualboyadvance-1.7.2-uninit.patch 530 RMD160 2fdb59ba6038290f5e50339ff489e04a5070de77 SHA1 4eb9a2d4f098fad9e87bfd8447b2707cc622b3a4 SHA256 ba2d6f3dde29a40616b566770c215caa23353f7e8b1e44053c6299727c9402af
 DIST VisualBoyAdvance-src-1.7.2.tar.gz 1410762 RMD160 44f94a4f270f2cda25879681c52892f6978caf99 SHA1 04d82406079563fd17cda07f72488185e9152f51 SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7
 DIST visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2 2892 RMD160 48ffe6634bd2407eef688e13dff56b645fa95339 SHA1 d05d162544aec4e346e2d4a259b6594dd12e0475 SHA256 cf61ddf1e806d3c3152a7102414929d96614319a84481333a9fca7dc640dd74b
-EBUILD visualboyadvance-1.7.2-r2.ebuild 2027 RMD160 6fcfd532b1dd1d30619a0540b18a5743ed4545b3 SHA1 c4c7a5b17edf003d386b7569d63eefd261ed9dd1 SHA256 68c3e4be85c9d6965879ff07d1ed26ec7b34f88e290f68e024caa1300cc5b60a
-MISC ChangeLog 5629 RMD160 2776156fada62d8252f2eb42b6ea8303bc98596d SHA1 1755c9db926543b2c668c1029e8a7b812b8f7b40 SHA256 a2f34b6ff5d90c56e846ce03382eab7bddc2706971ad8be8c1edac51f6125b53
+EBUILD visualboyadvance-1.7.2-r2.ebuild 2022 RMD160 b3ad92918e27a705cd28088cd117d727e32fd2ac SHA1 a3d0547e056d225f19e3ffc33ec1991b5db06949 SHA256 b49534a011639891ff98b72899b450116ca7bd48698095bd0d66f4e789891003
+MISC ChangeLog 5817 RMD160 9fb982aa6632585984474b5a8a727b9aa6355217 SHA1 9fe39c9778ec05f9d55e280ea90b714a4b1b591a SHA256 4726cc8a3a8033867eaa4281e248707beb1265ee7bb839194c3b0c7c117b20b4
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAky6hagACgkQdz7hIScOURHt6gCgxakn3rOxrOMBzBieLiesxwfB
-LgMAoLN2EVYc3YkYJlId6lKs+rNUWYs3
-=pgx7
------END PGP SIGNATURE-----
diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-ovflfix.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-ovflfix.patch
new file mode 100644
index 000000000000..e3a7d7bb5db5
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-ovflfix.patch
@@ -0,0 +1,11 @@
+--- src/sdl/debugger.cpp.old	2010-11-02 15:37:53.000000000 +0100
++++ src/sdl/debugger.cpp	2010-11-02 15:38:13.000000000 +0100
+@@ -1389,7 +1389,7 @@
+ {
+   char buffer[10];
+   printf("Are you sure you want to quit (y/n)? ");
+-  fgets(buffer, 1024, stdin);
++  fgets(buffer, sizeof(buffer), stdin);
+   
+   if(buffer[0] == 'y' || buffer[0] == 'Y') {
+     debugger = false;
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
index 732f70447bcd..f2df77e5a937 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild,v 1.3 2009/06/13 15:50:14 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild,v 1.4 2010/11/02 14:48:59 tupone Exp $
+EAPI=2
 
 inherit eutils flag-o-matic games
 
@@ -29,10 +30,7 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/VisualBoyAdvance-${PV}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	sed -i \
 		-e 's:$(localedir):/usr/share/locale:' \
 		-e 's:$(datadir)/locale:/usr/share/locale:' \
@@ -51,10 +49,11 @@ src_unpack() {
 		"${FILESDIR}"/${PV}-gcc41.patch \
 		"${WORKDIR}"/${P}-deprecatedsigc++.patch \
 		"${FILESDIR}"/${P}-uninit.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch
+		"${FILESDIR}"/${P}-glibc2.10.patch \
+		"${FILESDIR}"/${P}-ovflfix.patch
 }
 
-src_compile() {
+src_configure() {
 	# -O3 causes GCC to behave badly and hog memory, bug #64670.
 	replace-flags -O3 -O2
 
@@ -65,7 +64,6 @@ src_compile() {
 		$(use_enable gtk gtk 2.4) \
 		$(use_enable nls) \
 		|| die
-	emake || die "emake failed"
 }
 
 src_install() {