Merged branch 'master' of git://git.tokkee.org/pkg-collectd.

diff --git a/debian/changelog b/debian/changelog
index 755197e06c63249c9407545e63bf176c3640560c..c02aacda2fb659176eeac816b1e707b9100b97c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,15 +14,26 @@ collectd (4.7.0-1) unstable; urgency=low
     - Power consumption measurements from "The Energy Detective" (TED): ted
     - System uptime: uptime
   * debian/rules:
-    - Install collectd-{network,unixsock}.py to /usr/share/doc/collectd/
-      examples/.
+    - Install collectd-unixsock.py to /usr/share/doc/collectd/examples/.
     - Pass CPPFLAGS and CFLAGS as arguments to configure instead of setting
       them in the environment - this is the recommended way.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 10 May 2009 19:57:25 +0200
+
+collectd (4.6.3-1) unstable; urgency=low
+
+  * New upstream release.
   * debian/patches:
     - Removed battery_acpi_complain.dpatch - included upstream.
+    - Removed include_empty_files.dpatch - included upstream.
     - Removed ntpd_type_pun_fix.dpatch - included upstream.
+    - Removed rrdtool_uninitialized_fix.dpatch - included upstream.
+    - Added libcollectdclient_static_sstrerror.dpatch to make a private
+      function in libcollectdclient static.
+  * debian/rules:
+    - Install collectd-network.py to /usr/share/doc/collectd/examples/.
 
- -- Sebastian Harl <sh@tokkee.org>  Sun, 10 May 2009 19:57:25 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 02 Jun 2009 22:03:10 +0200
 
 collectd (4.6.2-3) unstable; urgency=low
 

diff --git a/debian/copyright b/debian/copyright
index 1752e1e98e390c20d2a903397754bbad4f8b9fe0..2dde8149c79db7a4717a751eb7f125531d5aa9b3 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -125,7 +125,7 @@ Licenses:
        Copyright © 2006-2007 Florian Forster <octo@verplant.org>
        Copyright © 2006 Anthony Gialluca <tonyabg@charter.net>
        Copyright © 2000-2004 Kern Sibbald
-       Copyright © 1996-99 Andre M. Hedrick <andre@suse.com>
+       Copyright © 1996-1999 Andre M. Hedrick <andre@suse.com>
        License: GNU General Public License
 
        File src/battery.c
@@ -276,7 +276,7 @@ Licenses:
 
        File src/processes.c
        Copyright © 2005 Lyonel Vincent <lyonel@ezix.org>
-       Copyright © 2006-2008 Florian Forster <octo@verplant.org> (Mach code)
+       Copyright © 2006-2008 Florian Forster <octo@verplant.org>
        Copyright © 2008 Oleg King <king2@kaluga.ru>
        Copyright © 2009 Sebastian Harl <sh@tokkee.org>
        License: GNU General Public License
@@ -321,6 +321,7 @@ Licenses:
        Copyright © 2005 Niki W. Waibel <niki.waibel@newlogic.com>
        Copyright © 2005-2007 Florian Forster <octo@verplant.org>
        Copyright © 2008 Oleg King <king2@kaluga.ru>
+       License: GNU General Public License
 
        File src/utils_ignorelist.c
        Copyright © 2006 Lubos Stanek <lubek@users.sourceforge.net>

diff --git a/debian/patches/00list b/debian/patches/00list
index 0ae5976899d1d54db022d920730ac0efa12cd024..eb3c26b1bac22ee8da84528c2d25be9481683487 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,4 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
-include_empty_files.dpatch
-rrdtool_uninitialized_fix.dpatch
+libcollectdclient_static_sstrerror.dpatch
 

