From nobody Tue Apr 19 11:32:33 2022 X-Original-To: dev-commits-ports-main@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 8607311D9C8A; Tue, 19 Apr 2022 11:32:36 +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 4KjM9G0wpWz3QmH; Tue, 19 Apr 2022 11:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650367954; 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=4P+OP85o76QmmKZpPtZnwBJIgfuRnbi4ST5/enUS1oA=; b=nxCrgIUOlnq//gI9FpJTBNzSxIHIpFsICSRFnorHfzvIlE0x/1OPfxLuEoUBfVHD1zXAJw MuOekbOOpfZBotpCHSIEXdgej8+M9/OzfCRD8ggoQqV5289TOqEiMM2I/hcTEoAr4S0niF CUTl1B6qFBVr73IDalojjxfuFRhgNyXR1zZ6VsYvkPBCbXXHbPjginJeTdcWUM5eqRVg58 OY5ePzSCqV/ESA1QtjnZL+l+zQl/haSBuhXieBI/Dkt2OQ54czBNhpa9cjUp2A8luyj1/V O3vDe9WSoUMQNKQxTNtfY2+k5eSpj0JzES06GAvbccIwKm1R3wEm9HocHA4Xgg== 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 B9A8326A86; Tue, 19 Apr 2022 11:32:33 +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 23JBWXQ8034917; Tue, 19 Apr 2022 11:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JBWXkY034916; Tue, 19 Apr 2022 11:32:33 GMT (envelope-from git) Date: Tue, 19 Apr 2022 11:32:33 GMT Message-Id: <202204191132.23JBWXkY034916@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: 97108f5a3fca - main - net/foreman-proxy: update 2.5.4 -> 3.0.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 97108f5a3fca1ae8de3556eebae86de77622b7e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650367954; 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=4P+OP85o76QmmKZpPtZnwBJIgfuRnbi4ST5/enUS1oA=; b=p2y1YeWa+FCZ1rEWMbSIrorw7ibDwiV03dVSoMKkYnOLXP4vI5EO18nbec//cC5Zv/sOw5 pc3S6E58pW6gwVhMlWBNlBy476+Kj2QAC4K7uBrme+kJDnrDRROB1xDS3AghMB0lMnIxmT pY7vA0kfVuaGQEUuRU1EsgDCRcCoVae51sF1iD/+WAzEZsEPq2XXk5WggLFsLargw2bPWP jq+B2C1aXVeeO10MzVf2P40/yPig8ktFdLJoHhKmHFyuqpQ125jhuVokOPcjjRCq9E7NYT kN7nSKEtLF0jyMh00K9X2GPqrle0rMzDH35cHLO9jKUzIEkRHgyHgTu+HkC9yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650367954; a=rsa-sha256; cv=none; b=JSWjEV4zzR993Gg3fFMUK2cEN5HL6QlCkISZvEb6GMQ466wxqZgSBB+G0NCG4swORwz332 FyPrW+RcpWvUBqfyFc6BAteE6SgQBlY37SMfL+60nDt4HQaNzLvtMJqzKWKWeVbZpBAZrN z1bIr/uXmiV8+u8Jj9nGQAuUv1XDPT0LZ3c3dcloY8OJzDMyJG8I/MNxcJ0od3iZvYSv+G /Mz30bQ31lGms7S551GwCBa2qTzvXOim9A7DCPrQD0XyFygxQvBh2YTmgmiOtSUig8yLKq WMiTvgDrkqdSNgPXuW71HxNTBdV454AnjfJu5s/Qrn/tqNHV3LMR64Ir4nHosA== 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=97108f5a3fca1ae8de3556eebae86de77622b7e2 commit 97108f5a3fca1ae8de3556eebae86de77622b7e2 Author: Frank Wall AuthorDate: 2022-01-25 01:27:34 +0000 Commit: Matthias Fechner CommitDate: 2022-04-19 11:32:17 +0000 net/foreman-proxy: update 2.5.4 -> 3.0.1 * update to version 3.0.1 * bump Puppet dependency to Puppet 7 * fix path in pkg-message * take maintainership Changes: https://github.com/theforeman/smart-proxy/compare/2.5.4...3.0.1 PR: 260019 Submitted by: Frank Wall ; junovitch (rebase on incremental update) --- net/foreman-proxy/Makefile | 16 ++++++++++------ net/foreman-proxy/distinfo | 6 +++--- ...settings.d-puppetca_hostname_whitelisting.yml.example | 8 ++++++++ ...patch-config-settings.d-puppetca_http_api.yml.example | 12 ++++++++++++ .../patch-config-settings.d-realm_freeipa.yml.example | 8 ++++---- .../files/patch-lib_proxy_http__download.rb | 6 +++--- net/foreman-proxy/pkg-message | 2 +- net/foreman-proxy/pkg-plist | 2 ++ 8 files changed, 43 insertions(+), 17 deletions(-) diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile index 63960ad6fc08..ae59b63a4742 100644 --- a/net/foreman-proxy/Makefile +++ b/net/foreman-proxy/Makefile @@ -1,11 +1,11 @@ # Created by: Martin Matuska PORTNAME= foreman-proxy -PORTVERSION= 2.5.4 +PORTVERSION= 3.0.1 CATEGORIES= net MASTER_SITES= https://downloads.theforeman.org/foreman-proxy/ -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= freebsd@moov.de COMMENT= Foreman Proxy Agent LICENSE= GPLv3 @@ -24,9 +24,9 @@ RUN_DEPENDS= rubygem-bundler_ext>=0.4:sysutils/rubygem-bundler_ext \ USES= shebangfix tar:bzip2 -OPTIONS_DEFINE= BMC PUPPET6 +OPTIONS_DEFINE= BMC PUPPET7 BMC_DESC= Depend on rubyipmi and redfish_client for BMC support -PUPPET6_DESC= Depend on Puppet 6 +PUPPET7_DESC= Depend on Puppet 7 NO_ARCH= yes NO_BUILD= yes @@ -53,7 +53,7 @@ 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 -PUPPET6_RUN_DEPENDS= puppet:sysutils/puppet6 \ +PUPPET7_RUN_DEPENDS= puppet:sysutils/puppet7 \ rubygem-ruby-augeas>=0.5:textproc/rubygem-ruby-augeas post-patch: @@ -63,7 +63,10 @@ post-patch: -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%DATADIR%%|${DATADIR}|g" \ ${WRKSRC}/bin/smart-proxy \ + ${WRKSRC}/extra/dhcpd_config_check.rb \ + ${WRKSRC}/extra/foreman-debug-proxy \ ${WRKSRC}/extra/migrate_settings.rb \ + ${WRKSRC}/extra/puppet_sign.rb \ ${WRKSRC}/extra/query.rb \ ${WRKSRC}/extra/register_service.rb @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ @@ -82,7 +85,8 @@ do-install: ${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR} .endfor ${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in -.for script in foreman-debug-proxy migrate_settings.rb query.rb register_service.rb +.for script in dhcpd_config_check.rb foreman-debug-proxy \ + migrate_settings.rb puppet_sign.rb query.rb register_service.rb ${INSTALL_SCRIPT} ${WRKSRC}/extra/${script} \ ${STAGEDIR}${DATADIR}/extra/${script} .endfor diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo index 814700b86af6..c5ddc1247fdb 100644 --- a/net/foreman-proxy/distinfo +++ b/net/foreman-proxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642902292 -SHA256 (foreman-proxy-2.5.4.tar.bz2) = 880bf324faeceaa0b84d69b601ced6c5bb4054634dfaf714370c646981a08121 -SIZE (foreman-proxy-2.5.4.tar.bz2) = 198722 +TIMESTAMP = 1643073442 +SHA256 (foreman-proxy-3.0.1.tar.bz2) = 9941ed09638d8e6baeef23f4ec99200a95743ea02bb639c8f5d715f3dfcc8d2d +SIZE (foreman-proxy-3.0.1.tar.bz2) = 199109 diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppetca_hostname_whitelisting.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppetca_hostname_whitelisting.yml.example new file mode 100644 index 000000000000..644021449e3c --- /dev/null +++ b/net/foreman-proxy/files/patch-config-settings.d-puppetca_hostname_whitelisting.yml.example @@ -0,0 +1,8 @@ +--- config/settings.d/puppetca_hostname_whitelisting.yml.example.orig 2021-10-26 14:48:17.000000000 +0200 ++++ config/settings.d/puppetca_hostname_whitelisting.yml.example 2021-11-24 11:59:39.227846000 +0100 +@@ -3,4 +3,4 @@ + # Configuration of the PuppetCA hostname_whitelisting provider + # + +-#:autosignfile: /etc/puppet/autosign.conf ++#:autosignfile: %%LOCALBASE%%/etc/puppet/autosign.conf diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppetca_http_api.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppetca_http_api.yml.example new file mode 100644 index 000000000000..b6f1d195b004 --- /dev/null +++ b/net/foreman-proxy/files/patch-config-settings.d-puppetca_http_api.yml.example @@ -0,0 +1,12 @@ +--- config/settings.d/puppetca_http_api.yml.example.orig 2021-10-26 14:48:17.000000000 +0200 ++++ config/settings.d/puppetca_http_api.yml.example 2021-11-24 12:00:12.367622000 +0100 +@@ -3,6 +3,6 @@ + #:puppet_url: https://puppet.example.com:8140 + # + # SSL certificates used to access the CA API. +-#:puppet_ssl_ca: /etc/puppetlabs/ssl/certs/ca.pem +-#:puppet_ssl_cert: /etc/puppetlabs/ssl/certs/puppet.example.com.pem +-#:puppet_ssl_key: /etc/puppetlabs/ssl/private_keys/puppet.example.com.pem ++#:puppet_ssl_ca: %%LOCALBASE%%/etc/puppetlabs/ssl/certs/ca.pem ++#:puppet_ssl_cert: %%LOCALBASE%%/etc/puppetlabs/ssl/certs/puppet.example.com.pem ++#:puppet_ssl_key: %%LOCALBASE%%/etc/puppetlabs/ssl/private_keys/puppet.example.com.pem 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..c7eb5e8a5d54 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,10 +1,10 @@ ---- 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 -@@ -1,8 +1,8 @@ +--- config/settings.d/realm_freeipa.yml.example.orig 2021-10-26 14:48:17.000000000 +0200 ++++ config/settings.d/realm_freeipa.yml.example 2021-11-24 12:26:05.935474000 +0100 +@@ -1,9 +1,9 @@ --- # Authentication for Kerberos-based Realms -:keytab_path: /etc/foreman-proxy/freeipa.keytab -+:realm_keytab: %%LOCALBASE%%/etc/foreman-proxy/freeipa.keytab ++:keytab_path: %%LOCALBASE%%/etc/foreman-proxy/freeipa.keytab :principal: realm-proxy@EXAMPLE.COM -:ipa_config: /etc/ipa/default.conf 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..4f2459957b86 100644 --- a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb +++ b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb @@ -1,8 +1,8 @@ ---- 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 2021-10-26 14:48:17.000000000 +0200 ++++ lib/proxy/http_download.rb 2021-11-24 12:24:12.924526000 +0100 @@ -9,7 +9,7 @@ - def initialize(src, dst, read_timeout = nil, connect_timeout = nil, dns_timeout = nil) + def initialize(src, dst, read_timeout = nil, connect_timeout = nil, dns_timeout = nil, verify_server_cert = false) @dst = dst - wget = which("wget") + wget = "%%LOCALBASE%%/bin/wget" diff --git a/net/foreman-proxy/pkg-message b/net/foreman-proxy/pkg-message index 82c1238d5fe2..451fa7a16cc4 100644 --- a/net/foreman-proxy/pkg-message +++ b/net/foreman-proxy/pkg-message @@ -11,7 +11,7 @@ ${PREFIX}/etc/foreman-proxy/settings.d You can use a bundled script to convert your old settings to new settings: -${PREFIX}/share/foreman/extra/migrate_settings.rb +${PREFIX}/share/foreman-proxy/extra/migrate_settings.rb EOM } ] diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist index 5673caab475b..f4ae423e3751 100644 --- a/net/foreman-proxy/pkg-plist +++ b/net/foreman-proxy/pkg-plist @@ -44,6 +44,7 @@ sbin/smart-proxy %%DATADIR%%/bundler.d/windows.rb %%DATADIR%%/config %%DATADIR%%/config.ru +%%DATADIR%%/extra/dhcpd_config_check.rb %%DATADIR%%/extra/foreman-debug-proxy %%DATADIR%%/extra/migrate_settings.rb %%DATADIR%%/extra/migrations/20150327000000_migrate_monolithic_config.rb @@ -55,6 +56,7 @@ sbin/smart-proxy %%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/puppet_sign.rb %%DATADIR%%/extra/query.rb %%DATADIR%%/extra/register_service.rb %%DATADIR%%/lib/bundler_helper.rb