Use https for downloads of 7z and NSIS and also add checksums. (Julia…

…Lang#31902) Use https for downloads of 7z and NSIS and also add checksums.
xuanxu · May 6, 2019 · f189ae4 · f189ae4
2 parents 9b5fea5 + 3736c1a
commit f189ae4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -593,17 +593,17 @@ endif
 endif
 ifneq (,$(filter $(ARCH), i386 i486 i586 i686))
 	cd $(JULIAHOME)/dist-extras && \
-	$(JLDOWNLOAD) http://downloads.sourceforge.net/sevenzip/7z1900.exe && \
+	$(JLDOWNLOAD) https://sourceforge.net/projects/sevenzip/files/7-Zip/19.00/7z1900.exe && \
+	$(JLCHECKSUM) 7z1900.exe && \
 	7z x -y 7z1900.exe 7z.exe 7z.dll && \
 	../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_Leap_42.2 \
 		"mingw32-libexpat1 mingw32-zlib1" && \
 	cp usr/i686-w64-mingw32/sys-root/mingw/bin/*.dll .
 else ifeq ($(ARCH),x86_64)
 	cd $(JULIAHOME)/dist-extras && \
-	$(JLDOWNLOAD) 7z1900-x64.msi http://downloads.sourceforge.net/sevenzip/7z1900-x64.msi && \
-	7z x -y 7z1900-x64.msi _7z.exe _7z.dll && \
-	mv _7z.dll 7z.dll && \
-	mv _7z.exe 7z.exe && \
+	$(JLDOWNLOAD) https://downloads.sourceforge.net/project/sevenzip/7-Zip/19.00/7z1900-x64.exe && \
+	$(JLCHECKSUM) 7z1900-x64.exe && \
+	7z x -y 7z1900-x64.exe 7z.exe 7z.dll && \
 	../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_Leap_42.2 \
 		"mingw64-libexpat1 mingw64-zlib1" && \
 	cp usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll .
@@ -613,6 +613,7 @@ endif
 	cd $(JULIAHOME)/dist-extras && \
 	$(JLDOWNLOAD) http://downloads.sourceforge.net/sevenzip/7z1900-extra.7z && \
 	$(JLDOWNLOAD) https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/unsis/nsis-2.46.5-Unicode-setup.exe && \
+	$(JLCHECKSUM) nsis-2.46.5-Unicode-setup.exe && \
 	chmod a+x 7z.exe && \
 	chmod a+x 7z.dll && \
 	$(call spawn,./7z.exe) x -y -onsis nsis-2.46.5-Unicode-setup.exe && \

diff --git a/deps/checksums/7z1900-x64.exe/md5 b/deps/checksums/7z1900-x64.exe/md5
@@ -0,0 +1 @@
+d7b20f933be6cdae41efbe75548eba5f
diff --git a/deps/checksums/7z1900-x64.exe/sha512 b/deps/checksums/7z1900-x64.exe/sha512
@@ -0,0 +1 @@
+af8f38679e16c996ffac152cac49369cf4b609abbd2cad07f49a114a82c6b5e564be29630c0fd2418110cf1a3d0ef3c9cc12f9164a69a575c91d9b98ce0df1a9
diff --git a/deps/checksums/7z1900.exe/md5 b/deps/checksums/7z1900.exe/md5
@@ -0,0 +1 @@
+fabe184f6721e640474e1497c69ffc98
diff --git a/deps/checksums/7z1900.exe/sha512 b/deps/checksums/7z1900.exe/sha512
@@ -0,0 +1 @@
+2924fd60f5dd636f643b68d402b65c2bfab5536122aa688ebba5ae142c7d04ce8b1c8e078f54db8adadce9d5c6fa74c0794604ecc16a4c5489f9ca70a6d9e1c4
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		af8f38679e16c996ffac152cac49369cf4b609abbd2cad07f49a114a82c6b5e564be29630c0fd2418110cf1a3d0ef3c9cc12f9164a69a575c91d9b98ce0df1a9
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		2924fd60f5dd636f643b68d402b65c2bfab5536122aa688ebba5ae142c7d04ce8b1c8e078f54db8adadce9d5c6fa74c0794604ecc16a4c5489f9ca70a6d9e1c4