add upstream patch for corrected stdarg usage (bug #485132)

Package-Manager: portage-2.2.1/cvs/Linux x86_64

4 files changed, 44 insertions, 29 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/Manifest b/games-mud/tf/Manifest
index b69ac0b6d98d..7e7a3ed88222 100644
--- a/games-mud/tf/Manifest
+++ b/games-mud/tf/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX tf-40-gcc4.patch 1955 SHA256 c6db5fa3a77a50c012f9a2e516dae708022d99bc0c111cc7af7d3553221af90c SHA512 ba11d127389cd4ddc9a48c25b56aa81c85b916c30974aa6ecdc276ea4ac621f10e56f2b205b05c150ec8d4a3e4539e27902ffa21a74cafd4f1ea80dec21104a2 WHIRLPOOL 4e8ab5a84229cbc0f22694fa2433aca944c5616527e8d2e8b69febe79857d0a2c65f4761759117ec8ca0c8f795aa5ccd52b02614022dd6fe88e4f13838f110a8
 AUX tf-40-gentoo.diff 1093 SHA256 8c31afa6845a429f5b4623b40459672849a54d275d8847d63ec0aa102b2a80ac SHA512 c93f61658b4618a6dde9abf56f6518b52208757287f840eebae628945c15db19553eaaa182f6bbb1e9eef1a0ef7e6083d254cfe0bc49dd4af5f63836b513432a WHIRLPOOL cb31f2788ca2d412945c7127ab64d7b4df13813f1d26a9bd1f913230d384a4833687bcd5c9637193dfc742a28d77b43e4094ec66c656a520445a0cb2e531040b
 AUX tf-50_beta8-pcre.patch 1917 SHA256 01b9cd92ed205b4a2d750cec9e8cc21d9a541e4e47c46140a53cae05f5458628 SHA512 942574f4a24f5c2660124caf6cc41438e42fb20b5d1781c60341da96ace2338a3b69a744454e5c2319d83d83a8de21af26029ec6f328a50facbc56db7091c092 WHIRLPOOL 14c974b6257469c6d21d160bd4793bdca25479ceed76b0079be53a41aabfbcbe39041cc3dc546fb3e3d671a5ff2f18e69d1d2f098e70b4c7428bfaba4419f2b3
+AUX tf-50_beta8-stdarg.patch 1092 SHA256 460e8ce3299039264c9d2603ed64f9c0814d7bb37d2d4e89e479c87d8adb487a SHA512 1d6be5e3b9f2b14c5bcd234d61e8c6fa4bf2e3a3ed09af876d202c1ab9146dfcd9059baa1f31a49e7909d906d193b71b96f910374948edd2c4ec23ba78c9eba3 WHIRLPOOL e0315a17e5b1eca1086daccb47eca177da0dd01ce5a9f4de4f92e543115436ca7c4ef90b9590705dc617cf12ba50903218287b63e15e6211d3b5bf1782638858
 DIST tf-40s1-help.tar.gz 121936 SHA256 057668bdbe63e7cd1b5121343ebbfc182956e75feb9e273dd42fe22ce0d45a48 SHA512 4f4d30fe0c7155e04cfdaec4a977a415ae68e676590b541c073e449cd26eb8000c438e4988341d684ce4cb5bd5ac54437a376f5393ccc7bfa3107523ddc1f3b7 WHIRLPOOL 52607f7cb7a46af781671aea352127cafa28953c442cd61ec3545c8e9e1ed1882084a94ae682027c979ed6c81919fcfd703ab7e5cebfd5c2d36376e6b426a863
 DIST tf-40s1.tar.gz 349239 SHA256 488715d3c75ff05c08a518b0e1cd4518245842fbc1e4178c6da515e415101beb SHA512 cd51bdf60989891dd3f0f3a0e9f2fb92e6260a2dda120269713b29e58ba619abeebe9cb47a6381e26539a895071e02f34a23d914896fc5e089c5c801337b8581 WHIRLPOOL 38523dfd214cf4054e63882f86d98b889952c21c5dbdaa39a58ddd60a7ab15e743ba2b742913edb92a2d08296a68c73dc3eafb196c25748402d68882c1e2ced9
 DIST tf-50b8-help.tar.gz 175591 SHA256 d9f7c2475c6641100ff3f2e877917d4ec4660df1aaa46e0a4d510479f5d11b83 SHA512 fd0fcf7e96772cbb61a97d24d0327c45b31b280bca329dfe6c680137cc25b7db5b4b79c0f608ad213cd24a0f2a67ee471ce7ee1c405b039f52033d7d87974b74 WHIRLPOOL 41d7de945730c32c845fd1b530b996a49779e5ed6701f4ee6a7e7818bcea1fe7b4d9aa7b08fd2e37e647c7561d679b98d6f71383b5d1bf49c7982c58e590178f
@@ -11,23 +9,6 @@ DIST tf-50b8.tar.gz 719553 SHA256 3750a114cf947b1e3d71cecbe258cb830c39f3186c369e
 DIST tf-allrootpatch.txt 3349 SHA256 c11c5480666d7e0045680abd16e2dbd004e42036964b6a7862005402fbfe4600 SHA512 3fe44e7291d133abd04040f0f8258da6a2b7f67cab79cb1628897a4a483a0998495b6cf97eaf29ee447a650fdb16a48c846599807e570f687a256bb58179495e WHIRLPOOL 08db8f58f11a3469553c1ea1059190ea45b2c936443b12447b13acbbde5135d84bc0bcbcb3df72766d11ee38b023ea88ddbbeafe51904eacfd72e3cbfef95513
 DIST tf-allsrcpatch.txt 10392 SHA256 f2829b3de7cdf99fe636bbc90e72e9c6203fd64e6ff319dd018be50145084b9a SHA512 3ac2447e05911d156509bb44e8809c06c4b1a92cbc8067d196c7e5f688fccd5186a9073001958ca0e757c9db20e9f96889fe7a5b6255495539f23208f72ec613 WHIRLPOOL de040a72a9b4a79c2cdfd30ccea06ae812ca49159e53fbcc404c4ea1006394970ad41f2d45de032d28533e1cb8d2d6018737df839d9a3f29c0de4eac053d9d3c
 EBUILD tf-40-r2.ebuild 1012 SHA256 5e48a7aa0450fbd415f2a7c960275a8dcf03cb3a03cf583070ce4d083d56f638 SHA512 310a63047e138221bcb83b67cc06c8e8132ff1f4dd719eb5b1d1b313472cedc800a108cb9a9c81587d3a7ed14c722d0825591ea5a3ae4caccf430abf3099a82a WHIRLPOOL 35a577c0a011c617435af781e045f921a0f7b67c0a10f206d8d1941a2caeffbb802eb0bb99f888f8e2401879ed1c1c0d55ab58c7aef87f15f7a124f53cb4197e
-EBUILD tf-50_beta8-r1.ebuild 1939 SHA256 a6db097d968c2cb4f838e51ab2317b8cd18c33f30e23ee92539f7995bd9cfa23 SHA512 5ad1cd89b2f811c115dd7178d47a90aacdf581cbcc3d5b469a6d6104ecb48a2307e6c6cab2301e903d071791254d87d23b4cbda8711b49b65a61350ccc835a6f WHIRLPOOL e2877e1f7e01a1196511481efcda267e1fb0158f9eb839b2ca950a3504cb85d782b4fdd301574dc145c0ca61643439826e1d60c4995a15bb678625394e5f162f
-MISC ChangeLog 4231 SHA256 3ef3f0371a554f09131372ce8fdc13222c4e0972d6c7f79a4edca1731504a27d SHA512 5f5495e29e58519477063b1ca342c63c4d4651af3451d9a57fe9b8602d31c91efc89aecc4ad4b8a19789697ae439e24e26c4ca93c388ca03e5248ee95934be56 WHIRLPOOL 15f0507a51ab8019d2edfd602e285a77b15f2878f7109811a6f9cb0862cb9e3c69f514eec7676183c301874ff6c3c503acd890acfd4f1bc3a262467108f42080
+EBUILD tf-50_beta8-r1.ebuild 1927 SHA256 2c52519f7c522bf1bd80d76e878debae4ce96a6e4f3827b8ecdae8c431cf30a5 SHA512 0edfe38b9f3c982ca83cb6aae9fb3d1bc755f219863f3e021ac7ef0db62b1deaed4c7edf4e1a8edb1b5b9458465260d61ecee2f8c25c54b316877fe38d845261 WHIRLPOOL 3bc52721290aa5c68e73b49433a12fac80f66a5286fa5aac565bba8bb9b4e231eb6a68e342206c1887804bdcebc0ba9b40bc0e0b9202b2be0db71ca35826b719
+MISC ChangeLog 4413 SHA256 28f8992b2951c5f277e861eaadffb16fee2d076bf041d58ec24c25de8e97c0eb SHA512 a7385bf2ab336147f02b2118b9c1ecc57c5664430ee367733dd5896adfa2a638d46d5a01e8d4e2288abeb8581d9f55da019c2d4afc20627143ddbab64e88992c WHIRLPOOL b52e9defa7efbff7debbe5fa1df5f6dc3f8de73dd705b39b7be0f645b80b51ae8f3e6429664446679cb76f0de53a4fd0e7f3338e36bdd747baca88cad57749d1
 MISC metadata.xml 343 SHA256 0bddfed9b721467cc6c068928d4b1f044d380a1eff9f2d934ca0bd52d7fcff52 SHA512 0e782524396df4b04e435b45a5fff918b9c73798116678d849842bdf0ff9c4f52b75c53ebf28ad38e3bd903855a56f75e79b691fa8771e7fd9bdf68459eafb8d WHIRLPOOL 122c735b2ae24b789c5f11666a2410dce4ce152e37e7e7753747602baa630f94b2aa6bdbab06b37e51b7095001f1181f8096770f8407292d6376e7beecf2d6d8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSB3prAAoJELp701BxlEWfZ6UP/i9LsoTImBHvo+pCxO3/BnwA
-3KorA0sDSSVVh/5NhpMxtrnnFq5nFrkCQA7kOdyKr2k8xId5ik6l3SUtPvtgMm/Z
-p5mFqQ0+3qT3usFZRNOnBwGioMZk5KKPqHHGmXdqtr9ONk3fgOfEQ39WElHcHfS9
-Tcm6OA94I+L9IFOwPk6rEZHl4t7KiwcLkI0DC2FkQf8XX5uEOieVKioI45LRfNjS
-g3Fhzvf1NdXe7nR7EJbbbWyUhi7Gmqp8NzKfomWTVlWvdS7U3eZKEvfYseKmHe3R
-t6/xTBP+d0cy77Rc7Re/MCRjYymsGNij2tzBjVvfMTyvDnbGZxZslO53GpQNcY+q
-OFDHzCeDs84ylvG6KX7wRsOZ2k23iZhUnfkrZViyxj+Sz3S/0Hs+bM5dw6wpYTEG
-De0slwbYylukWzB54EzJeGtc9PaVsbJC74Sf3DD2FigO+mUSQQ/QjaAOF1UcuHV5
-rVDiBz2CvGhbEtAvGJKt9x5k72WXYPDmQf5gLMy17H48xLBhfSGnDhJQzAx8DtnP
-fCgy6q/zQKc2voljcWLSs0ibiW0dQeF+HUe4viommH15Z82YgB7UoVQ7Pud7qIQ6
-Uuy7loL5zJuhsMbq1XES9HlsHXfXYBDgRZyN9OD12CNOqdwskB7GObEr0wxONcNm
-JimaGFZDoN8X9TMlU65R
-=VkJd
------END PGP SIGNATURE-----
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