diff --git a/debian/control b/debian/control index c34b93ad28..1e615b707a 100644 --- a/debian/control +++ b/debian/control @@ -93,7 +93,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, # API ruby-grape (>= 0.19.2~), ruby-grape-entity (>= 0.6~), - ruby-rack-cors (>= 0.4.0~), + ruby-rack-cors (>= 1.0~), # Disable strong_params so that Mash does not respond to :permitted? ruby-hashie-forbidden-attributes, # Pagination @@ -105,7 +105,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, # Drag and Drop UI ruby-dropzonejs-rails (>= 0.7.1~), # for backups - ruby-fog-aws (>= 1.4~), + ruby-fog-aws (>= 2.0~), ruby-fog-core (>= 1.44~), ruby-fog-google (>= 0.5~), ruby-fog-local (>= 0.3~), @@ -143,7 +143,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, # Run events after state machine commits ruby-after-commit-queue, # Issue tags - ruby-acts-as-taggable-on (>= 4.0~), + ruby-acts-as-taggable-on (>= 5.0~), # Background jobs ruby-sidekiq (>= 5.0~), ruby-sidekiq-cron (>= 0.6~), diff --git a/debian/patches/0310-relax-rack-cors.patch b/debian/patches/0310-relax-rack-cors.patch new file mode 100644 index 0000000000..d9abb6c580 --- /dev/null +++ b/debian/patches/0310-relax-rack-cors.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -79,7 +79,7 @@ + # API + gem 'grape', '~> 0.19.2' + gem 'grape-entity', '~> 0.6.0' +-gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' ++gem 'rack-cors', '~> 1.0', require: 'rack/cors' + + # Disable strong_params so that Mash does not respond to :permitted? + gem 'hashie-forbidden_attributes' diff --git a/debian/patches/0320-relax-fog-aws.patch b/debian/patches/0320-relax-fog-aws.patch new file mode 100644 index 0000000000..1fd3ce0960 --- /dev/null +++ b/debian/patches/0320-relax-fog-aws.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -97,7 +97,7 @@ + gem 'dropzonejs-rails', '~> 0.7.1' + + # for backups +-gem 'fog-aws', '~> 1.4' ++gem 'fog-aws', '>= 1.4' + gem 'fog-core', '~> 1.44' + gem 'fog-google', '~> 0.5' + gem 'fog-local', '~> 0.3' diff --git a/debian/patches/0330-relax-acts-as-taggable-on.patch b/debian/patches/0330-relax-acts-as-taggable-on.patch new file mode 100644 index 0000000000..b8c860cd4b --- /dev/null +++ b/debian/patches/0330-relax-acts-as-taggable-on.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -146,7 +146,7 @@ + gem 'after_commit_queue', '~> 1.3' + + # Issue tags +-gem 'acts-as-taggable-on', '~> 4.0' ++gem 'acts-as-taggable-on', '~> 5.0' + + # Background jobs + gem 'sidekiq', '~> 5.0' diff --git a/debian/patches/0340-relax-httparty.patch b/debian/patches/0340-relax-httparty.patch new file mode 100644 index 0000000000..52ba10f2a7 --- /dev/null +++ b/debian/patches/0340-relax-httparty.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -158,7 +158,7 @@ + gem 'rufus-scheduler', '~> 3.4' + + # HTTP requests +-gem 'httparty', '~> 0.13.3' ++gem 'httparty', '~> 0.13' + + # Colored output to console + gem 'rainbow', '~> 2.2' diff --git a/debian/patches/0350-relax-oj.patch b/debian/patches/0350-relax-oj.patch new file mode 100644 index 0000000000..e1b95b2181 --- /dev/null +++ b/debian/patches/0350-relax-oj.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -233,7 +233,7 @@ + gem 'charlock_holmes', '~> 0.7.3' + + # Faster JSON +-gem 'oj', '~> 2.17', '>= 2.17.4' ++gem 'oj', '>= 2.17.4' + + # Parse time & duration + gem 'chronic', '~> 0.10.2' diff --git a/debian/patches/series b/debian/patches/series index 94b045fa7b..5fdd4a8b56 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,6 +12,11 @@ pid-log-paths.patch 0280-relax-pg.patch 0290-skip-peek-mysql2.patch 0300-relax-rbnacl.patch +0310-relax-rack-cors.patch +0320-relax-fog-aws.patch +0330-relax-acts-as-taggable-on.patch +0340-relax-httparty.patch +0350-relax-oj.patch 0410-set-webpack-root.patch 0420-use-system-libs.patch 0430-remove-devdeps.patch