Add fix from upstream for json int parsing.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 136 insertions, 15 deletions

diff --git a/sys-block/fio/ChangeLog b/sys-block/fio/ChangeLog
index bae732dd0443..3e7d5d1950ae 100644
--- a/sys-block/fio/ChangeLog
+++ b/sys-block/fio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/fio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/ChangeLog,v 1.47 2014/06/25 17:48:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/ChangeLog,v 1.48 2014/06/25 17:53:59 vapier Exp $
+
+*fio-2.1.10-r1 (25 Jun 2014)
+
+  25 Jun 2014; Mike Frysinger <vapier@gentoo.org> +files/fio-2.1.10-json.patch,
+  +fio-2.1.10-r1.ebuild:
+  Add fix from upstream for json int parsing.
 
   25 Jun 2014; Mike Frysinger <vapier@gentoo.org> fio-2.1.10.ebuild:
   Add arm love.
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 1916c9368537..6aded5e7b5d5 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX fio-2.0.14-pic-clobber-fix.patch 1018 SHA256 224a0f76c1cf0f7ccbc39a5274366533a0155971b2e0d9d285e3284c8af25193 SHA512 84e3dd2ad14c230996f2b5fa133ccda401eadabc8ef253d1a134cf7eab6e4bb721b42a0c8b74042349cd08db8f78bad5fcb882d897472d53b919d144993d6523 WHIRLPOOL e4be27e42eb05515b431421fbd17edaeb077dff2471b00d41ab20c244baee66ff426a8e456ef0fc6f32197c44a0ca05becce00c4a9c3e1274ed4585b7107b1cd
+AUX fio-2.1.10-json.patch 1228 SHA256 17b2d34a7771752f17156893a1991e14710b8bfc9d351d7b44c545f937fc8b56 SHA512 aeeac56924c13c3b35cb9a47c9ce70f5d2a8ffdcbcdcc4e948819da51f2394f47d3d5d891ad63b6a4555a7b953755f863cd079514aae0b44195404230464254a WHIRLPOOL b8b2efaec2bfa27c98417a64902c0dcce49314200bd65530061d710c983c97d31458adeaa25090f829f1e939331e1bf5f003fca7064aacad2aa48edfa56ab4f7
 DIST fio-1.17.2.tar.bz2 1155486 SHA256 1bf40fb709b7e7dbee778139cabae6b70ec6a89a43ddd83450a6b981bf813498 SHA512 99ea0da474f2d23d17a4c8775d1ec0421c020f072e2ccfbf920cbf52edac934e365dac38cdbd15993dfa72dd09b81540b0b9802f1896f031e8682fdfd805ee4b WHIRLPOOL 61da7007e3b591b148f3ffba45c3c1ecf646c47ad08d78c258cdca2906c441285fa0db738e5b0b0113a00ed178d99973b5b380a03690fe5d2e279a361cea0201
 DIST fio-1.17.tar.bz2 1107885 SHA256 b536582f1355bf959350746dad5abab26ca646065eef84cf4b08d990726b26d4 SHA512 fdb2991470701af98974c7d29a079266791ef0069ad18937d8df56523ba10c7ec963acc958917c20a6aa9563f33579156a7151cc414f92f6b90636fa3ac5ef62 WHIRLPOOL c2b8689f627abe7bec101e2a698256d223542d7bfe61e4e22a048652900b905fced8a1988b2fe4b12e2a82d22b998f252aab68a2b62f5562e2b6461a7880ab7b
 DIST fio-1.18.1.tar.bz2 1206690 SHA256 5dc37a82b8bb8cd3c75d9fc5e135fd0cb313e19f6c1be5690ace365de990d4bb SHA512 fde9ab9804062281d7b7240a374bcdc4bd72b691c3b04af735bd2361690ccb3eff2876c92a87b526ee82a720f196c78b9f5c1dd0aee4a41c5c685fe16d0660ea WHIRLPOOL d0a7e0b37ba44056709e4f9004785c40f8b167e0a53dad6d948ed9c0c48a073e9826e64448894f0e705c9fac1869421829d4698c831fa7226f0cf2cafb89aeb8
