Attachment 229824 Details for Bug 253008 – net/foreman-proxy: update 2.2.3 -> 2.3.5

[patch] net/foreman-proxy: update 2.2.3 -> 2.3.5

foreman223-235.patch (text/plain), 8.12 KB, created by Jason Unovitch on 2021-12-01 02:15:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Unovitch

Created: 2021-12-01 02:15:12 UTC

Size: 8.12 KB

patch

obsolete

>commit e7d170d37ffbd8100923d1ba5351ed1b780181a9
>Author: Jason Unovitch <junovitch@FreeBSD.org>
>Date:   Sat Sep 4 16:29:29 2021 +0000
>
>    net/foreman-proxy: update 2.2.3 -> 2.3.5
>    
>    - Patch callback to systemd notify with this update (added in
>      theforeman/smart-proxy@99e9e5bf5843). This prevents a LoadError
>      on sd_notify which is a Linux specific gem used to notify systemd
>      about various service status changes of Ruby programs.
>
>diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
>index ecf00e6d9702..361f1575733d 100644
>--- a/net/foreman-proxy/Makefile
>+++ b/net/foreman-proxy/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Martin Matuska <mm@FreeBSD.org>
> 
> PORTNAME=	foreman-proxy
>-PORTVERSION=	2.2.3
>+PORTVERSION=	2.3.5
> CATEGORIES=	net
> MASTER_SITES=	https://downloads.theforeman.org/foreman-proxy/
> 
>@@ -50,7 +50,8 @@ PLIST_SUB=	${SUB_LIST} MKDIR="${MKDIR}"
> 
> SHEBANG_FILES=	extra/foreman-debug-proxy
> 
>-BMC_RUN_DEPENDS=	rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi
>+BMC_RUN_DEPENDS=	rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi \
>+			rubygem-redfish_client>=0.5.1:sysutils/rubygem-redfish_client
> PUPPET6_RUN_DEPENDS=	puppet:sysutils/puppet6 \
> 			rubygem-ruby-augeas>=0.5:textproc/rubygem-ruby-augeas
> 
>@@ -89,9 +90,7 @@ do-install:
> 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample
> .for cfg in bmc dhcp_isc dhcp_libvirt dhcp_native_ms dhcp dns_dnscmd \
> 	dns_libvirt dns_nsupdate_gss dns_nsupdate dns facts logs \
>-	puppet_proxy_customrun \
>-	puppet_proxy_mcollective puppet_proxy_puppet_api \
>-	puppet_proxy_salt puppet_proxy_ssh puppet \
>+	puppet_proxy_puppet_api puppet \
> 	puppetca realm templates tftp
> 	${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \
> 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample
>diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo
>index 6a469e5b3e7a..16eabe62116e 100644
>--- a/net/foreman-proxy/distinfo
>+++ b/net/foreman-proxy/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1630727352
>-SHA256 (foreman-proxy-2.2.3.tar.bz2) = fcbfe1c0befb3bbb4b9af3790c0f1e991746da1f98c1343c0ea86b91d71b6ec0
>-SIZE (foreman-proxy-2.2.3.tar.bz2) = 208927
>+TIMESTAMP = 1630770915
>+SHA256 (foreman-proxy-2.3.5.tar.bz2) = 879f0f656bd139c19dab6d68665672a45f747e60a7407332094c81edaf15883a
>+SIZE (foreman-proxy-2.3.5.tar.bz2) = 198327
>diff --git a/net/foreman-proxy/files/patch-lib_launcher.rb b/net/foreman-proxy/files/patch-lib_launcher.rb
>new file mode 100644
>index 000000000000..d1c8558932ee
>--- /dev/null
>+++ b/net/foreman-proxy/files/patch-lib_launcher.rb
>@@ -0,0 +1,48 @@
>+--- lib/launcher.rb.orig	2021-06-09 10:46:47 UTC
>++++ lib/launcher.rb
>+@@ -2,7 +2,6 @@ require 'proxy/log'
>+ require 'proxy/settings'
>+ require 'proxy/signal_handler'
>+ require 'proxy/log_buffer/trace_decorator'
>+-require 'sd_notify'
>+ 
>+ CIPHERS = ['ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES256-GCM-SHA384',
>+            'AES128-GCM-SHA256', 'AES256-GCM-SHA384', 'AES128-SHA256',
>+@@ -172,7 +171,6 @@
>+ 
>+       http_app = http_app(settings.http_port)
>+       https_app = https_app(settings.https_port)
>+-      install_webrick_callback!(http_app, https_app)
>+ 
>+       t1 = Thread.new { webrick_server(https_app, settings.bind_host, settings.https_port).start } unless https_app.nil?
>+       t2 = Thread.new { webrick_server(http_app, settings.bind_host, settings.http_port).start } unless http_app.nil?
>+@@ -190,29 +188,6 @@
>+       logger.error "Error during startup, terminating", e
>+       puts "Errors detected on startup, see log for details. Exiting: #{e}"
>+       exit(1)
>+-    end
>+-
>+-    def install_webrick_callback!(*apps)
>+-      apps.compact!
>+-
>+-      # track how many webrick apps are still starting up
>+-      @pending_webrick = apps.size
>+-      @pending_webrick_lock = Mutex.new
>+-
>+-      apps.each do |app|
>+-        # add a callback to each server, decrementing the pending counter
>+-        app[:StartCallback] = lambda do
>+-          @pending_webrick_lock.synchronize do
>+-            @pending_webrick -= 1
>+-            launched(apps) if @pending_webrick.zero?
>+-          end
>+-        end
>+-      end
>+-    end
>+-
>+-    def launched(apps)
>+-      logger.info("Smart proxy has launched on #{apps.size} socket(s), waiting for requests")
>+-      SdNotify.ready
>+     end
>+   end
>+ end
>diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist
>index 4939dea0d6f4..8048c5d5d51c 100644
>--- a/net/foreman-proxy/pkg-plist
>+++ b/net/foreman-proxy/pkg-plist
>@@ -11,11 +11,7 @@
> @sample %%ETCDIR%%/settings.d/facts.yml.sample
> @sample %%ETCDIR%%/settings.d/logs.yml.sample
> @sample %%ETCDIR%%/settings.d/puppet.yml.sample
>-@sample %%ETCDIR%%/settings.d/puppet_proxy_customrun.yml.sample
>-@sample %%ETCDIR%%/settings.d/puppet_proxy_mcollective.yml.sample
> @sample %%ETCDIR%%/settings.d/puppet_proxy_puppet_api.yml.sample
>-@sample %%ETCDIR%%/settings.d/puppet_proxy_salt.yml.sample
>-@sample %%ETCDIR%%/settings.d/puppet_proxy_ssh.yml.sample
> @sample %%ETCDIR%%/settings.d/puppetca.yml.sample
> @sample %%ETCDIR%%/settings.d/realm.yml.sample
> @sample %%ETCDIR%%/settings.d/templates.yml.sample
>@@ -80,7 +76,6 @@ sbin/smart-proxy
> %%DATADIR%%/lib/proxy/provider_factory.rb
> %%DATADIR%%/lib/proxy/request.rb
> %%DATADIR%%/lib/proxy/request_id_middleware.rb
>-%%DATADIR%%/lib/proxy/sd_notify.rb
> %%DATADIR%%/lib/proxy/settings.rb
> %%DATADIR%%/lib/proxy/settings/global.rb
> %%DATADIR%%/lib/proxy/settings/plugin.rb
>@@ -99,6 +94,9 @@ sbin/smart-proxy
> %%DATADIR%%/modules/bmc/bmc_plugin.rb
> %%DATADIR%%/modules/bmc/http_config.ru
> %%DATADIR%%/modules/bmc/ipmi.rb
>+%%DATADIR%%/modules/bmc/redfish.rb
>+%%DATADIR%%/modules/bmc/redfish/dell.rb
>+%%DATADIR%%/modules/bmc/redfish/hpe.rb
> %%DATADIR%%/modules/bmc/shell.rb
> %%DATADIR%%/modules/bmc/ssh.rb
> %%DATADIR%%/modules/dhcp/configuration_loader.rb
>@@ -185,29 +183,12 @@ sbin/smart-proxy
> %%DATADIR%%/modules/puppet_proxy_common/environments_retriever_base.rb
> %%DATADIR%%/modules/puppet_proxy_common/errors.rb
> %%DATADIR%%/modules/puppet_proxy_common/puppet_class.rb
>-%%DATADIR%%/modules/puppet_proxy_common/runner.rb
>-%%DATADIR%%/modules/puppet_proxy_customrun/customrun_main.rb
>-%%DATADIR%%/modules/puppet_proxy_customrun/plugin_configuration.rb
>-%%DATADIR%%/modules/puppet_proxy_customrun/puppet_proxy_customrun.rb
>-%%DATADIR%%/modules/puppet_proxy_customrun/puppet_proxy_customrun_plugin.rb
>-%%DATADIR%%/modules/puppet_proxy_mcollective/mcollective_main.rb
>-%%DATADIR%%/modules/puppet_proxy_mcollective/plugin_configuration.rb
>-%%DATADIR%%/modules/puppet_proxy_mcollective/puppet_proxy_mcollective.rb
>-%%DATADIR%%/modules/puppet_proxy_mcollective/puppet_proxy_mcollective_plugin.rb
> %%DATADIR%%/modules/puppet_proxy_puppet_api/plugin_configuration.rb
> %%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api.rb
> %%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api_plugin.rb
> %%DATADIR%%/modules/puppet_proxy_puppet_api/v3_api_request.rb
> %%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environment_classes_api_classes_retriever.rb
> %%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environments_retriever.rb
>-%%DATADIR%%/modules/puppet_proxy_salt/plugin_configuration.rb
>-%%DATADIR%%/modules/puppet_proxy_salt/puppet_proxy_salt.rb
>-%%DATADIR%%/modules/puppet_proxy_salt/puppet_proxy_salt_plugin.rb
>-%%DATADIR%%/modules/puppet_proxy_salt/salt_main.rb
>-%%DATADIR%%/modules/puppet_proxy_ssh/plugin_configuration.rb
>-%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh.rb
>-%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh_main.rb
>-%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh_plugin.rb
> %%DATADIR%%/modules/puppetca/dependency_injection.rb
> %%DATADIR%%/modules/puppetca/http_config.ru
> %%DATADIR%%/modules/puppetca/plugin_configuration.rb
>@@ -244,6 +225,11 @@ sbin/smart-proxy
> %%DATADIR%%/modules/realm_freeipa/provider.rb
> %%DATADIR%%/modules/realm_freeipa/realm_freeipa.rb
> %%DATADIR%%/modules/realm_freeipa/realm_freeipa_plugin.rb
>+%%DATADIR%%/modules/registration/http_config.ru
>+%%DATADIR%%/modules/registration/proxy_request.rb
>+%%DATADIR%%/modules/registration/registration.rb
>+%%DATADIR%%/modules/registration/registration_api.rb
>+%%DATADIR%%/modules/registration/registration_plugin.rb
> %%DATADIR%%/modules/root/http_config.ru
> %%DATADIR%%/modules/root/root.rb
> %%DATADIR%%/modules/root/root_api.rb

Actions: View | Diff

Attachments on bug 253008: 221918 | 221919 | 221920 | 228908 | 228909 | 229824