diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2024-10-13 17:44:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-13 16:44:16 -0600 |
| commit | 796e372bdec4968afdf7ebf44acf0cd9ff5c5880 (patch) | |
| tree | 2b02e0587f355cb422f4d5b3fab3e2d4165675be /var | |
| parent | 78740942f9c6b5fc42a7c826a1cc58d569e799d2 (diff) | |
| download | spack-796e372bdec4968afdf7ebf44acf0cd9ff5c5880.tar.gz spack-796e372bdec4968afdf7ebf44acf0cd9ff5c5880.tar.bz2 spack-796e372bdec4968afdf7ebf44acf0cd9ff5c5880.tar.xz spack-796e372bdec4968afdf7ebf44acf0cd9ff5c5880.zip | |
tomcat: add v9.0.96, v10.1.31, v11.0.0 (fix CVEs) (#46950)
* tomcat: add v9.0.96, v10.1.31, v11.0.0
* [@spackbot] updating style on behalf of wdconinc
---------
Co-authored-by: wdconinc <wdconinc@users.noreply.github.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/tomcat/package.py | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/tomcat/package.py b/var/spack/repos/builtin/packages/tomcat/package.py index b3f69890ed..0b11a910c6 100644 --- a/var/spack/repos/builtin/packages/tomcat/package.py +++ b/var/spack/repos/builtin/packages/tomcat/package.py @@ -14,19 +14,44 @@ class Tomcat(Package): """ homepage = "https://tomcat.apache.org/" - url = "https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.30/bin/apache-tomcat-9.0.30.tar.gz" + url = ( + "https://archive.apache.org/dist/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0.tar.gz" + ) license("Apache-2.0") - version("9.0.30", sha256="43a9b268671bbd3aace427637fbf577e742b521901e111342321ae901478100b") - version("9.0.29", sha256="1bf634413326ec96972fc1c3ac6666e8e4cab49ad3fc9f5e3228b85208d9c4b0") - version("9.0.27", sha256="6616a150e1593ef1a622298aaef9b889db70c8ee5122d35ad52adfcda1084d10") - version("9.0.26", sha256="b5430890d3b986d6b7ec6a6ef611f9451cbfa933b0a1a3dd48e2cd1f46a63381") - version("9.0.24", sha256="22064138e25f7ab899802804775259a156c06770535b8ce93856beba13dfcf6d") + version("11.0.0", sha256="d0ca319af349838f59009a9c5ed3709f02344201059dbc26dce4313ee969cd20") + version("10.1.31", sha256="06f6e2e11ef5afb435a4b27e1e264ebcdbafd95389f5ee37e425dc135ed325d4") + version( + "9.0.96", + sha256="bf4ad04955457ad663157876461015437a7479546aec9a38840d736b3d70151f", + preferred=True, + ) + with default_args(deprecated=True): + # https://nvd.nist.gov/vuln/detail/CVE-2023-46589 + version( + "9.0.30", sha256="43a9b268671bbd3aace427637fbf577e742b521901e111342321ae901478100b" + ) + version( + "9.0.29", sha256="1bf634413326ec96972fc1c3ac6666e8e4cab49ad3fc9f5e3228b85208d9c4b0" + ) + version( + "9.0.27", sha256="6616a150e1593ef1a622298aaef9b889db70c8ee5122d35ad52adfcda1084d10" + ) + version( + "9.0.26", sha256="b5430890d3b986d6b7ec6a6ef611f9451cbfa933b0a1a3dd48e2cd1f46a63381" + ) + version( + "9.0.24", sha256="22064138e25f7ab899802804775259a156c06770535b8ce93856beba13dfcf6d" + ) + + # https://tomcat.apache.org/whichversion.html + depends_on("java@8:", type="run", when="@9:") + depends_on("java@11:", type="run", when="@10:") + depends_on("java@17:", type="run", when="@11:") def url_for_version(self, version): - url = "https://archive.apache.org/dist/tomcat/tomcat-9/v{0}/bin/apache-tomcat-{0}.tar.gz" - return url.format(version) + return f"https://archive.apache.org/dist/tomcat/tomcat-{version.up_to(1)}/v{version}/bin/apache-tomcat-{version}.tar.gz" def install(self, spec, prefix): install_tree(".", prefix) |