Add upstream compatibility patch for yajl-v2, bug 374411; add Johan Bergström as proxied maintainer

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

5 files changed, 154 insertions, 18 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 44ffbb983783..e86be9b42af8 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2011/04/24 21:16:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.22 2011/07/18 10:13:02 dilfridge Exp $
+
+  18 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-5.0.0-r1.ebuild, +files/collectd-5.0.0-yajl2.patch, metadata.xml:
+  Add upstream compatibility patch for yajl-v2, bug 374411; add Johan
+  Bergström as proxied maintainer
 
   24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   collectd-4.10.3-r1.ebuild, +files/collectd-4.10.3-werror.patch,
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 69ed3b110e24..238f030ae60c 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -9,29 +9,30 @@ 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.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
 AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c
 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 12509 RMD160 6485469c971fc2b8d8a7de745f5c5c026cd320cd SHA1 8de82dcad14c62f12338c4fee66df7d8ae690d70 SHA256 060fe1c060fc57d8429ee2ed084be86d03d39067a2fc1142a2f4c0e073057429
-EBUILD collectd-5.0.0-r1.ebuild 12835 RMD160 df6195449c155a57a65ac5f96fb84c94bf732089 SHA1 244824ab250544552c4b3bb366a9f08c91042002 SHA256 8388b53753fc8478c5c482d74926b1b8decb52740948c61337dc2383450afeea
-MISC ChangeLog 4968 RMD160 7f406856e28086cc2d21ef0e19758d63d754ab78 SHA1 163cd699d181a2fc23a0af17ecbf0c7016372a4e SHA256 bf565ac1a1fbc29042a8da0503912d6a20a9509249219fca85557a4693c74477
-MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc
+EBUILD collectd-5.0.0-r1.ebuild 12874 RMD160 7a7c9a8fe7bd9dd867f393de14c5029667f8ab1d SHA1 72ef8ab6467abe28577f37466e971c7cde647986 SHA256 a602398ae4a72803109692ce8ea2284441f4f7eb86064f2dded4cccd38afe38d
+MISC ChangeLog 5208 RMD160 e1520477b1edb5e68ec2d317d52254f11ad26c05 SHA1 fb233c38d46658e837ab6ebe8200680361f93a64 SHA256 2b248777bd56b400e56d24d593e452446b84a9db628dd66f3fce760ebd74c267
+MISC metadata.xml 11596 RMD160 bf74bfdd8c9a6083822a182c702a4f650e7237cf SHA1 8c0244c467028a172dd5b1f7beb537c039de2462 SHA256 63c1f6ffb3f2e6dea9015a97c5249d873899860020af7e0a8c2af7561099ee0e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNtJOzAAoJENwGBM22xffevq4P/R8rzGRwRR+wuz60AQexh9K7
-soTHr7INSAMNcWAcXTKG0HBtxgdTIFT1zkbvjPQ390INTTWSD81AMG0yM4KHY85T
-hlEou/9Ygt3PZIzD3egx3OhbNipK7PoRhKHPIYwHOxnoK+nJMoU2R30foqTwsQVg
-dKKgI2jlC3DQ2eVoeqAX7xSX4S1SxNw4AaZjDfN7lwmXTZnFL5kwzLku5mRwGWlh
-bFVsdgwDOOQRu4HgsWuaZkHzvVEM1Pnzd+OnM4r4z1FUyhmTnsNWs0M3oelfkgEK
-0OEgH3zewxloptvAJKmrVkrY9UD9blWcFJ2Zpc0Af0KhgmPgMXXCMdPRAWg17V6h
-8dQkUdA9mKBSlZXvSjP+slxtH8sH1K1uSogpZOF0ZD+lxWWeLjgFi2GzJcwlevJ+
-eBiqwisXLzydX89Hk2t+ClclEX2Qvr4XtwS0sIdmIKsruQDKKmlXvaUtYs+6h5Si
-pu6VOlVQ+EPTqPUCXr4bgK4wzukdYSurLZTp/z19HRNDNROHNmxf5HnwLBeDRlGy
-TUMIXr+6NSErC4aGW9rm9+BflSiizU3EY1h0YOtqQCILeSZrE7ZixlWLhAxCQPcm
-t1NSQJMN9os0OQatxkrMO9bOKIfYmslossd4J1m97ICaAfH46YxO2ME1ws8Dm4p8
-Xic701cKTwWBo0EVSoSR
-=8w2T
+iQIcBAEBCgAGBQJOJAdHAAoJEEb+UGWnxTyHFEIP/jHkbBTnQ1ufa3ekd6mcofqS
+uiMu0ZxmfV/lckPbpMSZRQp0lKJsCB4AZDsZEI79cnN9hZcHymfXkCRLUuEkA66A
+yTGl7u2SR29XVJm5jWujHNMELDbdr1GNQGg3AvRU3MrWHoLVswmiz3IdLpCqrH6X
+BqKPwd5mpgTN4+m4NhpmTW8zqpzCPzuPrwtVr53tZ71XCdTi2NM4XwYKEdx0ikK4
+g6CRroZIv595eHrNcpt9l7J66leENqQonI/KH0RLKPpDcJQOm5m/9gHHF8yq3Fm4
+VsM4EqJK6zi5J9lPxpbEoDzfKKT1+eHSLKAqtZhIMwC4ktwUn7LSkQ6LlfCDmBKJ
+qZnIlWwIDu+YjCbN6BdpFibttvsILkboxD4ieqpNKhJdwjZLQ5/XSKrNMhQPz8SS
+taeN/TUnRCYHZjJ2cMKKwC7WQIhql4seOptfwzUXix/CKuaIbxprBVtCI8UPzz2J
+manW/Uz6nQByEwLhXcDPxdY+x3xIACmlnQhid69Yy6X/BXVOhN/MJZ9j5Dvxff6e
+uUTUa46lIGd6g6lGD/PzW70A3VbadSIUY8NaVaLt4JaVaNfyihxO4/jpVWvEiVVD
+PQZWxEwVi9awcvZUaig2b86DRX3rICUmNOUm01rXRs4KiT29nEO+Lptg8O66J59J
+zFcd1WibMPpJ1OlotJGH
+=C1Rs
 -----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 3ef5d3d12ff5..b3d2031d328f 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.2 2011/04/24 21:16:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.0-r1.ebuild,v 1.3 2011/07/18 10:13:02 dilfridge Exp $
 
 EAPI=4
 
