[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c846ed161682adfd7a9939d7778ce28b6f677d71

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2434 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  c846ed161682adfd7a9939d7778ce28b6f677d71 (commit)
      from  f93238725f2f73975dff1a2c67820d9480a100e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c846ed161682adfd7a9939d7778ce28b6f677d71
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jan 2 16:12:35 2020 +0000

    pakfire: use HTTPS if no protocol is specified
    
    also use HTTPS on fallback to mainserver if no mirror was left
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/140/filelists/files | 1 +
 src/pakfire/lib/functions.pl              | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/core/140/filelists/files
index 80c52449b..181ef8cf4 100644
--- a/config/rootfiles/core/140/filelists/files
+++ b/config/rootfiles/core/140/filelists/files
@@ -5,4 +5,5 @@ var/ipfire/langs
 etc/rc.d/init.d/networking/red.up/06-safe-search
 etc/rc.d/init.d/unbound
 etc/rc.d/init.d/suricata
+opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/ids.cgi
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 460eaf303..61787757e 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -144,7 +144,7 @@ sub fetchfile {
 			$file = $getfile;
 		}
 		
-		$proto = "HTTP" unless $proto;
+		$proto = "HTTPS" unless $proto;
 		
 		logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file");
 
@@ -318,7 +318,7 @@ sub selectmirror {
 
 	if ($scount eq 0) {
 		logger("MIRROR INFO: Could not find any servers. Falling back to main server $Conf::mainserver");
-		return ("HTTP", $Conf::mainserver, "/$Conf::version");
+		return ("HTTPS", $Conf::mainserver, "/$Conf::version");
 	}
 
 	### Choose a random server and test if it is online


hooks/post-receive
--
IPFire 2.x development tree