From 5edb3b847e2f4712963e481236c840886d1a32d2 Mon Sep 17 00:00:00 2001
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date: Sep 05 2019 14:31:45 +0000
Subject: add patch 4380, update to 3.4.0-1.2


---

diff --git a/4380.patch b/4380.patch
new file mode 100644
index 0000000..07b7e7c
--- /dev/null
+++ b/4380.patch
@@ -0,0 +1,22 @@
+From 1fbc9a278df9d8ae0306c433f42eabe0250dae63 Mon Sep 17 00:00:00 2001
+From: Cedric Clerget <cedric.clerget@gmail.com>
+Date: Wed, 4 Sep 2019 18:34:00 +0200
+Subject: [PATCH] Fix FuseMount check causing to always set PID namespace
+
+---
+ cmd/internal/cli/actions_linux.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmd/internal/cli/actions_linux.go b/cmd/internal/cli/actions_linux.go
+index b6c71ab31c..a4189bd640 100644
+--- a/cmd/internal/cli/actions_linux.go
++++ b/cmd/internal/cli/actions_linux.go
+@@ -284,7 +284,7 @@ func execStarter(cobraCmd *cobra.Command, image string, args []string, name stri
+ 	}
+ 
+ 	engineConfig.SetBindPath(BindPaths)
+-	if FuseMount != nil {
++	if len(FuseMount) > 0 {
+ 		/* If --fusemount is given, imply --pid */
+ 		PidNamespace = true
+ 		engineConfig.SetFuseMount(FuseMount)
diff --git a/singularity.spec b/singularity.spec
index e13e673..a74c986 100644
--- a/singularity.spec
+++ b/singularity.spec
@@ -30,7 +30,7 @@
 Summary: Application and environment virtualization
 Name: singularity
 Version: 3.4.0
-Release: 1.1%{?dist}
+Release: 1.2%{?dist}
 # https://spdx.org/licenses/BSD-3-Clause-LBNL.html
 License: BSD-3-Clause-LBNL
 URL: https://www.sylabs.io/singularity/
@@ -38,6 +38,7 @@ Source: %{name}-%{version}.tar.gz
 # https://github.com/sylabs/singularity/pull/4346.patch
 Patch0: 4370.patch
 Patch1: 4346.patch
+Patch2: 4380.patch
 ExclusiveOS: linux
 # RPM_BUILD_ROOT wasn't being set ... for some reason
 %if "%{sles_version}" == "11"
@@ -101,6 +102,7 @@ cd $GOPATH/%{singgopath}
 
 patch -p1 <%{PATCH0}
 patch -p1 <%{PATCH1}
+patch -p1 <%{PATCH2}
 
 # Not all of these parameters currently have an effect, but they might be
 #  used someday.  They are the same parameters as in the configure macro.
@@ -167,6 +169,9 @@ chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/singularity/actions/*
 
 
 %changelog
+* Thu Sep 05 2019 Dave Dykstra <dwd@fedoraproject.org> - 3.4.0-1.2
+- Add fix for bug that always enabled --pid (PR #4380)
+
 * Tue Sep 03 2019 Dave Dykstra <dwd@fedoraproject.org> - 3.4.0-1.1
 - Update to upstream 3.4.0-1
 - Fix compiles on non-64 bit architectures (PR #4370)