[backfire] merge r24686 and r24688

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24689 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/download.mk b/include/download.mk
index 9dd26a7447232b505e776629ebf3c490b05e8ed2..cf14cde1dde240ea809dbf29c8aefc7351eafebf 100644 (file)
--- a/include/download.mk
+++ b/include/download.mk
@@ -11,7 +11,7 @@ DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
 define dl_method
 $(strip \
   $(if $(2),$(2), \
-    $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \
+    $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% https://% file://%,$(1)),default, \
       $(if $(filter git://%,$(1)),git, \
         $(if $(filter svn://%,$(1)),svn, \
           $(if $(filter cvs://%,$(1)),cvs, \

diff --git a/scripts/download.pl b/scripts/download.pl
index fe27df5e8fbabbc32b391b33d85afeecf4001304..633a4f6f7dbbb83f4fd6c970c73f4f17f95e6e84 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -77,7 +77,7 @@ sub download
                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;