From 2c7ceb567ff634fa3b6a4e232ad84ba1e339f92a Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Fri, 29 Mar 2024 00:01:56 +0100 Subject: [PATCH] net/foreman-proxy: update to 3.10.0 PR: 278015 Approved by: maintainer --- net/foreman-proxy/Makefile | 7 ++----- net/foreman-proxy/distinfo | 6 +++--- .../files/patch-lib_proxy_http__download.rb | 11 ----------- net/foreman-proxy/pkg-plist | 2 -- 4 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 net/foreman-proxy/files/patch-lib_proxy_http__download.rb diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile index e8b3b456ffdf..fa02e29ae1f9 100644 --- a/net/foreman-proxy/Makefile +++ b/net/foreman-proxy/Makefile @@ -1,5 +1,5 @@ PORTNAME= foreman-proxy -PORTVERSION= 3.4.0 +PORTVERSION= 3.10.0 CATEGORIES= net MASTER_SITES= https://downloads.theforeman.org/foreman-proxy/ @@ -24,9 +24,8 @@ RUN_DEPENDS= rubygem-bundler_ext>=0.4:sysutils/rubygem-bundler_ext \ USES= ruby shebangfix tar:bzip2 -OPTIONS_DEFINE= BMC PUPPET7 +OPTIONS_DEFINE= BMC BMC_DESC= Depend on rubyipmi and redfish_client for BMC support -PUPPET7_DESC= Depend on Puppet 7 NO_ARCH= yes NO_BUILD= yes @@ -52,8 +51,6 @@ SHEBANG_FILES= extra/foreman-debug-proxy BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi \ rubygem-redfish_client>=0.5.1:sysutils/rubygem-redfish_client -PUPPET7_RUN_DEPENDS= puppet:sysutils/puppet7 \ - rubygem-ruby-augeas>=0.5:textproc/rubygem-ruby-augeas post-patch: @${REINPLACE_CMD} \ diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo index 5f63713e5c40..5671a11e1784 100644 --- a/net/foreman-proxy/distinfo +++ b/net/foreman-proxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667679385 -SHA256 (foreman-proxy-3.4.0.tar.bz2) = 5846625b59ee0c0da4b9af4eac97f5f5d7020b48b31ee0b28b2946f1b94181cf -SIZE (foreman-proxy-3.4.0.tar.bz2) = 195061 +TIMESTAMP = 1711664645 +SHA256 (foreman-proxy-3.10.0.tar.bz2) = 422d52ece95af93a9e9fc04db4cad0c7b1ccadc9678783d723953d5576bac00a +SIZE (foreman-proxy-3.10.0.tar.bz2) = 195667 diff --git a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb deleted file mode 100644 index 354fd915f8e7..000000000000 --- a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/proxy/http_download.rb.orig 2022-09-08 13:50:11 UTC -+++ lib/proxy/http_download.rb -@@ -10,7 +10,7 @@ module Proxy - logger.warn('Deprecated: HttpDownload read_timeout is deprecated and will be removed in 3.5') if read_timeout - logger.warn('Deprecated: HttpDownload dns_timeout is deprecated and will be removed in 3.5') if dns_timeout - connect_timeout ||= DEFAULT_CONNECT_TIMEOUT -- args = [which('curl')] -+ args = ["%%LOCALBASE%%/bin/curl"] - - # no cert verification if set - args << "--insecure" unless verify_server_cert diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist index c96d1ac659cf..83100d03676b 100644 --- a/net/foreman-proxy/pkg-plist +++ b/net/foreman-proxy/pkg-plist @@ -81,7 +81,6 @@ sbin/smart-proxy %%DATADIR%%/lib/proxy/plugin_validators.rb %%DATADIR%%/lib/proxy/plugins.rb %%DATADIR%%/lib/proxy/provider.rb -%%DATADIR%%/lib/proxy/provider_factory.rb %%DATADIR%%/lib/proxy/request.rb %%DATADIR%%/lib/proxy/request_id_middleware.rb %%DATADIR%%/lib/proxy/settings.rb @@ -148,7 +147,6 @@ sbin/smart-proxy %%DATADIR%%/modules/dns/dns_api.rb %%DATADIR%%/modules/dns/dns_plugin.rb %%DATADIR%%/modules/dns/http_config.ru -%%DATADIR%%/modules/dns_common/dependency_injection/dependencies.rb %%DATADIR%%/modules/dns_common/dns_common.rb %%DATADIR%%/modules/dns_dnscmd/dns_dnscmd.rb %%DATADIR%%/modules/dns_dnscmd/dns_dnscmd_main.rb