[rpms/apptainer] rawhide: update to 1.5.1

[rpms/apptainer] rawhide: update to 1.5.1

[Dave Dykstra]

A new commit has been pushed.

Repo   : rpms/apptainer
Branch : rawhide
Commit : 7e2fdb4b8ce7dbe22a3655fb10eaef0845460bbc
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date   : 2026-06-04T11:38:02-05:00
Stats  : +16/-190 in 9 file(s)
URL    : https://src.fedoraproject.org/rpms/apptainer/c/7e2fdb4b8ce7dbe22a3655fb10eaef0845460bbc?branch=rawhide

Log:
update to 1.5.1

---
diff --git a/.gitignore b/.gitignore
index 9ee7cf2..9bd0ad7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
+/PRoot-*tar*
 /apptainer-*tar*
 /e2fsprogs-*tar*
+/fuse-overlayfs-*tar*
 /gocryptfs[-_]*tar*
 /squashfs-tools-*tar*
-# Small tarballs hang on upload so they're checked in and not ignored
-# /fuse-overlayfs-*tar*
-# /squashfuse-*tar*
-# /PRoot-*tar*
+/squashfuse-*tar*

diff --git a/PRoot-5.4.0-rootless.2.tar.gz b/PRoot-5.4.0-rootless.2.tar.gz
deleted file mode 100644
index f9f14a7..0000000
Binary files a/PRoot-5.4.0-rootless.2.tar.gz and /dev/null differ

diff --git a/apptainer.spec b/apptainer.spec
index ddeed4b..573986a 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -27,15 +27,15 @@
 
 # This can be slightly different than %%{version}.
 # For example, it has dash instead of tilde for release candidates.
-%global package_version 1.5.0
+%global package_version 1.5.1
 
 %global gocryptfs_version 2.6.1
-%global squashfuse_version 0.6.1
-%global e2fsprogs_version 1.47.3
+%global squashfuse_version 0.6.2
+%global e2fsprogs_version 1.47.4
 %global fuse_overlayfs_version 1.16
 %global squashfs_tools_version 4.7.5
 %ifnarch ppc64le s390x
-%global PRoot_version 5.4.0-rootless.2
+%global PRoot_version 5.4.0-rootless.3
 %endif
 
 # The last singularity version number in EPEL/Fedora
@@ -43,7 +43,7 @@
 
 Summary: Application and environment virtualization formerly known as Singularity
 Name: apptainer
-Version: 1.5.0
+Version: 1.5.1
 Release: 1%{?dist}
 # See LICENSE.md for first party code (BSD-3-Clause and LBNL BSD)
 # See LICENSE_THIRD_PARTY.md for incorporated code (ASL 2.0)
@@ -63,13 +63,6 @@ Source11: https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squas
 %if "%{?e2fsprogs_version}" != ""
 # URL: https://github.com/tytso/e2fsprogs/archive/refs/tags/v%%{e2fsprogs_version}.tar.gz
 Source12: e2fsprogs-%{e2fsprogs_version}.tar.gz
-# URL: https://github.com/tytso/e2fsprogs/pull/246.patch
-Patch121: e2fsprogs-246.patch
-# this is PR 250 from tytso/e2fsprogs backported to apply cleanly on v1.47.3
-# URL: https://github.com/DrDaveD/e2fsprogs/pull/2.patch
-Patch122: e2fsprogs-250.patch
-# URL: https://github.com/tytso/e2fsprogs/pull/251.patch
-Patch123: e2fsprogs-251.patch
 %endif
 %if "%{?fuse_overlayfs_version}" != ""
 Source13: https://github.com/containers/fuse-overlayfs/archive/v%{fuse_overlayfs_version}/fuse-overlayfs-%{fuse_overlayfs_version}.tar.gz
@@ -520,6 +513,9 @@ fi
 %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid
 
 %changelog
+* Thu Jun 04 2026 Dave Dykstra <dwd@cern.ch> - 1.5.1
+- Update to upstream 1.5.1
+
 * Wed May 06 2026 Dave Dykstra <dwd@cern.ch> - 1.5.0
 - Update to upstream 1.5.0
 

