[backfire] uhttpd: merge r28792

[openwrt-10.03/.git] / scripts / download.pl

diff --git a/scripts/download.pl b/scripts/download.pl
index e63595497f79591a1e0b76fda80424cc11e7c429..50ecfc696659ea63b1974259e03dddfa6b5411d1 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -32,7 +32,8 @@ sub localmirrors {
                while (<CONFIG>) {
                        /^CONFIG_LOCALMIRROR="(.+)"/ and do {
                                chomp;
-                               push @mlist, $1;
+                               my @local_mirrors = split(/;/, $1);
+                               push @mlist, @local_mirrors;
                        };
                }
                close CONFIG;
@@ -65,12 +66,18 @@ sub download
        if( $mirror =~ /^file:\/\// ) {
                my $cache = $mirror;
                $cache =~ s/file:\/\///g;
-               print "Checking local cache: $cache\n";
-               system("mkdir -p $target/");
-               system("cp -f $cache/$filename $target/$filename.dl") == 0 or return;
+               if(system("test -d $cache")) {
+                       print STDERR "Wrong local cache directory -$cache-.\n";
+                       cleanup();
+                       return;
+               }
+               if(! -d $target) {
+                       system("mkdir -p $target/");
+               }
+               system("cp -vf $cache/$filename $target/$filename.dl") == 0 or return;
                system("$md5cmd $target/$filename.dl > \"$target/$filename.md5sum\" ") == 0 or return;
        } else {
-               open WGET, "wget -t5 --timeout=20 $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
+               open WGET, "wget -t5 --timeout=20 --no-check-certificate $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
                open MD5SUM, "| $md5cmd > \"$target/$filename.md5sum\"" or die "Cannot launch md5sum.\n";
                open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n";
                my $buffer;
@@ -128,12 +135,22 @@ foreach my $mirror (@ARGV) {
                push @mirrors, "ftp://ftp.leo.org/pub/comp/os/unix/gnu/$1";
                push @mirrors, "ftp://ftp.digex.net/pub/gnu/$1";
        } elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {
-               push @mirrors, "ftp://ftp.all.kernel.org/pub/$1";
-               push @mirrors, "http://ftp.all.kernel.org/pub/$1";
-               push @mirrors, "ftp://ftp.de.kernel.org/pub/$1";
-               push @mirrors, "http://ftp.de.kernel.org/pub/$1";
-               push @mirrors, "ftp://ftp.fr.kernel.org/pub/$1";
-               push @mirrors, "http://ftp.fr.kernel.org/pub/$1";
+               my @extra = ( $1 );
+               if ($filename =~ /linux-\d+\.\d+\.\d+-rc/) {
+                       push @extra, "$extra[0]/testing";
+               } elsif ($filename =~ /linux-(\d+\.\d+\.\d+)/) {
+                       push @extra, "$extra[0]/longterm/v$1";
+               }               
+               foreach my $dir (@extra) {
+                       push @mirrors, "ftp://ftp.geo.kernel.org/pub/$dir";
+                       push @mirrors, "http://ftp.geo.kernel.org/pub/$dir";
+                       push @mirrors, "ftp://ftp.all.kernel.org/pub/$dir";
+                       push @mirrors, "http://ftp.all.kernel.org/pub/$dir";
+                       push @mirrors, "ftp://ftp.de.kernel.org/pub/$dir";
+                       push @mirrors, "http://ftp.de.kernel.org/pub/$dir";
+                       push @mirrors, "ftp://ftp.fr.kernel.org/pub/$dir";
+                       push @mirrors, "http://ftp.fr.kernel.org/pub/$dir";
+               }
     } elsif ($mirror =~ /^\@GNOME\/(.+)$/) {
                push @mirrors, "http://ftp.gnome.org/pub/GNOME/sources/$1";
                push @mirrors, "http://ftp.unina.it/pub/linux/GNOME/sources/$1";