[DRE-commits] [SCM] ruby-fast-gettext.git branch, master, updated. upstream/0.6.2-13-g01abae5

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit 01abae556e21741a2ec9e0c41b4cf0b3f2dcdf26
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Tue Nov 1 16:09:26 2011 +0300

    really delete the untaint patch

diff --git a/debian/patches/0002-untaint-relative-file-path.patch b/debian/patches/0002-untaint-relative-file-path.patch
deleted file mode 100644
index a7271e2..0000000
--- a/debian/patches/0002-untaint-relative-file-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Dmitry Borodaenko <angdraug at debian.org>
-Date: Sun, 25 Sep 2011 19:09:24 +0300
-Subject: untaint relative file path
-
-path itself is not tainted or the preceding exists? would have raised
-SecurityError, so a file beneath it can be trusted, too
----
- lib/fast_gettext/translation_repository/base.rb |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/fast_gettext/translation_repository/base.rb b/lib/fast_gettext/translation_repository/base.rb
-index b61b6df..3c80cc4 100644
---- a/lib/fast_gettext/translation_repository/base.rb
-+++ b/lib/fast_gettext/translation_repository/base.rb
-@@ -38,7 +38,7 @@ module FastGettext
-         @files = {}
-         Dir[File.join(path,'*')].each do |locale_folder|
-           next unless File.basename(locale_folder) =~ LOCALE_REX
--          file = File.join(locale_folder,relative_file_path)
-+          file = File.join(locale_folder,relative_file_path).untaint
-           next unless File.exist? file
-           locale = File.basename(locale_folder)
-           @files[locale] = yield(locale,file)
--- 

-- 
ruby-fast-gettext.git