[DRE-commits] [ruby-celluloid-io] 01/03: Import upstream patch to change to Numeric the result of recvfrom for UPDSockets

Cédric Boutillier boutil at moszumanska.debian.org
Thu Mar 3 17:35:56 UTC 2016


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

boutil pushed a commit to branch master
in repository ruby-celluloid-io.

commit e2bbc6efda91fb709c720a7268f4ecbb50b4d81e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Mar 3 18:22:15 2016 +0100

    Import upstream patch to change to Numeric the result of recvfrom for UPDSockets
---
 debian/changelog                                   |  8 ++++++++
 .../0005-udpsocket_recvfrom_nonblock_numeric.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f1e2309..c0e1af4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-celluloid-io (0.16.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Import upstream patch to change to Numeric the result of recvfrom for
+    UPDSockets. It fixes tests for ruby2.3
+
+ -- Cédric Boutillier <boutil at debian.org>  Thu, 03 Mar 2016 18:21:31 +0100
+
 ruby-celluloid-io (0.16.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0005-udpsocket_recvfrom_nonblock_numeric.patch b/debian/patches/0005-udpsocket_recvfrom_nonblock_numeric.patch
new file mode 100644
index 0000000..d1ec5f9
--- /dev/null
+++ b/debian/patches/0005-udpsocket_recvfrom_nonblock_numeric.patch
@@ -0,0 +1,23 @@
+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 6d6caae..c17c0ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 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