diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-03-20 20:20:35 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-03-20 20:20:35 +0000 |
| commit | 21c1e7998dc38404e50a3dbf55aeccefa4756b41 (patch) | |
| tree | 718df25e63ed1238fe3499a7a21894df22749c7b /games-roguelike | |
| parent | Switch to qt4-r2 eclass. (diff) | |
| download | gentoo-2-21c1e7998dc38404e50a3dbf55aeccefa4756b41.tar.gz gentoo-2-21c1e7998dc38404e50a3dbf55aeccefa4756b41.tar.bz2 gentoo-2-21c1e7998dc38404e50a3dbf55aeccefa4756b41.zip | |
Fix buffer overflow during save. Bug #310379
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'games-roguelike')
| -rw-r--r-- | games-roguelike/tome/ChangeLog | 6 | ||||
| -rw-r--r-- | games-roguelike/tome/files/tome-2.3.5-overflow.patch | 13 | ||||
| -rw-r--r-- | games-roguelike/tome/tome-2.3.5.ebuild | 21 |
3 files changed, 27 insertions, 13 deletions
diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog index 0cfe2e4958c9..648a44eb9e97 100644 --- a/games-roguelike/tome/ChangeLog +++ b/games-roguelike/tome/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-roguelike/tome # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.33 2010/01/22 20:15:02 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.34 2010/03/20 20:20:33 tupone Exp $ + + 20 Mar 2010; Tupone Alfredo <tupone@gentoo.org> tome-2.3.5.ebuild, + +files/tome-2.3.5-overflow.patch: + Fix buffer overflow during save. Bug #310379 by Markus Sander 22 Jan 2010; Brent Baude <ranger@gentoo.org> tome-2.3.5.ebuild: stable ppc, bug 285406 diff --git a/games-roguelike/tome/files/tome-2.3.5-overflow.patch b/games-roguelike/tome/files/tome-2.3.5-overflow.patch new file mode 100644 index 000000000000..399fdd1536b0 --- /dev/null +++ b/games-roguelike/tome/files/tome-2.3.5-overflow.patch @@ -0,0 +1,13 @@ +--- ../lib/edit/p_info.txt.old 2010-03-20 20:40:53.000000000 +0100 ++++ ../lib/edit/p_info.txt 2010-03-20 20:41:05.000000000 +0100 +@@ -1559,8 +1559,8 @@ + S:O:70:12:25d3 + + # Used for corruptions that can change your subrace +-S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +-S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ++S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ++S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + S:S:0:0:0:0:0:0:0:100 + S:K:0:0:0:0:0:0:0:0 + S:P:0:0:0 diff --git a/games-roguelike/tome/tome-2.3.5.ebuild b/games-roguelike/tome/tome-2.3.5.ebuild index d7c058c33f1c..e3a448678adb 100644 --- a/games-roguelike/tome/tome-2.3.5.ebuild +++ b/games-roguelike/tome/tome-2.3.5.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.4 2010/01/22 20:15:02 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.5 2010/03/20 20:20:33 tupone Exp $ +EAPI=2 inherit eutils games @@ -25,20 +26,18 @@ RDEPEND=">=sys-libs/ncurses-5 DEPEND="${RDEPEND} x11-misc/makedepend" -S=${WORKDIR}/tome-${MY_PV}-src +S=${WORKDIR}/tome-${MY_PV}-src/src -src_unpack() { - unpack ${A} - cd "${S}" - cd "src" +src_prepare() { mv makefile.std makefile - epatch "${FILESDIR}/${PV}-gentoo-paths.patch" + epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \ + "${FILESDIR}"/${P}-overflow.patch sed -i \ -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c \ || die "sed failed" - find "${S}" -name .cvsignore -exec rm -f \{\} \; - find "${S}/lib/edit" -type f -exec chmod a-x \{\} \; + find .. -name .cvsignore -exec rm -f \{\} \; + find ../lib/edit -type f -exec chmod a-x \{\} \; } src_compile() { @@ -80,7 +79,6 @@ src_compile() { fi GENTOO_INCLUDES="${GENTOO_INCLUDES} -Ilua -I." GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_LUA" - cd src make \ INCLUDES="${GENTOO_INCLUDES}" \ DEFINES="${GENTOO_DEFINES}" \ @@ -99,14 +97,13 @@ src_compile() { } src_install() { - cd src make \ DESTDIR="${D}" \ OWNER="${GAMES_USER}" \ BINDIR="${GAMES_BINDIR}" \ LIBDIR="${GAMES_DATADIR}/${PN}" install \ || die "make install failed" - cd "${S}" + cd .. dodoc *.txt dodir "${GAMES_STATEDIR}" |