From 5d34383ed9e80822196cd4134e82f3e9c68561ce Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 4 Apr 2018 21:51:30 +0530 Subject: [PATCH] refresh patches --- debian/patches/0050-relax-stable-libs.patch | 3 +-- debian/patches/0250-relax-licensee.patch | 11 ----------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 debian/patches/0250-relax-licensee.patch diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch index ba5b859605..dffb9835c0 100644 --- a/debian/patches/0050-relax-stable-libs.patch +++ b/debian/patches/0050-relax-stable-libs.patch @@ -221,8 +221,7 @@ gitlab Gemfile +gem 'babosa', '~> 1.0', '>= 1.0.2' # Sanitizes SVG input --gem 'loofah', '~> 2.0.3' -+gem 'loofah', '~> 2.0', '>= 2.0.3' + gem 'loofah', '~> 2.2' # Working with license -gem 'licensee', '~> 8.7.0' diff --git a/debian/patches/0250-relax-licensee.patch b/debian/patches/0250-relax-licensee.patch deleted file mode 100644 index 10aa1389fa..0000000000 --- a/debian/patches/0250-relax-licensee.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Gemfile -+++ b/Gemfile -@@ -222,7 +222,7 @@ - gem 'loofah', '~> 2.0', '>= 2.0.3' - - # Working with license --gem 'licensee', '~> 8.7' -+gem 'licensee', '~> 8.0' - - # Protect against bruteforcing - gem 'rack-attack', '~> 4.4', '>= 4.4.1' diff --git a/debian/patches/series b/debian/patches/series index 091d4a0cc4..e1a2b20db2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,6 @@ source-init-functions.patch pid-log-paths.patch 0220-relax-webmock.patch -0250-relax-licensee.patch 0280-relax-pg.patch 0290-skip-peek-mysql2.patch 0300-relax-rbnacl.patch