Accepting request 993258 from home:mslacken:pr

* Added fix-32bit-compilation.patch from upstream

OBS-URL: https://build.opensuse.org/request/show/993258
OBS-URL: https://build.opensuse.org/package/show/network:cluster/apptainer?expand=0&rev=15

apptainer.changes

@@ -131,6 +131,7 @@ Thu Aug  4 12:31:33 UTC 2022 - Christian Goll <cgoll@suse.com>
   * Fix the issue that the oras protocol would ignore the --no-https/--nohttps flag.
 - File changes
   * Removed useful_error_message.patch as not needed any more
+  * Added fix-32bit-compilation.patch from upstream
 
 
 -------------------------------------------------------------------

apptainer.spec

@@ -35,6 +35,7 @@ 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
@@ -67,6 +68,7 @@ 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}

fix-32bit-compilation.patch

@@ -0,0 +1,26 @@
+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
+