diff -Nru containerd-1.2.6/debian/changelog containerd-1.2.6/debian/changelog --- containerd-1.2.6/debian/changelog 2019-04-12 00:28:52.000000000 +0000 +++ containerd-1.2.6/debian/changelog 2019-07-03 12:06:38.000000000 +0000 @@ -1,3 +1,26 @@ +containerd (1.2.6-0ubuntu1~16.04.3) xenial-security; urgency=medium + + * No change rebuild for the -security pocket + + -- Mike Salvatore Wed, 03 Jul 2019 08:06:38 -0400 + +containerd (1.2.6-0ubuntu1~16.04.2) xenial; urgency=medium + + * Increase runc version requirement. + + -- Michael Hudson-Doyle Thu, 16 May 2019 15:43:29 +1200 + +containerd (1.2.6-0ubuntu1~16.04.1) xenial; urgency=medium + + * Backport to 16.04. (LP: #1824461) + * Build with golang-1.10-go. + * Build depend on btrfs-tools, not libbtrfs-dev or btrfs-progs. + * Re-add Build-Depends: on dh-systemd + * Disable race testing as go 1.10 race runtime not yet present in Xenial. + * Add Breaks: docker.io (<= 18.09.3~) + + -- Michael Hudson-Doyle Tue, 16 Apr 2019 13:50:23 +1200 + containerd (1.2.6-0ubuntu1) disco; urgency=medium * New upstream release. diff -Nru containerd-1.2.6/debian/control containerd-1.2.6/debian/control --- containerd-1.2.6/debian/control 2019-04-11 23:34:58.000000000 +0000 +++ containerd-1.2.6/debian/control 2019-05-16 03:42:14.000000000 +0000 @@ -5,10 +5,10 @@ XSBC-Original-Maintainer: Debian Go Packaging Team Uploaders: Tianon Gravi Build-Depends: debhelper (>= 9), + dh-systemd, go-md2man, - golang-go (>= 2:1.10~), - golang-race-detector-runtime [amd64], - libbtrfs-dev | btrfs-progs (<< 4.16.1~), + golang-1.10-go, + btrfs-tools, libseccomp-dev, pkg-config Standards-Version: 3.9.7 @@ -19,7 +19,8 @@ Package: containerd Architecture: linux-any -Depends: runc (>= 1.0.0~rc2~), ${misc:Depends}, ${shlibs:Depends} +Depends: runc (>= 1.0.0~rc7~), ${misc:Depends}, ${shlibs:Depends} +Breaks: docker.io (<= 18.09.3~) Built-Using: ${misc:Built-Using} Description: daemon to control runC Containerd is a daemon to control runC, built for performance and density. diff -Nru containerd-1.2.6/debian/patches/disable-race-tests.patch containerd-1.2.6/debian/patches/disable-race-tests.patch --- containerd-1.2.6/debian/patches/disable-race-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ containerd-1.2.6/debian/patches/disable-race-tests.patch 2019-04-16 01:50:07.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -20,8 +20,3 @@ + ifeq ($(GOOS),linux) + GO_GCFLAGS += -buildmode=pie + endif +- +-# amd64 supports go test -race +-ifeq ($(GOARCH),amd64) +- TESTFLAGS_RACE= -race +-endif diff -Nru containerd-1.2.6/debian/patches/series containerd-1.2.6/debian/patches/series --- containerd-1.2.6/debian/patches/series 2019-04-11 23:34:58.000000000 +0000 +++ containerd-1.2.6/debian/patches/series 2019-04-16 01:50:07.000000000 +0000 @@ -0,0 +1 @@ +disable-race-tests.patch diff -Nru containerd-1.2.6/debian/rules containerd-1.2.6/debian/rules --- containerd-1.2.6/debian/rules 2019-04-11 23:34:58.000000000 +0000 +++ containerd-1.2.6/debian/rules 2019-04-16 01:50:07.000000000 +0000 @@ -5,6 +5,7 @@ # temporary build path (see http://golang.org/doc/code.html#GOPATH) OUR_GOPATH := $(CURDIR)/.gopath export GOPATH := $(OUR_GOPATH) +export PATH := /usr/lib/go-1.10/bin:$(PATH) override_dh_auto_configure: # copy pristine source for "/usr/share/gocode" to get into "golang-github-containerd-containerd-dev" before we muddy it with build artifacts, etc