summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2013-09-16 21:34:10 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2013-09-16 21:34:10 +0000
commit49acdb8f16c91a7e5bfe20f80271e6d74c9a890a (patch)
treeea6c9d99ed87f0b6c17b73607b4e1dd66d6e5079 /games-mud
parentDrop unnecessary whitespace in deps. (diff)
downloadgentoo-2-49acdb8f16c91a7e5bfe20f80271e6d74c9a890a.tar.gz
gentoo-2-49acdb8f16c91a7e5bfe20f80271e6d74c9a890a.tar.bz2
gentoo-2-49acdb8f16c91a7e5bfe20f80271e6d74c9a890a.zip
add upstream patch for corrected stdarg usage (bug #485132)
(Portage version: 2.2.1/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-mud')
-rw-r--r--games-mud/tf/ChangeLog6
-rw-r--r--games-mud/tf/files/tf-50_beta8-stdarg.patch30
-rw-r--r--games-mud/tf/tf-50_beta8-r1.ebuild12
3 files changed, 41 insertions, 7 deletions
diff --git a/games-mud/tf/ChangeLog b/games-mud/tf/ChangeLog
index 763304488094..298cbfb51cd5 100644
--- a/games-mud/tf/ChangeLog
+++ b/games-mud/tf/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-mud/tf
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/ChangeLog,v 1.27 2013/08/11 11:50:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/ChangeLog,v 1.28 2013/09/16 21:34:10 mr_bones_ Exp $
+
+ 16 Sep 2013; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/tf-50_beta8-stdarg.patch, tf-50_beta8-r1.ebuild:
+ add upstream patch for corrected stdarg usage (bug #485132)
11 Aug 2013; Agostino Sarubbo <ago@gentoo.org> tf-50_beta8-r1.ebuild:
Stable for amd64, wrt bug #479424
diff --git a/games-mud/tf/files/tf-50_beta8-stdarg.patch b/games-mud/tf/files/tf-50_beta8-stdarg.patch
new file mode 100644
index 000000000000..6d568f4708a8
--- /dev/null
+++ b/games-mud/tf/files/tf-50_beta8-stdarg.patch
@@ -0,0 +1,30 @@
+diff -U5 -r tf-50b8.orig/src/tfio.c tf-50b8/src/tfio.c
+--- src/tfio.c.orig 2007-01-13 18:12:39.000000000 -0500
++++ src/tfio.c 2007-02-02 16:50:12.000000000 -0500
+@@ -495,10 +495,11 @@
+ const char *q, *sval;
+ char *specptr, quote;
+ const conString *Sval;
+ int len, min, max, leftjust, stars;
+ attr_t attrs = buf->attrs;
++ va_list aq;
+
+ if (!(flags & SP_APPEND) && buf->data) Stringtrunc(buf, 0);
+ while (*fmt) {
+ if (*fmt != '%' || *++fmt == '%') {
+ for (q = fmt + 1; *q && *q != '%'; q++);
+@@ -520,11 +521,13 @@
+ switch (*fmt) {
+ case 'd': case 'i':
+ case 'x': case 'X': case 'u': case 'o':
+ case 'f': case 'e': case 'E': case 'g': case 'G':
+ case 'p':
+- vsprintf(tempbuf, spec, ap);
++ va_copy(aq, ap);
++ vsprintf(tempbuf, spec, aq);
++ va_end(aq);
+ Stringcat(buf, tempbuf);
+ /* eat the arguments used by vsprintf() */
+ while (stars--) (void)va_arg(ap, int);
+ switch (*fmt) {
+ case 'd': case 'i':
diff --git a/games-mud/tf/tf-50_beta8-r1.ebuild b/games-mud/tf/tf-50_beta8-r1.ebuild
index 42dc83307835..b428a7c2b4ad 100644
--- a/games-mud/tf/tf-50_beta8-r1.ebuild
+++ b/games-mud/tf/tf-50_beta8-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-50_beta8-r1.ebuild,v 1.5 2013/08/11 11:50:05 ago Exp $
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-50_beta8-r1.ebuild,v 1.6 2013/09/16 21:34:09 mr_bones_ Exp $
+EAPI=2
inherit games
MY_P="${P/_beta/b}"
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
-PATCHES=( "${DISTDIR}"/tf-all*patch.txt "${FILESDIR}"/${P}-pcre.patch )
+PATCHES=( "${DISTDIR}"/tf-all*patch.txt "${FILESDIR}"/${P}-pcre.patch "${FILESDIR}"/${P}-stdarg.patch )
src_configure() {
STRIP=: egamesconf \
@@ -40,16 +40,16 @@ src_configure() {
}
src_install() {
- dogamesbin src/tf || die "dogamesbin failed"
+ dogamesbin src/tf || die
newman src/tf.1.nroffman tf.1
dodoc CHANGES CREDITS README
insinto "${GAMES_DATADIR}"/${PN}-lib
# the application looks for this file here if /changes is called.
# see comments on bug #23274
- doins CHANGES || die "doins failed"
+ doins CHANGES || die
insopts -m0755
- doins tf-lib/* || die "doins failed"
+ doins tf-lib/* || die
if use doc ; then
cd ../${MY_P}-help
dohtml -r *.html commands topics