X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Fpakfire%2Flib%2Ffunctions.pl;h=8d4a7da7db52b5a47a617fb3819bbaf67453cf18;hp=a07b89ffa78b3f47bbdfbb3ff62d7d40333d5436;hb=ff9545f8629ac2e96d5ba2776a2e7e9d70f6a153;hpb=a6d327a74bcd32015f0bf274623e1e136a59dd23 diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index a07b89ffa7..8d4a7da7db 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -1,4 +1,23 @@ #!/usr/bin/perl -w +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### require "/opt/pakfire/etc/pakfire.conf"; require "/var/ipfire/general-functions.pl"; @@ -14,6 +33,31 @@ use Net::Ping; package Pakfire; +# GPG Keys +my $myid = "64D96617"; # Our own gpg-key paks@ipfire.org +my $trustid = "65D0FD58"; # gpg-key of CaCert + +# A small color-hash :D +my %color; + $color{'normal'} = "\033[0m"; + $color{'black'} = "\033[0;30m"; + $color{'darkgrey'} = "\033[1;30m"; + $color{'blue'} = "\033[0;34m"; + $color{'lightblue'} = "\033[1;34m"; + $color{'green'} = "\033[0;32m"; + $color{'lightgreen'} = "\033[1;32m"; + $color{'cyan'} = "\033[0;36m"; + $color{'lightcyan'} = "\033[1;36m"; + $color{'red'} = "\033[0;31m"; + $color{'lightred'} = "\033[1;31m"; + $color{'purple'} = "\033[0;35m"; + $color{'lightpurple'} = "\033[1;35m"; + $color{'brown'} = "\033[0;33m"; + $color{'lightgrey'} = "\033[0;37m"; + $color{'yellow'} = "\033[1;33m"; + $color{'white'} = "\033[1;37m"; +our $enable_colors = 1; + my $final_data; my $total_size; my $bfile; @@ -23,21 +67,49 @@ my %pakfiresettings = (); sub message { my $message = shift; - print "$message\n"; + logger("$message"); + if ( $enable_colors == 1 ) { + if ("$message" =~ /ERROR/) { + $message = "$color{'red'}$message$color{'normal'}"; + } elsif ("$message" =~ /INFO/) { + $message = "$color{'cyan'}$message$color{'normal'}"; + } elsif ("$message" =~ /WARN/) { + $message = "$color{'yellow'}$message$color{'normal'}"; + } elsif ("$message" =~ /RESV/) { + $message = "$color{'purple'}$message$color{'normal'}"; + } elsif ("$message" =~ /INST/) { + $message = "$color{'green'}$message$color{'normal'}"; + } elsif ("$message" =~ /REMV/) { + $message = "$color{'lightred'}$message$color{'normal'}"; + } elsif ("$message" =~ /UPGR/) { + $message = "$color{'lightblue'}$message$color{'normal'}"; + } + } + print "$message\n"; + } sub logger { my $log = shift; - system("logger -t pakfire \"$log\"") if "$log"; + if ($log) { + #system("echo \"`date`: $log\" >> /var/log/pakfire.log"); + system("logger -t pakfire \"$log\""); + } } sub usage { - &Pakfire::message("Usage: pakfire "); + &Pakfire::message("Usage: pakfire [options] "); &Pakfire::message(" - Contacts the servers for new lists of paks."); &Pakfire::message(" - Installs the latest version of all paks."); &Pakfire::message(" - Outputs a short list with all available paks."); &Pakfire::message(""); + &Pakfire::message(" Global options:"); + &Pakfire::message(" --non-interactive --> Enables the non-interactive mode."); + &Pakfire::message(" You won't see any question here."); + &Pakfire::message(" -y --> Short for --non-interactive."); + &Pakfire::message(" --no-colors --> Turns off the wonderful colors."); + &Pakfire::message(""); exit 1; } @@ -46,7 +118,7 @@ sub pinghost { $p = Net::Ping->new(); if ($p->ping($host)) { - logger("PING INFO: $host is alive"); + logger("PING INFO: $host is alive"); return 1; } else { logger("PING INFO: $host is unreachable"); @@ -58,11 +130,13 @@ sub pinghost { sub fetchfile { my $getfile = shift; my $gethost = shift; - my (@server, $host, $proto, $file, $allok, $i); + my (@server, $host, $proto, $file, $i); + my $allok = 0; - logger("DOWNLOAD STARTED: $getfile") unless ($bfile =~ /^counter\?.*/); use File::Basename; $bfile = basename("$getfile"); + + logger("DOWNLOAD STARTED: $getfile") unless ($bfile =~ /^counter\?.*/); $i = 0; while (($allok == 0) && $i < 5) { @@ -82,21 +156,20 @@ sub fetchfile { unless ($bfile =~ /^counter\?.*/) { logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file"); - #message("DOWNLOAD INFO: Loading $bfile from ($proto) $host..."); } my $ua = LWP::UserAgent->new; $ua->agent("Pakfire/$Conf::version"); - $ua->timeout(5); + $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\?.*/); + logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}\"") unless ($bfile =~ /^counter.py\?.*/); 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\?.*/); + logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\"") unless ($bfile =~ /^counter.py\?.*/); } else { $ua->proxy("http","http://$proxysettings{'UPSTREAM_PROXY'}/"); } @@ -106,7 +179,7 @@ sub fetchfile { my $url = "http://$host/$file"; my $response; - unless ($bfile =~ /^counter\?.*/) { + unless ($bfile =~ /^counter.py\?.*/) { my $result = $ua->head($url); my $remote_headers = $result->headers; $total_size = $remote_headers->content_length; @@ -128,24 +201,29 @@ sub fetchfile { } if ($response->is_success) { - if (open(FILE, ">$Conf::tmpdir/$bfile")) { - print FILE $final_data; - close(FILE); - unless ($bfile =~ /^counter\?.*/) { # Don't check out counterfile cause it's empty + 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; + } else { + logger("DOWNLOAD ERROR: Could not open $Conf::cachedir/$bfile for writing."); } - logger("DOWNLOAD FINISHED: $file") unless ($bfile =~ /^counter\?.*/); - $allok = 1; - return 0; } else { - logger("DOWNLOAD ERROR: Could not open $Conf::cachedir/$bfile for writing."); + return 0; } } else { logger("DOWNLOAD ERROR: $log"); @@ -156,21 +234,59 @@ sub fetchfile { } 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(); + $age = $time - $stat[9]; + $force = "force" if ("$age" >= "3600"); + logger("MIRROR INFO: server-list.db is $age seconds old. - DEBUG: $force"); + } else { + # 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"); + } +} - logger("MIRROR: Trying to get a mirror list."); +sub getcoredb { + my $force = shift; + my $age; - fetchfile("$Conf::version/lists/server-list.db", "$Conf::mainserver"); - move("$Conf::cachedir/server-list.db", "$Conf::dbdir/lists/server-list.db"); + use File::Copy; + + if ( -e "$Conf::dbdir/lists/core-list.db" ) { + my @stat = stat("$Conf::dbdir/lists/core-list.db"); + my $time = time(); + $age = $time - $stat[9]; + $force = "force" if ("$age" >= "3600"); + logger("CORE INFO: core-list.db is $age seconds old. - DEBUG: $force"); + } else { + # 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"); + } } + sub selectmirror { ### 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(); + getmirrors("noforce"); } if ($count == 5) { message("MIRROR ERROR: Could not find or download a server list"); @@ -195,6 +311,7 @@ sub selectmirror { # This will never give up. my $found = 0; my $servers = 0; + my $pingdelay = 1; while ($found == 0) { $server = int(rand($scount) + 1); $servers = 0; @@ -207,10 +324,22 @@ sub selectmirror { $proto = $templine[0]; $host = $templine[1]; $path = $templine[2]; - if (pinghost("$host")) { + 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; + } + } } } } @@ -229,16 +358,62 @@ sub dbgetlist { my @stat = stat("$Conf::dbdir/lists/packages_list.db"); my $time = time(); $age = $time - $stat[9]; + $force = "force" if ("$age" >= "3600"); + logger("DB INFO: packages_list.db is $age seconds old. - DEBUG: $force"); } else { # Force an update. - $age = "86401"; + $force = "force"; } - if (("$age" gt 86400) || ("$force" eq "force")) { - #cleanup(); + if ("$force" eq "force") { fetchfile("lists/packages_list.db", ""); move("$Conf::cachedir/packages_list.db", "$Conf::dbdir/lists/packages_list.db"); } + + # 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 @templine; + + open(FILE, "<$Conf::dbdir/lists/packages_list.db"); + my @db = ; + close(FILE); + + opendir(DIR,"$Conf::dbdir/meta"); + my @files = readdir(DIR); + closedir(DIR); + foreach $file (@files) { + next if ( $file eq "." ); + next if ( $file eq ".." ); + next if ( $file =~ /^old/ ); + open(FILE, "<$Conf::dbdir/meta/$file"); + @meta = ; + 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); + } + } + 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"); + } + } + } } sub dblist { @@ -257,20 +432,39 @@ sub dblist { my @templine; ### Make sure that the list is not outdated. - dbgetlist("noforce"); + #dbgetlist("noforce"); open(FILE, "<$Conf::dbdir/lists/packages_list.db"); my @db = ; close(FILE); if ("$filter" eq "upgrade") { - opendir(DIR,"$Conf::dbdir/meta"); + if ("$forweb" ne "forweb" && "$forweb" ne "notice" ) {getcoredb("noforce");} + eval(`grep "core_" $Conf::dbdir/lists/core-list.db`); + if ("$core_release" > "$Conf::core_mine") { + if ("$forweb" eq "forweb") { + print "\n"; + } + elsif ("$forweb" eq "notice") { + print "