@@ -104,6 +104,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch
 	"${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
 	)
 
 # @FUNCTION: collectd_plugin_kernel_linux
diff --git a/app-admin/collectd/files/collectd-5.0.0-yajl2.patch b/app-admin/collectd/files/collectd-5.0.0-yajl2.patch
new file mode 100644
index 000000000000..3d2f77332909
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.0.0-yajl2.patch
@@ -0,0 +1,125 @@
+diff -ruN collectd-5.0.0.orig/configure.in collectd-5.0.0/configure.in
+--- collectd-5.0.0.orig/configure.in	2011-03-27 18:35:08.000000000 +0200
++++ collectd-5.0.0/configure.in	2011-07-18 11:56:01.053544558 +0200
+@@ -3863,6 +3863,7 @@
+ 	CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags"
+ 
+ 	AC_CHECK_HEADERS(yajl/yajl_parse.h, [with_libyajl="yes"], [with_libyajl="no (yajl/yajl_parse.h not found)"])
++	AC_CHECK_HEADERS(yajl/yajl_version.h)
+ 
+ 	CPPFLAGS="$SAVE_CPPFLAGS"
+ fi
+diff -ruN collectd-5.0.0.orig/src/curl_json.c collectd-5.0.0/src/curl_json.c
+--- collectd-5.0.0.orig/src/curl_json.c	2011-03-27 18:35:08.000000000 +0200
++++ collectd-5.0.0/src/curl_json.c	2011-07-18 12:03:00.741544705 +0200
+@@ -1,7 +1,7 @@
+ /**
+  * collectd - src/curl_json.c
+  * Copyright (C) 2009       Doug MacEachern
+- * Copyright (C) 2006-2010  Florian octo Forster
++ * Copyright (C) 2006-2011  Florian octo Forster
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU General Public License as published by the
+@@ -18,7 +18,7 @@
+  *
+  * Authors:
+  *   Doug MacEachern <dougm at hyperic.com>
+- *   Florian octo Forster <octo at verplant.org>
++ *   Florian octo Forster <octo at collectd.org>
+  **/
+ 
+ #include "collectd.h"
+@@ -29,6 +29,13 @@
+ 
+ #include <curl/curl.h>
+ #include <yajl/yajl_parse.h>
++#if HAVE_YAJL_YAJL_VERSION_H
++# include <yajl/yajl_version.h>
++#endif
++
++#if defined(YAJL_MAJOR) && (YAJL_MAJOR > 1)
++# define HAVE_YAJL_V2 1
++#endif
+ 
+ #define CJ_DEFAULT_HOST "localhost"
+ #define CJ_KEY_MAGIC 0x43484b59UL /* CHKY */
+@@ -77,6 +84,12 @@
+ };
+ typedef struct cj_s cj_t; /* }}} */
+ 
++#if HAVE_YAJL_V2
++typedef size_t yajl_len_t;
++#else
++typedef unsigned int yajl_len_t;
++#endif
++
+ static int cj_read (user_data_t *ud);
+ static int cj_curl_perform (cj_t *db, CURL *curl);
+ static void cj_submit (cj_t *db, cj_key_t *key, value_t *value);
+@@ -98,8 +111,21 @@
+     return (0);
+ 
+   status = yajl_parse(db->yajl, (unsigned char *)buf, len);
+-  if ((status != yajl_status_ok)
+-      && (status != yajl_status_insufficient_data))
++  if (status == yajl_status_ok)
++  {
++#if HAVE_YAJL_V2
++    status = yajl_complete_parse(db->yajl);
++#else
++    status = yajl_parse_complete(db->yajl);
++#endif
++    return (len);
++  }
++#if !HAVE_YAJL_V2
++  else if (status == yajl_status_insufficient_data)
++    return (len);
++#endif
++
++  if (status != yajl_status_ok)
+   {
+     unsigned char *msg =
+       yajl_get_error(db->yajl, /* verbose = */ 1,
+@@ -130,7 +156,7 @@
+ /* "number" may not be null terminated, so copy it into a buffer before
+  * parsing. */
+ static int cj_cb_number (void *ctx,
+-    const char *number, unsigned int number_len)
++    const char *number, yajl_len_t number_len)
+ {
+   char buffer[number_len + 1];
+ 
+@@ -159,7 +185,7 @@
+ } /* int cj_cb_number */
+ 
+ static int cj_cb_map_key (void *ctx, const unsigned char *val,
+-                            unsigned int len)
++    yajl_len_t len)
+ {
+   cj_t *db = (cj_t *)ctx;
+   c_avl_tree_t *tree;
+@@ -187,7 +213,7 @@
+ }
+ 
+ static int cj_cb_string (void *ctx, const unsigned char *val,
+-                           unsigned int len)
++    yajl_len_t len)
+ {
+   cj_t *db = (cj_t *)ctx;
+   char str[len + 1];
+@@ -697,7 +723,13 @@
+   char *url;
+   yajl_handle yprev = db->yajl;
+ 
+-  db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db);
++  db->yajl = yajl_alloc (&ycallbacks,
++#if HAVE_YAJL_V2
++      /* alloc funcs = */ NULL,
++#else
++      /* alloc funcs = */ NULL, NULL,
++#endif
++      /* context = */ (void *)db);
+   if (db->yajl == NULL)
+   {
+     ERROR ("curl_json plugin: yajl_alloc failed.");
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 401f2064212f..7039301838cc 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
+		<email>bugs@bergstroem.nu</email>
+		<name>Johan Bergström</name>
+	</maintainer>
+	<maintainer>
 		<email>dilfridge@gentoo.org</email>
 		<name>Andreas K. Huettel</name>
 	</maintainer>