View | Details | Raw Unified | Return to bug 253008 | Differences between
and this patch

Collapse All | Expand All

(-)b/net/foreman-proxy/Makefile (-3 / +3 lines)
Lines 1-7 Link Here
1
# Created by: Martin Matuska <mm@FreeBSD.org>
1
# Created by: Martin Matuska <mm@FreeBSD.org>
2
2
3
PORTNAME=	foreman-proxy
3
PORTNAME=	foreman-proxy
4
PORTVERSION=	2.0.3
4
PORTVERSION=	2.1.4
5
CATEGORIES=	net
5
CATEGORIES=	net
6
MASTER_SITES=	https://downloads.theforeman.org/foreman-proxy/
6
MASTER_SITES=	https://downloads.theforeman.org/foreman-proxy/
7
7
Lines 63-69 post-patch: Link Here
63
		${WRKSRC}/bin/smart-proxy \
63
		${WRKSRC}/bin/smart-proxy \
64
		${WRKSRC}/extra/migrate_settings.rb \
64
		${WRKSRC}/extra/migrate_settings.rb \
65
		${WRKSRC}/extra/query.rb \
65
		${WRKSRC}/extra/query.rb \
66
		${WRKSRC}/extra/register-service.rb
66
		${WRKSRC}/extra/register_service.rb
67
	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
67
	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
68
		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
68
		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
