curl: add v8.8.0 (#44622)

Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>

2 files changed, 20 insertions, 94 deletions

diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py
index c3d46c6634..b1565f06e4 100644
--- a/var/spack/repos/builtin/packages/curl/package.py
+++ b/var/spack/repos/builtin/packages/curl/package.py
@@ -32,6 +32,7 @@ class Curl(NMakePackage, AutotoolsPackage):
 
     license("curl")
 
+    version("8.8.0", sha256="40d3792d38cfa244d8f692974a567e9a5f3387c547579f1124e95ea2a1020d0d")
     version("8.7.1", sha256="05bbd2b698e9cfbab477c33aa5e99b4975501835a41b7ca6ca71de03d8849e76")
     version("8.6.0", sha256="b4785f2d8877fa92c0e45d7155cf8cc6750dbda961f4b1a45bcbec990cf2fa9b")
     version("8.4.0", sha256="e5250581a9c032b1b6ed3cf2f9c114c811fc41881069e9892d115cc73f9e88c6")
@@ -112,8 +113,12 @@ class Curl(NMakePackage, AutotoolsPackage):
     depends_on("pkgconfig", type="build", when="platform=freebsd")
 
     depends_on("gnutls", when="tls=gnutls")
-    depends_on("mbedtls@2: +pic", when="@7.79: tls=mbedtls")
-    depends_on("mbedtls@:2 +pic", when="@:7.78 tls=mbedtls")
+
+    with when("tls=mbedtls"):
+        depends_on("mbedtls@:2 +pic", when="@:7.78")
+        depends_on("mbedtls@2: +pic", when="@7.79:")
+        depends_on("mbedtls@3.6.0: +pic", when="@8.8.0:")
+
     depends_on("nss", when="tls=nss")
 
     with when("tls=openssl"):
diff --git a/var/spack/repos/builtin/packages/mbedtls/package.py b/var/spack/repos/builtin/packages/mbedtls/package.py
index 7f0bbc1000..73f463239d 100644
--- a/var/spack/repos/builtin/packages/mbedtls/package.py
+++ b/var/spack/repos/builtin/packages/mbedtls/package.py
@@ -14,112 +14,28 @@ class Mbedtls(MakefilePackage):
     """
 
     homepage = "https://tls.mbed.org"
-    url = "https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.2.1.tar.gz"
+    url = "https://github.com/Mbed-TLS/mbedtls/releases/download/v3.6.0/mbedtls-3.6.0.tar.bz2"
+
     maintainers("haampie")
 
     license("Apache-2.0 OR GPL-2.0-or-later")
 
     # version 3.x
+    version("3.6.0", sha256="3ecf94fcfdaacafb757786a01b7538a61750ebd85c4b024f56ff8ba1490fcd38")
     version("3.3.0", sha256="a22ff38512697b9cd8472faa2ea2d35e320657f6d268def3a64765548b81c3ec")
-    version(
-        "3.2.1",
-        sha256="5850089672560eeaca03dc36678ee8573bb48ef6e38c94f5ce349af60c16da33",
-        deprecated=True,
-    )
-    version(
-        "3.1.0",
-        sha256="64d01a3b22b91cf3a25630257f268f11bc7bfa37981ae6d397802dd4ccec4690",
-        deprecated=True,
-    )
-    version(
-        "3.0.0",
-        sha256="377d376919be19f07c7e7adeeded088a525be40353f6d938a78e4f986bce2ae0",
-        deprecated=True,
-    )
 
     # version 2.x
+    version("2.28.8", sha256="241c68402cef653e586be3ce28d57da24598eb0df13fcdea9d99bfce58717132")
     version("2.28.2", sha256="1db6d4196178fa9f8264bef5940611cd9febcd5d54ec05f52f1e8400f792b5a4")
-    version(
-        "2.28.1",
-        sha256="82ff5fda18ecbdee9053bdbeed6059c89e487f3024227131657d4c4536735ed1",
-        deprecated=True,
-    )
-    version(
-        "2.28.0",
-        sha256="f644248f23cf04315cf9bb58d88c4c9471c16ca0533ecf33f86fb7749a3e5fa6",
-        deprecated=True,
-    )
-    version(
-        "2.27.0",
-        sha256="4f6a43f06ded62aa20ef582436a39b65902e1126cbbe2fb17f394e9e9a552767",
-        deprecated=True,
-    )
+    version("2.7.19", sha256="3da12b1cebe1a25da8365d5349f67db514aefcaa75e26082d7cb2fa3ce9608aa")
+
+    # deprecated versions
+    # required by julia@1.6:1.7
     version(
         "2.24.0",
         sha256="b5a779b5f36d5fc4cba55faa410685f89128702423ad07b36c5665441a06a5f3",
         deprecated=True,
     )
-    version(
-        "2.16.12",
-        sha256="0afb4a4ce5b771f2fb86daee786362fbe48285f05b73cd205f46a224ec031783",
-        deprecated=True,
-    )
-    version(
-        "2.16.11",
-        sha256="51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701",
-        deprecated=True,
-    )
-    version(
-        "2.16.9",
-        sha256="b7ca99ee10551b5b13242b7effebefd2a5cc38c287e5f5be1267d51ee45effe3",
-        deprecated=True,
-    )
-    version(
-        "2.16.7",
-        sha256="4786b7d1676f5e4d248f3a7f2d28446876d64962634f060ff21b92c690cfbe86",
-        deprecated=True,
-    )
-    version(
-        "2.16.1",
-        sha256="daf0d40f3016c34eb42d1e4b3b52be047e976d566aba8668977723c829af72f3",
-        deprecated=True,
-    )
-    version("2.7.19", sha256="3da12b1cebe1a25da8365d5349f67db514aefcaa75e26082d7cb2fa3ce9608aa")
-    version(
-        "2.7.10",
-        sha256="42b19b30b86a798bdb69c5da2f8bbd7d72ffede9a35b888ab986a29480f9dc3e",
-        deprecated=True,
-    )
-    version(
-        "2.3.0",
-        sha256="1614ee70be99a18ca8298148308fb725aad4ad31c569438bb51655a4999b14f9",
-        deprecated=True,
-    )
-    version(
-        "2.2.1",
-        sha256="32819c62c20e8740a11b49daa5d09ac6f179edf120a87ac559cd63120b66b699",
-        deprecated=True,
-    )
-    version(
-        "2.2.0",
-        sha256="75494361e412444b38ebb9c908b7e17a5fb582eb9c3fadb2fe9b21e96f1bf8cb",
-        deprecated=True,
-    )
-    version(
-        "2.1.4",
-        sha256="a0ee4d3dd135baf67a3cf5ad9e70d67575561704325d6c93d8f087181f4db338",
-        deprecated=True,
-    )
-    version(
-        "2.1.3",
-        sha256="94da4618d5a518b99f7914a5e348be436e3571113d9a9978d130725a1fc7bfac",
-        deprecated=True,
-    )
-    version(
-        "1.3.16",
-        sha256="0c2666222b66cf09c4630fa60a715aafd7decb1a09933b75c0c540b0625ac5df",
-        deprecated=True,
-    )
 
     depends_on("c", type="build")  # generated
 
@@ -160,6 +76,11 @@ class Mbedtls(MakefilePackage):
     # libs=shared building both shared and static libs.
     # conflicts('libs=shared', msg='Makefile build cannot build shared libs only now')
 
+    def url_for_version(self, version):
+        if self.spec.satisfies("@:2.28.7,3:3.5"):
+            return f"https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v{version}.tar.gz"
+        return f"https://github.com/Mbed-TLS/mbedtls/releases/download/v{version}/mbedtls-{version}.tar.bz2"
+
     def flag_handler(self, name, flags):
         # Compile with PIC, if requested.
         if name == "cflags":