Attachment #233350 for bug #263431

View | Details | Raw Unified | Return to bug 263431
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/net/foreman-proxy/Makefile (-2 / +2 lines)
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= 3.0.1	4	PORTVERSION= 3.1.2
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 20-26 RUN_DEPENDS= rubygem-bundler_ext>=0.4:sysutils/rubygem-bundler_ext \ Link Here
20	rubygem-rsec>=0.4.3:devel/rubygem-rsec \	20	rubygem-rsec>=0.4.3:devel/rubygem-rsec \
21	rubygem-sd_notify>=0.1.1:devel/rubygem-sd_notify \	21	rubygem-sd_notify>=0.1.1:devel/rubygem-sd_notify \
22	rubygem-sinatra>=2.0:www/rubygem-sinatra \	22	rubygem-sinatra>=2.0:www/rubygem-sinatra \
23	wget:ftp/wget	23	curl:ftp/curl
24		24
25	USES= shebangfix tar:bzip2	25	USES= shebangfix tar:bzip2
26		26

Lines 1-3 Link Here

(-)b/net/foreman-proxy/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1643073442	1	TIMESTAMP = 1646448265
2	SHA256 (foreman-proxy-3.0.1.tar.bz2) = 9941ed09638d8e6baeef23f4ec99200a95743ea02bb639c8f5d715f3dfcc8d2d	2	SHA256 (foreman-proxy-3.1.2.tar.bz2) = 14a21af2e735e266f5e22ec64e4597bf4821b53fb7a2393a5146587f1400a1eb
3	SIZE (foreman-proxy-3.0.1.tar.bz2) = 199109	3	SIZE (foreman-proxy-3.1.2.tar.bz2) = 199897




--- lib/proxy/http_download.rb.orig	2022-02-16 01:16:26 UTC
+++ lib/proxy/http_download.rb
@@ -10,7 +10,7 @@ module Proxy
       logger.warn('Deprecated: HttpDownload read_timeout is deprecated and will be removed in 4.0') if read_timeout
       logger.warn('Deprecated: HttpDownload dns_timeout is deprecated and will be removed in 4.0') if dns_timeout
       connect_timeout ||= DEFAULT_CONNECT_TIMEOUT
-      args = [which('curl')]
+      args = ["%%LOCALBASE%%/bin/curl"]
 
       # no cert verification if set
       args << "--insecure" unless verify_server_cert
-      wget = which("wget")
+      wget = "%%LOCALBASE%%/bin/wget"
       read_timeout ||= DEFAULT_READ_TIMEOUT
       dns_timeout ||= DEFAULT_CONNECT_TIMEOUT
       connect_timeout ||= DEFAULT_DNS_TIMEOUT
- 

Return to bug 263431

Lines 1-11 Link Here

(-)b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb (-11 / +10 lines)
1	--- lib/proxy/http_download.rb.orig 2021-10-26 14:48:17.000000000 +0200	1	--- lib/proxy/http_download.rb.orig 2022-02-16 01:16:26 UTC
2	+++ lib/proxy/http_download.rb 2021-11-24 12:24:12.924526000 +0100	2	+++ lib/proxy/http_download.rb
3	@@ -9,7 +9,7 @@	3	@@ -10,7 +10,7 @@ module Proxy
		4	logger.warn('Deprecated: HttpDownload read_timeout is deprecated and will be removed in 4.0') if read_timeout
		5	logger.warn('Deprecated: HttpDownload dns_timeout is deprecated and will be removed in 4.0') if dns_timeout
		6	connect_timeout \|\|= DEFAULT_CONNECT_TIMEOUT
		7	- args = [which('curl')]
		8	+ args = ["%%LOCALBASE%%/bin/curl"]
4		9
5	def initialize(src, dst, read_timeout = nil, connect_timeout = nil, dns_timeout = nil, verify_server_cert = false)	10	# no cert verification if set
6	@dst = dst	11	args << "--insecure" unless verify_server_cert
7	- wget = which("wget")
8	+ wget = "%%LOCALBASE%%/bin/wget"
9	read_timeout \|\|= DEFAULT_READ_TIMEOUT
10	dns_timeout \|\|= DEFAULT_CONNECT_TIMEOUT
11	connect_timeout \|\|= DEFAULT_DNS_TIMEOUT
12	-