Merge version 18.06.1+dfsg1-2+rpi1 and 18.09.1+dfsg1-7 to produce 18.09.1+dfsg1-7+rpi1

Merge docker.io (18.09.1+dfsg1-7) import into refs/heads/workingbranch

test--skip-privileged-unit-tests

Gbp-Pq: Name test--skip-privileged-unit-tests.patch

test--skip-network-tests

Gbp-Pq: Name test--skip-network-tests.patch

test--skip-TestStateRunStop

~~~~
 state_test.go:102: ExitCode -1, expected 2, err "context deadline exceeded"
~~~~

Gbp-Pq: Name test--skip-TestStateRunStop.patch

test--skip-TestGetRootUIDGID

~~~~
 FAIL: TestGetRootUIDGID (0.00s)
 idtools_unix_test.go:287:
    Error Trace: idtools_unix_test.go:287
    Error:       Not equal:
                 expected: 1009
                 actual  : 2952
    Test:        TestGetRootUIDGID
~~~~

Gbp-Pq: Name test--skip-TestGetRootUIDGID.patch

Skip TestClientWithRequestTimeout

This test seems to be flaky. Please follow-up upstream for more details:
<https://github.com/moby/moby/issues/38587>

Origin: vendor, Debian
Forwarded: not-needed, Debian-specific
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Gbp-Pq: Name test--skip-TestClientWithRequestTimeout.patch

test--skip-TestChangesWithChangesGH13590

Gbp-Pq: Name test--skip-TestChangesWithChangesGH13590.patch

test--skip-TestAdapterReadLogs

~~~~
 FAIL: TestAdapterReadLogs (0.00s)
 panic: runtime error: invalid memory address or nil pointer dereference [recovered]
    panic: runtime error: invalid memory address or nil pointer dereference
 [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x83273c5]

 goroutine 7 [running]:
 testing.tRunner.func1(0x1a686ab0)
    /usr/lib/go-1.10/src/testing/testing.go:742 +0x24a
 panic(0x8393cc0, 0x85d1e78)
    /usr/lib/go-1.10/src/runtime/panic.go:502 +0x1dc
 github.com/docker/docker/daemon/logger.testMessageEqual(0x1a686ab0, 0x1a65cc7c, 0x0)
    /var/lib/gitlab-runner/builds/736b76b0/1/docker-team/docker/.gopath/src/github.com/docker/docker/daemon/logger/adapter_test.go:178 +0x35
 github.com/docker/docker/daemon/logger.TestAdapterReadLogs(0x1a686ab0)
    /var/lib/gitlab-runner/builds/736b76b0/1/docker-team/docker/.gopath/src/github.com/docker/docker/daemon/logger/adapter_test.go:131 +0x710
 testing.tRunner(0x1a686ab0, 0x83fa01c)
    /usr/lib/go-1.10/src/testing/testing.go:777 +0xaa
 created by testing.(*T).Run
    /usr/lib/go-1.10/src/testing/testing.go:824 +0x243
 FAIL  github.com/docker/docker/daemon/logger  0.012s
~~~~

Gbp-Pq: Name test--skip-TestAdapterReadLogs.patch

test--fix-test-errors

Gbp-Pq: Name test--fix-test-errors.patch

Disable containerizedengine/update_test.go

This test FTBFS, see <https://github.com/docker/cli/pull/1561>.
Please re-enable this test when this MR is accepted.

Origin: vendor, Debian
Forwarded: not-needed, Debian-specific
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Gbp-Pq: Name test--disable-containerizedengine-update-test.patch

netlink_syscall

Gbp-Pq: Name netlink_syscall.patch

mips-fix-devnumber

~~~~
github.com/docker/docker/pkg/system/stat_linux.go:13:7: cannot use s.Rdev (type uint32) as type uint64 in field value
~~~~

Gbp-Pq: Name mips-fix-devnumber.patch

SIGSKTFLT does not exist on MIPS, instead SIGEMT does.

SIGRTMAX is also 127 on MIPS.

This patch is merged upstream on master, please drop it when necessary.

Signed-off-by: Kasper Fabæch Brandt <poizan@poizan.dk>
Origin: upstream, https://github.com/moby/moby/pull/37491

