Accepting request 580741 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/580741
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/runc?expand=0&rev=16

_service

@@ -2,13 +2,13 @@
   <service name="download_url" mode="disabled">
     <param name="protocol">https</param>
 	<param name="host">github.com</param>
-	<param name="path">opencontainers/runc/releases/download/v1.0.0-rc4/runc.tar.xz</param>
+	<param name="path">opencontainers/runc/releases/download/v1.0.0-rc5/runc.tar.xz</param>
-	<param name="filename">runc-1.0.0-rc4.tar.xz</param>
+	<param name="filename">runc-1.0.0-rc5.tar.xz</param>
   </service>
   <service name="download_url" mode="disabled">
     <param name="protocol">https</param>
 	<param name="host">github.com</param>
-	<param name="path">opencontainers/runc/releases/download/v1.0.0-rc4/runc.tar.xz.asc</param>
+	<param name="path">opencontainers/runc/releases/download/v1.0.0-rc5/runc.tar.xz.asc</param>
-	<param name="filename">runc-1.0.0-rc4.tar.xz.asc</param>
+	<param name="filename">runc-1.0.0-rc5.tar.xz.asc</param>
   </service>
 </services>

bsc1053532-0001-makefile-drop-usage-of-install.patch

@@ -1,101 +0,0 @@
-From 6581d0f488b3bfa00760cc71c5f1fccfee302b0d Mon Sep 17 00:00:00 2001
-From: Aleksa Sarai <asarai@suse.de>
-Date: Mon, 14 Aug 2017 00:10:28 +1000
-Subject: [PATCH] makefile: drop usage of --install
-
-The "go build -i" invocation may slightly help with incremental
-recompilation, but it will cause builds to fail if $GOROOT is not
-writeable by the current user. While this does appear to work sometimes,
-it's a concern for external build systems where "-i" causes build errors
-for no real gain.
-
-Given the size of the runc project, --install is not really giving us
-much anyway.
-
-SUSE-Bug: https://bugzilla.opensuse.org/show_bug.cgi?id=1053532
-SUSE-Backport: https://github.com/opencontainers/runc/pull/1555
-Signed-off-by: Aleksa Sarai <asarai@suse.de>
----
- Makefile | 22 ++++++++++++----------
- 1 file changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 6781ac74e8a0..dc13d2e5296e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,6 +2,8 @@
- 	    localtest localunittest localintegration \
- 	    test unittest integration
- 
-+GO := go
-+
- SOURCES := $(shell find . 2>&1 | grep -E '.*\.(c|h|go)$$')
- PREFIX := $(DESTDIR)/usr/local
- BINDIR := $(PREFIX)/sbin
-@@ -27,18 +29,18 @@ SHELL := $(shell command -v bash 2>/dev/null)
- .DEFAULT: runc
- 
- runc: $(SOURCES)
--	go build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc .
-+	$(GO) build $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc .
- 
- all: runc recvtty
- 
- recvtty: contrib/cmd/recvtty/recvtty
- 
- contrib/cmd/recvtty/recvtty: $(SOURCES)
--	go build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
-+	$(GO) build $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
- 
- static: $(SOURCES)
--	CGO_ENABLED=1 go build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc .
--	CGO_ENABLED=1 go build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
-+	CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc .
-+	CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
- 
- release:
- 	@flag_list=(seccomp selinux apparmor static); \
-@@ -62,15 +64,15 @@ release:
- 			CGO_ENABLED=1; \
- 		}; \
- 		echo "Building target: $$output"; \
--		go build -i $(EXTRA_FLAGS) -ldflags "$$ldflags $(EXTRA_LDFLAGS)" -tags "$$tags" -o "$$output" .; \
-+		$(GO) build $(EXTRA_FLAGS) -ldflags "$$ldflags $(EXTRA_LDFLAGS)" -tags "$$tags" -o "$$output" .; \
- 	done
- 
- dbuild: runcimage
- 	docker run --rm -v $(CURDIR):/go/src/$(PROJECT) --privileged $(RUNC_IMAGE) make clean all
- 
- lint:
--	go vet $(allpackages)
--	go fmt $(allpackages)
-+	$(GO) vet $(allpackages)
-+	$(GO) fmt $(allpackages)
- 
- man:
- 	man/md2man-all.sh
-@@ -88,7 +90,7 @@ unittest: runcimage
- 	docker run -e TESTFLAGS -t --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localunittest
- 
- localunittest: all
--	go test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v $(allpackages)
-+	$(GO) test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v $(allpackages)
- 
- integration: runcimage
- 	docker run -e TESTFLAGS -t --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localintegration
-@@ -133,10 +135,10 @@ clean:
- 
- validate:
- 	script/validate-gofmt
--	go vet $(allpackages)
-+	$(GO) vet $(allpackages)
- 
- ci: validate localtest
- 
- # memoize allpackages, so that it's executed only once and only if used
--_allpackages = $(shell go list ./... | grep -v vendor)
-+_allpackages = $(shell $(GO) list ./... | grep -v vendor)
- allpackages = $(if $(__allpackages),,$(eval __allpackages := $$(_allpackages)))$(__allpackages)
--- 
-2.14.0
-

runc-1.0.0-rc4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a059c773455b723fa792fab3d82baa1e01de5b68defda70400ba3683831c7d95
-size 486220

