summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorWouter Deconinck <wdconinc@gmail.com>2024-10-18 20:34:14 -0500
committerGitHub <noreply@github.com>2024-10-19 03:34:14 +0200
commitd47e726b76d6fe900e5a0440ebae4b0fd843c406 (patch)
tree939d31ba70e07fd96de5f765730c608c359e66c8 /var
parent89ab47284f9a5ed892252ae7b09667e7f6d4691f (diff)
downloadspack-d47e726b76d6fe900e5a0440ebae4b0fd843c406.tar.gz
spack-d47e726b76d6fe900e5a0440ebae4b0fd843c406.tar.bz2
spack-d47e726b76d6fe900e5a0440ebae4b0fd843c406.tar.xz
spack-d47e726b76d6fe900e5a0440ebae4b0fd843c406.zip
libcgroup: add v3.1.0 (fixes CVE) (#46945)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/libcgroup/package.py24
-rw-r--r--var/spack/repos/builtin/packages/linux-pam/package.py1
2 files changed, 18 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/libcgroup/package.py b/var/spack/repos/builtin/packages/libcgroup/package.py
index 9877976717..67cd8e8ec2 100644
--- a/var/spack/repos/builtin/packages/libcgroup/package.py
+++ b/var/spack/repos/builtin/packages/libcgroup/package.py
@@ -9,17 +9,20 @@ from spack.package import *
class Libcgroup(AutotoolsPackage):
"""Library of control groups."""
- homepage = "https://sourceforge.net/projects/libcg/"
- url = "https://sourceforge.net/projects/libcg/files/libcgroup/v0.41/libcgroup-0.41.tar.bz2"
+ homepage = "https://github.com/libcgroup/libcgroup/"
+ url = "https://github.com/libcgroup/libcgroup/releases/download/v3.1.0/libcgroup-3.1.0.tar.gz"
license("LGPL-2.1-only")
- version("0.41", sha256="e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51")
- version("0.37", sha256="15c8f3febb546530d3495af4e4904b3189c273277ca2d8553dec882cde1cd0f6")
- version("0.36", sha256="8dcd2ae220435b3de736d3efb0023fdf1192d7a7f4032b439f3cf5342cff7b4c")
+ version("3.1.0", sha256="976ec4b1e03c0498308cfd28f1b256b40858f636abc8d1f9db24f0a7ea9e1258")
+ with default_args(deprecated=True):
+ # https://nvd.nist.gov/vuln/detail/CVE-2018-14348
+ version("0.41", sha256="e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51")
+ version("0.37", sha256="15c8f3febb546530d3495af4e4904b3189c273277ca2d8553dec882cde1cd0f6")
+ version("0.36", sha256="8dcd2ae220435b3de736d3efb0023fdf1192d7a7f4032b439f3cf5342cff7b4c")
- depends_on("c", type="build") # generated
- depends_on("cxx", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
depends_on("m4", type="build")
depends_on("autoconf", type="build")
@@ -28,3 +31,10 @@ class Libcgroup(AutotoolsPackage):
depends_on("bison", type="build")
depends_on("flex", type="build")
depends_on("linux-pam")
+ depends_on("systemd", when="@3.1:")
+
+ def url_for_version(self, version):
+ if self.spec.satisfies("@2.0.1:"):
+ return f"https://github.com/libcgroup/libcgroup/releases/download/v{version}/libcgroup-{version}.tar.gz"
+ else:
+ return f"https://github.com/libcgroup/libcgroup/releases/download/v{version}/libcgroup-{version}.tar.bz2"
diff --git a/var/spack/repos/builtin/packages/linux-pam/package.py b/var/spack/repos/builtin/packages/linux-pam/package.py
index 484e9e2cb9..265a96e4a6 100644
--- a/var/spack/repos/builtin/packages/linux-pam/package.py
+++ b/var/spack/repos/builtin/packages/linux-pam/package.py
@@ -31,6 +31,7 @@ class LinuxPam(AutotoolsPackage):
variant("lastlog", default=False, description="Build pam_lastlog model")
variant("regenerate-docu", default=False, description="Regenerate docs")
+ depends_on("pkgconfig", type="build")
depends_on("libtirpc")
depends_on("libxcrypt")
depends_on("xauth", when="+xauth")