git: 97108f5a3fca - main - net/foreman-proxy: update 2.5.4 -> 3.0.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 19 Apr 2022 11:32:33 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=97108f5a3fca1ae8de3556eebae86de77622b7e2
commit 97108f5a3fca1ae8de3556eebae86de77622b7e2
Author: Frank Wall <fw@moov.de>
AuthorDate: 2022-01-25 01:27:34 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
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 <fw@moov.de>; 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 <mm@FreeBSD.org>
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