From de3decf2929dc3141ef0d662099a0ea3365b5ea4 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 11 Oct 2009 19:13:56 +0200 Subject: [PATCH] patches: Removed bts541953-curl-followlocation.dpatch. This patch has been included upstream. --- debian/changelog | 3 +- debian/patches/00list | 1 - .../bts541953-curl-followlocation.dpatch | 63 ------------------- 3 files changed, 2 insertions(+), 65 deletions(-) delete mode 100755 debian/patches/bts541953-curl-followlocation.dpatch diff --git a/debian/changelog b/debian/changelog index c19f87f..b600e83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,9 @@ collectd (4.8.1-1) unstable; urgency=low - Install contrib/GenericJMX.conf to /usr/share/doc/collectd/examples/. * debian/patches: - Removed bts535787-powerdns-fix-localsocket.dpatch - included upstream. + - Removed bts541953-curl-followlocation.dpatch - included upstream. - -- Sebastian Harl Sun, 11 Oct 2009 19:11:39 +0200 + -- Sebastian Harl Sun, 11 Oct 2009 19:13:42 +0200 collectd (4.7.2-1) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 703d408..be95bdf 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -4,6 +4,5 @@ network-fix-cacheflush.dpatch libvirt-reconnect.dpatch plugin-fix-unregister.dpatch java-fix-jvm-start.dpatch -bts541953-curl-followlocation.dpatch bts542859-df-fix-ignorelist.dpatch diff --git a/debian/patches/bts541953-curl-followlocation.dpatch b/debian/patches/bts541953-curl-followlocation.dpatch deleted file mode 100755 index b412637..0000000 --- a/debian/patches/bts541953-curl-followlocation.dpatch +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## curl-followlocation.dpatch by Florian Forster -## -## DP: Plugins using libcurl: Enable the ‘CURLOPT_FOLLOWLOCATION’ option. - -@DPATCH@ - -diff a/src/apache.c b/src/apache.c ---- a/src/apache.c -+++ b/src/apache.c -@@ -458,6 +458,7 @@ static int init_host (apache_t *st) /* {{{ */ - } - - curl_easy_setopt (st->curl, CURLOPT_URL, st->url); -+ curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1); - - if (st->verify_peer != 0) - { -diff a/src/ascent.c b/src/ascent.c ---- a/src/ascent.c -+++ b/src/ascent.c -@@ -560,6 +560,7 @@ static int ascent_init (void) /* {{{ */ - } - - curl_easy_setopt (curl, CURLOPT_URL, url); -+ curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1); - - if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0)) - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1); -diff a/src/bind.c b/src/bind.c ---- a/src/bind.c -+++ b/src/bind.c -@@ -1395,6 +1395,7 @@ static int bind_init (void) /* {{{ */ - curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION); - curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, bind_curl_error); - curl_easy_setopt (curl, CURLOPT_URL, (url != NULL) ? url : BIND_DEFAULT_URL); -+ curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1); - - return (0); - } /* }}} int bind_init */ -diff a/src/curl.c b/src/curl.c ---- a/src/curl.c -+++ b/src/curl.c -@@ -346,6 +346,7 @@ static int cc_page_init_curl (web_page_t *wp) /* {{{ */ - PACKAGE_NAME"/"PACKAGE_VERSION); - curl_easy_setopt (wp->curl, CURLOPT_ERRORBUFFER, wp->curl_errbuf); - curl_easy_setopt (wp->curl, CURLOPT_URL, wp->url); -+ curl_easy_setopt (wp->curl, CURLOPT_FOLLOWLOCATION, 1); - - if (wp->user != NULL) - { -diff a/src/nginx.c b/src/nginx.c ---- a/src/nginx.c -+++ b/src/nginx.c -@@ -141,6 +141,8 @@ static int init (void) - curl_easy_setopt (curl, CURLOPT_URL, url); - } - -+ curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1); -+ - if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0)) - { - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1); -- 2.30.2