From nobody Sun Sep 11 12:25:07 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MQTSz62pWz4bjJd; Sun, 11 Sep 2022 12:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MQTSz5JMTz3jFb; Sun, 11 Sep 2022 12:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662899107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFcvnkgWApoJuqfCgRQw3ZdQU7X0ATZp1sLmvH500Dk=; b=BOGmgtxrclGX5m5ssH+3cWdNTEZb0+PDXZw7lbnHjjGysfBXgeHEttwWrtyVgMT5UyuOPf VBcSDjFOcnAJdtd8N8ncfdg070iZ7fLojQAPE7NYOs5EsPjmxNZKpUxxfXQXZrqfgKAmoH 6lUBdHnnVVu/ERbVdV42usszxBziQIEBadgIhdaNXWNwp8Wh0vk20SNOMyLKtVYSdvqBJz 71y0xs+oxqyBS0sJa/ZR43fw4UXmGmVjwfLsQWspVGK7mky5rH2VOxOUtxeO+jJL8/9+kr pCziWpyGj/X6JstC+B4uCKjKu4zo3mdMEdZ3tayiyuoM6HJKX7U9UKi0djP6cQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MQTSz4NMGzdyQ; Sun, 11 Sep 2022 12:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28BCP7xR077698; Sun, 11 Sep 2022 12:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28BCP7bC077697; Sun, 11 Sep 2022 12:25:07 GMT (envelope-from git) Date: Sun, 11 Sep 2022 12:25:07 GMT Message-Id: <202209111225.28BCP7bC077697@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: dbfcc3a1b034 - main - net-mgmt/rubygem-riemann-client: Update to 1.0.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbfcc3a1b034e9a217df24a42715db1a18e7fb79 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662899107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFcvnkgWApoJuqfCgRQw3ZdQU7X0ATZp1sLmvH500Dk=; b=IkWODZgYgUr5NOj6wNER+jDeW3NTw37ihYr6RPE9+yZd8hqhw+XabHQfskmWWT/cvfBNLJ sjsai3vL/9sVkZ6n/Nj14EkqbTn7sbOC82XJHAoDl0+BXh1XrzDqJN8l4MSCa2TD5PuDCE tohFFZ4NnLVTjzf7yPFZrGRUnCt3INjPWUEnpXaYMBUFmhpioJU7TtYJjO5P78cj3bTs16 qSevJITyqekUEHzYYZzt4tL34gEgv6duYzCGdHFh6D0xGsaShzaIxsCYcFPAsWa9ZdDZd2 ptktxygA1YMoep9Nhl6mt/0u0sZVY8d8HgFWMJVYyjVGrvRXV9GH8Kp1tEK2RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662899107; a=rsa-sha256; cv=none; b=S/y+5v8V0bT+6jidD41hNj5QqYeScaRKaN6PcOgftXFqXnw+ksdV0SbVJdYOgT/y2Q0NPR 1zMdGWVCNDIAKwm5GttbuMj68ytZVzWnXNLeaBn/8H3bull3dlC6o8m91SqaSkyav4CakJ c/4Tdpgmp7B/Ej84H+N8+ESQwKywRdeQzZXCSo1shv+339G1sE3cGz+Wx8uJbUQzlSJrcM IPSv75DjGQhJUaiAOkc6TzCAfDzo219wFbm8ZvwVjghy4BEbXVYYfgUtzjP4RCF0wb3cYt iu3AxrFQxj6vSs08JN7ocCI7SvQmE6p1Z7A5RJ0mUsx0KNj+5nb3CTmVKHzvmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=dbfcc3a1b034e9a217df24a42715db1a18e7fb79 commit dbfcc3a1b034e9a217df24a42715db1a18e7fb79 Author: Romain Tartière AuthorDate: 2022-09-11 12:11:59 +0000 Commit: Dave Cottlehuber CommitDate: 2022-09-11 12:23:06 +0000 net-mgmt/rubygem-riemann-client: Update to 1.0.1 ChangeLog: https://github.com/riemann/riemann-ruby-client/blob/main/CHANGELOG.md#101-2022-06-25 PR: 266326 Tested by: romain Sponsored by: SkunkWerks, GmbH --- net-mgmt/rubygem-riemann-client/Makefile | 6 +-- net-mgmt/rubygem-riemann-client/distinfo | 6 +-- .../files/patch-lib_riemann_client_tcp__socket.rb | 48 ---------------------- .../files/patch-riemann-client.gemspec | 11 ----- 4 files changed, 5 insertions(+), 66 deletions(-) diff --git a/net-mgmt/rubygem-riemann-client/Makefile b/net-mgmt/rubygem-riemann-client/Makefile index 69f50061864e..6b63e7071868 100644 --- a/net-mgmt/rubygem-riemann-client/Makefile +++ b/net-mgmt/rubygem-riemann-client/Makefile @@ -1,6 +1,5 @@ PORTNAME= riemann-client -DISTVERSION= 0.2.6 -PORTREVISION= 1 +DISTVERSION= 1.0.1 CATEGORIES= net-mgmt rubygems MASTER_SITES= RG @@ -12,8 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-beefcake>=1.2:net/rubygem-beefcake \ - rubygem-mtrc>=0.0.4:math/rubygem-mtrc \ - rubygem-trollop>=2.9:devel/rubygem-trollop + rubygem-mtrc>=0.0.4:math/rubygem-mtrc USES= gem USE_RUBY= yes diff --git a/net-mgmt/rubygem-riemann-client/distinfo b/net-mgmt/rubygem-riemann-client/distinfo index 664c2e49f053..69d8c0c2866a 100644 --- a/net-mgmt/rubygem-riemann-client/distinfo +++ b/net-mgmt/rubygem-riemann-client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540513080 -SHA256 (rubygem/riemann-client-0.2.6.gem) = 28ba11bd2bf7cecaeb1fa94ef486796f7b2feae313b1d42beac140e44547370b -SIZE (rubygem/riemann-client-0.2.6.gem) = 15360 +TIMESTAMP = 1662755179 +SHA256 (rubygem/riemann-client-1.0.1.gem) = 34ed4b4a3b71cec374d91f47c5b26eb42ef649a8a276f16c1edfb00a1c826569 +SIZE (rubygem/riemann-client-1.0.1.gem) = 19456 diff --git a/net-mgmt/rubygem-riemann-client/files/patch-lib_riemann_client_tcp__socket.rb b/net-mgmt/rubygem-riemann-client/files/patch-lib_riemann_client_tcp__socket.rb deleted file mode 100644 index 527292f86545..000000000000 --- a/net-mgmt/rubygem-riemann-client/files/patch-lib_riemann_client_tcp__socket.rb +++ /dev/null @@ -1,48 +0,0 @@ ---- 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 diff --git a/net-mgmt/rubygem-riemann-client/files/patch-riemann-client.gemspec b/net-mgmt/rubygem-riemann-client/files/patch-riemann-client.gemspec deleted file mode 100644 index e0126dc98147..000000000000 --- a/net-mgmt/rubygem-riemann-client/files/patch-riemann-client.gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- riemann-client.gemspec.orig 2021-10-25 13:35:50 UTC -+++ riemann-client.gemspec -@@ -26,7 +26,7 @@ Gem::Specification.new do |s| - if s.respond_to? :add_runtime_dependency then - s.add_development_dependency(%q.freeze, [">= 1.3"]) - s.add_development_dependency(%q.freeze, [">= 0"]) -- s.add_runtime_dependency(%q.freeze, [">= 0.3.5", "<= 1.0.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 1.2.0"]) - s.add_runtime_dependency(%q.freeze, [">= 1.16.2"]) - s.add_runtime_dependency(%q.freeze, [">= 0.0.4"]) - else