Merged branch 'pkg/deb/master' of github.com/alindobre/rrdtool-1.x.

diff --git a/debian/patches/bts664724-rrdcached-j-segfault b/debian/patches/bts664724-rrdcached-j-segfault
deleted file mode 100644 (file)
index 37f7548..0000000
--- a/debian/patches/bts664724-rrdcached-j-segfault
+++ /dev/null
@@ -1,31 +0,0 @@
-diff a/src/rrd_daemon.c b/src/rrd_daemon.c
---- a/src/rrd_daemon.c
-+++ b/src/rrd_daemon.c
-@@ -3090,8 +3090,7 @@ static int read_options (int argc, char **argv) /* {{{ */
-       case 'j':
-       {
-         char journal_dir_actual[PATH_MAX];
--        const char *dir;
--        dir = journal_dir = strdup(realpath((const char *)optarg, journal_dir_actual));
-+        const char *dir = (const char *)optarg;
- 
-         status = rrd_mkdir_p(dir, 0777);
-         if (status != 0)
-@@ -3100,8 +3099,16 @@ static int read_options (int argc, char **argv) /* {{{ */
-               dir, rrd_strerror(errno));
-           return 6;
-         }
-+        journal_dir = realpath((const char *)dir, journal_dir_actual);
-+        if (! journal_dir) {
-+          fprintf(stderr, "Failed to canonicalize journal directory '%s': %s\n",
-+              dir, rrd_strerror(errno));
-+          return 6;
-+        }
-+
-+        journal_dir = strdup(journal_dir);
- 
--        if (access(dir, R_OK|W_OK|X_OK) != 0)
-+        if (access(journal_dir, R_OK|W_OK|X_OK) != 0)
-         {
-           fprintf(stderr, "Must specify a writable directory with -j! (%s)\n",
-                   errno ? rrd_strerror(errno) : "");

diff --git a/debian/patches/ruby_bindings_format_string.patch b/debian/patches/ruby_bindings_format_string.patch
deleted file mode 100644 (file)
index e551af0..0000000
--- a/debian/patches/ruby_bindings_format_string.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Subject: fix format string in Ruby binding
-Author: Johannes Brandstätter <jbrandstaetter@gmail.com>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676081
-Forwarded: no
-Last-Update: 2012-07-01
-
---- rrdtool-1.4.7.orig/bindings/ruby/main.c
-+++ rrdtool-1.4.7/bindings/ruby/main.c
-@@ -27,7 +27,7 @@
- 
- #define RRD_CHECK_ERROR  \
-     if (rrd_test_error()) \
--      rb_raise(rb_eRRDError, rrd_get_error()); \
-+      rb_raise(rb_eRRDError, "%s", rrd_get_error()); \
-     rrd_clear_error();
- 
- string_arr string_arr_new(
-@@ -56,8 +56,8 @@
-             break;
-         default:
-             rb_raise(rb_eTypeError,
--                     "invalid argument - %s, expected T_STRING or T_FIXNUM on index %ld",
--                     (long)rb_class2name(CLASS_OF(v)), i);
-+                     "invalid argument - %s, expected T_STRING or T_FIXNUM on index %d",
-+                     rb_class2name(CLASS_OF(v)), i);
-             break;
-         }
-     }

diff --git a/debian/patches/series b/debian/patches/series
index 0420162b2a0c339ae8d3b7d6a6564377db1e67f6..32223097c378c816926d5e3e5611cfd7d9a79d43 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,4 @@ no-rpath-for-ruby
 no-rpath-for-perl
 implicit-decl-fix
 bts530814-hurd
-tcl-8.5
-ruby_bindings_format_string.patch
-bts664724-rrdcached-j-segfault
 CVE-2013-2131

diff --git a/debian/patches/tcl-8.5 b/debian/patches/tcl-8.5
deleted file mode 100644 (file)
index a84798b..0000000
--- a/debian/patches/tcl-8.5
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/bindings/tcl/tclrrd.c b/bindings/tcl/tclrrd.c
---- a/bindings/tcl/tclrrd.c
-+++ b/bindings/tcl/tclrrd.c
-@@ -678,7 +678,7 @@ static int init(
-     if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL)
-         return TCL_ERROR;
- 
--    if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) {
-+    if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) {
-         return TCL_ERROR;
-     }
- 

diff --git a/debian/rrdtool-tcl.install b/debian/rrdtool-tcl.install
index bdee4cb79310e2cd9c401137b7ae41c3ba2ad867..11a98e496e61d584ac428ac4e4b6402521eb6f04 100644 (file)
--- a/debian/rrdtool-tcl.install
+++ b/debian/rrdtool-tcl.install
@@ -1,2 +1,2 @@
 usr/lib/tcl* usr/lib/tcltk/rrdtool-tcl/
-usr/lib/rrdtool/pkgIndex.tcl usr/lib/tcltk/rrdtool-tcl/
+usr/share/rrdtool/pkgIndex.tcl usr/lib/tcltk/rrdtool-tcl/

diff --git a/debian/rrdtool.install b/debian/rrdtool.install
index facb917c4e0fdf4346e10177eaf702c2a47d2ef5..68a0eb59dcd93a01a17a6e898afdf87faf57f4cb 100644 (file)
--- a/debian/rrdtool.install
+++ b/debian/rrdtool.install
@@ -1,6 +1,6 @@
 usr/share/doc/rrdtool
 usr/bin
-usr/lib/rrdtool/ifOctets.tcl usr/share/doc/rrdtool/examples/
+usr/share/rrdtool/ifOctets.tcl usr/share/doc/rrdtool/examples/
 usr/share/man/man1
 usr/share/man/man3/librrd.3
 usr/share/rrdtool/examples/*.cgi usr/share/doc/rrdtool/examples/