@@ -51,6 +52,7 @@ EBUILD fio-2.0.15.ebuild 1170 SHA256 a5b92fadce62b29a89dcc52da6908c36a49e65e5dde
 EBUILD fio-2.0.3.ebuild 1012 SHA256 a1e602601007ad48ac1ce21390d4a3df90ba775869aef0e8b10d2f8a037d144d SHA512 43bfc536e6a3337b6bf59ec42544cceeebccc02d3923b2aed305e75e24c16c2b8f1d1e26a801b43fadfba716ca657fe1bb0601f15022ebf66827e44b16bf2cc9 WHIRLPOOL d3adeb8c44cd333ad053ea7441a73af72d49bd45f8fabba9e59bcabf6d20fa5112605c725ba03c8c0c5d7a28ae800b521d4209aa1780d65a4422150cd25c70c3
 EBUILD fio-2.0.8.ebuild 959 SHA256 056b421e12c9c46d65c2336ef61e873bc3c934a43244df0a43b15012360598ba SHA512 b648749c404449d9e6a61ecbd3aacbe367327b42d72388614eb2cea58b7b53fb7e1e5131aedfee51e5b557fc637c283b7526f4911cc77299926b8d284a7ab61d WHIRLPOOL 9b79aaeee96efbbae6374450cc995c880a8ab3757614183e2615b4fb0606fc11214b1421b6f943d38e794e3b2b32c3c5332bb8e8421bb5a6d9b3265685fa103d
 EBUILD fio-2.0.9.ebuild 959 SHA256 a73d5feb166c41a35657269868514a456ed35106abbcca85d46d8b3c8dc678b6 SHA512 c6aadcab34294d37cc757e533cb7f97c073b822204a1e83714ed3e96dfc4a315ab40bf5effcf6bc6ca90a0027e53813789761ab9ff790fca9be9a63d52066aa8 WHIRLPOOL e5f939fc964880d4006624da3326849bd9cb5e7262d657a4100615f71a3a54dbc6a5110bf4d4d6ab0a47eb54f62c5dd0696213e34896d5aad09db9df7b850fcd
+EBUILD fio-2.1.10-r1.ebuild 2140 SHA256 7f1fe60c85dc9780ab8f5738790786f95c44eac74d57ee3d6aa40861501528d2 SHA512 afe1519a1f1c24cb18103b9a1d6dce6c9f9c2a3ea1a81a55630962bc0992e6b05b43a6f5183e9fcd44ce2350f9bdd7ed68503a7093e9bb66d7d743718246764a WHIRLPOOL 511b2b11e2896d917465d2fd779651321c02be7666952c0c0e00ee05d43c6bb55ddc6aca389bd0d20f418274670cfae671df91355b0a19e75a6a8eb0f34f9893
 EBUILD fio-2.1.10.ebuild 2099 SHA256 9ffa236eb3e628f45cd58e4798a45e605efd97af9d402e3af50343ae93b6dd3f SHA512 d4356bb90fe4c1754d932efb4fc9a49b9a205ed5d2345715de5f20c1d76361b3d5f0cf17a246a749209e4e4039aef8dfc1d4e4556a46d2c2cf4fb409870c806a WHIRLPOOL 35c44d3e137f6e3ad8c3dc93c46837940a3a2adcd34db4b91cf3a7a3bfd876fe9a98a7a59174945cadfe6b0ca859dc2d54dcbfc6db68e8e42bc2a5e54ae9d686
 EBUILD fio-2.1.2.ebuild 1279 SHA256 848d899063549182861ad214660564dd0dc533f6e47db934ffbc3296c727483e SHA512 225a95c546d3e44ea5629f6ea7807852a223b27de8bf256bb972fda5fc45b4ce713ed0df3fc86d9cafaec3b386cdb382872bda0a965c069c5b23fca8a12aec7e WHIRLPOOL 60764e080375aeea42d55d26cb5d114406bfcdde4292b0a9fd63262b3bace4f746b28267b6b5dd389d90808dd0322be6e3f58480e46d3994f6d8132f89aef1f7
 EBUILD fio-2.1.4.ebuild 1293 SHA256 fe41e5847d3b2e86005d9a109ac602005146ef8153bdade46e5768ae3bfdbbc1 SHA512 2060b56309d81c80b524d547fc181e284a7d88b6ba4fe280074feb991c570e24c8f17b0510e3be800a91d5bace6bdf02e5c9cefaf2caec4dd36c68b4851b0397 WHIRLPOOL 7dd3dc6efd0673423eaaafb0dedf7eed17618789849a98ff9513e203443d93a0464118b82246cd3d6f50e6999e10e20a4afd9526d4532de07ef6560069d51004
