Fix buffer overflow. Bug #208327

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

diff --git a/games-rpg/openglad/ChangeLog b/games-rpg/openglad/ChangeLog
index 0b82f5ec407bad40a260bddf4d40288ae4a90e11..ec9603e2259a97f6bdb1343359a3b94ebbf83778 100644 (file)
--- a/games-rpg/openglad/ChangeLog
+++ b/games-rpg/openglad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/openglad
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/ChangeLog,v 1.8 2008/04/30 23:45:33 nyhm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/ChangeLog,v 1.9 2011/07/23 20:31:05 tupone Exp $
+
+  23 Jul 2011; Tupone Alfredo <tupone@gentoo.org> openglad-0.98.ebuild,
+  +files/openglad-0.98-ovfl.patch:
+  Fix buffer overflow. Bug #208327 by Billy DeVincentis
 
   30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
   +files/openglad-0.98-gcc43.patch, openglad-0.98.ebuild:

diff --git a/games-rpg/openglad/Manifest b/games-rpg/openglad/Manifest
index 1630ccd2e1f2dce56e66ef3e3d264c526acd33d4..87f8dbb06d84a7279edf0fa40fdbeefc548525aa 100644 (file)
--- a/games-rpg/openglad/Manifest
+++ b/games-rpg/openglad/Manifest
@@ -3,15 +3,16 @@ Hash: SHA1
 
 AUX 0.98-gladpack.c.patch 516 RMD160 8c5e0359889d7db0f4d9d355c68667fc0536f4ff SHA1 ae74f298c8380c49a0c7ba0e3f23b0574da8627e SHA256 d48cdfbd330c938ec645133cee074cb3e7203f12836f0a4718f63c8e1db00910
 AUX openglad-0.98-gcc43.patch 201 RMD160 792bac0b475a895d5b24fea0a959adef0eca1d06 SHA1 1d1340588c8154b8cb82e829ae76228e1ea5d2bb SHA256 73c4c1c3a1e3f663a7cd7a8149a68e683a9b5b95672aca0eac5bd6c6a453298c
+AUX openglad-0.98-ovfl.patch 381 RMD160 7025cc731e7f0344340a69bdfb5332cd36b2430d SHA1 ff2351906e0f7325bd1815ce33523544b7262ded SHA256 dd8f0e97a8ac39f32b0928700ae2fe6373578670d7b49add4f2ede36d1b57629
 DIST openglad-0.98.tar.gz 724106 RMD160 1dd11933885ab73fb374c341d69d3d96878db548 SHA1 795b2f83cb965b655107e5b798e9000f9f113250 SHA256 a3df9f8ea8827f56a9b38611c3f5c3a11aaec865a95d37cef90617d6b6efb844
 DIST openglad.png 5593 RMD160 5adc86eef27628bb151c2cbb9936b7a51ebcd34b SHA1 d2c8e82e1bb15e42225db7e97014dfd83e8dc3b3 SHA256 04fd6707bda5a7f42e11f1f441a6410709d38f5f6d5d124bf1ab0bb44fad5f1c
-EBUILD openglad-0.98.ebuild 1074 RMD160 f82fd5fafc30c1a73d31e0a6063fa7fb9449fc01 SHA1 2b4e88eb7c8c9611f4819e4a5c40b9d980eaca3d SHA256 5b7a79c918766556a4290be4a0be8b436d593557e02f94502095b19faca4fe4f
-MISC ChangeLog 1015 RMD160 1b7c04c44b4285fb414bf6cec8c21507f0288297 SHA1 5c26a9fedd22dde37ef439abdea69c011768d0ea SHA256 6180aec4a042b249d4fab7b61cbecd17366c75f997e0a80ed37ce1f5cea99e05
+EBUILD openglad-0.98.ebuild 1044 RMD160 15540b381c60d2ee60e14c75ea86a0f9e1bcbed0 SHA1 95d678f08e449d579b5d2a94ea8baebbc773326b SHA256 9d124f41d73d1b88d5a2d2ce74edd2350ec1b2112c6c50809c57087660bd1c0d
+MISC ChangeLog 1181 RMD160 b292cabdbe191c02d4330d2df3f57e4a91e1b7fc SHA1 0688fbbcd6d56acbbd8c4d96b0c5d2b2d11f2e93 SHA256 bd776719ef10ab421faadae0ed0ee63c4e2a7e29c3613951bd7bac2df2375825
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkgZBKMACgkQdz7hIScOUREejACeL0yXgoCV4WYqhMqt7xoWe4zE
-/dsAoLeiCbDCB9GqgZ6LHfRMryhM+VzI
-=4nph
+iEYEARECAAYFAk4rL3kACgkQIY77eQFFFC0ONQCgone/lJ0z1AfHd8JSN+Z3blGd
+F80AnRsdQVJtXvMSBWaBwM7dnWchsGbI
+=RnCy
 -----END PGP SIGNATURE-----

diff --git a/games-rpg/openglad/files/openglad-0.98-ovfl.patch b/games-rpg/openglad/files/openglad-0.98-ovfl.patch
new file mode 100644 (file)
index 0000000..14cd73c
--- /dev/null
+++ b/games-rpg/openglad/files/openglad-0.98-ovfl.patch
@@ -0,0 +1,11 @@
+--- src/screen.cpp.old 2011-07-23 21:35:34.385063301 +0200
++++ src/screen.cpp     2011-07-23 21:35:59.948063312 +0200
+@@ -2383,7 +2383,7 @@
+       short listsize;
+       short i;
+       walker * new_guy;
+-      char newgrid[12] = "grid.pix";  // default grid
++      char newgrid[13] = "grid.pix";  // default grid
+       char new_scen_type; // read the scenario type
+       char oneline[80];
+       char numlines, tempwidth;

diff --git a/games-rpg/openglad/openglad-0.98.ebuild b/games-rpg/openglad/openglad-0.98.ebuild
index de44a708fc7105308cedbee9be598af8f94560b1..1f5907e4729545dc2add8b97cd66cc1c9ee4650c 100644 (file)
--- a/games-rpg/openglad/openglad-0.98.ebuild
+++ b/games-rpg/openglad/openglad-0.98.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/openglad-0.98.ebuild,v 1.10 2008/04/30 23:45:33 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/openglad-0.98.ebuild,v 1.11 2011/07/23 20:31:05 tupone Exp $
+EAPI=2
 
 inherit eutils games
 
@@ -18,21 +19,18 @@ DEPEND="media-libs/sdl-mixer
        media-libs/sdl-image
        media-libs/libsdl"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch \
-               "${FILESDIR}"/${PV}-gladpack.c.patch \
-               "${FILESDIR}"/${P}-gcc43.patch
-}
+PATCHES=(
+       "${FILESDIR}"/${PV}-gladpack.c.patch
+       "${FILESDIR}"/${P}-gcc43.patch
+       "${FILESDIR}"/${P}-ovfl.patch
+)
 
-src_compile() {
+src_configure() {
        egamesconf \
                --prefix=/usr \
                --bindir="${GAMES_BINDIR}" \
                --datadir="${GAMES_DATADIR}/${PN}" \
                 || die
-       emake || die "emake failed"
 }
 
 src_install() {