Add chaostable from #1187, also enable netfilter modules for ixp4xx.

[openwrt.git] / scripts / download.pl

diff --git a/scripts/download.pl b/scripts/download.pl
index c29b5fe..859e6c8 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -35,8 +35,11 @@ chomp $md5cmd;
 sub download
 {
        my $mirror = shift;
-
-       open WGET, "wget -t1 --timeout=20 -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
+       my $options = $ENV{WGET_OPTIONS};
+       $options or $options = "";
+       
+       $mirror =~ s/\/$//;
+       open WGET, "wget -t1 --timeout=20 $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;
@@ -77,19 +80,10 @@ sub cleanup
 
 foreach my $mirror (@ARGV) {
        if ($mirror =~ /^\@SF\/(.+)$/) {
-               my $sfpath = $1;
-               open SF, "wget -t1 -q -O- 'http://prdownloads.sourceforge.net/$sfpath/$filename' |";
-               while (<SF>) {
-                       /RADIO NAME=use_default VALUE=(\w+) OnClick="form\.submit\(\)">/ or
-                       /type="radio" name="use_default" value="(\w+)" onclick="form\.submit\(\)"\/>/ and do {
-                               push @mirrors, "http://$1.dl.sourceforge.net/sourceforge/$sfpath";
-                       };
-                       /<a href="\/.+\?use_mirror=(\w+)"><b>Download/ and do {
-                               push @mirrors, "http://$1.dl.sourceforge.net/sourceforge/$sfpath";
-                       };
+               # give sourceforge a few more tries, because it redirects to different mirrors
+               for (1 .. 5) {
+                       push @mirrors, "http://downloads.sourceforge.net/$1";
                }
-               push @mirrors, "http://dl.sourceforge.net/sourceforge/$sfpath";
-               close SF;
        } elsif ($mirror =~ /^\@GNU\/(.+)$/) {
                my $gnupath = $1;
                push @mirrors, "ftp://ftp.gnu.org/gnu/$gnupath";
@@ -105,9 +99,9 @@ foreach my $mirror (@ARGV) {
        }
 }
 
-#push @mirrors, 'http://mirror1.openwrt.org/';
+#push @mirrors, 'http://mirror1.openwrt.org';
 push @mirrors, 'http://mirror2.openwrt.org/sources';
-push @mirrors, 'http://downloads.openwrt.org/sources/';
+push @mirrors, 'http://downloads.openwrt.org/sources';
 
 while (!$ok) {
        my $mirror = shift @mirrors;