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,104 +1,108 @@ # 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 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 \ rubygem-sd_notify>=0.1.1:devel/rubygem-sd_notify \ rubygem-sinatra>=2.0:www/rubygem-sinatra \ wget:ftp/wget 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 USE_RC_SUBR= foreman-proxy USE_RUBY= yes FOREMAN_PROXY_USER?= foreman_proxy FOREMAN_PROXY_GROUP?= foreman_proxy FOREMAN_PROXY_LOGDIR?= /var/log/foreman-proxy FOREMAN_PROXY_RUNDIR?= /var/run/foreman-proxy USERS= ${FOREMAN_PROXY_USER} GROUPS= ${FOREMAN_PROXY_GROUP} SUB_LIST= RUBY="${RUBY}" \ FOREMAN_PROXY_USER="${FOREMAN_PROXY_USER}" \ FOREMAN_PROXY_GROUP="${FOREMAN_PROXY_GROUP}" \ FOREMAN_PROXY_RUNDIR="${FOREMAN_PROXY_RUNDIR}" \ FOREMAN_PROXY_LOGDIR="${FOREMAN_PROXY_LOGDIR}" PLIST_SUB= ${SUB_LIST} MKDIR="${MKDIR}" 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: @${REINPLACE_CMD} \ -e "s|/usr/bin/env ruby|${RUBY}|g" \ -e "s|/usr/bin/ruby|${RUBY}|g" \ -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" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/config/settings.d/*.yml.example \ ${WRKSRC}/lib/proxy/http_download.rb do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d ${MKDIR} ${STAGEDIR}${DATADIR}/extra ${LN} -s ${PREFIX}/etc/foreman-proxy ${STAGEDIR}${DATADIR}/config ${INSTALL_SCRIPT} ${WRKSRC}/bin/smart-proxy \ ${STAGEDIR}${PREFIX}/sbin/smart-proxy .for file in CHANGELOG Contributors Gemfile LICENSE README.md \ smart_proxy.gemspec VERSION bundler.d config.ru lib modules ${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 ${CP} -r ${WRKSRC}/extra/migrations ${STAGEDIR}${DATADIR}/extra ${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 httpboot \ logs puppet_proxy_puppet_api puppet \ puppetca_hostname_whitelisting puppetca_http_api \ puppetca_puppet_cert puppetca_token_whitelisting \ puppetca realm_freeipa realm registration templates tftp ${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \ ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample .endfor ${MKDIR} -m 0700 ${STAGEDIR}${FOREMAN_PROXY_LOGDIR} \ ${STAGEDIR}${FOREMAN_PROXY_RUNDIR} .include 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,13 +1,13 @@ ---- 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 +:ipa_config: %%LOCALBASE%%/etc/ipa/default.conf # Remove from DNS when deleting the FreeIPA entry :remove_dns: true 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,11 +1,11 @@ ---- 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" read_timeout ||= DEFAULT_READ_TIMEOUT dns_timeout ||= DEFAULT_CONNECT_TIMEOUT connect_timeout ||= DEFAULT_DNS_TIMEOUT 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 @@ -1,17 +1,17 @@ [ { type: upgrade maximum_version: 1.11 message: <