]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/pakfire/lib/functions.pl
pakfire: Better errorhandling on downloads
[people/pmueller/ipfire-2.x.git] / src / pakfire / lib / functions.pl
index 11b1e37d583382cdef82e21a220131545865beec..24c55fd4ae7585591aee8b8f7beb78429e161e67 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015   IPFire Team   <info@ipfire.org>                   #
+# Copyright (C) 2007-2022   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -30,16 +30,22 @@ use HTTP::Headers;
 use HTTP::Message;
 use HTTP::Request;
 use Net::Ping;
+use URI;
+
+use Switch;
 
 package Pakfire;
 
-# GPG Keys
-my $myid = "64D96617";                 # Our own gpg-key paks@ipfire.org
-my $trustid = "65D0FD58";              # gpg-key of CaCert
+my @VALID_KEY_FINGERPRINTS = (
+       # 2018
+       "3ECA8AA4478208B924BB96206FEF7A8ED713594B",
+       # 2007
+       "179740DC4D8C47DC63C099C74BDE364C64D96617",
+);
 
 # A small color-hash :D
 my %color;
-       $color{'normal'}      = "\033[0m"; 
+       $color{'normal'}      = "\033[0m";
        $color{'black'}       = "\033[0;30m";
        $color{'darkgrey'}    = "\033[1;30m";
        $color{'blue'}        = "\033[0;34m";
@@ -65,9 +71,15 @@ my $bfile;
 my %pakfiresettings = ();
 &General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings);
 
+# Make version
+$Conf::version = &make_version();
+
+# Pakfire lock file.
+our $lockfile = "/tmp/pakfire_lock";
+
 sub message {
        my $message = shift;
-               
+
        logger("$message");
        if ( $enable_colors == 1 ) {
                if ("$message" =~ /ERROR/) {
@@ -87,7 +99,7 @@ sub message {
                }
        }
        print "$message\n";
-       
+
 }
 
 sub logger {
@@ -103,6 +115,7 @@ sub usage {
   &Pakfire::message("               <update> - Contacts the servers for new lists of paks.");
   &Pakfire::message("               <upgrade> - Installs the latest version of all paks.");
   &Pakfire::message("               <list> - Outputs a short list with all available paks.");
+  &Pakfire::message("               <status> - Outputs a summary about available core upgrades, updates and a required reboot");
   &Pakfire::message("");
   &Pakfire::message("       Global options:");
   &Pakfire::message("               --non-interactive --> Enables the non-interactive mode.");
@@ -113,35 +126,21 @@ sub usage {
   exit 1;
 }
 
-sub pinghost {
-       my $host = shift;
-       
-       $p = Net::Ping->new("icmp");
-  if ($p->ping($host)) {
-        logger("PING INFO: $host is alive");
-       return 1;
-  } else {
-               logger("PING INFO: $host is unreachable");
-               return 0;
-       }
-  $p->close();
-}
-
 sub fetchfile {
        my $getfile = shift;
        my $gethost = shift;
        my (@server, $host, $proto, $file, $i);
        my $allok = 0;
-       
+
        use File::Basename;
        $bfile = basename("$getfile");
-       
-       logger("DOWNLOAD STARTED: $getfile") unless ($bfile =~ /^counter\?.*/);
 
-       $i = 0; 
+       logger("DOWNLOAD STARTED: $getfile");
+
+       $i = 0;
        while (($allok == 0) && $i < 5) {
                $i++;
-               
+
                if ("$gethost" eq "") {
                        @server = selectmirror();
                        $proto = $server[0];
@@ -151,94 +150,100 @@ sub fetchfile {
                        $host = $gethost;
                        $file = $getfile;
                }
-               
-               $proto = "HTTP" unless $proto;
-               
-               unless ($bfile =~ /^counter\?.*/) {
-                       logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file");
-               }
 
-               my $ua = LWP::UserAgent->new;
+               $proto = "HTTPS" unless $proto;
+
+               logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file");
+
+               # Init LWP::UserAgent, request SSL hostname verification
+               # and specify CA file.
+               my $ua = LWP::UserAgent->new(
+                       ssl_opts => {
+                               SSL_ca_file     => '/etc/ssl/cert.pem',
+                               verify_hostname => 1,
+                       }
+               );
                $ua->agent("Pakfire/$Conf::version");
                $ua->timeout(20);
-               
+
                my %proxysettings=();
                &General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings);
 
                if ($proxysettings{'UPSTREAM_PROXY'}) {
-                       logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}\"") unless ($bfile =~ /^counter.py\?.*/); 
+                       logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}\"");
                        if ($proxysettings{'UPSTREAM_USER'}) {
-                               $ua->proxy("http","http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/");
-                               logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\"") unless ($bfile =~ /^counter.py\?.*/);
+                               $ua->proxy(["http", "https"], "http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/");
+                               logger("DOWNLOAD INFO: Logging in with \"$proxysettings{'UPSTREAM_USER'}\" against \"$proxysettings{'UPSTREAM_PROXY'}\"");
                        } else {
-                               $ua->proxy("http","http://$proxysettings{'UPSTREAM_PROXY'}/");
+                               $ua->proxy(["http", "https"], "http://$proxysettings{'UPSTREAM_PROXY'}/");
                        }
                }
 
                $final_data = undef;