Gbp-Pq: Name mips-add-specific-signal-file.patch

Revert "debian has iptables-legacy and iptables-nft now"

This reverts commit 7da66eea9f68e4abc83ed2892114ec565eddd66a.

Libnetwork should only use the iptables binary. Iptables v1.8 and above
uses the nftables backend. The translations for all the rules used by
libnetwork is supported by the new iptables binary.

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
Origin: upstream, https://github.com/docker/libnetwork/pull/2343

Gbp-Pq: Name libnetwork-revert-iptables-legacy.patch

libnetwork_proto

Gbp-Pq: Name libnetwork_proto.patch

go-metrics_prometheus-fix_Observer

Gbp-Pq: Name go-metrics_prometheus-fix_Observer.patch

engine-test-noinstall

~~~~
 go test net: open /usr/lib/go-1.10/pkg/linux_amd64/net.a: permission denied
~~~~

Gbp-Pq: Name engine-test-noinstall.patch

mkimage: Fix Debian security presence check

Add Location following since security redirects to security-cdn and caused the repository to be added on Debian unstable.

Signed-off-by: Mattias Jernberg <nostrad@gmail.com>
Origin: upstream, https://github.com/docker/engine/commit/8db5403

Gbp-Pq: Name engine-contrib-debootstrap-curl-follow-location.patch

cli/registry: fix a Debugf statement

Fix this warning from go-1.11

> cli/registry/client/fetcher.go:234: Debugf format %s has arg
> repoEndpoint of wrong type client.repositoryEndpoint

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Origin: upstream, https://github.com/docker/cli/commit/51848bf

Gbp-Pq: Name cli-fix-registry-debug-message-go-1.11.patch

cli-fix-manpages-build-script

Gbp-Pq: Name cli-fix-manpages-build-script.patch

Build against google-grpc 1.11, where md.Get() does not exist.

This patch is based on the commit that introduced md.Get() in google-grpc:
<https://github.com/grpc/grpc-go/commit/291de7f0>.

Please drop this patch as soon as we build docker against google-grpc >= 1.12.

Origin: vendor, Debian
Forwarded: not-needed, Debian-specific
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Gbp-Pq: Name buildkit-build-against-google-grpc-1.11.patch

debian-nuke-no-prompt

Gbp-Pq: Name debian-nuke-no-prompt.patch

debian-cgroupfs-mount-convenience-copy

Gbp-Pq: Name debian-cgroupfs-mount-convenience-copy.patch

debian-dockerd-binary-location

Gbp-Pq: Name debian-dockerd-binary-location.patch

debian-containerd-name

Gbp-Pq: Name debian-containerd-name.patch

debian-systemd-unit-environment-file

Gbp-Pq: Name debian-systemd-unit-environment-file.patch

docker.service: don't limit tasks

Signed-off-by: Pierre Carrier <pierre@meteor.com>
Gbp-Pq: Name debian-systemd-unit-tasksmax.patch

