Add missing yajl 1/2 check, bug 374411

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

4 files changed, 42 insertions, 17 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 98dbf01c694d..abcd67d0b814 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.23 2011/07/25 21:00:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.24 2011/08/25 21:00:18 dilfridge Exp $
+
+  25 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-5.0.0-r1.ebuild, +files/collectd-5.0.0-yajl2-2.patch:
+  Add missing yajl 1/2 check, bug 374411
 
   25 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   collectd-4.10.3-r1.ebuild, collectd-5.0.0-r1.ebuild:
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index bf4146e09d23..2f23306f79e6 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -9,6 +9,7 @@ AUX collectd-4.10.2-libocci.patch 720 RMD160 c90872f76a771076efe500c78dc3e3a5545
 AUX collectd-4.10.2-nohal.patch 888 RMD160 a7d5969f3119f44eeb1b163d13bfd86c727854f3 SHA1 275e928e2bbad3b01d7e129793922d48348334fa SHA256 d1b8fccc96289c42e6aa33187bfca250ae0152a44d5cfba41ccf9e941a6aa799
 AUX collectd-4.10.3-lt.patch 1006 RMD160 b7eee4c9261af6ac3d330494746b922792241bac SHA1 ce2f25fbb84912bce137866faecf147d4da4ee57 SHA256 b5640f7a029366d33d6821f8efe203097d56c0193ec39e1e52d93bc7723179c7
 AUX collectd-4.10.3-werror.patch 849 RMD160 1bf304deb3addbdeb4d7e12ea06f49dd3f85e387 SHA1 07f8c063f788c77e2958f2490bc910296a9db25e SHA256 c9b70f892f96c0d5da5d65702679bc0b4a38b4e77ff819f69c03ad68cc3f68fd
+AUX collectd-5.0.0-yajl2-2.patch 735 RMD160 58f634894c80b7c17656fde910a9917c46b15c17 SHA1 06b9c515587fcc39c2fb9c744db2e18d06628273 SHA256 06f82f3a8d350482a5ae1804db9f97948c02f527d9fdcdad8646c56e42cbc8fd
 AUX collectd-5.0.0-yajl2.patch 3586 RMD160 7bbd917f5dabd645a72b32d8bf70826014736e89 SHA1 32df19c19620adea658320e917f791690fb02342 SHA256 463ed3de9819000d37883698e25756d775fac232405310ae6a6b4494878e285d
 AUX collectd.confd 865 RMD160 edf4e29bc193128d913443ba5251935726b13194 SHA1 0987c9546a814d0f6c888f46828ad66b3a190a97 SHA256 c24b11a65cb25587aa534c529a2b394b7c190ac44e1849ea5e1bc02d1e0a1592
 AUX collectd.initd 1644 RMD160 70c454364fdcef21fa48467e9fd66d3d1e5907fd SHA1 a6bd53ce58210796b216687582fc7f58316ca7a9 SHA256 6a5e169cc00aa393e501788414a661051b6218f9ad9413b960da012a94c6d78a
@@ -16,23 +17,23 @@ AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faa
 DIST collectd-4.10.3.tar.bz2 1343806 RMD160 3c6257880de6385ee0ad891b5e8fff0916969be8 SHA1 fbeb672d9e1a32f9eb4a5df535519e2fdb8da636 SHA256 ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65
 DIST collectd-5.0.0.tar.bz2 1372805 RMD160 7b0b9060a4dbde937fa2263076fdd81f328f46aa SHA1 720746ee2542ddec9ef7b42b5f3e00412d1b3b43 SHA256 2df6ef3b90d588b82a16da479ad652fdd5837fb9e6fd04b728c6427a3d767e3c
 EBUILD collectd-4.10.3-r1.ebuild 12528 RMD160 2ad40970131dc4bc194a9d109d3120767b1d68c4 SHA1 46d610c1107d8f51aa5627e6a8ac1d036bf6a593 SHA256 c2b7de77077f354dc676b7d4785943037972803f238f1d3bb8a4d3aa5a256cda
-EBUILD collectd-5.0.0-r1.ebuild 12893 RMD160 5e9fd63c64c2686db7d24c1b98769b36e6c21793 SHA1 44d1e4932b26c44befae77d3abfc8f4bf8df5a9d SHA256 75156c3237a10bd7b71a55e07fccf553f8dc662a349890f4cc46a4f49c5a104c
-MISC ChangeLog 5368 RMD160 6e6fe572332db231e36256a57e91c7e0ba890599 SHA1 8cb1ce12db54b4cd853acbf16591fd292cff60b2 SHA256 0f274e922c5f2c0d917e7c5984be8b10d83c9cb01eeab64d7bd2fd4f57ef64a6
+EBUILD collectd-5.0.0-r1.ebuild 12934 RMD160 5776853dc4a40b3fe9e46f660720d571637b0af6 SHA1 5e2d7db0f17b5f4fdaeb4b43c0cb6d14e5b91088 SHA256 88e045909af797e40aa637cf06e32124a0c28a6442ba25585878489ffa9c2c56
+MISC ChangeLog 5532 RMD160 9c05e1186c5e811029fb38d1df24e1b8d5d06e09 SHA1 3654d505b119459889f9f06c94514c5edc6253c8 SHA256 27dabb1ab44dd53250ba446be08660158b24fa62f91c7f2d9d22affb5a169250
 MISC metadata.xml 11596 RMD160 bf74bfdd8c9a6083822a182c702a4f650e7237cf SHA1 8c0244c467028a172dd5b1f7beb537c039de2462 SHA256 63c1f6ffb3f2e6dea9015a97c5249d873899860020af7e0a8c2af7561099ee0e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOLeC+AAoJENwGBM22xffexEIP/3G3b+AMM7Fz8L+RjoEmoLLH