-               my $url = "http://$host/$file";
-               my $response;
-               
-               unless ($bfile =~ /^counter.py\?.*/) {
-                       my $result = $ua->head($url);
-                       my $remote_headers = $result->headers;
-                       $total_size = $remote_headers->content_length;
-                       logger("DOWNLOAD INFO: $file has size of $total_size bytes");
-                       
-                       $response = $ua->get($url, ':content_cb' => \&callback );
-                       message("");
-               } else {
-                       $response = $ua->get($url);
+
+               my $url;
+               switch ($proto) {
+                       case "HTTP" { $url = "http://$host/$file"; }
+                       case "HTTPS" { $url = "https://$host/$file"; }
+                       else {
+                               # skip all lines with unknown protocols
+                               logger("DOWNLOAD WARNING: Skipping Host: $host due to unknown protocol ($proto) in mirror database");
+                               next;
+                       }
                }
-               
+
+               my $result = $ua->head($url);
+               my $remote_headers = $result->headers;
+               $total_size = $remote_headers->content_length;
+               logger("DOWNLOAD INFO: $file has size of $total_size bytes");
+
+               my $response = $ua->get($url, ':content_cb' => \&callback );
+               message("");
+
                my $code = $response->code();
                my $log = $response->status_line;
                logger("DOWNLOAD INFO: HTTP-Status-Code: $code - $log");
-               
+
                if ( $code eq "500" ) {
                        message("Giving up: There was no chance to get the file \"$getfile\" from any available server.\nThere was an error on the way. Please fix it.");
-                       return 1;
+                       return 0;
                }
-               
+
                if ($response->is_success) {
-                       unless ($bfile =~ /^counter.py\?.*/) {
-                               if (open(FILE, ">$Conf::tmpdir/$bfile")) {
-                                       print FILE $final_data;
-                                       close(FILE);
-                                       logger("DOWNLOAD INFO: File received. Start checking signature...");
-                                       if (system("gpg --verify \"$Conf::tmpdir/$bfile\" &>/dev/null") eq 0) {
-                                               logger("DOWNLOAD INFO: Signature of $bfile is fine.");
-                                               move("$Conf::tmpdir/$bfile","$Conf::cachedir/$bfile");
-                                       } else {
-                                               message("DOWNLOAD ERROR: The downloaded file ($file) wasn't verified by IPFire.org. Sorry - Exiting...");
-                                               my $ntp = `ntpdate -q -t 10 pool.ntp.org 2>/dev/null | tail -1`;
-                                               if ( $ntp !~ /time\ server(.*)offset(.*)/ ){message("TIME ERROR: Unable to get the nettime, this may lead to the verification error.");}
-                                               else { $ntp =~ /time\ server(.*)offset(.*)/; message("TIME INFO: Time Server$1has$2 offset to localtime.");}
-                                               exit 1;
-                                       }
-                                       logger("DOWNLOAD FINISHED: $file");
-                                       $allok = 1;
-                                       return 0;
+                       if (open(FILE, ">$Conf::tmpdir/$bfile")) {
+                               print FILE $final_data;
+                               close(FILE);
+                               logger("DOWNLOAD INFO: File received. Start checking signature...");
+                               if (&valid_signature("$Conf::tmpdir/$bfile")) {
+                                       logger("DOWNLOAD INFO: Signature of $bfile is fine.");
+                                       move("$Conf::tmpdir/$bfile","$Conf::cachedir/$bfile");
                                } else {
-                                       logger("DOWNLOAD ERROR: Could not open $Conf::tmpdir/$bfile for writing.");
+                                       message("DOWNLOAD ERROR: The downloaded file ($file) wasn't verified by IPFire.org. Sorry - Exiting...");
+                                       my $ntp = `ntpdate -q -t 10 pool.ntp.org 2>/dev/null | tail -1`;
+                                       if ( $ntp !~ /time\ server(.*)offset(.*)/ ){message("TIME ERROR: Unable to get the nettime, this may lead to the verification error.");}
+                                       else { $ntp =~ /time\ server(.*)offset(.*)/; message("TIME INFO: Time Server$1has$2 offset to localtime.");}
+                                       exit 1;
                                }
+                               logger("DOWNLOAD FINISHED: $file");
+                               $allok = 1;
+                               return 1;
                        } else {
-                               return 0;
+                               logger("DOWNLOAD ERROR: Could not open $Conf::tmpdir/$bfile for writing.");
                        }
-               }       else {
+               } else {
                        logger("DOWNLOAD ERROR: $log");
                }
        }
        message("DOWNLOAD ERROR: There was no chance to get the file \"$getfile\" from any available server.\nMay be you should run \"pakfire update\" to get some new servers.");
-       return 1;
+       return 0;
 }
 
 sub getmirrors {
        my $force = shift;
        my $age;
-       
+
        use File::Copy;
-       
+
        if ( -e "$Conf::dbdir/lists/server-list.db" ) {
                my @stat = stat("$Conf::dbdir/lists/server-list.db");
                my $time = time();
@@ -249,19 +254,24 @@ sub getmirrors {
                # Force an update.
                $force = "force";
        }
-       
+
        if ("$force" eq "force") {
-               fetchfile("$Conf::version/lists/server-list.db", "$Conf::mainserver");
-               move("$Conf::cachedir/server-list.db", "$Conf::dbdir/lists/server-list.db");
+               if (fetchfile("$Conf::version/lists/server-list.db", "$Conf::mainserver")) {
+                       move("$Conf::cachedir/server-list.db", "$Conf::dbdir/lists/server-list.db");
+               } elsif (! -e "$Conf::dbdir/lists/server-list.db" ) {
+                       # if we end up with no server-list at all, return failure
+                       return 0;
+               }
        }
+       return 1;
 }
 
 sub getcoredb {
        my $force = shift;
        my $age;
-       
+
        use File::Copy;
-       
+
        if ( -e "$Conf::dbdir/lists/core-list.db" ) {
                my @stat = stat("$Conf::dbdir/lists/core-list.db");
                my $time = time();
@@ -272,26 +282,55 @@ sub getcoredb {
                # Force an update.
                $force = "force";
        }
-       
+
        if ("$force" eq "force") {
-               fetchfile("lists/core-list.db", "");
-               move("$Conf::cachedir/core-list.db", "$Conf::dbdir/lists/core-list.db");
+               if (fetchfile("lists/core-list.db", "")) {
+                       move("$Conf::cachedir/core-list.db", "$Conf::dbdir/lists/core-list.db");
+               }
        }
 }
 
+sub valid_signature($) {
+       my $filename = shift;
+
+       open(my $cmd, "gpg --verify --status-fd 1 \"$filename\" 2>/dev/null |");
+       while (<$cmd>) {
+               # Process valid signature lines
+               if (/VALIDSIG ([A-Z0-9]+)/) {
+                       # Check if we know the key
+                       foreach my $key (@VALID_KEY_FINGERPRINTS) {
+                               # Signature is valid
+                               return 1 if ($key eq $1);
+                       }
+               }
+       }
+       close($cmd);
+
+       # Signature is invalid
+       return 0;
+}
 
 sub selectmirror {
+       if (defined ${Conf::mirror}) {
+               my $uri = URI->new("${Conf::mirror}");
+
+               # Only accept HTTPS mirrors
+               if ($uri->scheme eq "https") {
+                       return ("HTTPS", $uri->host, $uri->path . "/" . ${Conf::version});
+               } else {
+                       message("MIRROR ERROR: Unsupported mirror: " . ${Conf::mirror});
+               }
+       }
+
        ### Check if there is a current server list and read it.
        #   If there is no list try to get one.
-       my $count = 0;
-       while (!(open(FILE, "<$Conf::dbdir/lists/server-list.db")) && ($count lt 5)) {
-               $count++;
-               getmirrors("noforce");
-       }
-       if ($count == 5) {
-               message("MIRROR ERROR: Could not find or download a server list");
-               exit 1;
+       unless (open(FILE, "<$Conf::dbdir/lists/server-list.db")) {
+               unless (getmirrors("noforce")) {
+                       message("MIRROR ERROR: Could not find or download a server list");
+                       exit 1;
+               }
        }
+
        my @lines = <FILE>;
        close(FILE);
 
@@ -308,16 +347,14 @@ 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
        #   If the check fails try a new server.
        #   This will never give up.
-       my $found = 0;
        my $servers = 0;
-       my $pingdelay = 1;
-       while ($found == 0) {
+       while (1) {
                $server = int(rand($scount) + 1);
                $servers = 0;
                my ($line, $proto, $path, $host);
@@ -329,22 +366,8 @@ sub selectmirror {
                                $proto = $templine[0];
                                $host = $templine[1];
                                $path = $templine[2];
-                               if ($pakfiresettings{'HEALTHCHECK'} eq "off") {
-                                       logger("PING INFO: Healthcheck is disabled");
-                                       $found = 1;
-                                       return ($proto, $host, $path);
-                               }
-                               elsif (pinghost("$host")) {
-                                       $found = 1;
-                                       return ($proto, $host, $path);
-                               }
-                               if ($found == 0) {
-                                       sleep($pingdelay);
-                                       $pingdelay=$pingdelay*2;
-                                       if ($pingdelay>1200) {
-                                               $pingdelay=1200;
-                                       }
-                               }
+
+                               return ($proto, $host, $path);
                        }
                }
        }
@@ -356,9 +379,9 @@ sub dbgetlist {
        #   Usage is always with an argument.
        my $force = shift;
        my $age;
-       
+
        use File::Copy;
-       
+
        if ( -e "$Conf::dbdir/lists/packages_list.db" ) {
                my @stat = stat("$Conf::dbdir/lists/packages_list.db");
                my $time = time();
@@ -369,18 +392,22 @@ sub dbgetlist {
                # Force an update.
                $force = "force";
        }
-       
+
        if ("$force" eq "force") {
-               fetchfile("lists/packages_list.db", "");
-               move("$Conf::cachedir/packages_list.db", "$Conf::dbdir/lists/packages_list.db");
+               if (fetchfile("lists/packages_list.db", "")) {
+                       move("$Conf::cachedir/packages_list.db", "$Conf::dbdir/lists/packages_list.db");
+               } elsif ( -e "$Conf::dbdir/lists/packages_list.db" ) {
+                       # If we end up with no db file after download error there
+                       # is nothing more we can do here.
+                       return 0;
+               }
        }
 
        # Update the meta database if new packages was in the package list
-       my @meta;
        my $file;
        my $line;
        my $prog;
-       my ($name, $version, $release);
+       my %metadata;
        my @templine;
 
        open(FILE, "<$Conf::dbdir/lists/packages_list.db");
@@ -395,28 +422,13 @@ sub dbgetlist {
                next if ( $file eq ".." );
                next if ( $file eq "meta-" );
                next if ( $file =~ /^old/ );
-               open(FILE, "<$Conf::dbdir/meta/$file");
-               @meta = <FILE>;
-               close(FILE);
-               foreach $line (@meta) {
-                       @templine = split(/\: /,$line);
-                       if ("$templine[0]" eq "Name") {
-                               $name = $templine[1];
-                               chomp($name);
-                       } elsif ("$templine[0]" eq "ProgVersion") {
-                               $version = $templine[1];
-                               chomp($version);
-                       } elsif ("$templine[0]" eq "Release") {
-                               $release = $templine[1];
-                               chomp($release);
-                       }
-               }
+               %metadata = parsemetafile("$Conf::dbdir/meta/$file");
+
                foreach $prog (@db) {
                        @templine = split(/\;/,$prog);
-                       if (("$name" eq "$templine[0]") && ("$release" ne "$templine[2]")) {
-                               move("$Conf::dbdir/meta/meta-$name","$Conf::dbdir/meta/old_meta-$name");
-                               fetchfile("meta/meta-$name", "");
-                               move("$Conf::cachedir/meta-$name", "$Conf::dbdir/meta/meta-$name");
+                       if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" ne "$templine[2]")) {
+                               move("$Conf::dbdir/meta/meta-$metadata{'Name'}","$Conf::dbdir/meta/old_meta-$metadata{'Name'}");
+                               getmetafile($metadata{'Name'});
                        }
                }
        }
@@ -424,20 +436,19 @@ sub dbgetlist {
 
 sub dblist {
        ### This subroutine lists the packages.
-       #   You may also pass a filter: &Pakfire::dblist(filter) 
+       #   You may also pass a filter: &Pakfire::dblist(filter)
        #   Usage is always with two arguments.
        #   filter may be: all, notinstalled, installed
        my $filter = shift;
        my $forweb = shift;
-       my @meta;
        my @updatepaks;
        my $file;
        my $line;
        my $prog;
-       my ($name, $version, $release);
+       my %metadata;
        my @templine;
-       
-       ### Make sure that the list is not outdated. 
+
+       ### Make sure that the list is not outdated.
        #dbgetlist("noforce");
 
        open(FILE, "<$Conf::dbdir/lists/packages_list.db");
@@ -462,7 +473,7 @@ sub dblist {
                                }
                        }
                }
-       
+
                opendir(DIR,"$Conf::dbdir/installed");
                my @files = readdir(DIR);
                closedir(DIR);
@@ -470,30 +481,16 @@ sub dblist {
                        next if ( $file eq "." );
                        next if ( $file eq ".." );
                        next if ( $file =~ /^old/ );
-                       open(FILE, "<$Conf::dbdir/installed/$file");
-                       @meta = <FILE>;
-                       close(FILE);
-                       foreach $line (@meta) {
-                               @templine = split(/\: /,$line);
-                               if ("$templine[0]" eq "Name") {
-                                       $name = $templine[1];
-                                       chomp($name);
-                               } elsif ("$templine[0]" eq "ProgVersion") {
-                                       $version = $templine[1];
-                                       chomp($version);
-                               } elsif ("$templine[0]" eq "Release") {
-                                       $release = $templine[1];
-                                       chomp($release);
-                               }
-                       }
+                       %metadata = parsemetafile("$Conf::dbdir/installed/$file");
+
                        foreach $prog (@db) {
                                @templine = split(/\;/,$prog);
-                               if (("$name" eq "$templine[0]") && ("$release" < "$templine[2]" && "$forweb" ne "notice")) {
-                                       push(@updatepaks,$name);
+                               if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" < "$templine[2]" && "$forweb" ne "notice")) {
+                                       push(@updatepaks,$metadata{'Name'});
                                        if ("$forweb" eq "forweb") {
-                                               print "<option value=\"$name\">Update: $name -- Version: $version -> $templine[1] -- Release: $release -> $templine[2]</option>\n";
+                                               print "<option value=\"$metadata{'Name'}\">Update: $metadata{'Name'} -- Version: $metadata{'ProgVersion'} -> $templine[1] -- Release: $metadata{'Release'} -> $templine[2]</option>\n";
                                        } else {
-                                               my $command = "Update: $name\nVersion: $version -> $templine[1]\nRelease: $release -> $templine[2]\n";
+                                               my $command = "Update: $metadata{'Name'}\nVersion: $metadata{'ProgVersion'} -> $templine[1]\nRelease: $metadata{'Release'} -> $templine[2]\n";
                                                if ("$Pakfire::enable_colors" eq "1") {
                                                        print "$color{'lila'}$command$color{'normal'}\n";
                                                } else {
@@ -512,13 +509,13 @@ sub dblist {
                foreach $line (sort @db) {
                        next unless ($line =~ /.*;.*;.*;/ );
                        $use_color = "";
-                       $count++;
                        @templine = split(/\;/,$line);
                        if ("$filter" eq "notinstalled") {
                                next if ( -e "$Conf::dbdir/installed/meta-$templine[0]" );
                        } elsif ("$filter" eq "installed") {
                                next unless ( -e "$Conf::dbdir/installed/meta-$templine[0]" );
                        }
+                       $count++;
                        if ("$forweb" eq "forweb")
                         {
                                if ("$filter" eq "notinstalled") {
@@ -529,7 +526,7 @@ sub dblist {
                        } else {
                                if ("$Pakfire::enable_colors" eq "1") {
                                        if (&isinstalled("$templine[0]")) {
-                                               $use_color = "$color{'red'}" 
+                                               $use_color = "$color{'red'}"
                                        } else {
                                                $use_color = "$color{'green'}"
                                        }
@@ -541,25 +538,19 @@ sub dblist {
        }
 }
 
-sub resolvedeps {
+sub resolvedeps_one {
        my $pak = shift;
        
-       getmetafile("$pak");
-       
        message("PAKFIRE RESV: $pak: Resolving dependencies...");
+
+       unless (getmetafile("$pak")) {
+               message("PAKFIRE ERROR: Error retrieving dependency information on $pak. Unable to resolve dependencies.");
+               exit 1;
+       };
        
-       open(FILE, "<$Conf::dbdir/meta/meta-$pak");
-       my @file = <FILE>;
-       close(FILE);
-       
-       my $line;
-       my (@templine, @deps, @tempdeps, @all);
-       foreach $line (@file) {
-               @templine = split(/\: /,$line);
-               if ("$templine[0]" eq "Dependencies") {
-                       @deps = split(/ /, $templine[1]);
-               }
-       }
+       my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak");
+       my @all;
+       my @deps = split(/ /, $metadata{'Dependencies'});
        chomp (@deps);
        foreach (@deps) {
                if ($_) {
@@ -568,30 +559,41 @@ sub resolvedeps {
                        message("PAKFIRE RESV: $pak: Dependency is already installed: $_");
                  } else {
                        message("PAKFIRE RESV: $pak: Need to install dependency: $_");
-                               push(@tempdeps,$_);
                                push(@all,$_);
-                       } 
+                       }
                }
        }
 
-       foreach (@tempdeps) {
-               if ($_) {
-                       my @newdeps = resolvedeps("$_");
-                       foreach(@newdeps) {
-                               unless (($_ eq " ") || ($_ eq "")) {
-                                       my $return = &isinstalled($_);
-                                       if ($return eq 0) {
-                                               message("PAKFIRE RESV: $pak: Dependency is already installed: $_");
-                                       } else {
-                                               message("PAKFIRE RESV: $pak: Need to install dependency: $_");
-                                               push(@all,$_);
-                                       }
-                               }
+       return @all;
+}
+
+sub resolvedeps {
+       my $pak = shift;
+       my @all;
+
+       # Resolve all not yet installed dependencies of $pak
+       my @deps = &resolvedeps_one($pak);
+       push(@all, @deps);
+
+       # For each dependency, we check if more dependencies exist
+       while (@deps) {
+               my $dep = pop(@deps);
+
+               my @subdeps = &resolvedeps_one($dep);
+               foreach my $subdep (@subdeps) {
+                       # Skip the package we are currently resolving for
+                       next if ($pak eq $subdep);
+
+                       # If the package is not already to be installed,
+                       # we add it to the list (@all) and check if it has
+                       # more dependencies on its own.
+                       unless (grep {$_ eq $subdep} @all) {
+                               push(@deps, $subdep);
+                               push(@all, $subdep);
                        }
                }
        }
-       message("");
-       chomp (@all);
+
        return @all;
 }
 
@@ -617,9 +619,9 @@ sub resolvedeps_recursive {
 sub cleanup {
        my $dir = shift;
        my $path;
-       
+
        logger("CLEANUP: $dir");
-       
+
        if ( "$dir" eq "meta" ) {
                $path = "$Conf::dbdir/meta";
        } elsif ( "$dir" eq "tmp" ) {
@@ -639,20 +641,16 @@ sub cleanup {
 sub getmetafile {
        my $pak = shift;
        
-       unless ( -e "$Conf::dbdir/meta/meta-$pak" ) {
-               fetchfile("meta/meta-$pak", "");
-               move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak");
-       }
-       
-       if ( -z "$Conf::dbdir/meta/meta-$pak" ) {
-               fetchfile("meta/meta-$pak", "");
+       # Try to download meta-file if we don't have one yet, or it is empty for some reason
+       if ((! -e "$Conf::dbdir/meta/meta-$pak" ) || ( -z "$Conf::dbdir/meta/meta-$pak" )) {
+               return 0 unless (fetchfile("meta/meta-$pak", ""));
                move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak");
        }
-       
+
        open(FILE, "<$Conf::dbdir/meta/meta-$pak");
        my @line = <FILE>;
        close(FILE);
-       
+
        open(FILE, ">$Conf::dbdir/meta/meta-$pak");
        foreach (@line) {
                my $string = $_;
@@ -660,37 +658,58 @@ sub getmetafile {
                print FILE $string;
        }
        close(FILE);
+
        return 1;
 }
 
 sub getsize {
        my $pak = shift;
-       
+
        getmetafile("$pak");
-       
-       open(FILE, "<$Conf::dbdir/meta/meta-$pak");
-       my @file = <FILE>;
-       close(FILE);
-       
-       my $line;
+
+       if (my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak")) {
+               return $metadata{'Size'};
+       }
+       return 0;
+}
+
+sub parsemetafile {
+       ### This subroutine returns a hash with the contents of a meta- file
+       #   Pass path to metafile as argument: Pakfire::parsemetafile("$Conf::dbdir/meta/meta-$pak")
+       #   Usage is always with an argument.
+       my $metafile = shift;
+
+       my %metadata = ();
+
        my @templine;
-       foreach $line (@file) {
-               @templine = split(/\: /,$line);
-               if ("$templine[0]" eq "Size") {
+       my @file;
+
+       if (! -e $metafile ) {
+               return 0;
+       }
+
+       open(FILE, "<$metafile");
+       @file = <FILE>;
+       close(FILE);
+
+       foreach (@file) {
+               @templine = split(/\: /,$_);
+               if ($templine[1]) {
                        chomp($templine[1]);
-                       return $templine[1];
+                       $metadata{"$templine[0]"} = $templine[1];
                }
        }
-       return 0;
+
+       return %metadata;
 }
 
 sub decryptpak {
        my $pak = shift;
-       
+
        cleanup("tmp");
-       
+
        my $file = getpak("$pak", "noforce");
-       
+
        logger("DECRYPT STARTED: $pak");
        my $return = system("cd $Conf::tmpdir/ && gpg -d --batch --quiet --no-verbose --status-fd 2 --output - < $Conf::cachedir/$file 2>/dev/null | tar x");
        $return %= 255;
@@ -702,50 +721,41 @@ sub getpak {
        my $pak = shift;
        my $force = shift;
 
-       getmetafile("$pak");
-       
-       open(FILE, "<$Conf::dbdir/meta/meta-$pak");
-       my @file = <FILE>;
-       close(FILE);
-       
-       my $line;
-       my $file;
-       my @templine;
-       foreach $line (@file) {
-               @templine = split(/\: /,$line);
-               if ("$templine[0]" eq "File") {
-                       chomp($templine[1]);
-                       $file = $templine[1];
-               }
+       unless (getmetafile("$pak")) {
+               message("PAKFIRE ERROR: Unable to retrieve $pak metadata.");
+               exit 1;
        }
        
+       my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak");
+       my $file = $metadata{'File'};
+
        unless ($file) {
                message("No filename given in meta-file.");
                exit 1;
        }
-       
+
        unless ( "$force" eq "force" ) {
                if ( -e "$Conf::cachedir/$file" ) {
                        return $file;
                }
        }
        
-       fetchfile("paks/$file", "");
+       unless (fetchfile("paks/$file", "")) {
+               message("PAKFIRE ERROR: Unable to download $pak.");
+               exit 1;
+       }
        return $file;
 }
 
 sub setuppak {
        my $pak = shift;
-       
+
        message("PAKFIRE INST: $pak: Decrypting...");
        decryptpak("$pak");
-       
+
        message("PAKFIRE INST: $pak: Copying files and running post-installation scripts...");
        my $return = system("cd $Conf::tmpdir && NAME=$pak ./install.sh >> $Conf::logdir/install-$pak.log 2>&1");
        $return %= 255;
-       if ($pakfiresettings{'UUID'} ne "off") {
-               fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid&ipak=$pak&return=$return", "$Conf::mainserver");
-       }
        if ($return == 0) {
          move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak");
          cleanup("tmp");
@@ -763,8 +773,14 @@ sub upgradecore {
        getcoredb("noforce");
        eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
        if ("$core_release" > "$Conf::core_mine") {
+               # Safety check for lazy testers:
+               # Before we upgrade to the latest release, we re-install the previous release
+               # to make sure that the tester has always been on the latest version.
+               my $tree = &get_tree();
+               $Conf::core_mine-- if ($tree eq "testing" || $tree eq "unstable");
+
                message("CORE UPGR: Upgrading from release $Conf::core_mine to $core_release");
-               
+
                my @seq = `seq $Conf::core_mine $core_release`;
                shift @seq;
                my $release;
@@ -772,14 +788,14 @@ sub upgradecore {
                        chomp($release);
                        getpak("core-upgrade-$release");
                }
-               
+
                foreach $release (@seq) {
                        chomp($release);
                        upgradepak("core-upgrade-$release");
                }
-               
+
                system("echo $core_release > $Conf::coredir/mine");
-               
+
        } else {
                message("CORE ERROR: No new upgrades available. You are on release $Conf::core_mine.");
        }
@@ -804,9 +820,6 @@ sub upgradepak {
        message("PAKFIRE UPGR: $pak: Upgrading files and running post-upgrading scripts...");
        my $return = system("cd $Conf::tmpdir && NAME=$pak ./update.sh >> $Conf::logdir/update-$pak.log 2>&1");
        $return %= 255;
-       if ($pakfiresettings{'UUID'} ne "off") {
-               fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid&upak=$pak&return=$return", "$Conf::mainserver");
-       }
        if ($return == 0) {
          move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak");
          cleanup("tmp");
@@ -829,9 +842,6 @@ sub removepak {
        message("PAKFIRE REMV: $pak: Removing files and running post-removing scripts...");
        my $return = system("cd $Conf::tmpdir && NAME=$pak ./uninstall.sh >> $Conf::logdir/uninstall-$pak.log 2>&1");
        $return %= 255;
-       if ($pakfiresettings{'UUID'} ne "off") {
-               fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid&dpak=$pak&return=$return", "$Conf::mainserver");
-       }
        if ($return == 0) {
          unlink("$Conf::dbdir/rootfiles/$pak");
          unlink("$Conf::dbdir/installed/meta-$pak");
@@ -849,7 +859,7 @@ sub beautifysize {
        my $size = shift;
        #$size = $size / 1024;
        my $unit;
-       
+
        if ($size > 1023*1024) {
          $size = ($size / (1024*1024));
          $unit = "MB";
@@ -869,7 +879,7 @@ sub makeuuid {
                open(FILE, "</proc/sys/kernel/random/uuid");
                my @line = <FILE>;
                close(FILE);
-               
+
                open(FILE, ">$Conf::dbdir/uuid");
                foreach (@line) {
                        print FILE $_;
@@ -878,32 +888,6 @@ sub makeuuid {
        }
 }
 
-sub senduuid {
-       if ($pakfiresettings{'UUID'} ne "off") {
-               unless("$Conf::uuid") {
-                       $Conf::uuid = `cat $Conf::dbdir/uuid`;
-               }
-               logger("Sending my uuid: $Conf::uuid");
-               fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid", "$Conf::mainserver");
-               system("rm -f $Conf::tmpdir/counter* 2>/dev/null");
-       }
-}
-
-sub checkcryptodb {
-       logger("CRYPTO INFO: Checking GnuPG Database");
-       my $ret = system("gpg --list-keys | grep -q $myid");
-       unless ( "$ret" eq "0" ) {
-               message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
-               message("CRYPTO WARN: It's normal to see this on first execution.");
-               message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP.");
-               my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";
-               system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
-               system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
-       } else {
-               logger("CRYPTO INFO: Database is okay");
-       }
-}
-
 sub callback {
    my ($data, $response, $protocol) = @_;
    $final_data .= $data;
@@ -919,9 +903,107 @@ sub progress_bar {
                        $show_bfile = substr($bfile,0,17)."...";
                } else {
                        $show_bfile = $bfile;
-               }       
+               }
                $progress = sprintf("%.2f%%", 100*$got/+$total);
     sprintf "$color{'lightgreen'}%-20s %7s |%-${width}s| %10s$color{'normal'}\r",$show_bfile, $progress, $char x (($width-1)*$got/$total). '>', beautifysize($got);
 }
 
+sub updates_available {
+       # Get packets with updates available
+       my @upgradepaks = &Pakfire::dblist("upgrade", "noweb");
+
+       # Get the length of the returned array
+       my $updatecount = scalar @upgradepaks;
+
+       return "$updatecount";
+}
+
+sub coreupdate_available {
+       eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
+       if ("$core_release" > "$Conf::core_mine") {
+               return "yes ($core_release)";
+       }
+       else {
+               return "no";
+       }
+}
+
+sub reboot_required {
+       if ( -e "/var/run/need_reboot" ) {
+               return "yes";
+       }
+       else {
+               return "no";
+       }
+}
+
+sub status {
+       # General info
+       my $return = "Core-Version: $Conf::version\n";
+       $return .= "Core-Update-Level: $Conf::core_mine\n";
+       $return .= "Last update: " . &General::age("/opt/pakfire/db/core/mine") . " ago\n";
+       $return .= "Last core-list update: " . &General::age("/opt/pakfire/db/lists/core-list.db") . " ago\n";
+       $return .= "Last server-list update: " . &General::age("/opt/pakfire/db/lists/server-list.db") . " ago\n";
+       $return .= "Last packages-list update: " . &General::age("/opt/pakfire/db/lists/packages_list.db") . " ago\n";
+
+       # Get availability of core updates
+       $return .= "Core-Update available: " . &Pakfire::coreupdate_available() . "\n";
+
+       # Get availability of package updates
+       $return .= "Package-Updates available: " . &Pakfire::updates_available() . "\n";
+
+       # Test if reboot is required
+       $return .= "Reboot required: " . &Pakfire::reboot_required() . "\n";
+
+       # Return status text
+       print "$return";
+       exit 1;
+}
+
+sub get_arch() {
+       # Append architecture
+       my ($sysname, $nodename, $release, $version, $machine) = POSIX::uname();
+
+       # We only support armv6l for 32 bit arm
+       if ($machine =~ m/armv[67]/) {
+               return "armv6l";
+       }
+
+       return $machine;
+}
+
+sub get_tree() {
+       # Return stable if nothing is set
+       return "stable" unless (defined $pakfiresettings{'TREE'});
+
+       return $pakfiresettings{'TREE'};
+}
+
+sub make_version() {
+       my $version = "";
+
+       # Open /etc/system-release
+       open(RELEASE, "</etc/system-release");
+       my $release = <RELEASE>;
+       close(RELEASE);
+
+       # Add the main relase
+       if ($release =~ m/IPFire ([\d\.]+)/) {
+               $version .= $1;
+       }
+
+       # Append suffix for tree
+       my $tree = &get_tree();
+       if ($tree eq "testing") {
+               $version .= ".1";
+       } elsif ($tree eq "unstable") {
+               $version .= ".2";
+       }
+
+       # Append architecture
+       $version .= "-" . &get_arch();
+
+       return $version;
+}
+
 1;