[Debian-ha-commits] [pcs] 03/10: d/patches: update for new version

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository pcs.

commit 8992f56ea945f2812e07986c9d4b1a9760975d24
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Tue Apr 10 11:34:09 2018 +0200

    d/patches: update for new version
---
 .../0001-Remove-Gemlock.file-on-Debian.patch       |  10 +-
 debian/patches/0005-Replace-orderedhash.patch      | 108 ---------------------
 debian/patches/series                              |   1 -
 3 files changed, 2 insertions(+), 117 deletions(-)

diff --git a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
index d5e4895..37f5310 100644
--- a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
+++ b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
@@ -12,15 +12,11 @@ Change-Id: I49a3aaccabe58efad195786006b79526fe8db7f2
  1 file changed, 53 deletions(-)
  delete mode 100644 pcsd/Gemfile.lock
 
-diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock
-deleted file mode 100644
-index 3140d6f..0000000
 --- a/pcsd/Gemfile.lock
 +++ /dev/null
-@@ -1,48 +0,0 @@
+@@ -1,45 +0,0 @@
 -GEM
 -  remote: https://rubygems.org/
--  remote: https://tojeline.fedorapeople.org/rubygems/
 -  specs:
 -    backports (3.9.1)
 -    ethon (0.10.1)
@@ -28,9 +24,8 @@ index 3140d6f..0000000
 -    json (2.1.0)
 -    multi_json (1.12.2)
 -    open4 (1.3.4)
--    orderedhash (0.0.6)
 -    rack (1.6.4)
--    rack-protection (1.5.3)
+-    rack-protection (1.5.5)
 -      rack
 -    rack-test (0.7.0)
 -      rack (>= 1.0)
@@ -58,7 +53,6 @@ index 3140d6f..0000000
 -  json
 -  multi_json
 -  open4
--  orderedhash
 -  rack
 -  rack-protection
 -  rack-test
diff --git a/debian/patches/0005-Replace-orderedhash.patch b/debian/patches/0005-Replace-orderedhash.patch
deleted file mode 100644
index 084820d..0000000
--- a/debian/patches/0005-Replace-orderedhash.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Description: Replace orderedhash gem with active_support
- Gem orderedhash <https://rubygems.org/gems/orderedhash/>
- has several problems:
- * not packaged in Debian (so not used by some other software)
- * does not look maintained (last version 0.0.6 is from 2008)
- * no license file included (just one mention of public domain
-   in a source file)
- .
- On the other hand, replacement active_support gem is rather
- popular (albeit somewhat big) and does not experience any of
- these problems.
-Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
-Last-Update: 2017-06-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/pcsd/config.rb
-+++ b/pcsd/config.rb
-@@ -1,5 +1,5 @@
- require 'json'
--require 'orderedhash'
-+require 'active_support/ordered_hash'
- 
- require 'cluster.rb'
- require 'permissions.rb'
-@@ -124,15 +124,15 @@
-   end
- 
-   def text()
--    out_hash = OrderedHash.new
-+    out_hash = ActiveSupport::OrderedHash.new
-     out_hash['format_version'] = CURRENT_FORMAT
-     out_hash['data_version'] = @data_version
-     out_hash['clusters'] = []
--    out_hash['permissions'] = OrderedHash.new
-+    out_hash['permissions'] = ActiveSupport::OrderedHash.new
-     out_hash['permissions']['local_cluster'] = []
- 
-     @clusters.each { |c|
--      c_hash = OrderedHash.new
-+      c_hash = ActiveSupport::OrderedHash.new
-       c_hash['name'] = c.name
-       c_hash['nodes'] = c.nodes.uniq.sort
-       out_hash['clusters'] << c_hash
-@@ -182,7 +182,7 @@
- end
- 
- def hash_to_ordered_hash(hash)
--  new_hash = OrderedHash.new
-+  new_hash = ActiveSupport::OrderedHash.new
-   hash.keys.sort.each { |key| new_hash[key] = hash[key] }
-   return new_hash
- end
-@@ -235,7 +235,7 @@
-   end
- 
-   def text()
--    out_hash = OrderedHash.new
-+    out_hash = ActiveSupport::OrderedHash.new
-     out_hash['format_version'] = CURRENT_FORMAT
-     out_hash['data_version'] = @data_version
-     out_hash['tokens'] = hash_to_ordered_hash(@tokens)
---- a/pcsd/pcsd-cli.rb
-+++ b/pcsd/pcsd-cli.rb
-@@ -4,15 +4,15 @@
- require 'etc'
- require 'json'
- require 'stringio'
--require 'orderedhash'
-+require 'active_support/ordered_hash'
- 
- require 'bootstrap.rb'
- require 'pcs.rb'
- require 'auth.rb'
- require 'remote.rb'
- 
- def cli_format_response(status, text=nil, data=nil)
--  response = OrderedHash.new
-+  response = ActiveSupport::OrderedHash.new
-   response['status'] = status
-   response['text'] = text if text
-   response['data'] = data if data
---- a/pcsd/permissions.rb
-+++ b/pcsd/permissions.rb
-@@ -1,4 +1,4 @@
--require 'orderedhash'
-+require 'active_support/ordered_hash'
- 
- module Permissions
- 
-@@ -104,7 +104,7 @@
-     end
- 
-     def to_hash()
--      perm_hash = OrderedHash.new
-+      perm_hash = ActiveSupport::OrderedHash.new
-       perm_hash['type'] = @type
-       perm_hash['name'] = @name
-       perm_hash['allow'] = @allow_list.uniq.sort
---- a/pcsd/Gemfile
-+++ b/pcsd/Gemfile
-@@ -15,6 +15,6 @@
- gem 'json'
- gem 'multi_json'
- gem 'open4'
--gem 'orderedhash'
-+gem 'activesupport'
- gem 'ffi'
- gem 'ethon'
diff --git a/debian/patches/series b/debian/patches/series
index 0fd88ad..74101af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 0002-Remove-require-in-pcsd-ssl.rb.patch
 0003-Remove-pcsd-test-.gitignore-file.patch
 0004-settings.py
-0005-Replace-orderedhash.patch
 0006-Fix-corosync-log.patch
 0007-Fix-testsuite.patch
 0008-Replace-chkconfig.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git