@@ -60,22 +62,22 @@ EBUILD fio-2.1.7.ebuild 1243 SHA256 ed5b19b051a070bd116c54db5f9476177cc8bd201683
 EBUILD fio-2.1.8-r1.ebuild 2096 SHA256 6975643a7b531634509995af0f4b20cde846155bd2348c5fb62778a1b19ca3a7 SHA512 8d507846ba5865089b8fe701be6a423d9bf7945f2f7b61c4b9b16f36326555d820a234d29c579b43a784fe59fed4a7c958ee39fc52aec870ec7640b27cb3375c WHIRLPOOL 19a8e58ffa5c671de7fd3a5b5dfbd8cfbad31ca9b6c135a12c5c6d91c9cc4a66328de14a674a39a7a441a4f837587c8a0f8038d2fd6f327ed7811b1fee0ad7dc
 EBUILD fio-2.1.8.ebuild 1243 SHA256 423f7bb912ddf169cbcc891f4a6905ae7d85acf19547dcc12271be74c51e6f06 SHA512 095e8683cc5032119597631805a0558a832b493a8b677e09691aa0f5b4dea17e324f446c2b4f90ee89248125415a23eefe52f03680c085a51f831ab91e4f827f WHIRLPOOL 8ae5391bf821cf8aeb4880560fd61286b345139fdf8afaf41a2a75286169d2551395b6b3abe366a2a3a7c010ac701e2c2a578040242d8f0c4c81356b95e3b8f2
 EBUILD fio-2.1.9.ebuild 2096 SHA256 f37da029dc6827248770825efb270db26160a6e16c210ea0c869c467007cbe8b SHA512 d38be092804de72c12d061f8db0d337d2d599e15fde37fed50f9f2ae4c7278ea09840699490f6d708490a2adf29c91a68d6ebe91c81d192ee477a0c1954fa79d WHIRLPOOL ef59b7bbd90f59999152e67fa454ff53afa21097c262fd68a188716f5689a8b0b7bee247d263cc31ef54044aa2e77fcd6bbbef0a174eb55811c9c58c0d1849cc
