Hello community, here is the log from the commit of package docker-runc for openSUSE:Factory checked in at 2017-10-20 14:39:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker-runc (Old) and /work/SRC/openSUSE:Factory/.docker-runc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-runc" Fri Oct 20 14:39:23 2017 rev:4 rq:535047 version:1.0.0rc3+gitr3201_2d41c04 Changes: -------- --- /work/SRC/openSUSE:Factory/docker-runc/docker-runc.changes 2017-09-09 20:22:48.325629947 +0200 +++ /work/SRC/openSUSE:Factory/.docker-runc.new/docker-runc.changes 2017-10-20 14:39:25.490334421 +0200 @@ -1,0 +2,18 @@ +Mon Oct 16 11:02:24 UTC 2017 - [email protected] + +- Drop backport of https://github.com/opencontainers/runc/pull/1603. bsc#1055676 + It's going to be fixed in Docker instead. + - bsc1055676-0001-rootfs-preserve-old-mount-flags-when-remounting-bind.patch + +------------------------------------------------------------------- +Mon Oct 9 11:07:35 UTC 2017 - [email protected] + +- Update to docker-runc 2d41c047c83e09a6d61d464906feb2a2f3c52aa4, which is + required for Docker v17.07-ce. +- Add backport of https://github.com/opencontainers/runc/pull/1603. bsc#1055676 + + bsc1055676-0001-rootfs-preserve-old-mount-flags-when-remounting-bind.patch +- Remove fix for CVE-2016-9962, as the patches are now included in the upstream + source. bsc#1012568 + - CVE-2016-9962.patch + +------------------------------------------------------------------- Old: ---- CVE-2016-9962.patch docker-runc-git.9c2d8d184e5da67c95d601382adf14862e4f2228.tar.xz New: ---- docker-runc-git.2d41c047c83e09a6d61d464906feb2a2f3c52aa4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker-runc.spec ++++++ --- /var/tmp/diff_new_pack.rDur3e/_old 2017-10-20 14:39:27.306249446 +0200 +++ /var/tmp/diff_new_pack.rDur3e/_new 2017-10-20 14:39:27.306249446 +0200 @@ -18,14 +18,14 @@ # MANUAL: Update the git_version, git_short, and git_revision -%define git_version 9c2d8d184e5da67c95d601382adf14862e4f2228 -%define git_short 9c2d8d1 +%define git_version 2d41c047c83e09a6d61d464906feb2a2f3c52aa4 +%define git_short 2d41c04 # How to get the git_revision # git clone ${url}.git runc-upstream # cd runc-upstream # git checkout $git_version # git_revision=r$(git rev-list HEAD | wc -l) -%define git_revision r2947 +%define git_revision r3201 %define go_tool go %define _name runc @@ -45,19 +45,16 @@ %endif Name: docker-runc -Version: 0.1.1+git%{git_revision}_%{git_short} +Version: 1.0.0rc3+git%{git_revision}_%{git_short} Release: 0 Summary: Tool for spawning and running OCI containers License: Apache-2.0 Group: System/Management Url: https://github.com/opencontainers/runc Source: %{name}-git.%{git_version}.tar.xz -# SUSE-FIX-UPSTREAM: Backport of CVE-2016-9962 fix. bsc#1012568 -Patch0: CVE-2016-9962.patch # SUSE-FIX-UPSTREAM: Backport of https://github.com/opencontainers/runc/pull/1555. bsc#1053532 Patch100: bsc1053532-0001-makefile-drop-usage-of-install.patch BuildRequires: fdupes -# Make sure we require go 1.7 BuildRequires: go-go-md2man BuildRequires: libapparmor-devel BuildRequires: golang(API) = 1.7 @@ -77,7 +74,6 @@ %package test Summary: Test package for runc -# Make sure we require go 1.7 Group: System/Management BuildRequires: golang(API) = 1.7 Requires: go-go-md2man @@ -95,8 +91,6 @@ %prep %setup -q -n %{name}-git.%{git_version} -# bsc#1012568 -%patch0 -p1 # bsc#1053532 %patch100 -p1 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.rDur3e/_old 2017-10-20 14:39:27.350247387 +0200 +++ /var/tmp/diff_new_pack.rDur3e/_new 2017-10-20 14:39:27.350247387 +0200 @@ -4,14 +4,11 @@ <param name="scm">git</param> <param name="filename">docker-runc</param> <param name="versionformat">git.%H</param> - <param name="revision">9c2d8d184e5da67c95d601382adf14862e4f2228</param> + <param name="revision">2d41c047c83e09a6d61d464906feb2a2f3c52aa4</param> <param name="exclude">.git</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="disabled"> - <param name="basename">runc</param> - </service> </services> ++++++ bsc1053532-0001-makefile-drop-usage-of-install.patch ++++++ --- /var/tmp/diff_new_pack.rDur3e/_old 2017-10-20 14:39:27.358247012 +0200 +++ /var/tmp/diff_new_pack.rDur3e/_new 2017-10-20 14:39:27.362246826 +0200 @@ -1,12 +1,12 @@ -From 678f31ecf967c4d859e47b76ec93d6f124d58266 Mon Sep 17 00:00:00 2001 -From: Aleksa Sarai <[email protected]> -Date: Mon, 14 Aug 2017 00:10:28 +1000 +From 87d1669e9704cff42dab0ea4b564a86ab6f026e6 Mon Sep 17 00:00:00 2001 +From: Valentin Rothberg <[email protected]> +Date: Tue, 12 Sep 2017 12:07:21 +0200 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 +writeable by the current user. While this does appear to work sometim +it's a concern for external build systems where "-i" causes build err for no real gain. Given the size of the runc project, --install is not really giving us @@ -15,81 +15,91 @@ 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 <[email protected]> + +(ported to 2d41c04) +Signed-off-by: Valentin Rothberg <[email protected]> --- - Makefile | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) + Makefile | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) -Index: docker-runc-git.9c2d8d184e5da67c95d601382adf14862e4f2228/Makefile -=================================================================== ---- docker-runc-git.9c2d8d184e5da67c95d601382adf14862e4f2228.orig/Makefile -+++ docker-runc-git.9c2d8d184e5da67c95d601382adf14862e4f2228/Makefile +diff --git a/Makefile b/Makefile +index d6d337dab5ca..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 - GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) -@@ -26,11 +28,11 @@ VERSION := ${shell cat ./VERSION} - - SHELL := $(shell command -v bash 2>/dev/null) +@@ -27,18 +29,18 @@ SHELL := $(shell command -v bash 2>/dev/null) + .DEFAULT: runc --all: $(RUNC_LINK) + runc: $(SOURCES) - go build -i -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -tags "$(BUILDTAGS)" -o runc . -+runc: $(RUNC_LINK) + $(GO) build $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc . - static: $(RUNC_LINK) + all: runc recvtty + + recvtty: contrib/cmd/recvtty/recvtty + + contrib/cmd/recvtty/recvtty: $(SOURCES) +- go build -i -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -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 -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -o runc . +- CGO_ENABLED=1 go build -i -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -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: $(RUNC_LINK) - @flag_list=(seccomp selinux apparmor static ambient); \ -@@ -54,8 +56,7 @@ release: $(RUNC_LINK) + release: + @flag_list=(seccomp selinux apparmor static); \ +@@ -62,15 +64,15 @@ release: CGO_ENABLED=1; \ }; \ echo "Building target: $$output"; \ -- rm -rf "${GOPATH}/pkg"; \ - go build -i -ldflags "$$ldflags" -tags "$$tags" -o "$$output" .; \ + $(GO) build $(EXTRA_FLAGS) -ldflags "$$ldflags $(EXTRA_LDFLAGS)" -tags "$$tags" -o "$$output" .; \ done - $(RUNC_LINK): -@@ -65,8 +66,8 @@ dbuild: runcimage - docker run --rm -v $(CURDIR):/go/src/$(PROJECT) --privileged $(RUNC_IMAGE) make + dbuild: runcimage + docker run --rm -v $(CURDIR):/go/src/$(PROJECT) --privileged $(RUNC_IMAGE) make clean all lint: -- go vet ./... -- go fmt ./... -+ $(GO) vet ./... -+ $(GO) fmt ./... +- go vet $(allpackages) +- go fmt $(allpackages) ++ $(GO) vet $(allpackages) ++ $(GO) fmt $(allpackages) man: man/md2man-all.sh -@@ -83,13 +84,13 @@ localtest: - unittest: runcimage - docker run -e TESTFLAGS -ti --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localunittest - --localunittest: all -- go test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v ./... -+localunittest: runc -+ $(GO) test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v ./... +@@ -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 - --localintegration: all -+localintegration: runc - bats -t tests/integration${TESTFLAGS} - - install: -@@ -119,6 +120,6 @@ clean: +@@ -133,11 +135,10 @@ clean: validate: script/validate-gofmt -- go vet ./... -+ $(GO) vet ./... +- script/validate-shfmt +- 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.1 + ++++++ docker-runc-git.9c2d8d184e5da67c95d601382adf14862e4f2228.tar.xz -> docker-runc-git.2d41c047c83e09a6d61d464906feb2a2f3c52aa4.tar.xz ++++++ ++++ 213891 lines of diff (skipped)