69
		${WRKSRC}/config/settings.d/*.yml.example \
69
		${WRKSRC}/config/settings.d/*.yml.example \
Lines 80-86 do-install: Link Here
80
	${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
80
	${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
81
.endfor
81
.endfor
82
	${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in
82
	${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in
83
.for script in foreman-debug-proxy migrate_settings.rb query.rb register-service.rb
83
.for script in foreman-debug-proxy migrate_settings.rb query.rb register_service.rb
84
	${INSTALL_SCRIPT} ${WRKSRC}/extra/${script} \
84
	${INSTALL_SCRIPT} ${WRKSRC}/extra/${script} \
85
		${STAGEDIR}${DATADIR}/extra/${script}
85
		${STAGEDIR}${DATADIR}/extra/${script}
86
.endfor
86
.endfor
(-)b/net/foreman-proxy/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1611514882
1
TIMESTAMP = 1619297779
2
SHA256 (foreman-proxy-2.0.3.tar.bz2) = 2a0d9139d8d5dbea1a319c29577867c0044d713d34f56be6a03d363bf2cdc7b4
2
SHA256 (foreman-proxy-2.1.4.tar.bz2) = 05e187fe352e02b0829b7b83624433e7a012e93712151e4859ba8e53a6cf154e
3
SIZE (foreman-proxy-2.0.3.tar.bz2) = 210662
3
SIZE (foreman-proxy-2.1.4.tar.bz2) = 209030
(-)b/net/foreman-proxy/files/patch-bin-smart-proxy (-1 / +1 lines)
Lines 3-9 Link Here
3
@@ -1,6 +1,7 @@
3
@@ -1,6 +1,7 @@
4
 #!/usr/bin/env ruby
4
 #!/usr/bin/env ruby
5
 
5
 
6
 $LOAD_PATH.unshift(*Dir[File.expand_path("../../lib", __FILE__), File.expand_path("../../modules", __FILE__)])
6
 $LOAD_PATH.unshift(*Dir[File.expand_path('../lib', __dir__), File.expand_path('../modules', __dir__)])
7
+$LOAD_PATH.unshift(*Dir["%%DATADIR%%/lib", "%%DATADIR%%/modules"])
7
+$LOAD_PATH.unshift(*Dir["%%DATADIR%%/lib", "%%DATADIR%%/modules"])
8
 
8
 
9
 require 'smart_proxy_main'
9
 require 'smart_proxy_main'
(-)b/net/foreman-proxy/pkg-plist (-6 / +1 lines)
Lines 53-61 sbin/smart-proxy Link Here
53
%%DATADIR%%/extra/migrations/2018062000000_migrate_puppetca_settings.rb
53
%%DATADIR%%/extra/migrations/2018062000000_migrate_puppetca_settings.rb
54
%%DATADIR%%/extra/migrations/20181016000000_migrate_puppetca_puppet_cert_settings.rb
54
%%DATADIR%%/extra/migrations/20181016000000_migrate_puppetca_puppet_cert_settings.rb
55
%%DATADIR%%/extra/query.rb
55
%%DATADIR%%/extra/query.rb
56
%%DATADIR%%/extra/register-service.rb
56
%%DATADIR%%/extra/register_service.rb
57
%%DATADIR%%/lib/bundler_helper.rb
57
%%DATADIR%%/lib/bundler_helper.rb
58
%%DATADIR%%/lib/hash-patch.rb
59
%%DATADIR%%/lib/launcher.rb
58
%%DATADIR%%/lib/launcher.rb
60
%%DATADIR%%/lib/proxy/default_di_wirings.rb
59
%%DATADIR%%/lib/proxy/default_di_wirings.rb
61
%%DATADIR%%/lib/proxy/default_plugin_validators.rb
60
%%DATADIR%%/lib/proxy/default_plugin_validators.rb
Lines 94-100 sbin/smart-proxy Link Here
94
%%DATADIR%%/lib/smart_proxy.rb
93
%%DATADIR%%/lib/smart_proxy.rb
95
%%DATADIR%%/lib/smart_proxy_for_testing.rb
94
%%DATADIR%%/lib/smart_proxy_for_testing.rb
96
%%DATADIR%%/lib/smart_proxy_main.rb
95
%%DATADIR%%/lib/smart_proxy_main.rb
97
%%DATADIR%%/lib/webrick-patch.rb
98
%%DATADIR%%/modules/bmc/base.rb
96
%%DATADIR%%/modules/bmc/base.rb
99
%%DATADIR%%/modules/bmc/bmc.rb
97
%%DATADIR%%/modules/bmc/bmc.rb
100
%%DATADIR%%/modules/bmc/bmc_api.rb
98
%%DATADIR%%/modules/bmc/bmc_api.rb
Lines 114-121 sbin/smart-proxy Link Here
114
%%DATADIR%%/modules/dhcp_common/isc/configuration_parser.rb
112
%%DATADIR%%/modules/dhcp_common/isc/configuration_parser.rb
115
%%DATADIR%%/modules/dhcp_common/isc/omapi_provider.rb
113
%%DATADIR%%/modules/dhcp_common/isc/omapi_provider.rb
116
%%DATADIR%%/modules/dhcp_common/isc/subnet_service_initialization.rb
114
%%DATADIR%%/modules/dhcp_common/isc/subnet_service_initialization.rb
117
%%DATADIR%%/modules/dhcp_common/monkey_patch_subnet.rb
118
%%DATADIR%%/modules/dhcp_common/monkey_patches.rb
119
%%DATADIR%%/modules/dhcp_common/pingable.rb
115
%%DATADIR%%/modules/dhcp_common/pingable.rb
120
%%DATADIR%%/modules/dhcp_common/record.rb
116
%%DATADIR%%/modules/dhcp_common/record.rb
121
%%DATADIR%%/modules/dhcp_common/record/deleted_reservation.rb
117
%%DATADIR%%/modules/dhcp_common/record/deleted_reservation.rb
Lines 185-191 sbin/smart-proxy Link Here
185
%%DATADIR%%/modules/puppet_proxy/puppet_api.rb
181
%%DATADIR%%/modules/puppet_proxy/puppet_api.rb
186
%%DATADIR%%/modules/puppet_proxy/puppet_plugin.rb
182
%%DATADIR%%/modules/puppet_proxy/puppet_plugin.rb
187
%%DATADIR%%/modules/puppet_proxy_common/api_request.rb
183
%%DATADIR%%/modules/puppet_proxy_common/api_request.rb
188
%%DATADIR%%/modules/puppet_proxy_common/custom_validators.rb
189
%%DATADIR%%/modules/puppet_proxy_common/environment.rb
184
%%DATADIR%%/modules/puppet_proxy_common/environment.rb
190
%%DATADIR%%/modules/puppet_proxy_common/environments_retriever_base.rb
185
%%DATADIR%%/modules/puppet_proxy_common/environments_retriever_base.rb
191
%%DATADIR%%/modules/puppet_proxy_common/errors.rb
186
%%DATADIR%%/modules/puppet_proxy_common/errors.rb

Return to bug 253008