-MISC ChangeLog 5912 SHA256 cac6672cc43e10799fb4ce58f2aad061ac071591daf3aa200399f64589d99791 SHA512 d5ee85414be4641573e833f9d14a338570afd3361bc8d717b3344ab85b36d5aeda2b945bd1144b0b090d35dbd96eb95711222241a024b9fd75751da10bc2cfd9 WHIRLPOOL fa33af0eb67af6d0f0efa8c48721aea4e1d0b4116540c9b3c73fc8c3128c0945ee5db223d11a325c3a544fcd3966272bbd5ec97c097dcbcc1d8e42cd7d0200e6
+MISC ChangeLog 6094 SHA256 7e4924453f4b0eca061feca4c34916f64994a506e02d61b670858852a0e310cf SHA512 ce99301fd2f126276a6b86af0b9fc9469c3c6c552e615966ddaaaf7ce6d95f7f4991d8b2d18a7ffd018203d79e6bd40882f23a0426663e544c5499a124a78366 WHIRLPOOL 273b152a113d03cef35910c684b874644d562f9c0eb1af73aa4b897f713d475f0b7207b94048c3104ecb0169feab1c6a21e26f3e5969b84fa20212cbfe9646b8
 MISC metadata.xml 452 SHA256 5b6d0e9054d1eac1b7990980f960776666c8077053b1b4afcb0e6d274dea86fc SHA512 9a3b2c5edc41973d8a9ec4ac9f385a86d94598c9724d8105a2d7983221aeb1798bf8f3f06dca39e2d5f7f5406209ebfa99c07fd3611db5decba534ca62f9f67e WHIRLPOOL 7ea8effc47fb8e193b5c5e3d5c50d1e69d05d3fc4d950e129075df1d3d5c5fe6bb307ea5928f7e2b4af8dabd1d30d419697a7b60b1f61d54c865601068df4f2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTqwt+AAoJEPGu1DbS6WIAa3EP/iwZEfOQUHj9BhvOIChlwz1C
-yFETfi/3FPDjnorPNkLVfWq0yp9PWZn1PtJHmjfgv3dKuwKO4/p0onjhBDD9A/JF
-1d3rErH+tKwqsIR0opTJahbw2ji3/fawlNP3CoLqqrdN/WoKu/BobIv2d128j3OF
-CwOOilIVyEa5llJJ96NSOhgoejyXh6EEzIDAWCLItT5CLSCVWm/ykSgLwcr8IMgr
-AtiVvb4KHY0Fluej7lr+aLAFUs0WiZ6q9J1cQS3DQryLW8cJOgaKmCFKEE1ZbEgw
-ZUs9khoX88NOd+eR5fZmEZYAoucgOpoAnaLGGcdcW9rM7TtgJFJlXT/DJQWt49AN
-tDPZ1RiOVef2WTNFM23+mPMkCZQrDboq16vMEOpu2cXnYwXhkxUSnjB2+DBjZmWv
-pVtfJRZcfYZovBFyuX+SLT5BaFwc1qZf1md7ueCk4ShUJ2aB4dinxSehOwb043LD
-VyDwQSxK8A8fzTj/ugtQAL0CGbBs2LgC6p8q/VhJOqRrxqvZUBrlszcNj7YrRf+i
-muZWQ+85gINbvMjapWGjR2BDEejbj19OeVAosV7xOo/uYP9hN8TvdVspYwaL4v4a
-5/jkFqSe+P5p8BYUGxi8JTXIoyt1sKmJfZpZxlwHmBnHV10+vx6brTzoMiUZAjYE
-il672QC4wDI0d7ksM62q
-=S7VS
+iQIcBAEBCAAGBQJTqwy8AAoJEPGu1DbS6WIA1/sQAItEvZ6C/dwZim3JftTzQ5CD
+YKansVAfCMbiSab+Db7TfYHNIE3dA6Zhar9IUer32vY4b5YW88jXrBxbjJPYiarE
+9asNmnYa3A8u5j9gMmcoZqpnha2mDUy4qZcOS5ujv/vPDx/AHDS6glip+jIZDRCP
+k34McKN8UTVg7/0P1Z+E/M7S0wPDvBwRuQyDufZB3h6nKSDSN1xxxCg42wnwdgWT
+yb7aJtOAcLihnHvG8yZsZu9jQIOzzM3Jg/O16nxw7ad10ydh71I9Jqt49jito/KC
+kTQONI8cHHURSU2SvLS3INwgeeJAt4eX2KN7EvvWsYVRyAAz37tT2E7DNWugN+RE
+el+PFLXRvgv3wdNqgJ8C4aDtk00zd68Z0GAA5JB/E6YTTh1lFlD4s+gx61sC6jkF
+hzGbGDdwFMtXu1rg3PRC/0N9nQShN4304htnj8pnr+ub+u/gbHqbYswaDWTUH8j9
+lVHdCae6GreuR15rTC0caFEuIbZ7EUNbjoCadRvDEbyO8NdcrcQikDQ243MdOBvX
+x0pDbRvbct9IC70Td7NjtSMW4fL32KXCZw9pm07x3nWbT4dhxDR/wA/+LdKEgwpQ
+jWTC5Hed8QUfO6WSiDR9oKCaZOg90zUldFkxgCPnYvyFBtgQwft6gH+Wf0jfkmP0
+tH0M3eD9y4LwUrd/HYR5
+=vqUx
 -----END PGP SIGNATURE-----
