Merge pull request JuliaLang#19135 from JuliaLang/tk/depupgrades

upgrade mbedtls to 2.5. curl to 7.54.1
antoine-levitt · Jul 12, 2017 · 5eb4112 · 5eb4112
2 parents ba21d1c + 41fb6de
commit 5eb4112
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 25 deletions.
diff --git a/deps/Versions.make b/deps/Versions.make
@@ -9,5 +9,5 @@ OSXUNWIND_VER = 0.0.3
 GMP_VER = 6.1.2
 MPFR_VER = 3.1.5
 PATCHELF_VER = 0.9
-MBEDTLS_VER = 2.3.0
-CURL_VER = 7.53.1
+MBEDTLS_VER = 2.5.1
+CURL_VER = 7.54.1
diff --git a/deps/checksums/curl-7.53.1.tar.bz2/md5 b/deps/checksums/curl-7.53.1.tar.bz2/md5
diff --git a/deps/checksums/curl-7.53.1.tar.bz2/sha512 b/deps/checksums/curl-7.53.1.tar.bz2/sha512
diff --git a/deps/checksums/curl-7.54.1.tar.bz2/md5 b/deps/checksums/curl-7.54.1.tar.bz2/md5
@@ -0,0 +1 @@
+6b6eb722f512e7a24855ff084f54fe55
diff --git a/deps/checksums/curl-7.54.1.tar.bz2/sha512 b/deps/checksums/curl-7.54.1.tar.bz2/sha512
@@ -0,0 +1 @@
+eb9639677f0ca1521ca631c520ab83ad071c52b31690e5e7f31546f6a44b2f11d1bb62282056cffb570eb290bf1e7830e87cb536295ac6a54a904663e795f2da
diff --git a/deps/checksums/mbedtls-2.3.0-apache.tgz/md5 b/deps/checksums/mbedtls-2.3.0-apache.tgz/md5
diff --git a/deps/checksums/mbedtls-2.3.0-apache.tgz/sha512 b/deps/checksums/mbedtls-2.3.0-apache.tgz/sha512
diff --git a/deps/checksums/mbedtls-2.3.0-gpl.tgz/md5 b/deps/checksums/mbedtls-2.3.0-gpl.tgz/md5
diff --git a/deps/checksums/mbedtls-2.3.0-gpl.tgz/sha512 b/deps/checksums/mbedtls-2.3.0-gpl.tgz/sha512
diff --git a/deps/checksums/mbedtls-2.5.1-apache.tgz/md5 b/deps/checksums/mbedtls-2.5.1-apache.tgz/md5
@@ -0,0 +1 @@
+1299f38583cb4f93c78c99c14a8c913f
diff --git a/deps/checksums/mbedtls-2.5.1-apache.tgz/sha512 b/deps/checksums/mbedtls-2.5.1-apache.tgz/sha512
@@ -0,0 +1 @@
+8bde8f3d1d025a13c2a20fa8d2a4b9711adf0bb32d2226f1dd898dda3f3337c929b3d60e53684fbcf8094142568dd1d780353a92b94cb15c28c31c6d0542e6fc
diff --git a/deps/checksums/mbedtls-2.5.1-gpl.tgz/md5 b/deps/checksums/mbedtls-2.5.1-gpl.tgz/md5
@@ -0,0 +1 @@
+313f637f65b5f6d74d45310482a9c84f
diff --git a/deps/checksums/mbedtls-2.5.1-gpl.tgz/sha512 b/deps/checksums/mbedtls-2.5.1-gpl.tgz/sha512
@@ -0,0 +1 @@
+fa05a5f61d9d79bc74e47badc89f68f8b6fd228537f10706cbdacc03b02455171b88121b3c1c5f56dff648c39ff88936413a9c5eea0dd0e046fb1f889e173c63
diff --git a/deps/mbedtls.mk b/deps/mbedtls.mk
@@ -29,11 +29,6 @@ $(SRCDIR)/srccache/$(MBEDTLS_SRC)/source-extracted: $(SRCDIR)/srccache/$(MBEDTLS
  touch -c $(SRCDIR)/srccache/$(MBEDTLS_SRC)/CMakeLists.txt # old target
  echo 1 > $@
 
-$(SRCDIR)/srccache/$(MBEDTLS_SRC)/mbedtls-ssl.h.patch-applied: $(SRCDIR)/srccache/$(MBEDTLS_SRC)/source-extracted
- cd $(SRCDIR)/srccache/$(MBEDTLS_SRC)/include/mbedtls && patch -p0 -f < $(SRCDIR)/patches/mbedtls-ssl.h.patch
- echo 1 > $@
-$(BUILDDIR)/$(MBEDTLS_SRC)/build-configured: $(SRCDIR)/srccache/$(MBEDTLS_SRC)/mbedtls-ssl.h.patch-applied
-
 $(BUILDDIR)/$(MBEDTLS_SRC)/build-configured: $(SRCDIR)/srccache/$(MBEDTLS_SRC)/source-extracted
  mkdir -p $(dir $@)
  cd $(dir $@) && \

diff --git a/deps/patches/mbedtls-ssl.h.patch b/deps/patches/mbedtls-ssl.h.patch