diff --git a/apptainer-1.1.0-rc.1.tar.gz b/apptainer-1.1.0-rc.1.tar.gz deleted file mode 100644 index 9551119..0000000 --- a/apptainer-1.1.0-rc.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18d2828c4c4e7adaccfbf82aac9ea8d698e11d5d4a690c372733f5eafd116d11 -size 5165719 diff --git a/apptainer-1.1.0-rc.2.tar.gz b/apptainer-1.1.0-rc.2.tar.gz new file mode 100644 index 0000000..d37b6b7 --- /dev/null +++ b/apptainer-1.1.0-rc.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a16e59996096cd22b5ac415f2bd09f2c978609da57ee59b3209cd2c6246c9840 +size 5169775 diff --git a/apptainer.changes b/apptainer.changes index bc29ac5..09f908d 100644 --- a/apptainer.changes +++ b/apptainer.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Fri Aug 19 10:07:20 UTC 2022 - Christian Goll + +- Udpated to version 1.1.0-rc2 with following changes: + * Fixed longstanding bug in the underlay logic when there are nested bind + points separated by more than one path level, for example /var and + /var/lib/yum, and the path didn't exist in the container image. The bug + only caused an error when there was a directory in the container image that + didn't exist on the host. + * Improved wildcard matching in the %files directive of build definition + files by replacing usage of sh with the mvdan.cc library. + * Replaced checks for compatible filesystem types when using fuse-overlayfs + with an INFO message when an incompatible filesystem type causes it to be + unwritable by a fakeroot user. + * The --nvccli option now works without --fakeroot. In that case the option + can be used with --writable-tmpfs instead of --writable, and + --writable-tmpfs is implied if neither option is given. Note that also + /usr/bin has to be writable by the user, so without --fakeroot that + probably requires a sandbox image that was built with --fix-perms. + * The --nvccli option implies --nv. + * Configure squashfuse to always show files to be owned by the current user. + That's especially important for fakeroot to prevent most of the files from + looking like they are owned by user 65534. + * The fakeroot command can now be used even if $PATH is empty in the + environment of the apptainer command. + * Allow the newuidmap command to be missing if the current user is not listed + in /etc/subuid. + * Require the uidmap package in Debian packaging. + * Improved error handling of unsupported pass protected PEM files with + encrypted containers. + * Ensure bootstrap_history directory is populated with previous definition + files, present in source containers used in a build. + * Add additional options to the build command for testing different fakeroot + modes: --userns like the action flag and hidden options --ignore-subuid, + --ignore-fakeroot-command, and --ignore-userns. + * Require root user early when building an encrypted container. +- removed upstream incorated patch fix-32bit-compilation.patch + ------------------------------------------------------------------- Thu Aug 4 12:31:33 UTC 2022 - Christian Goll diff --git a/apptainer.spec b/apptainer.spec index cc5909c..5c16521 100644 --- a/apptainer.spec +++ b/apptainer.spec @@ -19,7 +19,7 @@ %define apptainerpath src/github.com/apptainer/ %define _buildshell /bin/bash -%define vers_suffix -rc.1 +%define vers_suffix -rc.2 Summary: Application and environment virtualization License: BSD-3-Clause-LBNL @@ -35,7 +35,6 @@ Source2: SLE-12SP5.def Source3: SLE-15SP3.def Source5: %{name}-rpmlintrc Source10: vendor.tar.gz -Patch1: fix-32bit-compilation.patch BuildRequires: cryptsetup BuildRequires: fdupes BuildRequires: gcc @@ -68,7 +67,6 @@ containers that can be used across host environments. cp %{S:1} %{S:2} %{S:3} . mv %{name}-%{version}%{?vers_suffix} %{name} cd %{_builddir}/gopath/%{apptainerpath}/apptainer -%patch1 -p1 %build cd %{name} diff --git a/fix-32bit-compilation.patch b/fix-32bit-compilation.patch deleted file mode 100644 index c9337ea..0000000 --- a/fix-32bit-compilation.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cf82cf54c592e1fb86fe0b552c2a1769c5193725 Mon Sep 17 00:00:00 2001 -From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> -Date: Tue, 2 Aug 2022 11:55:17 -0500 -Subject: [PATCH] fix 32bit compilation - -Signed-off-by: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> ---- - internal/pkg/util/fs/overlay/overlay_linux.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/internal/pkg/util/fs/overlay/overlay_linux.go b/internal/pkg/util/fs/overlay/overlay_linux.go -index b5eff4bd2..7b220f97f 100644 ---- a/internal/pkg/util/fs/overlay/overlay_linux.go -+++ b/internal/pkg/util/fs/overlay/overlay_linux.go -@@ -81,7 +81,7 @@ func check(path string, d dir, allowType int64) error { - return nil - } - -- if stfs.Type == allowType { -+ if int64(stfs.Type) == allowType { - return nil - } - --- -2.37.1 - diff --git a/vendor.tar.gz b/vendor.tar.gz index 1b3d3f4..f162be2 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7735457b98aafd288d84535215550976fff739082cd8290784415e1bee514c1f -size 7205443 +oid sha256:1f28d695f5646e10dc7fcdf8e35d6a4fdf1f26c23d6291c7664bb4042fbebfe0 +size 7205851