From 81756d0089c849ee721ed9fff76671b6c654b183 Mon Sep 17 00:00:00 2001 From: jow Date: Sat, 18 Dec 2010 21:44:36 +0000 Subject: [PATCH] [backfire] merge r24686 and r24688 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24689 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/download.mk | 2 +- scripts/download.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/download.mk b/include/download.mk index 9dd26a744..cf14cde1d 100644 --- 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 fe27df5e8..633a4f6f7 100755 --- 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;