-f4IEa/dIgal5LQeVRbKxXbW869AZ27ssHjNoD/uyUJqI+MhHDiD3CRl2N6rghqLn
-C4a8GtAz8s0aphexWn3fk9P2yTqjhODDjaOqM5/tJErBntndmtfOY9kUE/CdkTP/
-UTNbcAymP/QC6NgB0o1FG6mgT7By6rb4q+U+Uw16wHXeQdi6qWRXVjYSd/eZlNNe
-btwS223qHsP39JcK1zdPZCDCn+lxrym+Ho0IAyYu9GUJh1JAaCOQ5V3isYz0t6RZ
-65oK5XrC5muiZdx7+ynG7upluMgdLya6cNigsVpO1iX8DY2fAGk3QfYHNUn8aMhm
-O1wAE+M5nylWmjBAMEFUTe4K/QwF2LYToFGZSks4kfQN5wIXR32rtHDkmvZqI5JW
-GGCVQpTJFCpw877GNlGUwbDO7u4NWQbkaq5lcyJsvW/tNqHKspLDWy5C9EfEmXLF
-9/AUTB6u3fo+8tnhSz4gLl+cnjA4KxhOgiQt0R1dq0FBtPGXcJKhXeHKb2btf6LC
-u8k2PG1Sg+KRsWChrnyz6MdFhGXxa4zRYos5FzEI84L96dRlaQq8zK1n8eAW5zTs
-3qasAOSTWHdLCOBFpEUr043p/cvtJf1hTwN33sJ1b6fvhZXralgx8ujO0kgtmXdg
-V1m0FcxP4kSMDrOeZzIb
-=lwwC
+iQIcBAEBCgAGBQJOVrf2AAoJENwGBM22xffeM/8P/2FQZHa1GziR76+BLpdlOq38
+WGvsiSR6Qb+u9kywlqbzvzCODYj/YMUkeEumeioYIfPCEI70cMkxsSjk57t0GKLv
+YbTgOeI/VJIzk6s0bUojCjbZE2s5ANPvV1DgORYTr4OuuWoFDKnVbVeqN6DQ0WHN
+yFqPkDXU1vZUCx/o5BjcPmBgXEws4YNBKZmvnVXO9WRRqGTQjOGQljt1jrsh0HaL
+9B04wicx4IKvPWOaqCzn68ccrzy4JxI7DZ1tOlPADYPx+k1t4h1Tufs931B9F8a6
+uIKE1NfB8bxu5Zaajg/AMWcsZPQzKWc7/+WniwdW/oxZlZXq0CZxDEQ4KsE7EgLn
+Pxi+YzAhnT3BFJhCe/XliByHXUh9biBVTwBD0mysTglub5jPWx+YU75tRayd6Dy1
+6M6Oa/lWldci/6efBnUydPufvAXrptzYva/nJQrcb/7cPU0Npad6vUakxcivL/aP
+875kj7V7yRrner5F8XdScoGvyrANxiOnRcZhRSH37Pgh/fT6i2AyXwM6V84OfNfB
+cBxZQyncNUFfM5Jn+w9XQkcIE8ViEmM/d+Rr0aQyjhdUzQGfo3crESJ4yHd/LaD0
+phRNqgzI8UHhWhAF/AV1wemXtiByzG9CA/1fX7npsEMvi3Hl21s87sMg2U0tCJc5
+yrOA4BNjLd4s/ctle/qK
+=bzUR
 -----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-5.0.0-r1.ebuild b/app-admin/collectd/collectd-5.0.0-r1.ebuild
index c0fe10077f25..588140eff02e 100644
--- a/app-admin/collectd/collectd-5.0.0-r1.ebuild
+++ b/app-admin/collectd/collectd-5.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.0-r1.ebuild,v 1.4 2011/07/25 21:00:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.0-r1.ebuild,v 1.5 2011/08/25 21:00:18 dilfridge Exp $
 
 EAPI=4
 
@@ -106,6 +106,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.10.2"-{libocci,libnotify-0.7,nohal}.patch
 	"${FILESDIR}/${PN}-4.10.3"-{lt,werror}.patch
 	"${FILESDIR}/${PN}-5.0.0"-yajl2.patch
+	"${FILESDIR}/${PN}-5.0.0"-yajl2-2.patch
 	)
 
 # @FUNCTION: collectd_plugin_kernel_linux
diff --git a/app-admin/collectd/files/collectd-5.0.0-yajl2-2.patch b/app-admin/collectd/files/collectd-5.0.0-yajl2-2.patch
new file mode 100644
index 000000000000..30e6c0ddc272
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.0.0-yajl2-2.patch
@@ -0,0 +1,19 @@
+X-Git-Url: https://collectd.org/gerrit/gitweb?p=collectd.git;a=blobdiff_plain;f=src%2Fcurl_json.c;h=857e276bb585e16a9f872d4863f43e86c20d1e2d;hp=988ed58df3442459d23ef25b20894df6f82ae21e;hb=0471475841a912322c50200c5fb7a45b790ad576;hpb=4b962d32365228d8984759d36269904527927cf3
+
+diff --git a/src/curl_json.c b/src/curl_json.c
+index 988ed58..857e276 100644
+--- a/src/curl_json.c
++++ b/src/curl_json.c
+@@ -763,7 +763,11 @@ static int cj_curl_perform (cj_t *db, CURL *curl) /* {{{ */
+     return (-1);
+   }
+ 
+-  status = yajl_parse_complete (db->yajl);
++#if HAVE_YAJL_V2
++    status = yajl_complete_parse(db->yajl);
++#else
++    status = yajl_parse_complete(db->yajl);
++#endif
+   if (status != yajl_status_ok)
+   {
+     unsigned char *errmsg;