[DRE-commits] [ruby-whitewash] 01/01: Add support for Ruby 2.2

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository ruby-whitewash.

commit e0e3e0e4e85177623f8b95875b38083ac5a4127f
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Fri Aug 21 09:58:14 2015 -0300

    Add support for Ruby 2.2
---
 debian/changelog                                  | 13 ++++++-
 debian/compat                                     |  2 +-
 debian/control                                    | 16 +++++---
 debian/patches/0002-add-support-for-ruby2.2.patch | 47 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 5 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61c16c5..d442e0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,15 @@
-ruby-whitewash (2.0-2) unstable; urgency=low
+ruby-whitewash (2.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add support for Ruby 2.2. (Closes: #795207).
+    - Add patch 0002-add-support-for-ruby2.2.patch.
+  * Bump Standards-Version to 3.9.6. No changes were required.
+  * Update Vcs-* fields.
+  * Bump DH compat level to 9.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Fri, 21 Aug 2015 14:24:38 +0200
+
+ruby-whitewash (2.0-2~wip~fourmond1) UNRELEASED; urgency=low
 
   * Team upload.
   * Build with newer gem2deb
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 1b158ee..72ddc99 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,23 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Borodaenko <angdraug at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-rspec, ruby-nokogiri
-Standards-Version: 3.9.3
-Vcs-Git: git://github.com/angdraug/whitewash.git
-Vcs-Browser: https://github.com/angdraug/whitewash
+Build-Depends: debhelper (>= 9~),
+               gem2deb (>= 0.3.0~),
+               ruby-rspec,
+               ruby-nokogiri
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-whitewash.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-whitewash.git
 Homepage: http://samizdat.nongnu.org/
 XS-Ruby-Versions: all
 
 Package: ruby-whitewash
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-nokogiri
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ruby | ruby-interpreter,
+         ruby-nokogiri
 Description: Whitelist-based HTML filter for Ruby
  This module allows Ruby programs to clean up any HTML document or fragment
  coming from an untrusted source and to remove all dangerous constructs that
diff --git a/debian/patches/0002-add-support-for-ruby2.2.patch b/debian/patches/0002-add-support-for-ruby2.2.patch
new file mode 100644
index 0000000..7aee290
--- /dev/null
+++ b/debian/patches/0002-add-support-for-ruby2.2.patch
@@ -0,0 +1,47 @@
+Description: Add support for Ruby 2.2
+Author: Miguel Landaeta <nomadium at debian.org>
+Origin: upstream, https://github.com/tenderlove/syck/issues/9
+Forwarded: no
+Last-Update: 2015-08-21
+
+--- ruby-whitewash-2.0.orig/lib/whitewash.rb
++++ ruby-whitewash-2.0/lib/whitewash.rb
+@@ -17,24 +17,24 @@ class WhitewashError < RuntimeError; end
+ 
+ class Whitewash
+ 
+-  if RUBY_VERSION < '1.9.3'
++#  if RUBY_VERSION < '1.9.3'
+     def Whitewash.load(string)
+       YAML.load(string)
+     end
+ 
+-  else
+-    # use Syck to parse the whitelist until Psych issue #36 is fixed
+-    #
+-    def Whitewash.load(string)
+-      Mutex.new.synchronize do
+-        yamler = YAML::ENGINE.yamler
+-        YAML::ENGINE.yamler = 'syck'
+-        whitelist = YAML.load(string)
+-        YAML::ENGINE.yamler = yamler
+-        whitelist
+-      end
+-    end
+-  end
++#  else
++#    # use Syck to parse the whitelist until Psych issue #36 is fixed
++#    #
++#    def Whitewash.load(string)
++#      Mutex.new.synchronize do
++#        yamler = YAML::ENGINE.yamler
++#        YAML::ENGINE.yamler = 'syck'
++#        whitelist = YAML.load(string)
++#        YAML::ENGINE.yamler = yamler
++#        whitelist
++#      end
++#    end
++#  end
+ 
+   def Whitewash.default_whitelist
+     unless found = PATH.find {|dir| File.readable?(File.join(dir, WHITELIST)) }
diff --git a/debian/patches/series b/debian/patches/series
index b884c58..8634d96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-rename-data-dir-to-ruby-whitewash.patch
+0002-add-support-for-ruby2.2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-whitewash.git