From 9f3629f9c56dd33a4adf30554d5449ce5f3d17fc Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Mon, 27 Feb 2023 04:56:47 -0500 Subject: [PATCH] Add MbedTLS 2.28.2, compat Julia 1.9 (#6323) * Add MbedTLS 2.28.2, compat Julia 1.9 * Fix typo * Use GitSource instead of ArchiveSource --- M/MbedTLS/MbedTLS@2.28.2/build_tarballs.jl | 6 ++++++ ...Remove-flags-not-supported-by-ranlib.patch | 1 + M/MbedTLS/common.jl | 20 ++++++++++++++----- 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 M/MbedTLS/MbedTLS@2.28.2/build_tarballs.jl create mode 120000 M/MbedTLS/MbedTLS@2.28.2/bundled/patches/conditional/0001-Remove-flags-not-supported-by-ranlib.patch diff --git a/M/MbedTLS/MbedTLS@2.28.2/build_tarballs.jl b/M/MbedTLS/MbedTLS@2.28.2/build_tarballs.jl new file mode 100644 index 0000000000..2b18795395 --- /dev/null +++ b/M/MbedTLS/MbedTLS@2.28.2/build_tarballs.jl @@ -0,0 +1,6 @@ +version = v"2.28.2" +include("../common.jl") + +build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.9") + +# Trigger Build! diff --git a/M/MbedTLS/MbedTLS@2.28.2/bundled/patches/conditional/0001-Remove-flags-not-supported-by-ranlib.patch b/M/MbedTLS/MbedTLS@2.28.2/bundled/patches/conditional/0001-Remove-flags-not-supported-by-ranlib.patch new file mode 120000 index 0000000000..2fa999ea74 --- /dev/null +++ b/M/MbedTLS/MbedTLS@2.28.2/bundled/patches/conditional/0001-Remove-flags-not-supported-by-ranlib.patch @@ -0,0 +1 @@ +../../../../MbedTLS@2.24.0/bundled/patches/conditional/0001-Remove-flags-not-supported-by-ranlib.patch \ No newline at end of file diff --git a/M/MbedTLS/common.jl b/M/MbedTLS/common.jl index 1b9801a29f..fb76f50c11 100644 --- a/M/MbedTLS/common.jl +++ b/M/MbedTLS/common.jl @@ -5,30 +5,40 @@ name = "MbedTLS" # Collection of sources required to build MbedTLS sources_by_version = Dict( v"2.24.0" => [ - GitSource("https://github.com/ARMmbed/mbedtls.git", + GitSource("https://github.com/Mbed-TLS/mbedtls.git", "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8"), DirectorySource("./bundled"; follow_symlinks=true), ], v"2.25.0" => [ - GitSource("https://github.com/ARMmbed/mbedtls.git", + GitSource("https://github.com/Mbed-TLS/mbedtls.git", "1c54b5410fd48d6bcada97e30cac417c5c7eea67"), DirectorySource("./bundled"; follow_symlinks=true), ], v"2.26.0" => [ - GitSource("https://github.com/ARMmbed/mbedtls.git", + GitSource("https://github.com/Mbed-TLS/mbedtls.git", "e483a77c85e1f9c1dd2eb1c5a8f552d2617fe400"), DirectorySource("./bundled"; follow_symlinks=true), ], v"2.27.0" => [ - GitSource("https://github.com/ARMmbed/mbedtls.git", + GitSource("https://github.com/Mbed-TLS/mbedtls.git", "f71e2878084126737cc39083e1e15afc459bd93d"), DirectorySource("./bundled"; follow_symlinks=true), ], v"2.28.0" => [ - GitSource("https://github.com/ARMmbed/mbedtls.git", + GitSource("https://github.com/Mbed-TLS/mbedtls.git", "8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0"), DirectorySource("./bundled"; follow_symlinks=true), ], + v"2.28.1" => [ + GitSource("https://github.com/Mbed-TLS/mbedtls.git", + "dd79db10014d85b26d11fe57218431f2e5ede6f2"), + DirectorySource("./bundled"; follow_symlinks=true), + ], + v"2.28.2" => [ + GitSource("https://github.com/Mbed-TLS/mbedtls.git", + "89f040a5c938985c5f30728baed21e49d0846a53"), + DirectorySource("./bundled"; follow_symlinks=true), + ], ) sources = sources_by_version[version]