patches: Removed bts535787-powerdns-fix-localsocket.dpatch.

This patch has been included upstream.

diff --git a/debian/changelog b/debian/changelog
index 09b5cea0bce946016722f962ba95bf07fcb6c561..c19f87fbc6b3ebfbfa6afeca61999e98db0ba726 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ collectd (4.8.1-1) unstable; urgency=low
     - Match zero COUNTER values: empty_counter
   * debian/rules:
     - Install contrib/GenericJMX.conf to /usr/share/doc/collectd/examples/.
+  * debian/patches:
+    - Removed bts535787-powerdns-fix-localsocket.dpatch - included upstream.
 
- -- Sebastian Harl <tokkee@debian.org>  Sun, 11 Oct 2009 18:10:37 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 11 Oct 2009 19:11:39 +0200
 
 collectd (4.7.2-1) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index d7c012296a615e5f6d0482fd65d793b57f02c6da..703d4085032ca5034f1ba3a1066ef96607db6748 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -5,6 +5,5 @@ libvirt-reconnect.dpatch
 plugin-fix-unregister.dpatch
 java-fix-jvm-start.dpatch
 bts541953-curl-followlocation.dpatch
-bts535787-powerdns-fix-localsocket.dpatch
 bts542859-df-fix-ignorelist.dpatch
 

diff --git a/debian/patches/bts535787-powerdns-fix-localsocket.dpatch b/debian/patches/bts535787-powerdns-fix-localsocket.dpatch
deleted file mode 100755 (executable)
index c113aad..0000000
--- a/debian/patches/bts535787-powerdns-fix-localsocket.dpatch
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts535787-powerdns-fix-localsocket.dpatch by Luke Heberling
-## <collectd@c-ware.com>
-##
-## DP: powerdns plugin: Fixed handling of the LocalSocket option.
-
-@DPATCH@
-
-diff a/src/powerdns.c b/src/powerdns.c
---- a/src/powerdns.c
-+++ b/src/powerdns.c
-@@ -380,6 +380,18 @@ static int powerdns_get_data_dgram (list_item_t *item, /* {{{ */
-       break;
-     }
- 
-+    struct timeval timeout;
-+    timeout.tv_sec=2;
-+    if (timeout.tv_sec < interval_g * 3 / 4)
-+      timeout.tv_sec = interval_g * 3 / 4;
-+    timeout.tv_usec=0;
-+    status = setsockopt (sd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof (timeout));
-+    if (status != 0)
-+    {
-+      FUNC_ERROR ("setsockopt");
-+      break;
-+    }
-+
-     status = connect (sd, (struct sockaddr *) &item->sockaddr,
-         sizeof (item->sockaddr));
-     if (status != 0)
-@@ -911,11 +923,18 @@ static int powerdns_config (oconfig_item_t *ci) /* {{{ */
-       powerdns_config_add_server (option);
-     else if (strcasecmp ("LocalSocket", option->key) == 0)
-     {
--      char *temp = strdup (option->key);
--      if (temp == NULL)
--        return (1);
--      sfree (local_sockpath);
--      local_sockpath = temp;
-+      if ((option->values_num != 1) || (option->values[0].type != OCONFIG_TYPE_STRING))
-+      {
-+        WARNING ("powerdns plugin: `%s' needs exactly one string argument.", option->key);
-+      }
-+      else
-+      {
-+        char *temp = strdup (option->values[0].value.string);
-+        if (temp == NULL)
-+          return (1);
-+        sfree (local_sockpath);
-+        local_sockpath = temp;
-+      }
-     }
-     else
-     {