From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/2] Pakfire: fix upstream proxy usage
Date: Sat, 11 Apr 2020 12:19:20 +0200
Message-ID: <6fd2993f-d022-9bd2-b3b7-5a60e974d9b6@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4892963756168071301=="
List-Id: <development.lists.ipfire.org>

--===============4892963756168071301==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This patch ensures Pakfire will download updates via the configured
upstream proxy (if any) for both HTTP and HTTPS.

Fixes: #12357

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
 src/pakfire/lib/functions.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 45e3427b1..17a420c33 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -161,10 +161,10 @@ sub fetchfile {
 		if ($proxysettings{'UPSTREAM_PROXY'}) {
 			logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}=
\"");
 			if ($proxysettings{'UPSTREAM_USER'}) {
-				$ua->proxy([["http", "https"] =3D> "http://$proxysettings{'UPSTREAM_USER=
'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/"]=
);
+				$ua->proxy(["http", "https"], "http://$proxysettings{'UPSTREAM_USER'}:$p=
roxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/");
 				logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'=
}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\"");
 			} else {
-				$ua->proxy([["http", "https"] =3D> "http://$proxysettings{'UPSTREAM_PROX=
Y'}/"]);
+				$ua->proxy(["http", "https"], "http://$proxysettings{'UPSTREAM_PROXY'}/"=
);
 			}
 		}
=20
--=20
2.16.4

--===============4892963756168071301==--