Rebased toolbox-Don-t-use-Go-s-semantic-import-versioning.patch

toolbox-Don-t-use-Go-s-semantic-import-versioning.patch

@@ -1,12 +1,13 @@
-From 4039c49b0cd2111cd1c505b9a9aef25aeebb6a0e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Harry=20M=C3=ADchal?= <harrymichal@seznam.cz>
-Date: Sat, 27 Jun 2020 16:17:56 +0200
+From c6e3a241c54fb16494d129bb8a455e874e0ba1ba Mon Sep 17 00:00:00 2001
+From: Oliver Gutierrez <ogutierrez@fedoraproject.org>
+Date: Wed, 28 Jul 2021 17:58:48 +0100
 Subject: [PATCH] Don't use Go's semantic import versioning
 
 Fedora doesn't support Go modules when building Go programs. This
 means that source code using semantic import versioning can't be built.
 
 https://github.com/containers/toolbox/pull/484
+
 ---
  src/cmd/create.go      | 2 +-
  src/go.mod             | 2 +-
@@ -15,7 +16,7 @@ https://github.com/containers/toolbox/pull/484
  4 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/cmd/create.go b/src/cmd/create.go
-index 50938890b22f..29bc0f2c42f7 100644
+index 8b31365..502f691 100644
 --- a/src/cmd/create.go
 +++ b/src/cmd/create.go
 @@ -28,7 +28,7 @@ import (
@@ -28,7 +29,7 @@ index 50938890b22f..29bc0f2c42f7 100644
  	"github.com/spf13/cobra"
  	"golang.org/x/crypto/ssh/terminal"
 diff --git a/src/go.mod b/src/go.mod
-index 219d3d578992..7e1a6807fd7e 100644
+index cce3e5a..eb7f70c 100644
 --- a/src/go.mod
 +++ b/src/go.mod
 @@ -8,7 +8,7 @@ require (
@@ -41,10 +42,10 @@ index 219d3d578992..7e1a6807fd7e 100644
  	github.com/sirupsen/logrus v1.4.2
  	github.com/spf13/cobra v0.0.5
 diff --git a/src/go.sum b/src/go.sum
-index 5a03a6823698..d9ce63604fcf 100644
+index fbad155..737f058 100644
 --- a/src/go.sum
 +++ b/src/go.sum
-@@ -18,8 +18,8 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
+@@ -20,8 +20,8 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
  github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
  github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
  github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -52,11 +53,11 @@ index 5a03a6823698..d9ce63604fcf 100644
 -github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 +github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=
 +github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
+ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
  github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
  github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
- github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go
-index 5455298cbce4..3f7fc26147fc 100644
+index ae7c596..4d1556a 100644
 --- a/src/pkg/utils/utils.go
 +++ b/src/pkg/utils/utils.go
 @@ -33,7 +33,7 @@ import (
@@ -66,8 +67,8 @@ index 5455298cbce4..3f7fc26147fc 100644
 -	"github.com/godbus/dbus/v5"
 +	"github.com/godbus/dbus"
  	"github.com/sirupsen/logrus"
+ 	"github.com/spf13/viper"
  	"golang.org/x/sys/unix"
- )
 -- 
-2.25.4
+2.31.1