From b2d35f33de3bb6b269fba67a90a8e14268439af1 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 5 Jan 2012 15:21:41 +0100 Subject: [PATCH] patches: Removed bts592623-curl_json-file -- included upstream. --- debian/changelog | 3 ++- debian/patches/00list | 1 - .../patches/bts592623-curl_json-file.dpatch | 22 ------------------- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100755 debian/patches/bts592623-curl_json-file.dpatch diff --git a/debian/changelog b/debian/changelog index 8714cf2..72c8a2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,9 @@ collectd (4.10.4-1) unstable; urgency=low (Closes: #639796). * debian/patches: - Removed bts595756-notify_email-segfault -- included upstream. + - Removed bts592623-curl_json-file -- included upstream. - -- Sebastian Harl Thu, 05 Jan 2012 15:19:02 +0100 + -- Sebastian Harl Thu, 05 Jan 2012 15:21:24 +0100 collectd (4.10.1-2.1) unstable; urgency=high diff --git a/debian/patches/00list b/debian/patches/00list index 10dc8e3..a9b3cba 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,6 +1,5 @@ rrd_filter_path.dpatch collection_conf_path.dpatch bts559801_plugin_find_fix.dpatch -bts592623-curl_json-file.dpatch bts596128-reheap-fix.dpatch CVE-2010-4336.dpatch diff --git a/debian/patches/bts592623-curl_json-file.dpatch b/debian/patches/bts592623-curl_json-file.dpatch deleted file mode 100755 index d143bc8..0000000 --- a/debian/patches/bts592623-curl_json-file.dpatch +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## bts592623-curl_json-file.dpatch by Florian Forster -## -## DP: curl json: Fix checking the response code. -## DP: -## DP: This fixes access to file:// URLs. - -@DPATCH@ - -diff a/src/curl_json.c b/src/curl_json.c ---- a/src/curl_json.c -+++ b/src/curl_json.c -@@ -775,7 +775,8 @@ static int cj_curl_perform (cj_t *db, CURL *curl) /* {{{ */ - curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &rc); - -- if (rc != 200) -+ /* The response code is zero if a non-HTTP transport was used. */ -+ if ((rc != 0) && (rc != 200)) - { - ERROR ("curl_json plugin: curl_easy_perform failed with response code %ld (%s)", - rc, url); -- 2.30.2