[DRE-commits] [SCM] ruby-nokogiri.git branch, master, updated. debian/1.5.2-1-7-g3cae42d

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 1bf4ea21b82075bd1d26c08116dc9c6072136b2a
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sat Jun 9 16:20:46 2012 +0200

     drop fix-sporadically-failing-tests.patch; add fix-format-security-issue.patch

diff --git a/debian/patches/fix-format-security-issue.patch b/debian/patches/fix-format-security-issue.patch
new file mode 100644
index 0000000..d8a15ad
--- /dev/null
+++ b/debian/patches/fix-format-security-issue.patch
@@ -0,0 +1,22 @@
+From: Mike Dalessio <mike at csa.net>
+Subject: Fix format string security issue (Closes #676207)
+Origin: https://github.com/tenderlove/nokogiri/commit/786a42c87c3fbd7eb3c315f713414c5d5f58db74
+Bug: https://github.com/tenderlove/nokogiri/issues/680
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676207
+Last-Update: 2012-06-07
+
+---
+ ext/nokogiri/xml_xpath_context.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/ext/nokogiri/xml_xpath_context.c
++++ b/ext/nokogiri/xml_xpath_context.c
+@@ -190,7 +190,7 @@
+   vasprintf(&message, msg, args);
+   va_end(args);
+ 
+-  rb_raise(rb_eRuntimeError, message);
++  rb_raise(rb_eRuntimeError, "%s", message);
+ }
+ 
+ /*
diff --git a/debian/patches/fix-sporadically-failing-tests.patch b/debian/patches/fix-sporadically-failing-tests.patch
deleted file mode 100644
index 1a89af2..0000000
--- a/debian/patches/fix-sporadically-failing-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fixing spec that fails sporadically on libxml 2.7.8 and later.
-From: Mike Dalessio <mike at csa.net>
-Bug: https://github.com/tenderlove/nokogiri/issues/626
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661690
-Origin: https://github.com/tenderlove/nokogiri/commit/1ea45940a1ebd78749485d8928d89720db586b3b
----
- test/xml/test_document.rb |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
---- a/test/xml/test_document.rb
-+++ b/test/xml/test_document.rb
-@@ -358,13 +358,17 @@
-       def test_subclass_parse
-         klass = Class.new(Nokogiri::XML::Document)
-         doc = klass.parse(File.read(XML_FILE))
--        assert_equal @xml.to_s, doc.to_s
-+        # lame hack uses root to avoid comparing DOCTYPE tags which can appear out of order.
-+        # I should really finish lorax and use that here.
-+        assert_equal @xml.root.to_s, doc.root.to_s
-         assert_instance_of klass, doc
-       end
- 
-       def test_document_parse_method
-         xml = Nokogiri::XML::Document.parse(File.read(XML_FILE))
--        assert_equal @xml.to_s, xml.to_s
-+        # lame hack uses root to avoid comparing DOCTYPE tags which can appear out of order.
-+        # I should really finish lorax and use that here.
-+        assert_equal @xml.root.to_s, xml.root.to_s
-       end
- 
-       def test_encoding=
diff --git a/debian/patches/series b/debian/patches/series
index 673598b..7398354 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 remove-annoying-warning.patch
 no-require-rubygems.patch
-fix-sporadically-failing-tests.patch
+fix-format-security-issue.patch

-- 
ruby-nokogiri.git