[DRE-commits] [ruby-celluloid-io] 04/06: Refresh patches, deletes patches already applied upstream
Sruthi Chandran
srud-guest at moszumanska.debian.org
Sat Sep 30 10:23:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
srud-guest pushed a commit to branch master
in repository ruby-celluloid-io.
commit b41eec0cde6acd6d00cb154bed43259705835fd2
Author: Sruthi Chandran <srud at disroot.org>
Date: Sat Sep 30 13:13:10 2017 +0530
Refresh patches, deletes patches already applied upstream
---
...01-Disable-bundler-rubygems-and-coveralls.patch | 26 ++--
debian/patches/0002-Rspec3-compatibility.patch | 132 ---------------------
.../0003-Add-require-pathname-to-spec_helper.patch | 12 +-
.../patches/0004-Disable-DNS-and-SSL-tests.patch | 8 +-
.../0005-udpsocket_recvfrom_nonblock_numeric.patch | 23 ----
debian/patches/series | 2 -
6 files changed, 17 insertions(+), 186 deletions(-)
diff --git a/debian/patches/0001-Disable-bundler-rubygems-and-coveralls.patch b/debian/patches/0001-Disable-bundler-rubygems-and-coveralls.patch
index 2205692..d46df0d 100644
--- a/debian/patches/0001-Disable-bundler-rubygems-and-coveralls.patch
+++ b/debian/patches/0001-Disable-bundler-rubygems-and-coveralls.patch
@@ -7,28 +7,22 @@ Subject: Disable bundler, rubygems and coveralls
spec/spec_helper.rb | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
-diff --git a/Rakefile b/Rakefile
-index f43f2b6..b32471c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,5 @@
#!/usr/bin/env rake
--require 'bundler/gem_tasks'
-+#require 'bundler/gem_tasks'
+-require "bundler/gem_tasks"
++#require "bundler/gem_tasks"
Dir["tasks/**/*.task"].each { |task| load task }
- task :default => :spec
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 1e47ac7..fd6f36d 100644
+ task default: :spec
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
-@@ -1,9 +1,5 @@
--require 'rubygems'
--require 'bundler/setup'
- require 'celluloid/io'
- require 'celluloid/rspec'
--require 'coveralls'
--Coveralls.wear!
+@@ -1,5 +1,5 @@
+-require "rubygems"
+-require "bundler/setup"
++#require "rubygems"
++#require "bundler/setup"
- logfile = File.open(File.expand_path("../../log/test.log", __FILE__), 'a')
- logfile.sync = true
+ module Specs
+ ALLOW_SLOW_MAILBOXES = true # TODO: Remove hax.
diff --git a/debian/patches/0002-Rspec3-compatibility.patch b/debian/patches/0002-Rspec3-compatibility.patch
deleted file mode 100644
index fb36cba..0000000
--- a/debian/patches/0002-Rspec3-compatibility.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Fri, 26 Jun 2015 17:40:38 +0300
-Subject: Rspec3 compatibility
-
----
- spec/celluloid/io/reactor_spec.rb | 2 +-
- spec/celluloid/io/ssl_server_spec.rb | 2 +-
- spec/celluloid/io/tcp_server_spec.rb | 2 +-
- spec/celluloid/io/tcp_socket_spec.rb | 6 +++---
- spec/celluloid/io/udp_socket_spec.rb | 2 +-
- spec/celluloid/io/unix_server_spec.rb | 2 +-
- spec/celluloid/io/unix_socket_spec.rb | 4 ++--
- 7 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/spec/celluloid/io/reactor_spec.rb b/spec/celluloid/io/reactor_spec.rb
-index 9c63990..f552683 100644
---- a/spec/celluloid/io/reactor_spec.rb
-+++ b/spec/celluloid/io/reactor_spec.rb
-@@ -29,7 +29,7 @@ describe Celluloid::IO::Reactor do
- end
- end
-
-- expect(handle).to be_true
-+ expect(handle).to be_truthy
-
- server.close
- peer.close
-diff --git a/spec/celluloid/io/ssl_server_spec.rb b/spec/celluloid/io/ssl_server_spec.rb
-index 1a53f21..fda8712 100644
---- a/spec/celluloid/io/ssl_server_spec.rb
-+++ b/spec/celluloid/io/ssl_server_spec.rb
-@@ -25,7 +25,7 @@ describe Celluloid::IO::SSLServer do
- context "inside Celluloid::IO" do
- it "should be evented" do
- with_ssl_server do |subject|
-- within_io_actor { Celluloid::IO.evented? }.should be_true
-+ within_io_actor { Celluloid::IO.evented? }.should be_truthy
- end
- end
-
-diff --git a/spec/celluloid/io/tcp_server_spec.rb b/spec/celluloid/io/tcp_server_spec.rb
-index bfb3437..17a19d9 100644
---- a/spec/celluloid/io/tcp_server_spec.rb
-+++ b/spec/celluloid/io/tcp_server_spec.rb
-@@ -11,7 +11,7 @@ describe Celluloid::IO::TCPServer do
- context "inside Celluloid::IO" do
- it "should be evented" do
- with_tcp_server do |subject|
-- within_io_actor { Celluloid::IO.evented? }.should be_true
-+ within_io_actor { Celluloid::IO.evented? }.should be_truthy
- end
- end
-
-diff --git a/spec/celluloid/io/tcp_socket_spec.rb b/spec/celluloid/io/tcp_socket_spec.rb
-index e2e9ddf..a54f56e 100644
---- a/spec/celluloid/io/tcp_socket_spec.rb
-+++ b/spec/celluloid/io/tcp_socket_spec.rb
-@@ -23,7 +23,7 @@ describe Celluloid::IO::TCPSocket do
- thread = Thread.new { server.accept }
-
- value = within_io_actor { Celluloid::IO::TCPSocket.open(example_addr, example_port) { true } }
-- value.should be_true
-+ value.should be_truthy
-
- server.close
- thread.terminate
-@@ -47,7 +47,7 @@ describe Celluloid::IO::TCPSocket do
-
- it "should be evented" do
- with_connected_sockets do |subject|
-- within_io_actor { Celluloid::IO.evented? }.should be_true
-+ within_io_actor { Celluloid::IO.evented? }.should be_truthy
- end
- end
-
-@@ -124,7 +124,7 @@ describe Celluloid::IO::TCPSocket do
- within_io_actor {
- subject.read(1)
- Celluloid.timeout(0.5) {
-- subject.eof?.should be_false
-+ subject.eof?.should be_falsey
- }
- }
- }.to raise_error(Celluloid::Task::TimeoutError)
-diff --git a/spec/celluloid/io/udp_socket_spec.rb b/spec/celluloid/io/udp_socket_spec.rb
-index d7d4769..78e17c5 100644
---- a/spec/celluloid/io/udp_socket_spec.rb
-+++ b/spec/celluloid/io/udp_socket_spec.rb
-@@ -12,7 +12,7 @@ describe Celluloid::IO::UDPSocket do
-
- context "inside Celluloid::IO" do
- it "should be evented" do
-- within_io_actor { Celluloid::IO.evented? }.should be_true
-+ within_io_actor { Celluloid::IO.evented? }.should be_truthy
- end
-
- it "sends and receives packets" do
-diff --git a/spec/celluloid/io/unix_server_spec.rb b/spec/celluloid/io/unix_server_spec.rb
-index a0f9fdc..328972e 100644
---- a/spec/celluloid/io/unix_server_spec.rb
-+++ b/spec/celluloid/io/unix_server_spec.rb
-@@ -11,7 +11,7 @@ describe Celluloid::IO::UNIXServer do
- context "inside Celluloid::IO" do
- it "should be evented" do
- with_unix_server do |subject|
-- within_io_actor { Celluloid::IO.evented? }.should be_true
-+ within_io_actor { Celluloid::IO.evented? }.should be_truthy
- end
- end
-
-diff --git a/spec/celluloid/io/unix_socket_spec.rb b/spec/celluloid/io/unix_socket_spec.rb
-index 132d18d..f3e9e44 100644
---- a/spec/celluloid/io/unix_socket_spec.rb
-+++ b/spec/celluloid/io/unix_socket_spec.rb
-@@ -25,7 +25,7 @@ describe Celluloid::IO::UNIXSocket do
-
- it "should be evented" do
- with_connected_unix_sockets do |subject|
-- within_io_actor { Celluloid::IO.evented? }.should be_true
-+ within_io_actor { Celluloid::IO.evented? }.should be_truthy
- end
- end
-
-@@ -111,7 +111,7 @@ describe Celluloid::IO::UNIXSocket do
- within_io_actor {
- subject.read(1)
- Celluloid.timeout(0.5) {
-- subject.eof?.should be_false
-+ subject.eof?.should be_falsey
- }
- }
- }.to raise_error(Celluloid::Task::TimeoutError)
diff --git a/debian/patches/0003-Add-require-pathname-to-spec_helper.patch b/debian/patches/0003-Add-require-pathname-to-spec_helper.patch
index 0a72bd0..e9b322c 100644
--- a/debian/patches/0003-Add-require-pathname-to-spec_helper.patch
+++ b/debian/patches/0003-Add-require-pathname-to-spec_helper.patch
@@ -6,14 +6,12 @@ Subject: Add require 'pathname' to spec_helper
spec/spec_helper.rb | 1 +
1 file changed, 1 insertion(+)
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index fd6f36d..9936ceb 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
-@@ -1,5 +1,6 @@
- require 'celluloid/io'
- require 'celluloid/rspec'
+@@ -7,5 +7,6 @@
+
+ require "celluloid/rspec"
+ require "celluloid/io"
+require 'pathname'
- logfile = File.open(File.expand_path("../../log/test.log", __FILE__), 'a')
- logfile.sync = true
+ Dir[*Specs::INCLUDE_PATHS].map { |f| require f }
diff --git a/debian/patches/0004-Disable-DNS-and-SSL-tests.patch b/debian/patches/0004-Disable-DNS-and-SSL-tests.patch
index d91c0af..64624cc 100644
--- a/debian/patches/0004-Disable-DNS-and-SSL-tests.patch
+++ b/debian/patches/0004-Disable-DNS-and-SSL-tests.patch
@@ -7,21 +7,17 @@ Subject: Disable DNS and SSL tests
spec/celluloid/io/ssl_socket_spec.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/spec/celluloid/io/dns_resolver_spec.rb b/spec/celluloid/io/dns_resolver_spec.rb
-index 87ca2c7..e166f2b 100644
--- a/spec/celluloid/io/dns_resolver_spec.rb
+++ b/spec/celluloid/io/dns_resolver_spec.rb
-@@ -40,4 +40,4 @@ describe Celluloid::IO::DNSResolver do
+@@ -40,4 +40,4 @@
end
end
end
-end
+end if false
-diff --git a/spec/celluloid/io/ssl_socket_spec.rb b/spec/celluloid/io/ssl_socket_spec.rb
-index 86df511..d29e6b5 100644
--- a/spec/celluloid/io/ssl_socket_spec.rb
+++ b/spec/celluloid/io/ssl_socket_spec.rb
-@@ -216,4 +216,4 @@ describe Celluloid::IO::SSLSocket do
+@@ -239,4 +239,4 @@
peer.close
end
end
diff --git a/debian/patches/0005-udpsocket_recvfrom_nonblock_numeric.patch b/debian/patches/0005-udpsocket_recvfrom_nonblock_numeric.patch
deleted file mode 100644
index d1ec5f9..0000000
--- a/debian/patches/0005-udpsocket_recvfrom_nonblock_numeric.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: The flag for `UDPSocket#recvfrom_nonblock` should be Numeric in Ruby 2.3
-Origin: upstream, https://github.com/celluloid/celluloid-io/commit/8bf7f38e35bffc38cc69dedcb6ce9ec0fceee4c6.patch
-Author: Ryunosuke SATO <tricknotes.rs at gmail.com>
-Reviewed-by: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2016-03-03
-
----
- lib/celluloid/io/udp_socket.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/celluloid/io/udp_socket.rb b/lib/celluloid/io/udp_socket.rb
-index 290655e..703ab04 100644
---- a/lib/celluloid/io/udp_socket.rb
-+++ b/lib/celluloid/io/udp_socket.rb
-@@ -16,7 +16,7 @@ def wait_readable; Celluloid::IO.wait_readable(self); end
- # MSG_ options. The first element of the results, mesg, is the data
- # received. The second element, sender_addrinfo, contains
- # protocol-specific address information of the sender.
-- def recvfrom(maxlen, flags = nil)
-+ def recvfrom(maxlen, flags = 0)
- begin
- if @socket.respond_to? :recvfrom_nonblock
- @socket.recvfrom_nonblock(maxlen, flags)
diff --git a/debian/patches/series b/debian/patches/series
index c17c0ea..5fd4832 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
0001-Disable-bundler-rubygems-and-coveralls.patch
-0002-Rspec3-compatibility.patch
0003-Add-require-pathname-to-spec_helper.patch
0004-Disable-DNS-and-SSL-tests.patch
-0005-udpsocket_recvfrom_nonblock_numeric.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-celluloid-io.git
More information about the Pkg-ruby-extras-commits
mailing list