diff --git a/sys-block/fio/files/fio-2.1.10-json.patch b/sys-block/fio/files/fio-2.1.10-json.patch
new file mode 100644
index 000000000000..526be9b76228
--- /dev/null
+++ b/sys-block/fio/files/fio-2.1.10-json.patch
@@ -0,0 +1,32 @@
+From a606a802173272002e37be6475802be8c37481d6 Mon Sep 17 00:00:00 2001
+From: Puthikorn Voravootivat <puthik@chromium.org>
+Date: Tue, 24 Jun 2014 15:59:53 -0700
+Subject: [PATCH] Cast input argument for json_object_add_value_int to long
+ long
+
+The latency related (and some other) variables type is uint32_t
+but the JSON integer type is long long. So we need to cast
+the numbers to long long type to make JSON output correctly.
+
+Signed-off-by: Puthikorn Voravootivat <puthik@chromium.org>
+Signed-off-by: Jens Axboe <axboe@fb.com>
+---
+ json.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/json.h b/json.h
+index 081afd6..962c11c 100644
+--- a/json.h
++++ b/json.h
+@@ -52,7 +52,7 @@ void json_free_object(struct json_object *obj);
+ 
+ int json_object_add_value_type(struct json_object *obj, const char *name, int type, ...);
+ #define json_object_add_value_int(obj, name, val) \
+-	json_object_add_value_type((obj), name, JSON_TYPE_INTEGER, (val))
++	json_object_add_value_type((obj), name, JSON_TYPE_INTEGER, (long long) (val))
+ #define json_object_add_value_float(obj, name, val) \
+ 	json_object_add_value_type((obj), name, JSON_TYPE_FLOAT, (val))
+ #define json_object_add_value_string(obj, name, val) \
+-- 
+2.0.0
+
diff --git a/sys-block/fio/fio-2.1.10-r1.ebuild b/sys-block/fio/fio-2.1.10-r1.ebuild
new file mode 100644
index 000000000000..34d755cbff15
--- /dev/null
+++ b/sys-block/fio/fio-2.1.10-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.10-r1.ebuild,v 1.1 2014/06/25 17:53:59 vapier Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="http://brick.kernel.dk/snaps/"
+SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio gnuplot gtk numa zlib"
+
+DEPEND="aio? ( dev-libs/libaio )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+	numa? ( sys-process/numactl )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	gnuplot? (
+		sci-visualization/gnuplot
+		${PYTHON_DEPS}
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
+	epatch "${FILESDIR}"/${P}-json.patch
+	epatch_user
+
+	# Many checks don't have configure flags.
+	sed -i \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
+		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
+		configure || die
+}
+
+src_configure() {
+	# not a real configure script
+	./configure \
+		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+		--cc="$(tc-getCC)" \
+		$(usex gtk '--enable-gfio' '') \
+		$(usex numa '' '--disable-numa') \
+		|| die 'configure failed'
+}
+
+src_compile() {
+	emake V=1 OPTFLAGS=
+}
+
+src_install() {
+	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
+
+	if use gnuplot ; then
+		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
+	else
+		rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
+		rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
+		rm "${ED}"/usr/share/fio/*.gpm || die
+		rmdir "${ED}"/usr/share/fio/ 2>/dev/null
+	fi
+
+	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
+	rm "${ED}"/usr/bin/genfio || die
+
+	dodoc README REPORTING-BUGS HOWTO
+	docinto examples
+	dodoc examples/*
+}