patches: Removed bts592623-curl_json-file -- included upstream.

diff --git a/debian/changelog b/debian/changelog
index 8714cf2bb0e516b55563c14c52df2dcc9fcc4b4c..72c8a2d628ce229eb35c77386a0c21a83ff9b00a 100644 (file)
--- 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 <tokkee@debian.org>  Thu, 05 Jan 2012 15:19:02 +0100
+ -- Sebastian Harl <tokkee@debian.org>  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 10dc8e3527aa01d260996172ab1b06e11328bbf1..a9b3cba01b431550ce2929a1d82e4e3139fa0ada 100644 (file)
--- 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 (executable)
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 <octo@verplant.org>
-##
-## 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);