diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2024-10-13 16:09:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-13 15:09:16 -0600 |
| commit | 81b41d5948007d5bd0e3952bf86df9bf83571941 (patch) | |
| tree | 476eb904f619265fefef0764339806bbea84d9ce | |
| parent | 0ff980ae8782f51dc6fb6f3d0407d7285d2de576 (diff) | |
| download | spack-81b41d5948007d5bd0e3952bf86df9bf83571941.tar.gz spack-81b41d5948007d5bd0e3952bf86df9bf83571941.tar.bz2 spack-81b41d5948007d5bd0e3952bf86df9bf83571941.tar.xz spack-81b41d5948007d5bd0e3952bf86df9bf83571941.zip | |
guacamole-{client,server}: add v1.5.5 (fix CVEs) (#46948)
* guacamole-client: add v1.5.5
* guacamole-server: add v1.5.5
* guacamole-client: add patch and ensure maven doesn't flag it
* guacamole-client: limit patch to 1.5; java@:16 when @:1.4
| -rw-r--r-- | var/spack/repos/builtin/packages/guacamole-client/package.py | 15 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/guacamole-server/package.py | 9 |
2 files changed, 20 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/guacamole-client/package.py b/var/spack/repos/builtin/packages/guacamole-client/package.py index 7b1cb8d11c..1aed681f84 100644 --- a/var/spack/repos/builtin/packages/guacamole-client/package.py +++ b/var/spack/repos/builtin/packages/guacamole-client/package.py @@ -15,6 +15,19 @@ class GuacamoleClient(MavenPackage): license("Apache-2.0") + version("1.5.5", sha256="ebbd3c0b73ddafbf6656d11324163f5b8d410f94b472791e6fa75fca13a5d30b") version("1.2.0", sha256="2327368a32e61cf82032311be79ded4e5eefbc59ac9fb6e0a054b4f49168843e") - depends_on("java@8", type=("build", "run")) + # remove usage of deprecated AccessController class, deprecated in java 17 + patch( + "https://github.com/apache/guacamole-client/commit/b315e6aac84550948763a2bc99f12ceb2a28dca1.patch?full_index=1", + sha256="3529eb8bfd3d025682463cbce3f5a58bdbcacfa58c915c5471e00913c89f7474", + when="@1.5:1.5.5", + ) + + depends_on("java@8:", type=("build", "run")) + depends_on("java@:16", type=("build", "run"), when="@:1.4") + + def build_args(self): + # The file .spack_patched is flagged as an unapproved license + return ["-Drat.numUnapprovedLicenses=1"] diff --git a/var/spack/repos/builtin/packages/guacamole-server/package.py b/var/spack/repos/builtin/packages/guacamole-server/package.py index 42ac61c925..0b0805dcc1 100644 --- a/var/spack/repos/builtin/packages/guacamole-server/package.py +++ b/var/spack/repos/builtin/packages/guacamole-server/package.py @@ -16,15 +16,18 @@ class GuacamoleServer(AutotoolsPackage): license("GPL-3.0-or-later") - version("1.1.0", sha256="d0f0c66ebfa7a4fd6689ae5240f21797b5177945a042388b691b15b8bd5c81a8") + version("1.5.5", sha256="50430c0f0f3b92f2cd3e60436fab0cedee8c1a9f762696a666016347039c731e") + with default_args(deprecated=True): + # https://nvd.nist.gov/vuln/detail/CVE-2023-43826 + version("1.1.0", sha256="d0f0c66ebfa7a4fd6689ae5240f21797b5177945a042388b691b15b8bd5c81a8") - depends_on("c", type="build") # generated + depends_on("c", type="build") depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") depends_on("m4", type="build") - depends_on("cairo") + depends_on("cairo +pdf +png") # pdf enables zlib support required for CairoScript depends_on("libjpeg") depends_on("libpng") depends_on("uuid") |