[DRE-commits] [ruby-eventmachine] 02/05: Refresh upstream patches to apply cleanly
Balint Reczey
rbalint at moszumanska.debian.org
Mon Jun 27 22:03:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
rbalint pushed a commit to branch wheezy-security
in repository ruby-eventmachine.
commit 0b4adf84e67171b07e8e4e3cc145a6bf769ab234
Author: Balint Reczey <balint at balintreczey.hu>
Date: Mon Jun 27 20:40:50 2016 +0200
Refresh upstream patches to apply cleanly
---
...e-ruby-select-api-with-expandable-fd-sets.patch | 30 ++++++++--------------
...d-stubs-with-warnings-for-1.8.7-and-1.9.0.patch | 15 ++++-------
...-comment-about-where-the-macros-came-from.patch | 7 +----
3 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/debian/patches/0002-use-ruby-select-api-with-expandable-fd-sets.patch b/debian/patches/0002-use-ruby-select-api-with-expandable-fd-sets.patch
index 9a94a64..98a5d87 100644
--- a/debian/patches/0002-use-ruby-select-api-with-expandable-fd-sets.patch
+++ b/debian/patches/0002-use-ruby-select-api-with-expandable-fd-sets.patch
@@ -13,11 +13,9 @@ Conflicts:
3 files changed, 42 insertions(+), 20 deletions(-)
create mode 100644 tests/test_many_fds.rb
-diff --git a/ext/em.cpp b/ext/em.cpp
-index a53699b..d51e716 100644
--- a/ext/em.cpp
+++ b/ext/em.cpp
-@@ -707,9 +707,9 @@ SelectData_t::SelectData_t
+@@ -774,9 +774,9 @@
SelectData_t::SelectData_t()
{
maxsocket = 0;
@@ -30,7 +28,7 @@ index a53699b..d51e716 100644
}
-@@ -722,7 +722,7 @@ _SelectDataSelect
+@@ -789,7 +789,7 @@
static VALUE _SelectDataSelect (void *v)
{
SelectData_t *sd = (SelectData_t*)v;
@@ -39,7 +37,7 @@ index a53699b..d51e716 100644
return Qnil;
}
#endif
-@@ -783,9 +783,9 @@ bool EventMachine_t::_RunSelectOnce()
+@@ -850,9 +850,9 @@
SelectData_t SelectData;
/*
@@ -52,7 +50,7 @@ index a53699b..d51e716 100644
int maxsocket = 0;
*/
-@@ -795,7 +795,7 @@ bool EventMachine_t::_RunSelectOnce()
+@@ -862,7 +862,7 @@
// running on localhost with a randomly-chosen port. (*Puke*)
// Windows has a version of the Unix pipe() library function, but it doesn't
// give you back descriptors that are selectable.
@@ -61,7 +59,7 @@ index a53699b..d51e716 100644
if (SelectData.maxsocket < LoopBreakerReader)
SelectData.maxsocket = LoopBreakerReader;
-@@ -810,15 +810,15 @@ bool EventMachine_t::_RunSelectOnce()
+@@ -877,15 +877,15 @@
assert (sd != INVALID_SOCKET);
if (ed->SelectForRead())
@@ -80,7 +78,7 @@ index a53699b..d51e716 100644
#endif
if (SelectData.maxsocket < sd)
-@@ -853,15 +853,15 @@ bool EventMachine_t::_RunSelectOnce()
+@@ -920,15 +920,15 @@
continue;
assert (sd != INVALID_SOCKET);
@@ -100,11 +98,9 @@ index a53699b..d51e716 100644
_ReadLoopBreaker();
}
else if (s < 0) {
-diff --git a/ext/em.h b/ext/em.h
-index c5d409a..845071c 100644
--- a/ext/em.h
+++ b/ext/em.h
-@@ -32,7 +32,7 @@ See the file COPYING for complete licensing information.
+@@ -32,7 +32,7 @@
#ifdef BUILD_FOR_RUBY
#include <ruby.h>
@@ -113,7 +109,7 @@ index c5d409a..845071c 100644
#if defined(HAVE_RBTRAP)
#include <rubysig.h>
-@@ -54,7 +54,7 @@ See the file COPYING for complete licensing information.
+@@ -54,7 +54,7 @@
#define RUBY_UBF_IO RB_UBF_DFL
#endif
#else
@@ -121,8 +117,8 @@ index c5d409a..845071c 100644
+ #define EmSelect rb_fd_select
#endif
-
-@@ -218,9 +218,9 @@ struct SelectData_t
+ class EventableDescriptor;
+@@ -227,9 +227,9 @@
int _Select();
int maxsocket;
@@ -135,9 +131,6 @@ index c5d409a..845071c 100644
timeval tv;
int nSockets;
};
-diff --git a/tests/test_many_fds.rb b/tests/test_many_fds.rb
-new file mode 100644
-index 0000000..74dc926
--- /dev/null
+++ b/tests/test_many_fds.rb
@@ -0,0 +1,22 @@
@@ -163,6 +156,3 @@ index 0000000..74dc926
+ }
+ end
+end
---
-2.1.4
-
diff --git a/debian/patches/0003-add-stubs-with-warnings-for-1.8.7-and-1.9.0.patch b/debian/patches/0003-add-stubs-with-warnings-for-1.8.7-and-1.9.0.patch
index 9f4b20b..7a860e0 100644
--- a/debian/patches/0003-add-stubs-with-warnings-for-1.8.7-and-1.9.0.patch
+++ b/debian/patches/0003-add-stubs-with-warnings-for-1.8.7-and-1.9.0.patch
@@ -9,13 +9,11 @@ Conflicts:
ext/em.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
-diff --git a/ext/em.h b/ext/em.h
-index 845071c..7909d55 100644
--- a/ext/em.h
+++ b/ext/em.h
-@@ -57,6 +57,26 @@ See the file COPYING for complete licensing information.
- #define EmSelect rb_fd_select
- #endif
+@@ -60,6 +60,26 @@
+ class EventableDescriptor;
+ class InotifyDescriptor;
+#ifndef rb_fd_max
+#define fd_check(n) (((n) < FD_SETSIZE) ? 1 : 0*fprintf(stderr, "fd %d too large for select\n", (n)))
@@ -38,8 +36,5 @@ index 845071c..7909d55 100644
+ rb_thread_select(fd_check((n)-1) ? (n) : FD_SETSIZE, (rfds), (wfds), (efds), (timeout))
+#endif
- #ifdef OS_UNIX
- typedef long long Int64;
---
-2.1.4
-
+ /********************
+ class EventMachine_t
diff --git a/debian/patches/0004-add-comment-about-where-the-macros-came-from.patch b/debian/patches/0004-add-comment-about-where-the-macros-came-from.patch
index 12f0209..2541089 100644
--- a/debian/patches/0004-add-comment-about-where-the-macros-came-from.patch
+++ b/debian/patches/0004-add-comment-about-where-the-macros-came-from.patch
@@ -7,11 +7,9 @@ Subject: [PATCH 4/4] add comment about where the macros came from
ext/em.h | 3 +++
1 file changed, 3 insertions(+)
-diff --git a/ext/em.h b/ext/em.h
-index 7909d55..b80779c 100644
--- a/ext/em.h
+++ b/ext/em.h
-@@ -59,6 +59,9 @@ See the file COPYING for complete licensing information.
+@@ -62,6 +62,9 @@
#ifndef rb_fd_max
#define fd_check(n) (((n) < FD_SETSIZE) ? 1 : 0*fprintf(stderr, "fd %d too large for select\n", (n)))
@@ -21,6 +19,3 @@ index 7909d55..b80779c 100644
typedef fd_set rb_fdset_t;
#define rb_fd_zero(f) FD_ZERO(f)
#define rb_fd_set(n, f) do { if (fd_check(n)) FD_SET((n), (f)); } while(0)
---
-2.1.4
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-eventmachine.git
More information about the Pkg-ruby-extras-commits
mailing list