[DRE-commits] [ruby-omniauth-ldap] 02/05: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Mar 15 17:17:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-omniauth-ldap.
commit be79833d3ad878211de193058085544bfad64428
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Tue Mar 15 11:19:19 2016 +0530
refresh patches
---
debian/changelog | 7 ++++
debian/patches/get-rid-of-simplecov.patch | 6 ++-
debian/patches/port-tests-rspec3.patch | 57 +++++++++++++++--------------
debian/patches/relax-net-ldap-version.patch | 34 -----------------
debian/patches/relax-ntlm.patch | 34 -----------------
debian/patches/series | 2 -
6 files changed, 40 insertions(+), 100 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8e8b1a7..10bdf7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-omniauth-ldap (1.0.5-1) UNRELEASED; urgency=medium
+
+ * New upstream patch release
+ * Refresh patches
+
+ -- Pirate Praveen <praveen at debian.org> Tue, 15 Mar 2016 11:18:40 +0530
+
ruby-omniauth-ldap (1.0.4-4) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/get-rid-of-simplecov.patch b/debian/patches/get-rid-of-simplecov.patch
index d8ac2fb..9d31d31 100644
--- a/debian/patches/get-rid-of-simplecov.patch
+++ b/debian/patches/get-rid-of-simplecov.patch
@@ -2,8 +2,10 @@ Description: Remove usage of simplecov while running tests
Author: Pirate Praveen <praveen at debian.org>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
+Index: ruby-omniauth-ldap/spec/spec_helper.rb
+===================================================================
+--- ruby-omniauth-ldap.orig/spec/spec_helper.rb
++++ ruby-omniauth-ldap/spec/spec_helper.rb
@@ -1,7 +1,5 @@
$:.unshift File.expand_path('..', __FILE__)
$:.unshift File.expand_path('../../lib', __FILE__)
diff --git a/debian/patches/port-tests-rspec3.patch b/debian/patches/port-tests-rspec3.patch
index bd5b662..e555bf6 100644
--- a/debian/patches/port-tests-rspec3.patch
+++ b/debian/patches/port-tests-rspec3.patch
@@ -4,9 +4,11 @@ Forwarded: https://github.com/intridea/omniauth-ldap/pull/64
Last-Update: 2016-01-10
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/omniauth-ldap/adaptor_spec.rb
-+++ b/spec/omniauth-ldap/adaptor_spec.rb
-@@ -4,53 +4,53 @@
+Index: ruby-omniauth-ldap/spec/omniauth-ldap/adaptor_spec.rb
+===================================================================
+--- ruby-omniauth-ldap.orig/spec/omniauth-ldap/adaptor_spec.rb
++++ ruby-omniauth-ldap/spec/omniauth-ldap/adaptor_spec.rb
+@@ -4,53 +4,53 @@ describe "OmniAuth::LDAP::Adaptor" do
describe 'initialize' do
it 'should throw exception when must have field is not set' do
#[:host, :port, :method, :bind_dn]
@@ -86,9 +88,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ expect(adaptor.connection.instance_variable_get('@auth')[:initial_credential]).to match(/^NTLMSSP/)
+ expect(adaptor.connection.instance_variable_get('@auth')[:challenge_response]).not_to be_nil
end
- end
-@@ -60,18 +60,18 @@
+ it 'should set the encryption method correctly' do
+@@ -65,18 +65,18 @@ describe "OmniAuth::LDAP::Adaptor" do
it 'should bind simple' do
adaptor = OmniAuth::LDAP::Adaptor.new({host: "192.168.1.126", method: 'plain', base: 'dc=score, dc=local', port: 389, uid: 'sAMAccountName', bind_dn: 'bind_dn', password: 'password'})
@@ -115,17 +117,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
end
end
---- a/spec/omniauth/strategies/ldap_spec.rb
-+++ b/spec/omniauth/strategies/ldap_spec.rb
-@@ -24,46 +24,46 @@
- end
-
- it 'should add a camelization for itself' do
-- OmniAuth::Utils.camelize('ldap').should == 'LDAP'
-+ expect(OmniAuth::Utils.camelize('ldap')).to eq('LDAP')
- end
-
- describe '/auth/ldap' do
+Index: ruby-omniauth-ldap/spec/omniauth/strategies/ldap_spec.rb
+===================================================================
+--- ruby-omniauth-ldap.orig/spec/omniauth/strategies/ldap_spec.rb
++++ ruby-omniauth-ldap/spec/omniauth/strategies/ldap_spec.rb
+@@ -31,19 +31,19 @@ describe "OmniAuth::Strategies::LDAP" do
before(:each){ get '/auth/ldap' }
it 'should display a form' do
@@ -150,9 +146,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
end
- describe 'post /auth/ldap/callback' do
+@@ -51,20 +51,20 @@ describe "OmniAuth::Strategies::LDAP" do
before(:each) do
@adaptor = double(OmniAuth::LDAP::Adaptor, {:uid => 'ping'})
+ @adaptor.stub(:filter)
- OmniAuth::LDAP::Adaptor.stub(:new).and_return(@adaptor)
+ allow(OmniAuth::LDAP::Adaptor).to receive(:new).and_return(@adaptor)
end
@@ -174,7 +171,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
end
-@@ -71,8 +71,8 @@
+@@ -72,8 +72,8 @@ describe "OmniAuth::Strategies::LDAP" do
it 'should redirect to error page' do
post('/auth/ldap/callback', {:username => ""})
@@ -185,7 +182,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
end
-@@ -81,8 +81,8 @@
+@@ -82,8 +82,8 @@ describe "OmniAuth::Strategies::LDAP" do
it 'should redirect to error page' do
post('/auth/ldap/callback', {:username => "ping"})
@@ -196,7 +193,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
end
-@@ -90,8 +90,8 @@
+@@ -91,8 +91,8 @@ describe "OmniAuth::Strategies::LDAP" do
it 'should redirect to error page' do
post('/auth/ldap/callback', {:username => "ping", :password => ""})
@@ -207,7 +204,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
end
end
-@@ -101,21 +101,21 @@
+@@ -102,8 +102,8 @@ describe "OmniAuth::Strategies::LDAP" do
it 'should redirect to error page' do
post('/auth/ldap/callback', {:username => 'ping', :password => 'password'})
@@ -216,7 +213,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ expect(last_response).to be_redirect
+ expect(last_response.headers['Location']).to match(%r{invalid_credentials})
end
- end
+ context 'and filter is set' do
+ it 'should bind with filter' do
+@@ -120,14 +120,14 @@ describe "OmniAuth::Strategies::LDAP" do
context "and communication with LDAP server caused an exception" do
before :each do
@@ -234,24 +233,26 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
end
end
-@@ -125,7 +125,7 @@
- let(:auth_hash){ last_request.env['omniauth.auth'] }
+@@ -138,7 +138,7 @@ describe "OmniAuth::Strategies::LDAP" do
before(:each) do
+ @adaptor.stub(:filter)
- @adaptor.stub(:bind_as).and_return(Net::LDAP::Entry.from_single_ldif_string(
+ allow(@adaptor).to receive(:bind_as).and_return(Net::LDAP::Entry.from_single_ldif_string(
%Q{dn: cn=ping, dc=intridea, dc=com
mail: ping at intridea.com
givenname: Ping
-@@ -148,22 +148,22 @@
- end
+@@ -170,24 +170,24 @@ description: omniauth-ldap
+ Net::LDAP::Filter.should_receive(:construct).with('uid=ping')
+ post('/auth/ldap/callback', {:username => 'ping', :password => 'password'})
- it 'should not redirect to error page' do
-- last_response.should_not be_redirect
+- last_response.should_not be_redirect
+ expect(last_response).not_to be_redirect
+ end
end
it 'should map user info to Auth Hash' do
+ post('/auth/ldap/callback', {:username => 'ping', :password => 'password'})
- auth_hash.uid.should == 'cn=ping, dc=intridea, dc=com'
- auth_hash.info.email.should == 'ping at intridea.com'
- auth_hash.info.first_name.should == 'Ping'
diff --git a/debian/patches/relax-net-ldap-version.patch b/debian/patches/relax-net-ldap-version.patch
deleted file mode 100644
index 3a1139a..0000000
--- a/debian/patches/relax-net-ldap-version.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Relax the dependency on the gem 'net-ldap'
-Author: Pirate Praveen <praveen at debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -30,14 +30,14 @@
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
-- version: 0.3.1
-+ version: 0.8.0
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
-- version: 0.3.1
-+ version: 0.8.0
- - !ruby/object:Gem::Dependency
- name: pyu-ruby-sasl
- requirement: !ruby/object:Gem::Requirement
---- a/omniauth-ldap.gemspec
-+++ b/omniauth-ldap.gemspec
-@@ -10,7 +10,7 @@
- gem.license = "MIT"
-
- gem.add_runtime_dependency 'omniauth', '~> 1.0'
-- gem.add_runtime_dependency 'net-ldap', '~> 0.3.1'
-+ gem.add_runtime_dependency 'net-ldap', '~> 0.8.0'
- gem.add_runtime_dependency 'pyu-ruby-sasl', '~> 0.0.3.1'
- gem.add_runtime_dependency 'rubyntlm', '~> 0.1.1'
- gem.add_development_dependency 'rspec', '~> 2.7'
diff --git a/debian/patches/relax-ntlm.patch b/debian/patches/relax-ntlm.patch
deleted file mode 100644
index c4ee932..0000000
--- a/debian/patches/relax-ntlm.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Relax the dependency on the gem 'ntlm'
-Author: Pirate Praveen <praveen at debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -58,14 +58,14 @@
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
-- version: 0.1.1
-+ version: 0.3.4
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
-- version: 0.1.1
-+ version: 0.3.4
- - !ruby/object:Gem::Dependency
- name: rspec
- requirement: !ruby/object:Gem::Requirement
---- a/omniauth-ldap.gemspec
-+++ b/omniauth-ldap.gemspec
-@@ -12,7 +12,7 @@
- gem.add_runtime_dependency 'omniauth', '~> 1.0'
- gem.add_runtime_dependency 'net-ldap', '~> 0.8.0'
- gem.add_runtime_dependency 'pyu-ruby-sasl', '~> 0.0.3.1'
-- gem.add_runtime_dependency 'rubyntlm', '~> 0.1.1'
-+ gem.add_runtime_dependency 'rubyntlm', '~> 0.3.4'
- gem.add_development_dependency 'rspec', '~> 2.7'
- gem.add_development_dependency 'simplecov'
- gem.add_development_dependency 'rack-test'
diff --git a/debian/patches/series b/debian/patches/series
index 1b6f8bf..97845b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
gitlab.patch
get-rid-of-simplecov.patch
-relax-net-ldap-version.patch
-relax-ntlm.patch
port-tests-rspec3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-omniauth-ldap.git
More information about the Pkg-ruby-extras-commits
mailing list