Date: Sun, 30 Jul 2023 23:02:04 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 40c1140647d5 - 2023Q3 - net-mgmt/rubygem-oxidized-web: update to support puma6 Message-ID: <202307302302.36UN24qr016264@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=40c1140647d541475c8c0e307ad5ec12678be924 commit 40c1140647d541475c8c0e307ad5ec12678be924 Author: Nick Hilliard <nick@foobar.org> AuthorDate: 2023-07-11 08:36:18 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> 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<haml>.freeze, ["~> 5.0"]) s.add_runtime_dependency(%q<htmlentities>.freeze, ["~> 4.3"]) s.add_runtime_dependency(%q<oxidized>.freeze, ["~> 0.26"]) - s.add_runtime_dependency(%q<puma>.freeze, ["~> 3.11.4"]) -+ s.add_runtime_dependency(%q<puma>.freeze, ["~> 5.6"]) ++ s.add_runtime_dependency(%q<puma>.freeze, ["~> 6"]) s.add_runtime_dependency(%q<sass>.freeze, ["~> 3.3"]) - s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 1.4", ">= 1.4.6"]) - s.add_runtime_dependency(%q<sinatra-contrib>.freeze, ["~> 1.4", ">= 1.4.6"]) +- s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 1.4", ">= 1.4.6"]) +- s.add_runtime_dependency(%q<sinatra-contrib>.freeze, ["~> 1.4", ">= 1.4.6"]) ++ s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 3.0", ">= 3.0.6"]) ++ s.add_runtime_dependency(%q<sinatra-contrib>.freeze, ["~> 3.0", ">= 3.0.6"]) s.add_runtime_dependency(%q<json>.freeze, [">= 1.7.0"]) - s.add_runtime_dependency(%q<rack-test>.freeze, ["~> 0.7.0"]) -+ s.add_runtime_dependency(%q<rack-test>.freeze, [">= 0.7.0"]) s.add_development_dependency(%q<bundler>.freeze, ["~> 2.0"]) s.add_development_dependency(%q<rails_best_practices>.freeze, ["~> 1.19"]) s.add_development_dependency(%q<rake>.freeze, ["~> 10.0"])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307302302.36UN24qr016264>