diff options
author | Bryan Quigley <gquigs@gmail.com> | 2017-02-24 11:05:48 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2017-03-03 14:16:03 +0000 |
commit | faef35d8653003786f9a0ea2ae1a2330fd15d632 (patch) | |
tree | ab93ca16d245fa002da5e13526cd54d38d506d45 /Makefile.fetch | |
parent | bb2a3df2d5b5a01aa58fb3567686e50762186036 (diff) |
Move file download verification from md5sum to sha256sum
This leaves all the md5sum parts in place for now, but switches
to using sha256sum. Tries both shasum -a 256 and sha256sum.
Change-Id: I393d0dde56521f6e9e76f3d5a8d15c6c830fd683
Reviewed-on: https://gerrit.libreoffice.org/34633
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'Makefile.fetch')
-rw-r--r-- | Makefile.fetch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index d2c073ebbc1e..3091c5e4b1e0 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -21,9 +21,9 @@ endef endif -ifneq (,$(MD5SUM)) +ifneq (,$(SHA256SUM)) define fetch_Download__checksum_command -&& SUM=`$(MD5SUM) $1 | sed "s/ .*//"` \ +&& SUM=`$(SHA256SUM) $1 | sed "s/ .*//"` \ && if test "$$SUM" != "$2"; then \ echo ERROR: expected checksum for $1 is $2 2>&1 | tee -a $(fetch_LOGFILE); \ false; \ @@ -35,7 +35,7 @@ fetch_Download__checksum_command := endif -# fetch__Download_item url tarball-name md5sum +# fetch__Download_item url tarball-name sha256sum define fetch__Download_item $(if $(wildcard $(TARFILE_LOCATION)/$2),, \ cd $(TARFILE_LOCATION)/tmp \ @@ -52,7 +52,7 @@ $(filter 32,$(words $(shell echo $(1) | sed -e 's/./& /g'))) endef define fetch_Download__subst_var -$(subst _DLL,_MD5SUM,$(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(subst _JAR,_MD5SUM,$(1))))) +$(subst _DLL,_SHA256SUM,$(subst _TARBALL,_SHA256SUM,$(subst _PACK,_SHA256SUM,$(subst _JAR,_SHA256SUM,$(1))))) endef # fetch_Download_item url variable-name |