2 files changed, 94 insertions, 0 deletions
diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest
index ee0bfb471b58..48f107c62d73 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -1,6 +1,8 @@
 AUX apptainer-1.0.2-trim_upstream_cflags.patch 1142 BLAKE2B 7238229b70a8ac37f3401a163d19dc705adb6a4ab6355e4eaa386ad5c639bfc1443cf61507112a53b66816399ca5fe2c32de964dd602ea16c5dfbf9003343f8c SHA512 1351ee000274567bb5a63aa740fbc43510d84ccad42c9af0c555943b99d93d86a2b036801c1681b93548a874bda1bab3304c2bf0da83bbca102a71e82574a032
 DIST apptainer-1.2.3.tar.gz 14387465 BLAKE2B b7aacb0e85ea1f8cbd2b27f321f539cee8d048cdb7f75894e9d4be39add40a0c61763bc4e8984542b1410ddea4ca67c9d341505856870075ec3f1907d5c9bc98 SHA512 d9146760c6602cddc9d7a29bfb637fe5332adb405e54667812a618245052334a97c23198b7d59296522f614654e555e083e4ed0eec72115469b3be35e2f5a0ae
 DIST apptainer-1.2.4.tar.gz 14387522 BLAKE2B 8435bf590149c4e83dc32a866198fdcaa44270cad4e6722e9174352c7b00e4b13c1aa4c290991c289d71797afcd9e2411e3bcc0a2b80440528babdcf3e19bec5 SHA512 bc2ad5f10f2c8e69b4bc5b997083e2dd5f62913d195eda6213d572c3dbfe03923845882e55e1a60d395ed3019100ce26919323f9523c59ccda51d7f1397bcba3
+DIST apptainer-1.2.5.tar.gz 14360956 BLAKE2B 4ee50229e800c5505c127731944d102fd688bc5f24ea4fc11cf8216d4f3d49f8d3cb19c8f6f03d34004c36acacfe729ba51f00661b6dcd046d6f4b862a6b8dd9 SHA512 58b7e9947bfc2e2d267e126ae7f9766d04ffa943c72e9a00b649ba93fd66828ee55c8d93b114f542067b305822737516675cdca79ce0d8c1153c61fa88d058d7
 EBUILD apptainer-1.2.3.ebuild 2462 BLAKE2B 1a06bf82e2b38d450b97e525b39b882695f66d6d585b38bda337d24a8f7acae772ca82f0aaf6b0879fa76cab5a03fa2abbbb335cdb07b52174cb751ec7b90489 SHA512 7f6623d33ca9c34a7be5edf861c0e2cece3349bff73a8bd66d9995ab1e5207a40877623040a8c318668cee4d3200692a02c645c0ec43560fa667083fff68929a
 EBUILD apptainer-1.2.4.ebuild 2463 BLAKE2B 7df515094920e98c8ddecaee7640504401cba76d76cb8ba7d7081fca4070d11d9e6bd01f5f23d83816da5b3f2d7cd4846fe1a02623acd69915b45580f9c9a111 SHA512 1184828ae023c1b50e7e61edebd44ca79bbf907d6fa0ee2ee5e09e60ab7ce0f16e897181bc032bcebcf496863a46cd3556bff29c91a243a928ee4cf31c6ec2ca
+EBUILD apptainer-1.2.5.ebuild 2463 BLAKE2B 7df515094920e98c8ddecaee7640504401cba76d76cb8ba7d7081fca4070d11d9e6bd01f5f23d83816da5b3f2d7cd4846fe1a02623acd69915b45580f9c9a111 SHA512 1184828ae023c1b50e7e61edebd44ca79bbf907d6fa0ee2ee5e09e60ab7ce0f16e897181bc032bcebcf496863a46cd3556bff29c91a243a928ee4cf31c6ec2ca
 MISC metadata.xml 454 BLAKE2B 7891b6acae30424b8b6877166b856c1113a13e40ebec9051935df10a0650bf941f52d75bdb6a4258795e07b080082979469b8b8242d2ddd56c52f9c5b6759f0e SHA512 ef53c2dee45734f36403ab71549494f3c24707bc183353e4bd9c548a97b3ab5d7877f4fc9d311d9e86ab249cbdb379f0a1a211ee36afda99fd552f0a5cac30bb
diff --git a/app-containers/apptainer/apptainer-1.2.5.ebuild b/app-containers/apptainer/apptainer-1.2.5.ebuild
new file mode 100644
index 000000000000..b5e7811c6f00
--- /dev/null
+++ b/app-containers/apptainer/apptainer-1.2.5.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.19.0
+	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
+}