$Lang::tr{'core notice 1'} $Conf::core_mine $Lang::tr{'core notice 2'} $core_release $Lang::tr{'core notice 3'}"; + } else { + my $command = "Core-Update $Conf::version\nRelease: $Conf::core_mine -> $core_release\n"; + if ("$Pakfire::enable_colors" eq "1") { + print "$color{'lila'}$command$color{'normal'}\n"; + } else { + print "$command\n"; + } + } + } + + opendir(DIR,"$Conf::dbdir/installed"); my @files = readdir(DIR); closedir(DIR); foreach $file (@files) { next if ( $file eq "." ); next if ( $file eq ".." ); - open(FILE, "<$Conf::dbdir/meta/$file"); + next if ( $file =~ /^old/ ); + open(FILE, "<$Conf::dbdir/installed/$file"); @meta = ; close(FILE); foreach $line (@meta) { @@ -288,12 +482,17 @@ sub dblist { } foreach $prog (@db) { @templine = split(/\;/,$prog); - if (("$name" eq "$templine[0]") && ("$release" < "$templine[2]" )) { + if (("$name" eq "$templine[0]") && ("$release" < "$templine[2]" && "$forweb" ne "notice")) { push(@updatepaks,$name); if ("$forweb" eq "forweb") { print "\n"; } else { - print "Update: $name\nVersion: $version -> $templine[1]\nRelease: $release -> $templine[2]\n\n"; + my $command = "Update: $name\nVersion: $version -> $templine[1]\nRelease: $release -> $templine[2]\n"; + if ("$Pakfire::enable_colors" eq "1") { + print "$color{'lila'}$command$color{'normal'}\n"; + } else { + print "$command\n"; + } } } } @@ -301,9 +500,13 @@ sub dblist { return @updatepaks; } else { my $line; + my $use_color; my @templine; + my $count; 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]" ); @@ -313,9 +516,17 @@ sub dblist { if ("$forweb" eq "forweb") { print "\n"; } else { - print "Name: $templine[0]\nProgVersion: $templine[1]\nRelease: $templine[2]\n\n"; + if ("$Pakfire::enable_colors" eq "1") { + if (&isinstalled("$templine[0]")) { + $use_color = "$color{'red'}" + } else { + $use_color = "$color{'green'}" + } + } + print "${use_color}Name: $templine[0]\nProgVersion: $templine[1]\nRelease: $templine[2]$color{'normal'}\n\n"; } } + print "$count packages total.\n" unless ("$forweb" eq "forweb"); } } @@ -324,8 +535,7 @@ sub resolvedeps { getmetafile("$pak"); - message(""); - message("## Resolving dependencies for $pak..."); + message("PAKFIRE RESV: $pak: Resolving dependencies..."); open(FILE, "<$Conf::dbdir/meta/meta-$pak"); my @file = ; @@ -344,9 +554,9 @@ sub resolvedeps { if ($_) { my $return = &isinstalled($_); if ($return eq 0) { - message("### Dependency is already installed: $_"); + message("PAKFIRE RESV: $pak: Dependency is already installed: $_"); } else { - message("### Need to install dependency: $_"); + message("PAKFIRE RESV: $pak: Need to install dependency: $_"); push(@tempdeps,$_); push(@all,$_); } @@ -360,15 +570,16 @@ sub resolvedeps { unless (($_ eq " ") || ($_ eq "")) { my $return = &isinstalled($_); if ($return eq 0) { - message("### Dependency is already installed: $_"); + message("PAKFIRE RESV: $pak: Dependency is already installed: $_"); } else { - message("### Need to install dependency: $_"); + message("PAKFIRE RESV: $pak: Need to install dependency: $_"); push(@all,$_); } } } } } + message(""); chomp (@all); return @all; } @@ -377,6 +588,8 @@ sub cleanup { my $dir = shift; my $path; + logger("CLEANUP: $dir"); + if ( "$dir" eq "meta" ) { $path = "$Conf::dbdir/meta"; } elsif ( "$dir" eq "tmp" ) { @@ -396,7 +609,12 @@ sub cleanup { sub getmetafile { my $pak = shift; - unless ( -e "$Conf::dbdir/meta/meta-$pak") { + 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", ""); move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak"); } @@ -444,7 +662,7 @@ sub decryptpak { my $file = getpak("$pak", "noforce"); logger("DECRYPT STARTED: $pak"); - my $return = system("cd $Conf::tmpdir/ && gpg -d < $Conf::cachedir/$file | tar x &>/dev/null"); + 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; logger("DECRYPT FINISHED: $pak - Status: $return"); if ($return != 0) { exit 1; } @@ -489,30 +707,54 @@ sub getpak { sub setuppak { my $pak = shift; - message("################################################################################"); - message("# --> Installing: $pak"); - message("################################################################################"); - + 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("cgi-bin/counter?ver=$Conf::version&uuid=$Conf::uuid&ipak=$pak&return=$return", "$Conf::mainserver"); + 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"); copy("$Conf::dbdir/meta/meta-$pak","$Conf::dbdir/installed/"); - message("Setup completed. Congratulations!"); - message("################################################################################"); + message("PAKFIRE INST: $pak: Finished."); + message(""); } else { - message("Setup returned: $return. Sorry. Please search our forum to find a solution for this problem."); + message("PAKFIRE ERROR: Returncode: $return. Sorry. Please search our forum to find a solution for this problem."); exit $return; } return $return; } +sub upgradecore { + getcoredb("noforce"); + eval(`grep "core_" $Conf::dbdir/lists/core-list.db`); + if ("$core_release" > "$Conf::core_mine") { + message("CORE UPGR: Upgrading from release $Conf::core_mine to $core_release"); + + my @seq = `seq $Conf::core_mine $core_release`; + shift @seq; + my $release; + foreach $release (@seq) { + 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."); + } +} + sub isinstalled { my $pak = shift; if ( open(FILE,"<$Conf::dbdir/installed/meta-$pak") ) { @@ -526,22 +768,23 @@ sub isinstalled { sub upgradepak { my $pak = shift; - message("We are going to upgrade: $pak"); - + message("PAKFIRE UPGR: $pak: Decrypting..."); decryptpak("$pak"); + 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("cgi-bin/counter?ver=$Conf::version&uuid=$Conf::uuid&upak=$pak&return=$return", "$Conf::mainserver"); + 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"); - copy("$Conf::dbdir/meta/meta-$pak","$Conf::dbdir/installed/"); - message("Upgrade completed. Congratulations!"); + copy("$Conf::dbdir/meta/meta-$pak", "$Conf::dbdir/installed/"); + message("PAKFIRE UPGR: $pak: Finished."); + message(""); } else { - message("Setup returned: $return. Sorry. Please search our forum to find a solution for this problem."); + message("PAKFIRE ERROR: Returncode: $return. Sorry. Please search our forum to find a solution for this problem."); exit $return; } return $return; @@ -550,33 +793,23 @@ sub upgradepak { sub removepak { my $pak = shift; - message("We are going to uninstall: $pak"); - + message("PAKFIRE REMV: $pak: Decrypting..."); decryptpak("$pak"); + 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("cgi-bin/counter?ver=$Conf::version&uuid=$Conf::uuid&dpak=$pak&return=$return", "$Conf::mainserver"); + fetchfile("counter.py?ver=$Conf::version&uuid=$Conf::uuid&dpak=$pak&return=$return", "$Conf::mainserver"); } if ($return == 0) { - open(FILE, "<$Conf::dbdir/rootfiles/$pak"); - my @file = ; - close(FILE); - message("Removing files..."); - foreach (@file) { - my $line = $_; - chomp($line); - system("echo \"Removing: $line\" >> $Conf::logdir/uninstall-$pak.log 2>&1"); - system("cd / && rm -rf $line >> $Conf::logdir/uninstall-$pak.log 2>&1"); - } unlink("$Conf::dbdir/rootfiles/$pak"); unlink("$Conf::dbdir/installed/meta-$pak"); - message("Finished removing files!"); cleanup("tmp"); - message("Uninstall completed. Congratulations!"); + message("PAKFIRE REMV: $pak: Finished."); + message(""); } else { - message("Setup returned: $return. Sorry. Please search our forum to find a solution for this problem."); + message("PAKFIRE ERROR: Returncode: $return. Sorry. Please search our forum to find a solution for this problem."); exit $return; } return $return; @@ -584,14 +817,17 @@ sub removepak { sub beautifysize { my $size = shift; - $size = $size / 1024; + #$size = $size / 1024; my $unit; - if ($size > 1023) { - $size = ($size / 1024); + if ($size > 1023*1024) { + $size = ($size / (1024*1024)); $unit = "MB"; - } else { + } elsif ($size > 1023) { + $size = ($size / 1024); $unit = "KB"; + } else { + $unit = "B"; } $size = sprintf("%.2f" , $size); my $string = "$size $unit"; @@ -618,21 +854,20 @@ sub senduuid { $Conf::uuid = `cat $Conf::dbdir/uuid`; } logger("Sending my uuid: $Conf::uuid"); - fetchfile("cgi-bin/counter?ver=$Conf::version&uuid=$Conf::uuid", "$Conf::mainserver"); + 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 $myid = "64D96617"; # Our own gpg-key - my $trustid = "65D0FD58"; # Id of CaCert 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."); - system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $myid &>>$Conf::logdir/gnupg-database.log"); - system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $trustid &>>$Conf::logdir/gnupg-database.log"); + my $command = "gpg --keyserver pgp.mit.edu --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"); } @@ -641,21 +876,21 @@ sub checkcryptodb { sub callback { my ($data, $response, $protocol) = @_; $final_data .= $data; - print progress_bar( length($final_data), $total_size, 25, '=' ); + print progress_bar( length($final_data), $total_size, 30, '=' ); } sub progress_bar { my ( $got, $total, $width, $char ) = @_; my $show_bfile; - $width ||= 25; $char ||= '='; - my $num_width = length $total; + $width ||= 30; $char ||= '='; my $len_bfile = length $bfile; - if ("$len_bfile" >= "12") { - $show_bfile = substr($bfile,0,12)."..."; + if ("$len_bfile" >= "17") { + $show_bfile = substr($bfile,0,17)."..."; } else { $show_bfile = $bfile; - } - sprintf "$show_bfile [%-${width}s] Got %${num_width}s bytes of %s (%.2f%%)\r", $char x (($width-1)*$got/$total). '>', $got, $total, 100*$got/+$total; + } + $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); } 1;