diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-25 21:00:18 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-25 21:00:18 +0000 |
| commit | d22f9895b6411f2f09a29f6d2ab0e7d8d7cb0a32 (patch) | |
| tree | d5375722a62ad1b16f2eedf299d42ce23186af70 /app-admin/collectd | |
| parent | Revision bump for xorg-server-1.10.4, bug #379963 (diff) | |
| download | gentoo-2-d22f9895b6411f2f09a29f6d2ab0e7d8d7cb0a32.tar.gz gentoo-2-d22f9895b6411f2f09a29f6d2ab0e7d8d7cb0a32.tar.bz2 gentoo-2-d22f9895b6411f2f09a29f6d2ab0e7d8d7cb0a32.zip | |
Add missing yajl 1/2 check, bug 374411
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/collectd')
| -rw-r--r-- | app-admin/collectd/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/collectd/collectd-5.0.0-r1.ebuild | 3 | ||||
| -rw-r--r-- | app-admin/collectd/files/collectd-5.0.0-yajl2-2.patch | 19 |
3 files changed, 26 insertions, 2 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/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; |