From 8dc9feb5fab1c315112a80f601f36176144978a7da2c25fda5714fda6ade7b5d Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 17 Oct 2011 09:20:44 +0000 Subject: [PATCH] fixed build OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=93 --- collectd-fix_new_yajl_lib.patch | 24 ++++++++++++++++++++++++ collectd.changes | 5 +++++ collectd.spec | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 collectd-fix_new_yajl_lib.patch diff --git a/collectd-fix_new_yajl_lib.patch b/collectd-fix_new_yajl_lib.patch new file mode 100644 index 0000000..d6e4f10 --- /dev/null +++ b/collectd-fix_new_yajl_lib.patch @@ -0,0 +1,24 @@ +--- src/curl_json.c ++++ src/curl_json.c +@@ -100,11 +100,9 @@ + status = yajl_parse(db->yajl, (unsigned char *)buf, len); + if (status == yajl_status_ok) + { +- status = yajl_parse_complete(db->yajl); ++ status = yajl_complete_parse(db->yajl); + return (len); + } +- else if (status == yajl_status_insufficient_data) +- return (len); + + if (status != yajl_status_ok) + { +@@ -760,7 +758,7 @@ + char *url; + yajl_handle yprev = db->yajl; + +- db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db); ++ db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db); + if (db->yajl == NULL) + { + ERROR ("curl_json plugin: yajl_alloc failed."); diff --git a/collectd.changes b/collectd.changes index 1c53764..dfd53e5 100644 --- a/collectd.changes +++ b/collectd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 17 09:19:25 UTC 2011 - schubi@suse.com + +- fixed build ( new yajl lib API ) + ------------------------------------------------------------------- Fri Sep 16 14:35:10 UTC 2011 - coolo@suse.com diff --git a/collectd.spec b/collectd.spec index 296cf71..e979813 100644 --- a/collectd.spec +++ b/collectd.spec @@ -147,6 +147,7 @@ Patch24: collectd-pkgconfig_libnotify_add_gtk.patch Patch25: collectd-df-remove-duplicates.patch Patch26: collectd-iptc.diff Patch27: collectd-libnotify_070.patch +Patch28: collectd-fix_new_yajl_lib.patch Url: http://collectd.org/ Group: System/Monitoring License: GNU General Public License (GPL) @@ -516,6 +517,7 @@ popd #iproute2 %patch25 -p1 %patch -P 26 -p1 %patch27 -p1 +%patch28 %__sed -i 's|@@VERSION@@|%{version}|g' configure.in