docker.io (18.09.1+dfsg1-7) unstable; urgency=medium

  * Add patch to revert using iptables-legacy (Closes: #921600).

[dgit import unpatched docker.io 18.09.1+dfsg1-7]

Import docker.io_18.09.1+dfsg1-7.debian.tar.xz

[dgit import tarball docker.io 18.09.1+dfsg1-7 docker.io_18.09.1+dfsg1-7.debian.tar.xz]

Merge docker.io (18.06.1+dfsg1-2+rpi1) import into refs/heads/workingbranch

test--skip-privileged-unit-tests

Gbp-Pq: Name test--skip-privileged-unit-tests.patch

test--skip-network-tests

Gbp-Pq: Name test--skip-network-tests.patch

test--skip-TestStateRunStop

~~~~
 state_test.go:102: ExitCode -1, expected 2, err "context deadline exceeded"
~~~~

Gbp-Pq: Name test--skip-TestStateRunStop.patch

test--skip-TestGetRootUIDGID

~~~~
 FAIL: TestGetRootUIDGID (0.00s)
 idtools_unix_test.go:287:
    Error Trace: idtools_unix_test.go:287
    Error:       Not equal:
                 expected: 1009
                 actual  : 2952
    Test:        TestGetRootUIDGID
~~~~

Gbp-Pq: Name test--skip-TestGetRootUIDGID.patch

test--skip-TestAdapterReadLogs

~~~~
 FAIL: TestAdapterReadLogs (0.00s)
 panic: runtime error: invalid memory address or nil pointer dereference [recovered]
    panic: runtime error: invalid memory address or nil pointer dereference
 [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x83273c5]

 goroutine 7 [running]:
 testing.tRunner.func1(0x1a686ab0)
    /usr/lib/go-1.10/src/testing/testing.go:742 +0x24a
 panic(0x8393cc0, 0x85d1e78)
    /usr/lib/go-1.10/src/runtime/panic.go:502 +0x1dc
 github.com/docker/docker/daemon/logger.testMessageEqual(0x1a686ab0, 0x1a65cc7c, 0x0)
    /var/lib/gitlab-runner/builds/736b76b0/1/docker-team/docker/.gopath/src/github.com/docker/docker/daemon/logger/adapter_test.go:178 +0x35
 github.com/docker/docker/daemon/logger.TestAdapterReadLogs(0x1a686ab0)
    /var/lib/gitlab-runner/builds/736b76b0/1/docker-team/docker/.gopath/src/github.com/docker/docker/daemon/logger/adapter_test.go:131 +0x710
 testing.tRunner(0x1a686ab0, 0x83fa01c)
    /usr/lib/go-1.10/src/testing/testing.go:777 +0xaa
 created by testing.(*T).Run
    /usr/lib/go-1.10/src/testing/testing.go:824 +0x243
 FAIL  github.com/docker/docker/daemon/logger  0.012s
~~~~

Gbp-Pq: Name test--skip-TestAdapterReadLogs.patch

test--fix-test-errors

Gbp-Pq: Name test--fix-test-errors.patch

test--disable-TestChangesWithChangesGH13590

Gbp-Pq: Name test--disable-TestChangesWithChangesGH13590.patch

nuke-no-prompt

Gbp-Pq: Name nuke-no-prompt.patch

netlink_syscall

Gbp-Pq: Name netlink_syscall.patch

mips

~~~~
github.com/docker/docker/pkg/system/stat_linux.go:13:7: cannot use s.Rdev (type uint32) as type uint64 in field value
~~~~

Gbp-Pq: Name mips.patch

libnetwork_proto

Gbp-Pq: Name libnetwork_proto.patch

go-metrics_prometheus-fix_Observer

Gbp-Pq: Name go-metrics_prometheus-fix_Observer.patch

engine-test-noinstall

~~~~
 go test net: open /usr/lib/go-1.10/pkg/linux_amd64/net.a: permission denied
~~~~

Gbp-Pq: Name engine-test-noinstall.patch

dockerd-binary-location

Gbp-Pq: Name dockerd-binary-location.patch

cli-fix-manpages-build-script

Gbp-Pq: Name cli-fix-manpages-build-script.patch

change-system-unit-env-file

Gbp-Pq: Name change-system-unit-env-file.patch

cgroupfs-mount-convenience-copy

Gbp-Pq: Name cgroupfs-mount-convenience-copy.patch

docker.service: don't limit tasks

Signed-off-by: Pierre Carrier <pierre@meteor.com>
Gbp-Pq: Name 21491--systemd-tasksmax.patch

moby-buildkit-disable-stuff

Gbp-Pq: Name moby-buildkit-disable-stuff.patch

docker.io (18.06.1+dfsg1-2+rpi1) buster-staging; urgency=medium

  * Disable testsuite.

[dgit import unpatched docker.io 18.06.1+dfsg1-2+rpi1]

Import docker.io_18.06.1+dfsg1-2+rpi1.debian.tar.xz

[dgit import tarball docker.io 18.06.1+dfsg1-2+rpi1 docker.io_18.06.1+dfsg1-2+rpi1.debian.tar.xz]

Import docker.io_18.09.1+dfsg1.orig.tar.xz

[dgit import orig docker.io_18.09.1+dfsg1.orig.tar.xz]

Import docker.io_18.09.1+dfsg1.orig-containerd.tar.xz

[dgit import orig docker.io_18.09.1+dfsg1.orig-containerd.tar.xz]

Import docker.io_18.09.1+dfsg1.orig-distribution.tar.xz

[dgit import orig docker.io_18.09.1+dfsg1.orig-distribution.tar.xz]

Import docker.io_18.09.1+dfsg1.orig-go-events.tar.xz

[dgit import orig docker.io_18.09.1+dfsg1.orig-go-events.tar.xz]

Import docker.io_18.09.1+dfsg1.orig-go-metrics.tar.xz

[dgit import orig docker.io_18.09.1+dfsg1.orig-go-metrics.tar.xz]

Import docker.io_18.09.1+dfsg1.orig-libnetwork.tar.xz

[dgit import orig docker.io_18.09.1+dfsg1.orig-libnetwork.tar.xz]

Import docker.io_18.09.1+dfsg1.orig-swarmkit.tar.xz

[dgit import orig docker.io_18.09.1+dfsg1.orig-swarmkit.tar.xz]

Merge docker.io (18.06.1+dfsg1-2) import into refs/heads/workingbranch

test--skip-privileged-unit-tests

Gbp-Pq: Name test--skip-privileged-unit-tests.patch

test--skip-network-tests

Gbp-Pq: Name test--skip-network-tests.patch

test--skip-TestStateRunStop

~~~~
 state_test.go:102: ExitCode -1, expected 2, err "context deadline exceeded"
~~~~

Gbp-Pq: Name test--skip-TestStateRunStop.patch

test--skip-TestGetRootUIDGID

~~~~
 FAIL: TestGetRootUIDGID (0.00s)
 idtools_unix_test.go:287:
    Error Trace: idtools_unix_test.go:287
    Error:       Not equal:
                 expected: 1009
                 actual  : 2952
    Test:        TestGetRootUIDGID
~~~~

Gbp-Pq: Name test--skip-TestGetRootUIDGID.patch

test--skip-TestAdapterReadLogs

~~~~
 FAIL: TestAdapterReadLogs (0.00s)
 panic: runtime error: invalid memory address or nil pointer dereference [recovered]
    panic: runtime error: invalid memory address or nil pointer dereference
 [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x83273c5]

 goroutine 7 [running]:
 testing.tRunner.func1(0x1a686ab0)
    /usr/lib/go-1.10/src/testing/testing.go:742 +0x24a
 panic(0x8393cc0, 0x85d1e78)
    /usr/lib/go-1.10/src/runtime/panic.go:502 +0x1dc
 github.com/docker/docker/daemon/logger.testMessageEqual(0x1a686ab0, 0x1a65cc7c, 0x0)
    /var/lib/gitlab-runner/builds/736b76b0/1/docker-team/docker/.gopath/src/github.com/docker/docker/daemon/logger/adapter_test.go:178 +0x35
 github.com/docker/docker/daemon/logger.TestAdapterReadLogs(0x1a686ab0)
    /var/lib/gitlab-runner/builds/736b76b0/1/docker-team/docker/.gopath/src/github.com/docker/docker/daemon/logger/adapter_test.go:131 +0x710
 testing.tRunner(0x1a686ab0, 0x83fa01c)
    /usr/lib/go-1.10/src/testing/testing.go:777 +0xaa
 created by testing.(*T).Run
    /usr/lib/go-1.10/src/testing/testing.go:824 +0x243
 FAIL  github.com/docker/docker/daemon/logger  0.012s
~~~~

Gbp-Pq: Name test--skip-TestAdapterReadLogs.patch

test--fix-test-errors

Gbp-Pq: Name test--fix-test-errors.patch

test--disable-TestChangesWithChangesGH13590

Gbp-Pq: Name test--disable-TestChangesWithChangesGH13590.patch

nuke-no-prompt

Gbp-Pq: Name nuke-no-prompt.patch

netlink_syscall

Gbp-Pq: Name netlink_syscall.patch

mips

~~~~
github.com/docker/docker/pkg/system/stat_linux.go:13:7: cannot use s.Rdev (type uint32) as type uint64 in field value
~~~~

Gbp-Pq: Name mips.patch

libnetwork_proto

Gbp-Pq: Name libnetwork_proto.patch

go-metrics_prometheus-fix_Observer

Gbp-Pq: Name go-metrics_prometheus-fix_Observer.patch

engine-test-noinstall

~~~~
 go test net: open /usr/lib/go-1.10/pkg/linux_amd64/net.a: permission denied
~~~~

Gbp-Pq: Name engine-test-noinstall.patch

dockerd-binary-location

Gbp-Pq: Name dockerd-binary-location.patch

cli-fix-manpages-build-script

Gbp-Pq: Name cli-fix-manpages-build-script.patch

change-system-unit-env-file

Gbp-Pq: Name change-system-unit-env-file.patch

cgroupfs-mount-convenience-copy

Gbp-Pq: Name cgroupfs-mount-convenience-copy.patch

docker.service: don't limit tasks

Signed-off-by: Pierre Carrier <pierre@meteor.com>
Gbp-Pq: Name 21491--systemd-tasksmax.patch

moby-buildkit-disable-stuff

Gbp-Pq: Name moby-buildkit-disable-stuff.patch

docker.io (18.06.1+dfsg1-2) unstable; urgency=medium

  * Tighten versioned dependency on "runc".
  * dev: install "libnetwork/ipamutils".

[dgit import unpatched docker.io 18.06.1+dfsg1-2]

Import docker.io_18.06.1+dfsg1-2.debian.tar.xz

[dgit import tarball docker.io 18.06.1+dfsg1-2 docker.io_18.06.1+dfsg1-2.debian.tar.xz]

Import docker.io_18.06.1+dfsg1.orig.tar.xz

[dgit import orig docker.io_18.06.1+dfsg1.orig.tar.xz]

Import docker.io_18.06.1+dfsg1.orig-containerd.tar.xz

[dgit import orig docker.io_18.06.1+dfsg1.orig-containerd.tar.xz]

Import docker.io_18.06.1+dfsg1.orig-distribution.tar.xz

[dgit import orig docker.io_18.06.1+dfsg1.orig-distribution.tar.xz]

Import docker.io_18.06.1+dfsg1.orig-go-events.tar.xz

[dgit import orig docker.io_18.06.1+dfsg1.orig-go-events.tar.xz]

Import docker.io_18.06.1+dfsg1.orig-go-metrics.tar.xz

[dgit import orig docker.io_18.06.1+dfsg1.orig-go-metrics.tar.xz]

Import docker.io_18.06.1+dfsg1.orig-libnetwork.tar.xz

[dgit import orig docker.io_18.06.1+dfsg1.orig-libnetwork.tar.xz]

Import docker.io_18.06.1+dfsg1.orig-swarmkit.tar.xz

[dgit import orig docker.io_18.06.1+dfsg1.orig-swarmkit.tar.xz]

Merge docker.io (1.11.2~ds1-5) import into refs/heads/workingbranch

check-v1

Gbp-Pq: Name check-v1.patch

skip-racy-unit-tests

Gbp-Pq: Name skip-racy-unit-tests.patch

skip-privileged-unit-tests

Gbp-Pq: Name skip-privileged-unit-tests.patch

opencontainer-specs--no-mountlabel

Gbp-Pq: Name opencontainer-specs--no-mountlabel.patch

opencontainer-specs-0.5.0

Gbp-Pq: Name opencontainer-specs-0.5.0.patch

update-aws-sdk-go

Gbp-Pq: Name 23063--update-aws-sdk-go.patch

remove-docker-prefix

Gbp-Pq: Name remove-docker-prefix.patch

Ignore invalid "Host:" header between go1.6 and old docker clients

Gbp-Pq: Name 22000--ignore-invalid-host-header.patch

docker.service: don't limit tasks

Signed-off-by: Pierre Carrier <pierre@meteor.com>
Gbp-Pq: Name 21491--systemd-tasksmax.patch

overlay

Gbp-Pq: Name overlay.patch

change-system-unit-env-file

Gbp-Pq: Name change-system-unit-env-file.patch