Fix buffer overflow during save. Bug #310379

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

4 files changed, 30 insertions, 15 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/Manifest b/games-roguelike/tome/Manifest
index 1e3fc7581302..1ff5331abdb5 100644
--- a/games-roguelike/tome/Manifest
+++ b/games-roguelike/tome/Manifest
@@ -1,5 +1,6 @@
 AUX 2.3.5-gentoo-paths.patch 1172 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 SHA1 c6c2203e504cd0b09f91c2ed8e3eec9fd6f84280 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1
+AUX tome-2.3.5-overflow.patch 632 RMD160 2272d373623c8fd09e738d200e91bf80b61c51a0 SHA1 86b445cf95ae3ab75788c16f49de202f6770e61b SHA256 1f7d840e48470923f30c931058752619832afef6f62efcc9d5c9ddc23a480dff
 DIST tome-235-src.tar.bz2 2951227 RMD160 c13bf80cee65287c0d4280a1fa6aeb885eb7f21b SHA1 30e39f5b4464ef42abb9fa9e1b43f2cf7f0f3203 SHA256 8844b0b889bac3943ea2f4d4d43b38e2d91d242a93028e9e07403aaab46d691b
-EBUILD tome-2.3.5.ebuild 3724 RMD160 f3512053988fd4c51a622d7bde647ea938cf9c16 SHA1 52307a6213cedcbe85f332469c0926d72477f91d SHA256 1e181851542e9a45872796ca6a400b7d0ee44bcfe4d25c5bc53a1b04382359d0
-MISC ChangeLog 6011 RMD160 d8741ff3a34739c2a0dddb73e76136f3f2de22e0 SHA1 9ac38c3a9b18afdba585e9c60e33e2d1581747ec SHA256 44172cc07e7efb417fba656abbcc6ae571fa734850b7ec1ec847d63ffe7b3737
+EBUILD tome-2.3.5.ebuild 3712 RMD160 337ecbb487e9aaafc56d07aa4e98ef4bf2007c84 SHA1 57b8108506d070043850b39c6c2595fc4d50ecc6 SHA256 6a7844c700377794480f3a3bb52d1a5615e577c97f6052ba5a8543c6cd4fafa8
+MISC ChangeLog 6181 RMD160 61339a7874663177fde6b3300b80e696948af82a SHA1 9161c2112cb3a29a4930880c82bfe8528fe5845c SHA256 9aa3e18ec81f91cf3600f9c767a61bc8dc7cbed64a5379d7a73d14e76947cd79
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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}"