From nobody Sun Jul 30 23:02:04 2023 X-Original-To: dev-commits-ports-all@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 4RDcMj1Pt1z4pYnv; Sun, 30 Jul 2023 23:02:10 +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 4RDcMJ5pHtz3xjw; Sun, 30 Jul 2023 23:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690758125; 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=xqekL1Vr1cPtXTA9OTqnqOfnaP/zqCwQPN5RptQWXc0=; b=Mv8E/z2RScHo2Oa6mB2Z2HIqf+NauNJMJJp6+KHiPbOkXLWHkpitEJS+9JAFNO8g2sD8l5 b2ZpHG4I1Dk9HcYFoTh8z4watVbDryFM1qaKeM04pVjKCgAHlDAQ6bMTE0xIbTYNbjOij6 W+zwAEtq7GQzlC8FmC+cQLZHUEUm4aWYubePu3wgExx7TQ4q6RyiMKF2r6DdbfFiuaLy87 EYQ0mBiGkMfJTtxaJWa0R5IbhMZW6f5P8AsYVkq6JjYhAW/YjmkAF8SrX4yLzNuyvvXARe D3rl+eRneWbshYIFh7KIodGeZINFRAb9qgljHOFKJH3Q4WN0eRVlLtbADHXmWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690758125; 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=xqekL1Vr1cPtXTA9OTqnqOfnaP/zqCwQPN5RptQWXc0=; b=qanGmZtE7ZENqz60MRDykArBzbsIYCFEPu38ozbFh73KbA8HP/CfRNm8ad9sAqLxL84Bk2 HM4I1pJkPOBCRFkSIsEM6z/MKRXClPnQ9MEr3TxfEWF9I53hcbO7YkvTtxtd/w9KQ5Qn8c oPYFEo0AJ6X0U0EUWhyrCkdkoR2SFZWhWAR15q1blj3YtZdkvRanpVMTu95kx9/HYvSCPE 8EgRugnxT9B9Izgnxw/S5eCGWW7w2QkTQsXHnA7CFW+5saniILiCAZCBuVpnCHnu/pdZ2W wd2yV1t5iHwO8PMArUAl6gm5d/xglIMG+b8WEtkDeZq1WxtfM+YSj5syjZUFkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690758125; a=rsa-sha256; cv=none; b=xIeKzjtv2AEoRYBlcMhv/NAKxcvpvfDa1ejy1qeJ0bUDEl0t3pphAjKveB795c2nI9WnII Bjaryjb+UvmJ3z/VhpX7SeHR6UeQfPskBXrsbC8enXtVLb45DprINQsZqDDVR5dZicbHGv U78xXS0QosndOhd5lOCV91sHZ3aHW/vRicyiUuMfQJqBUXuOClLvBLlA8QVS+NsiQp8GBs dF6BDVEWGQgpqi+0n5UBluaZ2SChjXdo4VKuVpH23Pps35waJjNJoEvUvaKq4KX3YbyNJK 0ixwyUBkcodtMXT9/Ue59B7s/zzq7p3qJivDmuUNQih0/YK6y3Y5wBb3x9Ys+g== 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 4RDcMJ45zjzXnq; Sun, 30 Jul 2023 23:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36UN24qU016265; Sun, 30 Jul 2023 23:02:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36UN24qr016264; Sun, 30 Jul 2023 23:02:04 GMT (envelope-from git) Date: Sun, 30 Jul 2023 23:02:04 GMT Message-Id: <202307302302.36UN24qr016264@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 40c1140647d5 - 2023Q3 - net-mgmt/rubygem-oxidized-web: update to support puma6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 40c1140647d541475c8c0e307ad5ec12678be924 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=40c1140647d541475c8c0e307ad5ec12678be924 commit 40c1140647d541475c8c0e307ad5ec12678be924 Author: Nick Hilliard AuthorDate: 2023-07-11 08:36:18 +0000 Commit: Robert Clausecker CommitDate: 2023-07-30 23:01:41 +0000 net-mgmt/rubygem-oxidized-web: update to support puma6 The recent update from rubygem-puma5 to rubygem-puma6 broke rubygem-oxidized-web. This patch fixes it (+ has been submitted upstream). PR: 272441 (cherry picked from commit c8b47f91bca080d5a8212a8608f1b36d99de1893) --- net-mgmt/rubygem-oxidized-web/Makefile | 7 +++---- .../files/patch-lib_oxidized_web.rb | 17 ++++++++++++++--- .../files/patch-oxidized-web.gemspec | 15 ++++++++------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/net-mgmt/rubygem-oxidized-web/Makefile b/net-mgmt/rubygem-oxidized-web/Makefile index d371b90173b4..d7978166fd7d 100644 --- a/net-mgmt/rubygem-oxidized-web/Makefile +++ b/net-mgmt/rubygem-oxidized-web/Makefile @@ -1,6 +1,6 @@ PORTNAME= oxidized-web PORTVERSION= 0.13.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt rubygems MASTER_SITES= RG @@ -17,10 +17,9 @@ RUN_DEPENDS= rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \ rubygem-json>=1.7.0:devel/rubygem-json \ rubygem-oxidized>=0.26:net-mgmt/rubygem-oxidized \ rubygem-puma>=3.11.4:www/rubygem-puma \ - rubygem-rack-test>=0.7.0:www/rubygem-rack-test \ rubygem-sass>=3.3:textproc/rubygem-sass \ - rubygem-sinatra-contrib1>=1.4.6:www/rubygem-sinatra-contrib1 \ - rubygem-sinatra1>=1.4.6:www/rubygem-sinatra1 + rubygem-sinatra-contrib>=3.0.0:www/rubygem-sinatra-contrib \ + rubygem-sinatra>=3.0.0:www/rubygem-sinatra USES= gem diff --git a/net-mgmt/rubygem-oxidized-web/files/patch-lib_oxidized_web.rb b/net-mgmt/rubygem-oxidized-web/files/patch-lib_oxidized_web.rb index 7547653b6af7..0167fcfba4b9 100644 --- a/net-mgmt/rubygem-oxidized-web/files/patch-lib_oxidized_web.rb +++ b/net-mgmt/rubygem-oxidized-web/files/patch-lib_oxidized_web.rb @@ -1,6 +1,17 @@ ---- lib/oxidized/web.rb.orig 2022-04-22 14:40:24 UTC -+++ lib/oxidized/web.rb -@@ -26,7 +26,7 @@ module Oxidized +--- lib/oxidized/web.rb.orig 2023-07-09 23:03:50.799687000 +0100 ++++ lib/oxidized/web.rb 2023-07-09 23:04:50.410274000 +0100 +@@ -3,9 +3,8 @@ + module Oxidized + module API + class Web +- require 'rack/handler' ++ require 'rack/handler/puma' + attr_reader :thread +- Rack::Handler::WEBrick = Rack::Handler.get(:puma) + def initialize nodes, listen + require 'oxidized/web/webapp' + listen, uri = listen.split '/' +@@ -26,7 +25,7 @@ def run @thread = Thread.new do diff --git a/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec b/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec index fa379ca0f48e..efc6289ef8f4 100644 --- a/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec +++ b/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec @@ -1,17 +1,18 @@ ---- oxidized-web.gemspec.orig 2023-02-05 19:04:08 UTC -+++ oxidized-web.gemspec -@@ -25,12 +25,12 @@ Gem::Specification.new do |s| +--- oxidized-web.gemspec.orig 2023-07-09 18:50:01.343035000 +0100 ++++ oxidized-web.gemspec 2023-07-09 23:15:10.104846000 +0100 +@@ -25,12 +25,11 @@ s.add_runtime_dependency(%q.freeze, ["~> 5.0"]) s.add_runtime_dependency(%q.freeze, ["~> 4.3"]) s.add_runtime_dependency(%q.freeze, ["~> 0.26"]) - s.add_runtime_dependency(%q.freeze, ["~> 3.11.4"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 5.6"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 6"]) s.add_runtime_dependency(%q.freeze, ["~> 3.3"]) - s.add_runtime_dependency(%q.freeze, ["~> 1.4", ">= 1.4.6"]) - s.add_runtime_dependency(%q.freeze, ["~> 1.4", ">= 1.4.6"]) +- s.add_runtime_dependency(%q.freeze, ["~> 1.4", ">= 1.4.6"]) +- s.add_runtime_dependency(%q.freeze, ["~> 1.4", ">= 1.4.6"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 3.0", ">= 3.0.6"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 3.0", ">= 3.0.6"]) s.add_runtime_dependency(%q.freeze, [">= 1.7.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.7.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 0.7.0"]) s.add_development_dependency(%q.freeze, ["~> 2.0"]) s.add_development_dependency(%q.freeze, ["~> 1.19"]) s.add_development_dependency(%q.freeze, ["~> 10.0"])