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

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit e8961f992c56e3c1580a2ebb383ade258294df3f
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Jun 15 00:27:13 2012 +0200

    Drop fix-format-security-issue.patch: included upstream

diff --git a/debian/patches/fix-format-security-issue.patch b/debian/patches/fix-format-security-issue.patch
deleted file mode 100644
index d8a15ad..0000000
--- a/debian/patches/fix-format-security-issue.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/series b/debian/patches/series
index 7398354..816b918 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 remove-annoying-warning.patch
 no-require-rubygems.patch
-fix-format-security-issue.patch

-- 
ruby-nokogiri.git