From 97d1322c3eeebe13ef2ea0eecb9d61eb7a9d16dd Mon Sep 17 00:00:00 2001 From: Chirag Sukhala <chirag@sukhala.in> Date: Tue, 31 Oct 2023 01:03:24 +0530 Subject: [PATCH 1/3] updated gem version according to upstream. --- debian/control | 4 ++-- debian/patches/gemfile-deps-adjustment.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 2957bf16..fcba4f09 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Build-Depends: dbconfig-common, ruby-mini-magick (>= 4.11.0~), ruby-mini-mime (>= 1.0.1~), ruby-net-ldap (>= 0.17.0~), - ruby-nokogiri (>= 1.14.0~), + ruby-nokogiri (>= 1.15.2~), ruby-rack (>= 1.4.5~), ruby-rails (>= 2:6.1.7~), ruby-rails-observers, @@ -83,7 +83,7 @@ Depends: dbconfig-common, ruby-mini-mime (>= 1.0.1~), ruby-mocha (>= 1.4.0~), ruby-net-ldap (>= 0.17.0~), - ruby-nokogiri (>= 1.14.0~), + ruby-nokogiri (>= 1.15.2~), ruby-rack (>= 1.4.5~), ruby-rack-test (>= 0.7.0~), ruby-rails (>= 2:6.1.7~), diff --git a/debian/patches/gemfile-deps-adjustment.patch b/debian/patches/gemfile-deps-adjustment.patch index 070051c0..ffd0402d 100644 --- a/debian/patches/gemfile-deps-adjustment.patch +++ b/debian/patches/gemfile-deps-adjustment.patch @@ -1,4 +1,4 @@ -Last-Update: 2022-03-29 +Last-Update: 2023-10-30 Forwarded: not-needed Author: Antonio Terceiro <terceiro@debian.org> Description: Adapt dep requirements @@ -39,7 +39,7 @@ Index: redmine/Gemfile +gem "mail", "~> 2.8.1" gem 'csv', '~> 3.2.0' -gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.4') -+gem 'nokogiri', '~> 1.14.0' ++gem 'nokogiri', '~> 1.15.2' gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0') gem 'i18n', '~> 1.10.0' gem "rbpdf", "~> 1.20.0" -- GitLab From 19465376c0a0d88a371c7585f80b17bf1c8056e0 Mon Sep 17 00:00:00 2001 From: Chirag Sukhala <chirag@sukhala.in> Date: Mon, 8 Jan 2024 11:13:34 +0530 Subject: [PATCH 2/3] i18n fixes --- debian/control | 4 ++-- debian/patches/gemfile-deps-adjustment.patch | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index fcba4f09..2d2bb483 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: dbconfig-common, ruby-csv (>= 3.2.0~), ruby-task-list (>= 2.3.2~), ruby-html-pipeline (>= 2.13.2~), - ruby-i18n (>= 1.10.0~), + ruby-i18n (>= 1.14.1~), ruby-jquery-rails (>= 4.0.5~), ruby-mail (>= 2.8.1~), ruby-marcel (>= 1.0.1+dfsg-2~), @@ -75,7 +75,7 @@ Depends: dbconfig-common, ruby-csv (>= 3.2.0~), ruby-task-list (>= 2.3.2~), ruby-html-pipeline (>= 2.13.2~), - ruby-i18n (>= 1.10.0~), + ruby-i18n (>= 1.14.1~), ruby-jquery-rails (>= 4.0.5~), ruby-mail (>= 2.8.1~), ruby-marcel, diff --git a/debian/patches/gemfile-deps-adjustment.patch b/debian/patches/gemfile-deps-adjustment.patch index ffd0402d..f4e11838 100644 --- a/debian/patches/gemfile-deps-adjustment.patch +++ b/debian/patches/gemfile-deps-adjustment.patch @@ -41,7 +41,8 @@ Index: redmine/Gemfile -gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.4') +gem 'nokogiri', '~> 1.15.2' gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0') - gem 'i18n', '~> 1.10.0' +-gem 'i18n', '~> 1.10.0' ++gem 'i18n', '~> 1.14.1' gem "rbpdf", "~> 1.20.0" gem 'addressable' gem 'rubyzip', '~> 2.3.0' -- GitLab From 7fb089b239b6f224d3b01948225936aea7245f67 Mon Sep 17 00:00:00 2001 From: Chirag Sukhala <chirag@sukhala.in> Date: Mon, 8 Jan 2024 21:27:15 +0530 Subject: [PATCH 3/3] updates rouge, red carpet --- Gemfile | 2 +- debian/changelog | 6 ++++++ debian/control | 8 ++++---- debian/patches/gemfile-deps-adjustment.patch | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 1121a72f..6f8cf9cb 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ end # Optional Markdown support, not for JRuby # ToDo: Remove common_mark group when common_mark is decoupled from markdown. See defect (#36892) for more details. -gem 'redcarpet', '~> 3.5.1', groups: [:markdown, :common_mark] +gem 'redcarpet', '~> 3.6.0', groups: [:markdown, :common_mark] # Optional CommonMark support, not for JRuby group :common_mark do diff --git a/debian/changelog b/debian/changelog index 36ccb303..1c750fa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +redmine (5.0.4-7) unstable; urgency=medium + + * upfddated gems version + + -- CHirag Sukhala <chirag@sukhala.in> Mon, 08 Jan 2024 11:26:38 +0530 + redmine (5.0.4-7) unstable; urgency=medium * d/postinst: Run redmine from its own user. (Closes: #1022815) diff --git a/debian/control b/debian/control index 2d2bb483..fcf804c7 100644 --- a/debian/control +++ b/debian/control @@ -30,13 +30,13 @@ Build-Depends: dbconfig-common, ruby-rails (>= 2:6.1.7~), ruby-rails-observers, ruby-rbpdf (>= 1.19~), - ruby-redcarpet (>= 3.5.1~), + ruby-redcarpet (>= 3.6.0~), ruby-request-store (>= 1.5.0~), ruby-rmagick (>= 2.14.0~), ruby-roadie (>= 3.2.2~), ruby-roadie-rails (>= 3.0.0~), ruby-rotp (>= 5.0.0~), - ruby-rouge (>= 4.1.0~), + ruby-rouge (>= 4.2.0~), ruby-rqrcode, ruby-sanitize (>= 6.0~), ruby-zip (>= 2.3.0~), @@ -90,13 +90,13 @@ Depends: dbconfig-common, ruby-rails-dom-testing (>= 1.0.6-2~), ruby-rails-observers, ruby-rbpdf (>= 1.19~), - ruby-redcarpet (>= 3.5.1~), + ruby-redcarpet (>= 3.6.0~), ruby-request-store (>= 1.5.0~), ruby-rmagick (>= 2.14.0~), ruby-roadie (>= 3.2.2~), ruby-roadie-rails (>= 3.0.0~), ruby-rotp (>= 5.0.0~), - ruby-rouge (>= 4.1.0~), + ruby-rouge (>= 4.2.0~), ruby-rqrcode, ruby-sanitize (>= 6.0~), ruby-zip (>= 2.3.0~), diff --git a/debian/patches/gemfile-deps-adjustment.patch b/debian/patches/gemfile-deps-adjustment.patch index f4e11838..07b2056d 100644 --- a/debian/patches/gemfile-deps-adjustment.patch +++ b/debian/patches/gemfile-deps-adjustment.patch @@ -29,7 +29,7 @@ Index: redmine/Gemfile +gem 'rails', '~> 6.1.7' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') -gem 'rouge', '~> 3.28.0' -+gem 'rouge', '~> 4.1.0' ++gem 'rouge', '~> 4.2.0' gem 'request_store', '~> 1.5.0' gem 'mini_mime', '~> 1.1.0' gem "actionpack-xml_parser" @@ -55,7 +55,7 @@ Index: redmine/Gemfile # Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590 gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0') -@@ -48,10 +48,10 @@ gem 'redcarpet', '~> 3.5.1', groups: [:m +@@ -48,10 +48,10 @@ gem 'redcarpet', '~> 3.6.0', groups: [:m # Optional CommonMark support, not for JRuby group :common_mark do -- GitLab