diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/singularity/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/singularity/package.py | 53 |
1 files changed, 22 insertions, 31 deletions
diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index 810a811d39..838cfe6f3e 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * @@ -29,13 +10,23 @@ class Singularity(AutotoolsPackage): """Singularity is a container platform focused on supporting 'Mobility of Compute'""" - homepage = "http://singularity.lbl.gov/" - url = "https://github.com/singularityware/singularity/archive/2.4.tar.gz" + homepage = "https://www.sylabs.io/singularity/" + url = "https://github.com/singularityware/singularity/releases/download/2.5.2/singularity-2.5.2.tar.gz" + git = "https://github.com/singularityware/singularity.git" + + # Versions before 2.5.2 suffer from a serious security problem. + # https://nvd.nist.gov/vuln/detail/CVE-2018-12021 + version('develop', branch='master') + version('2.6.0', sha256='7c425211a099f6fa6f74037e6e17be58fb5923b0bd11aea745e48ef83c488b49') + version('2.5.2', '2edc1a8ac9a4d7d26fba6244f1c5fd95') - version('2.4', 'd357ce68ef2f8149edd84155731531465dbe74148c37719f87f168fc39384377') - version('2.3.1', '292ff7fe3db09c854b8accf42f763f62') + depends_on('libarchive', when='@2.5.2:') + # these are only needed if we're grabbing the unreleased tree + depends_on('m4', type='build', when='@develop') + depends_on('autoconf', type='build', when='@develop') + depends_on('automake', type='build', when='@develop') + depends_on('libtool', type='build', when='@develop') - depends_on('m4', type='build') - depends_on('autoconf', type='build') - depends_on('automake', type='build') - depends_on('libtool', type='build') + # When installing as root, the copy has to run before chmod runs + def install(self, spec, prefix): + make('install', parallel=False) |