From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 23 Nov 2014 14:37:03 +0000 (+0100)
Subject: Refresh bts770683_curl_init.dpatch.
X-Git-Tag: collectd-5.4.1-6^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=73e45c76d72f6bf472d9a42269b8f48df4ac404e;p=pkg-collectd.git

Refresh bts770683_curl_init.dpatch.
---

diff --git a/debian/patches/bts770683_curl_init.dpatch b/debian/patches/bts770683_curl_init.dpatch
index b1f1c42..8529bf4 100755
--- a/debian/patches/bts770683_curl_init.dpatch
+++ b/debian/patches/bts770683_curl_init.dpatch
@@ -13,32 +13,9 @@
 ## DP:
 ## DP: Upstream commits:
 ## DP: https://github.com/katzj/collectd/commit/401fa6e
-## DP: https://github.com/katzj/collectd/commit/50dbebf
 
 @DPATCH@
 
-diff a/src/apache.c b/src/apache.c
---- a/src/apache.c
-+++ b/src/apache.c
-@@ -671,9 +671,18 @@ static int apache_read_host (user_data_t *user_data) /* {{{ */
- 	return (0);
- } /* }}} int apache_read_host */
- 
-+static int apache_init (void) /* {{{ */
-+{
-+	/* Call this while collectd is still single-threaded to avoid
-+	 * initialization issues in libgcrypt. */
-+	curl_global_init (CURL_GLOBAL_SSL);
-+	return (0);
-+} /* }}} int apache_init */
-+
- void module_register (void)
- {
- 	plugin_register_complex_config ("apache", config);
-+	plugin_register_init ("apache", apache_init);
- } /* void module_register */
- 
- /* vim: set sw=8 noet fdm=marker : */
 diff a/src/curl.c b/src/curl.c
 --- a/src/curl.c
 +++ b/src/curl.c