In den Pakfire nun auch das neuen Paketformat uebernommen.

[people/pmueller/ipfire-2.x.git] / src / pakfire / lib / functions.pl

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 000b2cfc82ec270d47e44142c4e27dd849475f07..6e416f915c65667bd7b7e79e60c855892389cd0c 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -21,6 +21,14 @@ sub logger {
        system("logger -t pakfire \"$log\"");
 }
 
+sub usage {
+  &Pakfire::message("Usage: pakfire <install|remove> <pak(s)>");
+  &Pakfire::message("               <update> - Contacts the servers for new lists of paks.");
+  &Pakfire::message("               <upgrade> - Installs the latest version of a pak.");
+  &Pakfire::message("               <list> - Outputs a short list with all available paks.");
+  exit 1;
+}
+
 sub pinghost {
        my $host = shift;
        
@@ -163,7 +171,7 @@ sub dbgetlist {
        }
        
        if (("$age" gt 86400) || ("$force" eq "force")) {
-               cleanup();
+               #cleanup();
                fetchfile("lists/packages_list.db", "");
                move("$Conf::cachedir/packages_list.db", "$Conf::dbdir/lists/packages_list.db");
        }
@@ -188,11 +196,15 @@ sub dblist {
        my @templine;
        foreach $line (sort @db) {
                @templine = split(/\;/,$line);
-               ### filter here...
+               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]" );
+               }
                if ("$forweb" eq "forweb") {
                        print "<option value=\"$templine[0]\">$templine[0]-$templine[1]-$templine[2]</option>\n";
                } else {
-                       print "Name: $templine[0]\nVersion: $templine[1]\nRelease: $templine[2]\n\n";
+                       print "Name: $templine[0]\nProgVersion: $templine[1]\nRelease: $templine[2]\n\n";
                }
        }
 }
@@ -323,10 +335,10 @@ sub decryptpak {
        
        my $file = getpak("$pak", "noforce");
        
-       my $return = system("gpg -d < $Conf::cachedir/$file | tar xj -C $Conf::tmpdir/");
+       my $return = system("cd $Conf::tmpdir/ && gpg -d < $Conf::cachedir/$file | cpio -i >/dev/null 2>&1");
        
        logger("Decryption process returned the following: $return");
-       if ($return != 1) { exit 1; }
+       if ($return != 0) { exit 1; }
 }
 
 sub getpak {
@@ -373,6 +385,7 @@ sub setuppak {
        decryptpak("$pak");
        
        my $return = system("cd $Conf::tmpdir && ./install.sh >> $Conf::logdir/install-$pak.log 2>&1");
+       $return %= 255;
        if ($return == 0) {
          move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak");
          cleanup("tmp");
@@ -471,4 +484,31 @@ sub senduuid {
        system("rm -f $Conf::cachedir/counter* 2>/dev/null");
 }
 
+sub lock {
+       my $status = shift;
+       if ("$status" eq "on") {
+               system("touch /opt/pakfire/pakfire.lock");
+               system("chmod 777 /opt/pakfire/pakfire.lock");
+               logger("Created lock");
+       } else {
+               if (system("rm -f /opt/pakfire/pakfire.lock >/dev/null 2>&1")) {
+                       logger("Successfully removed lock.");
+               } else {
+                       logger("Couldn't remove lock.");
+               }
+       }
+       return 0;
+}
+
+sub checkcryptodb {
+       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("The GnuPG isn't configured corectly. Trying now to fix this.");
+               system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $myid");
+               system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $trustid");
+       }
+}
+
 1;