Fix overflow. Bug #339004

(Portage version: 2.1.9.24/cvs/Linux i686)

4 files changed, 30 insertions, 72 deletions

diff --git a/games-board/eboard/ChangeLog b/games-board/eboard/ChangeLog
index 57205ea15708..3d2030f91e99 100644
--- a/games-board/eboard/ChangeLog
+++ b/games-board/eboard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/eboard
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.30 2010/10/15 12:44:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.31 2010/11/03 15:53:03 tupone Exp $
+
+  03 Nov 2010; Tupone Alfredo <tupone@gentoo.org> -eboard-1.1.1.ebuild,
+  eboard-1.1.1-r1.ebuild, +files/eboard-1.1.1-ovflfix.patch:
+  Fix overflow. Bug #339004 by flameeyes@gentoo.org
 
   15 Oct 2010; Brent Baude <ranger@gentoo.org> eboard-1.1.1-r1.ebuild:
   stable ppc, bug 317245
diff --git a/games-board/eboard/eboard-1.1.1-r1.ebuild b/games-board/eboard/eboard-1.1.1-r1.ebuild
index e4ca0e491e5a..61af85173e8c 100644
--- a/games-board/eboard/eboard-1.1.1-r1.ebuild
+++ b/games-board/eboard/eboard-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1-r1.ebuild,v 1.5 2010/10/15 12:44:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1-r1.ebuild,v 1.6 2010/11/03 15:53:03 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -32,7 +32,8 @@ src_prepare() {
 	epatch \
 		"${WORKDIR}"/${PN}_${DEB_V}.diff \
 		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-ovflfix.patch
 	sed -i \
 		-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" \
 		configure \
diff --git a/games-board/eboard/eboard-1.1.1.ebuild b/games-board/eboard/eboard-1.1.1.ebuild
deleted file mode 100644
index d26e3cd2a426..000000000000
--- a/games-board/eboard/eboard-1.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1.ebuild,v 1.8 2010/05/24 13:56:44 armin76 Exp $
-
-EAPI=2
-inherit eutils games
-
-EXTRAS1="eboard-extras-1pl2"
-EXTRAS2="eboard-extras-2"
-DESCRIPTION="chess interface for POSIX systems"
-HOMEPAGE="http://www.bergo.eng.br/eboard/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${EXTRAS1}.tar.gz
-	mirror://sourceforge/${PN}/${EXTRAS2}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND=">=x11-libs/gtk+-2
-	media-libs/libpng
-	dev-lang/perl
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" \
-		configure \
-		|| die "sed configure failed"
-	epatch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_configure() {
-	# not an autoconf script
-	./configure \
-		--compiler="${CXX}" \
-		--prefix="${GAMES_PREFIX}" \
-		--data-prefix="${GAMES_DATADIR}" \
-		--man-prefix="/usr/share/man" \
-		$(use_enable nls) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS ChangeLog TODO Documentation/*.txt
-
-	newicon icon-eboard.xpm ${PN}.xpm
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	cd "${WORKDIR}"/${EXTRAS1}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins *.png *.wav || die "doins failed (extra1)"
-	newins extras1.conf themeconf.extras1 || die "newins failed (extra1)"
-	newdoc ChangeLog Changelog.extras
-	newdoc README README.extras
-	dodoc CREDITS
-
-	cd "${WORKDIR}"/${EXTRAS2}
-	doins *.png *.wav || die "doins failed (extra2)"
-	newins extras2.conf themeconf.extras2 || die "newins failed (extra2)"
-
-	prepgamesdirs
-}
diff --git a/games-board/eboard/files/eboard-1.1.1-ovflfix.patch b/games-board/eboard/files/eboard-1.1.1-ovflfix.patch
new file mode 100644
index 000000000000..4a586b2b70a3
--- /dev/null
+++ b/games-board/eboard/files/eboard-1.1.1-ovflfix.patch
@@ -0,0 +1,22 @@
+--- proto_xboard.cc.old	2010-11-03 16:42:15.000000000 +0100
++++ proto_xboard.cc	2010-11-03 16:43:14.000000000 +0100
+@@ -1084,7 +1084,7 @@
+   snprintf(EngineCommandLine,512,"crafty bookpath=%s logpath=%s tbpath=%s",
+ 	   BookPath,LogPath,LogPath);
+   if (!global.env.Home.empty())
+-    snprintf(EngineRunDir,512,"%s/.eboard/craftylog",global.env.Home.c_str());
++    snprintf(EngineRunDir, sizeof(EngineRunDir), "%s/.eboard/craftylog", global.env.Home.c_str());
+   else
+     strcpy(EngineRunDir,"/tmp");
+ 
+--- util.cc.old	2010-11-03 16:42:24.000000000 +0100
++++ util.cc	2010-11-03 16:43:42.000000000 +0100
+@@ -783,7 +783,7 @@
+   int i,n;
+   char cmd[1024];
+ 
+-  n = snprintf(tmpfile,1024,"/tmp/eb%d-%s",(int) getpid(), origfile);
++  n = snprintf(tmpfile, sizeof(tmpfile), "/tmp/eb%d-%s", (int) getpid(), origfile);
+ 
+   if (n >= 1024) {
+     failure = 1;