patches: Added libcollectdclient_static_sstrerror.dpatch.

This patch makes a private function in libcollectdclient static.

diff --git a/debian/changelog b/debian/changelog
index 2991c1a13ebbf9901f2863e8e85d92894a6489ec..bcbe7eedc2119b575cc762a34348011029fa044c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,12 @@ collectd (4.6.3-1) unstable; urgency=low
     - 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 <tokkee@debian.org>  Tue, 02 Jun 2009 21:14:21 +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/patches/00list b/debian/patches/00list
index 332b35c8333c22b54c6ead8e9d0f6750c3bfbc7f..eb3c26b1bac22ee8da84528c2d25be9481683487 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
+libcollectdclient_static_sstrerror.dpatch
 

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;
+