diff --git a/debian/patches/include_empty_files.dpatch b/debian/patches/include_empty_files.dpatch
deleted file mode 100755 (executable)
index cf6d673..0000000
--- a/debian/patches/include_empty_files.dpatch
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## include_empty_files.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: configfile.c: Fixed Include'ing empty files.
-## DP:
-## DP: When including empty files, a typo prevented that the "Include" child
-## DP: (of the config parse tree) was removed correctly, leaving behind
-## DP: garbage which in turn led to a segfault if the Include option was not
-## DP: the last element of the config file.
-## DP:
-## DP: Also, another Include option following the inclusion of an empty file
-## DP: used to be ignored. This has been fixed as well.
-
-@DPATCH@
-
-diff a/src/configfile.c b/src/configfile.c
---- a/src/configfile.c
-+++ b/src/configfile.c
-@@ -378,12 +378,12 @@ static int cf_ci_replace_child (oconfig_item_t *dst, oconfig_item_t *src,
-       temp = NULL;
- 
-       /* If (src->children_num == 0) the array size is decreased. If offset
--       * is _not_ the last element, (offset < (src->children_num - 1)), then
-+       * is _not_ the last element, (offset < (dst->children_num - 1)), then
-        * we need to move the trailing elements before resizing the array. */
--      if ((src->children_num == 0) && (offset < (src->children_num - 1)))
-+      if ((src->children_num == 0) && (offset < (dst->children_num - 1)))
-       {
--              int nmemb = src->children_num - (offset + 1);
--              memmove (src->children + offset, src->children + offset + 1,
-+              int nmemb = dst->children_num - (offset + 1);
-+              memmove (dst->children + offset, dst->children + offset + 1,
-                               sizeof (oconfig_item_t) * nmemb);
-       }
- 
-@@ -415,7 +415,7 @@ static int cf_ci_replace_child (oconfig_item_t *dst, oconfig_item_t *src,
-                               sizeof (oconfig_item_t) * nmemb);
-       }
- 
--      /* Last but not least: If there are new childrem, copy them to the
-+      /* Last but not least: If there are new children, copy them to the
-        * memory reserved for them. */
-       if (src->children_num > 0)
-       {
-@@ -491,6 +491,9 @@ static int cf_include_all (oconfig_item_t *root, int depth)
-               /* Now replace the i'th child in `root' with `new'. */
-               cf_ci_replace_child (root, new, i);
- 
-+              /* ... and go back to the new i'th child. */
-+              --i;
-+
-               sfree (new->values);
-               sfree (new);
-       } /* for (i = 0; i < root->children_num; i++) */

diff --git a/debian/patches/libcollectdclient_static_sstrerror.dpatch b/debian/patches/libcollectdclient_static_sstrerror.dpatch
new file mode 100755 (executable)
index 0000000..e638089
--- /dev/null
+++ b/debian/patches/libcollectdclient_static_sstrerror.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## libcollectdclient_static_sstrerror.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: libcollectdclient/client.c: Made sstrerror() static.
+## DP:
+## DP: This is a private helper function only.
+
+@DPATCH@
+
+diff a/src/libcollectdclient/client.c b/src/libcollectdclient/client.c
+--- a/src/libcollectdclient/client.c
++++ b/src/libcollectdclient/client.c
+@@ -121,7 +121,7 @@ typedef struct lcc_response_s lcc_response_t;
+ /* Even though Posix requires "strerror_r" to return an "int",
+  * some systems (e.g. the GNU libc) return a "char *" _and_
+  * ignore the second argument ... -tokkee */
+-char *sstrerror (int errnum, char *buf, size_t buflen)
++static char *sstrerror (int errnum, char *buf, size_t buflen)
+ {
+   buf[0] = 0;
+ 

diff --git a/debian/patches/rrdtool_uninitialized_fix.dpatch b/debian/patches/rrdtool_uninitialized_fix.dpatch
deleted file mode 100755 (executable)
index 1f13a41..0000000
--- a/debian/patches/rrdtool_uninitialized_fix.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## rrdtool_uninitialized_fix.dpatch by Florian Forster <octo@verplant.org>
-##
-## DP: rrdtool plugin: Make absolutely sure two local variables are
-## DP: initialized.
-
-@DPATCH@
-
-diff a/src/rrdtool.c b/src/rrdtool.c
---- a/src/rrdtool.c
-+++ b/src/rrdtool.c
-@@ -624,6 +624,9 @@ static void *rrd_queue_thread (void *data)
-               int    status;
-               int    i;
- 
-+              values = NULL;
-+              values_num = 0;
-+
-                 pthread_mutex_lock (&queue_lock);
-                 /* Wait for values to arrive */
-                 while (true)