[rpms/apptainer] migrate-spdx: update to upstream 1.4.4

[Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>]

A new commit has been pushed.

Repo   : rpms/apptainer
Branch : migrate-spdx
Commit : a3fe8a1aad7544ee9a2d7c79b2f913e096f01304
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date   : 2025-10-29T11:41:33-05:00
Stats  : +21/-33 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/apptainer/c/a3fe8a1aad7544ee9a2d7c79b2f913e096f01304?branch=migrate-spdx

Log:
update to upstream 1.4.4

---
diff --git a/.gitignore b/.gitignore
index 14d04a8..01714b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
-/apptainer-*
-/e2fsprogs-*
-/gocryptfs-*
-/squashfuse-*
-/fuse-overlayfs-*
-/squashfs-tools-*
-/go*.src.*
+/apptainer-*tar*
+/e2fsprogs-*tar*
+/gocryptfs-*tar*
+/squashfuse-*tar*
+/fuse-overlayfs-*tar*
+/squashfs-tools-*tar*

diff --git a/apptainer.spec b/apptainer.spec
index 0a4b0fc..caf4b92 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -31,7 +31,7 @@
 
 # This can be slightly different than %%{version}.
 # For example, it has dash instead of tilde for release candidates.
-%global package_version 1.4.3
+%global package_version 1.4.4
 
 %global gocryptfs_version 2.5.1
 %global squashfuse_version 0.6.0
@@ -44,8 +44,8 @@
 
 Summary: Application and environment virtualization formerly known as Singularity
 Name: apptainer
-Version: 1.4.3
-Release: 3%{?dist}
+Version: 1.4.4
+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)
 # See LICENSE_DEPENDENCIES.md for dependencies
@@ -67,13 +67,18 @@ 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
 Source13: https://github.com/containers/fuse-overlayfs/archive/v%{fuse_overlayfs_version}/fuse-overlayfs-%{fuse_overlayfs_version}.tar.gz
 %if "%{?squashfs_tools_version}" != ""
 Source14: https://github.com/plougher/squashfs-tools/archive/%{squashfs_tools_version}/squashfs-tools-%{squashfs_tools_version}.tar.gz
 %endif
-# From https://github.com/ulikunitz/xz/commit/7eee8a8a405163554a9accec7b9402ee21400769
-Patch0: xz-32bit.patch
 
 # This Conflicts is in case someone tries to install the main apptainer
 # package when an old singularity package is installed.  An Obsoletes is on
@@ -243,7 +248,7 @@ Provides: bundled(golang(github.com/stefanberger/go_pkcs11uri)) = v0.0.0_2023080
 Provides: bundled(golang(github.com/sylabs/json_resp)) = v0.9.4
 Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635
 Provides: bundled(golang(github.com/titanous/rocacheck)) = v0.0.0_20171023193734_afe73141d399
-Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.14
+Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.15
 Provides: bundled(golang(github.com/vbatts/go_mtree)) = v0.5.0
 Provides: bundled(golang(github.com/vbatts/tar_split)) = v0.11.6
 Provides: bundled(golang(github.com/vbauerster/mpb/v8)) = v8.9.1
@@ -275,7 +280,6 @@ Provides: bundled(golang(gotest.tools/v3)) = v3.5.2
 Provides: bundled(golang(mvdan.cc/sh/v3)) = v3.10.0
 
 %if "%{_target_vendor}" == "suse"
-BuildRequires: binutils-gold
 BuildRequires: go
 BuildRequires: liblz4-devel
 %if 0%{?suse_version} > 1600
@@ -329,7 +333,6 @@ Provides the optional setuid-root portion of Apptainer.
 %setup -n %{name}-%{package_version}
 # don't need to setup dependent source packages and patches because
 # that is done by the compile-dependencies script
-%patch -P 0 -p0
 
 %build
 %if "%{?SOURCE1}" != ""
@@ -486,6 +489,9 @@ fi
 %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid
 
 %changelog
+* Wed Oct 29 2025 Dave Dykstra <dwd@cern.ch> - 1.4.4-1
+- Update to upstream 1.4.4
+
 * Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 1.4.3-3
 - rebuild
 

diff --git a/e2fsprogs-246.patch b/e2fsprogs-246.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/e2fsprogs-246.patch

diff --git a/e2fsprogs-250.patch b/e2fsprogs-250.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/e2fsprogs-250.patch

diff --git a/e2fsprogs-251.patch b/e2fsprogs-251.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/e2fsprogs-251.patch

diff --git a/sources b/sources
index ab0202e..eda0cec 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@ SHA512 (squashfuse-0.6.0.tar.gz) = 5b6f76aeab38c30a470a7bbd14a0029bbe6b1cff9c72a
 SHA512 (gocryptfs-2.5.1.tar.gz) = 45f8f60235ec9472ee8071e1b413e275d6172b67f859dc6efc282cb1e26e7c3893b2a526876fa38419cb80b70ec90c369f2145cb746318c7e26470b3316687ff
 SHA512 (e2fsprogs-1.47.3.tar.gz) = 72d6ad9b2bdd1032b2a64cb7e2789a4c98e660169f3594c1d04d6322aff2ed4783cb5842eb4cb0aff7660c96c122d638dc541833b1a0a5cfdabaaaa3705ae2dd
 SHA512 (fuse-overlayfs-1.15.tar.gz) = 6da1094216e4f6ddbc8e1cf1b1a0ebb6a8902920c73c7fb0dfc4c23f5a3ff6f14430156f5914ac021e6b84c3d8425e006e45734dac3dcc26fce414155f3db370
-SHA512 (apptainer-1.4.3.tar.gz) = bdbbb65b1a717424dcf2e075765bcf14f5b733eca566cfc3a9c8b2c5ad023930896a07c3288fec867b3fd45c4782ad67615d890ea8f502393742cc679cd2c1f4
+SHA512 (apptainer-1.4.4.tar.gz) = 7fbc38114e8e43ea05bd006542822bf3bd57073ebb17e1ddde8741b44422e457259584980c0f52bdb1388e84eddb3bead0f6f3ecbb66b50539b3efc18bbe1a75

diff --git a/xz-32bit.patch b/xz-32bit.patch
deleted file mode 100644
index 58c6f22..0000000
--- a/xz-32bit.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git vendor/github.com/ulikunitz/xz/lzma/reader.go.O vendor/github.com/ulikunitz/xz/lzma/reader.go
-index ea021b0..eef6bea 100644
---- vendor/github.com/ulikunitz/xz/lzma/reader.go
-+++ vendor/github.com/ulikunitz/xz/lzma/reader.go
-@@ -28,9 +28,9 @@ type ReaderConfig struct {
- // fill converts the zero values of the configuration to the default values.
- func (c *ReaderConfig) fill() {
- 	if c.DictCap == 0 {
--		// set an upper limit of 2 GB for dictionary capacity to address
--		// the zero prefix security issue.
--		c.DictCap = 1 << 31
-+		// set an upper limit of 2 GiB-1 for dictionary capacity
-+		// to address the zero prefix security issue.
-+		c.DictCap = (1 << 31) - 1
- 		// original: c.DictCap = 8 * 1024 * 1024
- 	}
- }