Skip to content

Commit

Permalink
Update Mozilla CA certificate store to latest (03-07-2018) for libgit…
Browse files Browse the repository at this point in the history
… 2 SSL. (#26983)

Update Mozilla CA certificate store to latest (06-20-2018) for libgit2 SSL.

* Use MOZILLA_CACERT_VERSION to obtain specific version of Mozilla's CA certificate store from the curl project.
  • Loading branch information
mikhail-j authored and vchuravy committed Jun 22, 2018
1 parent 218dc82 commit 5886a8c
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 6 deletions.
5 changes: 5 additions & 0 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ SOMAJOR := $(JULIA_MAJOR_VERSION)
SOMINOR := $(JULIA_MINOR_VERSION)
endif

# Specify the version of the Mozilla CA Certificate Store to obtain.
# The versions of cacert.pem are identified by the date (YYYY-MM-DD) of their changes.
# See https://curl.haxx.se/docs/caextract.html for more details.
MOZILLA_CACERT_VERSION := 2018-06-20

ifneq ($(NO_GIT), 1)
JULIA_COMMIT := $(shell git rev-parse --short=10 HEAD)
else
Expand Down
1 change: 0 additions & 1 deletion deps/checksums/cacert-2018-01-17.pem/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/cacert-2018-01-17.pem/sha512

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/cacert-2018-06-20.pem/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
247294da2f913ad84609b3bdd85c16f3
1 change: 1 addition & 0 deletions deps/checksums/cacert-2018-06-20.pem/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f0e369cad84d2d0157d68dec9d5cb2fab0d0350952716f3273a861db9e31fc3661efc7958cd53201cdc421475df8bfc66c0acbfe293d55835b60dbd72f8da2e6
12 changes: 8 additions & 4 deletions deps/libgit2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,15 @@ $(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/so
patch -p1 -f < $(SRCDIR)/patches/libgit2-agent-nonfatal.patch
echo 1 > $@

$(build_datarootdir)/julia/cert.pem:
$(JLDOWNLOAD) $(shell pwd)/cacert-2018-01-17.pem https://curl.haxx.se/ca/cacert-2018-01-17.pem
$(JLCHECKSUM) $(shell pwd)/cacert-2018-01-17.pem
cacert-$(MOZILLA_CACERT_VERSION).pem:
$(JLDOWNLOAD) $@ https://curl.haxx.se/ca/cacert-$(MOZILLA_CACERT_VERSION).pem
$(JLCHECKSUM) $@

libgit2-install-mozilla-cacert: cacert-$(MOZILLA_CACERT_VERSION).pem
mkdir -p $(build_datarootdir)/julia
mv $(shell pwd)/cacert-2018-01-17.pem $@
cp $< $(build_datarootdir)/julia/cert.pem

$(build_datarootdir)/julia/cert.pem: libgit2-install-mozilla-cacert

$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: \
$(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied \
Expand Down

0 comments on commit 5886a8c

Please sign in to comment.