From 700012c01f3bd8a8b86a196b1121a5fe77c1646c Mon Sep 17 00:00:00 2001 From: Marek Szuba Date: Tue, 21 Feb 2023 23:05:44 +0000 Subject: app-containers/apptainer: add 1.1.6, drop 1.1.5 Signed-off-by: Marek Szuba --- app-containers/apptainer/Manifest | 2 +- app-containers/apptainer/apptainer-1.1.5.ebuild | 92 ------------------------- app-containers/apptainer/apptainer-1.1.6.ebuild | 92 +++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 app-containers/apptainer/apptainer-1.1.5.ebuild create mode 100644 app-containers/apptainer/apptainer-1.1.6.ebuild (limited to 'app-containers') diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest index 96eaa1486bf3..0ddbdbbe9d74 100644 --- a/app-containers/apptainer/Manifest +++ b/app-containers/apptainer/Manifest @@ -1,2 +1,2 @@ DIST apptainer-1.1.2.tar.gz 12896912 BLAKE2B 29a8df78617661e0a181955942e8321c112a69efaf15f4bb3e1563cc0789197916a3be1eb5396fb608d57b0edd5d5de2a70a2bda935095d8d511410660ebc106 SHA512 3fad253379a87ea790f22a14aec703296f606255d4ce847454a59f9dba0b9a6fc449489e7760c4696c1df90fc6abec198934310c1b762e33a83c72cafc7cb370 -DIST apptainer-1.1.5.tar.gz 12915073 BLAKE2B 0cd696adb9f99782f6f1dd4d384f6aacb11a71f3df13c07775c376d42b88993ca82c02ad545a57b012a151403c3a3719e3e4512fe34e7de540d04d7d27ddf86f SHA512 e6a5d392f3874f093a8580508e83e270140ad52606c7856797e7e7665dd6687e63900984a4cb920c3cba9a4b7148047de4085a4353c9c77697b94f8d9cd099fc +DIST apptainer-1.1.6.tar.gz 12914465 BLAKE2B a04ed9b9b429d7885d6c91f72d574d2a3a2955fdbe5cb2d30b59744b1f3bfb6f7d4f07ce7f1863caa83fb3361d7fdd2739b82334458d606ce053de43e1e9f755 SHA512 dd38abe1e343352e29a8a1fd1922901e4d48282fef641c75360253392ad53c6f1e5f7510ef612594e29db5f090fb41ff55b9d52d126be253450b0630fc7d383b diff --git a/app-containers/apptainer/apptainer-1.1.5.ebuild b/app-containers/apptainer/apptainer-1.1.5.ebuild deleted file mode 100644 index 11042b31127b..000000000000 --- a/app-containers/apptainer/apptainer-1.1.5.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info toolchain-funcs - -DESCRIPTION="The container system for secure high-performance computing" -HOMEPAGE="https://apptainer.org/" -SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="examples +network suid systemd" - -# Do not complain about CFLAGS etc. since go projects do not use them. -QA_FLAGS_IGNORED='.*' - -DEPEND="app-crypt/gpgme - >=dev-lang/go-1.17.6 - dev-libs/openssl - sys-apps/util-linux - sys-fs/cryptsetup - sys-fs/squashfs-tools - sys-libs/libseccomp - !suid? ( - sys-fs/e2fsprogs[fuse] - sys-fs/squashfuse - )" -RDEPEND="${DEPEND} - !sys-cluster/singularity" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~SQUASHFS" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.2-trim_upstream_cflags.patch -) - -DOCS=( README.md CONTRIBUTORS.md CONTRIBUTING.md ) - -src_configure() { - local myconfargs=( - -c "$(tc-getBUILD_CC)" \ - -x "$(tc-getBUILD_CXX)" \ - -C "$(tc-getCC)" \ - -X "$(tc-getCXX)" \ - --prefix="${EPREFIX}"/usr \ - --sysconfdir="${EPREFIX}"/etc \ - --runstatedir="${EPREFIX}"/run \ - --localstatedir="${EPREFIX}"/var \ - $(usex network "" "--without-network") \ - $(use_with suid) - ) - ./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig" -} - -src_compile() { - emake -C builddir -} - -src_install() { - emake DESTDIR="${D}" -C builddir install - keepdir /var/${PN}/mnt/session - - if use systemd; then - sed -i -e '/systemd cgroups/ s/no/yes/' "${ED}"/etc/${PN}/${PN}.conf \ - || die "Failed to enable systemd use in configuration" - else - sed -i -e '/systemd cgroups/ s/yes/no/' "${ED}"/etc/${PN}/${PN}.conf \ - || die "Failed to disable systemd use in configuration" - fi - - einstalldocs - if use examples; then - dodoc -r examples - fi -} - -pkg_postinst() { - if ! use suid; then - local oldver - for oldver in ${REPLACING_VERSIONS}; do - if ver_test "${oldver}" -lt 1.1.0; then - ewarn "Since version 1.1.0 ${PN} no longer installs setuid-root components by default, relying on unprivileged user namespaces instead. For details, see https://apptainer.org/docs/admin/main/user_namespace.html" - ewarn "Make sure user namespaces (possibly except network ones for improved security) are enabled on your system, or re-enable installation of setuid root components by passing USE=suid to ${CATEGORY}/${PN}" - break - fi - done - fi -} diff --git a/app-containers/apptainer/apptainer-1.1.6.ebuild b/app-containers/apptainer/apptainer-1.1.6.ebuild new file mode 100644 index 000000000000..11042b31127b --- /dev/null +++ b/app-containers/apptainer/apptainer-1.1.6.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info toolchain-funcs + +DESCRIPTION="The container system for secure high-performance computing" +HOMEPAGE="https://apptainer.org/" +SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="examples +network suid systemd" + +# Do not complain about CFLAGS etc. since go projects do not use them. +QA_FLAGS_IGNORED='.*' + +DEPEND="app-crypt/gpgme + >=dev-lang/go-1.17.6 + dev-libs/openssl + sys-apps/util-linux + sys-fs/cryptsetup + sys-fs/squashfs-tools + sys-libs/libseccomp + !suid? ( + sys-fs/e2fsprogs[fuse] + sys-fs/squashfuse + )" +RDEPEND="${DEPEND} + !sys-cluster/singularity" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~SQUASHFS" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.2-trim_upstream_cflags.patch +) + +DOCS=( README.md CONTRIBUTORS.md CONTRIBUTING.md ) + +src_configure() { + local myconfargs=( + -c "$(tc-getBUILD_CC)" \ + -x "$(tc-getBUILD_CXX)" \ + -C "$(tc-getCC)" \ + -X "$(tc-getCXX)" \ + --prefix="${EPREFIX}"/usr \ + --sysconfdir="${EPREFIX}"/etc \ + --runstatedir="${EPREFIX}"/run \ + --localstatedir="${EPREFIX}"/var \ + $(usex network "" "--without-network") \ + $(use_with suid) + ) + ./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig" +} + +src_compile() { + emake -C builddir +} + +src_install() { + emake DESTDIR="${D}" -C builddir install + keepdir /var/${PN}/mnt/session + + if use systemd; then + sed -i -e '/systemd cgroups/ s/no/yes/' "${ED}"/etc/${PN}/${PN}.conf \ + || die "Failed to enable systemd use in configuration" + else + sed -i -e '/systemd cgroups/ s/yes/no/' "${ED}"/etc/${PN}/${PN}.conf \ + || die "Failed to disable systemd use in configuration" + fi + + einstalldocs + if use examples; then + dodoc -r examples + fi +} + +pkg_postinst() { + if ! use suid; then + local oldver + for oldver in ${REPLACING_VERSIONS}; do + if ver_test "${oldver}" -lt 1.1.0; then + ewarn "Since version 1.1.0 ${PN} no longer installs setuid-root components by default, relying on unprivileged user namespaces instead. For details, see https://apptainer.org/docs/admin/main/user_namespace.html" + ewarn "Make sure user namespaces (possibly except network ones for improved security) are enabled on your system, or re-enable installation of setuid root components by passing USE=suid to ${CATEGORY}/${PN}" + break + fi + done + fi +} -- cgit v1.2.3-65-gdbad