Attachment 221918 Details for Bug 253008 – net/foreman-proxy: update 1.21.2 -> 1.23.2

[patch] net/foreman-proxy: update 1.21.2 -> 1.23.2

foreman-proxy-121-123.patch (text/plain), 15.00 KB, created by Jason Unovitch on 2021-01-26 01:32:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Unovitch

Created: 2021-01-26 01:32:12 UTC

Size: 15.00 KB

patch

obsolete

>commit c5288b61c315780a0c382de73f0c7cbb19e423b9
>Author: junovitch <junovitch@FreeBSD.org>
>Date:   Sat Nov 14 22:08:34 2020 +0000
>
>    net/foreman-proxy: update 1.21.2 -> 1.23.2
>
>diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
>index cef318fca85d..4e4ea320ade6 100644
>--- a/net/foreman-proxy/Makefile
>+++ b/net/foreman-proxy/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	foreman-proxy
>-PORTVERSION=	1.21.2
>+PORTVERSION=	1.23.2
> CATEGORIES=	net
> MASTER_SITES=	https://downloads.theforeman.org/foreman-proxy/
> 
>@@ -13,7 +13,9 @@ LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	rubygem-bundler_ext>=0.4:sysutils/rubygem-bundler_ext \
>+		rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \
> 		rubygem-json>=1.8.1:devel/rubygem-json \
>+		rubygem-logging>=0:devel/rubygem-logging \
> 		rubygem-rack>=2.0:www/rubygem-rack \
> 		rubygem-rb-kqueue>=0.2.2:devel/rubygem-rb-kqueue \
> 		rubygem-rsec>=0.4.3:devel/rubygem-rsec \
>@@ -88,9 +90,9 @@ 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_legacy \
>+	puppet_proxy_customrun \
> 	puppet_proxy_mcollective puppet_proxy_puppet_api \
>-	puppet_proxy_puppetrun puppet_proxy_salt puppet_proxy_ssh puppet \
>+	puppet_proxy_salt puppet_proxy_ssh 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 581509743483..91efea61f7a9 100644
>--- a/net/foreman-proxy/distinfo
>+++ b/net/foreman-proxy/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1555274078
>-SHA256 (foreman-proxy-1.21.2.tar.bz2) = bc5590f13de8e37cfb52c9a898642ae595b91d498b0384da28602e5505245a6a
>-SIZE (foreman-proxy-1.21.2.tar.bz2) = 210802
>+TIMESTAMP = 1585316255
>+SHA256 (foreman-proxy-1.23.2.tar.bz2) = 6b538b9a434c59780f27f4348d6fa44cd8a1fcd20465ee767a7e8ddff4af4f26
>+SIZE (foreman-proxy-1.23.2.tar.bz2) = 208682
>diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example
>deleted file mode 100644
>index 9acd043d62ec..000000000000
>--- a/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example
>+++ /dev/null
>@@ -1,24 +0,0 @@
>---- config/settings.d/puppet_proxy_legacy.yml.example	2018-12-06 13:30:25.000000000 +0100
>-+++ config/settings.d/puppet_proxy_legacy.yml.example	2019-02-11 22:22:20.750500000 +0100
>-@@ -5,7 +5,7 @@
>- # :puppet_version setting in smart-proxy's puppet.yml configuration file.
>- #
>- ---
>--#:puppet_conf: /etc/puppet/puppet.conf
>-+#:puppet_conf: %%LOCALBASE%%/etc/puppet/puppet.conf
>- #
>- # Override use of Puppet's API to list environments, by default it will use only if
>- # environmentpath is given in puppet.conf, else will look for environments in puppet.conf
>-@@ -16,9 +16,9 @@
>- #:puppet_url: https://puppet.example.com:8140
>- #
>- # SSL certificates used to access the environment API. Required if puppet_use_environment_api is set to true.
>--#:puppet_ssl_ca: /var/lib/puppet/ssl/certs/ca.pem
>--#:puppet_ssl_cert: /var/lib/puppet/ssl/certs/puppet.example.com.pem
>--#:puppet_ssl_key: /var/lib/puppet/ssl/private_keys/puppet.example.com.pem
>-+#:puppet_ssl_ca: /var/puppet/ssl/certs/ca.pem
>-+#:puppet_ssl_cert: /var/puppet/ssl/certs/puppet.example.com.pem
>-+#:puppet_ssl_key: /var/puppet/ssl/private_keys/puppet.example.com.pem
>- #
>- # Enable/disable puppet class cache
>- #:use_cache: true
>diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_puppet_api.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_puppet_api.yml.example
>index 84cff78da77f..5541e2e7a763 100644
>--- a/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_puppet_api.yml.example
>+++ b/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_puppet_api.yml.example
>@@ -1,6 +1,6 @@
>---- config/settings.d/puppet_proxy_puppet_api.yml.example.orig	2018-12-06 13:30:25.000000000 +0100
>-+++ config/settings.d/puppet_proxy_puppet_api.yml.example	2019-02-11 22:22:53.410247000 +0100
>-@@ -9,9 +9,9 @@
>+--- config/settings.d/puppet_proxy_puppet_api.yml.example.orig	2020-03-12 14:08:43 UTC
>++++ config/settings.d/puppet_proxy_puppet_api.yml.example
>+@@ -3,9 +9,9 @@
>  #:puppet_url: https://puppet.example.com:8140
>  #
>  # SSL certificates used to access the puppet API
>diff --git a/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example b/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example
>index 52f93d135b18..2fe5f1da9cd5 100644
>--- a/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example
>+++ b/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example
>@@ -1,5 +1,5 @@
>---- config/settings.d/realm_freeipa.yml.example.orig	2018-12-06 13:30:25.000000000 +0100
>-+++ config/settings.d/realm_freeipa.yml.example	2019-02-11 22:24:18.091737000 +0100
>+--- config/settings.d/realm_freeipa.yml.example.orig	2017-05-08 15:18:42 UTC
>++++ config/settings.d/realm_freeipa.yml.example
> @@ -1,8 +1,8 @@
>  ---
>  # Authentication for Kerberos-based Realms
>diff --git a/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example b/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example
>index 5aae4bfc8a6a..350598f0599c 100644
>--- a/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example
>+++ b/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example
>@@ -1,6 +1,6 @@
>---- config/settings.d/tftp.yml.example.orig	2018-12-06 13:30:25.000000000 +0100
>-+++ config/settings.d/tftp.yml.example	2019-02-11 22:24:46.060855000 +0100
>-@@ -2,7 +2,7 @@
>+--- config/settings.d/tftp.yml.example.orig	2017-05-08 15:18:42 UTC
>++++ config/settings.d/tftp.yml.example
>+@@ -2,6 +2,6 @@
>  # Can be true, false, or http/https to enable just one of the protocols
>  :enabled: false
>  
>@@ -8,4 +8,3 @@
> +#:tftproot: /tftpboot
>  # Defines the TFTP Servername to use, overrides the name in the subnet declaration
>  #:tftp_servername: tftp.domain.com
>- 
>diff --git a/net/foreman-proxy/files/patch-config-settings.yml.example b/net/foreman-proxy/files/patch-config-settings.yml.example
>index ff3ac32eedde..bf15c6366d0e 100644
>--- a/net/foreman-proxy/files/patch-config-settings.yml.example
>+++ b/net/foreman-proxy/files/patch-config-settings.yml.example
>@@ -1,6 +1,6 @@
>---- config/settings.yml.example.orig	2018-12-06 13:30:25.000000000 +0100
>-+++ config/settings.yml.example	2019-02-11 22:25:42.626500000 +0100
>-@@ -43,7 +43,7 @@
>+--- config/settings.yml.example.orig	2017-05-08 15:18:42 UTC
>++++ config/settings.yml.example
>+@@ -38,7 +38,7 @@
>  #:foreman_ssl_key: ssl/private_keys/fqdn.pem
>  
>  # by default smart_proxy runs in the foreground. To enable running as a daemon, uncomment 'daemon' setting
>diff --git a/net/foreman-proxy/files/patch-config_settings.d_puppetca__puppet__cert.yml.example b/net/foreman-proxy/files/patch-config_settings.d_puppetca__puppet__cert.yml.example
>new file mode 100644
>index 000000000000..a236513fca8e
>--- /dev/null
>+++ b/net/foreman-proxy/files/patch-config_settings.d_puppetca__puppet__cert.yml.example
>@@ -0,0 +1,9 @@
>+--- config/settings.d/puppetca_puppet_cert.yml.example.orig	2019-12-22 22:37:03 UTC
>++++ config/settings.d/puppetca_puppet_cert.yml.example
>+@@ -1,4 +1,4 @@
>+ ---
>+-#:ssldir: /var/lib/puppet/ssl
>++#:ssldir: /var/puppet/ssl
>+ #:puppetca_use_sudo: true
>+-#:sudo_command: /usr/bin/sudo
>++#:sudo_command: %%LOCALBASE%%/bin/sudo
>diff --git a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
>index 81c97ff8734e..153d0bfedc01 100644
>--- a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
>+++ b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
>@@ -1,5 +1,5 @@
>---- lib/proxy/http_download.rb.orig	2018-12-06 13:30:25.000000000 +0100
>-+++ lib/proxy/http_download.rb	2019-02-11 22:33:58.455890000 +0100
>+--- lib/proxy/http_download.rb.orig	2017-05-08 15:18:42 UTC
>++++ lib/proxy/http_download.rb
> @@ -9,7 +9,7 @@
>  
>      def initialize(src, dst, read_timeout = nil, connect_timeout = nil, dns_timeout = nil)
>diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist
>index 4ade110f67cd..a48b7f7155b1 100644
>--- a/net/foreman-proxy/pkg-plist
>+++ b/net/foreman-proxy/pkg-plist
>@@ -12,10 +12,8 @@
> @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_legacy.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_puppetrun.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
>@@ -37,7 +35,6 @@ sbin/smart-proxy
> %%DATADIR%%/bundler.d/journald.rb
> %%DATADIR%%/bundler.d/krb5.rb
> %%DATADIR%%/bundler.d/libvirt.rb
>-%%DATADIR%%/bundler.d/puppet.rb
> %%DATADIR%%/bundler.d/puppetca_token_whitelisting.rb
> %%DATADIR%%/bundler.d/realm_freeipa.rb
> %%DATADIR%%/bundler.d/test.rb
>@@ -54,11 +51,11 @@ sbin/smart-proxy
> %%DATADIR%%/extra/migrations/20161209000000_migrate_realm_settings.rb
> %%DATADIR%%/extra/migrations/20170523000000_migrate_autosign_setting.rb
> %%DATADIR%%/extra/migrations/2018062000000_migrate_puppetca_settings.rb
>+%%DATADIR%%/extra/migrations/20181016000000_migrate_puppetca_puppet_cert_settings.rb
> %%DATADIR%%/extra/query.rb
> %%DATADIR%%/extra/register-service.rb
> %%DATADIR%%/lib/bundler_helper.rb
>-%%DATADIR%%/lib/checks.rb
>-%%DATADIR%%/lib/daemon.rb
>+%%DATADIR%%/lib/hash-patch.rb
> %%DATADIR%%/lib/launcher.rb
> %%DATADIR%%/lib/proxy/default_di_wirings.rb
> %%DATADIR%%/lib/proxy/default_plugin_validators.rb
>@@ -67,8 +64,6 @@ sbin/smart-proxy
> %%DATADIR%%/lib/proxy/file_lock.rb
> %%DATADIR%%/lib/proxy/helpers.rb
> %%DATADIR%%/lib/proxy/http_download.rb
>-%%DATADIR%%/lib/proxy/http_download.rb.bak
>-%%DATADIR%%/lib/proxy/http_download.rb.orig
> %%DATADIR%%/lib/proxy/kerberos.rb
> %%DATADIR%%/lib/proxy/log.rb
> %%DATADIR%%/lib/proxy/log_buffer/buffer.rb
>@@ -92,7 +87,6 @@ sbin/smart-proxy
> %%DATADIR%%/lib/proxy/signal_handler.rb
> %%DATADIR%%/lib/proxy/util.rb
> %%DATADIR%%/lib/proxy/validations.rb
>-%%DATADIR%%/lib/rack-patch.rb
> %%DATADIR%%/lib/sinatra/authorization.rb
> %%DATADIR%%/lib/sinatra/default_not_found_page.rb
> %%DATADIR%%/lib/smart_proxy.rb
>@@ -199,18 +193,6 @@ sbin/smart-proxy
> %%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_legacy/class_scanner.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/class_scanner_base.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/class_scanner_eparser.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/environments_api_request.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/initializer.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/plugin_configuration.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_api_v2_environments_retriever.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_cache.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_config.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_config_environments_retriever.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_proxy_legacy.rb
>-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_proxy_legacy_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
>@@ -219,13 +201,8 @@ sbin/smart-proxy
> %%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_classes_retriever.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_puppetrun/plugin_configuration.rb
>-%%DATADIR%%/modules/puppet_proxy_puppetrun/puppet_proxy_puppetrun.rb
>-%%DATADIR%%/modules/puppet_proxy_puppetrun/puppet_proxy_puppetrun_plugin.rb
>-%%DATADIR%%/modules/puppet_proxy_puppetrun/puppetrun_main.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
>@@ -236,15 +213,23 @@ sbin/smart-proxy
> %%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
> %%DATADIR%%/modules/puppetca/puppetca.rb
>+%%DATADIR%%/modules/puppetca/plugin_configuration.rb
> %%DATADIR%%/modules/puppetca/puppetca_api.rb
> %%DATADIR%%/modules/puppetca/puppetca_plugin.rb
>-%%DATADIR%%/modules/puppetca/puppetca_puppet_cert.rb
> %%DATADIR%%/modules/puppetca_hostname_whitelisting/plugin_configuration.rb
> %%DATADIR%%/modules/puppetca_hostname_whitelisting/puppetca_hostname_whitelisting.rb
> %%DATADIR%%/modules/puppetca_hostname_whitelisting/puppetca_hostname_whitelisting_autosigner.rb
> %%DATADIR%%/modules/puppetca_hostname_whitelisting/puppetca_hostname_whitelisting_plugin.rb
>+%%DATADIR%%/modules/puppetca_http_api/ca_v1_api_request.rb
>+%%DATADIR%%/modules/puppetca_http_api/plugin_configuration.rb
>+%%DATADIR%%/modules/puppetca_http_api/puppetca_http_api.rb
>+%%DATADIR%%/modules/puppetca_http_api/puppetca_http_api_plugin.rb
>+%%DATADIR%%/modules/puppetca_http_api/puppetca_impl.rb
>+%%DATADIR%%/modules/puppetca_puppet_cert/plugin_configuration.rb
>+%%DATADIR%%/modules/puppetca_puppet_cert/puppetca_impl.rb
>+%%DATADIR%%/modules/puppetca_puppet_cert/puppetca_puppet_cert.rb
>+%%DATADIR%%/modules/puppetca_puppet_cert/puppetca_puppet_cert_plugin.rb
> %%DATADIR%%/modules/puppetca_token_whitelisting/plugin_configuration.rb
> %%DATADIR%%/modules/puppetca_token_whitelisting/puppetca_token_whitelisting.rb
> %%DATADIR%%/modules/puppetca_token_whitelisting/puppetca_token_whitelisting_autosigner.rb
>@@ -267,11 +252,15 @@ sbin/smart-proxy
> %%DATADIR%%/modules/root/root_api.rb
> %%DATADIR%%/modules/root/root_module_loader.rb
> %%DATADIR%%/modules/root/root_plugin.rb
>+%%DATADIR%%/modules/root/root_v2_api.rb
> %%DATADIR%%/modules/templates/http_config.ru
>+%%DATADIR%%/modules/templates/proxy_request.rb
> %%DATADIR%%/modules/templates/template_proxy_request.rb
> %%DATADIR%%/modules/templates/templates.rb
>-%%DATADIR%%/modules/templates/templates_api.rb
> %%DATADIR%%/modules/templates/templates_plugin.rb
>+%%DATADIR%%/modules/templates/templates_unattended_api.rb
>+%%DATADIR%%/modules/templates/templates_userdata_api.rb
>+%%DATADIR%%/modules/templates/userdata_proxy_request.rb
> %%DATADIR%%/modules/tftp/http_config.ru
> %%DATADIR%%/modules/tftp/server.rb
> %%DATADIR%%/modules/tftp/tftp.rb

Actions: View | Diff

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