From 2e4713516b3fe5c0c4a4b2144593c24c52c4581d Mon Sep 17 00:00:00 2001
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date: Dec 15 2021 00:00:20 +0000
Subject: update to 3.8.5-2, include go source


---

diff --git a/.gitignore b/.gitignore
index 23115cb..75a7ddf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /singularity-*.tar.gz
+/go*.tar.gz
diff --git a/singularity.spec b/singularity.spec
index 31f0a27..075e87d 100644
--- a/singularity.spec
+++ b/singularity.spec
@@ -29,14 +29,17 @@
 # For example, it has dash instead of tilde for release candidates.
 %define package_version 3.8.5
 
+%define goversion 1.16.12
+
 Summary: Application and environment virtualization
 Name: singularity
 Version: 3.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 # https://spdx.org/licenses/BSD-3-Clause-LBNL.html
 License: BSD-3-Clause-LBNL
 URL: https://singularity.hpcng.org
 Source: %{name}-%{package_version}.tar.gz
+Source1: go%{goversion}.src.tar.gz
 ExclusiveOS: linux
 # RPM_BUILD_ROOT wasn't being set ... for some reason
 %if "%{sles_version}" == "11"
@@ -95,6 +98,18 @@ mkdir %{name}-%{version}
 %build
 cd %{name}-%{version}
 
+%if "%{?SOURCE1}" != ""
+# build the go tool chain from source, because the default on most OSes has
+#  a security flaw we want to avoid.
+pushd ..
+tar -xf %SOURCE1
+cd go/src
+./make.bash
+cd ../..
+export PATH=$PWD/go/bin:$PATH
+popd
+%endif
+
 # Setup an empty GOPATH for the build
 mkdir -p gopath
 
@@ -128,7 +143,9 @@ make old_config=
 %install
 cd %{name}-%{version}
 
-# Setup an empty GOPATH for the build
+%if "%{?SOURCE1}" != ""
+export PATH=$PWD/go/bin:$PATH
+%endif
 export GOPATH=$PWD/gopath
 export PATH=$GOPATH/bin:$PATH
 
@@ -168,6 +185,9 @@ make DESTDIR=$RPM_BUILD_ROOT install man
 
 
 %changelog
+* Tue Dec 14 2021 Dave Dykstra <dwd@fedoraproject.org> - 3.8.5-2
+- Rebuild using golang-1.16.12
+
 * Mon Nov 29 2021 Dave Dykstra <dwd@fedoraproject.org> - 3.8.5-1
 - Upgrade to upstream 3.8.5
 
diff --git a/sources b/sources
index f0cd508..1f8259f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (singularity-3.8.5.tar.gz) = 857761f47528a841a3cf11b49583ab7e8a2d137703e1826ff194011abba3334ed06859219e0c457f352304e7b18f1c493a8b337cc5df67981eb428c567d0ac5f
+SHA512 (go1.16.12.src.tar.gz) = 01a641b1c52890ff375f62761db4d87f7207297c7971951ba9305aa99313b5ba3014cb7555096a8fd04c97c208d2432d71d94aa9134d1617f8bedb203aa91b58