diff --git a/e2fsprogs-246.patch b/e2fsprogs-246.patch
deleted file mode 100644
index cdd6a46..0000000
--- a/e2fsprogs-246.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9c12bff363f1c7bba62decc56d06cb17e5f685d6 Mon Sep 17 00:00:00 2001
-From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
-Date: Fri, 10 Oct 2025 08:29:00 -0500
-Subject: [PATCH] fuse2fs: revert change of storing boolean options in bytes
- instead of ints
-
-This reverts commit c7f2688540d95e7f2cbcd178f8ff62ebe079faf7
-which turned the ints into uint8_t but didn't realize that
-fuse_opt_parse() assumes they are ints.
-
-Signed-off-by: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
----
- misc/fuse2fs.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
-index cb5620c7e..f565dbe7c 100644
---- a/misc/fuse2fs.c
-+++ b/misc/fuse2fs.c
-@@ -217,17 +217,17 @@ struct fuse2fs {
- 	pthread_mutex_t bfl;
- 	char *device;
- 	char *shortdev;
--	uint8_t ro;
--	uint8_t debug;
--	uint8_t no_default_opts;
--	uint8_t panic_on_error;
--	uint8_t minixdf;
--	uint8_t fakeroot;
--	uint8_t alloc_all_blocks;
--	uint8_t norecovery;
--	uint8_t kernel;
--	uint8_t directio;
--	uint8_t acl;
-+	int ro;
-+	int debug;
-+	int no_default_opts;
-+	int panic_on_error;
-+	int minixdf;
-+	int fakeroot;
-+	int alloc_all_blocks;
-+	int norecovery;
-+	int kernel;
-+	int directio;
-+	int acl;
- 
- 	int logfd;
- 	int blocklog;

diff --git a/e2fsprogs-250.patch b/e2fsprogs-250.patch
deleted file mode 100644
index 2fc267e..0000000
--- a/e2fsprogs-250.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From bb46af2ae75aa0b670f33f17f3141c9bf563bece Mon Sep 17 00:00:00 2001
-From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
-Date: Fri, 17 Oct 2025 15:51:44 -0500
-Subject: [PATCH] fuse2fs: open read-only when image is not writable
-
-This opens the image read-only when the image is not writable. If it is then found that a journal recovery is needed, an error is returned then.
-
-The ret value is set to 2 after the option checks so that if there's an error resulting in "goto out" it won't print an error about unrecognized options.
-
-Signed-off-by: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
----
- misc/fuse2fs.c | 32 ++++++++++++++++++++++++++++----
- 1 file changed, 28 insertions(+), 4 deletions(-)
-
-diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
-index d209bc790..96b7de26e 100644
---- a/misc/fuse2fs.c
-+++ b/misc/fuse2fs.c
-@@ -4459,9 +4459,24 @@ int main(int argc, char *argv[])
- 	err = ext2fs_open2(fctx.device, options, flags, 0, 0, unix_io_manager,
- 			   &global_fs);
- 	if (err) {
--		err_printf(&fctx, "%s.\n", error_message(err));
--		err_printf(&fctx, "%s\n", _("Please run e2fsck -fy."));
--		goto out;
-+		if ((err == EACCES) || (err == EPERM)) {
-+			if (fctx.ro) {
-+				dbg_printf(&fctx, "%s: %s\n", __func__,
-+ _("Permission denied with writable, trying without.\n"));
-+			} else {
-+				dbg_printf(&fctx, "%s: %s\n", __func__,
-+ _("No write access, opening read-only.\n"));
-+				fctx.ro = 1;
-+			}
-+			flags &= ~EXT2_FLAG_RW;
-+			err = ext2fs_open2(fctx.device, options, flags, 0, 0, 
-+					   unix_io_manager, &global_fs);
-+		}
-+		if (err) {
-+			err_printf(&fctx, "%s.\n", error_message(err));
-+			err_printf(&fctx, "%s\n", _("Please run e2fsck -fy."));
-+			goto out;
-+		}
- 	}
- 	fctx.fs = global_fs;
- 	global_fs->priv_data = &fctx;
-@@ -4504,6 +4519,8 @@ int main(int argc, char *argv[])
- 		goto out;
- 	}
- 
-+	ret = 2;
-+
- 	if (ext2fs_has_feature_shared_blocks(global_fs->super))
- 		fctx.ro = 1;
- 
-@@ -4513,6 +4530,11 @@ int main(int argc, char *argv[])
-  _("Mounting read-only without recovering journal."));
- 			fctx.ro = 1;
- 			global_fs->flags &= ~EXT2_FLAG_RW;
-+		} else if (fctx.ro && !(flags & EXT2_FLAG_RW)) {
-+			err_printf(&fctx, "%s\n",
-+ _("Journal needs recovery but filesystem could not be opened read-write."));
-+			err_printf(&fctx, "%s\n", _("Please run e2fsck -fy."));
-+			goto out;
- 		} else {
- 			log_printf(&fctx, "%s\n", _("Recovering journal."));
- 			err = ext2fs_run_ext3_journal(&global_fs);
-@@ -4578,8 +4600,10 @@ int main(int argc, char *argv[])
- 	if (fctx.no_default_opts == 0)
- 		fuse_opt_add_arg(&args, extra_args);
- 
--	if (fctx.ro)
-+	if (fctx.ro) {
-+		/* This is in case ro was implied above and not passed in */
- 		fuse_opt_add_arg(&args, "-oro");
-+	}
- 
- 	if (fctx.fakeroot) {
- #ifdef HAVE_MOUNT_NODEV

diff --git a/e2fsprogs-251.patch b/e2fsprogs-251.patch
deleted file mode 100644
index 95b05d3..0000000
--- a/e2fsprogs-251.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From aeea611af1f33b69d971b080febc6d74127e376f Mon Sep 17 00:00:00 2001
-From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
-Date: Fri, 17 Oct 2025 14:51:54 -0500
-Subject: [PATCH] fuse2fs: updates for message reporting journal is not
- supported
-
-This makes two changes to the message that is shown saying that fuse2fs
-does not support the journal.  First is that it reverts the check to
-what it was before 3875380 to look at the ro option not being set
-instead of checking the RW flag.  That's because I don't think this
-message needs to be shown when the ro option is set even when it was
-opened RW; there should be nothing to corrupt when it is ro.
-
-Second, it changes the message to say that writing is not supported
-rather than using the journal is not supported.  The current message is
-confusing because in fact the journal is used for recovery when needed
-and possible.
-
-Signed-off-by: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
----
- misc/fuse2fs.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
-index cb5620c7e..4401b52c1 100644
---- a/misc/fuse2fs.c
-+++ b/misc/fuse2fs.c
-@@ -4774,12 +4774,15 @@ int main(int argc, char *argv[])
- 		}
- 	}
- 
--	if (global_fs->flags & EXT2_FLAG_RW) {
-+	if (!fctx.ro) {
- 		if (ext2fs_has_feature_journal(global_fs->super))
- 			log_printf(&fctx, "%s",
-- _("Warning: fuse2fs does not support using the journal.\n"
-+ _("Warning: fuse2fs does not support writing the journal.\n"
-    "There may be file system corruption or data loss if\n"
-    "the file system is not gracefully unmounted.\n"));
-+	}
-+
-+	if (global_fs->flags & EXT2_FLAG_RW) {
- 		err = ext2fs_read_inode_bitmap(global_fs);
- 		if (err) {
- 			translate_error(global_fs, 0, err);

diff --git a/fuse-overlayfs-1.16.tar.gz b/fuse-overlayfs-1.16.tar.gz
deleted file mode 100644
index 0ec0a4a..0000000
Binary files a/fuse-overlayfs-1.16.tar.gz and /dev/null differ

diff --git a/sources b/sources
index 1997a2b..31c06b4 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,7 @@
-SHA512 (e2fsprogs-1.47.3.tar.gz) = 72d6ad9b2bdd1032b2a64cb7e2789a4c98e660169f3594c1d04d6322aff2ed4783cb5842eb4cb0aff7660c96c122d638dc541833b1a0a5cfdabaaaa3705ae2dd
+SHA512 (PRoot-5.4.0-rootless.3.tar.gz) = 870e3e4a4853bd38ad504d9bb55bf5f593533569373b3b2aeab2476836d6a55a06d049e4441cf09d918ff277aa06423b678382cf5687177e0d68068f4e4a33b5
+SHA512 (e2fsprogs-1.47.4.tar.gz) = 923c1ba52cf48557e190ee936be47ff3e43e4798950499e3c663f0f077470caefbb69ee845ebe1f969b3e7c1bb0c22e507188f1daca24649c54c5843c835b2f9
+SHA512 (fuse-overlayfs-1.16.tar.gz) = d72ef0881b788c8f907e0e83bbb5aaa93f37068670781443401234ae04b7347f216bf88fced429d8f6ad76790fa2de6267fd6f6da8327b0d1bb5902b1a5ec468
 SHA512 (gocryptfs_v2.6.1_src-deps.tar.gz) = ec8a8011a355656c1f242269fcc1559c537e880342e4f71a956a63ac72e47f2d9fea45f6ef308d420282725eb5bd4780f0cd645d137bb6beecb97a9c93b448fb
 SHA512 (squashfs-tools-4.7.5.tar.gz) = d24f1c8611dc7dcb17b81f3a34ee8c0d3484141c70ebe7c77c91c966e76cddc671e24d3f4a471ddc819c4708480cdd179168fe2bca8a09e97cebf0da9ef83b1c
-SHA512 (apptainer-1.5.0.tar.gz) = de8d1e2e93610cf5385451b3f73f6c0c89c73a5d518fc11f1cdd61ea871e084d7fba14a96b580ebb9ba0602e3f309986807881730a9892ada23b394484dee95a
+SHA512 (squashfuse-0.6.2.tar.gz) = 6eb32c05f5b2cbb94805a8b0f0b1d9a77dc7b582f94316de1be1e4aab19cc8856a50dd4542f4f4c9475c753e63f8a6fad21c0902704643f32422da6a08b21622
+SHA512 (apptainer-1.5.1.tar.gz) = b8d206c1494221db04901334e5aa7f8bca2cea326e493a741ffa7ef62687652dc74d859bd402d01f5066ad4b4e212a45fdc78a50aeb3f60bd9a939f03c6fd7e8

diff --git a/squashfuse-0.6.1.tar.gz b/squashfuse-0.6.1.tar.gz
deleted file mode 100644
index a43311e..0000000
Binary files a/squashfuse-0.6.1.tar.gz and /dev/null differ