cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to kgio 2.7.0, remove patches applied upstream.

Browse Source
This commit is contained in:
jeremy 2011-12-21 19:57:30 +00:00
parent f9ba185828
commit 7efc2b07e3
5 changed files with 7 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/ruby-kgio/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2011/11/18 00:03:15 jeremy Exp $
# $OpenBSD: Makefile,v 1.8 2011/12/21 19:57:30 jeremy Exp $
COMMENT = kinder, gentler I/O for Ruby
DISTNAME = kgio-2.6.0
DISTNAME = kgio-2.7.0
CATEGORIES = devel
MAINTAINER = Jeremy Evans <jeremy@openbsd.org>

10
devel/ruby-kgio/distinfo
View File

@ -1,5 +1,5 @@
MD5 (kgio-2.6.0.gem) = xEbDe6kTReKvKM3G3NBgwQ==
RMD160 (kgio-2.6.0.gem) = 52qhTsc7e2QHHxqgGpen7l11cEA=
SHA1 (kgio-2.6.0.gem) = BMLVITKzHTAA2xBcJWKXi4s/3eU=
SHA256 (kgio-2.6.0.gem) = 59TYLk9U6gTbRjDkw0c4RMjg1Zwdr1rNkOJh+d2UJZM=
SIZE (kgio-2.6.0.gem) = 66048
MD5 (kgio-2.7.0.gem) = p1vP9Mw/q4m6+cO006rdyw==
RMD160 (kgio-2.7.0.gem) = RpG7Jm/QDvpFZOQojMHC81nMwtA=
SHA1 (kgio-2.7.0.gem) = y8ey9Tf5aAdAFre71PTNsWSs42w=
SHA256 (kgio-2.7.0.gem) = PG+1svbBJt8qTbXb27Nl5D29I5OaJh/FUispqd/Kxcw=
SIZE (kgio-2.7.0.gem) = 68096

61
devel/ruby-kgio/patches/patch-ext_kgio_accept_c
View File

