summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-12-01 10:06:53 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-12-01 10:06:53 +0000
commit3c2339496b0fefc31f44ef4f14d7ef0034c5f96d (patch)
tree243d58351de447b2c0c374b2dc425ebdce770036 /games-emulation/gxmame
parentEAPI 3 bump. Listen to CFLAGS/CXXFLAGS. Better grouping of econf options. (diff)
downloadgentoo-2-3c2339496b0fefc31f44ef4f14d7ef0034c5f96d.tar.gz
gentoo-2-3c2339496b0fefc31f44ef4f14d7ef0034c5f96d.tar.bz2
gentoo-2-3c2339496b0fefc31f44ef4f14d7ef0034c5f96d.zip
Fix buffer overflow. Bug #325281
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'games-emulation/gxmame')
-rw-r--r--games-emulation/gxmame/ChangeLog8
-rw-r--r--games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch29
-rw-r--r--games-emulation/gxmame/gxmame-0.35_beta2.ebuild15
3 files changed, 42 insertions, 10 deletions
diff --git a/games-emulation/gxmame/ChangeLog b/games-emulation/gxmame/ChangeLog
index 9c05c3a2460a..e6e2d9720620 100644
--- a/games-emulation/gxmame/ChangeLog
+++ b/games-emulation/gxmame/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/gxmame
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/ChangeLog,v 1.20 2008/04/08 01:44:15 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/ChangeLog,v 1.21 2010/12/01 10:06:53 tupone Exp $
+
+ 01 Dec 2010; Tupone Alfredo <tupone@gentoo.org> gxmame-0.35_beta2.ebuild,
+ +files/gxmame-0.35_beta2-ovflfix.patch:
+ Fix buffer overflow. Bug #325281 by David Carlos Manuelda
08 Apr 2008; Michael Sterrett <mr_bones_@gentoo.org>
gxmame-0.35_beta2.ebuild:
diff --git a/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch b/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch
new file mode 100644
index 000000000000..8831a3e09b61
--- /dev/null
+++ b/games-emulation/gxmame/files/gxmame-0.35_beta2-ovflfix.patch
@@ -0,0 +1,29 @@
+--- src/options.c.old 2010-12-01 10:48:45.000000000 +0100
++++ src/options.c 2010-12-01 10:53:55.000000000 +0100
+@@ -4245,7 +4245,7 @@
+ case XMAME_EXEC_SVGAFX:
+ target->fxgkeepaspect = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fxgkeepaspect_checkbutton));
+ used_text = gtk_editable_get_chars (GTK_EDITABLE (fx_entry), 0, -1);
+- strncpy (target->resolution, used_text, 20);
++ strncpy (target->resolution, used_text, sizeof(target->resolution));
+ g_free (used_text);
+ break;
+
+@@ -4330,7 +4330,7 @@
+ }
+
+ used_text = gtk_editable_get_chars (GTK_EDITABLE (soundfile_entry), 0, -1);
+- strncpy (target->soundfile, used_text, 50);
++ strncpy (target->soundfile, used_text, sizeof(target->soundfile));
+ g_free (used_text);
+
+ target->timer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (timer_checkbutton));
+@@ -4465,7 +4465,7 @@
+ target->skip_disclaimer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (disclaimer_checkbutton));
+ target->skip_gameinfo = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gameinfo_checkbutton));
+ used_text = gtk_editable_get_chars (GTK_EDITABLE (debug_size_combo_entry), 0, -1);
+- strncpy (target->debug_size, used_text, 20);
++ strncpy (target->debug_size, used_text, sizeof(target->debug_size));
+ g_free (used_text);
+ target->use_additional_options = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (additional_options_checkbutton));
+ /* here I'm using directly the additional option because I don't know its length */
diff --git a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild b/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
index 91a4d6e16416..1464c33c9049 100644
--- a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
+++ b/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 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/gxmame/gxmame-0.35_beta2.ebuild,v 1.9 2008/04/08 01:44:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/gxmame-0.35_beta2.ebuild,v 1.10 2010/12/01 10:06:53 tupone Exp $
+EAPI=2
-inherit games
+inherit eutils games
MY_P="${PN}-${PV/_beta/beta}"
DESCRIPTION="frontend for XMame using the GTK library"
@@ -25,9 +26,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-ovflfix.patch
sed -i \
-e "s:-O2 -fomit-frame-pointer -ffast-math:${CFLAGS}:" \
-e "s:-O2:${CFLAGS}:" \
@@ -51,14 +51,13 @@ src_unpack() {
|| die "sed failed"
}
-src_compile() {
+src_configure() {
egamesconf \
--disable-dependency-tracking \
--with-xmame-dir="${GAMES_DATADIR}"/xmame \
$(use_enable nls) \
$(use_enable joystick) \
|| die
- emake || die "emake failed"
}
src_install() {