[DRE-commits] [SCM] ruby-locale.git branch, master, updated. upstream/2.0.5-6-gde14d4f

[Hleb Valoshka]

The following commit has been merged in the master branch:
commit 61996db093ddcb146c0e7ea555d15aa26be20d5e
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Thu Mar 15 21:45:39 2012 +0300

    Fix SecurityError under ruby1.9.1 and $SAFE>=1

diff --git a/debian/patches/fix-untainted-path-under-safe-1 b/debian/patches/fix-untainted-path-under-safe-1
new file mode 100644
index 0000000..0a362dd
--- /dev/null
+++ b/debian/patches/fix-untainted-path-under-safe-1
@@ -0,0 +1,11 @@
+--- a/lib/locale.rb
++++ b/lib/locale.rb
+@@ -29,7 +29,7 @@
+ 
+   module_function
+   def require_driver(name)  #:nodoc:
+-    require File.join(ROOT, "locale/driver", name.to_s)
++    require File.join(ROOT, "locale/driver", name.to_s).untaint
+   end
+ 
+   def create_language_tag(tag)  #:nodoc:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..689145b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-untainted-path-under-safe-1

-- 
ruby-locale.git