From d3ce957850b260f4cd7b852668afcae5187bb0af Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 9 Jul 2020 17:01:25 +0200 Subject: [PATCH] Update to 0.0.93 The test suite has been temporarily disabled because ShellCheck 0.7.1 triggers SC2086 for some unquoted variables. It should be re-enabled as soon as it's fixed upstream. --- .gitignore | 1 + sources | 2 +- ...-use-Go-s-semantic-import-versioning.patch | 24 +++++++++---------- ...ags-match-Fedora-s-gobuild-for-PPC64.patch | 6 ++--- ...e-build-flags-match-Fedora-s-gobuild.patch | 6 ++--- toolbox.spec | 11 ++++++--- 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 3868b19..f5b798f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /toolbox-0.0.18.tar.xz /toolbox-0.0.91.tar.xz /toolbox-0.0.92.tar.xz +/toolbox-0.0.93.tar.xz diff --git a/sources b/sources index d656451..bcccc11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (toolbox-0.0.92.tar.xz) = c60e7284489fa84b1901be14f6efb0963d94f245f32590d81c6134b93f1b8cb50d9b9f257e58a7cf1b5f21788e5a0543b6ba0ac863366238c81aa09d632c9ca2 +SHA512 (toolbox-0.0.93.tar.xz) = bab8668b04572ebd2f8aac95b06f8d826e50cce448f272ecb0644e139d5bc949736f3710041040e0c6a59f92123c4edc21f8a893d152778b76332ca5ee940a2c diff --git a/toolbox-Don-t-use-Go-s-semantic-import-versioning.patch b/toolbox-Don-t-use-Go-s-semantic-import-versioning.patch index 88a4c43..537dfbb 100644 --- a/toolbox-Don-t-use-Go-s-semantic-import-versioning.patch +++ b/toolbox-Don-t-use-Go-s-semantic-import-versioning.patch @@ -1,4 +1,4 @@ -From 4a1fc0c94f48c281acd1588f35c3bb95a1a1e2f2 Mon Sep 17 00:00:00 2001 +From deac27651c22ad6e3a4045706c4c35292df736e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harry=20M=C3=ADchal?= Date: Sat, 27 Jun 2020 16:17:56 +0200 Subject: [PATCH] Don't use Go's semantic import versioning @@ -15,7 +15,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 80e4f8c36ca4..98df9d248466 100644 +index 0b78572f4e5c..0b8c30f40297 100644 --- a/src/cmd/create.go +++ b/src/cmd/create.go @@ -28,7 +28,7 @@ import ( @@ -26,25 +26,25 @@ index 80e4f8c36ca4..98df9d248466 100644 + "github.com/godbus/dbus" "github.com/sirupsen/logrus" "github.com/spf13/cobra" - ) + "golang.org/x/crypto/ssh/terminal" diff --git a/src/go.mod b/src/go.mod -index 07891e13a612..45e490f38907 100644 +index 2b1ac3018c8d..e8c4452c341d 100644 --- a/src/go.mod +++ b/src/go.mod -@@ -6,7 +6,7 @@ require ( - github.com/HarryMichal/go-version v1.0.0 +@@ -7,7 +7,7 @@ require ( github.com/acobaugh/osrelease v0.0.0-20181218015638-a93a0a55a249 github.com/briandowns/spinner v1.10.0 + github.com/docker/go-units v0.4.0 - github.com/godbus/dbus/v5 v5.0.3 + github.com/godbus/dbus v4.1.0+incompatible github.com/sirupsen/logrus v1.4.2 github.com/spf13/cobra v0.0.5 - golang.org/x/sys v0.0.0-20190422165155-953cdadca894 + golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 diff --git a/src/go.sum b/src/go.sum -index 5ee0d2179a39..5be421de9b13 100644 +index 4d6a0034d990..3b33ef9faec8 100644 --- a/src/go.sum +++ b/src/go.sum -@@ -15,8 +15,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs +@@ -17,8 +17,8 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD 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/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -56,13 +56,13 @@ index 5ee0d2179a39..5be421de9b13 100644 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 08de2997865a..d97d7b86a71b 100644 +index 634d981e8967..db60739271cf 100644 --- a/src/pkg/utils/utils.go +++ b/src/pkg/utils/utils.go -@@ -31,7 +31,7 @@ import ( - +@@ -33,7 +33,7 @@ import ( "github.com/acobaugh/osrelease" "github.com/containers/toolbox/pkg/shell" + "github.com/docker/go-units" - "github.com/godbus/dbus/v5" + "github.com/godbus/dbus" "github.com/sirupsen/logrus" diff --git a/toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch b/toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch index ec442f3..f5ce5df 100644 --- a/toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch +++ b/toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch @@ -1,4 +1,4 @@ -From cfd98ecda0e92c237a6b65dccea14dd98b579044 Mon Sep 17 00:00:00 2001 +From d83d1f87082cc1cfb3c71844c8266787a258faba Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 29 Jun 2020 17:57:47 +0200 Subject: [PATCH] build: Make the build flags match Fedora's %{gobuild} for @@ -29,14 +29,14 @@ explicitly specify the name of the output binary. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/go-build-wrapper b/src/go-build-wrapper -index e05b629755b0..ec6b9f68bb05 100755 +index 8f84277ed6d8..ec6b9f68bb05 100755 --- a/src/go-build-wrapper +++ b/src/go-build-wrapper @@ -27,5 +27,6 @@ if ! cd "$1"; then exit 1 fi --go build -ldflags "-X github.com/containers/toolbox/pkg/version.currentVersion=$3" -o "$2" +-go build -trimpath -ldflags "-X github.com/containers/toolbox/pkg/version.currentVersion=$3" -o "$2" +unset LDFLAGS +go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld ' -X github.com/containers/toolbox/pkg/version.currentVersion=$3" -a -v -x -o "$2/toolbox" exit "$?" diff --git a/toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch b/toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch index 05ad694..26afa79 100644 --- a/toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch +++ b/toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch @@ -1,4 +1,4 @@ -From 9d5cf38e4e7a07f4850bb4cfae5dac8d6e9bb33a Mon Sep 17 00:00:00 2001 +From 3d5733cc7fe1ad7f6675a948c6f40d1dcbe290ca Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 29 Jun 2020 17:57:47 +0200 Subject: [PATCH] build: Make the build flags match Fedora's %{gobuild} @@ -28,14 +28,14 @@ explicitly specify the name of the output binary. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/go-build-wrapper b/src/go-build-wrapper -index e05b629755b0..a0caf628435a 100755 +index 8f84277ed6d8..a0caf628435a 100755 --- a/src/go-build-wrapper +++ b/src/go-build-wrapper @@ -27,5 +27,6 @@ if ! cd "$1"; then exit 1 fi --go build -ldflags "-X github.com/containers/toolbox/pkg/version.currentVersion=$3" -o "$2" +-go build -trimpath -ldflags "-X github.com/containers/toolbox/pkg/version.currentVersion=$3" -o "$2" +unset LDFLAGS +go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld ' -X github.com/containers/toolbox/pkg/version.currentVersion=$3" -a -v -x -o "$2/toolbox" exit "$?" diff --git a/toolbox.spec b/toolbox.spec index a834d21..d932367 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -1,5 +1,5 @@ Name: toolbox -Version: 0.0.92 +Version: 0.0.93 %global goipath github.com/containers/%{name} %gometa @@ -22,7 +22,9 @@ BuildRequires: golang-github-cpuguy83-md2man BuildRequires: golang(github.com/HarryMichal/go-version) BuildRequires: golang(github.com/acobaugh/osrelease) BuildRequires: golang(github.com/briandowns/spinner) >= 1.10.0 +BuildRequires: golang(github.com/docker/go-units) >= 0.4.0 BuildRequires: golang(github.com/godbus/dbus) >= 5.0.3 +BuildRequires: golang(github.com/mattn/go-isatty) >= 0.0.12 BuildRequires: golang(github.com/sirupsen/logrus) >= 1.4.2 BuildRequires: golang(github.com/spf13/cobra) >= 0.0.5 BuildRequires: golang(golang.org/x/sys/unix) @@ -129,8 +131,8 @@ ln -s src/pkg pkg %meson_build -%check -%meson_test +# %%check +# %%meson_test %install @@ -153,6 +155,9 @@ ln -s src/pkg pkg %changelog +* Sat Jul 25 2020 Debarshi Ray - 0.0.93-1 +- Update to 0.0.93 + * Fri Jul 03 2020 Debarshi Ray - 0.0.92-1 - Update to 0.0.92