runc-1.0.0-rc4.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEXzbGxhtUYBJKdfWmnhiqJn3bjbQFAlmR2awACgkQnhiqJn3b
-jbRwexAAqKQ2N5z6FDrTGL+YnSLx3YzkzUca8euGyaS1ZS6r9rjlF49CSOutZBaQ
-ipQ06JXKAIT5K7sIe7bwDWk6OmOAHbAmEqC20Hi2WNBFZR2+PyWWvKyGkIuF5joW
-D+K0DW/t+nF/YV42aJm78DRUg5UFq3QjoQwaQFr4zzNND89U6aM9doEzJYhSaKuC
-j0XTyxr5KR4w9dca+IeMaiHX7yyW5p6yuHRJLVB8Z2Ztf84nGT3xigGKD0HSDDvG
-mt5U5ctH0vJ5Q5VQzYHhVsWuIP6pEukXTguMUuUtIF+DkRyFWa2ZWEgCkmtXkuSC
-/QAggPrpB7V1bVsWdw1CeazvEBU/R1r3YVzrNR4xLbZY3iDQI+7t52HDBtYpi5i6
-nxPQqFjyHhmRtjP054Mna1ZpkxrBD7DuLt/voI94vRG7F9gThuYjZ9w0jDXOL/Jo
-GHyIPVhUxSbMwG94xqmRQVyQFHM68I6kZrzebhEDQCD9e0WF5U0cgBMZAh3HJ9of
-AvphvbWhjkWQaYAv9etEftOr3WJsoyvEyz8BtKshw6gO8P5GOePvF8vBYHsw9ufB
-ugTls8KYc/KP0pjeWwyE3xFuu2qE6uMs1fsFQClrMfaduxrLSIEL4HCNoh/2qPp0
-+THSAVpLO+ylekK0lS/RqhPVDEx5Sfia0bMI2Q1wii4kw/HhrNk=
-=26mO
------END PGP SIGNATURE-----

runc-1.0.0-rc5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0304d249d0d381fbe4812999d30491b7abebf5a730aac59119f362cb7fdb2a20
+size 527984

runc-1.0.0-rc5.tar.xz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJEBAABCAAuFiEEXzbGxhtUYBJKdfWmnhiqJn3bjbQFAlqVlBsQHGFzYXJhaUBz
+dXNlLmNvbQAKCRCeGKomfduNtO3sD/0UEQOrpDpfkBshOo7oaZXLnwJSCLEhLWh4
+E/5GI0mqL/UXupfvzPrjBdkZxUkByP0Gd7443BlcoGO2mAQsqmf3B+TiqEsGc8hc
+j+aiTu8Ld6pdxfeY0uCQKT2Lcn05/TGDH6iqJ65Enu7tYO3vX1dhLJXVP4LCv4te
+25RyCun72YbTFwCPup4HSAofstzRSd0WjUZ35kdbvTOyWheh6nx5IjeMdlo/G1hB
+T+Y3KuVvVkNioWlN/t+MyWOduvL3htHvZZ4fo7gdDbpRpf2RwYDupII5xemQSJ4X
+TXD6XkduiFLtHH+dyXaZjAccVRDGUeYIes6ecc8xlLcEf98qL/cMNbFZKDEEwzK2
+BBUsa5ONHnGQ9XvSBKNf+U/hzoQkeDVA92vgVhADIMHVfck6RivW3i4sXziwjmnA
++jC1Xn+7HrH4TSunMsBRTE34UBGdsxlO7xjl1dCszSJskJbEwZjI4sYxApV9OkXW
+FWblvnH6L2+0143xvWB0XH5gdhV7/Fo8Qpq8sXmDug7d+B2FqxspwxfGtQPGSJUK
+mYzS7/51GyIqmtUUAiySpOeeyPreBKDpoE8ztLIYHO/tcm29OEhaHzlko4k/j3/C
+w/kN/SZH8+AiW+PKWmtNpTn6meDejsfRpxtnEyy0oioMTaGc7uSiw/P07FV000Lp
+63vGcD35NQ==
+=yZC1
+-----END PGP SIGNATURE-----

runc.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Feb 27 17:18:32 UTC 2018 - asarai@suse.com
+
+- Upgrade to runc v1.0.0~rc5. Upstream changelog is available from
+  https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc5
+- Remove patch now merged upstream.
+  - bsc1053532-0001-makefile-drop-usage-of-install.patch
+
 -------------------------------------------------------------------
 Thu Aug 17 04:39:56 UTC 2017 - asarai@suse.com
 

runc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package runc
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 %define git_version %{nil}
 
 %define go_tool go
-%define _version 1.0.0-rc4
+%define _version 1.0.0-rc5
 %define project github.com/opencontainers/runc
 
 # enable libseccomp for sle >= sle12sp2
@@ -39,7 +39,7 @@
 %endif
 
 Name:           runc
-Version:        1.0.0~rc4
+Version:        1.0.0~rc5
 Release:        0
 Summary:        Tool for spawning and running OCI containers
 License:        Apache-2.0
@@ -57,8 +57,6 @@ BuildRequires:  golang(API) = 1.7
 BuildRequires:  libseccomp-devel
 %endif
 BuildRequires:  libselinux-devel
-# SUSE-FIX-UPSTREAM: Backport of https://github.com/opencontainers/runc/pull/1555. bsc#1053532
-Patch100:       bsc1053532-0001-makefile-drop-usage-of-install.patch
 Recommends:     criu
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -87,8 +85,6 @@ Test package for runc. It contains the source code and the tests.
 
 %prep
 %setup -q -n %{name}-%{_version}
-# bsc#1053532
-%patch100 -p1
 
 %build
 # Do not use symlinks. If you want to run the unit tests for this package at