Attachment 228908 Details for Bug 253008 – net/foreman-proxy update 2.0.3 -> 2.1.4

[patch] net/foreman-proxy update 2.0.3 -> 2.1.4

foreman20-21.patch (text/plain), 4.26 KB, created by Jason Unovitch on 2021-10-21 00:49:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Unovitch

Created: 2021-10-21 00:49:43 UTC

Size: 4.26 KB

patch

obsolete

>commit 02169cee80b291b21dba1050b9b8007ecf8cbbe3
>Author: Jason Unovitch <junovitch@FreeBSD.org>
>Date:   Sat Apr 24 20:56:45 2021 +0000
>
>    net/foreman-proxy: update 2.0.3 -> 2.1.4
>
>diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
>index 225825436b19..6d53d29c340b 100644
>--- a/net/foreman-proxy/Makefile
>+++ b/net/foreman-proxy/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Martin Matuska <mm@FreeBSD.org>
> 
> PORTNAME=	foreman-proxy
>-PORTVERSION=	2.0.3
>+PORTVERSION=	2.1.4
> CATEGORIES=	net
> MASTER_SITES=	https://downloads.theforeman.org/foreman-proxy/
> 
>@@ -63,7 +63,7 @@ post-patch:
> 		${WRKSRC}/bin/smart-proxy \
> 		${WRKSRC}/extra/migrate_settings.rb \
> 		${WRKSRC}/extra/query.rb \
>-		${WRKSRC}/extra/register-service.rb
>+		${WRKSRC}/extra/register_service.rb
> 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
> 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
> 		${WRKSRC}/config/settings.d/*.yml.example \
>@@ -80,7 +80,7 @@ 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 foreman-debug-proxy migrate_settings.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 4e50f35313ca..c001b67c2088 100644
>--- a/net/foreman-proxy/distinfo
>+++ b/net/foreman-proxy/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1611514882
>-SHA256 (foreman-proxy-2.0.3.tar.bz2) = 2a0d9139d8d5dbea1a319c29577867c0044d713d34f56be6a03d363bf2cdc7b4
>-SIZE (foreman-proxy-2.0.3.tar.bz2) = 210662
>+TIMESTAMP = 1619297779
>+SHA256 (foreman-proxy-2.1.4.tar.bz2) = 05e187fe352e02b0829b7b83624433e7a012e93712151e4859ba8e53a6cf154e
>+SIZE (foreman-proxy-2.1.4.tar.bz2) = 209030
>diff --git a/net/foreman-proxy/files/patch-bin-smart-proxy b/net/foreman-proxy/files/patch-bin-smart-proxy
>index d85df17df24c..3df6da1863db 100644
>--- a/net/foreman-proxy/files/patch-bin-smart-proxy
>+++ b/net/foreman-proxy/files/patch-bin-smart-proxy
>@@ -3,7 +3,7 @@
> @@ -1,6 +1,7 @@
>  #!/usr/bin/env ruby
>  
>- $LOAD_PATH.unshift(*Dir[File.expand_path("../../lib", __FILE__), File.expand_path("../../modules", __FILE__)])
>+ $LOAD_PATH.unshift(*Dir[File.expand_path('../lib', __dir__), File.expand_path('../modules', __dir__)])
> +$LOAD_PATH.unshift(*Dir["%%DATADIR%%/lib", "%%DATADIR%%/modules"])
>  
>  require 'smart_proxy_main'
>diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist
>index b1867b123ecb..4939dea0d6f4 100644
>--- a/net/foreman-proxy/pkg-plist
>+++ b/net/foreman-proxy/pkg-plist
>@@ -53,9 +53,8 @@ sbin/smart-proxy
> %%DATADIR%%/extra/migrations/2018062000000_migrate_puppetca_settings.rb
> %%DATADIR%%/extra/migrations/20181016000000_migrate_puppetca_puppet_cert_settings.rb
> %%DATADIR%%/extra/query.rb
>-%%DATADIR%%/extra/register-service.rb
>+%%DATADIR%%/extra/register_service.rb
> %%DATADIR%%/lib/bundler_helper.rb
>-%%DATADIR%%/lib/hash-patch.rb
> %%DATADIR%%/lib/launcher.rb
> %%DATADIR%%/lib/proxy/default_di_wirings.rb
> %%DATADIR%%/lib/proxy/default_plugin_validators.rb
>@@ -94,7 +93,6 @@ sbin/smart-proxy
> %%DATADIR%%/lib/smart_proxy.rb
> %%DATADIR%%/lib/smart_proxy_for_testing.rb
> %%DATADIR%%/lib/smart_proxy_main.rb
>-%%DATADIR%%/lib/webrick-patch.rb
> %%DATADIR%%/modules/bmc/base.rb
> %%DATADIR%%/modules/bmc/bmc.rb
> %%DATADIR%%/modules/bmc/bmc_api.rb
>@@ -114,8 +112,6 @@ sbin/smart-proxy
> %%DATADIR%%/modules/dhcp_common/isc/configuration_parser.rb
> %%DATADIR%%/modules/dhcp_common/isc/omapi_provider.rb
> %%DATADIR%%/modules/dhcp_common/isc/subnet_service_initialization.rb
>-%%DATADIR%%/modules/dhcp_common/monkey_patch_subnet.rb
>-%%DATADIR%%/modules/dhcp_common/monkey_patches.rb
> %%DATADIR%%/modules/dhcp_common/pingable.rb
> %%DATADIR%%/modules/dhcp_common/record.rb
> %%DATADIR%%/modules/dhcp_common/record/deleted_reservation.rb
>@@ -185,7 +181,6 @@ sbin/smart-proxy
> %%DATADIR%%/modules/puppet_proxy/puppet_api.rb
> %%DATADIR%%/modules/puppet_proxy/puppet_plugin.rb
> %%DATADIR%%/modules/puppet_proxy_common/api_request.rb
>-%%DATADIR%%/modules/puppet_proxy_common/custom_validators.rb
> %%DATADIR%%/modules/puppet_proxy_common/environment.rb
> %%DATADIR%%/modules/puppet_proxy_common/environments_retriever_base.rb
> %%DATADIR%%/modules/puppet_proxy_common/errors.rb

Actions: View | Diff

Attachments on bug 253008: 221918 | 221919 | 221920 | 228908 | 228909 | 229824