Attachment #243328 for bug #272441

View | Details | Raw Unified | Return to bug 272441
Collapse All | Expand All




PORTNAME=	oxidized-web
PORTVERSION=	0.13.1
PORTREVISION=	5
CATEGORIES=	net-mgmt rubygems
MASTER_SITES=	RG


		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-contrib>=3.0.0:www/rubygem-sinatra-contrib \
		rubygem-sinatra>=3.0.0:www/rubygem-sinatra

USES=		gem





--- 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




--- 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, ["~> 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, ["~> 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"])

Return to bug 272441

Lines 1-6 Link Here

(-)rubygem-oxidized-web/Makefile (-4 / +3 lines)
1	PORTNAME= oxidized-web	1	PORTNAME= oxidized-web
2	PORTVERSION= 0.13.1	2	PORTVERSION= 0.13.1
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= net-mgmt rubygems	4	CATEGORIES= net-mgmt rubygems
5	MASTER_SITES= RG	5	MASTER_SITES= RG
6		6
Lines 17-26 Link Here
17	rubygem-json>=1.7.0:devel/rubygem-json \	17	rubygem-json>=1.7.0:devel/rubygem-json \
18	rubygem-oxidized>=0.26:net-mgmt/rubygem-oxidized \	18	rubygem-oxidized>=0.26:net-mgmt/rubygem-oxidized \
19	rubygem-puma>=3.11.4:www/rubygem-puma \	19	rubygem-puma>=3.11.4:www/rubygem-puma \
20	rubygem-rack-test>=0.7.0:www/rubygem-rack-test \
21	rubygem-sass>=3.3:textproc/rubygem-sass \	20	rubygem-sass>=3.3:textproc/rubygem-sass \
22	rubygem-sinatra-contrib1>=1.4.6:www/rubygem-sinatra-contrib1 \	21	rubygem-sinatra-contrib>=3.0.0:www/rubygem-sinatra-contrib \
23	rubygem-sinatra1>=1.4.6:www/rubygem-sinatra1	22	rubygem-sinatra>=3.0.0:www/rubygem-sinatra
24		23
25	USES= gem	24	USES= gem
26		25

Lines 1-6 Link Here

(-)rubygem-oxidized-web/files/patch-lib_oxidized_web.rb (-3 / +14 lines)
1	--- lib/oxidized/web.rb.orig 2022-04-22 14:40:24 UTC	1	--- lib/oxidized/web.rb.orig 2023-07-09 23:03:50.799687000 +0100
2	+++ lib/oxidized/web.rb	2	+++ lib/oxidized/web.rb 2023-07-09 23:04:50.410274000 +0100
3	@@ -26,7 +26,7 @@ module Oxidized	3	@@ -3,9 +3,8 @@
		4	module Oxidized
		5	module API
		6	class Web
		7	- require 'rack/handler'
		8	+ require 'rack/handler/puma'
		9	attr_reader :thread
		10	- Rack::Handler::WEBrick = Rack::Handler.get(:puma)
		11	def initialize nodes, listen
		12	require 'oxidized/web/webapp'
		13	listen, uri = listen.split '/'
		14	@@ -26,7 +25,7 @@
4		15
5	def run	16	def run
6	@thread = Thread.new do	17	@thread = Thread.new do

Lines 1-17 Link Here

(-)rubygem-oxidized-web/files/patch-oxidized-web.gemspec (-7 / +8 lines)
1	--- oxidized-web.gemspec.orig 2023-02-05 19:04:08 UTC	1	--- oxidized-web.gemspec.orig 2023-07-09 18:50:01.343035000 +0100
2	+++ oxidized-web.gemspec	2	+++ oxidized-web.gemspec 2023-07-09 23:15:10.104846000 +0100
3	@@ -25,12 +25,12 @@ Gem::Specification.new do \|s\|	3	@@ -25,12 +25,11 @@
4	s.add_runtime_dependency(%q<haml>.freeze, ["~> 5.0"])	4	s.add_runtime_dependency(%q<haml>.freeze, ["~> 5.0"])
5	s.add_runtime_dependency(%q<htmlentities>.freeze, ["~> 4.3"])	5	s.add_runtime_dependency(%q<htmlentities>.freeze, ["~> 4.3"])
6	s.add_runtime_dependency(%q<oxidized>.freeze, ["~> 0.26"])	6	s.add_runtime_dependency(%q<oxidized>.freeze, ["~> 0.26"])
7	- s.add_runtime_dependency(%q<puma>.freeze, ["~> 3.11.4"])	7	- s.add_runtime_dependency(%q<puma>.freeze, ["~> 3.11.4"])
8	+ s.add_runtime_dependency(%q<puma>.freeze, ["~> 5.6"])	8	+ s.add_runtime_dependency(%q<puma>.freeze, ["~> 6"])
9	s.add_runtime_dependency(%q<sass>.freeze, ["~> 3.3"])	9	s.add_runtime_dependency(%q<sass>.freeze, ["~> 3.3"])
10	s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 1.4", ">= 1.4.6"])	10	- s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 1.4", ">= 1.4.6"])
11	s.add_runtime_dependency(%q<sinatra-contrib>.freeze, ["~> 1.4", ">= 1.4.6"])	11	- s.add_runtime_dependency(%q<sinatra-contrib>.freeze, ["~> 1.4", ">= 1.4.6"])
		12	+ s.add_runtime_dependency(%q<sinatra>.freeze, ["~> 3.0", ">= 3.0.6"])
		13	+ s.add_runtime_dependency(%q<sinatra-contrib>.freeze, ["~> 3.0", ">= 3.0.6"])
12	s.add_runtime_dependency(%q<json>.freeze, [">= 1.7.0"])	14	s.add_runtime_dependency(%q<json>.freeze, [">= 1.7.0"])
13	- s.add_runtime_dependency(%q<rack-test>.freeze, ["~> 0.7.0"])	15	- s.add_runtime_dependency(%q<rack-test>.freeze, ["~> 0.7.0"])
14	+ s.add_runtime_dependency(%q<rack-test>.freeze, [">= 0.7.0"])
15	s.add_development_dependency(%q<bundler>.freeze, ["~> 2.0"])	16	s.add_development_dependency(%q<bundler>.freeze, ["~> 2.0"])
16	s.add_development_dependency(%q<rails_best_practices>.freeze, ["~> 1.19"])	17	s.add_development_dependency(%q<rails_best_practices>.freeze, ["~> 1.19"])
17	s.add_development_dependency(%q<rake>.freeze, ["~> 10.0"])	18	s.add_development_dependency(%q<rake>.freeze, ["~> 10.0"])