From b20eedb4483465dfba36a160d3f642399e28c06f Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Tue, 2 Jun 2009 21:08:55 +0200 Subject: [PATCH] patches: Removed include_empty_files.dpatch. This patch has been included upstream. --- debian/changelog | 3 +- debian/patches/00list | 1 - debian/patches/include_empty_files.dpatch | 54 ----------------------- 3 files changed, 2 insertions(+), 56 deletions(-) delete mode 100755 debian/patches/include_empty_files.dpatch diff --git a/debian/changelog b/debian/changelog index 6a4327b..0b8d183 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,10 +3,11 @@ 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. * debian/rules: - Install collectd-network.py to /usr/share/doc/collectd/examples/. - -- Sebastian Harl Tue, 02 Jun 2009 21:06:02 +0200 + -- Sebastian Harl Tue, 02 Jun 2009 21:08:34 +0200 collectd (4.6.2-3) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 14eaad5..d28f1dc 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,6 +1,5 @@ rrd_filter_path.dpatch collection_conf_path.dpatch ntpd_type_pun_fix.dpatch -include_empty_files.dpatch rrdtool_uninitialized_fix.dpatch diff --git a/debian/patches/include_empty_files.dpatch b/debian/patches/include_empty_files.dpatch deleted file mode 100755 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 -## -## 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++) */ -- 2.30.2