From a57ea0086c41343945c18455fe609002906df326 Mon Sep 17 00:00:00 2001 From: Jacob Quinn Date: Wed, 7 Aug 2019 06:36:33 -0600 Subject: [PATCH 1/5] Add MbedTLS as stdlib --- base/sysimg.jl | 1 + .../md5 | 1 + .../sha512 | 1 + stdlib/Makefile | 5 ++++- stdlib/MbedTLS.version | 2 ++ test/precompile.jl | 2 +- 6 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 deps/checksums/MbedTLS-4b57d240ac5de9643c4ee274151d3394ac426c91.tar.gz/md5 create mode 100644 deps/checksums/MbedTLS-4b57d240ac5de9643c4ee274151d3394ac426c91.tar.gz/sha512 create mode 100644 stdlib/MbedTLS.version diff --git a/base/sysimg.jl b/base/sysimg.jl index 27b25069cf11d..e71975190c621 100644 --- a/base/sysimg.jl +++ b/base/sysimg.jl @@ -29,6 +29,7 @@ let :Libdl, :Printf, :Markdown, + :MbedTLS, :LibGit2, :Logging, :Sockets, diff --git a/deps/checksums/MbedTLS-4b57d240ac5de9643c4ee274151d3394ac426c91.tar.gz/md5 b/deps/checksums/MbedTLS-4b57d240ac5de9643c4ee274151d3394ac426c91.tar.gz/md5 new file mode 100644 index 0000000000000..19fac13679ab1 --- /dev/null +++ b/deps/checksums/MbedTLS-4b57d240ac5de9643c4ee274151d3394ac426c91.tar.gz/md5 @@ -0,0 +1 @@ +4808623489c967ffec5b98499592854b diff --git a/deps/checksums/MbedTLS-4b57d240ac5de9643c4ee274151d3394ac426c91.tar.gz/sha512 b/deps/checksums/MbedTLS-4b57d240ac5de9643c4ee274151d3394ac426c91.tar.gz/sha512 new file mode 100644 index 0000000000000..d712e8f289645 --- /dev/null +++ b/deps/checksums/MbedTLS-4b57d240ac5de9643c4ee274151d3394ac426c91.tar.gz/sha512 @@ -0,0 +1 @@ +3b5296f58128016e246628e7b6aff08442644e84347385a780814ea4df8990144220768ee762e5155ecc7cd2b93ee633b9939b3288ccad6477cd73233cd12b7f diff --git a/stdlib/Makefile b/stdlib/Makefile index a08a672b22422..7259bb6988420 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -18,10 +18,13 @@ STDLIBS = Base64 CRC32c Dates DelimitedFiles Distributed FileWatching \ Future InteractiveUtils Libdl LibGit2 LinearAlgebra Logging \ Markdown Mmap Printf Profile Random REPL Serialization SHA \ SharedArrays Sockets SparseArrays Statistics SuiteSparse Test Unicode UUIDs -STDLIBS_EXT = Pkg +STDLIBS_EXT = Pkg MbedTLS PKG_GIT_URL := git://github.com/JuliaLang/Pkg.jl.git PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1 +MBEDTLS_GIT_URL := git://github.com/JuliaWeb/MbedTLS.jl.git +MBEDTLS_TAR_URL = https://api.github.com/repos/JuliaWeb/MbedTLS.jl/tarball/$1 + $(foreach module, $(STDLIBS_EXT), $(eval $(call stdlib-external,$(module),$(shell echo $(module) | tr a-z A-Z)))) # Generate symlinks to all stdlibs at usr/share/julia/stdlib/vX.Y/ diff --git a/stdlib/MbedTLS.version b/stdlib/MbedTLS.version new file mode 100644 index 0000000000000..3829ff4fad690 --- /dev/null +++ b/stdlib/MbedTLS.version @@ -0,0 +1,2 @@ +MBEDTLS_BRANCH = jq/stdlib +MBEDTLS_SHA1 = 4b57d240ac5de9643c4ee274151d3394ac426c91 diff --git a/test/precompile.jl b/test/precompile.jl index 138adf4a81556..d4016fbfacfd9 100644 --- a/test/precompile.jl +++ b/test/precompile.jl @@ -253,7 +253,7 @@ try Base.PkgId(m) => Base.module_build_id(m) end for s in [:Base64, :CRC32c, :Dates, :DelimitedFiles, :Distributed, :FileWatching, :Markdown, - :Future, :Libdl, :LinearAlgebra, :Logging, :Mmap, :Printf, + :Future, :Libdl, :LinearAlgebra, :Logging, :Mmap, :Printf, :MbedTLS, :Profile, :Random, :Serialization, :SharedArrays, :SparseArrays, :SuiteSparse, :Test, :Unicode, :REPL, :InteractiveUtils, :Pkg, :LibGit2, :SHA, :UUIDs, :Sockets, :Statistics, ]), From d175999f4322b2c4e032227aee63269edb83008f Mon Sep 17 00:00:00 2001 From: Jacob Quinn Date: Wed, 4 Sep 2019 09:00:36 -0600 Subject: [PATCH 2/5] Bump version --- stdlib/MbedTLS.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/MbedTLS.version b/stdlib/MbedTLS.version index 3829ff4fad690..fb4ab630e65f6 100644 --- a/stdlib/MbedTLS.version +++ b/stdlib/MbedTLS.version @@ -1,2 +1,2 @@ MBEDTLS_BRANCH = jq/stdlib -MBEDTLS_SHA1 = 4b57d240ac5de9643c4ee274151d3394ac426c91 +MBEDTLS_SHA1 = 86dfd77a9521d2e0ba1e4a9010f0de443237d4df From e6e561980646b5170a9704039a155c617f138d66 Mon Sep 17 00:00:00 2001 From: Jacob Quinn Date: Fri, 8 Nov 2019 14:34:37 -0700 Subject: [PATCH 3/5] Change url from JuliaWeb to JuliaLang --- stdlib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/Makefile b/stdlib/Makefile index 7259bb6988420..d1ae56d9af75b 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -22,8 +22,8 @@ STDLIBS_EXT = Pkg MbedTLS PKG_GIT_URL := git://github.com/JuliaLang/Pkg.jl.git PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1 -MBEDTLS_GIT_URL := git://github.com/JuliaWeb/MbedTLS.jl.git -MBEDTLS_TAR_URL = https://api.github.com/repos/JuliaWeb/MbedTLS.jl/tarball/$1 +MBEDTLS_GIT_URL := git://github.com/JuliaLang/MbedTLS.jl.git +MBEDTLS_TAR_URL = https://api.github.com/repos/JuliaLang/MbedTLS.jl/tarball/$1 $(foreach module, $(STDLIBS_EXT), $(eval $(call stdlib-external,$(module),$(shell echo $(module) | tr a-z A-Z)))) From 1f228dddb24c7e69c531b14e60e5feecf9bd14f2 Mon Sep 17 00:00:00 2001 From: Jacob Quinn Date: Fri, 8 Nov 2019 14:38:01 -0700 Subject: [PATCH 4/5] Remove MbedTLS stdlib from sysimg --- base/sysimg.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/base/sysimg.jl b/base/sysimg.jl index e71975190c621..27b25069cf11d 100644 --- a/base/sysimg.jl +++ b/base/sysimg.jl @@ -29,7 +29,6 @@ let :Libdl, :Printf, :Markdown, - :MbedTLS, :LibGit2, :Logging, :Sockets, From 59b4a6cdeac5bb1058293cd2d5f2fafd888a8bce Mon Sep 17 00:00:00 2001 From: Jacob Quinn Date: Fri, 8 Nov 2019 15:44:20 -0700 Subject: [PATCH 5/5] Remove MbedTLS from precompile.jl --- test/precompile.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/precompile.jl b/test/precompile.jl index d4016fbfacfd9..138adf4a81556 100644 --- a/test/precompile.jl +++ b/test/precompile.jl @@ -253,7 +253,7 @@ try Base.PkgId(m) => Base.module_build_id(m) end for s in [:Base64, :CRC32c, :Dates, :DelimitedFiles, :Distributed, :FileWatching, :Markdown, - :Future, :Libdl, :LinearAlgebra, :Logging, :Mmap, :Printf, :MbedTLS, + :Future, :Libdl, :LinearAlgebra, :Logging, :Mmap, :Printf, :Profile, :Random, :Serialization, :SharedArrays, :SparseArrays, :SuiteSparse, :Test, :Unicode, :REPL, :InteractiveUtils, :Pkg, :LibGit2, :SHA, :UUIDs, :Sockets, :Statistics, ]),