From: Peter Michael Green Date: Tue, 15 Oct 2019 13:24:57 +0000 (+0000) Subject: Manual merge of version 18.09.1+dfsg1-7.1+rpi1 and 18.09.9+dfsg1-5 to produce 18... X-Git-Tag: archive/raspbian/18.09.9+dfsg1-5+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b5047871a4e56f621d548b98ad5a8e968e9bf74e;p=docker.io.git Manual merge of version 18.09.1+dfsg1-7.1+rpi1 and 18.09.9+dfsg1-5 to produce 18.09.9+dfsg1-5+rpi1 --- b5047871a4e56f621d548b98ad5a8e968e9bf74e diff --cc debian/changelog index dc417016,188f43d8..e067e3ca --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,95 +1,102 @@@ - docker.io (18.09.1+dfsg1-7.1+rpi1) buster-staging; urgency=medium ++docker.io (18.09.9+dfsg1-5+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 18.06.1+dfsg1-2+rpi1 by Peter Michael Green at Sat, 26 Jan 2019 01:54:38 +0000] + * Disable testsuite. + - -- Raspbian forward porter Sun, 07 Jul 2019 14:50:07 +0000 ++ -- Peter Michael Green Tue, 15 Oct 2019 13:21:57 +0000 ++ + docker.io (18.09.9+dfsg1-5) unstable; urgency=medium + + [ Arnaud Rebillout ] + * Drop unused build depends + + [ Dmitry Smirnov ] + * Patch Docker to use jwt-go v3. + * Use golang-github-dgrijalva-jwt-go-dev (not -v3). + * dev: install new "containerd/*" files + (as required by "singularity-container"). + + -- Dmitry Smirnov Tue, 08 Oct 2019 14:37:25 +1100 + + docker.io (18.09.9+dfsg1-4) unstable; urgency=medium + + * d/control: Break/replace/provide containerd-dev (Closes: #941091) + * d/control: Order and indent a few things + + -- Arnaud Rebillout Wed, 25 Sep 2019 08:07:12 +0700 + + docker.io (18.09.9+dfsg1-3) unstable; urgency=medium + + [ Arnaud Rebillout ] + * d/control: Remove duplicate comma in build depends (Closes: #935488) + * d/control: Standards Version 4.4.0 + + [ Dmitry Smirnov ] + * Provides += golang-github-docker-go-metrics-dev + + -- Dmitry Smirnov Tue, 24 Sep 2019 12:45:51 +1000 + + docker.io (18.09.9+dfsg1-2) unstable; urgency=medium + + * Re-enable engine unit tests again. + + -- Arnaud Rebillout Mon, 16 Sep 2019 13:35:15 +0700 + + docker.io (18.09.9+dfsg1-1) unstable; urgency=medium + + [ Arnaud Rebillout ] + * New upstream release [18.09.9]. + * Disable engine unit tests (tmp, until gotestsum makes it to Debian). + + [ Dawid Dziurla ] + * Install fish completions + + -- Arnaud Rebillout Mon, 16 Sep 2019 11:18:11 +0700 + + docker.io (18.09.8+dfsg1-1) unstable; urgency=medium + + [ Dmitry Smirnov ] + * New upstream release [18.09.8]. + * Tighten various dependencies. + * Update -dev dependencies (for libpod). + * Backport oci/caps from 19.03.2 (for libpod). + * Un-vendor golang-github-ishidawataru-sctp-dev. + * Add upstream patch for libnetwork to build against newer sctp. + * Add upstream patch to build against + golang-github-opencontainers-selinux-dev (>= 1.3.0~). + * No longer disable Go cache to prevent FTBFS with Go 1.12. + + [ Arnaud Rebillout ] + * github-golang-docker-docker-dev: fix go-metrics install path. + * github-golang-docker-docker-dev: add replaces/breaks on docker-go-metrics-dev. + * Add patch to fix Debian security presence check (Closes: #925224). + + [ Reinhard Tartler ] + * github-golang-docker-docker-dev: add missing sources (Closes: #924257) + * Additional missing sources for openshift/imagebuilder + + -- Arnaud Rebillout Sat, 14 Sep 2019 10:10:55 +0700 + + docker.io (18.09.1+dfsg1-9) unstable; urgency=medium + + [ Dmitry Smirnov ] + * rules: no longer disable Go cache to prevent FTBFS with Go 1.12. + + [ Felix Geyer ] + * Cherry-pick upstream commits to fix test failures with golang >= 1.11.6-1+deb10u1 + * Add upstream patch for CVE-2019-14271 + * Fix build failure with gogo/protobuf >= 1.2 + + -- Arnaud Rebillout Wed, 04 Sep 2019 14:54:29 +0700 + + docker.io (18.09.1+dfsg1-8) unstable; urgency=medium + + * Make myself the maintainer, and Dmitry uploader. + (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908868) + * Add upstream patches for CVE-2019-13509 (Closes: #932673). + * Add upstream patch for CVE-2019-13139 (Closes: #933002). + + -- Arnaud Rebillout Mon, 05 Aug 2019 15:27:57 +0700 docker.io (18.09.1+dfsg1-7.1) unstable; urgency=medium diff --cc debian/rules index 142cfb92,062eaefd..b1742035 --- a/debian/rules +++ b/debian/rules @@@ -145,9 -142,10 +142,10 @@@ override_dh_auto_test-indep override_dh_auto_test-arch: ### [[[ DO NOT DISABLE TESTS ]]] [[[ DO *NOT* DISABLE TESTS ]]] - #DH_GOLANG_EXCLUDES="integration-cli integration test/integration" \ - #dh_auto_test -v --max-parallel=4 -- -short + DH_GOLANG_EXCLUDES="integration-cli integration test/integration" \ + dh_auto_test -v --max-parallel=4 -- -short -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + ## Test engine: # cd '$(OUR_GOPATH)/src/$(DH_GOPKG)' \ # && TESTFLAGS='-test.short' ./hack/make.sh test-unit