@ -1,61 +0,0 @@
$OpenBSD: patch-ext_kgio_accept_c,v 1.1 2011/11/18 00:03:15 jeremy Exp $
--- ext/kgio/accept.c.orig Thu Jan 1 01:00:00 1970
+++ ext/kgio/accept.c Wed Nov 16 01:32:16 2011
@@ -10,7 +10,7 @@ static VALUE cKgio_Socket;
static VALUE mSocketMethods;
static VALUE iv_kgio_addr;
-#if defined(__linux__)
+#if defined(__linux__) && defined(HAVE_RB_THREAD_BLOCKING_REGION)
static int accept4_flags = SOCK_CLOEXEC;
#else /* ! linux */
static int accept4_flags = SOCK_CLOEXEC | SOCK_NONBLOCK;
@@ -125,6 +125,10 @@ static int thread_accept(struct accept_args *a, int fo
/* always use non-blocking accept() under 1.8 for green threads */
set_nonblocking(a->fd);
+
+ /* created sockets are always non-blocking under 1.8, too */
+ a->flags |= SOCK_NONBLOCK;
+
TRAP_BEG;
rv = (int)xaccept(a);
TRAP_END;
@@ -409,6 +413,8 @@ static VALUE unix_accept(int argc, VALUE *argv, VALUE
*
* Returns true if newly accepted Kgio::Sockets are created with the
* FD_CLOEXEC file descriptor flag, false if not.
+ *
+ * Deprecated, use the per-socket flags for kgio_*accept instead.
*/
static VALUE get_cloexec(VALUE mod)
{
@@ -423,6 +429,8 @@ static VALUE get_cloexec(VALUE mod)
*
* Returns true if newly accepted Kgio::Sockets are created with the
* O_NONBLOCK file status flag, false if not.
+ *
+ * Deprecated, use the per-socket flags for kgio_*accept instead.
*/
static VALUE get_nonblock(VALUE mod)
{
@@ -444,6 +452,8 @@ static VALUE get_nonblock(VALUE mod)
*
* This is on by default, as there is little reason to deal to enable
* it for client sockets on a socket server.
+ *
+ * Deprecated, use the per-socket flags for kgio_*accept instead.
*/
static VALUE set_cloexec(VALUE mod, VALUE boolean)
{
@@ -476,6 +486,10 @@ static VALUE set_cloexec(VALUE mod, VALUE boolean)
* available (and on newer GNU/Linux, accept4() may also set
* the non-blocking flag. This defaults to +true+ on non-GNU/Linux
* systems.
+ *
+ * This is always true on Ruby implementations using user-space threads.
+ *
+ * Deprecated, use the per-socket flags for kgio_*accept instead.
*/
static VALUE set_nonblock(VALUE mod, VALUE boolean)
{

19
devel/ruby-kgio/patches/patch-test_lib_server_accept_rb
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-test_lib_server_accept_rb,v 1.1 2011/11/18 00:03:15 jeremy Exp $
--- test/lib_server_accept.rb.orig Thu Jan 1 01:00:00 1970
+++ test/lib_server_accept.rb Wed Nov 16 01:32:16 2011
@@ -25,7 +25,6 @@ module LibServerAccept
IO.select([@srv])
b = @srv.kgio_tryaccept nil, 0
assert_kind_of Kgio::Socket, b
- assert_equal false, b.nonblock?
assert_equal 0, b.fcntl(Fcntl::F_GETFD)
end
@@ -34,7 +33,6 @@ module LibServerAccept
IO.select([@srv])
b = @srv.kgio_accept nil, 0
assert_kind_of Kgio::Socket, b
- assert_equal false, b.nonblock?
assert_equal 0, b.fcntl(Fcntl::F_GETFD)
end

35
devel/ruby-kgio/patches/patch-test_test_accept_flags_rb
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-test_test_accept_flags_rb,v 1.1 2011/11/18 00:03:15 jeremy Exp $
--- test/test_accept_flags.rb.orig Thu Jan 1 01:00:00 1970
+++ test/test_accept_flags.rb Wed Nov 16 01:32:16 2011
@@ -13,7 +13,6 @@ class TestAcceptFlags < Test::Unit::TestCase
client = TCPSocket.new(@host, @port)
accepted = @srv.kgio_accept(nil, Kgio::SOCK_NONBLOCK)
assert_instance_of Kgio::Socket, accepted
- assert accepted.nonblock?
flags = accepted.fcntl(Fcntl::F_GETFD)
assert_equal 0, flags & Fcntl::FD_CLOEXEC
assert_nil client.close
@@ -22,7 +21,6 @@ class TestAcceptFlags < Test::Unit::TestCase
client = TCPSocket.new(@host, @port)
accepted = @srv.kgio_accept(nil, Kgio::SOCK_CLOEXEC)
assert_instance_of Kgio::Socket, accepted
- assert ! accepted.nonblock?
flags = accepted.fcntl(Fcntl::F_GETFD)
assert_equal Fcntl::FD_CLOEXEC, flags & Fcntl::FD_CLOEXEC
assert_nil client.close
@@ -31,7 +29,6 @@ class TestAcceptFlags < Test::Unit::TestCase
client = TCPSocket.new(@host, @port)
accepted = @srv.kgio_accept(nil, Kgio::SOCK_CLOEXEC|Kgio::SOCK_NONBLOCK)
assert_instance_of Kgio::Socket, accepted
- assert accepted.nonblock?
flags = accepted.fcntl(Fcntl::F_GETFD)
assert_equal Fcntl::FD_CLOEXEC, flags & Fcntl::FD_CLOEXEC
assert_nil client.close
@@ -40,7 +37,6 @@ class TestAcceptFlags < Test::Unit::TestCase
client = TCPSocket.new(@host, @port)
accepted = @srv.kgio_accept(nil, Kgio::SOCK_CLOEXEC|Kgio::SOCK_NONBLOCK)
assert_instance_of Kgio::Socket, accepted
- assert accepted.nonblock?
flags = accepted.fcntl(Fcntl::F_GETFD)
assert_equal Fcntl::FD_CLOEXEC, flags & Fcntl::FD_CLOEXEC
assert_nil client.close