[rpms/apptainer] migrate-spdx: update to 1.1.4

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

A new commit has been pushed.

Repo   : rpms/apptainer
Branch : migrate-spdx
Commit : 06fbf7b2d4fea55c0cee1172274679c69d2fd7df
Author : Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date   : 2022-12-13T15:37:48-06:00
Stats  : +38/-26 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/apptainer/c/06fbf7b2d4fea55c0cee1172274679c69d2fd7df?branch=migrate-spdx

Log:
update to 1.1.4

---
diff --git a/81.patch b/81.patch
new file mode 100644
index 0000000..58635a3
--- /dev/null
+++ b/81.patch
@@ -0,0 +1,29 @@
+From a804a17937f35b009787760034caed43dd4dcb0a Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 7 Dec 2022 15:20:48 +0100
+Subject: [PATCH] Fix fuse_mount function argument probing
+
+The test did not check the number of arguments with certain
+fuse headers because they declare fuse_mount in <fuse.h>,
+not <fuse_lowlevel.h>.  If the compile supports implicit
+function declarations, the test always succeeds (regardless
+of parameter count).  If it does not, it always fails.
+---
+ m4/squashfuse_fuse.m4 | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/m4/squashfuse_fuse.m4 b/m4/squashfuse_fuse.m4
+index e429168b..88c37a46 100644
+--- a/m4/squashfuse_fuse.m4
++++ b/m4/squashfuse_fuse.m4
+@@ -260,7 +260,9 @@ AC_DEFUN([SQ_FUSE_API_VERSION],[
+ 		AC_CACHE_CHECK([for two-argument fuse_unmount],
+ 				[sq_cv_decl_fuse_unmount_two_arg],[
+ 			AC_LINK_IFELSE(
+-				[AC_LANG_PROGRAM([#include <fuse_lowlevel.h>],
++				[AC_LANG_PROGRAM([
++				#include <fuse.h>
++				#include <fuse_lowlevel.h>],
+ 					[fuse_unmount(0,0)])],
+ 				[sq_cv_decl_fuse_unmount_two_arg=yes],
+ 				[sq_cv_decl_fuse_unmount_two_arg=no])

diff --git a/apptainer.spec b/apptainer.spec
index 80a0540..951bfe1 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -31,15 +31,15 @@
 
 # This can be slightly different than %%{version}.
 # For example, it has dash instead of tilde for release candidates.
-%global package_version 1.1.3
+%global package_version 1.1.4
 
 # Uncomment this to include a multithreaded version of squashfuse_ll
 %global squashfuse_version 0.1.105
 
 Summary: Application and environment virtualization
 Name: apptainer
-Version: 1.1.3
-Release: 2%{?dist}
+Version: 1.1.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
@@ -52,7 +52,7 @@ Source: https://github.com/%{name}/%{name}/releases/download/v%{package_version}
 Source10: https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squashfuse-%{squashfuse_version}.tar.gz
 Patch10: https://github.com/vasi/squashfuse/pull/70.patch
 Patch11: https://github.com/vasi/squashfuse/pull/77.patch
-Patch12: squashfuse-fuse_unmount-c99.patch
+Patch12: https://github.com/vasi/squashfuse/pull/81.patch
 %endif
 # The singularity package was renamed to apptainer after version 3.8.x.
 # The apptainer package reset numbering at 1.0.0, and some singularity
@@ -111,7 +111,7 @@ Provides the optional setuid-root portion of Apptainer.
 
 %prep
 %if "%{?squashfuse_version}" != ""
-# the default directory for other steps is where the %prep section ends
+# the default directory for other steps is where the %%prep section ends
 # so do main package last
 %setup -b 10 -n squashfuse-%{squashfuse_version}
 %patch -P 10 -p1
@@ -223,6 +223,9 @@ rmdir %{_sysconfdir}/singularity/* %{_sysconfdir}/singularity 2>/dev/null || tru
 %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid
 
 %changelog
+* Tue Dec 13 2022 Dave Dykstra <dwd@fedoraproject.org> - 1.1.4
+- Update to upstream 1.1.4.
+
 * Wed Dec  7 2022 Florian Weimer <fweimer@redhat.com> - 1.1.3-2
 - Port squashfuse configure script to C99
 

diff --git a/sources b/sources
index 60a19a1..5b07250 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (squashfuse-0.1.105.tar.gz) = 6bf18575fd4732f3b0e4530902f2556859c2efbbd781a31bdbf97fe6601412dc750a80354a8ab08a3132d4f8680ea5ff0dd04440f29243906f1017aa6c70bede
-SHA512 (apptainer-1.1.3.tar.gz) = d6602cee3db9bd279b09a4cd4939a2e5474b53bcd323c181abcaedd671cefcdb47575801867fde2de5ae457aca6dc3318c2128eed20b2634bedcb3af9a06e915
+SHA512 (apptainer-1.1.4.tar.gz) = 636336bb8db254c68252021b77b498476bb21697d8f41875a3d943764d6976edc3f55bc081409f37678f7815ff7e3faef304cb61c93c0adaa4d8f7f7c9f30509

diff --git a/squashfuse-fuse_unmount-c99.patch b/squashfuse-fuse_unmount-c99.patch
deleted file mode 100644
index 69ddb96..0000000
--- a/squashfuse-fuse_unmount-c99.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-The test does not work as intended, it only tests whether the compiler
-supports implicit function declarations or not by accident.
-
-Submitted upstream: <https://github.com/vasi/squashfuse/pull/81>
-
-diff --git a/m4/squashfuse_fuse.m4 b/m4/squashfuse_fuse.m4
-index e429168..88c37a4 100644
---- a/m4/squashfuse_fuse.m4
-+++ b/m4/squashfuse_fuse.m4
-@@ -260,7 +260,9 @@ AC_DEFUN([SQ_FUSE_API_VERSION],[
- 		AC_CACHE_CHECK([for two-argument fuse_unmount],
- 				[sq_cv_decl_fuse_unmount_two_arg],[
- 			AC_LINK_IFELSE(
--				[AC_LANG_PROGRAM([#include <fuse_lowlevel.h>],
-+				[AC_LANG_PROGRAM([
-+				#include <fuse.h>
-+				#include <fuse_lowlevel.h>],
- 					[fuse_unmount(0,0)])],
- 				[sq_cv_decl_fuse_unmount_two_arg=yes],
- 				[sq_cv_decl_fuse_unmount_two_arg=no])