[rpms/apptainer] migrate-spdx: Port squashfuse configure script to C99

[Florian Weimer <fweimer@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/apptainer
            Branch : migrate-spdx
            Commit : dfe3385507de55eea9204416ae7506ec3fb75490
            Author : Florian Weimer <fweimer@redhat.com>
            Date   : 2022-12-07T15:24:54+01:00
            Stats  : +26/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/apptainer/c/dfe3385507de55eea9204416ae7506ec3fb75490?branch=migrate-spdx

            Log:
            Port squashfuse configure script to C99

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>

---
diff --git a/apptainer.spec b/apptainer.spec
index 743ad34..80a0540 100644
--- a/apptainer.spec
+++ b/apptainer.spec
@@ -39,7 +39,7 @@
 Summary: Application and environment virtualization
 Name: apptainer
 Version: 1.1.3
-Release: 1%{?dist}
+Release: 2%{?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,6 +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
 %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
@@ -115,6 +116,7 @@ Provides the optional setuid-root portion of Apptainer.
 %setup -b 10 -n squashfuse-%{squashfuse_version}
 %patch -P 10 -p1
 %patch -P 11 -p1
+%patch -P 12 -p1
 %setup -n %{name}-%{package_version}
 %else
 %autosetup -n %{name}-%{package_version}
@@ -221,6 +223,9 @@ rmdir %{_sysconfdir}/singularity/* %{_sysconfdir}/singularity 2>/dev/null || tru
 %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid
 
 %changelog
+* Wed Dec  7 2022 Florian Weimer <fweimer@redhat.com> - 1.1.3-2
+- Port squashfuse configure script to C99
+
 * Tue Oct 25 2022 Dave Dykstra <dwd@fedoraproject.org> - 1.1.3
 - Update to upstream 1.1.3.
 

diff --git a/squashfuse-fuse_unmount-c99.patch b/squashfuse-fuse_unmount-c99.patch
new file mode 100644
index 0000000..69ddb96
--- /dev/null
+++ b/squashfuse-fuse_unmount-c99.patch
@@ -0,0 +1,20 @@
+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])