suricata: Change midstream policy to "pass-flow"

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

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 351d712165a55c5d42d1a1a1f81410ab997055ab..389c1399daaba179ef5c1a16843a7a7ee9b99b27 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -329,14 +329,18 @@
 
        } elsif ("$ARGV[0]" eq "list") {
                my $count;
+               my $coreupdate = 0;
                my $use_color = "";
                my $reset_color = "";
                my $filter = "all";
 
-               if ("$ARGV[1]" =~ /installed|notinstalled/) {
+               shift if ("$ARGV[1]" =~ "^-"); 
+
+               if ("$ARGV[1]" =~ /installed|notinstalled|upgrade/) {
                        $filter = "$ARGV[1]";
-               } else {
-                       &Pakfire::message("PAKFIRE WARN: Not a known option $ARGV[1]") if ($ARGV[1]); 
+               } elsif ($ARGV[1]) {
+                       &Pakfire::message("PAKFIRE ERROR: Not a known option $ARGV[1]"); 
+                       exit 1;
                }
 
                my $pak;
@@ -347,6 +351,17 @@
                        $use_color = "$Pakfire::color{'lightgreen'}";
                }
 
+               # Check for available core upgrade first if list of upgrades is requested
+               if ("$filter" eq "upgrade") {
+                       my %coredb = &Pakfire::coredbinfo();
+
+                       if (defined $coredb{'AvailableRelease'}) {
+                               print "${use_color}Core-Update $coredb{'CoreVersion'}\n";
+                               print "Release: $coredb{'Release'} -> $coredb{'AvailableRelease'}${reset_color}\n\n";
+                               $coreupdate = 1;
+                       }
+               }
+
                foreach $pak (sort keys %paklist) {
                        if ("$Pakfire::enable_colors" eq "1") {
                                if ("$paklist{$pak}{'Installed'}" eq "yes") {
@@ -373,8 +388,69 @@
                if ($count > 0) {
                        print "$count packages total.\n";
                } else {
-                       &Pakfire::message("PAKFIRE WARN: No packages where found using filter $filter.");
+                       if (! $coreupdate) {
+                               &Pakfire::message("PAKFIRE WARN: No packages where found using filter $filter.");
+                               exit 1;
+                       }
+               }
+       } elsif ("$ARGV[0]" eq "info") {
+               shift;
+
+               my @paks;
+               my $pak;
+               foreach $pak (@ARGV) {
+                       unless ("$pak" =~ "^-") {
+                               push(@paks,$pak);
+                       }
                }
+
+               unless ("@paks") {
+                       Pakfire::message("PAKFIRE ERROR: missing package name");
+                       Pakfire::usage;
+                       exit 1;
+               }
+
+               foreach $pak (@paks) {
+                       my %metadata = Pakfire::getmetadata($pak, "latest");
+
+                       ### Check if pakfile was actually found
+                       if ($metadata{'Installed'} eq "no" && $metadata{'Available'} eq "no") {
+                               Pakfire::message("PAKFIRE WARN: Pak '$pak' not found.");
+                               last;
+                       }
+
+                       unless (defined $metadata{'Available'}) {
+                               Pakfire::message("PAKFIRE WARN: Unable to retrieve latest metadata for $pak. Information may be outdated.")
+                       }
+
+                       ### Printout metadata in a user friendly format
+                       print "Name: $metadata{'Name'}\n";
+                       print "Summary: $metadata{'Summary'}\n";
+                       if ($metadata{'Available'} eq "yes") {
+                               print "Version: $metadata{'AvailableProgVersion'}-$metadata{'AvailableRelease'}\n";
+                       } else {
+                               print "Version: $metadata{'ProgVersion'}-$metadata{'Release'}\n";
+                       }
+                       print "Size: " . Pakfire::beautifysize("$metadata{'Size'}") . "\n";
+                       print "Dependencies: $metadata{'Dependencies'}\n";
+                       print "Pakfile: $metadata{'File'}\n";
+                       print "Service InitScripts: $metadata{'Services'}\n";
+                       print "Installed: $metadata{'Installed'}\n";
+                       ### Generate a pak status message
+                       if (! defined $metadata{'Available'}) {
+                               print "Status: unknown (an error occured retrieving latest pak metadata)";
+                       } elsif ($metadata{'Available'} eq "no") {
+                               print "Status: obsolete (version $metadata{'ProgVersion'}-$metadata{'Release'} is installed)\n";
+                       } elsif ($metadata{'Installed'} eq "yes" && "$metadata{'Release'}" < "$metadata{'AvailableRelease'}") {
+                               print "Status: outdated (version $metadata{'ProgVersion'}-$metadata{'Release'} is installed)\n";
+                       } elsif ($metadata{'Installed'} eq "yes") {
+                               print "Status: up-to-date\n";
+                       } else {
+                               print "Status: not installed\n";
+                       }
+                       print "\n";
+               }
+
        } elsif ("$ARGV[0]" eq "resolvedeps") {
                foreach (@ARGV) {
                        next if ("$_" eq "resolvedeps");
@@ -394,14 +470,31 @@
                        system("rm -f /etc/fcron.daily/pakfire-upgrade");
                }
        } elsif ("$ARGV[0]" eq "status") {
-               &Pakfire::status;
+               my $exitcode = 0;
+               my %status = &Pakfire::status;
+
+               print "Core-Version: $status{'CoreVersion'}\n";
+               print "Core-Update-Level: $status{'Release'}\n";
+               print "Last update: $status{'LastUpdate'} ago\n";
+               print "Last core-list update: $status{'LastCoreListUpdate'} ago\n";
+               print "Last server-list update: $status{'LastServerListUpdate'} ago\n";
+               print "Last packages-list update: $status{'LastPakListUpdate'} ago\n";
+               print "Core-Update available: $status{'CoreUpdateAvailable'}";
+               print " ($status{'AvailableRelease'})" if ("$status{'CoreUpdateAvailable'}" eq "yes");
+               print "\nPackage-Updates available: $status{'PakUpdatesAvailable'}\n";
+               print "Reboot required: $status{'RebootRequired'}\n";
+
+               $exitcode += 2 if ($status{'CoreUpdateAvailable'} eq "yes");
+               $exitcode += 3 if ($status{'PakUpdatesAvailable'} eq "yes");
+               $exitcode += 4 if ($status{'RebootRequired'} eq "yes");
+               exit $exitcode;
        } else {
                &Pakfire::usage;
        }
 
-       &Pakfire::logger("PAKFIRE INFO: Pakfire has finished. Closing.");
-
        END {
+               &Pakfire::logger("PAKFIRE INFO: Pakfire has finished. Closing.");
+
                # Check if pakfire has been locked in this session.
                if ($locked) {
                        # Remove lockfile.