X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Fpakfire%2Flib%2Ffunctions.pl;h=cfb7e51175f30a7ffb790ade89a7ae5a19bc38f9;hp=c8febe76e6dfd6201a5187d1592d14f425b18ab5;hb=bb6481a82072cf2df27306508c8b72b584eb4f80;hpb=28593a79c2db39a88e28e3e22be975eaa028fb21

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index c8febe76e6..cfb7e51175 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2015   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        #
@@ -34,8 +34,8 @@ use Net::Ping;
 package Pakfire;
 
 # GPG Keys
-my $myid = "64D96617";			# Our own gpg-key paks@ipfire.org
-my $trustid = "65D0FD58";		# gpg-key of CaCert
+my $myid = "179740DC4D8C47DC63C099C74BDE364C64D96617";		# Our own gpg-key paks@ipfire.org
+my $trustid = "A31D4F81EF4EBD07B456FA04D2BB0D0165D0FD58";	# gpg-key of CaCert
 
 # A small color-hash :D
 my %color;
@@ -116,7 +116,7 @@ sub usage {
 sub pinghost {
 	my $host = shift;
 	
-	$p = Net::Ping->new();
+	$p = Net::Ping->new("icmp");
   if ($p->ping($host)) {
  	 logger("PING INFO: $host is alive");
   	return 1;
@@ -220,7 +220,7 @@ sub fetchfile {
 					$allok = 1;
 					return 0;
 				} else {
-					logger("DOWNLOAD ERROR: Could not open $Conf::cachedir/$bfile for writing.");
+					logger("DOWNLOAD ERROR: Could not open $Conf::tmpdir/$bfile for writing.");
 				}
 			} else {
 				return 0;
@@ -305,12 +305,18 @@ sub selectmirror {
 		}
 	}
 	logger("MIRROR INFO: $scount servers found in list");
-	
+
+	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");
+	}
+
 	### 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) {
 		$server = int(rand($scount) + 1);
 		$servers = 0;
@@ -323,10 +329,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;
+					}
+				}
 			}
 		}
 	}
@@ -356,6 +374,52 @@ sub dbgetlist {
 		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 = <FILE>;
+	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 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);
+			}
+		}
+		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 {
@@ -381,11 +445,14 @@ sub dblist {
 	close(FILE);
 
 	if ("$filter" eq "upgrade") {
-		getcoredb("noforce");
+		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 "<option value=\"core\">Core-Update -- $Conf::version -- Release: $Conf::core_mine -> $core_release</option>\n";
+			}
+			elsif ("$forweb" eq "notice") {
+				print "<br /><br /><br /><a href='pakfire.cgi'>$Lang::tr{'core notice 1'} $Conf::core_mine $Lang::tr{'core notice 2'} $core_release $Lang::tr{'core notice 3'}</a>";
 			} else {
 				my $command = "Core-Update $Conf::version\nRelease: $Conf::core_mine -> $core_release\n";
 				if ("$Pakfire::enable_colors" eq "1") {
@@ -396,13 +463,14 @@ sub dblist {
 			}
 		}
 	
-		opendir(DIR,"$Conf::dbdir/meta");
+		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 = <FILE>;
 			close(FILE);
 			foreach $line (@meta) {
@@ -420,7 +488,7 @@ 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 "<option value=\"$name\">Update: $name -- Version: $version -> $templine[1] -- Release: $release -> $templine[2]</option>\n";
@@ -451,8 +519,13 @@ sub dblist {
 			} 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";
+			if ("$forweb" eq "forweb")
+			 {
+				if ("$filter" eq "notinstalled") {
+					print "<option value=\"$templine[0]\">$templine[0]-$templine[1]-$templine[2]</option>\n";
+				} else {
+					print "<option value=\"$templine[0]\">$templine[0]</option>\n";
+				}
 			} else {
 				if ("$Pakfire::enable_colors" eq "1") {
 					if (&isinstalled("$templine[0]")) {
@@ -468,7 +541,7 @@ sub dblist {
 	}
 }
 
-sub resolvedeps {
+sub resolvedeps_one {
 	my $pak = shift;
 	
 	getmetafile("$pak");
@@ -480,7 +553,7 @@ sub resolvedeps {
 	close(FILE);
 	
 	my $line;
-	my (@templine, @deps, @tempdeps, @all);
+	my (@templine, @deps, @all);
 	foreach $line (@file) {
 		@templine = split(/\: /,$line);
 		if ("$templine[0]" eq "Dependencies") {
@@ -495,33 +568,63 @@ 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;
 }
 
+sub resolvedeps_recursive {
+	my @packages = @_;
+	my @result = ();
+
+	foreach my $pkg (@packages) {
+		my @deps = &Pakfire::resolvedeps($pkg);
+
+		foreach my $dep (@deps) {
+			push(@result, $dep);
+		}
+	}
+
+	# Sort the result array and remove dupes
+	my %sort = map{ $_, 1 } @result;
+	@result = keys %sort;
+
+	return @result;
+}
+
 sub cleanup {
 	my $dir = shift;
 	my $path;
@@ -628,7 +731,7 @@ sub getpak {
 	}
 	
 	unless ($file) {
-		message("No filename given in meta-file. Please phone the developers.");
+		message("No filename given in meta-file.");
 		exit 1;
 	}
 	
@@ -803,7 +906,8 @@ sub checkcryptodb {
 	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.");
-		my $command = "gpg --keyserver pgp.mit.edu --always-trust --status-fd 2";
+		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 {