Date: Tue, 28 Apr 2026 16:55:30 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Frank Wall <freebsd@moov.de> Subject: git: ddf21cca84e7 - main - net/foreman-proxy: Update 3.13.0 => 3.18.1 Message-ID: <69f0e682.18e8c.b235bb@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ddf21cca84e7de63bf0797d3c771a122925bd867 commit ddf21cca84e7de63bf0797d3c771a122925bd867 Author: Frank Wall <freebsd@moov.de> AuthorDate: 2026-04-28 16:46:42 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-04-28 16:46:42 +0000 net/foreman-proxy: Update 3.13.0 => 3.18.1 Changelog: https://github.com/theforeman/smart-proxy/blob/3.18.1/CHANGELOG Commit log: https://github.com/theforeman/smart-proxy/compare/3.13.0...3.18.1 Improve port: - Fix warnings from portclippy. - Fix build with USERS/GROUPS not in UIDs/GIDs. - In do-install: - Merge MKDIRs. - Replace "LN -s" with "RLN". - Replace "CP -r" in for loop with single COPYTREE_SHARE. - Merge INSTALL_SCRIPTs. - Replace "${PREFIX}/etc/foreman-proxy" with "${ETCDIR}". - Replace "${PREFIX}/etc/foreman-proxy" with "${ETCDIR}" in rc script. PR: 294845 Sponsored by: UNIS Labs Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org> --- net/foreman-proxy/Makefile | 53 ++++++++++++++++---------------- net/foreman-proxy/distinfo | 6 ++-- net/foreman-proxy/files/foreman-proxy.in | 2 +- net/foreman-proxy/pkg-plist | 1 + 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile index 481061fa208e..b2fe48e1d149 100644 --- a/net/foreman-proxy/Makefile +++ b/net/foreman-proxy/Makefile @@ -1,5 +1,5 @@ PORTNAME= foreman-proxy -DISTVERSION= 3.13.0 +DISTVERSION= 3.18.1 CATEGORIES= net MASTER_SITES= https://downloads.theforeman.org/foreman-proxy/ @@ -23,32 +23,34 @@ RUN_DEPENDS= rubygem-bundler_ext>=0.4:sysutils/rubygem-bundler_ext \ curl:ftp/curl USES= ruby shebangfix tar:bzip2 - -OPTIONS_DEFINE= BMC -BMC_DESC= Depend on rubyipmi and redfish_client for BMC support +USE_RC_SUBR= foreman-proxy +SHEBANG_FILES= extra/foreman-debug-proxy NO_ARCH= yes NO_BUILD= yes -USE_RC_SUBR= foreman-proxy FOREMAN_PROXY_USER?= foreman_proxy FOREMAN_PROXY_GROUP?= foreman_proxy FOREMAN_PROXY_LOGDIR?= ${DESTDIR}/var/log/foreman-proxy FOREMAN_PROXY_RUNDIR?= ${DESTDIR}/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}" +.if ${FOREMAN_PROXY_USER} == foreman_proxy +USERS= ${FOREMAN_PROXY_USER} +.endif +.if ${FOREMAN_PROXY_GROUP} == foreman_proxy +GROUPS= ${FOREMAN_PROXY_GROUP} +.endif -SHEBANG_FILES= extra/foreman-debug-proxy +PLIST_SUB= ${SUB_LIST} MKDIR="${MKDIR}" +OPTIONS_DEFINE= BMC +BMC_DESC= Depend on rubyipmi and redfish_client for BMC support BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi \ rubygem-redfish_client>=0.5.1:sysutils/rubygem-redfish_client @@ -71,31 +73,30 @@ post-patch: ${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 + ${MKDIR} ${STAGEDIR}${ETCDIR}/settings.d \ + ${STAGEDIR}${DATADIR}/extra + ${RLN} ${STAGEDIR}${ETCDIR} ${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 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 + (cd ${WRKSRC} && \ + ${COPYTREE_SHARE} "CHANGELOG Contributors Gemfile LICENSE README.md \ + smart_proxy.gemspec VERSION bundler.d config.ru lib modules" \ + ${STAGEDIR}${DATADIR}) + ${RLN} ${STAGEDIR}${DATADIR}/Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in + ${INSTALL_SCRIPT} ${dhcpd_config_check.rb foreman-debug-proxy \ + migrate_settings.rb puppet_sign.rb query.rb register_service.rb \ + :L:S|^|${WRKSRC}/extra/|} \ + ${STAGEDIR}${DATADIR}/extra + (cd ${WRKSRC}/extra && ${COPYTREE_SHARE} migrations ${STAGEDIR}${DATADIR}/extra) ${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \ - ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample + ${STAGEDIR}${ETCDIR}/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_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 + ${STAGEDIR}${ETCDIR}/settings.d/${cfg}.yml.sample .endfor ${MKDIR} -m 0700 ${STAGEDIR}${FOREMAN_PROXY_LOGDIR} \ ${STAGEDIR}${FOREMAN_PROXY_RUNDIR} diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo index 37800d644487..8a8a937fa9a2 100644 --- a/net/foreman-proxy/distinfo +++ b/net/foreman-proxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735841275 -SHA256 (foreman-proxy-3.13.0.tar.bz2) = c9b6466e6519c40ad3f1bcbfa76cfd19a8b075a173c2b71b1e4a9b43bfc0fac1 -SIZE (foreman-proxy-3.13.0.tar.bz2) = 196653 +TIMESTAMP = 1777367505 +SHA256 (foreman-proxy-3.18.1.tar.bz2) = 0ff00d62deb65cdc7b9415f68c98a053b573da1a64717fc03c31c65db79763ee +SIZE (foreman-proxy-3.18.1.tar.bz2) = 202161 diff --git a/net/foreman-proxy/files/foreman-proxy.in b/net/foreman-proxy/files/foreman-proxy.in index 5f4a4cee9d87..7d909cea6c24 100644 --- a/net/foreman-proxy/files/foreman-proxy.in +++ b/net/foreman-proxy/files/foreman-proxy.in @@ -23,6 +23,6 @@ foreman_proxy_user=${foreman_proxy_user-"%%FOREMAN_PROXY_USER%%"} load_rc_config "${name}" -required_files="%%PREFIX%%/etc/foreman-proxy/settings.yml" +required_files="%%ETCDIR%%/settings.yml" run_rc_command "$1" diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist index 83100d03676b..3be46773fe8d 100644 --- a/net/foreman-proxy/pkg-plist +++ b/net/foreman-proxy/pkg-plist @@ -66,6 +66,7 @@ sbin/smart-proxy %%DATADIR%%/lib/proxy/error.rb %%DATADIR%%/lib/proxy/file_lock.rb %%DATADIR%%/lib/proxy/helpers.rb +%%DATADIR%%/lib/proxy/hsts_middleware.rb %%DATADIR%%/lib/proxy/http_download.rb %%DATADIR%%/lib/proxy/kerberos.rb %%DATADIR%%/lib/proxy/log.rbhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f0e682.18e8c.b235bb>