From nobody Tue Jul 11 22:08:44 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 4R0w4Y14lWz4lRGX; Tue, 11 Jul 2023 22:08:45 +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 4R0w4X6jF8z4H8k; Tue, 11 Jul 2023 22:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689113324; 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=bTsD3P7F1W3qGsbi5LL/gvfDvQCMZfhbbMdz5YhPpBQ=; b=CqQANw8pCUjQwj5KYeHNLm7fOkL+31fucsKPxxkTD12IaJpc0v67wClSjUzzpikAX5D9Q4 345pisLnmD/BgXGyK8RaQ09fyN9jwFJ5JRxVYaUhfCDKJiCyRD4Wp+XkEzlS6SDW7isah5 KDSMLulFdoDuHrMch0n6iwkn4YkPezGuPXYjLLTkZaE7JAoH1pUQ3hNaPps4neMbS2Rzyh Pg1la5KFZjY9VXPFjzXnKLEELzTL6zBMG/yA3xpHoJIED2X81Ebi15Y+B0G1yzomECcsxu Mt3V3SRcRAjeW6UmmuRhS6xrgBV8l6F4P2gVTf2CgFhwEw+Qtd64fR0YphjjWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689113324; 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=bTsD3P7F1W3qGsbi5LL/gvfDvQCMZfhbbMdz5YhPpBQ=; b=QOpvRAwwMJhC4ui/RV0nrVaklB07LZcSWdVzyf4EglQ/6nQA+Jxvc/Qoh/8UbDAOnffquE 1dKkuNx+3KLRpxSpp9NK4u4UGIcb/GBd6vDuUnb3piY+gFzBLQNS86Qn7p6vtMi+JD0v+y YboOjovVnxJ4mwuPTJvhl5JZgGmvhziWCRQ1HkOSMQMKSREnaKBrqP5ZK/U9VFKdra3tUy 5KMHYIS62z5QlCmIE9FhpS81neizRLe2lx6OMVCHaKsJ0M8eDQof4zgwlasbNLRtxyW3bY qIVI4u7IKhjRXr8bkN19+D+H7c1lBXbgqI3aeeUw05ZIpHyyUOjKiQvYphxk4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689113324; a=rsa-sha256; cv=none; b=UKaa/QDgQVYvdfBJdRxp/Gek94db5RrdDNd+nrIRlAI+m32lg4w89neXyeqn7ye20L8lMH B7rG8hb4Fqf59bmBLL+bx/0kIfbecpp9Sl9u0FrC33jP5T/PRIB7MU2a9JVZAVfeZ3AXTo RP3ENuCWsb+BBva9xB+tMva3UXDzO9JyhYEwM4g5EiTwKNpJ4uFXjTt/A4Rbp6AyPPZOpE SeVxIWdvuefgQ2UG5uDrqfP7J5S5ktisS8vF0evwHOb8eh+PIm0dhOEM++QmAj6yvVrCWW WH5EU1O7Y1RFSAxRiJoHldECqLgL/mrC+2Cok6J6tl+395viuqspLTwI0kQDMw== 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 4R0w4X5hgxzk2v; Tue, 11 Jul 2023 22:08:44 +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 36BM8il4005086; Tue, 11 Jul 2023 22:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BM8iAH005085; Tue, 11 Jul 2023 22:08:44 GMT (envelope-from git) Date: Tue, 11 Jul 2023 22:08:44 GMT Message-Id: <202307112208.36BM8iAH005085@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: c8b47f91bca0 - main - 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/main X-Git-Reftype: branch X-Git-Commit: c8b47f91bca080d5a8212a8608f1b36d99de1893 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8b47f91bca080d5a8212a8608f1b36d99de1893 commit c8b47f91bca080d5a8212a8608f1b36d99de1893 Author: Nick Hilliard AuthorDate: 2023-07-11 08:36:18 +0000 Commit: Robert Clausecker CommitDate: 2023-07-11 22:07:30 +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 --- 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"])