[DRE-commits] [SCM] ruby-tioga.git branch, master, updated. debian/1.14-1-1-g0dced49

[Vincent Fourmond]

The following commit has been merged in the master branch:
commit 0dced4919089a232d47fac6a3b1636a24c66d103
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Wed Jun 6 21:32:57 2012 +0200

    Fix FTBS with new build-hardening flags

diff --git a/debian/changelog b/debian/changelog
index 5dc8850..feff441 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-tioga (1.14-2) unstable; urgency=low
+
+  * Include fix-formats.diff to avoid passing to a printf-like function
+    unprotected strings (closes: #676193)
+  * Conforms to standards 3.9.3
+
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 06 Jun 2012 21:33:34 +0200
+
 ruby-tioga (1.14-1) unstable; urgency=low
 
   * New upstream version; now works correctly with ruby1.9.1
diff --git a/debian/control b/debian/control
index c7c11a6..351b774 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.ali
 Build-Depends: debhelper (>= 7.0.50~), ruby1.8-dev, ruby1.8, zlib1g-dev,
                rdoc1.8, libfftw3-dev, ruby1.9.1, ruby1.9.1-dev,
                gem2deb (>= 0.2.4~)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://tioga.rubyforge.org
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-tioga.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-tioga.git;a=summary
diff --git a/debian/patches/fix-formats.diff b/debian/patches/fix-formats.diff
new file mode 100644
index 0000000..a54abcc
--- /dev/null
+++ b/debian/patches/fix-formats.diff
@@ -0,0 +1,13 @@
+Index: ruby-tioga/ext/Tioga/FigureMaker/generic.c
+===================================================================
+--- ruby-tioga.orig/ext/Tioga/FigureMaker/generic.c	2011-06-06 22:10:38.486522584 +0200
++++ ruby-tioga/ext/Tioga/FigureMaker/generic.c	2012-06-06 21:29:57.131034110 +0200
+@@ -115,7 +115,7 @@
+ 
+ void GIVE_WARNING(const char *fmt, const char *str) { rb_warn(fmt,str); }
+ 
+-void RAISE_ERROR(char *str, int *ierr) { *ierr = -1; rb_raise(rb_eArgError,str); }
++void RAISE_ERROR(char *str, int *ierr) { *ierr = -1; rb_raise(rb_eArgError,"%s", str); }
+ 
+ #define err_buff_len 256
+ void RAISE_ERROR_s(char *fmt, char *s, int *ierr) {
diff --git a/debian/patches/series b/debian/patches/series
index 1de31aa..2d83d66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable-require-rubygems.diff
+fix-formats.diff

-- 
ruby-tioga.git