[DRE-commits] [diaspora] 04/14: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Mon Sep 19 15:51:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository diaspora.
commit 7773e45209ed140d1a1b65c7f654f126afac603f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Mon Sep 19 18:27:55 2016 +0530
refresh patches
---
debian/control | 1 -
.../002-remove-development-test-from-gemfile.patch | 102 +++-----
debian/patches/007-loosen-roxml-version.patch | 15 --
debian/patches/030-loosen-tiny-versions.patch | 24 --
debian/patches/031-embedded-gems.patch | 15 --
debian/patches/033-relax-rails-minor-version.patch | 14 --
debian/patches/045-replace-sidetiq.patch | 124 ----------
debian/patches/050-relax-stable-libs.patch | 258 ++++++++++++++-------
.../patches/051-relax-patch-release-versions.patch | 178 --------------
debian/patches/060-relax-devise.patch | 18 --
debian/patches/061-remove-diaspora-vines.patch | 15 --
debian/patches/062-lower-jquery-rails.patch | 21 +-
debian/patches/series | 8 -
13 files changed, 216 insertions(+), 577 deletions(-)
diff --git a/debian/control b/debian/control
index 9ade16e..d7f91b2 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
ruby-rails-autolink,
ruby-redcarpet (>= 3.3.4~),
ruby-twitter-text (>= 1.13~),
- ruby-roxml,
ruby-oembed (>= 0.9.0~),
ruby-open-graph-reader,
ruby-omniauth (>= 1.3.1~),
diff --git a/debian/patches/002-remove-development-test-from-gemfile.patch b/debian/patches/002-remove-development-test-from-gemfile.patch
index 4a488b9..ea5c31b 100644
--- a/debian/patches/002-remove-development-test-from-gemfile.patch
+++ b/debian/patches/002-remove-development-test-from-gemfile.patch
@@ -2,83 +2,39 @@ Description: Workaround for bundler
bundler can't ignore groups when --local is specified for bundle install
Bug: https://github.com/bundler/bundler/issues/4023
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -219,75 +219,3 @@ group :production do # we don"t install
-
+--- a/Gemfile
++++ b/Gemfile
+@@ -230,7 +230,8 @@
gem "asset_sync", "1.1.0", require: false
end
--
+
-group :development do
-- # Automatic test runs
-- gem "guard-cucumber", "1.5.4"
-- gem "guard-jshintrb", "1.1.1"
-- gem "guard-rspec", "4.6.4"
-- gem "guard-rubocop", "1.2.0"
-- gem "guard", "2.13.0", require: false
-- gem "rb-fsevent", "0.9.7", require: false
-- gem "rb-inotify", "0.9.7", require: false
--
-- # Linters
-- gem "jshintrb", "0.3.0"
-- gem "rubocop", "0.35.1"
--
-- # Preloading environment
--
-- gem "spring", "1.6.3"
-- gem "spring-commands-rspec", "1.0.4"
-- gem "spring-commands-cucumber", "1.0.1"
--
-- # Debugging
-- gem "pry"
-- gem "pry-debundle"
-- gem "pry-byebug"
--
-- # test coverage
-- gem "simplecov", "0.11.2", require: false
--
-- gem "turbo_dev_assets", "0.0.2"
++#group :development do
++if ENV["INCLUDE_TEST_DEPENDS"] == "true"
+ # Automatic test runs
+ gem "guard", "2.14.0", require: false
+ gem "guard-cucumber", "2.1.2", require: false
+@@ -262,9 +263,9 @@
+ gem "simplecov", "0.12.0", require: false
+
+ gem "turbo_dev_assets", "0.0.2"
-end
--
++#end
+
-group :test do
-- # RSpec (unit tests, some integration tests)
--
-- gem "fixture_builder", "0.4.1"
-- gem "fuubar", "2.0.0"
-- gem "rspec-instafail", "0.4.0", require: false
-- gem "test_after_commit", "0.4.2"
--
-- # Cucumber (integration tests)
--
-- gem "capybara", "2.6.2"
-- gem "database_cleaner" , "1.5.1"
-- gem "selenium-webdriver", "2.47.1"
--
-- # General helpers
--
-- gem "factory_girl_rails", "4.6.0"
-- gem "timecop", "0.8.0"
-- gem "webmock", "1.22.6", require: false
-- gem "shoulda-matchers", "3.1.1"
--
-- gem "diaspora_federation-test", "0.0.13"
++#group :test do
+ # RSpec (unit tests, some integration tests)
+
+ gem "fixture_builder", "0.4.1"
+@@ -291,9 +292,9 @@
+
+ # Coverage
+ gem 'coveralls', require: false
-end
--
++#end
+
-group :development, :test do
-- # RSpec (unit tests, some integration tests)
-- gem "rspec-rails", "3.4.2"
--
-- # Cucumber (integration tests)
-- gem "cucumber-rails", "1.4.3", require: false
--
-- # Jasmine (client side application tests (JS))
-- gem "jasmine", "2.4.0"
-- gem "jasmine-jquery-rails", "2.0.3"
-- gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
-- gem "sinon-rails", "1.15.0"
--
-- # silence assets
-- gem "quiet_assets", "1.1.0"
--end
++#group :development, :test do
+ # RSpec (unit tests, some integration tests)
+ gem "rspec-rails", "3.5.1"
+
diff --git a/debian/patches/007-loosen-roxml-version.patch b/debian/patches/007-loosen-roxml-version.patch
deleted file mode 100644
index 7bfd946..0000000
--- a/debian/patches/007-loosen-roxml-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-debian has a newer roxml
-
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -129,7 +129,7 @@ gem "messagebus_ruby_api", "1.0.3"
- gem "nokogiri", "1.6.8"
- gem "redcarpet", "3.3.4"
- gem "twitter-text", "1.13.3"
--gem "roxml", "3.1.6"
-+gem "roxml", "~> 3.1", ">= 3.1.6"
- gem "ruby-oembed", "0.9.0"
- gem "open_graph_reader", "0.6.1"
-
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
deleted file mode 100644
index f959177..0000000
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-relax dependecies
-
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -91,7 +91,7 @@ gem "js_image_paths", "0.1.0"
- gem "js-routes", "1.2.4"
-
- source "https://rails-assets.org" do
-- gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails
-+ gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails
-
- gem "rails-assets-markdown-it", "6.0.0"
- gem "rails-assets-markdown-it-hashtag", "0.4.0"
-@@ -168,7 +168,7 @@ gem "gon", "6.0.1"
- gem "haml", "4.0.7"
- gem "mobile-fu", "1.3.1"
- gem "will_paginate", "3.1.0"
--gem "rails-timeago", "2.11.0"
-+gem "rails-timeago", "~> 2.11.0"
-
- # Logging
-
diff --git a/debian/patches/031-embedded-gems.patch b/debian/patches/031-embedded-gems.patch
deleted file mode 100644
index 7ea2d4b..0000000
--- a/debian/patches/031-embedded-gems.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-debian has an incompatible version packaged
-
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -53,7 +53,7 @@ gem "rack-cors", "0.4.0", require: "rack
-
- # CSS
-
--gem "bootstrap-sass", "2.3.2.2"
-+gem "bootstrap-sass", "2.3.2.2", path: 'vendor/gems/bootstrap-sass-2.3.2.2'
- gem "compass-rails", "2.0.5"
- gem "sass-rails", "5.0.4"
- gem "autoprefixer-rails", "6.3.3.1"
diff --git a/debian/patches/033-relax-rails-minor-version.patch b/debian/patches/033-relax-rails-minor-version.patch
deleted file mode 100644
index be545e5..0000000
--- a/debian/patches/033-relax-rails-minor-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-allow newer rails patch releases
-
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -1,6 +1,6 @@
- source "https://rubygems.org"
-
--gem "rails", "4.2.5.2"
-+gem "rails", "~> 4.2.5"
-
- # Legacy Rails features, remove me!
- # responders (class level)
diff --git a/debian/patches/045-replace-sidetiq.patch b/debian/patches/045-replace-sidetiq.patch
deleted file mode 100644
index 3e1bfd9..0000000
--- a/debian/patches/045-replace-sidetiq.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From ab41bef5797b44ea41e7defaaa18af6075c1199d Mon Sep 17 00:00:00 2001
-From: cmrd Senya <senya at riseup.net>
-Date: Mon, 4 Jan 2016 05:40:04 +0300
-Subject: [PATCH] Replace sidetiq with sidekiq-cron
-
----
- Gemfile | 4 ++--
- app/workers/clean_cached_files.rb | 6 +-----
- app/workers/queue_users_for_removal.rb | 8 ++------
- config/initializers/sidekiq.rb | 6 ++++++
- config/routes.rb | 2 +-
- config/schedule.yml | 14 ++++++++++++++
- 8 files changed, 36 insertions(+), 29 deletions(-)
- create mode 100644 config/schedule.yml
-
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -32,12 +32,12 @@ gem "simple_captcha2", "0.4.0", require:
-
- # Background processing
-
--gem "sidekiq", "3.4.2"
-+gem "sidekiq", "~> 4.0"
- gem "sinatra", "1.4.7"
-
- # Scheduled processing
-
--gem "sidetiq", "0.6.3"
-+gem "sidekiq-cron", "~> 0.4.1"
-
- # Compression
-
-Index: diaspora/app/workers/clean_cached_files.rb
-===================================================================
---- diaspora.orig/app/workers/clean_cached_files.rb
-+++ diaspora/app/workers/clean_cached_files.rb
-@@ -1,13 +1,9 @@
- module Workers
- class CleanCachedFiles < Base
-- include Sidetiq::Schedulable
--
- sidekiq_options queue: :maintenance
-
-- recurrence { daily }
--
- def perform
- CarrierWave.clean_cached_files!
- end
-- end
-+ end
- end
-Index: diaspora/app/workers/queue_users_for_removal.rb
-===================================================================
---- diaspora.orig/app/workers/queue_users_for_removal.rb
-+++ diaspora/app/workers/queue_users_for_removal.rb
-@@ -4,12 +4,8 @@
-
- module Workers
- class QueueUsersForRemoval < Base
-- include Sidetiq::Schedulable
--
- sidekiq_options queue: :maintenance
--
-- recurrence { daily }
--
-+
- def perform
- # Queue users for removal due to inactivity
- if AppConfig.settings.maintenance.remove_old_users.enable?
-@@ -37,5 +33,5 @@ module Workers
- end
- end
- end
-- end
-+ end
- end
-Index: diaspora/config/initializers/sidekiq.rb
-===================================================================
---- diaspora.orig/config/initializers/sidekiq.rb
-+++ diaspora/config/initializers/sidekiq.rb
-@@ -52,3 +52,9 @@ end
- Sidekiq.configure_client do |config|
- config.redis = AppConfig.get_redis_options
- end
-+
-+schedule_file = "config/schedule.yml"
-+
-+if File.exist?(schedule_file) && Sidekiq.server?
-+ Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file)
-+end
-Index: diaspora/config/routes.rb
-===================================================================
---- diaspora.orig/config/routes.rb
-+++ diaspora/config/routes.rb
-@@ -3,7 +3,7 @@
- # the COPYRIGHT file.
-
- require 'sidekiq/web'
--require 'sidetiq/web'
-+require "sidekiq/cron/web"
-
- Diaspora::Application.routes.draw do
-
-Index: diaspora/config/schedule.yml
-===================================================================
---- /dev/null
-+++ diaspora/config/schedule.yml
-@@ -0,0 +1,14 @@
-+clean_cached_files:
-+ cron: "0 0 * * *"
-+ class: "Workers::CleanCachedFiles"
-+ queue: "clean_cached_files"
-+
-+queue_users_for_removal:
-+ cron: "0 0 * * *"
-+ class: "Workers::QueueUsersForRemoval"
-+ queue: queue_users_for_removal
-+
-+recurring_pod_check:
-+ cron: "0 0 * * *"
-+ class: "Workers::RecurringPodCheck"
-+ queue: recurring_pod_check
diff --git a/debian/patches/050-relax-stable-libs.patch b/debian/patches/050-relax-stable-libs.patch
index 63aef59..c852fb0 100644
--- a/debian/patches/050-relax-stable-libs.patch
+++ b/debian/patches/050-relax-stable-libs.patch
@@ -1,74 +1,117 @@
minor versions of stable libraries can be relaxed
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -4,11 +4,11 @@ gem "rails", "~> 4.2.5"
+--- a/Gemfile
++++ b/Gemfile
+@@ -1,190 +1,190 @@
+ source "https://rubygems.org"
+
+-gem "rails", "4.2.7.1"
++gem "rails", "~> 4.2", ">= 4.2.7.1"
# Legacy Rails features, remove me!
# responders (class level)
--gem "responders", "2.1.1"
-+gem "responders", "~> 2.1"
+-gem "responders", "2.2.0"
++gem "responders", "~> 2.2"
# Appserver
--gem "unicorn", "5.0.1", require: false
-+gem "unicorn", ">= 4.9", require: false
+-gem "unicorn", "5.1.0", require: false
+-gem "unicorn-worker-killer", "0.4.4"
++gem "unicorn", "~> 5.1", require: false
++gem "unicorn-worker-killer", "~> 0.4.4"
# Federation
-@@ -17,8 +17,8 @@ gem "diaspora_federation-rails", "0.0.13
+-gem "diaspora_federation-rails", "0.1.4"
++gem "diaspora_federation-rails", "~> 0.1.4"
+
# API and JSON
- gem "acts_as_api", "0.4.2"
+-gem "acts_as_api", "0.4.3"
-gem "json", "1.8.3"
--gem "json-schema", "2.6.0"
+-gem "json-schema", "2.6.2"
++gem "acts_as_api", "~> 0.4.3"
+gem "json", "~> 1.8", ">= 1.8.3"
-+gem "json-schema", "~> 2.6"
++gem "json-schema", "~> 2.6", ">= 2.6.2"
# Authentication
-@@ -33,7 +33,7 @@ gem "simple_captcha2", "0.4.0", require:
+-gem "devise", "4.2.0"
+-gem "devise_lastseenable", "0.0.6"
+-gem "devise-token_authenticatable", "0.5.2"
++gem "devise", "~> 4.2"
++gem "devise_lastseenable", "~> 0.0.6"
++gem "devise-token_authenticatable", "~> 0.5.2"
+
+ # Captcha
+
+-gem "simple_captcha2", "0.4.0", require: "simple_captcha"
++gem "simple_captcha2", "~> 0.4.0", require: "simple_captcha"
+
# Background processing
- gem "sidekiq", "~> 4.0"
+-gem "sidekiq", "4.1.4"
-gem "sinatra", "1.4.7"
++gem "sidekiq", "~> 4.1", ">= 4.1.4"
+gem "sinatra", "~> 1.4", ">= 1.4.7"
# Scheduled processing
-@@ -41,7 +41,7 @@ gem "sidekiq-cron", "~> 0.4.1"
+-gem "sidekiq-cron", "0.4.2"
++gem "sidekiq-cron", "~> 0.4.2"
# Compression
--gem "uglifier", "2.7.2"
-+gem "uglifier", "~> 2.7", ">= 2.7.2"
+-gem "uglifier", "3.0.1"
++gem "uglifier", "~> 3.0", ">= 3.0.1"
# Configuration
-@@ -54,9 +54,9 @@ gem "rack-cors", "0.4.0", require: "rack
+-gem "configurate", "0.3.1"
++gem "configurate", "~> 0.3.1"
+
+ # Cross-origin resource sharing
+
+-gem "rack-cors", "0.4.0", require: "rack/cors"
++gem "rack-cors", "~> 0.4.0", require: "rack/cors"
+
# CSS
- gem "bootstrap-sass", "2.3.2.2", path: 'vendor/gems/bootstrap-sass-2.3.2.2'
+-gem "bootstrap-sass", "3.3.7"
-gem "compass-rails", "2.0.5"
--gem "sass-rails", "5.0.4"
--gem "autoprefixer-rails", "6.3.3.1"
+-gem "sass-rails", "5.0.6"
+-gem "autoprefixer-rails", "6.4.0.2"
+-gem "bootstrap-switch-rails", "3.3.3"
++gem "bootstrap-sass", "~> 3.3", ">= 3.3.7"
+gem "compass-rails", "~> 2.0", ">= 2.0.5"
-+gem "sass-rails", "~> 5.0", ">= 5.0.4"
-+gem "autoprefixer-rails", "~> 6.3", ">= 6.3.3.1"
++gem "sass-rails", "~> 5.0", ">= 5.0.6"
++gem "autoprefixer-rails", "~> 6.4", ">= 6.4.0.2"
++gem "bootstrap-switch-rails", "~> 3.3", ">= 3.3.3"
# Database
-@@ -70,76 +70,76 @@ gem "activerecord-import", "0.11.0"
+ group :mysql, optional: true do
+- gem "mysql2", "0.4.4"
++ gem "mysql2", "~> 0.4.4"
+ end
+ group :postgresql, optional: true do
+- gem "pg", "0.18.4"
++ gem "pg", "~> 0.18.4"
+ end
+
+
+-gem "activerecord-import", "0.15.0"
++gem "activerecord-import", "~> 0.15.0"
+
# File uploading
- gem "carrierwave", "0.10.0"
--gem "fog", "1.37.0"
--gem "mini_magick", "4.4.0"
+-gem "carrierwave", "0.11.2"
+-gem "fog", "1.38.0"
+-gem "mini_magick", "4.5.1"
-gem "remotipart", "1.2.1"
-+gem "fog", "~> 1.34"
-+gem "mini_magick", "~> 4.4"
++gem "carrierwave", "~> 0.11.2"
++gem "fog", "~> 1.38"
++gem "mini_magick", "~> 4.5", ">= 4.5.1"
+gem "remotipart", "~> 1.2", ">= 1.2.1"
# GUID generation
@@ -77,52 +120,61 @@ Index: diaspora/Gemfile
# Icons
--gem "entypo-rails", "2.2.3"
-+gem "entypo-rails", "~> 2.2", ">= 2.2.3"
+-gem "entypo-rails", "3.0.0.pre.rc2"
++gem "entypo-rails", "~> 3.0.0.pre.rc2"
# JavaScript
-gem "backbone-on-rails", "1.2.0.0"
-+gem "backbone-on-rails", "~> 1.2"
- gem "handlebars_assets", "0.23.0"
--gem "jquery-rails", "4.1.0"
+-gem "handlebars_assets", "0.23.1"
+-gem "jquery-rails", "4.1.1"
-gem "jquery-ui-rails", "5.0.5"
-+gem "jquery-rails", "~> 4.1"
+-gem "js_image_paths", "0.1.0"
+-gem "js-routes", "1.2.9"
++gem "backbone-on-rails", "~> 1.2"
++gem "handlebars_assets", "~> 0.23.1"
++gem "jquery-rails", "~> 4.1", ">= 4.1.1"
+gem "jquery-ui-rails", "~> 5.0", ">= 5.0.5"
- gem "js_image_paths", "0.1.0"
--gem "js-routes", "1.2.4"
-+gem "js-routes", "~> 1.2", ">= 1.2.4"
++gem "js_image_paths", "~> 0.1.0"
++gem "js-routes", "~> 1.2", ">= 1.2.9"
source "https://rails-assets.org" do
-- gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails
-+ gem "rails-assets-jquery", "~> 1.11", ">= 1.11.1" # Should be kept in sync with jquery-rails
-
-- gem "rails-assets-markdown-it", "6.0.0"
-+ gem "rails-assets-markdown-it", "~> 6.0"
- gem "rails-assets-markdown-it-hashtag", "0.4.0"
- gem "rails-assets-markdown-it-diaspora-mention", "0.4.0"
- gem "rails-assets-markdown-it-sanitizer", "0.4.1"
- gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
+- gem "rails-assets-jquery", "2.2.1" # Should be kept in sync with jquery-rails
++ gem "rails-assets-jquery", "~> 2.2", ">= 2.2.1" # Should be kept in sync with jquery-rails
+
+- gem "rails-assets-markdown-it", "7.0.0"
+- gem "rails-assets-markdown-it-hashtag", "0.4.0"
+- gem "rails-assets-markdown-it-diaspora-mention", "1.0.0"
+- gem "rails-assets-markdown-it-sanitizer", "0.4.2"
+- gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
- gem "rails-assets-markdown-it-sub", "1.0.0"
- gem "rails-assets-markdown-it-sup", "1.0.0"
-- gem "rails-assets-highlightjs", "9.1.0"
+- gem "rails-assets-highlightjs", "9.6.0"
+- gem "rails-assets-bootstrap-markdown", "2.10.0"
++ gem "rails-assets-markdown-it", "~> 7.0"
++ gem "rails-assets-markdown-it-hashtag", "~> 0.4.0"
++ gem "rails-assets-markdown-it-diaspora-mention", "~> 1.0"
++ gem "rails-assets-markdown-it-sanitizer", "~> 0.4.2"
++ gem "rails-assets-markdown-it--markdown-it-for-inline", "~> 0.1.1"
+ gem "rails-assets-markdown-it-sub", "~> 1.0"
+ gem "rails-assets-markdown-it-sup", "~> 1.0"
-+ gem "rails-assets-highlightjs", "~> 9.1"
++ gem "rails-assets-highlightjs", "~> 9.6", ">= 9.6.0"
++ gem "rails-assets-bootstrap-markdown", "~> 2.10"
# jQuery plugins
- gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
- gem "rails-assets-jquery-placeholder", "2.3.1"
+- gem "rails-assets-jquery-textchange", "0.2.3"
+- gem "rails-assets-perfect-scrollbar", "0.6.12"
+- gem "rails-assets-autosize", "3.0.17"
+- gem "rails-assets-blueimp-gallery", "2.21.3"
+ gem "rails-assets-jquery-placeholder", "~> 2.3", ">= 2.3.1"
- gem "rails-assets-jquery-textchange", "0.2.3"
- gem "rails-assets-perfect-scrollbar", "0.6.10"
-- gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
-+ gem "rails-assets-jakobmattsson--jquery-elastic", "~> 1.6", ">= 1.6.11"
++ gem "rails-assets-jquery-textchange", "~> 0.2.3"
++ gem "rails-assets-perfect-scrollbar", "~> 0.6.12"
++ gem "rails-assets-autosize", "~> 3.0", '>= 3.0.17"
++ gem "rails-assets-blueimp-gallery", "~> 2.21", ">= 2.21.3"
end
- gem "facebox-rails", "0.2.0"
-
# Localization
-gem "http_accept_language", "2.0.5"
@@ -135,38 +187,54 @@ Index: diaspora/Gemfile
# Mail
-gem "markerb", "1.1.0"
--gem "messagebus_ruby_api", "1.0.3"
+gem "markerb", "~> 1.1"
-+gem "messagebus_ruby_api", "~> 1.0", ">= 1.0.3"
+
+ # Map
+-gem "leaflet-rails", "0.7.7"
++gem "leaflet-rails", "~> 0.7.7"
# Parsing
-gem "nokogiri", "1.6.8"
-gem "redcarpet", "3.3.4"
--gem "twitter-text", "1.13.3"
+-gem "twitter-text", "1.14.0"
+-gem "ruby-oembed", "0.10.1"
+-gem "open_graph_reader", "0.6.1"
+gem "nokogiri", "~> 1.6", ">= 1.6.8"
+gem "redcarpet", "~> 3.3", ">= 3.3.4"
-+gem "twitter-text", "~> 1.13", ">= 1.13.3"
- gem "roxml", "~> 3.1", ">= 3.1.6"
- gem "ruby-oembed", "0.9.0"
- gem "open_graph_reader", "0.6.1"
++gem "twitter-text", "~> 1.14"
++gem "ruby-oembed", "~> 0.10.1"
++gem "open_graph_reader", "~> 0.6.1"
# Services
-gem "omniauth", "1.3.1"
--gem "omniauth-facebook", "3.0.0"
+-gem "omniauth-facebook", "4.0.0"
-gem "omniauth-tumblr", "1.2"
-gem "omniauth-twitter", "1.2.1"
-gem "twitter", "5.16.0"
+-gem "omniauth-wordpress", "0.2.2"
+gem "omniauth", "~> 1.3", ">= 1.3.1"
-+gem "omniauth-facebook", "~> 3.0"
++gem "omniauth-facebook", "~> 4.0"
+gem "omniauth-tumblr", "~> 1.2"
+gem "omniauth-twitter", "~> 1.2", ">= 1.2.1"
+gem "twitter", "~> 5.16"
- gem "omniauth-wordpress", "0.2.2"
++gem "omniauth-wordpress", "~> 0.2.2"
+
+ # OpenID Connect
+-gem "openid_connect", "0.12.0"
++gem "openid_connect", "~> 0.12.0"
# Serializers
-@@ -152,23 +152,23 @@ gem "rails-assets-diaspora_jsxc", "~> 0.
+
+-gem "active_model_serializers", "0.9.5"
++gem "active_model_serializers", "~> 0.9.5"
+
+ # XMPP chat dependencies
+-gem "diaspora-prosody-config", "0.0.5"
+-gem "rails-assets-diaspora_jsxc", "0.1.5.develop.1", source: "https://rails-assets.org"
++gem "diaspora-prosody-config", "~> 0.0.5"
++gem "rails-assets-diaspora_jsxc", "~> 0.1.5.develop.1", source: "https://rails-assets.org"
# Tags
@@ -176,44 +244,63 @@ Index: diaspora/Gemfile
# URIs and HTTP
-gem "addressable", "2.3.8", require: "addressable/uri"
+-gem "faraday", "0.9.2"
+-gem "faraday_middleware", "0.10.0"
+-gem "faraday-cookie_jar", "0.0.6"
+-gem "typhoeus", "1.1.0"
+gem "addressable", "~> 2.3", ">= 2.3.8", require: "addressable/uri"
- gem "faraday", "0.9.2"
- gem "faraday_middleware", "0.10.0"
- gem "faraday-cookie_jar", "0.0.6"
--gem "typhoeus", "1.0.1"
-+gem "typhoeus", "~> 1.0", ">= 1.0.1"
++gem "faraday", "~> 0.9.2"
++gem "faraday_middleware", "~> 0.10.0"
++gem "faraday-cookie_jar", "~> 0.0.6"
++gem "typhoeus", "~> 1.1"
# Views
--gem "gon", "6.0.1"
--gem "haml", "4.0.7"
+-gem "gon", "6.1.0"
+-gem "hamlit", "2.5.0"
-gem "mobile-fu", "1.3.1"
-gem "will_paginate", "3.1.0"
--gem "rails-timeago", "~> 2.11.0"
-+gem "gon", "~> 6.0", ">= 6.0.1"
-+gem "haml", "~> 4.0", ">= 4.0.7"
+-gem "rails-timeago", "2.11.0"
++gem "gon", "~> 6.1.0"
++gem "hamlit", "~> 2.5.0"
+gem "mobile-fu", "~> 1.3", ">= 1.3.1"
+gem "will_paginate", "~> 3.1"
+gem "rails-timeago", "~> 2.11"
# Logging
-@@ -176,7 +176,7 @@ gem "logging-rails", "0.5.0", require: "
+-gem "logging-rails", "0.5.0", require: "logging/rails"
++gem "logging-rails", "~> 0.5.0", require: "logging/rails"
# Reading and writing zip files
--gem "rubyzip", "1.1.7", require: "zip"
-+gem "rubyzip", "~> 1.1", ">= 1.1.7", require: "zip"
+-gem "rubyzip", "1.2.0", require: "zip"
++gem "rubyzip", "~> 1.2", require: "zip"
# Prevent occasions where minitest is not bundled in
# packaged versions of ruby. See following issues/prs:
-@@ -199,12 +199,12 @@ group :production do # we don"t install
+@@ -193,7 +193,7 @@
+ # https://github.com/discourse/discourse/pull/238
+ gem "minitest"
+
+-gem "versionist", "1.5.0"
++gem "versionist", "~> 1.5"
+
+ # Windows and OSX have an execjs compatible runtime built-in, Linux users should
+ # install Node.js or use "therubyracer".
+@@ -205,29 +205,29 @@
+ group :production do # we don"t install these on travis to speed up test runs
+ # Administration
+
+- gem "rails_admin", "0.8.1"
++ gem "rails_admin", "~> 0.8.1"
# Analytics
- gem "rack-google-analytics", "1.2.0"
+- gem "rack-piwik", "0.3.0", require: "rack/piwik"
+ gem "rack-google-analytics", "~> 1.2"
- gem "rack-piwik", "0.3.0", require: "rack/piwik"
++ gem "rack-piwik", "~> 0.3.0", require: "rack/piwik"
# Click-jacking protection
@@ -222,7 +309,8 @@ Index: diaspora/Gemfile
# Process management
-@@ -212,10 +212,10 @@ group :production do # we don"t install
+- gem "eye", "0.8.1"
++ gem "eye", "~> 0.8.1"
# Redirects
@@ -236,3 +324,5 @@ Index: diaspora/Gemfile
- gem "asset_sync", "1.1.0", require: false
+ gem "asset_sync", "~> 1.1", require: false
end
+
+ #group :development do
diff --git a/debian/patches/051-relax-patch-release-versions.patch b/debian/patches/051-relax-patch-release-versions.patch
deleted file mode 100644
index 61b5c81..0000000
--- a/debian/patches/051-relax-patch-release-versions.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-relaxing patch releases required for newer diaspora versions
-
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -16,19 +16,19 @@ gem "diaspora_federation-rails", "0.0.13
-
- # API and JSON
-
--gem "acts_as_api", "0.4.2"
-+gem "acts_as_api", "~> 0.4.2"
- gem "json", "~> 1.8", ">= 1.8.3"
- gem "json-schema", "~> 2.6"
-
- # Authentication
-
- gem "devise", "3.5.6"
--gem "devise_lastseenable", "0.0.6"
-+gem "devise_lastseenable", "~> 0.0.6"
- gem "devise-token_authenticatable", "~> 0.4.0"
-
- # Captcha
-
--gem "simple_captcha2", "0.4.0", require: "simple_captcha"
-+gem "simple_captcha2", "~> 0.4.0", require: "simple_captcha"
-
- # Background processing
-
-@@ -45,11 +45,11 @@ gem "uglifier", "~> 2.7", ">= 2.7.2"
-
- # Configuration
-
--gem "configurate", "0.3.1"
-+gem "configurate", "~> 0.3.1"
-
- # Cross-origin resource sharing
-
--gem "rack-cors", "0.4.0", require: "rack/cors"
-+gem "rack-cors", "~> 0.4.0", require: "rack/cors"
-
- # CSS
-
-@@ -62,14 +62,14 @@ gem "autoprefixer-rails", "~> 6.3", ">=
-
- ENV["DB"] ||= "mysql"
-
--gem "mysql2", "0.4.3" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
--gem "pg", "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
-+gem "mysql2", "~> 0.4.3" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
-+gem "pg", "~> 0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
-
--gem "activerecord-import", "0.11.0"
-+gem "activerecord-import", "~> 0.11.0"
-
- # File uploading
-
--gem "carrierwave", "0.10.0"
-+gem "carrierwave", "~> 0.10.0"
- gem "fog", "~> 1.34"
- gem "mini_magick", "~> 4.4"
- gem "remotipart", "~> 1.2", ">= 1.2.1"
-@@ -84,34 +84,34 @@ gem "entypo-rails", "~> 2.2", ">= 2.2.3"
- # JavaScript
-
- gem "backbone-on-rails", "~> 1.2"
--gem "handlebars_assets", "0.23.0"
-+gem "handlebars_assets", "~> 0.23.0"
- gem "jquery-rails", "~> 4.1"
- gem "jquery-ui-rails", "~> 5.0", ">= 5.0.5"
--gem "js_image_paths", "0.1.0"
-+gem "js_image_paths", "~> 0.1.0"
- gem "js-routes", "~> 1.2", ">= 1.2.4"
-
- source "https://rails-assets.org" do
- gem "rails-assets-jquery", "~> 1.11", ">= 1.11.1" # Should be kept in sync with jquery-rails
-
- gem "rails-assets-markdown-it", "~> 6.0"
-- gem "rails-assets-markdown-it-hashtag", "0.4.0"
-- gem "rails-assets-markdown-it-diaspora-mention", "0.4.0"
-- gem "rails-assets-markdown-it-sanitizer", "0.4.1"
-- gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
-+ gem "rails-assets-markdown-it-hashtag", "~> 0.4.0"
-+ gem "rails-assets-markdown-it-diaspora-mention", "~> 0.4.0"
-+ gem "rails-assets-markdown-it-sanitizer", "~> 0.4.1"
-+ gem "rails-assets-markdown-it--markdown-it-for-inline", "~> 0.1.1"
- gem "rails-assets-markdown-it-sub", "~> 1.0"
- gem "rails-assets-markdown-it-sup", "~> 1.0"
- gem "rails-assets-highlightjs", "~> 9.1"
-
- # jQuery plugins
-
-- gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
-+ gem "rails-assets-jeresig--jquery.hotkeys", "~> 0.2.0"
- gem "rails-assets-jquery-placeholder", "~> 2.3", ">= 2.3.1"
-- gem "rails-assets-jquery-textchange", "0.2.3"
-- gem "rails-assets-perfect-scrollbar", "0.6.10"
-+ gem "rails-assets-jquery-textchange", "~> 0.2.3"
-+ gem "rails-assets-perfect-scrollbar", "~> 0.6.10"
- gem "rails-assets-jakobmattsson--jquery-elastic", "~> 1.6", ">= 1.6.11"
- end
-
--gem "facebox-rails", "0.2.0"
-+gem "facebox-rails", "~> 0.2.0"
-
- # Localization
-
-@@ -130,8 +130,8 @@ gem "nokogiri", "~> 1.6", ">= 1
- gem "redcarpet", "~> 3.3", ">= 3.3.4"
- gem "twitter-text", "~> 1.13", ">= 1.13.3"
- gem "roxml", "~> 3.1", ">= 3.1.6"
--gem "ruby-oembed", "0.9.0"
--gem "open_graph_reader", "0.6.1"
-+gem "ruby-oembed", "~> 0.9.0"
-+gem "open_graph_reader", "~> 0.6.1"
-
- # Services
-
-@@ -140,11 +140,11 @@ gem "omniauth-facebook", "~> 3.0"
- gem "omniauth-tumblr", "~> 1.2"
- gem "omniauth-twitter", "~> 1.2", ">= 1.2.1"
- gem "twitter", "~> 5.16"
--gem "omniauth-wordpress", "0.2.2"
-+gem "omniauth-wordpress", "~> 0.2.2"
-
- # Serializers
-
--gem "active_model_serializers", "0.9.4"
-+gem "active_model_serializers", "~> 0.9.4"
-
- # XMPP chat dependencies
- gem "diaspora-vines", "~> 0.2.0.develop"
-@@ -157,9 +157,9 @@ gem "acts-as-taggable-on", "~> 3.5"
- # URIs and HTTP
-
- gem "addressable", "~> 2.3", ">= 2.3.8", require: "addressable/uri"
--gem "faraday", "0.9.2"
--gem "faraday_middleware", "0.10.0"
--gem "faraday-cookie_jar", "0.0.6"
-+gem "faraday", "~> 0.9.2"
-+gem "faraday_middleware", "~> 0.10.0"
-+gem "faraday-cookie_jar", "~> 0.0.6"
- gem "typhoeus", "~> 1.0", ">= 1.0.1"
-
- # Views
-@@ -172,7 +172,7 @@ gem "rails-timeago", "~> 2.11"
-
- # Logging
-
--gem "logging-rails", "0.5.0", require: "logging/rails"
-+gem "logging-rails", "~> 0.5.0", require: "logging/rails"
-
- # Reading and writing zip files
-
-@@ -195,12 +195,12 @@ gem "minitest"
- group :production do # we don"t install these on travis to speed up test runs
- # Administration
-
-- gem "rails_admin", "0.8.1"
-+ gem "rails_admin", "~> 0.8.1"
-
- # Analytics
-
- gem "rack-google-analytics", "~> 1.2"
-- gem "rack-piwik", "0.3.0", require: "rack/piwik"
-+ gem "rack-piwik", "~> 0.3.0", require: "rack/piwik"
-
- # Click-jacking protection
-
-@@ -208,7 +208,7 @@ group :production do # we don"t install
-
- # Process management
-
-- gem "eye", "0.7"
-+ gem "eye", "~> 0.7.0"
-
- # Redirects
-
diff --git a/debian/patches/060-relax-devise.patch b/debian/patches/060-relax-devise.patch
deleted file mode 100644
index 58a547e..0000000
--- a/debian/patches/060-relax-devise.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-gitlab needs device 4.x
-
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -22,9 +22,9 @@ gem "json-schema", "~> 2.6"
-
- # Authentication
-
--gem "devise", "3.5.6"
-+gem "devise", "~> 4.0"
- gem "devise_lastseenable", "~> 0.0.6"
--gem "devise-token_authenticatable", "~> 0.4.0"
-+gem "devise-token_authenticatable", "~> 0.5.1"
-
- # Captcha
-
diff --git a/debian/patches/061-remove-diaspora-vines.patch b/debian/patches/061-remove-diaspora-vines.patch
deleted file mode 100644
index 6ae6af8..0000000
--- a/debian/patches/061-remove-diaspora-vines.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-vines is optional
-
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -147,7 +147,7 @@ gem "omniauth-wordpress", "~> 0.2.2"
- gem "active_model_serializers", "~> 0.9.4"
-
- # XMPP chat dependencies
--gem "diaspora-vines", "~> 0.2.0.develop"
-+#gem "diaspora-vines", "~> 0.2.0.develop"
- gem "rails-assets-diaspora_jsxc", "~> 0.1.4", source: "https://rails-assets.org"
-
- # Tags
diff --git a/debian/patches/062-lower-jquery-rails.patch b/debian/patches/062-lower-jquery-rails.patch
index 0cb3f0b..8e70fd8 100644
--- a/debian/patches/062-lower-jquery-rails.patch
+++ b/debian/patches/062-lower-jquery-rails.patch
@@ -1,15 +1,20 @@
jquery is backword compatible
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -85,7 +85,7 @@ gem "entypo-rails", "~> 2.2", ">= 2.2.3"
+--- a/Gemfile
++++ b/Gemfile
+@@ -90,13 +90,13 @@
gem "backbone-on-rails", "~> 1.2"
- gem "handlebars_assets", "~> 0.23.0"
--gem "jquery-rails", "~> 4.1"
+ gem "handlebars_assets", "~> 0.23.1"
+-gem "jquery-rails", "~> 4.1", ">= 4.1.1"
+gem "jquery-rails", "~> 4.0"
gem "jquery-ui-rails", "~> 5.0", ">= 5.0.5"
gem "js_image_paths", "~> 0.1.0"
- gem "js-routes", "~> 1.2", ">= 1.2.4"
+ gem "js-routes", "~> 1.2", ">= 1.2.9"
+
+ source "https://rails-assets.org" do
+- gem "rails-assets-jquery", "~> 2.2", ">= 2.2.1" # Should be kept in sync with jquery-rails
++ gem "rails-assets-jquery", ">= 1.11.2" # Should be kept in sync with jquery-rails
+
+ gem "rails-assets-markdown-it", "~> 7.0"
+ gem "rails-assets-markdown-it-hashtag", "~> 0.4.0"
diff --git a/debian/patches/series b/debian/patches/series
index 3d5bb73..782c067 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,6 @@
002-remove-development-test-from-gemfile.patch
-007-loosen-roxml-version.patch
-030-loosen-tiny-versions.patch
-031-embedded-gems.patch
-033-relax-rails-minor-version.patch
043-dont-do-git-checks.patch
044-work-around-sprockets3.patch
-045-replace-sidetiq.patch
050-relax-stable-libs.patch
-051-relax-patch-release-versions.patch
-060-relax-devise.patch
-061-remove-diaspora-vines.patch
062-lower-jquery-rails.patch
0100-set-rails-root.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git
More information about the Pkg-ruby-extras-commits
mailing list