summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2024-05-07 23:56:37 -0700
committerGitHub <noreply@github.com>2024-05-08 08:56:37 +0200
commit868327ee14056cecbd01137db72875aa035cb5cb (patch)
tree579eeb712b29ab41faeacf5cd35c7a1fa39889a9
parentf5430b16bc18c295743c1fbca878cd98a7de6b21 (diff)
downloadspack-868327ee14056cecbd01137db72875aa035cb5cb.tar.gz
spack-868327ee14056cecbd01137db72875aa035cb5cb.tar.bz2
spack-868327ee14056cecbd01137db72875aa035cb5cb.tar.xz
spack-868327ee14056cecbd01137db72875aa035cb5cb.zip
r: patch R-CVE-2024-27322 for `r@3.5:4.3.3` (#44050)
Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>
-rw-r--r--var/spack/repos/builtin/packages/r/package.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py
index 4dab317a76..bc41186372 100644
--- a/var/spack/repos/builtin/packages/r/package.py
+++ b/var/spack/repos/builtin/packages/r/package.py
@@ -23,6 +23,7 @@ class R(AutotoolsPackage):
license("GPL-2.0-or-later")
version("4.4.0", sha256="ace4125f9b976d2c53bcc5fca30c75e30d4edc401584859cbadb080e72b5f030")
+ version("4.3.3", sha256="80851231393b85bf3877ee9e39b282e750ed864c5ec60cbd68e6e139f0520330")
version("4.3.2", sha256="b3f5760ac2eee8026a3f0eefcb25b47723d978038eee8e844762094c860c452a")
version("4.3.1", sha256="8dd0bf24f1023c6f618c3b317383d291b4a494f40d73b983ac22ffea99e4ba99")
version("4.3.0", sha256="45dcc48b6cf27d361020f77fde1a39209e997b81402b3663ca1c010056a6a609")
@@ -113,6 +114,13 @@ class R(AutotoolsPackage):
# gets stored as compressed byte code, which is not relocatable
patch("relocate-which.patch")
+ # CVE-2024-27322 Patch only needed in R 4.3.3 and below; doesn't apply to R older than 3.5.0.
+ patch(
+ "https://github.com/r-devel/r-svn/commit/f7c46500f455eb4edfc3656c3fa20af61b16abb7.patch?full_index=1",
+ sha256="56c77763cb104aa9cb63420e585da63cb2c23bc03fa3ef9d088044eeff9d7380",
+ when="@3.5.0:4.3.3",
+ )
+
build_directory = "spack-build"
# R custom URL version