[DRE-commits] [diaspora] 01/01: rack-protection is in sync

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit 0421d7e2ef6b58e9096158be76e17fefbfa7c633
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 29 09:05:13 2015 +0530

    rack-protection is in sync
---
 debian/changelog                              | 2 +-
 debian/control                                | 2 +-
 debian/patches/030-loosen-tiny-versions.patch | 9 ---------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97d0539..642b5a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ diaspora (0.5.2.0+debian-7) UNRELEASED; urgency=medium
      diaspora-installer)
   * Stop diaspora before upgrade
   * Set minimum version for ruby-rails-assets-markdown-it, ruby-fog,
-    ruby-rack-rewrite, ruby-uuid, ruby-mini-magick
+    ruby-rack-rewrite, ruby-uuid, ruby-mini-magick, ruby-rack-protection
   * Add ruby-responders to dependencies
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 14:52:07 +0530
diff --git a/debian/control b/debian/control
index df57f3e..f9736f7 100644
--- a/debian/control
+++ b/debian/control
@@ -115,7 +115,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-rails-admin,
  ruby-rack-google-analytics,
  ruby-rack-piwik (>=0.3.0),
- ruby-rack-protection,
+ ruby-rack-protection (>= 1.5.3),
  ruby-eye (>= 0.7~pre-1),
  ruby-rack-rewrite (>= 1.5.1),
  ruby-rack-ssl,
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index f53a4ce..34debdc 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -114,12 +114,3 @@ Index: diaspora/Gemfile
  
    # Analytics
  
-@@ -203,7 +203,7 @@ group :production do # we don"t install
- 
-   # Click-jacking protection
- 
--  gem "rack-protection", "1.5.3"
-+  gem "rack-protection", "~> 1.5.2"
- 
-   # Process management
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git