From 6de90fe70b68c0fe9df386207dee35b8095136d5 Mon Sep 17 00:00:00 2001
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
Date: Jul 14 2020 18:08:27 +0000
Subject: no longer needed


---

diff --git a/4769.patch b/4769.patch
deleted file mode 100644
index cbe3a8f..0000000
--- a/4769.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 67324085bd1c0ecf542c5181d547a5d4e4b09d47 Mon Sep 17 00:00:00 2001
-From: Dave Dykstra <dwd@fnal.gov>
-Date: Wed, 20 Nov 2019 02:07:30 -0500
-Subject: [PATCH] switch back to build with golang-1.11
-
----
- internal/app/singularity/plugin_uninstall_linux.go | 2 +-
- internal/pkg/build/sources/oci_unpack_linux.go     | 2 +-
- internal/pkg/util/goversion/goversion.go           | 6 +++---
- internal/pkg/util/goversion/version_check.go       | 4 ++--
- mconfig                                            | 2 +-
- mlocal/frags/go_common_opts.mk                     | 2 +-
- 6 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/internal/app/singularity/plugin_uninstall_linux.go b/internal/app/singularity/plugin_uninstall_linux.go
-index 0f28b6e747..151d833b70 100644
---- a/internal/app/singularity/plugin_uninstall_linux.go
-+++ b/internal/app/singularity/plugin_uninstall_linux.go
-@@ -18,7 +18,7 @@ var ErrPluginNotFound = errors.New("plugin not found")
- // UninstallPlugin removes the named plugin from the system.
- func UninstallPlugin(name, libexecdir string) error {
- 	err := plugin.Uninstall(name, libexecdir)
--	if errors.Is(err, os.ErrNotExist) {
-+	if err == os.ErrNotExist {
- 		return ErrPluginNotFound
- 	}
- 	if err != nil {
-diff --git a/internal/pkg/build/sources/oci_unpack_linux.go b/internal/pkg/build/sources/oci_unpack_linux.go
-index fbca8dc539..7b0e2ee3c9 100644
---- a/internal/pkg/build/sources/oci_unpack_linux.go
-+++ b/internal/pkg/build/sources/oci_unpack_linux.go
-@@ -163,7 +163,7 @@ func checkPerms(rootfs string) (err error) {
- 		return nil
- 	})
- 
--	if errors.Is(err, errRestrictivePerm) {
-+	if err == errRestrictivePerm {
- 		sylog.Warningf("Permission handling has changed in Singularity 3.5 for improved OCI compatibility")
- 		sylog.Warningf("The sandbox will contain files/dirs that cannot be removed until permissions are modified")
- 		sylog.Warningf("Use 'chmod -R u+rwX' to set permissions that allow removal")
-diff --git a/internal/pkg/util/goversion/goversion.go b/internal/pkg/util/goversion/goversion.go
-index f7561f9708..2379e4e382 100644
---- a/internal/pkg/util/goversion/goversion.go
-+++ b/internal/pkg/util/goversion/goversion.go
-@@ -3,11 +3,11 @@
- // LICENSE.md file distributed with the sources of this project regarding your
- // rights to use or distribute this software.
- 
--// +build go1.13
-+// +build go1.11
- 
- package goversion
- 
--// __BUILD_REQUIRES_GO_VERSION_1_13_OR_LATER__ provides a human-readable
-+// __BUILD_REQUIRES_GO_VERSION_1_11_OR_LATER__ provides a human-readable
- // error message when building this package with an unsupported version
- // of the Go compiler.
- //
-@@ -15,4 +15,4 @@ package goversion
- // version specified in the build tag above.
- //
- // nolint:golint
--const __BUILD_REQUIRES_GO_VERSION_1_13_OR_LATER__ = uint8(0)
-+const __BUILD_REQUIRES_GO_VERSION_1_11_OR_LATER__ = uint8(0)
-diff --git a/internal/pkg/util/goversion/version_check.go b/internal/pkg/util/goversion/version_check.go
-index 31d6cbca31..8a216bf345 100644
---- a/internal/pkg/util/goversion/version_check.go
-+++ b/internal/pkg/util/goversion/version_check.go
-@@ -10,7 +10,7 @@
- // sufficient to trigger a build failure like:
- //
- //     ...
--//     ../internal/pkg/util/goversion/version_check.go:19:9: undefined: __BUILD_REQUIRES_GO_VERSION_1_13_OR_LATER__
-+//     ../internal/pkg/util/goversion/version_check.go:19:9: undefined: __BUILD_REQUIRES_GO_VERSION_1_11_OR_LATER__
- //
- //
- // This is based on the technique presented at
-@@ -19,4 +19,4 @@ package goversion
- 
- // keep the variable here in sync with the mininum required version
- // specified in goversion.go
--var _ = __BUILD_REQUIRES_GO_VERSION_1_13_OR_LATER__
-+var _ = __BUILD_REQUIRES_GO_VERSION_1_11_OR_LATER__
-diff --git a/mconfig b/mconfig
-index cd38f0831d..b042b00c52 100755
---- a/mconfig
-+++ b/mconfig
-@@ -20,7 +20,7 @@ hstld=
- hstranlib=
- hstobjcopy=
- hstgo=
--hstgo_version="1.13"
-+hstgo_version="1.11"
- hstgo_opts="go"
- 
- tgtcc=
-diff --git a/mlocal/frags/go_common_opts.mk b/mlocal/frags/go_common_opts.mk
-index c1d3cb4eb4..39a6dbd34a 100644
---- a/mlocal/frags/go_common_opts.mk
-+++ b/mlocal/frags/go_common_opts.mk
-@@ -7,7 +7,7 @@ GO_BUILDMODE := -buildmode=default
- GO_GCFLAGS :=
- GO_ASMFLAGS :=
- GO_MODFLAGS := $(if $(wildcard $(SOURCEDIR)/vendor/modules.txt),-mod=vendor,-mod=readonly)
--GOFLAGS := $(GO_MODFLAGS) -trimpath
-+GOFLAGS := $(GO_MODFLAGS)
- GOPROXY := https://proxy.golang.org
- 
- export GOFLAGS GO111MODULE GOPROXY