Die Abhaengigkeitspakete vom Samba erstellt.

vsftpd hinzugefuegt... :D Vergebt mir...
Paketmanager weitergebaut. Installiert nun die Pakete alle richtig (auch mit Abhaengigkeiten).
Samba aktualisiert.
Bootsplash entfernt.
mc-Alias erstellt, sodass der auf der Textkonsole ordentlich zu bedienen ist.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@583 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

src/initscripts/init.d/vsftpd

@@ -0,0 +1,45 @@
+#!/bin/sh
+# Begin $rc_base/init.d/vsftpd
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+
+#$LastChangedBy: bdubbs $
+#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
+
+. /etc/sysconfig/rc
+. $rc_functions
+
+case "$1" in
+	start)
+		boot_mesg "Starting vsFTPD Server..."
+		loadproc /usr/sbin/vsftpd
+		;;
+
+	stop)
+		boot_mesg "Stopping vsFTPD Server..."
+		killproc /usr/sbin/vsftpd
+		;;
+
+	reload)
+		boot_mesg "Reloading vsFTPD Server..."
+		reloadproc /usr/sbin/vsftpd
+		;;
+
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+
+	status)
+		statusproc /usr/sbin/vsftpd
+		;;
+
+	*)
+		echo "Usage: $0 {start|stop|reload|restart|status}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/vsftpd

src/pakfire/lib/functions.pl

@@ -53,7 +53,7 @@ sub fetchfile {
 	$bfile = basename("$file");
 	
 	my $ua = LWP::UserAgent->new;
-	$ua->agent('Pakfire/2.1');
+	$ua->agent('Pakfire/$Conf::version');
 	#$ua->timeout(5);
 	#$ua->env_proxy;
  
@@ -143,7 +143,7 @@ sub selectmirror {
 				$proto = $templine[0];
 				$host = $templine[1];
 				$path = $templine[2];
-				if ((pinghost("$host")) && testhost("$host") ) {
+				if (pinghost("$host")) {
 					$found = 1;
 					return ($proto, $host, $path);
 				}
@@ -312,18 +312,14 @@ sub getsize {
 	}
 }
 
-sub addsizes {
+sub addsizes { ## Still not working
 	my @paks = shift;
 	
-	my @sizes;
-	foreach (@paks) {
-		my $paksize = getsize("$_");
-		push(@sizes, $paksize);
-	}
-	
+	my $paksize;
 	my $totalsize = 0;
-	foreach (@sizes) {
-		$totalsize += $_;
+	foreach (@paks) {
+		$paksize = getsize("$_");
+		$totalsize = ($totalsize + $paksize) ;
 	}
 	return $totalsize;
 }
@@ -367,11 +363,10 @@ sub getpak {
 		exit 1;
 	}
 	
-	message("\n## Downloading $file...");
+	#message("\n## Downloading $file...");
 	
 	unless ( "$force" eq "force" ) {
 		if ( -e "$Conf::cachedir/$file" ) {
-			message("$file is already there. Skipping download.");
 			return $file;
 		}
 	}
@@ -397,7 +392,7 @@ sub setuppak {
 		exit $return;
 	}
 	
-	exit $return;
+	return $return;
 }
 
 sub updatepak {
@@ -451,13 +446,18 @@ sub removepak {
 
 sub beautifysize {
 	my $size = shift;
+	$size = $size / 1024;
+	my $unit;
 	
 	if ($size > 1023) {
-	  my $newsize = $size / 1024;
-	  return "$newsize MB";
+	  $size = ($size / 1024);
+	  $unit = "MB";
 	} else {
-	  return "$size KB";
+	  $unit = "KB";
 	}
+	$size = sprintf("%.2f" , $size);
+	my $string = "$size $unit";
+	return $string;
 }
 
 

src/pakfire/pakfire

@@ -24,13 +24,18 @@
 
 	if ("$ARGV[0]" eq "install") {
 		shift;
-		my @deps = ();
-		my @paks = @ARGV;
+		my @deps;
+		my @paks;
+		my @temp;
 		foreach (@ARGV) {
-			@deps = &Pakfire::resolvedeps("$_");
+			push(@paks,$_);
+		}
+		foreach (@paks) {
+			@temp = &Pakfire::resolvedeps("$_");
+			foreach (@temp) { push(@deps,$_) if $_; }
 		}
 		
-		my @all = ();
+		my @all;
 		foreach (@paks) {
 		  push(@all,$_);
 		}
@@ -39,20 +44,20 @@
 		}
 
 		&Pakfire::message("\n\n### Packages to install:");
-		foreach (@paks) {
+		foreach (sort @paks) {
 		  my $size = &Pakfire::getsize("$_");
 			$size = &Pakfire::beautifysize($size);
 		  &Pakfire::message("# $_  \t\t - $size");
 		}
 		
 		&Pakfire::message("\n### Packages to install for dependencies:");
-		foreach (@deps) {
+		foreach (sort @deps) {
 		  my $size = &Pakfire::getsize("$_");
 			$size = &Pakfire::beautifysize($size);
 		  &Pakfire::message("# $_  \t\t - $size");
 		}
 
-		my $totalsize = &Pakfire::addsizes(@all);
+		my $totalsize = &Pakfire::addsizes("@all");
 		$totalsize = &Pakfire::beautifysize($totalsize);
 		&Pakfire::message("\n### Download size: \t ~ $totalsize");
 		
@@ -68,8 +73,16 @@
 		}
 		
 		&Pakfire::message("### Installing all packages:");
+		foreach (sort @all) { &Pakfire::message("# --> $_"); }
+		&Pakfire::message("");
 
-		foreach (@all) {
+		### Download first
+		foreach (sort @all) {
+			&Pakfire::message("# --> Downloading: $_");
+			&Pakfire::getpak("$_", "");
+		}
+
+		foreach (sort @all) {
 			&Pakfire::setuppak("$_");
 		}
 

src/paks/cups/install.sh

@@ -0,0 +1 @@
+tar xvfj files.tbz2 -C /

src/paks/cyrus-sasl/install.sh

@@ -0,0 +1 @@
+tar xvfj files.tbz2 -C /

src/paks/mpg123/install.sh

@@ -0,0 +1 @@
+tar xvfj files.tbz2 -C /

src/paks/openldap/install.sh

@@ -0,0 +1 @@
+tar xvfj files.tbz2 -C /

src/paks/vsftpd/install.sh

@@ -0,0 +1 @@
+tar xvfj files.tbz2 -C /

src/scripts/vpn-watch

@@ -42,7 +42,7 @@ case "$1" in
 			exit 1
 		fi
 
-		if /bin/test -p /var/run/$(basename $0); then
+		if /usr/bin/test -p /var/run/$(basename $0); then
 			if ps --no-heading axw | grep -v 'grep' | grep -q "$(basename $0) conn: "; then
 				echo "Error: use '$(basename $0) stop' please; exit." >&2
 				exit 1