summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-06-08 20:25:36 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-06-08 20:25:36 +0000
commitaa9217438a3990b3e3d2f68a6a093fe45b10a3ed (patch)
tree79fa919ba28fbee4ec9cae7d12fa391ffd0ab20c /games-util/nforenum
parentxorg-2.eclass: bump util-macros dep to 1.8.0, see bugs #320625 and #322559 (diff)
downloadhistorical-aa9217438a3990b3e3d2f68a6a093fe45b10a3ed.tar.gz
historical-aa9217438a3990b3e3d2f68a6a093fe45b10a3ed.tar.bz2
historical-aa9217438a3990b3e3d2f68a6a093fe45b10a3ed.zip
fix string handling (bug #323249) with patch from David Leverton
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-util/nforenum')
-rw-r--r--games-util/nforenum/ChangeLog6
-rw-r--r--games-util/nforenum/Manifest15
-rw-r--r--games-util/nforenum/files/nforenum-0_pre2309-string.patch11
-rw-r--r--games-util/nforenum/nforenum-0_pre2309.ebuild6
4 files changed, 23 insertions, 15 deletions
diff --git a/games-util/nforenum/ChangeLog b/games-util/nforenum/ChangeLog
index 075b7f1c04d4..cdc275b573bb 100644
--- a/games-util/nforenum/ChangeLog
+++ b/games-util/nforenum/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-util/nforenum
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/nforenum/ChangeLog,v 1.4 2010/05/28 18:13:19 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/nforenum/ChangeLog,v 1.5 2010/06/08 20:25:36 mr_bones_ Exp $
+
+ 08 Jun 2010; Michael Sterrett <mr_bones_@gentoo.org>
+ nforenum-0_pre2309.ebuild, +files/nforenum-0_pre2309-string.patch:
+ fix string handling (bug #323249) with patch from David Leverton
28 May 2010; Joseph Jezak <josejx@gentoo.org> nforenum-0_pre2309.ebuild:
Marked ppc/ppc64 stable for bug #320495.
diff --git a/games-util/nforenum/Manifest b/games-util/nforenum/Manifest
index 804a1da0513e..2c33372ba0d1 100644
--- a/games-util/nforenum/Manifest
+++ b/games-util/nforenum/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX nforenum-0_pre2309-build.patch 1711 RMD160 bc8c05826c2a86e9594a50aafa4cfe6eaaf9dc7d SHA1 9e48be678ba19b78d154564052a36f875739ef79 SHA256 73f0e883d57868e596ef4c641b484b2ba8201ba01a5fe6341381b2c4bc79bcf5
+AUX nforenum-0_pre2309-string.patch 429 RMD160 e5c2773c520fac26e6bd0cb71d5cebf4f31a23cf SHA1 06d53827c4a31d0ba097b378e4a45419db954bbb SHA256 b2f64913b23927b1ac397fdbccc178b65d847a3903c181605723a4236eaa30f2
DIST nforenum-r2309-source.tar.bz2 127141 RMD160 4f3c1c4be548f1111803a123ad58f9776b055005 SHA1 1130d715f607ec30571829f5e0b8527c65309727 SHA256 06ef92912026743ca9cd2476b08aa8b0a0b30f6a4c419e5453df21b5971beb38
-EBUILD nforenum-0_pre2309.ebuild 923 RMD160 646c96429e61b61e37530f1a0c0e63b385bddf08 SHA1 2bf75ddc3c173b01e15a8bbf32786a9bf1799dff SHA256 6e9f0328bbd89e9d80306c671e9237fc821f1e9fc51d8ef47ef125bb29193efa
-MISC ChangeLog 816 RMD160 0ef0a7525ca9ea99ca7745d5f458b35fb49d2aeb SHA1 c8f8b72fb90031cbdf72ee9f7cf98cfb2c904633 SHA256 368d8f020e0f232c01609ba1815292e22b4e1ae4dce93ea29427b837416258bf
+EBUILD nforenum-0_pre2309.ebuild 966 RMD160 97cbeb5876e396b07872814d2d90dc0231181572 SHA1 53f82128baa7a94a15fc2e75106f8db0d71ccb63 SHA256 6bd2ce7e94a72557ddb8decf026c7087ed1351b2290852d89f85c726aed8cd97
+MISC ChangeLog 1011 RMD160 57476e5da390ff2817475dcbc4f5b024d03100df SHA1 24867bcec704db9d732d51db448aa68d0db018c1 SHA256 5b6e036d65c116ac0376c4c6a7819c3a65b2d61b67f71e9b4615bd38d8824059
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkwAB5YACgkQcsIHjyDViGSWawCfYID2HwRbTnOdZSdmI+6QKNNx
-hJ4AoL9JsiwA2M4LqfnocoOvqKL+QHKw
-=GFm5
------END PGP SIGNATURE-----
diff --git a/games-util/nforenum/files/nforenum-0_pre2309-string.patch b/games-util/nforenum/files/nforenum-0_pre2309-string.patch
new file mode 100644
index 000000000000..a22a324ae7db
--- /dev/null
+++ b/games-util/nforenum/files/nforenum-0_pre2309-string.patch
@@ -0,0 +1,11 @@
+--- nforenum-r2309/data.cpp~ 2010-03-07 02:28:26.000000000 +0000
++++ nforenum-r2309/data.cpp 2010-06-08 21:00:33.000000000 +0100
+@@ -648,7 +648,7 @@
+ if(dir=="")return false;
+ struct stat Stat;
+ if(dir[dir.length()-1]=='\\'||dir[dir.length()-1]=='/')
+- dir[dir.length()-1]='\0';
++ dir.resize(dir.length()-1);
+ if(stat((dir+"/.renum").c_str(),&Stat))return false;
+ else if(Stat.st_mode&S_IFREG)return false;
+ return true;
diff --git a/games-util/nforenum/nforenum-0_pre2309.ebuild b/games-util/nforenum/nforenum-0_pre2309.ebuild
index dbaa23dc0e83..98e565fff85c 100644
--- a/games-util/nforenum/nforenum-0_pre2309.ebuild
+++ b/games-util/nforenum/nforenum-0_pre2309.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-util/nforenum/nforenum-0_pre2309.ebuild,v 1.5 2010/05/28 18:13:19 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/nforenum/nforenum-0_pre2309.ebuild,v 1.6 2010/06/08 20:25:36 mr_bones_ Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -32,7 +32,9 @@ src_prepare() {
V = 1
__EOF__
- epatch "${FILESDIR}"/${P}-build.patch
+ epatch \
+ "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-string.patch
}
src_install() {