Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jan 2025 19:09:26 GMT
From:      Juraj Lutter <otis@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: ed5078fdd124 - 2025Q1 - net-mgmt/rubygem-oxidized-web: Fix run-time detection of puma library
Message-ID:  <202501131909.50DJ9QFl004188@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ed5078fdd124dfa29cc1e356032f72a28036c80b

commit ed5078fdd124dfa29cc1e356032f72a28036c80b
Author:     Sigi <freebsd-bt@beatsnet.com>
AuthorDate: 2025-01-13 19:01:31 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2025-01-13 19:09:01 +0000

    net-mgmt/rubygem-oxidized-web: Fix run-time detection of puma library
    
    Fix breakage after puma library upgrade to 6.5.0
    
    PR:     283676
    Approved by:    Nick Hilliard <nick@foobar.org> (maintainer)
    
    (cherry picked from commit 581439c871a58b355f2cb9c697849abf6a2510cf)
---
 net-mgmt/rubygem-oxidized-web/Makefile                        |  2 +-
 .../files/patch-lib_oxidized_web_webapp.rb                    | 10 ++++++++++
 .../rubygem-oxidized-web/files/patch-oxidized-web.gemspec     | 11 +++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/net-mgmt/rubygem-oxidized-web/Makefile b/net-mgmt/rubygem-oxidized-web/Makefile
index 808de4f33951..27526f0d8b62 100644
--- a/net-mgmt/rubygem-oxidized-web/Makefile
+++ b/net-mgmt/rubygem-oxidized-web/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	oxidized-web
 PORTVERSION=	0.14.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt rubygems
 MASTER_SITES=	RG
 
diff --git a/net-mgmt/rubygem-oxidized-web/files/patch-lib_oxidized_web_webapp.rb b/net-mgmt/rubygem-oxidized-web/files/patch-lib_oxidized_web_webapp.rb
new file mode 100644
index 000000000000..9171b3e7696b
--- /dev/null
+++ b/net-mgmt/rubygem-oxidized-web/files/patch-lib_oxidized_web_webapp.rb
@@ -0,0 +1,10 @@
+--- lib/oxidized/web/webapp.rb.orig	2025-01-13 18:59:48 UTC
++++ lib/oxidized/web/webapp.rb
+@@ -17,6 +17,7 @@ module Oxidized
+       helpers Sinatra::UrlForHelper
+       set :public_folder, proc { File.join(root, 'public') }
+       set :haml, { escape_html: false }
++      set :host_authorization, { permitted_hosts: [] }
+ 
+       get '/' do
+         redirect url_for('/nodes')
diff --git a/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec b/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec
new file mode 100644
index 000000000000..b8b93ee486fa
--- /dev/null
+++ b/net-mgmt/rubygem-oxidized-web/files/patch-oxidized-web.gemspec
@@ -0,0 +1,11 @@
+--- oxidized-web.gemspec.orig	2025-01-13 18:59:26 UTC
++++ oxidized-web.gemspec
+@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
+   s.add_runtime_dependency(%q<htmlentities>.freeze, ["~> 4.3".freeze])
+   s.add_runtime_dependency(%q<json>.freeze, ["~> 2.3".freeze])
+   s.add_runtime_dependency(%q<oxidized>.freeze, ["~> 0.26".freeze])
+-  s.add_runtime_dependency(%q<puma>.freeze, [">= 3.11.4".freeze, "< 6.5.0".freeze])
++  s.add_runtime_dependency(%q<puma>.freeze, [">= 3.11.4".freeze, "< 7.0".freeze])
+   s.add_runtime_dependency(%q<sinatra>.freeze, [">= 1.4.6".freeze, "< 5.0".freeze])
+   s.add_runtime_dependency(%q<sinatra-contrib>.freeze, [">= 1.4.6".freeze, "< 5.0".freeze])
+   s.add_development_dependency(%q<bundler>.freeze, ["~> 2.2".freeze])



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501131909.50DJ9QFl004188>