summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-11-02 09:29:36 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-11-02 09:29:36 +0000
commit178a3ec4f935d67bdeb7f9fcb9cc419a567cdfec (patch)
treec247eba6dc3269705339d39ae6c8f5f177d74b76 /games-puzzle/toppler
parentDisable dev-lang/vala support because it's not ready to be stabilized wrt #34... (diff)
downloadhistorical-178a3ec4f935d67bdeb7f9fcb9cc419a567cdfec.tar.gz
historical-178a3ec4f935d67bdeb7f9fcb9cc419a567cdfec.tar.bz2
historical-178a3ec4f935d67bdeb7f9fcb9cc419a567cdfec.zip
Fix overflow. Bug #339702
Package-Manager: portage-2.1.9.24/cvs/Linux i686
Diffstat (limited to 'games-puzzle/toppler')
-rw-r--r--games-puzzle/toppler/ChangeLog8
-rw-r--r--games-puzzle/toppler/Manifest5
-rw-r--r--games-puzzle/toppler/files/toppler-1.1.3-ovflfix.patch11
-rw-r--r--games-puzzle/toppler/toppler-1.1.3.ebuild7
4 files changed, 24 insertions, 7 deletions
diff --git a/games-puzzle/toppler/ChangeLog b/games-puzzle/toppler/ChangeLog
index 36853a4e26fe..97b588be1ab4 100644
--- a/games-puzzle/toppler/ChangeLog
+++ b/games-puzzle/toppler/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/toppler
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/toppler/ChangeLog,v 1.19 2009/02/06 22:31:48 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/toppler/ChangeLog,v 1.20 2010/11/02 09:29:35 tupone Exp $
+
+ 02 Nov 2010; Tupone Alfredo <tupone@gentoo.org> toppler-1.1.3.ebuild,
+ +files/toppler-1.1.3-ovflfix.patch:
+ Fix overflow. Bug #339702 by flameeyes@gentoo.org
06 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+files/toppler-1.1.3-gentoo.patch, toppler-1.1.3.ebuild:
diff --git a/games-puzzle/toppler/Manifest b/games-puzzle/toppler/Manifest
index 919054c941ac..1a2b34d031fc 100644
--- a/games-puzzle/toppler/Manifest
+++ b/games-puzzle/toppler/Manifest
@@ -1,5 +1,6 @@
AUX toppler-1.1.3-gentoo.patch 2249 RMD160 9d0e5cf19327ccf0d6aec0a7b565d42dba60e1a1 SHA1 f89fd9e5577d7518b734412abb964da17a70f1d4 SHA256 35bf74a265696cbe1d9d9c2427dc477fd8750fb01822b9c9101617b232dccba7
+AUX toppler-1.1.3-ovflfix.patch 535 RMD160 283436bc87da349ee8e28951f312bd53def6ba69 SHA1 e89b1b58e6e94c3058ff67092057a03f159130ad SHA256 7e4e60b9119a27ea9963ad54a29f6a25d2048a1baad439e09ff1ad045480d4d3
DIST toppler-1.1.3.tar.gz 2085343 RMD160 be14acaa9126d47b25431ee7051e556a92c72d74 SHA1 563839ceec44626574fcb10f677d2ab8f82dba29 SHA256 5db9cff3fe39007e9a80c3b27acfb86692641f2b0de118ef1d5e24ebd35d438b
-EBUILD toppler-1.1.3.ebuild 834 RMD160 3a3251b0ebc3503c99dc54975c741486ede1166b SHA1 3c5d03274f3515c8c11052922939206b317a905d SHA256 415b34e31daa6b54a0d2073f34561e50640711fa5086ade155ce2831703d6dd5
-MISC ChangeLog 2777 RMD160 7e9d4d593e89c42f24d7fce8515e7008c5b0fc18 SHA1 50d80c95d477a7a868fdcb05749eb929013aa9d3 SHA256 06f3eaca7290ea914c0ac96a379ec7edf3dcf0b8e68ea2b8ea5be92e2252677d
+EBUILD toppler-1.1.3.ebuild 865 RMD160 ec4bd812eae6ed973ea3ad6492ff59e60226e756 SHA1 44eea6d99d6fb8583d0ed3692f646e7fbf8206da SHA256 a7e929dfecc57355e33f61af812773f8a0323f29a3391a0205972d07304e0e71
+MISC ChangeLog 2937 RMD160 19690f15f9b22f201fd5f149ba985e518de6171f SHA1 bd87974b534ca9b56ce3f5cf9441ec2a8c652d52 SHA256 c245343bfac0587be1f925099c5c5436b45106527f52f88f200e2df56f1c75e9
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/toppler/files/toppler-1.1.3-ovflfix.patch b/games-puzzle/toppler/files/toppler-1.1.3-ovflfix.patch
new file mode 100644
index 000000000000..2821917b99d5
--- /dev/null
+++ b/games-puzzle/toppler/files/toppler-1.1.3-ovflfix.patch
@@ -0,0 +1,11 @@
+--- leveledit.cc.old 2010-11-02 09:33:24.000000000 +0100
++++ leveledit.cc 2010-11-02 10:12:11.000000000 +0100
+@@ -436,7 +436,7 @@
+
+ snprintf(knam, 256, "%s%s", keymod2str(_ed_keys[k].mod), SDL_GetKeyName(_ed_keys[k].key));
+
+- snprintf(tabbuf2, 256, "%3i", maxkeylen - scr_textlength(knam));
++ snprintf(tabbuf2, sizeof(tabbuf2), "%3i", maxkeylen - scr_textlength(knam));
+ if (tabbuf2[0] < '0') tabbuf2[0] = '0';
+ if (tabbuf2[1] < '0') tabbuf2[1] = '0';
+ if (tabbuf2[2] < '0') tabbuf2[2] = '0';
diff --git a/games-puzzle/toppler/toppler-1.1.3.ebuild b/games-puzzle/toppler/toppler-1.1.3.ebuild
index 2f2710d305e9..23373db981dc 100644
--- a/games-puzzle/toppler/toppler-1.1.3.ebuild
+++ b/games-puzzle/toppler/toppler-1.1.3.ebuild
@@ -1,6 +1,6 @@
-# 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-puzzle/toppler/toppler-1.1.3.ebuild,v 1.5 2009/02/06 22:31:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/toppler/toppler-1.1.3.ebuild,v 1.6 2010/11/02 09:29:35 tupone Exp $
EAPI=2
inherit games
@@ -21,7 +21,8 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
S=${WORKDIR}/${P/a/}
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-ovflfix.patch )
src_configure() {
egamesconf $(use_enable nls)