diff -pruN 2.0.3-1/debian/changelog 2.0.3-2/debian/changelog --- 2.0.3-1/debian/changelog 2021-02-10 21:42:00.000000000 +0000 +++ 2.0.3-2/debian/changelog 2022-01-20 14:29:29.000000000 +0000 @@ -1,3 +1,17 @@ +ruby-fast-gettext (2.0.3-2) unstable; urgency=medium + + [ Debian Janitor ] + * Remove constraints unnecessary since buster: + + Build-Depends: Drop versioned constraint on ruby-rspec. + + [ Utkarsh Gupta ] + * Drop the patch related to tainting. + * Add patch to fix FTBFS. (Closes: #1002103) + * Add patch to use update over update_attributes. + * Add myself as an uploader. + + -- Utkarsh Gupta Thu, 20 Jan 2022 19:59:29 +0530 + ruby-fast-gettext (2.0.3-1) unstable; urgency=medium [ Utkarsh Gupta ] diff -pruN 2.0.3-1/debian/control 2.0.3-2/debian/control --- 2.0.3-1/debian/control 2021-02-10 21:42:00.000000000 +0000 +++ 2.0.3-2/debian/control 2022-01-20 14:29:29.000000000 +0000 @@ -2,12 +2,13 @@ Source: ruby-fast-gettext Section: ruby Priority: optional Maintainer: Debian Ruby Team -Uploaders: Dmitry Borodaenko +Uploaders: Dmitry Borodaenko , + Utkarsh Gupta Build-Depends: debhelper-compat (= 13), gem2deb, ruby-activerecord, ruby-i18n, - ruby-rspec (>= 3), + ruby-rspec, ruby-sqlite3 Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/ruby-team/ruby-fast-gettext.git diff -pruN 2.0.3-1/debian/patches/0001-skip-safe-mode-test.patch 2.0.3-2/debian/patches/0001-skip-safe-mode-test.patch --- 2.0.3-1/debian/patches/0001-skip-safe-mode-test.patch 2021-02-10 21:37:01.000000000 +0000 +++ 2.0.3-2/debian/patches/0001-skip-safe-mode-test.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: Dmitry Borodaenko -Date: Sun, 8 Jan 2012 16:00:44 +0300 -Subject: skip safe mode test - -This test produces a false negative when run under /tmp, making it -impossible to build this package with cowbuilder and the like. ---- - spec/fast_gettext/translation_repository/mo_spec.rb | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/spec/fast_gettext/translation_repository/mo_spec.rb b/spec/fast_gettext/translation_repository/mo_spec.rb -index a7a31d1..cc54944 100644 ---- a/spec/fast_gettext/translation_repository/mo_spec.rb -+++ b/spec/fast_gettext/translation_repository/mo_spec.rb -@@ -52,10 +52,4 @@ describe 'FastGettext::TranslationRepository::Mo' do - rep['car'].should == 'Test'#just check it is loaded correctly - rep.pluralisation_rule.call(2).should == 3 - end -- -- it "can work in SAFE mode" do -- pending_if RUBY_VERSION > "2.0" do -- `ruby spec/cases/safe_mode_can_handle_locales.rb 2>&1`.should == 'true' -- end -- end - end diff -pruN 2.0.3-1/debian/patches/drop-taint-checking-mechanism.patch 2.0.3-2/debian/patches/drop-taint-checking-mechanism.patch --- 2.0.3-1/debian/patches/drop-taint-checking-mechanism.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.3-2/debian/patches/drop-taint-checking-mechanism.patch 2022-01-20 14:28:53.000000000 +0000 @@ -0,0 +1,63 @@ +From 081e2eebd252583890e8703b4706024d49e730ef Mon Sep 17 00:00:00 2001 +From: Aleksei Lipniagov +Date: Wed, 25 Aug 2021 15:29:02 +0300 +Subject: [PATCH] Drop taint checking mechanism related code + +Taint checking has been deprecated in +https://bugs.ruby-lang.org/issues/16131. As the result, this gems and +other gems using it (`gettext_i18n_rails`) produce too many noise +warning on Ruby 3 builds. We consider follow the deprecation of the +taint checking logic. +--- + lib/fast_gettext/translation_repository/base.rb | 2 +- + spec/cases/safe_mode_can_handle_locales.rb | 5 ----- + spec/fast_gettext/translation_repository/merge_spec.rb | 5 ----- + spec/fast_gettext/translation_repository/mo_spec.rb | 5 ----- + 4 files changed, 1 insertion(+), 16 deletions(-) + delete mode 100644 spec/cases/safe_mode_can_handle_locales.rb + +--- a/lib/fast_gettext/translation_repository/base.rb ++++ b/lib/fast_gettext/translation_repository/base.rb +@@ -47,7 +47,7 @@ + Dir[File.join(path, '*')].each do |locale_folder| + next unless File.basename(locale_folder) =~ LOCALE_REX + +- file = File.join(locale_folder, relative_file_path).untaint ++ file = File.join(locale_folder, relative_file_path) + next unless File.exist? file + + locale = File.basename(locale_folder) +--- a/spec/cases/safe_mode_can_handle_locales.rb ++++ /dev/null +@@ -1,5 +0,0 @@ +-$LOAD_PATH.unshift 'lib' +-require 'fast_gettext' +-$SAFE = 1 +-rep = FastGettext::TranslationRepository.build('safe_test',:path=>File.join('spec','locale')) +-print rep.is_a?(FastGettext::TranslationRepository::Mo) +--- a/spec/fast_gettext/translation_repository/merge_spec.rb ++++ b/spec/fast_gettext/translation_repository/merge_spec.rb +@@ -137,10 +137,4 @@ + end + end + end +- +- it "can work in SAFE mode" do +- pending_if RUBY_VERSION > "2.0" do +- `ruby spec/cases/safe_mode_can_handle_locales.rb 2>&1`.should == 'true' +- end +- end + end +--- a/spec/fast_gettext/translation_repository/mo_spec.rb ++++ b/spec/fast_gettext/translation_repository/mo_spec.rb +@@ -52,10 +52,4 @@ + rep['car'].should == 'Test'#just check it is loaded correctly + rep.pluralisation_rule.call(2).should == 3 + end +- +- it "can work in SAFE mode" do +- pending_if RUBY_VERSION > "2.0" do +- `ruby spec/cases/safe_mode_can_handle_locales.rb 2>&1`.should == 'true' +- end +- end + end diff -pruN 2.0.3-1/debian/patches/series 2.0.3-2/debian/patches/series --- 2.0.3-1/debian/patches/series 2021-02-10 21:37:01.000000000 +0000 +++ 2.0.3-2/debian/patches/series 2022-01-20 14:28:53.000000000 +0000 @@ -1,5 +1,6 @@ -0001-skip-safe-mode-test.patch 0002-fix-tests-with-ruby-calls.patch 0003-remove-bogus-tests.patch 0004-Add-metadata.yml-from-upstream-gem.patch 0005-tests-workaround-absence-of-singlecov.patch +drop-taint-checking-mechanism.patch +use-update-instead-of-update-attributes.patch diff -pruN 2.0.3-1/debian/patches/use-update-instead-of-update-attributes.patch 2.0.3-2/debian/patches/use-update-instead-of-update-attributes.patch --- 2.0.3-1/debian/patches/use-update-instead-of-update-attributes.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.3-2/debian/patches/use-update-instead-of-update-attributes.patch 2022-01-20 14:28:53.000000000 +0000 @@ -0,0 +1,16 @@ +Description: update_attributes has been replaces w update. +Author: Utkarsh Gupta +Origin: vendor +Bug: https://github.com/grosser/fast_gettext/issues/135 +Last-Update: 2022-01-18 + +--- a/spec/fast_gettext/translation_repository/db_spec.rb ++++ b/spec/fast_gettext/translation_repository/db_spec.rb +@@ -112,6 +112,6 @@ + it "expires the cache when updated" do + FastGettext.should_receive(:expire_cache_for).with('car') + translation_text = create_translation 'car', 'Auto' +- translation_text.update_attributes :text => 'Autobot' ++ translation_text.update :text => 'Autobot' + end + end