Date: Mon, 25 Nov 2019 13:52:28 +0000 (UTC) From: Dave Cottlehuber <dch@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518407 - in head/net-mgmt/rubygem-riemann-client: . files Message-ID: <201911251352.xAPDqSFK064355@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dch Date: Mon Nov 25 13:52:28 2019 New Revision: 518407 URL: https://svnweb.freebsd.org/changeset/ports/518407 Log: net-mgmt/rubygem-riemann-client: fix ipv6 Sponsored by: SkunkWerks. GmbH Added: head/net-mgmt/rubygem-riemann-client/files/patch-lib_riemann_client_tcp__socket.rb (contents, props changed) Modified: head/net-mgmt/rubygem-riemann-client/Makefile Modified: head/net-mgmt/rubygem-riemann-client/Makefile ============================================================================== --- head/net-mgmt/rubygem-riemann-client/Makefile Mon Nov 25 13:42:46 2019 (r518406) +++ head/net-mgmt/rubygem-riemann-client/Makefile Mon Nov 25 13:52:28 2019 (r518407) @@ -2,6 +2,7 @@ PORTNAME= riemann-client DISTVERSION= 0.2.6 +PORTREVISION= 1 CATEGORIES= net-mgmt rubygems MASTER_SITES= RG Added: head/net-mgmt/rubygem-riemann-client/files/patch-lib_riemann_client_tcp__socket.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/rubygem-riemann-client/files/patch-lib_riemann_client_tcp__socket.rb Mon Nov 25 13:52:28 2019 (r518407) @@ -0,0 +1,48 @@ +--- lib/riemann/client/tcp_socket.rb.orig 2019-11-25 11:01:31 UTC ++++ lib/riemann/client/tcp_socket.rb +@@ -107,13 +107,14 @@ module Riemann + # Using the options from the initializer, a new ::Socket is created that + # is: + # +- # TCP, IPv4 only, autoclosing on exit, nagle's algorithm is disabled and has ++ # TCP, autoclosing on exit, nagle's algorithm is disabled and has + # TCP Keepalive options set if keepalive is supported. + # +- # Returns a new ::Socket instance +- def blank_socket +- sock = ::Socket.new(::Socket::AF_INET, ::Socket::SOCK_STREAM, 0) ++ # Returns a new ::Socket instance for + ++ def socket_factory(type) ++ sock = ::Socket.new(type, ::Socket::SOCK_STREAM, 0) ++ + # close file descriptors if we exec + if Fcntl.constants.include?(:F_SETFD) && Fcntl.constants.include?(:FD_CLOEXEC) + sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) +@@ -167,13 +168,14 @@ module Riemann + # Calculate our timeout deadline + deadline = Time.now.to_f + connect_timeout + +- # Lookup destination address, we only want IPv4 , TCP +- addrs = ::Socket.getaddrinfo(host, port, ::Socket::AF_INET, ::Socket::SOCK_STREAM ) ++ # Lookup destination address, we only want TCP. ++ addrs = ::Socket.getaddrinfo(host, port, nil, ::Socket::SOCK_STREAM ) + errors = [] + conn_error = lambda { raise errors.first } + sock = nil + +- addrs.find( conn_error ) do |addr| ++ # Sort it so we get AF_INET, IPv4 ++ addrs.sort.find( conn_error ) do |addr| + sock = connect_or_error( addr, deadline, errors ) + end + return sock +@@ -210,7 +212,7 @@ module Riemann + # connection was possible. + def connect_nonblock( addr, timeout ) + sockaddr = ::Socket.pack_sockaddr_in(addr[1], addr[3]) +- sock = blank_socket() ++ sock = self.socket_factory( addr[4] ) + sock.connect_nonblock( sockaddr ) + return sock + rescue Errno::EINPROGRESS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911251352.xAPDqSFK064355>