[DRE-commits] [SCM] ruby-xmlparser.git branch, master, updated. upstream/0.7.2-8-gc4b2d92

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit c4b2d92a653c96041f91db86ec9febc06c25f5b9
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Jun 22 18:24:07 2012 +0200

    Merge NMU changes for 0.7.2-1.1 by Gregor Herrman

diff --git a/debian/changelog b/debian/changelog
index bedbe60..76b3e11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-xmlparser (0.7.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: xmlparser.c:1783:2: error: format not a string literal
+    and no format arguments [-Werror=format-security]": add patch
+    xmlparser-ftbfs-fix.patch from Andreas Stührk (adds format strings).
+    (Closes: #676194)
+
+ -- gregor herrmann <gregoa at debian.org>  Fri, 22 Jun 2012 16:52:46 +0200
+
 ruby-xmlparser (0.7.2-1) unstable; urgency=low
 
   * Switch to gem2deb-based packaging.
diff --git a/debian/patches/series b/debian/patches/series
index 3703a0d..939b7e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 replaces_gt_symbol_by_enconded_version.patch
 move-files-to-ext.patch
+xmlparser-ftbfs-fix.patch
diff --git a/debian/patches/xmlparser-ftbfs-fix.patch b/debian/patches/xmlparser-ftbfs-fix.patch
new file mode 100644
index 0000000..2fe2772
--- /dev/null
+++ b/debian/patches/xmlparser-ftbfs-fix.patch
@@ -0,0 +1,20 @@
+--- ruby-xmlparser-0.7.2.orig/ext/xmlparser.c
++++ ruby-xmlparser-0.7.2/ext/xmlparser.c
+@@ -1780,7 +1780,7 @@ XMLParser_parse(int argc, VALUE* argv, V
+       if (!ret) {
+ 	int err = XML_GetErrorCode(parser->parser);
+ 	const char* errStr = XML_ErrorString(err);
+-	rb_raise(eXMLParserError, (char*)errStr);
++	rb_raise(eXMLParserError, "%s", errStr);
+       }
+     } while (!NIL_P(buf));
+     return Qnil;
+@@ -1829,7 +1829,7 @@ XMLParser_parse(int argc, VALUE* argv, V
+   if (!ret) {
+     int err = XML_GetErrorCode(parser->parser);
+     const char* errStr = XML_ErrorString(err);
+-    rb_raise(eXMLParserError, (char*)errStr);
++    rb_raise(eXMLParserError, "%s", errStr);
+   }
+ 
+   return Qnil;

-- 
ruby-xmlparser.git