diff -Nru ruby-rails-html-sanitizer-1.0.3/debian/changelog ruby-rails-html-sanitizer-1.0.4/debian/changelog
--- ruby-rails-html-sanitizer-1.0.3/debian/changelog 2016-03-05 03:25:14.000000000 +0000
+++ ruby-rails-html-sanitizer-1.0.4/debian/changelog 2018-03-23 12:42:07.000000000 +0000
@@ -1,3 +1,21 @@
+ruby-rails-html-sanitizer (1.0.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/compat: Bump debhelper compatibility level to 11.
+ * debian/control:
+ - Bump required debhelper version to >= 11~.
+ - Bump Standards-Version to 4.1.3 (no changes needed).
+ - Use salsa.debian.org in Vcs-* fields.
+ - Add myself as Uploader.
+ - Require ruby-loofah >= 2.2.2~.
+ * debian/copyright:
+ - Use HTTPS in link to copyright format specification.
+ - Add missing Debian packaging authors.
+ * debian/patches: Drop patch to skip failing specs, fixed upstream.
+ * debian/watch: Use version 4 and HTTPS in link to gemwatch service.
+
+ -- Georg Faerber Fri, 23 Mar 2018 13:42:07 +0100
+
ruby-rails-html-sanitizer (1.0.3-2) unstable; urgency=medium
* Team upload.
diff -Nru ruby-rails-html-sanitizer-1.0.3/debian/compat ruby-rails-html-sanitizer-1.0.4/debian/compat
--- ruby-rails-html-sanitizer-1.0.3/debian/compat 2016-03-05 03:25:14.000000000 +0000
+++ ruby-rails-html-sanitizer-1.0.4/debian/compat 2018-03-23 12:42:07.000000000 +0000
@@ -1 +1 @@
-9
+11
diff -Nru ruby-rails-html-sanitizer-1.0.3/debian/control ruby-rails-html-sanitizer-1.0.4/debian/control
--- ruby-rails-html-sanitizer-1.0.3/debian/control 2016-03-05 03:25:14.000000000 +0000
+++ ruby-rails-html-sanitizer-1.0.4/debian/control 2018-03-23 12:42:07.000000000 +0000
@@ -2,15 +2,16 @@
Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers
-Uploaders: Balasankar C
-Build-Depends: debhelper (>= 9~),
+Uploaders: Balasankar C ,
+ Georg Faerber
+Build-Depends: debhelper (>= 11~),
gem2deb,
- ruby-loofah,
+ ruby-loofah (>= 2.2.2~),
ruby-minitest,
ruby-rails
-Standards-Version: 3.9.7
-Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-rails-html-sanitizer.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-rails-html-sanitizer.git
+Standards-Version: 4.1.3
+Vcs-Git: https://salsa.debian.org/ruby-team/ruby-rails-html-sanitizer.git
+Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-rails-html-sanitizer
Homepage: https://github.com/rafaelfranca/rails-html-sanitizer
Testsuite: autopkgtest-pkg-ruby
XS-Ruby-Versions: all
@@ -19,7 +20,7 @@
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ruby | ruby-interpreter,
- ruby-loofah,
+ ruby-loofah (>= 2.2.2~),
${misc:Depends},
${shlibs:Depends}
Description: HTML sanitization for Rails applications
diff -Nru ruby-rails-html-sanitizer-1.0.3/debian/copyright ruby-rails-html-sanitizer-1.0.4/debian/copyright
--- ruby-rails-html-sanitizer-1.0.3/debian/copyright 2016-03-05 03:25:14.000000000 +0000
+++ ruby-rails-html-sanitizer-1.0.4/debian/copyright 2018-03-23 12:42:07.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: rails-html-sanitizer
Source: https://github.com/rails/rails-html-sanitizer
@@ -8,7 +8,11 @@
License: Expat
Files: debian/*
-Copyright: 2015 Balasankar C
+Copyright: 2018 Georg Faerber
+ 2016 Christian Hofstaedtler
+ 2016 Cédric Boutillier
+ 2016 Antonio Terceiro
+ 2015 Balasankar C
License: Expat
Comment: the Debian packaging is licensed under the same terms as the original package.
diff -Nru ruby-rails-html-sanitizer-1.0.3/debian/patches/0001-Skip-some-tests-under-Debian.patch ruby-rails-html-sanitizer-1.0.4/debian/patches/0001-Skip-some-tests-under-Debian.patch
--- ruby-rails-html-sanitizer-1.0.3/debian/patches/0001-Skip-some-tests-under-Debian.patch 2016-03-05 03:25:14.000000000 +0000
+++ ruby-rails-html-sanitizer-1.0.4/debian/patches/0001-Skip-some-tests-under-Debian.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-From: Antonio Terceiro
-Date: Tue, 26 Jan 2016 19:54:52 -0200
-Subject: Skip some tests under Debian
-
-I suspect that those tests actually rely on the behavior of Nokogiri's
-patched libxml2, which is not used in Debian.
----
- test/sanitizer_test.rb | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/test/sanitizer_test.rb b/test/sanitizer_test.rb
-index f72b702..8123127 100644
---- a/test/sanitizer_test.rb
-+++ b/test/sanitizer_test.rb
-@@ -58,10 +58,12 @@ class SanitizersTest < Minitest::Test
- end
-
- def test_strip_invalid_html
-+ skip "test skipped in the Debian build"
- assert_equal "", full_sanitize("<<")
- end
-
-@@ -123,6 +126,7 @@ class SanitizersTest < Minitest::Test
- end
-
- def test_strip_links_with_tags_in_tags
-+ skip "test skipped in the Debian build"
- expected = "a href='hello'>all day long/a>"
- input = "<a href='hello'>all day long</a>"
- assert_equal expected, link_sanitize(input)
-@@ -360,6 +364,7 @@ class SanitizersTest < Minitest::Test
- end
-
- def test_should_sanitize_script_tag_with_multiple_open_brackets
-+ skip "test skipped in the Debian build"
- assert_sanitized %(<), "alert(\"XSS\");//"
- assert_sanitized %(
")
end
- def test_strip_tags_with_many_open_quotes
- assert_equal "", full_sanitize("<<")
+ def test_escape_tags_with_many_open_quotes
+ assert_equal "<<", full_sanitize("<<")
end
def test_strip_tags_with_sentence
@@ -123,7 +125,7 @@
end
def test_strip_links_with_tags_in_tags
- expected = "a href='hello'>all day long/a>"
+ expected = "<a href='hello'>all day long</a>"
input = "<a href='hello'>all day long</a>"
assert_equal expected, link_sanitize(input)
end
@@ -360,7 +362,7 @@
end
def test_should_sanitize_script_tag_with_multiple_open_brackets
- assert_sanitized %(<), "alert(\"XSS\");//"
+ assert_sanitized %(<), "<alert(\"XSS\");//<"
assert_sanitized %(