[DRE-commits] [berkshelf-api] 05/15: Add patches
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Thu Mar 24 11:24:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository berkshelf-api.
commit 01f309dd5888dc7616ed5e428329f04eff8b9972
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Wed Aug 19 18:17:04 2015 +0300
Add patches
---
.../patches/0001-Don-t-require-archive-gem.patch | 44 ++++++++++++++++++++++
debian/patches/0002-Allow-ruby-hashie-3.patch | 32 ++++++++++++++++
...re-rubygems-bundler-don-t-change-in-tests.patch | 20 ++++++++++
.../0004-Workaround-rspec-core-bug-2064.patch | 28 ++++++++++++++
.../patches/0005-RSA-private-key-for-tests.patch | 43 +++++++++++++++++++++
debian/patches/series | 5 +++
6 files changed, 172 insertions(+)
diff --git a/debian/patches/0001-Don-t-require-archive-gem.patch b/debian/patches/0001-Don-t-require-archive-gem.patch
new file mode 100644
index 0000000..27c34a4
--- /dev/null
+++ b/debian/patches/0001-Don-t-require-archive-gem.patch
@@ -0,0 +1,44 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Mon, 17 Aug 2015 17:19:57 +0300
+Subject: Don't require archive gem
+
+---
+ lib/berkshelf/api/site_connector/supermarket.rb | 1 -
+ metadata.yml | 14 --------------
+ 2 files changed, 15 deletions(-)
+
+diff --git a/lib/berkshelf/api/site_connector/supermarket.rb b/lib/berkshelf/api/site_connector/supermarket.rb
+index b702023..da2b1a8 100644
+--- a/lib/berkshelf/api/site_connector/supermarket.rb
++++ b/lib/berkshelf/api/site_connector/supermarket.rb
+@@ -1,5 +1,4 @@
+ require 'open-uri'
+-require 'archive'
+ require 'tempfile'
+
+ module OpenURI
+diff --git a/metadata.yml b/metadata.yml
+index 8889534..1aade76 100644
+--- a/metadata.yml
++++ b/metadata.yml
+@@ -116,20 +116,6 @@ dependencies:
+ - !ruby/object:Gem::Version
+ version: 3.0.0
+ - !ruby/object:Gem::Dependency
+- name: archive
+- requirement: !ruby/object:Gem::Requirement
+- requirements:
+- - - '='
+- - !ruby/object:Gem::Version
+- version: 0.0.6
+- type: :runtime
+- prerelease: false
+- version_requirements: !ruby/object:Gem::Requirement
+- requirements:
+- - - '='
+- - !ruby/object:Gem::Version
+- version: 0.0.6
+-- !ruby/object:Gem::Dependency
+ name: buff-config
+ requirement: !ruby/object:Gem::Requirement
+ requirements:
diff --git a/debian/patches/0002-Allow-ruby-hashie-3.patch b/debian/patches/0002-Allow-ruby-hashie-3.patch
new file mode 100644
index 0000000..69b7d7f
--- /dev/null
+++ b/debian/patches/0002-Allow-ruby-hashie-3.patch
@@ -0,0 +1,32 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Mon, 17 Aug 2015 17:20:56 +0300
+Subject: Allow ruby-hashie >= 3
+
+---
+ metadata.yml | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/metadata.yml b/metadata.yml
+index 1aade76..215192e 100644
+--- a/metadata.yml
++++ b/metadata.yml
+@@ -102,9 +102,6 @@ dependencies:
+ - - ">="
+ - !ruby/object:Gem::Version
+ version: 2.0.4
+- - - "<"
+- - !ruby/object:Gem::Version
+- version: 3.0.0
+ type: :runtime
+ prerelease: false
+ version_requirements: !ruby/object:Gem::Requirement
+@@ -112,9 +109,6 @@ dependencies:
+ - - ">="
+ - !ruby/object:Gem::Version
+ version: 2.0.4
+- - - "<"
+- - !ruby/object:Gem::Version
+- version: 3.0.0
+ - !ruby/object:Gem::Dependency
+ name: buff-config
+ requirement: !ruby/object:Gem::Requirement
diff --git a/debian/patches/0003-Don-t-require-rubygems-bundler-don-t-change-in-tests.patch b/debian/patches/0003-Don-t-require-rubygems-bundler-don-t-change-in-tests.patch
new file mode 100644
index 0000000..98eb7a6
--- /dev/null
+++ b/debian/patches/0003-Don-t-require-rubygems-bundler-don-t-change-in-tests.patch
@@ -0,0 +1,20 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Mon, 17 Aug 2015 17:25:48 +0300
+Subject: Don't require rubygems & bundler, don't change $: in tests
+
+---
+ spec/spec_helper.rb | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index d8644cb..7ba7757 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,7 +1,3 @@
+-$:.push File.expand_path("../../lib", __FILE__)
+-
+-require 'rubygems'
+-require 'bundler'
+ require 'rspec'
+ require 'spork'
+ require 'rack/test'
diff --git a/debian/patches/0004-Workaround-rspec-core-bug-2064.patch b/debian/patches/0004-Workaround-rspec-core-bug-2064.patch
new file mode 100644
index 0000000..df71440
--- /dev/null
+++ b/debian/patches/0004-Workaround-rspec-core-bug-2064.patch
@@ -0,0 +1,28 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Wed, 19 Aug 2015 13:36:42 +0300
+Subject: Workaround rspec-core bug 2064
+
+---
+ spec/spec_helper.rb | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 7ba7757..9575dd1 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -20,6 +20,15 @@ Spork.prefork do
+ config.before(:suite) { Berkshelf::RSpec::ChefServer.start }
+ config.before(:all) { Berkshelf::API::Logging.init(location: '/dev/null') }
+
++ # Workaround for bug https://github.com/rspec/rspec-core/issues/2064.
++ #
++ # When `true', spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb
++ # will hang on `it_behaves_like "a human-readable string"', which is
++ # spec/support/human_reaable.rb `expect(subject.to_s).to_not ...'
++ #
++ # This feature is introduced in rspec 3.3, so rspec <= 3.2 works fine.
++ config.threadsafe = false
++
+ config.before do
+ Celluloid.shutdown
+ Celluloid.boot
diff --git a/debian/patches/0005-RSA-private-key-for-tests.patch b/debian/patches/0005-RSA-private-key-for-tests.patch
new file mode 100644
index 0000000..9a77dd5
--- /dev/null
+++ b/debian/patches/0005-RSA-private-key-for-tests.patch
@@ -0,0 +1,43 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Wed, 19 Aug 2015 17:50:07 +0300
+Subject: RSA private key for tests
+
+ Copied from upstream
+---
+ spec/fixtures/reset.pem | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+ create mode 100644 spec/fixtures/reset.pem
+
+diff --git a/spec/fixtures/reset.pem b/spec/fixtures/reset.pem
+new file mode 100644
+index 0000000..19ffdb9
+--- /dev/null
++++ b/spec/fixtures/reset.pem
+@@ -0,0 +1,27 @@
++-----BEGIN RSA PRIVATE KEY-----
++MIIEpQIBAAKCAQEAyyUMqrTh1IzKOyE0fvXEWC7m0AdMI8/dr9JJMUKtK9vhhP0w
++rm6m95GoybFM2IRryukFsAxpcir3M1ungTU3Smq4MshhMJ7H9FbvZVfQoknTbCsR
++w6scg2fBepxT2+fcGRufr8nAh92M3uUkN9bMMTAkt18D4br6035YvdmvHDJERxYq
++ByA/720AdI9VNSIvw+x8oqsIkXLEdF6dgT9MpG5iWZT66pbFsnNZpRrd4/bFNWBY
+++13aOqdmjiTL08/EdgQFKMT5qimpos1TuQhA7mwInOjQgzVu9uCDkMiYejaLbUz0
++lGyS8y4uxu6z2hA900Jg/z+JJuXymH5QAX3GZQIDAQABAoIBAQCtFXkwbYPI1Nht
++/wG6du5+8B9K+hy+mppY9wPTy+q+Zs9Ev3Fd/fuXDm1QxBckl9c8AMUO1dR2KPOM
++t7gFl/DvH/SnmCFvCqp1nijFIUgrLlnMXPn6zG0z7RBlxpKQ2IGohufNIEpBuNwR
++Ag2U4hgChPGTp4ooJ2cVEh7MS5AupYPDbC62dWEdW68aRTWhh2BCGAWBb6s16yl9
++aZ7+OcxW2eeRJVbRfLkLQEDutJZi5TfOEn5QPc86ZgxcCmnvwulnpnhpz6QCkgQt
++OP/+KRqDhWSDVCFREVT30fUIj1EWvK7NFWASZQxueZStuIvMEKeFebYfrbHxRFzJ
++UmaxJnWVAoGBAPbKLpeky6ClccBaHHrCgjzakoDfGgyNKDQ9g753lJxB8nn7d9X4
++HQpkWpfqAGFRZp1hI2H+VxyUXLh2Ob5OUeTm0OZJll35vycOaQEtfgIScXTcvzn0
++16J9eX2YY4wIHEEMh85nKk8BEGgiNP5nuEviHocCeYXoi/Zq3+qj6v63AoGBANK5
++4nyi6LBQFs1CUc7Sh7vjtOE3ia7KeRmOr7gS6QhS3iK3Oa8FzBLJ6ETjN2a9Bw8N
++cF7I/+cr4s7DUJjxdb53D/J6TVSYORNNCUVnpF/uB2LqqdXDYmpO0PvFkXFoYTnJ
++kaLAN8uCoLKr6JH9tq3DfXIfDIHiZ+BOIvI070fDAoGBAMDyzEDFmGruTyRLj66u
+++rJnVVmqlKwxhLhrS+CTj74nlVOnt0a0KMhiM65IRqnPwcHUG5zXBPaUTHXwAS93
++/nFPwQ37hLPOupPnoVNJZRZrowbyPBQtCJbDMURv64ylHqoBCQDoCd0hANnZvMMX
++BrFVhfaaibaXXS542r6SD/27AoGAECadHE5kJTdOOBcwK/jo3Fa8g1J9Y/8yvum3
++wBT69V9clS6T5j08geglvDnqAh7UzquKBEnFi1NKw+wmXkKLcrivaTdEfApavYb3
++AfHKoGue907jC3Y5Mcquq81ds2J7qTEwz1eKLzfo1yjj32ShvrmwALIuhDn1GjUC
++6qtx938CgYEApEqvu0nocR1jmVVlLe5uKQBj949dh6NGq0R5Lztz6xufaTYzMC3d
++AZG9XPPjRqSLs+ylSXJpwHEwoeyLFDaJcO+GgW1/ut4MC2HppOx6aImwDdXMHUWR
++KYGIFF4AU/IYoBcanAm4s078EH/Oz01B2c7tR2TqabisPgLYe7PXSCw=
++-----END RSA PRIVATE KEY-----
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..250d477
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+0001-Don-t-require-archive-gem.patch
+0002-Allow-ruby-hashie-3.patch
+0003-Don-t-require-rubygems-bundler-don-t-change-in-tests.patch
+0004-Workaround-rspec-core-bug-2064.patch
+0005-RSA-private-key-for-tests.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/berkshelf-api.git
More information about the Pkg-ruby-extras-commits
mailing list