From nobody Tue Apr 19 10:32:23 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8DBA611C9E98; Tue, 19 Apr 2022 10:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KjKqq3bp6z3FZH; Tue, 19 Apr 2022 10:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650364343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yylAyejraI9d7wtQiw67koBeoEmXFkNVv9nrp0QoHUo=; b=PFdQw5M9SiRFwwj+RsEsxXBiBHKeZ7YIyCK2XDcKfzK2+l3R5RJ8RrawfL7ty3neRMPTIC A+FDfZJeikqLiu8kSF4FeaUK03qePdSFS6GZijcOQW5hpc0/zKdZ9S8BzCbmV+3FQ+XJai 6JkwFHp+WldTj6aAGxQqNw63xYzmVNDu+Q5T+bp9V1T1g+KwXUBXt/ugMl9Xhr529SrG+J M/e/Nojf1fNwvarrGsdMRPdN4cVwO71onCh8HZx8Y8dm5xhS3TOfFvEtnHGS0v70OOD+GK 3Wy3Qv8mqny1ntPUsS7Kv1PXTOmUEZRu6Bw3FiUeWtmXyJCBdONhFZMxKRYstQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5CF5725744; Tue, 19 Apr 2022 10:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23JAWNDW053726; Tue, 19 Apr 2022 10:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JAWNO7053711; Tue, 19 Apr 2022 10:32:23 GMT (envelope-from git) Date: Tue, 19 Apr 2022 10:32:23 GMT Message-Id: <202204191032.23JAWNO7053711@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 61f6cf14ee2c - main - net/foreman-proxy: update 1.21.2 -> 1.23.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61f6cf14ee2c173ae73e111b7eff28c94b8ee133 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650364343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yylAyejraI9d7wtQiw67koBeoEmXFkNVv9nrp0QoHUo=; b=r3ZBaqwR3XEVrbaI3+cNHROd2LMlS5lAF3GEBY9UMCwrBJLQ6D62EWFmg/2x2CJEHTV1nJ M/C5WOX1Mah1GJbBDQmq/ILeCqEcJKl62wdy/onkYGqArl4DbtwjwkAAVUuMfLWNkIYH/V Gfcme1Evh1JOLUGcIV+V9Y7XWFvht2T3rEr213I9AgIG5myB0HD5T6Xbn3mVypoJL47ZAG gwUgDpXyAdygBwXKb8E9pETh9csv3uo4WDNjd2/mR/QCvaaPZoeWS3wrE4ZxUr+sw9vmdL r1wNP7Fg0233F/uTKySTCkiwnn+XhcekyaBPtwZuLdNYmitiEFoLRidnrR9E1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650364343; a=rsa-sha256; cv=none; b=L4fivtMp3c4++GKy4HoqKnUbrGMZg9o8lhmepcwJ7DXU/9w4acQZO7WwFPNda6LE0lgzDE SKCmxhiEnV5mFx3uQ7iYUnbwDWbp6cQd6MukdZeUXxoz7dVsXwcnbFgJYrKBvl8wSAgpv0 9bLLQzD+2nXP2ihLkah7P31g87PfAQUj4jnWEpvBzb1gT/Z5nhhEiA5sathshlUUnVfZD9 MiF7idXVJASMfSdoXK8XXgOAlGmMIFIDTEWE09tszY3eOeAr6W613EkhPJ5/iZaipEqx2t Gn/bQNYOWZ/tdg0Bg4cIf2GGaXvU6HjaSuY6zv32gnleBVrOVwgtptILF+Gb0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=61f6cf14ee2c173ae73e111b7eff28c94b8ee133 commit 61f6cf14ee2c173ae73e111b7eff28c94b8ee133 Author: Jason Unovitch AuthorDate: 2020-11-14 22:08:34 +0000 Commit: Matthias Fechner CommitDate: 2022-04-19 10:27:10 +0000 net/foreman-proxy: update 1.21.2 -> 1.23.2 Changes: https://github.com/theforeman/smart-proxy/compare/1.21.2...1.23.2 PR: 253008 Submitted by: junovitch --- net/foreman-proxy/Makefile | 15 ++++--- net/foreman-proxy/distinfo | 6 +-- ...nfig-settings.d-puppet_proxy_legacy.yml.example | 24 ----------- ...g_settings.d_puppetca__puppet__cert.yml.example | 9 ++++ net/foreman-proxy/pkg-plist | 49 ++++++++++------------ 5 files changed, 43 insertions(+), 60 deletions(-) diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile index d348ac26fa3e..fa04cf3ce2a1 100644 --- a/net/foreman-proxy/Makefile +++ b/net/foreman-proxy/Makefile @@ -1,7 +1,7 @@ # Created by: Martin Matuska PORTNAME= foreman-proxy -PORTVERSION= 1.21.2 +PORTVERSION= 1.23.2 CATEGORIES= net MASTER_SITES= https://downloads.theforeman.org/foreman-proxy/ @@ -12,7 +12,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 \ @@ -86,11 +88,12 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \ ${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_mcollective puppet_proxy_puppet_api \ - puppet_proxy_puppetrun puppet_proxy_salt puppet_proxy_ssh puppet \ - puppetca realm templates tftp + dns_libvirt dns_nsupdate_gss dns_nsupdate dns facts httpboot \ + logs puppet_proxy_customrun puppet_proxy_mcollective \ + puppet_proxy_puppet_api puppet_proxy_salt puppet_proxy_ssh puppet \ + puppetca_hostname_whitelisting puppetca_http_api \ + puppetca_puppet_cert puppetca_token_whitelisting \ + puppetca realm_freeipa realm templates tftp ${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \ ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample .endfor 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_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/pkg-plist b/net/foreman-proxy/pkg-plist index 4ade110f67cd..dda1e20f5488 100644 --- a/net/foreman-proxy/pkg-plist +++ b/net/foreman-proxy/pkg-plist @@ -9,17 +9,21 @@ @sample %%ETCDIR%%/settings.d/dns_nsupdate.yml.sample @sample %%ETCDIR%%/settings.d/dns_nsupdate_gss.yml.sample @sample %%ETCDIR%%/settings.d/facts.yml.sample +@sample %%ETCDIR%%/settings.d/httpboot.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_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 +@sample %%ETCDIR%%/settings.d/puppetca_hostname_whitelisting.yml.sample +@sample %%ETCDIR%%/settings.d/puppetca_http_api.yml.sample +@sample %%ETCDIR%%/settings.d/puppetca_puppet_cert.yml.sample +@sample %%ETCDIR%%/settings.d/puppetca_token_whitelisting.yml.sample @sample %%ETCDIR%%/settings.d/realm.yml.sample +@sample %%ETCDIR%%/settings.d/realm_freeipa.yml.sample @sample %%ETCDIR%%/settings.d/templates.yml.sample @sample %%ETCDIR%%/settings.d/tftp.yml.sample @sample %%ETCDIR%%/settings.yml.sample @@ -37,7 +41,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 +57,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 +70,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 +93,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 +199,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 +207,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 @@ -240,11 +223,19 @@ sbin/smart-proxy %%DATADIR%%/modules/puppetca/puppetca.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 +258,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