From 70e48e43045e53be72876ccd521ba0b9139b919c Mon Sep 17 00:00:00 2001 From: Jonathan Wiltshire Date: Sun, 1 Jul 2012 12:37:47 +0100 Subject: [PATCH] Diff for NMU version 1.4.7-1.1. --- debian/changelog | 8 ++++++ .../patches/ruby_bindings_format_string.patch | 28 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) create mode 100644 debian/patches/ruby_bindings_format_string.patch diff --git a/debian/changelog b/debian/changelog index eed70be..4d1e443 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +rrdtool (1.4.7-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Add ruby_bindings_format_string.patch to fix FTBFS + (Closes: #676081) + + -- Jonathan Wiltshire Sun, 01 Jul 2012 12:37:47 +0100 + rrdtool (1.4.7-1) unstable; urgency=low * [b59bb994] Merge commit 'upstream/1.4.7' diff --git a/debian/patches/ruby_bindings_format_string.patch b/debian/patches/ruby_bindings_format_string.patch new file mode 100644 index 0000000..e551af0 --- /dev/null +++ b/debian/patches/ruby_bindings_format_string.patch @@ -0,0 +1,28 @@ +Subject: fix format string in Ruby binding +Author: Johannes Brandstätter +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 ab9438e..863055e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ no-rpath-for-perl implicit-decl-fix bts530814-hurd tcl-8.5 +ruby_bindings_format_string.patch -- 2.30.2