diff -Nru docker.io-20.10.21/debian/changelog docker.io-20.10.24+dfsg1/debian/changelog --- docker.io-20.10.21/debian/changelog 2023-02-28 09:17:52.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/changelog 2023-06-02 16:06:10.000000000 -0300 @@ -1,818 +1,1120 @@ -docker.io (20.10.21-0ubuntu3) lunar; urgency=medium +docker.io (20.10.24+dfsg1-1ubuntu1) mantic; urgency=medium - * d/t/docker-in-lxd: set up lxd container storage using btrfs. - Do not use privileged lxd container to run the test. - Follow the official Ubuntu documentation: - https://ubuntu.com/tutorials/how-to-run-docker-inside-lxd-containers + * Merge from Debian unstable (LP: #2022390). Make src:docker.io follow Debian + and src:docker.io-app is going to ship the application with vendorized + dependencies so we can keep updating just the application across all + supported releases. + * Added changes: + - d/control: remove binary paragragh for docker.io. + - d/docker.io.*: remove all packaging related files associated to the + docker.io binary package. + - d/p/engine-allow-exclude-unit-test.patch: add patch to allow excluding + extra directories when running engine unit tests. + - d/rules: do not run aufs related unit tests in the engine component. + - d/rules: do not install apparmor profile for docker.io. - -- Lucas Kanashiro Tue, 28 Feb 2023 09:17:52 -0300 + -- Lucas Kanashiro Fri, 02 Jun 2023 16:06:10 -0300 -docker.io (20.10.21-0ubuntu2) lunar; urgency=medium +docker.io (20.10.24+dfsg1-1) unstable; urgency=medium - * d/tests: install lxd via snap in docker-in-lxd test. - Since Jammy, lxd is not available as a .deb anymore. Let's install it via - snap. - * d/t/docker-in-lxd: launch LXD container as privileged. - Ortherwise, the docker run command fails inside the container. - - -- Lucas Kanashiro Wed, 15 Feb 2023 16:28:01 -0300 - -docker.io (20.10.21-0ubuntu1) lunar; urgency=medium - - * New upstream release. - - -- Lucas Kanashiro Wed, 16 Nov 2022 15:42:50 -0300 - -docker.io (20.10.16-0ubuntu1) kinetic; urgency=medium - - * New upstream release. - - -- Lucas Kanashiro Thu, 12 May 2022 17:04:31 -0300 - -docker.io (20.10.12-0ubuntu4) jammy; urgency=medium - - * Enable riscv64 architecture (LP: #1963920) - - -- Heinrich Schuchardt Mon, 07 Mar 2022 16:57:50 +0100 - -docker.io (20.10.12-0ubuntu2) jammy; urgency=medium - - * d/t/docker-in-lxd: Match "file:/" instead of "file:///" on - copy_local_apt_files. - The command "apt-get indextargets" returns a URI field with "file:/" - as the prefix. We've been trying to match "file:///", which is - sometimes unsuccessful and leads to errors because the local apt cache - is not copied over to the container. We can use "file:/" instead, - which will work on both scenarios. It's also not a problem to just - strip the "file:" prefix, because even paths like "///var/cache" are - correctly resolved by the filesystem. - - -- Sergio Durigan Junior Fri, 14 Jan 2022 14:30:44 -0500 - -docker.io (20.10.12-0ubuntu1) jammy; urgency=medium - - * New upstream release. - * Remove all patches, applied by upstream. - * Build depend on default golang 1.17. - * d/rules: set GO111MODULE to auto. - - -- Lucas Kanashiro Mon, 10 Jan 2022 18:08:58 -0300 - -docker.io (20.10.7-0ubuntu7) jammy; urgency=medium - - * SECURITY UPDATE: docker cli information disclosure on misconfiguration - - d/p/CVE-2021-41092.patch: Ensure that default authentication config - has an address. - - CVE-2021-41092 - - -- Ray Veldkamp Fri, 22 Oct 2021 17:03:30 +1100 - -docker.io (20.10.7-0ubuntu6) devel; urgency=medium - - * d/t/control: Drop unused aufs-tools as a test dependency (LP: #1947004) - - -- Lukas Märdian Wed, 13 Oct 2021 17:22:20 +0200 + * Team upload. + * New upstream release [20.10.24] + + CVE-2023-28840: Encrypted overlay network may be unauthenticated + + CVE-2023-28841: Encrypted overlay network traffic may be unencrypted + + CVE-2023-28842: Encrypted overlay network with a single endpoint is + unauthenticated + * Bump golang-github-containerd-fifo-dev to 1.1.0. Fix potential panic. -docker.io (20.10.7-0ubuntu5) impish; urgency=medium + -- Shengjing Zhu Wed, 05 Apr 2023 23:19:59 +0800 - [ Sergio Durigan Junior ] - * d/t/docker-in-lxd: - Improve dep8 test. Make it run a more complex test against an - ubuntu:devel docker container, especially because glibc updates might - break docker.io. Improve test reliability when running autopkgtest - locally. +docker.io (20.10.23+dfsg1-1) unstable; urgency=medium - [ Steve Beattie ] - * SECURITY UPDATE: insufficiently restricted directory permissions - - d/p/CVE-2021-41091.patch: Lock down docker root dir perms. - - CVE-2021-41091 - * SECURITY UPDATE: permissions modifications outside of install directory - - d/p/CVE-2021-41089.patch: chrootarchive: don't create parent dirs - outside of chroot. - - CVE-2021-41089 + * Team upload. + * New upstream release [20.10.23] + * Drop merged btrfs-progs 6.1 patch - -- Lucas Kanashiro Tue, 05 Oct 2021 16:45:26 -0300 + -- Shengjing Zhu Fri, 20 Jan 2023 16:04:03 +0800 -docker.io (20.10.7-0ubuntu4) impish; urgency=medium +docker.io (20.10.22+dfsg1-2) unstable; urgency=medium - * d/p/seccomp-add-support-for-clone3-syscall-in-default-policy.patch: Fix - failure with new glibc clone3 syscall adding it to the default seccomp - policy (LP: #1943049). + * Team upload. + * No-change rebuild against golang-github-golang-protobuf-1-3 for + testing migration. - -- Lucas Kanashiro Fri, 10 Sep 2021 15:34:38 -0300 + -- Shengjing Zhu Sat, 14 Jan 2023 17:09:27 +0800 -docker.io (20.10.7-0ubuntu3) impish; urgency=medium +docker.io (20.10.22+dfsg1-1) unstable; urgency=medium - * d/t/docker-in-lxd: - Perform a full upgrade and restart of the container before attempting - to install docker.io. (LP: #1942276) + * Team upload. + * New upstream release [20.10.22] + + Temperory vendor etcd 3.3 library. + * Add patch for btrfs-progs 6.1 (Closes: #1027114) - -- Sergio Durigan Junior Wed, 01 Sep 2021 18:58:31 -0400 + -- Shengjing Zhu Mon, 02 Jan 2023 00:36:21 +0800 -docker.io (20.10.7-0ubuntu2) impish; urgency=medium +docker.io (20.10.21+dfsg1-1) unstable; urgency=medium - * Ship libnetwork into the golang-github-docker-docker-dev package. - - d/golang-github-docker-docker-dev.install: add libnetwork directories. - - d/control: add runtime dependency on golang-github-ishidawataru-sctp-dev + * Team upload. + * New upstream release [20.10.21] + - Fixes TestCheckoutGit failure (Closes: #1024506) + - Build-depend on golang-github-armon-circbuf-dev + * Remove ancient NEWS file. + * Update lintian overrides. - -- Lucas Kanashiro Fri, 28 May 2021 10:55:12 -0300 + -- Felix Geyer Fri, 25 Nov 2022 18:47:24 +0100 -docker.io (20.10.7-0ubuntu1) impish; urgency=medium +docker.io (20.10.19+dfsg1-1) unstable; urgency=medium - * New upstream release. - - Among new features and bug fixes, the CVE-2021-21284 and CVE-2021-21285 - were addressed. - * d/watch: adjust regex to correctly match the tarball files. - * d/rules: make some improvements. - - Adjust regex in the build-manpages target due to some upstream changes. - - Separately install the systemd service and socket. - - Tell dh_installsystemd to not stop the service during the upgrade. - The previous implementation worked fine until debhelper compat 10 where - dh_systemd_start was still a thing. In compat 11, it was deprecated - which means that piece of code was not called. - - -- Lucas Kanashiro Tue, 03 Aug 2021 15:58:42 -0300 - -docker.io (20.10.2-0ubuntu2) hirsute; urgency=medium - - [ William 'jawn-smith' Wilson ] - * Add a preinst check for aufs storage-driver to fail the upgrade. - (LP: #1907713) + * Team upload. + * New upstream release [20.10.19] + - Fixes CVE-2022-36109 (Closes: #1019601) + * Drop test--cli-skip-TestRemoveForce.patch, race condition has been fixed + upstream. + * Adapt watch file to GitHub changes. - -- Michael Hudson-Doyle Tue, 02 Mar 2021 18:45:16 +1300 + -- Felix Geyer Sat, 15 Oct 2022 17:47:37 +0200 -docker.io (20.10.2-0ubuntu1) hirsute; urgency=medium +docker.io (20.10.17+dfsg1-1) unstable; urgency=medium - * New upstream release. - * d/watch: update components, docker-ce is deprecated now. - Add "engine", "cli" and "packaging" components which were previously - provided by docker-ce. - * Pass create-empty-orig to dpkg-source since now there is no main tarball. - Due to docker-ce deprecation this source package is now composed by - multiple components but no main tarball. In order to allow that, - create-empty-orig is passed to dpkg-source which creates an empty - tarball for us. - * Drop patches applied by upstream: - - d/p/41518--apparmor-parser-beta.patch - - d/p/CVE-2020-15157.patch - * Add docker systemd service and socket to the debian directory. - Instead of using the packaging component just to get those two files - let's embed them in the debian directory. They were downloaded from the - master branch of the docker/docker-ce-packaging: - https://github.com/docker/docker-ce-packaging/tree/master/systemd - * Apply changes in do-not-bind-docker-to-containerd.patch to systemd service. - The systemd service is part of the debian packaging directory, so no - need to have a patch for this. - This change was a decision made by the Ubuntu community, pay attention - to this when updating the systemd service file. - * Pass --name=docker to dh_installsystemd - * Remove "components/" from all references of engine and cli. - Now engine and cli are regular components in the root of the source - package. They are not under the components directory anymore. - * d/rules: use DEB_VERSION_UPSTREAM from pkg-info.mk instead of VERSION file. - The VERSION file was previously provided by the deprecated docker-ce. - * d/rules: do not try to install md2man in /go/bin/md2man. - Upstream source code changed and by default it tries to install it in - /go/bin/md2man. A sed command was added to replace this path with - $(OUR_GOPATH)/bin/md2man. - * d/vim-syntax-docker.install: do not install files from engine. - Those files do not exist anymore because they were incorporated in vim - itself upstream. - * Remove d/{helpers/gitcommit.sh,upstream-version-gitcommits} - Since the main repo, docker-ce, is deprecated there is no way to get a - consistent git commit hash across all the components. Let's use - DEB_VERSION for now. - * Bump debhelper compatibility level to 11. - For instance to call dh_installsystemd we need a compat level > 9. - I picked 11 because it is available from Bionic on in case we want to - backport the package. - - -- Lucas Kanashiro Fri, 15 Jan 2021 10:30:18 -0300 - -docker.io (19.03.13-0ubuntu6) hirsute; urgency=medium - - * d/docker.io.postinst: check if zfs exists before calling it (LP: #1910133). - The zfs executable is provided by zfs-fuse | zfsutils and they are - runtime Suggested dependencies, which means they might not be available - during configuration time. - - -- Lucas Kanashiro Mon, 04 Jan 2021 17:25:39 -0300 - -docker.io (19.03.13-0ubuntu5) hirsute; urgency=medium - - * d/rules: pass -r instead of --no-stop-on-upgrade to dh_systemd_start. - The --no-stop-on-upgrade is not backport-able to xenial because - debhelper 9 does not support that, and --no-restart-on-upgrade will be - deprecated in debhelper 14. Therefore, let's use the short version which - is supported by a larger range of debhelper versions. - - -- Lucas Kanashiro Thu, 10 Dec 2020 16:16:09 -0300 - -docker.io (19.03.13-0ubuntu4) hirsute; urgency=medium - - * d/p/do_not_bind_docker_to_containerd.patch: Update docker.io to not - stop when containerd is upgraded, by using Wants= rather than BindTo=. - (LP: #1870514) - * d/rules: Fix docker.io to not restart its service during package - upgrades, to prevent service downtime from automatic updates via - unattended-upgrade. - (LP: #1906364) - - -- Bryce Harrington Fri, 04 Dec 2020 23:02:49 +0000 - -docker.io (19.03.13-0ubuntu3) groovy; urgency=medium - - * SECURITY UPDATE: Sensitive information disclosure - - debian/patches/CVE-2020-15157.patch: Improve fetch function. - - CVE-2020-15157 + * Team upload. - -- Paulo Flabiano Smorigo Wed, 14 Oct 2020 13:25:32 +0000 + [ Reinhard Tartler ] + * unbreak FTBFS, avoid dependencies on consul + * add missing dependency -docker.io (19.03.13-0ubuntu2) groovy; urgency=medium + [ Arnaud Rebillout ] + * New upstream release [20.10.17] - [ Tianon Gravi ] - * Backport https://github.com/moby/moby/pull/41518 to handle newer AppArmor + -- Reinhard Tartler Mon, 15 Aug 2022 08:54:41 +0200 - -- Michael Hudson-Doyle Fri, 09 Oct 2020 08:28:02 +1300 +docker.io (20.10.14+dfsg1-1) unstable; urgency=medium -docker.io (19.03.13-0ubuntu1) groovy; urgency=medium + [ Felix Geyer ] + * Order docker.service after containerd.service to fix shutdown of + containers (Closes: #989490) - [ Tianon Gravi ] - * Update to 19.03.13 upstream release - * Build against Go 1.13 (per upstream) - * Use dh-golang to generate appropriate Built-Using + [ Arnaud Rebillout ] + * New upstream release [20.10.14] - -- Michael Hudson-Doyle Thu, 08 Oct 2020 10:43:13 +1300 + -- Arnaud Rebillout Wed, 30 Mar 2022 23:07:00 +0700 -docker.io (19.03.11-0ubuntu1) groovy; urgency=medium +docker.io (20.10.11+dfsg1-2) unstable; urgency=medium - * Update to 19.03.11 upstream release (CVE-2020-13401, LP: #1881679) - * Apply wrap-and-sort - * Move cgroupfs-mount to Suggests - (esp. on Ubuntu where systemd is canonical) + * Team upload. + * Fix default seccomp on mips (Closes: #1000318) - -- Tianon Gravi Mon, 01 Jun 2020 15:14:15 -0700 + -- Shengjing Zhu Sat, 04 Dec 2021 17:06:15 +0800 -docker.io (19.03.8-0ubuntu4) groovy; urgency=medium +docker.io (20.10.11+dfsg1-1) unstable; urgency=medium - * Provide "image" and "oci" components in golang dev package, - mirroring Debian to address libpod FTBFS + * New upstream release [20.10.11] - -- Reinhard Tartler Sat, 30 May 2020 11:56:59 -0400 + -- Arnaud Rebillout Mon, 22 Nov 2021 16:56:50 +0700 -docker.io (19.03.8-0ubuntu3) groovy; urgency=medium +docker.io (20.10.10+dfsg1-1) unstable; urgency=medium - * Provide the rootless component in golang dev package, mirroring Debian - (addresses nomad FTBFS). + * New upstream release [20.10.10] - -- Logan Rosen Tue, 26 May 2020 21:06:20 -0400 + -- Arnaud Rebillout Tue, 26 Oct 2021 14:22:48 +0700 -docker.io (19.03.8-0ubuntu2) groovy; urgency=medium +docker.io (20.10.8+dfsg1-2) unstable; urgency=medium - [ Jean-Baptiste Lallement ] - [ Didier Roche ] - * Fix use with ZFS on root: - - docker creates one dataset for any layer of containers that were - created. Create now a /var/lib/docker for creating them in - the persistent namespace and migrate existing one here. - - purge the automated historic that was created. - The migration only impacts the ubuntu desktop installation with - experimental ZFS on root, and we have thus to stop and start the daemon - to migrate data. (LP: #1879473) + * Team upload. - -- Didier Roche Tue, 19 May 2020 11:01:22 +0200 + [ Shengjing Zhu ] + * Add patch to build against runc 1.0 (Closes: #996166) -docker.io (19.03.8-0ubuntu1) focal; urgency=medium + -- Anthony Fok Fri, 22 Oct 2021 01:50:50 -0600 - * Update to 19.03.8 upstream release (LP: #1867068) - - Improve mitigation for CVE-2019-14271 for some nscd configuration. +docker.io (20.10.8+dfsg1-1) unstable; urgency=medium - -- Tianon Gravi Wed, 11 Mar 2020 15:48:33 -0700 + * Backport upstream patches to fix the build + * Backport upstream patch to skip a cli test that segfaults + * Drop unused Lintian override (field-too-long) + * Update my email address + * New upstream release [20.10.8] + * Update debian/watch + * Build-Depends += moby-locker-dev, drop obsolete vendoring + * Drop patches applied upstream + * Use leading tabs consistently in d/rules + * Update date format for the cli build time + * Build cli with dh-golang, don't use upstream Makefile anymore + * Use variables for package names in d/rules + * Bump standards version + * tests: Bump debootstrap suite to bullseye -docker.io (19.03.6-0ubuntu1) focal; urgency=medium + -- Arnaud Rebillout Wed, 22 Sep 2021 13:31:10 +0700 - * Update to 19.03.6 upstream release +docker.io (20.10.5+dfsg1-1) unstable; urgency=medium - -- Tianon Gravi Tue, 18 Feb 2020 09:03:26 +1300 + * Team upload. + * New upstream release 20.10.5 + Same as 20.10.4 but a patch in docker/cli is reverted to fix hanging in + "docker start --attach" and remove spurious "Unsupported signal: . + Discarding" messages. + + -- Shengjing Zhu Wed, 10 Mar 2021 00:53:21 +0800 + +docker.io (20.10.4+dfsg1-1) unstable; urgency=medium + + * Team upload + * New upstream release 20.10.4 + * Remove patch which is applied in new upstream version: + cli-build-man-pages-with-go-md2man.patch + * Add patch to skip TestUntarParentPathPermissions which requires root + + -- Shengjing Zhu Sat, 27 Feb 2021 21:16:16 +0800 + +docker.io (20.10.3+dfsg1-2) unstable; urgency=medium + + * Drop manual run of engine tests + * Update a patch that is now applied upstream + + -- Arnaud Rebillout Wed, 10 Feb 2021 09:13:49 +0700 + +docker.io (20.10.3+dfsg1-1) unstable; urgency=medium + + * Team upload + * New upstream release 20.10.3 + + CVE-2021-21285 Prevent an invalid image from crashing docker daemon + + CVE-2021-21284 Lock down file permissions to prevent remapped root + from accessing docker state + * Try to run basic-smoke tests in autopkgtest isolation-container + + -- Shengjing Zhu Tue, 09 Feb 2021 00:26:14 +0800 + +docker.io (20.10.2+dfsg1-2) unstable; urgency=medium + + * Add patch to fix flaky test + * Rename test-related patches for clarity + + -- Arnaud Rebillout Fri, 08 Jan 2021 14:08:51 +0700 + +docker.io (20.10.2+dfsg1-1) unstable; urgency=medium + + * Build-Depends += fvbommel-sortorder-dev, unvendor + * New upstream release [20.10.2] + * Drop patches applied upstream + * Drop selinux build tag, no longer needed + * Move the package to the Go Team + + -- Arnaud Rebillout Thu, 07 Jan 2021 08:40:41 +0700 + +docker.io (20.10.1+dfsg1-1) unstable; urgency=medium + + * Drop obsolete patches for good + * Don't clean the file manager_linux_test.go, patch it instead + * Update patches that are upstream + * Add patch to skip failing test on mips64 + * Add dep-3 header to last patch + * Build-Depends += golang-golang-x-term-dev, drop vendoring + * New upstream release [20.10.1] + * Update patches + * Fix gbp.conf debian branch + + -- Arnaud Rebillout Mon, 04 Jan 2021 11:25:41 +0700 + +docker.io (20.10.0+dfsg2-1) unstable; urgency=medium + + * Drop hack for oci fixtures, fixed upstream + * No need to clean manager_linux_test + * Use a variable for docker testflags + * No need to export DOCKER_BUILDTAGS + * Depends: Fix incorrect requirement on golang-dbus-dev + * Build-Depends: Make libseccomp-dev explicit + * Drop useless vendored directories + * Drop Build-Depends that are obviously not used anymore + * Group swarmkit Build-Depends for tests, not needed + * Group k8s.io Build-Depends + * Override dh_golang to produce better Built-Using + * Nitpick, simplify a bit dh_install + * Rework BUILDTIME, only needed for cli + * Rework KEEPBUNDLE, only needed for engine + * Nitpick, rename some variables + * Bump dfsg in watch file + * Big rename, build in _build instead of .gopath + + -- Arnaud Rebillout Mon, 14 Dec 2020 19:39:22 +0700 + +docker.io (20.10.0+dfsg1-1) experimental; urgency=medium + + * Build-Depends: git is only needed for tests, document that + * Depends: Drop undefined ${perl:Depends} + * Add patch to fix container creation time in tests + * Drop test--skip-TestResumableRequestHeaderTooMuchFailures.patch + * Drop test--skip-TestClientWithRequestTimeout.patch + * Drop test--skip-TestAdapterReadLogs.patch + * Update description for test--skip-pkg-signal-flaky-tests.patch + * Cosmetics in d/watch + * get-orig-source: Remove all the logs regarding the vendor tree + * get-orig-source: Rework to mimic uscan output + * uscan-summary: New helper to parse uscan+get-orig-source logs + * ls-vendor: New helper to quickly list the vendor directories + * real-upstream-version: New (tiny) helper to get original upst version + * helpers/docker: Be a bit more verbose + * helpers/docker: Add description, re-indent + * Cleanup, remove obsolete build deps and Files-Excluded + * Rework exported Go env variables in d/rules + * Simplify GOPATH handling in d/rules + * Add package update instructions to d/README.source + * Move -dev package to golang Section + * New upstream release [20.10.0] + * ls-vendor: More granularity for golang.org + * Vendor golang.org/x/term + + -- Arnaud Rebillout Wed, 09 Dec 2020 14:37:26 +0700 + +docker.io (20.10.0~rc1+dfsg3-1) experimental; urgency=medium + + * Bump standards version + * Mark docker-doc with Multi-Arch: foreign + * Remove ISC license from d/copyright + * Minor updates in d/control + * Add patch to skip test in pbuilder + * Rename the bash-completion patch + * Add moby-term-dev to the docker-dev dependencies + * Vendor armon-go-radix (Closes: #918375) + * Bump dfsg in d/watch + * Fix dockerd path in docker.io.docker.init + * Remove docker/distribution from the MUT + * Fix lintian override in d/source + * Update lintian tags + * Add lintian overrides regarding missing manual pages + + -- Arnaud Rebillout Wed, 02 Dec 2020 13:26:52 +0700 + +docker.io (20.10.0~rc1+dfsg2-3) experimental; urgency=medium + + * Fix my mistakes + + -- Arnaud Rebillout Tue, 01 Dec 2020 08:59:44 +0700 + +docker.io (20.10.0~rc1+dfsg2-2) experimental; urgency=medium + + * Fix cli binary name, it is arch specific + + -- Arnaud Rebillout Mon, 30 Nov 2020 21:48:20 +0700 + +docker.io (20.10.0~rc1+dfsg2-1) experimental; urgency=medium + + * Bump containerd version to 1.4.2 + * Forbid circular dependencies during build + * Remove commented-out block in d/rule + * Enable part of the patch that disables the cli network tests + * Update the patch for bash completion shebang + * Rework apparmor, recommend it unconditionally + * Install contrib/dockerd-rootless-setuptool.sh + * Suggest rootlesskit + * Conflicts with docker-ce-rootless-extras + * Nitpicks in docker.io.install + * docker.default: Update URLs + * docker.init: Update according to changes upstream + * docker.io.postinst: Add comment and indent + * Replace dh-exec usage with manual renaming in d/rules + * Simplify client installation: no more symlink + * Install bash completion from docker.io.install file + * Remove obsolete golang-github-docker-libnetwork-dev + * Unvendor containerd step 1: Depend on containerd + * Unvendor containerd step 2: Build-Depend on containerd + * Unvendor containerd step 3: Bump dfsg + + -- Arnaud Rebillout Mon, 30 Nov 2020 15:48:02 +0700 + +docker.io (20.10.0~rc1+dfsg1-1) experimental; urgency=medium + + * New upstream release [20.10.0~rc1] (Closes: #840829, #974857) + * Bump containerd version to 1.4.1 + * Revert dfsg version to 1 in d/watch + * Update d/watch for moby/moby 20.10.0~rc1 + * Update d/copyright for {cli,engine} 20.10.0~rc1 + * Add MUT components in d/copyright + * Rewrite the gitcommit logic completely, get docker version from control file + * get-orig-source: Rework to support moby tarball + cli as a MUT component + * get-orig-source: Rewrite get_vendor_tree() + * get-orig-source: Log the vendor tree for each component + * get-orig-source: Log the vendor tree left after removal of Files-Excluded + * Completely rework the dependency tree for 20.10.0~rc1 + * Drop patches that are obsolete or applied upstream + * Drop patch test--fix-test-errors.patch + * Update patches, rename a few of them + * Add patches to add go.mod files for {cli,engine,libnetwork} + * Add patch to remove shebang from bash completion + * Add containerd patches from Debian's containerd package + * Backport containerd patches from upstream (fix FTBFS moby/buildkit) + * Rework and split the big patch that skips privileged tests + * Drop various hacks in d/rules dh_auto_configure + * New hacks in d/rules dh_auto_configure + * Set GO111MODULE=off to build + * Remove vim-syntax-docker package + * Remove *-integration from docker.io.install + * Update containerd binary names in docker.io.install + * Remove docker-runc symlink, obsolete it seems + * Update libnetwork/ipvs to moby/ipvs in golang-...-docker-dev.install + * Install only the docker.io package in the testbed (rather than @) + * Clean d/gbp.conf, only keep the name of the debian branch + + -- Arnaud Rebillout Fri, 27 Nov 2020 14:09:53 +0700 + +docker.io (19.03.13+dfsg3-1) unstable; urgency=medium + + * d/control: Remove mention to golang-github-theupdateframework-notary-dev + * d/watch: Remove 's{\-ce}{}' from uversionmangle + * d/watch: Use dversionmangle=auto + * Stop vendoring sigs.k8s.io + * Move d/unpack-components to d/helpers + * Minor fix in d/helpers/docker.sh + * Remove old Replaces/Conflicts/Breaks statements + * Document briefly why we keep some vendored directories + * Vendor tonistiigi/fsutil again + * Add my name in d/copyright, after all + * No more split between indep/arch in d/rules + + -- Arnaud Rebillout Fri, 27 Nov 2020 00:08:07 +0700 + +docker.io (19.03.13+dfsg2-1) unstable; urgency=medium + + * Unvendor spf13/{cobra,pflag} + * Add Rules-Requires-Root + * Bump Standards-Version to 4.5.0 + * Bump debhelper-compat to 13 + * Add a note that unpack-components is now deprecated + * Document a bit how MUT works for docker.io + * Unvendor tonistiigi/{fsutil,units} + * Remove docker/go-events from MUT + * Add copyright mention for moby/buildkit + * get-orig-source: Put components in a variable + * get-orig-source: Allow to specify the version of a component + * Build with containerd 1.3.7 + * Disable patches that are not relevant for containerd 1.3.7 + * Update patches for containerd 1.3.7 + * Add patches for buildkit to build against containerd 1.3.7 + * Add patches for cli tests to build against containerd 1.3.7 + * Remove 'ambient' from docker build tags + + -- Arnaud Rebillout Thu, 19 Nov 2020 15:29:30 +0700 + +docker.io (19.03.13+dfsg1-4) unstable; urgency=medium + + * Fix FTBFS due to go-md2man v2 (Closes: #973084) + + -- Arnaud Rebillout Tue, 10 Nov 2020 21:31:26 +0700 + +docker.io (19.03.13+dfsg1-3) unstable; urgency=medium + + * Add patch to fix spf13/cobra (tianon) (Closes: #971789) + + -- Arnaud Rebillout Wed, 14 Oct 2020 11:38:00 +0700 + +docker.io (19.03.13+dfsg1-2) unstable; urgency=medium + + * Fix user.GetExecUser interface runc 1.0.0~rc92 (zhsj) (Closes: #970525) + + -- Arnaud Rebillout Tue, 22 Sep 2020 16:21:48 +0700 + +docker.io (19.03.13+dfsg1-1) unstable; urgency=medium + + * Move package build instructions in the right README.source file + * New upstream release [19.03.13] + * Drop build-dep vbom.ml/util, vendor fvbommel/sortorder + * Add upstream patch to fix FTBFS with go 1.15 + * lintian-overrides: Drop tag source-contains-empty-directory + * Stop shipping the mkimage contrib scripts (Closes: #969940) + + -- Arnaud Rebillout Fri, 18 Sep 2020 14:35:25 +0700 + +docker.io (19.03.12+dfsg1-4) unstable; urgency=medium + + * Fix build against runc 1.0.0~rc92 (zhsj) (Closes: #969227) + * Update helper to allow giving commands to docker run + * Update README.Debian with build instructions + + -- Arnaud Rebillout Mon, 31 Aug 2020 12:46:39 +0700 + +docker.io (19.03.12+dfsg1-3) unstable; urgency=medium + + * Add patch to disable TestRunLabel + + -- Arnaud Rebillout Mon, 13 Jul 2020 13:49:29 +0700 + +docker.io (19.03.12+dfsg1-2) unstable; urgency=medium + + * Add upstream patch to silence systemd warning (/var/run → /run) + + -- Arnaud Rebillout Mon, 13 Jul 2020 08:56:49 +0700 + +docker.io (19.03.12+dfsg1-1) unstable; urgency=medium + + * Rework dockerfile, add a helper to use docker to build the package + * d/copyright: Indent and sort a few things + * d/rules: Remove old comments + * d/control: Update my email address in the maintainer field + * New upstream release [19.03.12]. + * d/tests/basic-smoke: Debootstrap from buster (Closes: #946313) + * d/tests/basic-smoke: Use systemctl to start/stop docker + * d/tests/basic-smoke: More lines to the tail command + * d/tests/basic-smoke: Use deb.debian.org to debootstrap + * d/tests/basic-smoke: Style nitpicks + * Install dockerd-rootless.sh in usr/share/docker.io/contrib (Closes: #964071) + * d/rules: Silence lintian warnings regarding executable text files + * docker-dev: Install containerd -dev files from build directory + * docker-dev: Re-order the file d/...-dev.install + + -- Arnaud Rebillout Fri, 03 Jul 2020 12:09:20 +0700 + +docker.io (19.03.11+dfsg1-1) unstable; urgency=medium + + * New upstream release [19.03.11]. + * Update Files-Excluded list (ie. exclude archive vendoring) + * Update and drop patches + * Use gotest.tools import path in docker cli (without v3) + + -- Arnaud Rebillout Fri, 19 Jun 2020 13:41:28 +0700 -docker.io (19.03.2-0ubuntu1) eoan; urgency=medium +docker.io (19.03.7+dfsg1-3) unstable; urgency=medium - * Update to 19.03.2 + * dev: provide "rootless" component (Closes: #960827). - -- Tianon Gravi Wed, 11 Sep 2019 15:45:55 -0700 + -- Dmitry Smirnov Sun, 17 May 2020 17:07:15 +1000 -docker.io (18.09.9-0ubuntu1) eoan; urgency=medium +docker.io (19.03.7+dfsg1-2) unstable; urgency=medium - * Update to 18.09.9 - * Remove leftover sysvinit/upstart patches - - cgroupfs-mount-convenience-copy.patch - - devicemapper-cleanup.patch + [ Dmitry Smirnov ] + * Added missing-pre-depends. Thanks, Lintian. + * debian/TODO.Debian --> debian/TODO. + * L:Override "field-too-long Built-Using" on binary package also. - -- Tianon Gravi Wed, 11 Sep 2019 15:21:11 -0700 + [ Arnaud Rebillout ] + * d/clean: Remove lines that are obsolete. + * d/clean: Update for doc files. + * Add upstream patch to fix panic in libnetwork resolver (Closes: #958312). + * Add patch to skip flaky signal tests. -docker.io (18.09.8-0ubuntu5) eoan; urgency=medium + -- Arnaud Rebillout Tue, 21 Apr 2020 13:32:19 +0700 - * Set GOCACHE to a safely writable directory during build as the cache is - mandatory with Go 1.12. +docker.io (19.03.7+dfsg1-1) unstable; urgency=medium - -- Michael Hudson-Doyle Mon, 26 Aug 2019 10:20:12 +1200 + * New upstream release [19.03.7]. + * Drop test--disable-containerizedengine-update-test.patch. + * Unvendor vbom.ml/util and grpc-ecosystem/grpc-opentracing + (now packaged in Debian). -docker.io (18.09.8-0ubuntu4) eoan; urgency=medium + -- Arnaud Rebillout Tue, 14 Apr 2020 13:17:23 +0700 - * Add dependency on golang-github-docker-docker-credential-helpers-dev, - needed by github.com/docker/cli/cli/config/credentials/native_store.go. +docker.io (19.03.6+dfsg1-4) unstable; urgency=medium - -- Steve Langasek Fri, 23 Aug 2019 14:21:42 -0700 + * Do not use bundled "golang-github-stevvooe-ttrpc-dev" (Closes: #956502). -docker.io (18.09.8-0ubuntu3) eoan; urgency=medium + -- Dmitry Smirnov Mon, 13 Apr 2020 22:19:11 +1000 - * d/tests/docker-in-lxd: skip on eoan+/i386 as lxd images are no longer - provided. +docker.io (19.03.6+dfsg1-3) unstable; urgency=medium - -- Michael Hudson-Doyle Thu, 18 Jul 2019 22:44:03 +1200 + * New patch to disable failing test (Closes: #954727). + * New upstream patch to fix FTBFS with xeipuuv-gojsonschema (>= 1.2.0~). + * Lintian-override for "field-too-long Built-Using". + * DH to version 12. + * Build-Depends: + - golang-github-tinylib-msgp-dev + + golang-github-xeipuuv-gojsonschema-dev (>= 1.2.0~) -docker.io (18.09.8-0ubuntu2) eoan; urgency=medium + -- Dmitry Smirnov Sat, 11 Apr 2020 18:57:29 +1000 - * Remove extraneous start/stop of docker via init.d script from basic-smoke - autopkgtest. +docker.io (19.03.6+dfsg1-2) unstable; urgency=medium - -- Michael Hudson-Doyle Thu, 18 Jul 2019 15:42:38 +1200 + * New upstream patch to fix FTBFS in "libnetwork" (Closes: #952311). + * Build-Depends: + = golang-github-miekg-dns-dev (>= 1.1.26~) -docker.io (18.09.8-0ubuntu1) eoan; urgency=medium + -- Dmitry Smirnov Wed, 26 Feb 2020 11:20:11 +1100 - [ Michael Hudson-Doyle ] - * Version dependency on containerd. +docker.io (19.03.6+dfsg1-1) unstable; urgency=medium - [ Tianon Gravi ] - * Remove sysvinit and upstart scripts (LP: #1832819) - * Update to 18.09.8 (CVE-2019-13509, LP: #1836987) + * New upstream release [19.03.6]. + * Drop patches applied upstream. + * Vendor containerd-cgroups. + * d/copyright: Remove unused snippets. - -- Tianon Gravi Wed, 17 Jul 2019 18:26:58 -0700 + -- Arnaud Rebillout Wed, 19 Feb 2020 13:52:28 +0700 -docker.io (18.09.7-0ubuntu1) eoan; urgency=medium +docker.io (19.03.5+dfsg1-2) unstable; urgency=medium - * Update to 18.09.7. (LP: #1834690) - - Includes fix for CVE-2018-15664. + [ Dmitry Smirnov ] + * Removed unused "golang-github-rsc-letsencrypt-dev" from Build-Depends. + * Removed unused "golang-github-xenolf-lego-dev" from Build-Depends. + * Build-Depends += "golang-github-codegangsta-cli-dev" + * Don't run Btrfs tests ('chown' is not permitted). + * Removed unused "golang-github-vaughan0-go-ini-dev" fron Build-Depends. + + [ Arnaud Rebillout ] + * Build-Depends += "gotestsum", drop related patches + * Drop buildkit patch + * Update patch that disables hcsshim + * Add patch to build against vishvananda/libnetwork 1.1.x + * Add upstream patch to fix test against imdario/mergo 0.3.8 - -- Michael Hudson-Doyle Fri, 28 Jun 2019 21:13:02 +0100 + -- Arnaud Rebillout Thu, 06 Feb 2020 16:00:33 +0700 -docker.io (18.09.5-0ubuntu1) disco; urgency=medium +docker.io (19.03.5+dfsg1-1) unstable; urgency=medium - * Update to 18.09.5. + [ Dmitry Smirnov ] + * Added Conflicts with Docker's vendor packages (docker-ce, containerd.io) - -- Michael Hudson-Doyle Fri, 12 Apr 2019 12:27:37 +1200 + [ Arnaud Rebillout ] + * New upstream release [19.03.5]. -docker.io (18.09.3-0ubuntu1) disco; urgency=medium + -- Arnaud Rebillout Wed, 18 Dec 2019 17:51:41 +0700 - * Update to 18.09.3. - - update d/upstream-version-commits - - refresh d/patches/docker-prefix.patch to maintain dependence on - docker-specific containerd daemon. - - remove d/patches/0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch, - now included upstream. - * Stop bundling containerd and runc and instead depend on the containerd - package from the archive. +docker.io (19.03.4+dfsg2-2) unstable; urgency=medium - -- Michael Hudson-Doyle Thu, 14 Mar 2019 11:22:11 +1300 + * Removed unused package from Build-Depends. + * Standards-Version: 4.4.1. -docker.io (18.09.2-0ubuntu1) disco; urgency=medium + -- Dmitry Smirnov Tue, 12 Nov 2019 12:18:22 +1100 - * Update to 18.09.2, including fix for CVE-2019-5736. - - Convert components/engine/git-bundles/CVE-2019-5736.bundle into - d/patches/0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch. - - Hard code RUNC_COMMIT in d/rules for now. +docker.io (19.03.4+dfsg2-1) unstable; urgency=medium - -- Michael Hudson-Doyle Tue, 12 Feb 2019 10:55:11 +1300 + * Bump dfsg version to update orig tarball in the pool. -docker.io (18.09.1-0ubuntu2) disco; urgency=medium + -- Arnaud Rebillout Mon, 04 Nov 2019 16:06:27 +0700 - * Update "docker-prefix.patch" to also fix "docker.service" +docker.io (19.03.4+dfsg1-3) unstable; urgency=medium - -- Tianon Gravi Fri, 08 Feb 2019 14:52:47 -0800 + [ Dmitry Smirnov ] + * get-orig-source.sh: minor shellcheck correction. + * get-orig-source.sh: consistent/reproducible tarball generation. + * dev: install "libnetwork/ipvs", as required by Kubernetes. + * drop "github.com/marstr/guid" (indirect dependency). + * Un-vendor "golang-github-graylog2-go-gelf-dev". + + [ Arnaud Rebillout ] + * Stop vendoring docker-go-metrics. + * Add a patch to fix reverse build-deps against docker/cli. -docker.io (18.09.1-0~ubuntu1) disco; urgency=medium + [ Dmitry Smirnov ] + * tighten build-dep + * disabled unreliable test "TestClientWithRequestTimeout". - [ Michael Hudson-Doyle ] - * d/tests/docker-in-lxd: Increase timeout passed to lxd waitready. + -- Arnaud Rebillout Mon, 04 Nov 2019 14:26:10 +0700 - [ Tianon Gravi ] - * Update to 18.09.1 upstream release +docker.io (19.03.4+dfsg1-2) experimental; urgency=medium - [ Michael Hudson-Doyle ] - * d/rules: Empty XDG_RUNTIME_DIR when smoke testing runc to avoid it doing - silly things. - * d/golang-github-docker-docker-dev.install: install some more go packages - that other packages in the archive depend on. + [ Arnaud Rebillout ] + * Add patch to fix build against prometheus-client-golang 1.2.1-1 - -- Tianon Gravi Thu, 17 Jan 2019 16:14:51 -0800 + [ Dmitry Smirnov ] + * dev to depend on "golang-github-morikuni-aec-dev" (used in + "pkg/jsonmessage"). + * dev: provide "containerd/labels". -docker.io (18.06.1-0ubuntu2) disco; urgency=medium + -- Arnaud Rebillout Wed, 30 Oct 2019 12:19:58 +0700 - * Fix containerd/runc embedded commit values - * Add "libsystemd-dev" to "Build-Depends" (LP: #1802979) +docker.io (19.03.4+dfsg1-1) experimental; urgency=medium - -- Tianon Gravi Fri, 19 Oct 2018 13:06:35 -0700 + * New upstream release [19.03.4]. + * Unvendor a few build dependencies. + * Drop golang-docker-dev transitional package. -docker.io (18.06.1-0ubuntu1) cosmic; urgency=medium + -- Arnaud Rebillout Sat, 26 Oct 2019 10:39:45 +0700 - * Update to 18.06.1 upstream release (LP: #1794396) - - drop "fix-btrfs-constants.patch" (applied upstream) - * Update debconf to prompt more aggressively (LP: #1784602) - 1. does not prompt on initial install (but does start the daemon) - 2. does prompt on every reinstall / upgrade (if the daemon is running) - 3. does prompt during "dpkg-reconfigure docker.io" (but does _not_ - [re]start the daemon) - 4. works properly with DEBIAN_FRONTEND=noninteractive -- user's - previous/stored answer to the question automatically applies with no - prompt - * Check if "docker" group exists before creating it (LP: #1769911) +docker.io (19.03.3+dfsg1-1) experimental; urgency=medium - -- Tianon Gravi Mon, 24 Sep 2018 15:42:19 -0700 + * New upstream release [19.03.3]. + * Drop & refresh patches. + * Update build dependencies. + * Vendor every dependencies that are missing/outdated in debian. + * Cherry-pick changes from master (18.09.9+dfsg1-4 to 18.09.9+dfsg2-6). -docker.io (17.12.1-0ubuntu6) cosmic; urgency=medium + -- Arnaud Rebillout Mon, 21 Oct 2019 11:06:43 +0700 - * d/tests/docker-in-lxd: Avoid startup race and drop lxd-client depends +docker.io (18.09.9+dfsg2-7) unstable; urgency=medium - -- Stéphane Graber Sat, 15 Sep 2018 03:07:49 +0200 + [ Arnaud Rebillout ] + * Add patch to fix build against prometheus-client-golang 1.2.1-1 -docker.io (17.12.1-0ubuntu5) cosmic; urgency=medium + [ Dmitry Smirnov ] + * get-orig-source.sh: consistent/reproducible tarball generation. + * dev/install: + + containerd/labels + + libnetwork/ipvs - * Fix ftbfs by cherry-picking https://github.com/containerd/btrfs/pull/16. + -- Dmitry Smirnov Thu, 31 Oct 2019 19:22:25 +1100 - -- Michael Hudson-Doyle Wed, 01 Aug 2018 11:40:05 +1200 +docker.io (18.09.9+dfsg2-6) unstable; urgency=medium -docker.io (17.12.1-0ubuntu4) cosmic; urgency=medium + * (Build-)Depends: + + golang-github-appc-cni-dev (>= 0.7.1~) + + golang-github-containerd-go-cni-dev (>= 0.0~git20190904~) + + golang-github-containernetworking-plugins-dev + + golang-github-morikuni-aec-dev + * dev: provide few more containerd components. - * d/tests/docker-in-lxd: only setup network bridge if missing + -- Dmitry Smirnov Fri, 18 Oct 2019 00:05:06 +1100 - -- Stéphane Graber Tue, 05 Jun 2018 22:58:51 -0400 +docker.io (18.09.9+dfsg1-5) unstable; urgency=medium -docker.io (17.12.1-0ubuntu3) cosmic; urgency=medium + [ Arnaud Rebillout ] + * Drop unused build depends - * d/tests/docker-in-lxd: switch to ubuntu-daily lxd remote and wait - for cloud-init to finish before running commands in the container. + [ 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"). - -- Michael Hudson-Doyle Tue, 22 May 2018 10:54:00 +1200 + -- Dmitry Smirnov Tue, 08 Oct 2019 14:37:25 +1100 -docker.io (17.12.1-0ubuntu2) cosmic; urgency=medium +docker.io (18.09.9+dfsg1-4) unstable; urgency=medium - * Update btrfs dependencies to use the new libbtrfs-dev & btrfs-progs. + * d/control: Break/replace/provide containerd-dev (Closes: #941091) + * d/control: Order and indent a few things - -- Dimitri John Ledkov Thu, 17 May 2018 09:27:15 +0100 + -- Arnaud Rebillout Wed, 25 Sep 2019 08:07:12 +0700 -docker.io (17.12.1-0ubuntu1) bionic; urgency=medium +docker.io (18.09.9+dfsg1-3) unstable; urgency=medium - [ Tianon Gravi ] - * Update to 17.12.1-ce upstream release - - swap from github.com/docker/docker to .../docker/docker-ce - - build separate components in a way that can be parallelized - - remove older (unsupported) contrib/ bits from being shipped - - drop a lot of unnecessary packaging bits from debian/ - * Adjust debconf prompt: - - ask during _every_ upgrade - - default to not restarting + [ Arnaud Rebillout ] + * d/control: Remove duplicate comma in build depends (Closes: #935488) + * d/control: Standards Version 4.4.0 - [ Michael Hudson-Doyle ] - * Switch to building with default version of Go. - * Adjust debconf template to match change in behavior. + [ Dmitry Smirnov ] + * Provides += golang-github-docker-go-metrics-dev - -- Tianon Gravi Wed, 28 Feb 2018 09:46:05 -0800 + -- Dmitry Smirnov Tue, 24 Sep 2019 12:45:51 +1000 -docker.io (17.03.2-0ubuntu5) bionic; urgency=medium +docker.io (18.09.9+dfsg1-2) unstable; urgency=medium - * d/control, d/rules: Fix FTBFS when built with golang 1.10 by build - depending on golang-1.9-go. See https://github.com/moby/moby/pull/35739 - for upstream discussion on golang 1.10 compatibility. + * Re-enable engine unit tests again. - -- Tyler Hicks Tue, 20 Mar 2018 13:57:16 +0000 + -- Arnaud Rebillout Mon, 16 Sep 2019 13:35:15 +0700 -docker.io (17.03.2-0ubuntu4) bionic; urgency=medium +docker.io (18.09.9+dfsg1-1) unstable; urgency=medium - * d/tests/docker-in-lxd: Fix failing test due to /etc/resolv.conf being a - symlink in Bionic. The 'lxc file pull -' command prints the symlink - contents (the target path) to stdout, rather than the contents of the - target file, so use 'lxc exec' to grep /etc/resolv.conf. Grep will follow - the symlink in situations where /etc/resolv.conf is a symlink. + [ Arnaud Rebillout ] + * New upstream release [18.09.9]. + * Disable engine unit tests (tmp, until gotestsum makes it to Debian). - -- Tyler Hicks Mon, 19 Mar 2018 19:35:52 +0000 + [ Dawid Dziurla ] + * Install fish completions -docker.io (17.03.2-0ubuntu3) bionic; urgency=medium + -- Arnaud Rebillout Mon, 16 Sep 2019 11:18:11 +0700 - * d/tests/docker-in-lxd: set DEBIAN_FRONTEND=noninteractive when installing - docker in the lxd container +docker.io (18.09.8+dfsg1-1) unstable; urgency=medium - -- Michael Hudson-Doyle Wed, 21 Feb 2018 10:49:58 +1300 + [ 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 -docker.io (17.03.2-0ubuntu2) bionic; urgency=medium + -- Arnaud Rebillout Sat, 14 Sep 2019 10:10:55 +0700 - * Replace "--no-restart-on-upgrade" with "--no-start" and a debconf prompt - - not restarting Docker causes many issues (LP: #1658691) - - suggested methods for keeping containers up are to use a restart policy - ("--restart=..." on "docker run"), Swarm Mode services, or rolling - replacement of k8s workers - * Backport 30519 for bashism (LP: #1744599) - - https://github.com/docker/docker/pull/30519 +docker.io (18.09.1+dfsg1-9) unstable; urgency=medium - -- Tianon Gravi Thu, 07 Dec 2017 09:42:53 -0800 + [ Dmitry Smirnov ] + * rules: no longer disable Go cache to prevent FTBFS with Go 1.12. -docker.io (17.03.2-0ubuntu1) bionic; urgency=medium + [ 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 - * Update to 17.03.2 upstream release + -- Arnaud Rebillout Wed, 04 Sep 2019 14:54:29 +0700 - -- Tianon Gravi Wed, 01 Nov 2017 12:30:17 -0700 +docker.io (18.09.1+dfsg1-8) unstable; urgency=medium -docker.io (1.13.1-0ubuntu6) artful; 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). - * Add missing "runc" patches for LXD-enablement + -- Arnaud Rebillout Mon, 05 Aug 2019 15:27:57 +0700 - -- Tianon Gravi Wed, 11 Oct 2017 19:38:03 -0700 +docker.io (18.09.1+dfsg1-7.1) unstable; urgency=medium -docker.io (1.13.1-0ubuntu5) artful; urgency=medium + * Non-maintainer upload. - * Replace "runc" dependency with a multiorig copy of Docker's exact supported - commit contents (installed as "/usr/bin/docker-runc" mirroring upstream's - package) - * Replace "containerd" in the same way (with the exact upstream-supported - commit, binaries installed as "/usr/bin/docker-containerd*") + [ Hideki Yamane ] + * upstream site moved to mobyproject.org - -- Tianon Gravi Fri, 29 Sep 2017 13:22:39 -0700 + [ Arnaud Rebillout ] + * Add patch for CVE-2018-15664 (Closes: #929662). -docker.io (1.13.1-0ubuntu4) artful; urgency=medium + -- Shengjing Zhu Sun, 23 Jun 2019 01:25:10 +0800 - * d/tests/docker-in-lxd: Better handle DNS with systemd-resolved. +docker.io (18.09.1+dfsg1-7) unstable; urgency=medium - -- Stéphane Graber Thu, 21 Sep 2017 01:12:33 -0400 + * Add patch to revert using iptables-legacy (Closes: #921600). -docker.io (1.13.1-0ubuntu3) artful; urgency=medium + -- Arnaud Rebillout Mon, 13 May 2019 09:34:45 +0700 - * d/tests/docker-in-lxd: check for network-up has a race condition when - systemd-resolved is used. Add an additional check for a real DNS server - in systemd-resolve --status. +docker.io (18.09.1+dfsg1-6) unstable; urgency=medium - -- Steve Langasek Fri, 15 Sep 2017 23:32:16 -0700 + * Add patch to fix Debian security presence check (Closes: #925224). -docker.io (1.13.1-0ubuntu2) artful; urgency=medium + -- Arnaud Rebillout Tue, 16 Apr 2019 09:56:17 +0700 - * d/tests/docker-in-lxd: copy more apt config into container - * d/golang-github-docker-docker-dev.install: install missing packages. - (LP: #1714564) - * d/control: Add Build-Depend on tzdata. +docker.io (18.09.1+dfsg1-5) unstable; urgency=medium - -- Michael Hudson-Doyle Mon, 04 Sep 2017 13:31:34 +1200 + * Install "containerd-shim" as "docker-containerd-shim" (Closes: #920935). + * Update containerd-name patch. -docker.io (1.13.1-0ubuntu1) artful; urgency=medium + -- Arnaud Rebillout Sat, 02 Feb 2019 10:00:35 +1100 - * Update to 1.13.1 upstream release - - refresh patches (removing many that are applied upstream in 1.13+) - - use dh_clean (via debian/clean) instead of explicit "rm" in rules - - pull in explicit libnetwork sources for "docker-proxy" - - drop unnecessary dh_golang usage (only used for Built-Using calculation) - - update "upstream-version-gitcommits" with a more recent list of commits - - add "tini" for building "docker-init" (used by "docker run --init") - - prefer Go 1.7 explicitly if it's available +docker.io (18.09.1+dfsg1-4) unstable; urgency=medium - -- Tianon Gravi Tue, 22 Aug 2017 09:30:24 -0700 + * Updated "containerd" executable name patch; + renamed "containerd-shim" executable (Closes: #920597). -docker.io (1.12.6-0ubuntu7) artful; urgency=medium + -- Dmitry Smirnov Mon, 28 Jan 2019 10:16:28 +1100 - * Make sure to set security.nesting for the LXD autopkgtest. +docker.io (18.09.1+dfsg1-3) unstable; urgency=medium - -- Stéphane Graber Tue, 06 Jun 2017 14:55:34 -0600 + * New patch to fix name of the "containerd" executable (Closes: #920597). -docker.io (1.12.6-0ubuntu6) artful; urgency=medium + -- Dmitry Smirnov Sun, 27 Jan 2019 23:43:53 +1100 - * Fix FTBFS on Go 1.8. +docker.io (18.09.1+dfsg1-2) unstable; urgency=medium - -- Stéphane Graber Mon, 05 Jun 2017 16:21:16 -0600 + [ Dmitry Smirnov ] + * Standards-Version: 4.3.0. + * Upload to unstable. -docker.io (1.12.6-0ubuntu5) artful; urgency=medium + [ Arnaud Rebillout ] + * Bump runc requirement to 1.0.0~rc6. + * Add patch to skip flaky test. + * Tidy up patches. - * Update LXD autopkgtest now that the "docker" profile is deprecated. + -- Arnaud Rebillout Sat, 26 Jan 2019 10:58:39 +1100 - -- Stéphane Graber Mon, 05 Jun 2017 15:59:18 -0600 +docker.io (18.09.1+dfsg1-1) experimental; urgency=medium -docker.io (1.12.6-0ubuntu4) zesty; urgency=medium + * New upstream release [January 2019]. + * Remove obsolete patches, refresh remaining ones. + * New notable patches: + - build against the runc debian package. + - build against google-grpc 1.11. + - attempt to fix mips build. + - disable a test file that fails to build (known issue upstream). + * Remove various build dependencies, add new ones. + * Bump some build dependencies: + - golang-github-coreos-bbolt-dev (>= 1.3.1-coreos.5-3~). + * Vendor some build dependencies: + - docker/licensing (no debian package, no upstream release). + - golang-github-spf13-cobra/pflag-dev (docker has internal fork). - * Revert 1.12.6-0ubuntu2 as it does not achieve the stated goal on both - s390x and armhf. And lxc/lxd adt runners are too restrictive to - e.g. import an ubuntu-base container for a minimal functional test. + -- Arnaud Rebillout Tue, 22 Jan 2019 19:48:15 +1100 - -- Dimitri John Ledkov Tue, 14 Mar 2017 09:41:30 +0000 +docker.io (18.06.1+dfsg1-3) unstable; urgency=medium -docker.io (1.12.6-0ubuntu3) zesty; urgency=medium + * Import upstream patch to use iptables-legacy (Closes: #911808). + * Un-vendor opencontainers-runtime-tools. + * Import numerous patches from upstream for go 1.11. - * debian/tests/docker-in-lxd: Fix a latent version comparison bug that was - causing migration failures due to the script thinking it was dealing - with an old LXD (< 2.2) when it was really dealing with a recent LXD - (>= 2.10). The fix is to use `lxc info` to check if the network extension - is supported, rather than trying to compare version strings. + -- Arnaud Rebillout Thu, 17 Jan 2019 15:37:54 +1100 - -- Tyler Hicks Fri, 10 Mar 2017 17:40:22 +0000 +docker.io (18.06.1+dfsg1-2) unstable; urgency=medium -docker.io (1.12.6-0ubuntu2) zesty; urgency=medium + * Tighten versioned dependency on "runc". + * dev: install "libnetwork/ipamutils". - * Remove isolation-machine restriction from adt smoke-test - testcase. Should pass on s390x lxd runners; will fails on armhf - runners but that is not a regressions since previously all tests were - simply skipped on armhf. LP: #1658150 + -- Dmitry Smirnov Sun, 16 Sep 2018 13:21:33 +1000 - -- Dimitri John Ledkov Wed, 01 Feb 2017 10:08:00 +0000 +docker.io (18.06.1+dfsg1-1) unstable; urgency=medium -docker.io (1.12.6-0ubuntu1) zesty; urgency=medium + [ Dmitry Smirnov ] + * New upstream release [August 2018]. + * Upload to unstable (Closes: #906999). - * Update to 1.12.6 upstream release (LP: #1655906) - - add a few new privileged tests to "skip-privileged-unit-tests.patch" - * Adjust runc Depends to ensure fix for CVE-2016-9962 is included + [ Arnaud Rebillout ] + * Cleanup /etc/init/docker.conf (Closes: #907455) - -- Tianon Gravi Fri, 13 Jan 2017 11:57:24 +1300 + -- Dmitry Smirnov Tue, 11 Sep 2018 14:03:46 +1000 -docker.io (1.12.3-0ubuntu4) zesty; urgency=medium +docker.io (18.06.0+dfsg1-1) experimental; urgency=medium - * Explicity depend on the version of runc that was built with seccomp - support. + * New upstream release [July 2018]. - -- Michael Hudson-Doyle Mon, 12 Dec 2016 11:15:01 +1300 + [ Arnaud Rebillout ] + * get-orig-source: print the list of directories vendored by upstream. -docker.io (1.12.3-0ubuntu3) zesty; urgency=medium + [ Dmitry Smirnov ] + * README.source: noted duration of upstream support. + * README.Debian: added note about restart dilemma. - [ Michael Hudson-Doyle ] - * d/test/docker-in-lxd: make test for "is network up" more robust. + -- Dmitry Smirnov Fri, 10 Aug 2018 19:07:41 +1000 - [ Stefan Bader ] - * Backport upstream 1.13 change to keep existing bridges untouched - (LP: #1647376) - - upstream-1.13-Vendor-libnetwork-51d88e9ae63f.patch +docker.io (18.03.1+dfsg1-6) unstable; urgency=medium - -- Michael Hudson-Doyle Thu, 08 Dec 2016 11:53:36 +1300 + * Removed obsolete "golang-ed25519-dev" from Build-Depends. + * Standards-Version: 4.1.5. -docker.io (1.12.3-0ubuntu2) zesty; urgency=medium + -- Dmitry Smirnov Wed, 11 Jul 2018 20:15:24 +1000 - [ Tianon Gravi ] - * Enable seccomp support (LP: #1639407) +docker.io (18.03.1+dfsg1-5) unstable; urgency=medium - -- Steve Langasek Wed, 30 Nov 2016 12:34:22 -0800 + * New upstream patch to prevent needless calls to `pass` (Closes: #902258). + * Do not automatically restart daemon on upgrade (Closes: #786724). + * Recommends += "needrestart". -docker.io (1.12.3-0ubuntu1) zesty; urgency=medium + "needrestart" prompts to restart "docker" daemon on upgrade. This way + running containers won't be killed on upgrade until user choses to + restart Docker. + Not restarting Docker on upgrade may break CLI when it disagrees with + running daemon regarding API version. - * Update to 1.12.3 upstream release - - https://github.com/docker/docker/releases/tag/v1.12.2 - - https://github.com/docker/docker/releases/tag/v1.12.3 + -- Dmitry Smirnov Mon, 02 Jul 2018 14:56:46 +1000 - -- Tianon Gravi Tue, 15 Nov 2016 15:50:32 -0800 +docker.io (18.03.1+dfsg1-4) unstable; urgency=medium -docker.io (1.12.1-0ubuntu15) yakkety; urgency=medium + * Suggests += "e2fsprogs, xfsprogs" (Closes: #887222). + * rules: fixed test failure on binary-indep build (Closes: #902206). + Thanks, Santiago Vila. - * d/test/docker-in-lxd: use images:ubuntu/${suite}/${arch} instead of - ubuntu-daily:${suite} because the former does not have cloud-init in it to - rewrite /etc/apt/sources.list at unexpected times. + -- Dmitry Smirnov Sun, 24 Jun 2018 23:22:51 +1000 - -- Michael Hudson-Doyle Mon, 10 Oct 2016 21:38:17 +1300 +docker.io (18.03.1+dfsg1-3) unstable; urgency=medium -docker.io (1.12.1-0ubuntu14) yakkety; urgency=medium + [ Dmitry Smirnov ] + * Replaced upstream SysV init file with an improved one. + * --remove-pidfile on stop (Closes: #764921) + * don't fail when removed (Closes: #841282) + * fixed exit status: + + don't fail to stop when already stopped + + don't fail to start when already started + * removed useless check_init() + Thanks, Sam Morris. + * postinst: create "docker" group when needed (Closes: #821078). + * README.source: added comment to clarify upstream version numbering. + Thanks, Tianon Gravi + * README.source: added link describing upstream life cycle & release + policy. Thanks, Tianon Gravi. + + [ Arnaud Rebillout ] + * Added myself to uploaders. + * Bumped compat to 11 to allow installling the systemd socket + file automatically with dh_installsystemd. + * Installed systemd socket through dh_installsystemd. - * d/test/docker-in-lxd: cope with changes in lxd 2.3. + -- Dmitry Smirnov Thu, 21 Jun 2018 21:27:32 +1000 - -- Michael Hudson-Doyle Mon, 10 Oct 2016 15:30:42 +1300 +docker.io (18.03.1+dfsg1-2) unstable; urgency=medium -docker.io (1.12.1-0ubuntu13) yakkety; urgency=medium + [ Dmitry Smirnov ] + * Upload to unstable. + * Un-bundle "googleapis-gnostic-dev" and "docker-notary-dev". + * Removed "golang-github-hashicorp-consul-dev" from Build-Depends. - * d/tests/docker-in-lxd: copy apt config from host to container rather than - just enabling all of the -proposed pocket. + [ Arnaud Rebillout ] + * Fix bash completion install. + * d/control: depend on golang-any. + * d/README.source: re-write part about docker-ce upstream workflow. + * Set required version for imdario-mergo and hashicorp-memberlist. - -- Michael Hudson-Doyle Tue, 27 Sep 2016 12:23:56 +1300 + -- Dmitry Smirnov Wed, 20 Jun 2018 23:40:47 +1000 -docker.io (1.12.1-0ubuntu12) yakkety; urgency=medium +docker.io (18.03.1+dfsg-1) experimental; urgency=medium - * Final(?) docker-in-lxd fix: of course, alpine:latest is only the name of - the image on amd64. + * New upstream release [April 2018]. + * rules: + + properly pass daemon version. + + re-work override_dh_auto_configure with important fixes. + * New patch to disable unreliable TestAdapterReadLogs. + * Use packaged "tini", don't build it. + Thanks, Arnaud Rebillout. - -- Michael Hudson-Doyle Mon, 19 Sep 2016 20:34:59 +1200 + -- Dmitry Smirnov Tue, 19 Jun 2018 13:43:57 +1000 -docker.io (1.12.1-0ubuntu11) yakkety; urgency=medium +docker.io (17.12.1+dfsg-4) experimental; urgency=medium - * Even more docker-in-lxd fixes. + * golang-github-docker-docker-dev: + + install only selected "libnetwork" components. + + install missing "docker/cli" components. + + install "docker/docker/cli". - -- Michael Hudson-Doyle Mon, 19 Sep 2016 14:14:33 +1200 + -- Dmitry Smirnov Mon, 18 Jun 2018 19:32:51 +1000 -docker.io (1.12.1-0ubuntu10) yakkety; urgency=medium +docker.io (17.12.1+dfsg-3) experimental; urgency=medium - * Yet another docker-in-lxd fix. + * Removed versioning from -dev Breaks/Replaces: libnetwork-dev + (Closes: #901694). + * Build with consistent tags "apparmor seccomp selinux ambient" + (Closes: #901743). + Thanks, Laurent Bigonville. + * New patch to fix FTBFS on mips* architectures. - -- Michael Hudson-Doyle Fri, 16 Sep 2016 19:02:41 +1200 + -- Dmitry Smirnov Mon, 18 Jun 2018 12:05:10 +1000 -docker.io (1.12.1-0ubuntu9) yakkety; urgency=medium +docker.io (17.12.1+dfsg-2) experimental; urgency=medium - * Proxy related fix for docker-in-lxd. + * New patch to disable TestGetRootUIDGID, failing in sbuild. - -- Michael Hudson-Doyle Fri, 16 Sep 2016 18:59:54 +1200 + -- Dmitry Smirnov Sat, 16 Jun 2018 21:31:51 +1000 -docker.io (1.12.1-0ubuntu8) yakkety; urgency=medium +docker.io (17.12.1+dfsg-1) experimental; urgency=medium - * Re-enable docker-in-lxd again after many fixes. + * Team upload. + * New upstream release [February 2018] (Closes: #850753). + * Restart on upgrade, like most daemons (Closes: #792327). + Docker's upgrade tip from 17.12.0 release notes: + "You must stop all containers and plugins BEFORE upgrading". + * New multi-upstream-tarball (MUT) layout, building all docker components + (containerd, libnetwork, swarmkit) at once; + incorporated binaries of docker-containerd and libnetwork. + * docker-dev to provide libnetwork-dev (a part of Docker). + * New patches to build on go-1.10; build with latest Go compiler. + * Declared myself as Maintainer. + + -- Dmitry Smirnov Sat, 16 Jun 2018 20:05:48 +1000 + +docker.io (1.13.1~ds3-4) unstable; urgency=medium + + * Build with go-1.7 as later versions cause [archive,tarsum] failures + (Closes: #901317). + * Re-enabled [archive,tarsum] tests. + * Build-Depends: + = golang-1.7-go | golang-go (>= 2:1.6~) + + -- Dmitry Smirnov Tue, 12 Jun 2018 00:02:27 +1000 + +docker.io (1.13.1~ds3-3) unstable; urgency=medium + + * Removed invalid team email from Uploaders (Closes: #899285). + * B-D: "libbtrfs-dev | btrfs-progs (<< 4.16.1~)" (Closes: #898876). + Thanks, Dimitri John Ledkov. + * (Build-)Depends: + - removed unused "golang-github-aanand-compose-file-dev". + - removed needless versioning and unknown alternatives. + * dev: install "runconfig" (used by "github.com/aanand/compose-file"). + * repack.sh: use correct compression type, depending on file name. + * watch file to version 4; updated "repack.sh". - -- Michael Hudson-Doyle Fri, 16 Sep 2016 12:26:04 +1200 + -- Dmitry Smirnov Sun, 10 Jun 2018 19:49:42 +1000 -docker.io (1.12.1-0ubuntu7) yakkety; urgency=medium +docker.io (1.13.1~ds3-2) unstable; urgency=medium - * d/tests/control: disable docker-in-lxd again, does not work in production - infrastructure. + * Team upload. + * Install -dev files from build directory. - -- Michael Hudson-Doyle Thu, 08 Sep 2016 09:41:13 +1200 + -- Dmitry Smirnov Sat, 09 Jun 2018 20:20:53 +1000 -docker.io (1.12.1-0ubuntu6) yakkety; urgency=medium +docker.io (1.13.1~ds3-1) unstable; urgency=medium - * d/tests/control: docker-in-lxd needs to depend on lxd-client as well. + * Team upload. - -- Michael Hudson-Doyle Wed, 07 Sep 2016 21:18:18 +1200 + [ Tianon Gravi ] + * Remove gccgo support. + Removed upstream in commit eda90f63446253f97d2011926555306f2417d208 + (https://github.com/moby/moby/pull/25978) + * Update upstream-version-gitcommits with more upstream versions -docker.io (1.12.1-0ubuntu5) yakkety; urgency=medium + [ Dmitry Smirnov ] + * New patch to fix CVE-2017-16539 (Closes: #900140). + * New patch to remove 10 seconds delay on purge (Closes: #853258). + * debhelper to version 11; compat to version 10. + * copyright format URL to HTTPS; bump copyright years. + * Standards-Version: 4.1.4. + * Vcs URLs to Salsa. + * Included "cliconfig" to -dev package (used by "gitlab-runner"). + * Included "reference" and "registry" into -dev package (used by "nomad"). + * Removed obsolete "golang-github-docker-engine-api-dev" from Build-Depends. + * Use more private libraries to fix build and break circular dependencies: + + github.com/docker/swarmkit + + github.com/docker/libnetwork + + github.com/docker/go-events + + github.com/docker/go-metrics + * Removed Upstart .conf file. + * rules: + + better clean, remove generated file(s). + + fixed "sirupsen/logrus" imports. + + DH_GOLANG_GO_GENERATE = 1 + + -- Dmitry Smirnov Sat, 09 Jun 2018 14:50:13 +1000 + +docker.io (1.13.1~ds2-3) unstable; urgency=medium + + * Switch from "runc" to "docker-runc" and "containerd" to + "docker-containerd", removing prefix-removing patch + (Closes: #877329, #877892) + * Update patches, especially test-disablers + + -- Tianon Gravi Sat, 14 Oct 2017 08:58:11 -0700 + +docker.io (1.13.1~ds1-2) unstable; urgency=medium + + * Make test suite pass by using assorted patches to fix or disable + tests that don't work under pbuilder. (Closes: #858269) + * Suppress some unfixable Lintian warnings. + * Verify CVE-2016-9962 is fixed. (Closes: #850952) - * Ignore failure to set oom_score_adj, as happens in an unprivileged - container. - * Use $DOCKER_OPTS in service file again. - * Add an autopkgtest to test docker-in-lxd. + -- Tim Potter Wed, 07 Jun 2017 11:43:14 +1000 - -- Michael Hudson-Doyle Wed, 07 Sep 2016 15:36:50 +1200 +docker.io (1.13.1~ds1-1) unstable; urgency=medium -docker.io (1.12.1-0ubuntu4) yakkety; urgency=medium + * New upstream release. - * Fix service file. + -- Tim Potter Wed, 24 May 2017 11:44:10 +1000 - -- Michael Hudson-Doyle Wed, 07 Sep 2016 14:13:12 +1200 +docker.io (1.13.0~ds1-3) unstable; urgency=medium -docker.io (1.12.1-0ubuntu3) yakkety; urgency=medium + * Add api and client directories to dev package. - * Skip "TestOverlay50LayerRead" on "overlay" driver too (in - "skip-privileged-unit-tests.patch") + -- Tim Potter Mon, 24 Apr 2017 16:02:32 +1000 - -- Tianon Gravi Mon, 29 Aug 2016 16:00:00 -0700 +docker.io (1.13.0~ds1-2) unstable; urgency=medium -docker.io (1.12.1-0ubuntu2) yakkety; urgency=medium + * Re-enable logfiles.com logging support after upstream license + change. + * Run nuke-graph-directory.sh using bash instead of regular sh. + * Fix dockerd location for sysvinit and upstart scripts. (Closes: #858249) - * Add new "overlay2" driver's tests to "skip-privileged-unit-tests.patch" - (FTBFS fix) + -- Tim Potter Tue, 28 Mar 2017 15:41:55 +1100 - -- Tianon Gravi Fri, 26 Aug 2016 10:20:24 -0700 +docker.io (1.13.0~ds1-1) experimental; urgency=medium -docker.io (1.12.1-0ubuntu1) yakkety; urgency=medium + [ Paul Tagliamonte ] + * Remove myself as maintainer, and swap out tpot. Sadly, these days, I'm + mostly just in the way, and not actually helping all that much with + the Docker packaging. My last upload was basically forever ago, and + tianon and tpot have been doing all the work since than. As such, I'm + going to make an unilateral executive decision to tell everyone who + listens to actually just listen to tpot. I plan to continue to be around in + the form of cruft and chaos monkey. You should also listen to tianon. - * Update to 1.12.1 upstream release (LP: #1602243) - - refresh "cgroupfs-mount-convenience-copy.patch" - - remove "fatal-error-old-kernels.patch"; applied upstream, - https://github.com/docker/docker/commit/51b23d88422918c24291f5876df35f91b23a446a - - refresh "change-system-unit-env-file.patch" - - refresh "21491--systemd-tasksmax.patch" - - remove "22000--ignore-invalid-host-header.patch"; applied upstream, - https://github.com/docker/docker/pull/22000 - https://github.com/docker/docker/pull/22888 - https://github.com/docker/docker/pull/23046 - - refresh "remove-docker-prefix.patch" - - refresh "skip-privileged-unit-tests.patch"; add new privileged tests, - + TestMakeRemoteContext - + TestMakeSumTarContext - + TestDispatch - + TestEmptyDockerfile - + TestDockerfileOutsideTheBuildContext - + TestRealodNoOpts - - replace "lxd--20902--docker-in-userns.patch" with the upstream-applied - "lxd--25672--docker-in-userns.patch" - - remove "lxd--runc-617.patch"; no longer necessary (due to kernel fixes), - https://github.com/opencontainers/runc/pull/617#issuecomment-223654149 - - remove "21714--no-aufs-in-userns.patch"; applied upstream, - https://github.com/docker/docker/pull/21714 - - add "man" to "DH_GOLANG_EXCLUDES" (has new "generate.go" which imports the - non-vendored "github.com/spf13/cobra/doc", causing dh_golang to choke) - - add "docker-proxy-vendor.patch" to account for "vendor/..." vs - "vendor/src/..." - - install new explicit "dockerd" and "docker-proxy" binaries - - update containerd dependency (>= 0.2.3) - - update runc dependency (>= 1.0.0-rc1) + [ Tianon Gravi ] + * Update basic-smoke test with "set -x" for debuggability and proper Depends + * Build from within GOPATH so Go packages are resolved properly + * Split "dh_auto_build-arch" from "dh_auto_build-indep" * Update "debian/watch" to use "uscan.tianon.xyz" so older versions are still easily fetchable without excess work outside uscan + * Fix d/copyright text about Apache version 2.0 being in + "/usr/share/common-licenses/GPL-2" (Closes: #835440); thanks cascardo! + * Add Tim Potter to Uploaders ♥ + * Add a bit more formatting to README.Debian (and a short intro to explain + what kinds of things this file includes) + * Add an explicit note about "systemd.legacy_systemd_cgroup_controller=yes" + in README.Debian (Closes: #843530) + * Add explicit new "golang-golang-x-oauth2-google-dev" package to Depends + + [ Tim Potter ] + * Add missing "golang-github-docker-go-events-dev" B-D (Closes: #850793) + * New upstream version. + * Refresh patches and remove obsolete ones. + * Remove logentries.com log driver as upstream module is unlicensed. - -- Tianon Gravi Wed, 24 Aug 2016 11:48:34 -0700 - -docker.io (1.11.2-0ubuntu6) yakkety; urgency=medium - - * Merge from Debian Unstable: - - more README.Debian notes (including a fixed href) - - new "docker-doc" package which contains the documentation - - use "dh-golang" for building (generates appropriate Built-Using) - - run upstream unit tests during dh_auto_test - - convert upstream-discouraged "/etc/default/docker" to comments-only - - utilize dh_install (w/dh-exec) more fully to simplify debian/rules - - fix "/etc/docker" permissions for co-existence with docker-registry - - remove "/var/lib/docker" on purge - * Remaining Ubuntu delta: - - non-pruned vendor/ (included in golang-github-docker-docker-dev) - - Docker-in-userns patches - * Changes from pending Debian upload: - - build from within GOPATH so Go packages are resolved properly - - split "dh_auto_build-arch" from "dh_auto_build-indep" - - include vendor/ in golang-github-docker-docker-dev (since we don't - necessarily have the appropriate packages for Depends on that package) - - -- Tianon Gravi Fri, 19 Aug 2016 10:15:14 -0700 + -- Tianon Gravi Fri, 19 Aug 2016 12:52:55 -0700 docker.io (1.11.2~ds1-6) unstable; urgency=medium @@ -890,135 +1192,6 @@ -- Tianon Gravi Mon, 04 Jul 2016 09:59:44 -0700 -docker.io (1.11.2-0ubuntu5) yakkety; urgency=medium - - * Add 'allow-stderr' to basic-smoke stanza in debian/tests/control to fix - autopkgtest on some architectures. - * Also add aufs-tools and debian-archive-keyring to Depends to reduce log spam. - * Add set -x to script. - - -- Michael Hudson-Doyle Thu, 07 Jul 2016 09:15:56 +1200 - -docker.io (1.11.2-0ubuntu4) yakkety; urgency=medium - - [ Tianon Gravi ] - * Remove erroneous "docker.io.links" file - * Prefer Go 1.6 more explicitly - - [ Michael Hudson-Doyle ] - * Add a basic smoke test to debian/tests. - * Disable debian/tests/integration. - - -- Tianon Gravi Wed, 15 Jun 2016 14:11:59 -0700 - -docker.io (1.11.2-0ubuntu3) yakkety; urgency=medium - - * No change rebuild to pick up s390x fixes. - - -- Michael Hudson-Doyle Fri, 10 Jun 2016 14:39:24 +1200 - -docker.io (1.11.2-0ubuntu2) yakkety; urgency=medium - - * Remove "docker-" prefix on expected "runc" and "containerd" binaries - - -- Tianon Gravi Thu, 09 Jun 2016 09:57:15 -0700 - -docker.io (1.11.2-0ubuntu1) yakkety; urgency=medium - - * Update to 1.11.2 upstream release (and resync many minor bits with Debian) - * Update "22000--ignore-invalid-host-header.patch" to fix "index out of range" - panic and reflect the current state of master acceptance - - -- Tianon Gravi Wed, 11 May 2016 08:07:09 -0700 - -docker.io (1.10.3-0ubuntu7) yakkety; urgency=medium - - [ Tianon Gravi ] - * Update GOPATH logic in debian/tests/integration to match debian/rules - - [ Michael Hudson-Doyle ] - * Add d/patches/22000--ignore-invalid-host-header.patch. (LP: #1574904) - - -- Tianon Gravi Tue, 26 Apr 2016 16:40:15 -0700 - -docker.io (1.10.3-0ubuntu6) xenial; urgency=medium - - * Clean up some DEP3 patch metadata (especially "Origin" and "Forwarded") - - -- Tianon Gravi Wed, 20 Apr 2016 14:19:16 -0700 - -docker.io (1.10.3-0ubuntu5) xenial; urgency=medium - - * Rebuild to pick up fixes in golang-1.6 1.6-0ubuntu5. - * Add golang version to Built-Using in docker package. - - -- Michael Hudson-Doyle Mon, 11 Apr 2016 14:15:45 +1200 - -docker.io (1.10.3-0ubuntu4) xenial; urgency=medium - - * Drop d/patches/libnetwork-s390x.patch, no longer needed after golang - updates. - - -- Michael Hudson-Doyle Mon, 04 Apr 2016 16:27:28 +1200 - -docker.io (1.10.3-0ubuntu3) xenial; urgency=medium - - * Do not use aufs in a lxd container. (LP: #1560685) - - -- Serge Hallyn Thu, 31 Mar 2016 21:30:49 -0500 - -docker.io (1.10.3-0ubuntu2) xenial; urgency=medium - - * Add "TasksMax=infinity" patch for newer kernel+systemd - * Add support to DEP8 test script for passing *_proxy environment variables - forward appropriately - - -- Tianon Gravi Mon, 28 Mar 2016 15:20:51 -0700 - -docker.io (1.10.3-0ubuntu1) xenial; urgency=medium - - [ Joseph Ferguson ] - * Update "Homepage" to "dockerproject.org" (versus ".com" which now redirects) - * Update "Vcs-Browser" to use https - * Add missing "jq" to DEP8 test dependencies - * Add a few multiarch build system patches to enable running the integration - tests - - -- Dustin Kirkland Thu, 24 Mar 2016 16:08:42 -0500 - -docker.io (1.10.2-0ubuntu4) xenial; urgency=medium - - * Add debian/patches/upstream-delegate.patch: Add "Delegate=yes" to docker's - service file, so that it can manage cgroups by itself. Patch cherry-picked - from upstream master. (LP: #1546214) - - -- Martin Pitt Sun, 13 Mar 2016 22:50:51 +0100 - -docker.io (1.10.2-0ubuntu3) xenial; urgency=medium - - * debian/control: - - drop the any- prefix on build arches; seems that any-armhf isn't - defined, so armhf builds did not trigger - - -- Dustin Kirkland Thu, 10 Mar 2016 14:41:00 -0500 - -docker.io (1.10.2-0ubuntu2) xenial; urgency=medium - - * debian/control: - - disable powerpc build for now - - -- Dustin Kirkland Thu, 10 Mar 2016 10:39:16 -0500 - -docker.io (1.10.2-0ubuntu1) xenial; urgency=medium - - * Update to 1.10.2 upstream release (LP: #1552790) - - include upstream's vendored bits (explicitly relying on upstream for - security updates and support) - - patches for enabling Docker-in-LXD (still pending upstream) - - patches for s390x support - - -- Tianon Gravi Tue, 01 Mar 2016 14:21:20 -0800 - docker.io (1.8.3~ds1-2) unstable; urgency=medium * Move "overlay" higher in priority (Closes: #799087) diff -Nru docker.io-20.10.21/debian/clean docker.io-20.10.24+dfsg1/debian/clean --- docker.io-20.10.21/debian/clean 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/clean 2023-01-14 05:55:59.000000000 -0300 @@ -1,8 +1,14 @@ -.gocache/ -.gopath/ -cli/build/ -cli/man/man*/ -engine/bundles/ -engine/dockerversion/*_autogen*.go -libnetwork/docker-proxy -tini/build/ +## Debian CI: +debian/.gitlab-ci.yml + +## Useless non-doc files: +cli/docs/yaml/* + +## generated: +engine/dockerversion/version_autogen_unix.go +engine/dockerversion/version_autogen.go + +## Privileged tests: +engine/daemon/graphdriver/btrfs/btrfs_test.go +engine/daemon/graphdriver/devmapper/devmapper_test.go +engine/daemon/graphdriver/vfs/vfs_test.go diff -Nru docker.io-20.10.21/debian/compat docker.io-20.10.24+dfsg1/debian/compat --- docker.io-20.10.21/debian/compat 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/compat 1969-12-31 21:00:00.000000000 -0300 @@ -1 +0,0 @@ -11 diff -Nru docker.io-20.10.21/debian/control docker.io-20.10.24+dfsg1/debian/control --- docker.io-20.10.21/debian/control 2023-02-23 16:29:50.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/control 2023-06-02 16:06:10.000000000 -0300 @@ -1,112 +1,190 @@ Source: docker.io Section: admin Priority: optional +Standards-Version: 4.6.0 Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Paul Tagliamonte -Uploaders: Docker Packaging Team , - Tianon Gravi +XSBC-Original-Maintainer: Debian Go Packaging Team +Uploaders: Arnaud Rebillout + ,Dmitry Smirnov + ,Tim Potter + ,Tianon Gravi + ,Paul Tagliamonte Build-Conflicts: golang-github-docker-docker-dev -Build-Depends: bash-completion, - ca-certificates, - cmake, - debconf (>= 0.5), - debhelper (>= 11), - dh-apparmor, - dh-exec, - dh-golang, - git, - golang-go, - libapparmor-dev, - libbtrfs-dev | btrfs-progs (<< 4.16.1~), - libdevmapper-dev (>= 2:1.02.68~), - libltdl-dev, - libseccomp-dev, - libsystemd-dev (>= 209~), - pkg-config, - procps, - tzdata -Standards-Version: 3.9.8 -Homepage: https://www.docker.com/community-edition -Vcs-Git: https://anonscm.debian.org/git/docker/docker.io.git -Vcs-Browser: https://anonscm.debian.org/cgit/docker/docker.io.git +Build-Depends: debhelper-compat (= 13) ,dh-apparmor ,dh-golang (>= 1.14~) + ,bash-completion + ,ca-certificates + ,golang-any (>= 2:1.10~) + ,go-md2man (>= 1.0.3~) + ,gogoprotobuf, libprotobuf-dev + ,golang-dbus-dev (>= 5.0.2~) +# ,golang-etcd-server-dev + ,golang-github-armon-circbuf-dev + ,golang-github-armon-go-metrics-dev + ,golang-github-aws-aws-sdk-go-dev + ,golang-github-bsphere-le-go-dev + ,golang-github-burntsushi-toml-dev + ,golang-github-cespare-xxhash-dev + ,golang-github-cilium-ebpf-dev + ,golang-github-cloudflare-cfssl-dev + ,golang-github-containerd-cgroups-dev + ,golang-github-containerd-console-dev + ,golang-github-containerd-containerd-dev (>= 1.4.2~ds1-2~) + ,golang-github-containerd-continuity-dev (>= 0.0~git20190426~) + ,golang-github-containerd-fifo-dev (>= 1.1.0~) + ,golang-github-containerd-go-runc-dev + ,golang-github-containerd-typeurl-dev + ,golang-github-coreos-bbolt-dev + ,golang-github-coreos-go-systemd-dev (>= 20~) + ,golang-github-creack-pty-dev + ,golang-github-cyphar-filepath-securejoin-dev + ,golang-github-deckarep-golang-set-dev + ,golang-github-docker-distribution-dev (>= 2.7.1~) + ,golang-github-docker-docker-credential-helpers-dev (>= 0.6.1~) + ,golang-github-docker-go-connections-dev (>= 0.4.0~) + ,golang-github-docker-go-events-dev + ,golang-github-docker-go-metrics-dev + ,golang-github-docker-go-units-dev (>= 0.4.0~) + ,golang-github-docker-libkv-dev + ,golang-github-docker-libtrust-dev + ,golang-github-docker-notary-dev + ,golang-github-fernet-fernet-go-dev + ,golang-github-fluent-fluent-logger-golang-dev (>= 1.3.0~) + ,golang-github-fsnotify-fsnotify-dev + ,golang-github-fvbommel-sortorder-dev + ,golang-github-gofrs-flock-dev + ,golang-github-gogo-googleapis-dev + ,golang-github-golang-groupcache-dev + ,golang-github-googleapis-gax-go-dev + ,golang-github-google-go-cmp-dev (>= 0.2.0~) + ,golang-github-google-shlex-dev + ,golang-github-google-uuid-dev + ,golang-github-gorilla-mux-dev (>= 1.7.1~) + ,golang-github-gotestyourself-gotest.tools-dev + ,golang-github-graylog2-go-gelf-dev (>= 0.0+git20191017~) + ,golang-github-grpc-ecosystem-go-grpc-prometheus-dev + ,golang-github-grpc-ecosystem-go-grpc-middleware-dev + ,golang-github-grpc-ecosystem-grpc-opentracing-dev + ,golang-github-hashicorp-go-memdb-dev + ,golang-github-hashicorp-memberlist-dev (>= 0.1.0~) + ,golang-github-hashicorp-serf-dev + ,golang-github-ishidawataru-sctp-dev + ,golang-github-imdario-mergo-dev (>= 0.3.3~) + ,golang-github-json-iterator-go-dev (>= 1.1.4~) + ,golang-github-miekg-dns-dev (>= 1.1.26~) + ,golang-github-mitchellh-hashstructure-dev + ,golang-github-moby-locker-dev + ,golang-github-moby-sys-dev + ,golang-github-moby-term-dev + ,golang-github-modern-go-reflect2-dev + ,golang-github-morikuni-aec-dev + ,golang-github-opencontainers-go-digest-dev + ,golang-github-opencontainers-image-spec-dev (>= 1.0.1~) + ,golang-github-opencontainers-runc-dev (>= 1.0.0~rc8~) + ,golang-github-opencontainers-selinux-dev (>= 1.8.0~) + ,golang-github-opencontainers-specs-dev (>= 1.0.1~) + ,golang-github-opentracing-contrib-go-stdlib-dev + ,golang-github-opentracing-opentracing-go-dev + ,golang-github-philhofer-fwd-dev + ,golang-github-prometheus-client-golang-dev (>= 0.9.0~) + ,golang-github-racksec-srslog-dev + ,golang-github-samuel-go-zookeeper-dev + ,golang-github-sirupsen-logrus-dev (>= 1.0.2~) + ,golang-github-spf13-cobra-dev (>= 1.1.1~) + ,golang-github-spf13-pflag-dev (>= 1.0.5-2~) + ,golang-github-tchap-go-patricia-dev +# ,golang-github-tonistiigi-fsutil-dev (>= 0.0~git20200724~) + ,golang-github-tonistiigi-units-dev + ,golang-github-urfave-cli-dev (>= 1.20.0~) + ,golang-github-vbatts-tar-split-dev (>= 0.11.1~) + ,golang-github-vishvananda-netlink-dev (>= 1.0.0~) + ,golang-github-vishvananda-netns-dev (>= 0.0~git20170707~) + ,golang-github-xeipuuv-gojsonschema-dev (>= 1.2.0~) + ,golang-gocapability-dev + ,golang-golang-x-net-dev + ,golang-golang-x-oauth2-google-dev | golang-golang-x-oauth2-dev + ,golang-golang-x-term-dev + ,golang-golang-x-time-dev + ,golang-google-api-dev + ,golang-google-cloud-dev + ,golang-google-grpc-dev + ,golang-goprotobuf-dev (>= 0.0~git20151207~) + ,golang-go-zfs-dev + ,golang-protobuf-extensions-dev + ,gotestsum + ,libapparmor-dev + ,libbtrfs-dev | btrfs-progs (<< 4.16.1~) + ,libdevmapper-dev + ,libseccomp-dev + ,pkg-config + ,procps + ,tzdata +# tests: + ,git +# swarmkit tests are not run: +# ,golang-github-onsi-ginkgo-dev +# ,golang-gomega-dev +# cli/vendor/k8s.io dependencies: + ,golang-github-davecgh-go-spew-dev + ,golang-github-evanphx-json-patch-dev (>= 4.1.0~) + ,golang-github-googleapis-gnostic-dev + ,golang-github-google-gofuzz-dev + ,golang-gopkg-inf.v0-dev +# ,golang-k8s-sigs-structured-merge-diff-dev + ,golang-k8s-sigs-yaml-dev +Homepage: https://mobyproject.org +Vcs-Browser: https://salsa.debian.org/go-team/packages/docker +Vcs-Git: https://salsa.debian.org/go-team/packages/docker.git +Rules-Requires-Root: no XS-Go-Import-Path: github.com/docker/docker -Package: docker.io -Architecture: amd64 arm64 armhf i386 ppc64el riscv64 s390x -Depends: adduser, - containerd (>= 1.2.6-0ubuntu1~), - iptables, - ${misc:Depends}, - ${shlibs:Depends} -Recommends: ca-certificates, - git, - pigz, - ubuntu-fan, - xz-utils, - ${apparmor:Recommends} -Replaces: docker (<< 1.5~) -Breaks: docker (<< 1.5~) -Suggests: aufs-tools, - btrfs-progs, - cgroupfs-mount | cgroup-lite, - debootstrap, - docker-doc, - rinse, - zfs-fuse | zfsutils -Built-Using: ${libc:Built-Using}, ${misc:Built-Using} -Description: Linux container runtime - Docker complements kernel namespacing with a high-level API which operates at - the process level. It runs unix processes with strong guarantees of isolation - and repeatability across servers. - . - Docker is a great building block for automating distributed systems: - large-scale web deployments, database clusters, continuous deployment systems, - private PaaS, service-oriented architectures, etc. - . - This package contains the daemon and client. Using docker.io on non-amd64 hosts - is not supported at this time. Please be careful when using it on anything - besides amd64. - . - Also, note that kernel version 3.8 or above is required for proper operation of - the daemon process, and that any lower versions may have subtle and/or glaring - issues. - -Package: vim-syntax-docker -Architecture: all -Depends: vim, ${misc:Depends} -Recommends: vim-addon-manager -Suggests: docker.io -Description: Docker container engine - Vim highlighting syntax files - This package provides syntax files for the Vim editor for editing Dockerfiles - from the Docker container engine. - Package: golang-github-docker-docker-dev Architecture: all -Depends: golang-github-ishidawataru-sctp-dev, - golang-github-docker-docker-credential-helpers-dev, - golang-github-seccomp-libseccomp-golang-dev, - ${misc:Depends} -Replaces: golang-docker-dev (<< 1.8.2~ds1-1~) -Breaks: golang-docker-dev (<< 1.8.2~ds1-1~) -Provides: golang-docker-dev -Description: Externally reusable Go packages included with Docker +Section: golang +Depends: ${misc:Depends} + ,golang-github-armon-circbuf-dev + ,golang-github-containerd-containerd-dev (>= 1.4.2~ds1-2~) + ,golang-github-containerd-continuity-dev (>= 0.0~git20190426~) + ,golang-github-docker-distribution-dev (>= 2.7.1~) + ,golang-github-docker-docker-credential-helpers-dev (>= 0.6.1~) + ,golang-github-docker-go-connections-dev (>= 0.4.0~) + ,golang-github-docker-go-metrics-dev + ,golang-github-docker-go-units-dev (>= 0.4.0~) + ,golang-github-docker-libkv-dev + ,golang-github-fsnotify-fsnotify-dev + ,golang-github-gorilla-mux-dev (>= 1.7.1~) + ,golang-github-moby-term-dev + ,golang-github-morikuni-aec-dev + ,golang-github-opencontainers-go-digest-dev + ,golang-github-opencontainers-image-spec-dev (>= 1.0.1~) + ,golang-github-opencontainers-runc-dev (>= 1.0.0~rc8~) + ,golang-github-opencontainers-selinux-dev (>= 1.8.0~) + ,golang-github-sirupsen-logrus-dev (>= 1.0.2~) + ,golang-github-tchap-go-patricia-dev + ,golang-golang-x-net-dev + ,golang-golang-x-sys-dev (>= 0.0~git20190726~) + ,golang-google-grpc-dev +# libnetwork: + ,golang-dbus-dev (>= 5.0.2~) + ,golang-github-burntsushi-toml-dev + ,golang-github-deckarep-golang-set-dev + ,golang-github-docker-go-events-dev + ,golang-github-hashicorp-memberlist-dev (>= 0.1.0~) + ,golang-github-hashicorp-serf-dev + ,golang-github-ishidawataru-sctp-dev + ,golang-github-vishvananda-netlink-dev (>= 1.0.0~) + ,golang-github-vishvananda-netns-dev +# moby/buildkit/session + ,golang-github-opentracing-opentracing-go-dev +Description: reusable Go packages included with Docker These packages are intentionally developed by upstream in such a way that they are reusable to projects outside Docker and only rely on each other or other external dependencies to be built. -Package: golang-docker-dev -Section: oldlibs -Priority: optional -Architecture: all -Depends: golang-github-docker-docker-dev, ${misc:Depends} -Description: Transitional package for golang-github-docker-docker-dev - This is a transitional package to ease upgrades to the - golang-github-docker-docker-dev package. It can safely be removed. - Package: docker-doc Provides: docker.io-doc Section: doc Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Description: Linux container runtime -- documentation Docker complements kernel namespacing with a high-level API which operates at diff -Nru docker.io-20.10.21/debian/copyright docker.io-20.10.24+dfsg1/debian/copyright --- docker.io-20.10.21/debian/copyright 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/copyright 2023-01-14 05:55:59.000000000 -0300 @@ -1,463 +1,268 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://github.com/moby/moby Upstream-Name: Docker Upstream-Contact: Docker, Inc. -Source: https://github.com/docker/docker - -# values gathered via "git grep -inE 'license|copyright'" (should be in the order that command spits out) -# (don't forget that we're multiorig, so need all tarball licenses!!) +Comment: + "~B~" Breaks something (apart from the build). + "~C~" induce a Circular dependency. + "~F~" upstream uses an internal Fork. + "~~" does not build with system library. + "~" not packaged or not available (e.g. removed). + . + Thanks to custom repack script, Files-Excluded section is applied to all + components otherwise individual Files-Excluded-{component} sections would + contain too much duplication. + . + armon/go-radix v1 causes libnetwork to segfault, cf. #918375 + . + Temperory vendor etcd library, to upgrade etcd to 3.4 in unstable. +Files-Excluded: + .github + .gitignore + vendor/archive + vendor/cloud.google.com + ~vendor/code.cloudfoundry.org + vendor/github.com/armon/circbuf + vendor/github.com/armon/go-metrics + ~B~vendor/github.com/armon/go-radix + vendor/github.com/aws/aws-sdk-go + vendor/github.com/Azure/go-ansiterm + vendor/github.com/beorn7/perks + vendor/github.com/bsphere/le_go + vendor/github.com/BurntSushi/toml + vendor/github.com/cespare/xxhash + vendor/github.com/cilium/ebpf + vendor/github.com/cloudflare/cfssl + vendor/github.com/containerd/cgroups + vendor/github.com/containerd/console + vendor/github.com/containerd/containerd + vendor/github.com/containerd/continuity + vendor/github.com/containerd/fifo + vendor/github.com/containerd/go-runc + vendor/github.com/containerd/ttrpc + vendor/github.com/containerd/typeurl + ~~vendor/github.com/coreos/etcd + vendor/github.com/coreos/go-semver + vendor/github.com/coreos/go-systemd + vendor/github.com/coreos/pkg + vendor/github.com/cpuguy83/go-md2man + vendor/github.com/creack/pty + vendor/github.com/cyphar/filepath-securejoin + vendor/github.com/davecgh/go-spew + vendor/github.com/deckarep/golang-set + ~vendor/github.com/docker/compose-on-kubernetes + vendor/github.com/docker/distribution + vendor/github.com/docker/docker + vendor/github.com/docker/docker-credential-helpers + vendor/github.com/docker/go + vendor/github.com/docker/go-connections + vendor/github.com/docker/go-events + vendor/github.com/docker/go-metrics + vendor/github.com/docker/go-units + vendor/github.com/docker/libkv + vendor/github.com/docker/libnetwork + vendor/github.com/docker/libtrust + vendor/github.com/docker/swarmkit + vendor/github.com/dustin/go-humanize + vendor/github.com/evanphx/json-patch + vendor/github.com/fernet/fernet-go + vendor/github.com/fluent/fluent-logger-golang + vendor/github.com/fsnotify/fsnotify + vendor/github.com/fvbommel/sortorder + vendor/github.com/godbus/dbus + vendor/github.com/gofrs/flock + vendor/github.com/gogo/googleapis + vendor/github.com/gogo/protobuf + ~vendor/github.com/golang/gddo + vendor/github.com/golang/groupcache + vendor/github.com/golang/protobuf + vendor/github.com/googleapis/gax-go + vendor/github.com/googleapis/gnostic + vendor/github.com/google/btree + vendor/github.com/google/certificate-transparency-go + vendor/github.com/google/go-cmp + vendor/github.com/google/gofuzz + vendor/github.com/google/shlex + vendor/github.com/google/uuid + vendor/github.com/gorilla/mux + vendor/github.com/Graylog2/go-gelf + vendor/github.com/grpc-ecosystem/go-grpc-middleware + vendor/github.com/grpc-ecosystem/go-grpc-prometheus + vendor/github.com/grpc-ecosystem/grpc-gateway + vendor/github.com/grpc-ecosystem/grpc-opentracing + vendor/github.com/hashicorp/consul + vendor/github.com/hashicorp/errwrap + ~F~vendor/github.com/hashicorp/go-immutable-radix + vendor/github.com/hashicorp/golang-lru + vendor/github.com/hashicorp/go-memdb + vendor/github.com/hashicorp/go-msgpack + vendor/github.com/hashicorp/go-multierror + vendor/github.com/hashicorp/go-sockaddr + vendor/github.com/hashicorp/memberlist + vendor/github.com/hashicorp/serf + vendor/github.com/hpcloud/tail + vendor/github.com/imdario/mergo + vendor/github.com/inconshreveable/mousetrap + vendor/github.com/ishidawataru/sctp + ~F~vendor/github.com/jaguilar/vt100 + vendor/github.com/jmespath/go-jmespath + vendor/github.com/json-iterator/go + vendor/github.com/konsorten/go-windows-terminal-sequences + vendor/github.com/matttproud/golang_protobuf_extensions + vendor/github.com/Microsoft/go-winio + vendor/github.com/Microsoft/hcsshim + vendor/github.com/Microsoft/opengcs + vendor/github.com/miekg/dns + vendor/github.com/miekg/pkcs11 + vendor/github.com/mistifyio/go-zfs + vendor/github.com/mitchellh/hashstructure + vendor/github.com/mitchellh/mapstructure + ~vendor/github.com/moby/buildkit + ~vendor/github.com/moby/ipvs + vendor/github.com/moby/locker + vendor/github.com/moby/sys + vendor/github.com/moby/term + vendor/github.com/modern-go/concurrent + vendor/github.com/modern-go/reflect2 + vendor/github.com/morikuni/aec + vendor/github.com/onsi/ginkgo + vendor/github.com/onsi/gomega + vendor/github.com/opencontainers/go-digest + vendor/github.com/opencontainers/image-spec + vendor/github.com/opencontainers/runc + vendor/github.com/opencontainers/runtime-spec + vendor/github.com/opencontainers/selinux + vendor/github.com/opentracing-contrib/go-stdlib + vendor/github.com/opentracing/opentracing-go + ~vendor/github.com/phayes/permbits + vendor/github.com/philhofer/fwd + vendor/github.com/pkg/errors + vendor/github.com/pmezard/go-difflib + vendor/github.com/prometheus/client_golang + vendor/github.com/prometheus/client_model + vendor/github.com/prometheus/common + vendor/github.com/prometheus/procfs + vendor/github.com/RackSec/srslog + vendor/github.com/rcrowley/go-metrics + vendor/github.com/russross/blackfriday + vendor/github.com/samuel/go-zookeeper + vendor/github.com/sean-/seed + vendor/github.com/sirupsen/logrus + vendor/github.com/spf13/cobra + vendor/github.com/spf13/pflag + vendor/github.com/stretchr/testify + vendor/github.com/syndtr/gocapability + vendor/github.com/tchap/go-patricia + vendor/github.com/theupdateframework/notary + vendor/github.com/tinylib/msgp + ~C~vendor/github.com/tonistiigi/fsutil + ~vendor/github.com/tonistiigi/go-rosetta + vendor/github.com/tonistiigi/units + vendor/github.com/ugorji/go + vendor/github.com/urfave/cli + vendor/github.com/vbatts/tar-split + vendor/github.com/vishvananda/netlink + vendor/github.com/vishvananda/netns + vendor/github.com/willf/bitset + vendor/github.com/xeipuuv/gojsonpointer + vendor/github.com/xeipuuv/gojsonreference + vendor/github.com/xeipuuv/gojsonschema + vendor/go.etcd.io + vendor/golang.org + vendor/google.golang.org + vendor/go.opencensus.io + vendor/gopkg.in + vendor/gotest.tools + ~vendor/k8s.io + vendor/sigs.k8s.io +Files-Excluded-distribution: + */docs Files: * -Copyright: 2012-2016 Docker, Inc. -License: Apache-2.0 - -Files: tini/* -Copyright: 2015 Thomas Orozco -License: Expat - -Files: debian/* -Copyright: 2013-2014 Daniel Mizyrycki - 2013-2014 Paul Tagliamonte - 2012-2014 Michael Stapelberg - 2013-2016 Tianon Gravi - 2013-2014 Johan Euphrosine - 2014 Prach Pongpanich - 2016 Tim Potter - 2016 Dmitry Smirnov - 2016 Michael Hudson-Doyle +Copyright: 2012-2018 Docker, Inc. License: Apache-2.0 -Files: contrib/completion/zsh/* +Files: + cli/contrib/completion/zsh/* Copyright: 2013-2014 Felix Riedel License: BSD-3-clause-Generic -Files: contrib/init/openrc/docker.initd -Copyright: 1999-2013 Gentoo Foundation -License: GPL-2 +Files: + engine/contrib/busybox/* +Copyright: 2015 John Howard (Microsoft) +License: Expat -Files: contrib/selinux*/* -Copyright: 2012-2016 Docker Inc. +Files: + engine/contrib/init/openrc/docker.initd +Copyright: 1999-2013 Gentoo Foundation License: GPL-2 -Comment: - No explicit copyright statement; assuming upstream copyright. - -Files: contrib/syntax/vim/* -Copyright: 2013 Honza Pokorny -License: BSD-2-clause -# pkg/aaparser/*.go include references to "Copyright" that are referring to the output of another tool (not the copyright of these files themselves) - -Files: pkg/symlink/fs.go +Files: + libnetwork/client/mflag/* Copyright: 2014-2016 The Docker & Go Authors License: BSD-3-clause-Google -Files: vendor/github.com/Azure/go-ansiterm/* -Copyright: 2015 Microsoft Corporation -License: Expat - -Files: vendor/github.com/BurntSushi/toml/* -Copyright: 2013–2016 Andrew Gallant -License: WTFPL-2.0 - -Files: vendor/github.com/BurntSushi/toml/type_fields.go -Copyright: 2010 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/github.com/Graylog2/go-gelf/* -Copyright: 2012 SocialCode -License: Expat - -Files: vendor/github.com/Microsoft/go-winio/* -Copyright: 2015 Microsoft -License: Expat - -Files: vendor/github.com/Microsoft/go-winio/archive/tar/* -Copyright: 2012 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/github.com/Microsoft/hcsshim/* -Copyright: 2015 Microsoft +Files: + swarmkit/ca/pkcs8/pkcs8.go +Copyright: 2014 youmark License: Expat -Files: vendor/github.com/Microsoft/hcsshim/mksyscall_windows.go -Copyright: 2013 The Go Authors +Files: + swarmkit/protobuf/plugin/raftproxy/test/service.proto +Copyright: 2015, Google Inc. License: BSD-3-clause-Google -Files: vendor/github.com/RackSec/srslog/* -Copyright: 2015 Rackspace -License: BSD-3-clause-Google - -Files: vendor/github.com/Sirupsen/logrus/* -Copyright: 2014 Simon Eskildsen -License: Expat - -Files: vendor/github.com/Sirupsen/logrus/alt_exit.go -Copyright: 2012 Miki Tebeka -License: Expat - -Files: vendor/github.com/Sirupsen/logrus/terminal_*.go -Copyright: 2011 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/github.com/agl/ed25519/* -Copyright: 2012 The Go Authors -License:BSD-3-clause-Google - -Files: vendor/github.com/armon/go-metrics/* -Copyright: 2013 Armon Dadgar -License: Expat - -Files: vendor/github.com/armon/go-radix/* -Copyright: 2014 Armon Dadgar -License: Expat - -Files: vendor/github.com/beorn7/perks/* -Copyright: 2013 Blake Mizerany -License: Expat - -Files: vendor/github.com/boltdb/bolt/* -Copyright: 2013 Ben Johnson -License: Expat - -Files: vendor/github.com/cloudflare/cfssl/* -Copyright: 2014 CloudFlare Inc. -License: Expat - -Files: vendor/github.com/coreos/etcd/* -Copyright: 2013-2015 CoreOS Inc. - 2014 Google Inc. - 2015 The etcd Authors -License: Apache-2.0 - -Files: vendor/github.com/coreos/etcd/client/cancelreq.go - vendor/github.com/coreos/etcd/pkg/pathutil/path.go -Copyright: 2015 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/github.com/coreos/go-systemd/* -Copyright: 2013-2015 CoreOS Inc. - 2015 RedHat, Inc. +Files: + */vendor/github.com/moby/buildkit/* +Copyright: + The BuildKit Authors + The containerd authors License: Apache-2.0 -Files: vendor/github.com/coreos/pkg/* -Copyright: 2014 CoreOS, Inc -License: Apache-2.0 - -Files: vendor/github.com/davecgh/go-spew/* -Copyright: 2012-2013 Dave Collins -License: ISC - -Files: vendor/github.com/deckarep/golang-set/* -Copyright: 2013 Ralph Caraveo -License: Expat - -Files: vendor/github.com/docker/containerd/* - containerd/* -Copyright: 2012-2015 Docker, Inc. -License: Apache-2.0 - -Files: vendor/github.com/docker/distribution/* -Copyright: 2014-2016 Docker, Inc. -License: Apache-2.0 - -Files: vendor/github.com/docker/docker-credential-helpers/* -Copyright: 2016 David Calavera -License: Expat - -Files: vendor/github.com/docker/go-connections/* -Copyright: 2015 Docker, Inc. -License: Apache-2.0 - -Files: vendor/github.com/docker/go-events/* -Copyright: 2016 Docker, Inc. -License: Apache-2.0 - -Files: vendor/github.com/docker/go-metrics/* -Copyright: 2012-2015 Docker, Inc. -License: Apache-2.0 - -Files: vendor/github.com/docker/go-units/* -Copyright: 2015 Docker, Inc. -License: Apache-2.0 - -Files: vendor/github.com/docker/go/* -Copyright: 2012 The Go Authors - 2015 Jessie Frazelle -License: BSD-3-Clause-Google - -Files: vendor/github.com/docker/libnetwork/* - libnetwork/* -Copyright: 2014 Docker Inc. -License: Apache-2.0 - -Files: vendor/github.com/docker/libtrust/* -Copyright: 2014 Docker Inc. -License: Apache-2.0 - -Files: vendor/github.com/docker/notary/* -Copyright: 2015 Docker, Inc. -License: Apache-2.0 - -Files: vendor/github.com/docker/notary/tuf/* -Copyright: 2015 Docker, Inc. - 2014-2015 Prime Directive, Inc. -License: BSD-3-clause-Prime - -Files: vendor/github.com/docker/swarmkit/* -Copyright: 2014 Docker Inc. -License: Apache-2.0 - -Files: vendor/github.com/docker/swarmkit/api/duration/duration.proto - vendor/github.com/docker/swarmkit/api/timestamp/timestamp.proto - vendor/github.com/docker/swarmkit/protobuf/ptypes/duration.go -Copyright: 2008 Google Inc. -License: BSD-3-clause-Google - -Files: vendor/github.com/fluent/fluent-logger-golang/* -Copyright: 2013 Tatsuo Kaniwa -License: Apache-2.0 - -Files: vendor/github.com/flynn-archive/go-shlex/* -Copyright: 2012 Google Inc. -License: Apache-2.0 - -Files: vendor/github.com/fsnotify/fsnotify/* -Copyright: 2010 The Go Authors - 2012 fsnotify Authors -License: BSD-3-clause-Google - -Files: vendor/github.com/go-check/check/* -Copyright: 2010-2013 Gustavo Niemeyer -License: BSD-2-clause - -Files: vendor/github.com/go-check/check/benchmark.go -Copyright: 2012 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/github.com/go-ini/ini/* -Copyright: 2014 Unknwon -License: Apache-2.0 - -Files: vendor/github.com/godbus/dbus/* -Copyright: 2013 Georg Reinke - 2013 Google -License: BSD-2-clause - -Files: vendor/github.com/gogo/protobuf/* -Copyright: 2013, The GoGo Authors - 2010 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/github.com/golang/mock/* -Copyright: 2010 Google Inc. -License: Apache-2.0 - -Files: vendor/github.com/golang/protobuf/* -Copyright: 2010 The Go Authors -License: BSD-3-clause-Google - -# https://github.com/google/certificate-transparency/blob/c5649b7459cf167ec89bfbc4ff589f4f9086393e/AUTHORS -Files: vendor/github.com/google/certificate-transparency/* -Copyright: Comodo CA Limited - Ed Maste - Fiaz Hossain - Google Inc. - Jeff Trawick - Katriel Cohn-Gordon - Laël Cellier - Mark Schloesser - NORDUnet A/S - Nicholas Galbreath - Oliver Weidner - PrimeKey Solutions AB - Ruslan Kovalov - Venafi, Inc. - Vladimir Rutsky - Ximin Luo +Files: + */vendor/github.com/moby/ipvs/* +Copyright: 2015 Docker, inc. License: Apache-2.0 -Files: vendor/github.com/google/certificate-transparency/cpp/third_party/curl/* -Copyright: 1996-2013 Daniel Stenberg +Files: + */vendor/github.com/phayes/permbits/* +Copyright: 2016 Patrick D Hayes License: Expat -Files: vendor/github.com/google/certificate-transparency/cpp/third_party/isec_partners/* -Copyright: 2012 iSEC Partners +Files: + */vendor/github.com/tonistiigi/go-rosetta/* +Copyright: 2020 Tõnis Tiigi License: Expat -Files: vendor/github.com/google/certificate-transparency/go/* -Copyright: 2009 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/github.com/gorilla/* -Copyright: 2012 Rodrigo Moraes -License: BSD-3-clause-Google - -Files: vendor/github.com/hashicorp/* -Copyright: 2013-2016 HashiCorp -License: MPL-2.0 - -Files: vendor/github.com/hashicorp/go-msgpack/* -Copyright: 2012-2013 Ugorji Nwoke -License: BSD-3-clause-Generic - -Files: vendor/github.com/imdario/mergo/* -Copyright: 2013 Dario Castañé - 2009 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/github.com/inconshreveable/mousetrap/* -Copyright: 2014 Alan Shreve -License: Apache-2.0 - -Files: vendor/github.com/jmespath/go-jmespath/* -Copyright: 2015 James Saryerwinnie -License: Apache-2.0 - -Files: vendor/github.com/mattn/go-sqlite3/* -Copyright: 2014 Yasuhiro Matsumoto -License: Expat - -Files: vendor/github.com/matttproud/golang_protobuf_extensions/* -Copyright: 2013 Matt T. Proud -License: Apache-2.0 - -Files: vendor/github.com/miekg/dns/* -Copyright: 2009-2015 Miek Gieben - 2014 CloudFlare - 2009 The Go Authors -License: BSD-3-Clause-Google - -Files: vendor/github.com/miekg/pkcs11/* -Copyright: 2013 Miek Gieben -License: BSD-3-clause-miekg - -Files: vendor/github.com/miekg/pkcs11/pkcs11*.h -Copyright: 1994 RSA Security Inc. -License: Cryptoki - -Files: vendor/github.com/mistifyio/go-zfs/* -Copyright: 2014, OmniTI Computer Consulting, Inc. -License: Apache-2.0 - -Files: vendor/github.com/mitchellh/mapstructure/* -Copyright: 2013 Mitchell Hashimoto +Files: + */vendor/github.com/tonistiigi/fsutil/* +Copyright: 2017 Tõnis Tiigi License: Expat -Files: vendor/github.com/opencontainers/runc/* - runc/* -Copyright: 2012 Docker, Inc. -License: Apache-2.0 - -Files: vendor/github.com/opencontainers/runtime-spec/* -Copyright: 2015 The Linux Foundation +Files: + */vendor/k8s.io/* +Copyright: 2014-2018 The Kubernetes Authors. License: Apache-2.0 -Files: vendor/github.com/pborman/uuid/* -Copyright: 2009 Google Inc. -License: BSD-3-clause-Google - -Files: vendor/github.com/pivotal-golang/clock/* -Copyright: 2015 CloudFoundry.org Foundation, Inc. - 2015 Pivotal Software, Inc. -License: Apache-2.0 - -Files: vendor/github.com/pkg/errors/* -Copyright: 2015 Dave Cheney -License: BSD-2-clause - -Files: vendor/github.com/pmezard/go-difflib/* -Copyright: 2013 Patrick Mezard -License: BSD-3-clause-Generic - -Files: vendor/github.com/prometheus/* -Copyright: 2012-2015 The Prometheus Authors - 2011 Open Knowledge Foundation Ltd. - 2013-2015 Blake Mizerany, Björn Rabenstein - 2010 The Go Authors - 2013 Matt T. Proud -License: Apache-2.0 - -Files: vendor/github.com/samuel/go-zookeeper/* -Copyright: 2012-2013 Samuel Stauffer -License: BSD-3-clause-Generic - -Files: vendor/github.com/seccomp/libseccomp-golang/* -Copyright: 2015 Matthew Heon - 2015 Paul Moore -License: BSD-2-clause - -Files: vendor/github.com/spf13/cobra/* -Copyright: 2013 Steve Francia -License: Apache-2.0 - -Files: vendor/github.com/spf13/pflag/* -Copyright: 2012 Alex Ogier - 2012 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/github.com/stretchr/testify/* -Copyright: 2012-2013 Mat Ryer and Tyler Bunnell -License: Expat - -Files: vendor/github.com/syndtr/gocapability/* -Copyright: 2013 Suryandaru Triandana -License: BSD-2-clause-gocapability - -Files: vendor/github.com/tchap/go-patricia/* -Copyright: 2014 Ondřej Kupka -License: Expat - -Files: vendor/github.com/tinylib/msgp/* -Copyright: 2014 Philip Hofer - 2009 The Go Authors -License: Expat - -Files: vendor/github.com/tonistiigi/fifo/* -Copyright: 2016 Tõnis Tiigi -License: Expat - -Files: vendor/github.com/ugorji/go/* -Copyright: 2012-2015 Ugorji Nwoke -License: Expat - -Files: vendor/github.com/vbatts/tar-split/* -Copyright: 2015 Vincent Batts -License: Expat - -Files: vendor/github.com/vbatts/tar-split/archive/tar/* +Files: + */vendor/k8s.io/apimachinery/third_party/forked/golang/reflect/deep_equal.go Copyright: 2009 The Go Authors - 2015 Vincent Batts License: BSD-3-clause-Google -Files: vendor/github.com/vdemeester/shakers/* -Copyright: 2015-2016 Vincent Demeester -License: Apache-2.0 - -Files: vendor/github.com/vishvananda/* -Copyright: 2014 Vishvananda Ishaya - 2014 Docker, Inc. -License: Apache-2.0 - -Files: vendor/github.com/xeipuuv/gojsonpointer/* -Copyright: 2015 xeipuuv +Files: debian/* +Copyright: + 2018-2021 Arnaud Rebillout + 2016-2018 Dmitry Smirnov + 2013-2014 Daniel Mizyrycki + 2013-2014 Paul Tagliamonte + 2012-2014 Michael Stapelberg + 2013-2016 Tianon Gravi + 2013-2014 Johan Euphrosine + 2014 Prach Pongpanich + 2016 Tim Potter + 2016 Michael Hudson-Doyle License: Apache-2.0 -Files: vendor/golang.org/x/* -Copyright: 2009 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/golang.org/x/oauth2/* -Copyright: 2014-2015 The oauth2 Authors - 2014-2016 The Go Authors -License: BSD-3-clause-Google - -Files: vendor/google.golang.org/* -Copyright: 2011 Google Inc. -License: BSD-3-clause-Google - -Files: vendor/gopkg.in/yaml.v2/* -Copyright: 2011-2014 Canonical Inc. -License: LGPL-3 - License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -474,38 +279,23 @@ On Debian systems, the complete text of the Apache version 2.0 license can be found in "/usr/share/common-licenses/Apache-2.0". -License: GPL-2 - This file is part of Buildbot. Buildbot is free software: you can - redistribute it and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation, version 2. - . - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public License along with - this program; if not, write to the Free Software Foundation, Inc., 51 - Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . - On Debian systems, the complete text of the Apache version 2.0 license - can be found in "/usr/share/common-licenses/GPL-2". - -License: BSD-2-clause +License: BSD-3-clause-Generic Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - . - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT @@ -539,58 +329,6 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: BSD-3-clause-Prime - All rights reserved. - . - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - . - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - * Neither the name of Prime Directive, Inc. nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -License: BSD-3-clause-Generic - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -599,475 +337,30 @@ copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - -License: WTFPL-2.0 - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - . - Copyright (C) 2004 Sam Hocevar - . - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - . - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - . - 0. You just DO WHAT THE FUCK YOU WANT TO. - -License: BSD-2-clause-gocapability - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - . - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - . - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -License: MPL-2.0 - Mozilla Public License, version 2.0 - . - 1. Definitions - . - 1.1. “Contributor” - . - means each individual or legal entity that creates, contributes to the - creation of, or owns Covered Software. - . - 1.2. “Contributor Version” - . - means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor’s Contribution. - . - 1.3. “Contribution” - . - means Covered Software of a particular Contributor. - . - 1.4. “Covered Software” - . - means Source Code Form to which the initial Contributor has attached the - notice in Exhibit A, the Executable Form of such Source Code Form, and - Modifications of such Source Code Form, in each case including portions - thereof. - . - 1.5. “Incompatible With Secondary Licenses” - means - . - a. that the initial Contributor has attached the notice described in - Exhibit B to the Covered Software; or - . - b. that the Covered Software was made available under the terms of version - 1.1 or earlier of the License, but not also under the terms of a - Secondary License. - . - 1.6. “Executable Form” - . - means any form of the work other than Source Code Form. - . - 1.7. “Larger Work” - . - means a work that combines Covered Software with other material, in a separate - file or files, that is not Covered Software. - . - 1.8. “License” - . - means this document. - . - 1.9. “Licensable” - . - means having the right to grant, to the maximum extent possible, whether at the - time of the initial grant or subsequently, any and all of the rights conveyed by - this License. - . - 1.10. “Modifications” - . - means any of the following: - . - a. any file in Source Code Form that results from an addition to, deletion - from, or modification of the contents of Covered Software; or - . - b. any new file in Source Code Form that contains any Covered Software. - . - 1.11. “Patent Claims” of a Contributor - . - means any patent claim(s), including without limitation, method, process, - and apparatus claims, in any patent Licensable by such Contributor that - would be infringed, but for the grant of the License, by the making, - using, selling, offering for sale, having made, import, or transfer of - either its Contributions or its Contributor Version. - . - 1.12. “Secondary License” - . - means either the GNU General Public License, Version 2.0, the GNU Lesser - General Public License, Version 2.1, the GNU Affero General Public - License, Version 3.0, or any later versions of those licenses. - . - 1.13. “Source Code Form” - . - means the form of the work preferred for making modifications. - . - 1.14. “You” (or “Your”) - . - means an individual or a legal entity exercising rights under this - License. For legal entities, “You” includes any entity that controls, is - controlled by, or is under common control with You. For purposes of this - definition, “control” means (a) the power, direct or indirect, to cause - the direction or management of such entity, whether by contract or - otherwise, or (b) ownership of more than fifty percent (50%) of the - outstanding shares or beneficial ownership of such entity. - . - . - 2. License Grants and Conditions - . - 2.1. Grants - . - Each Contributor hereby grants You a world-wide, royalty-free, - non-exclusive license: - . - a. under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or as - part of a Larger Work; and - . - b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its Contributions - or its Contributor Version. - . - 2.2. Effective Date - . - The licenses granted in Section 2.1 with respect to any Contribution become - effective for each Contribution on the date the Contributor first distributes - such Contribution. - . - 2.3. Limitations on Grant Scope - . - The licenses granted in this Section 2 are the only rights granted under this - License. No additional rights or licenses will be implied from the distribution - or licensing of Covered Software under this License. Notwithstanding Section - 2.1(b) above, no patent license is granted by a Contributor: - . - a. for any code that a Contributor has removed from Covered Software; or - . - b. for infringements caused by: (i) Your and any other third party’s - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - . - c. under Patent Claims infringed by Covered Software in the absence of its - Contributions. - . - This License does not grant any rights in the trademarks, service marks, or - logos of any Contributor (except as may be necessary to comply with the - notice requirements in Section 3.4). - . - 2.4. Subsequent Licenses - . - No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this License - (see Section 10.2) or under the terms of a Secondary License (if permitted - under the terms of Section 3.3). - . - 2.5. Representation - . - Each Contributor represents that the Contributor believes its Contributions - are its original creation(s) or it has sufficient rights to grant the - rights to its Contributions conveyed by this License. - . - 2.6. Fair Use - . - This License is not intended to limit any rights You have under applicable - copyright doctrines of fair use, fair dealing, or other equivalents. - . - 2.7. Conditions - . - Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in - Section 2.1. - . - . - 3. Responsibilities - . - 3.1. Distribution of Source Form - . - All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under the - terms of this License. You must inform recipients that the Source Code Form - of the Covered Software is governed by the terms of this License, and how - they can obtain a copy of this License. You may not attempt to alter or - restrict the recipients’ rights in the Source Code Form. - . - 3.2. Distribution of Executable Form - . - If You distribute Covered Software in Executable Form then: - . - a. such Covered Software must also be made available in Source Code Form, - as described in Section 3.1, and You must inform recipients of the - Executable Form how they can obtain a copy of such Source Code Form by - reasonable means in a timely manner, at a charge no more than the cost - of distribution to the recipient; and - . - b. You may distribute such Executable Form under the terms of this License, - or sublicense it under different terms, provided that the license for - the Executable Form does not attempt to limit or alter the recipients’ - rights in the Source Code Form under this License. - . - 3.3. Distribution of a Larger Work - . - You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for the - Covered Software. If the Larger Work is a combination of Covered Software - with a work governed by one or more Secondary Licenses, and the Covered - Software is not Incompatible With Secondary Licenses, this License permits - You to additionally distribute such Covered Software under the terms of - such Secondary License(s), so that the recipient of the Larger Work may, at - their option, further distribute the Covered Software under the terms of - either this License or such Secondary License(s). - . - 3.4. Notices - . - You may not remove or alter the substance of any license notices (including - copyright notices, patent notices, disclaimers of warranty, or limitations - of liability) contained within the Source Code Form of the Covered - Software, except that You may alter any license notices to the extent - required to remedy known factual inaccuracies. - . - 3.5. Application of Additional Terms - . - You may choose to offer, and to charge a fee for, warranty, support, - indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on behalf - of any Contributor. You must make it absolutely clear that any such - warranty, support, indemnity, or liability obligation is offered by You - alone, and You hereby agree to indemnify every Contributor for any - liability incurred by such Contributor as a result of warranty, support, - indemnity or liability terms You offer. You may include additional - disclaimers of warranty and limitations of liability specific to any - jurisdiction. - . - 4. Inability to Comply Due to Statute or Regulation - . - If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, judicial - order, or regulation then You must: (a) comply with the terms of this License - to the maximum extent possible; and (b) describe the limitations and the code - they affect. Such description must be placed in a text file included with all - distributions of the Covered Software under this License. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - . - 5. Termination - . - 5.1. The rights granted under this License will terminate automatically if You - fail to comply with any of its terms. However, if You become compliant, - then the rights granted under this License from a particular Contributor - are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing basis, - if such Contributor fails to notify You of the non-compliance by some - reasonable means prior to 60 days after You have come back into compliance. - Moreover, Your grants from a particular Contributor are reinstated on an - ongoing basis if such Contributor notifies You of the non-compliance by - some reasonable means, this is the first time You have received notice of - non-compliance with this License from such Contributor, and You become - compliant prior to 30 days after Your receipt of the notice. - . - 5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, counter-claims, - and cross-claims) alleging that a Contributor Version directly or - indirectly infringes any patent, then the rights granted to You by any and - all Contributors for the Covered Software under Section 2.1 of this License - shall terminate. - . - 5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user - license agreements (excluding distributors and resellers) which have been - validly granted by You or Your distributors under this License prior to - termination shall survive termination. - . - 6. Disclaimer of Warranty - . - Covered Software is provided under this License on an “as is” basis, without - warranty of any kind, either expressed, implied, or statutory, including, - without limitation, warranties that the Covered Software is free of defects, - merchantable, fit for a particular purpose or non-infringing. The entire - risk as to the quality and performance of the Covered Software is with You. - Should any Covered Software prove defective in any respect, You (not any - Contributor) assume the cost of any necessary servicing, repair, or - correction. This disclaimer of warranty constitutes an essential part of this - License. No use of any Covered Software is authorized under this License - except under this disclaimer. - . - 7. Limitation of Liability - . - Under no circumstances and under no legal theory, whether tort (including - negligence), contract, or otherwise, shall any Contributor, or anyone who - distributes Covered Software as permitted above, be liable to You for any - direct, indirect, special, incidental, or consequential damages of any - character including, without limitation, damages for lost profits, loss of - goodwill, work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses, even if such party shall have been - informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from such - party’s negligence to the extent applicable law prohibits such limitation. - Some jurisdictions do not allow the exclusion or limitation of incidental or - consequential damages, so this exclusion and limitation may not apply to You. - . - 8. Litigation - . - Any litigation relating to this License may be brought only in the courts of - a jurisdiction where the defendant maintains its principal place of business - and such litigation shall be governed by laws of that jurisdiction, without - reference to its conflict-of-law provisions. Nothing in this Section shall - prevent a party’s ability to bring cross-claims or counter-claims. - . - 9. Miscellaneous - . - This License represents the complete agreement concerning the subject matter - hereof. If any provision of this License is held to be unenforceable, such - provision shall be reformed only to the extent necessary to make it - enforceable. Any law or regulation which provides that the language of a - contract shall be construed against the drafter shall not be used to construe - this License against a Contributor. - . - . - 10. Versions of the License - . - 10.1. New Versions - . - Mozilla Foundation is the license steward. Except as provided in Section - 10.3, no one other than the license steward has the right to modify or - publish new versions of this License. Each version will be given a - distinguishing version number. - . - 10.2. Effect of New Versions - . - You may distribute the Covered Software under the terms of the version of - the License under which You originally received the Covered Software, or - under the terms of any subsequent version published by the license - steward. - . - 10.3. Modified Versions - . - If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a modified - version of this License if you rename the license and remove any - references to the name of the license steward (except to note that such - modified license differs from this License). - . - 10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses - If You choose to distribute Source Code Form that is Incompatible With - Secondary Licenses under the terms of this version of the License, the - notice described in Exhibit B of this License must be attached. - . - Exhibit A - Source Code Form License Notice - . - This Source Code Form is subject to the - terms of the Mozilla Public License, v. - 2.0. If a copy of the MPL was not - distributed with this file, You can - obtain one at - http://mozilla.org/MPL/2.0/. - . - If it is not possible or desirable to put the notice in a particular file, then - You may include the notice in a location (such as a LICENSE file in a relevant - directory) where a recipient would be likely to look for such a notice. - . - You may add additional accurate notices of copyright ownership. - . - Exhibit B - “Incompatible With Secondary Licenses” Notice - . - This Source Code Form is “Incompatible - With Secondary Licenses”, as defined by - the Mozilla Public License, v. 2.0. - -License: Cryptoki - License to copy and use this software is granted provided that it is identified - as "RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki)" in all - material mentioning or referencing this software. - . - License is also granted to make and use derivative works provided that such - works are identified as "derived from the RSA Security Inc. PKCS #11 - Cryptographic Token Interface (Cryptoki)" in all material mentioning or - referencing the derived work. - . - RSA Security Inc. makes no representations concerning either the - merchantability of this software or the suitability of this software for any - particular purpose. It is provided "as is" without express or implied warranty - of any kind. + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. -License: BSD-3-clause-miekg - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of Miek Gieben nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -License: ISC - Permission to use, copy, modify, and distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - . - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -License: LGPL-3 - This package is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version. +License: GPL-2 + This file is part of Buildbot. Buildbot is free software: you can + redistribute it and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation, version 2. . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + details. . - You should have received a copy of the GNU General Public License - along with this program. If not, see . + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. . - On Debian systems, the complete text of the GNU Lesser General - Public License can be found in "/usr/share/common-licenses/LGPL-3". + On Debian systems, the complete text of the GNU GPL v2 license can be found in + "/usr/share/common-licenses/GPL-2". diff -Nru docker.io-20.10.21/debian/docker-doc.docs docker.io-20.10.24+dfsg1/debian/docker-doc.docs --- docker.io-20.10.21/debian/docker-doc.docs 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker-doc.docs 2023-01-14 05:55:59.000000000 -0300 @@ -1,2 +1,3 @@ cli/docs/* engine/docs/* +cli/NOTICE engine/NOTICE diff -Nru docker.io-20.10.21/debian/Dockerfile docker.io-20.10.24+dfsg1/debian/Dockerfile --- docker.io-20.10.21/debian/Dockerfile 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/Dockerfile 2023-01-14 05:55:59.000000000 -0300 @@ -0,0 +1,19 @@ +FROM debian:sid + +# Optionally, add incoming to sources.list +#RUN echo 'deb http://incoming.debian.org/debian-buildd buildd-unstable main contrib non-free' > /etc/apt/sources.list.d/incoming.list + +# Add deb-src to sources.list +RUN find /etc/apt/sources.list* -type f -exec sed -i 'p; s/^deb /deb-src /' '{}' + + +# Install developer tools +RUN apt-get update \ + && apt-get install --no-install-recommends -yV \ + build-essential \ + devscripts \ + equivs + +# Install the build deps for _this_ package +COPY control /tmp/control +RUN mk-build-deps -irt 'apt-get --no-install-recommends -yV' /tmp/control \ + && rm /tmp/control diff -Nru docker.io-20.10.21/debian/docker.io.bash-completion docker.io-20.10.24+dfsg1/debian/docker.io.bash-completion --- docker.io-20.10.21/debian/docker.io.bash-completion 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.bash-completion 1969-12-31 21:00:00.000000000 -0300 @@ -1 +0,0 @@ -cli/contrib/completion/bash/docker diff -Nru docker.io-20.10.21/debian/docker.io.dirs docker.io-20.10.24+dfsg1/debian/docker.io.dirs --- docker.io-20.10.21/debian/docker.io.dirs 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.dirs 1969-12-31 21:00:00.000000000 -0300 @@ -1 +0,0 @@ -etc/docker diff -Nru docker.io-20.10.21/debian/docker.io.docker.service docker.io-20.10.24+dfsg1/debian/docker.io.docker.service --- docker.io-20.10.21/debian/docker.io.docker.service 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.docker.service 1969-12-31 21:00:00.000000000 -0300 @@ -1,48 +0,0 @@ -[Unit] -Description=Docker Application Container Engine -Documentation=https://docs.docker.com -After=network-online.target firewalld.service containerd.service -Wants=network-online.target -Requires=docker.socket -Wants=containerd.service - -[Service] -Type=notify -# the default is not to use systemd for cgroups because the delegate issues still -# exists and systemd currently does not support the cgroup feature set required -# for containers run by docker -ExecStart=/usr/bin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock -ExecReload=/bin/kill -s HUP $MAINPID -TimeoutSec=0 -RestartSec=2 -Restart=always - -# Note that StartLimit* options were moved from "Service" to "Unit" in systemd 229. -# Both the old, and new location are accepted by systemd 229 and up, so using the old location -# to make them work for either version of systemd. -StartLimitBurst=3 - -# Note that StartLimitInterval was renamed to StartLimitIntervalSec in systemd 230. -# Both the old, and new name are accepted by systemd 230 and up, so using the old name to make -# this option work for either version of systemd. -StartLimitInterval=60s - -# Having non-zero Limit*s causes performance problems due to accounting overhead -# in the kernel. We recommend using cgroups to do container-local accounting. -LimitNOFILE=infinity -LimitNPROC=infinity -LimitCORE=infinity - -# Comment TasksMax if your systemd version does not support it. -# Only systemd 226 and above support this option. -TasksMax=infinity - -# set delegate yes so that systemd does not reset the cgroups of docker containers -Delegate=yes - -# kill only the docker process, not all processes in the cgroup -KillMode=process -OOMScoreAdjust=-500 - -[Install] -WantedBy=multi-user.target diff -Nru docker.io-20.10.21/debian/docker.io.docker.socket docker.io-20.10.24+dfsg1/debian/docker.io.docker.socket --- docker.io-20.10.21/debian/docker.io.docker.socket 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.docker.socket 1969-12-31 21:00:00.000000000 -0300 @@ -1,11 +0,0 @@ -[Unit] -Description=Docker Socket for the API - -[Socket] -ListenStream=/var/run/docker.sock -SocketMode=0660 -SocketUser=root -SocketGroup=docker - -[Install] -WantedBy=sockets.target diff -Nru docker.io-20.10.21/debian/docker.io.docs docker.io-20.10.24+dfsg1/debian/docker.io.docs --- docker.io-20.10.21/debian/docker.io.docs 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.docs 1969-12-31 21:00:00.000000000 -0300 @@ -1 +0,0 @@ -engine/README.md diff -Nru docker.io-20.10.21/debian/docker.io.install docker.io-20.10.24+dfsg1/debian/docker.io.install --- docker.io-20.10.21/debian/docker.io.install 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.install 1969-12-31 21:00:00.000000000 -0300 @@ -1,11 +0,0 @@ -#!/usr/bin/dh-exec - -# https://github.com/docker/docker-ce/blob/v19.03.2/components/packaging/deb/common/rules#L36 -cli/build/docker => usr/bin/docker -engine/bundles/dynbinary-daemon/dockerd => usr/bin/dockerd -libnetwork/docker-proxy => usr/bin/docker-proxy -tini/build/tini-static => usr/bin/docker-init - -cli/contrib/completion/zsh/_docker usr/share/zsh/vendor-completions/ -engine/contrib/check-config.sh usr/share/docker.io/contrib/ -engine/contrib/nuke-graph-directory.sh usr/share/docker.io/contrib/ diff -Nru docker.io-20.10.21/debian/docker.io.maintscript docker.io-20.10.24+dfsg1/debian/docker.io.maintscript --- docker.io-20.10.21/debian/docker.io.maintscript 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.maintscript 1969-12-31 21:00:00.000000000 -0300 @@ -1,5 +0,0 @@ -mv_conffile /etc/bash_completion.d/docker.io /etc/bash_completion.d/docker 1.2.0~ -mv_conffile /etc/default/docker.io /etc/default/docker 1.2.0~ -mv_conffile /etc/init.d/docker.io /etc/init.d/docker 1.2.0~ -mv_conffile /etc/init/docker.io.conf /etc/init/docker.conf 1.2.0~ -rm_conffile /etc/bash_completion.d/docker 1.11.2~ diff -Nru docker.io-20.10.21/debian/docker.io.manpages docker.io-20.10.24+dfsg1/debian/docker.io.manpages --- docker.io-20.10.21/debian/docker.io.manpages 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.manpages 1969-12-31 21:00:00.000000000 -0300 @@ -1 +0,0 @@ -cli/man/man*/* diff -Nru docker.io-20.10.21/debian/docker.io.postinst docker.io-20.10.24+dfsg1/debian/docker.io.postinst --- docker.io-20.10.21/debian/docker.io.postinst 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.postinst 1969-12-31 21:00:00.000000000 -0300 @@ -1,109 +0,0 @@ -#!/bin/sh -set -e - -. /usr/share/debconf/confmodule - -case "$1" in - configure) - if [ -z "$2" ]; then - # make sure the "docker" system group exists for "docker.socket" to apply it as the group on "docker.sock" - if ! getent group docker > /dev/null 2>&1; then - addgroup --system docker - fi - fi - - # Ensure config directory permissions - # On a fresh install, $2 = '' and dpkg "le-nl" treat that as a - # greater version, so the body is not executed. - if dpkg --compare-versions "$2" le-nl '1.11.2~ds1-1'; then - if [ "$(stat -c '%a' /etc/docker)" = '700' ]; then - chmod 0755 /etc/docker - fi - fi - - # ZFS handling: create a dedicated ZFS docker dataset to handle all children containers in a single, - # persistent, place. - # Also check if zfs executable exists and if it is in $PATH. - # The zfs command is provided by zfs-fuse | zfsutils and they - # are runtime Suggested dependencies which means they are not - # necessarily available during configuration time (LP: #1910133). - if [ -x "$(command -v zfs)" ] && modinfo zfs >/dev/null 2>&1; then - # if there is no mountpoint /var/lib/docker: - # 1: create /var/lib/docker if doesn’t exist (zfs mount?) - # /var/lib with canmount off if doesn’t exist - # /var with canmount off if doesn’t exist - rpool="$(zfs mount | awk '$2=="/" {print $1}'| cut -d/ -f1)" - - if [ -n "$rpool" ]; then - dockermnt="$(findmnt -n -o SOURCE /var/lib/docker || true)" - - # Create /var/lib/docker if doesn’t exist - if echo "$dockermnt" | grep -qE '^$|/ROOT/'; then - zfs create -o canmount=off "$rpool"/var 2>/dev/null || true - zfs create -o canmount=off "$rpool"/var/lib 2>/dev/null || true - if dpkg --compare-versions "$2" le-nl '19.03.8-0ubuntu2'; then - invoke-rc.d docker stop || true - mv /var/lib/docker /var/lib/docker.migrating - fi - zfs create "$rpool"/var/lib/docker 2>/dev/null || true - dockermnt="$rpool"/var/lib/docker - fi - - if dpkg --compare-versions "$2" le-nl '19.03.8-0ubuntu2'; then - mv /var/lib/docker.migrating/* /var/lib/docker/ - rmdir /var/lib/docker.migrating/ - # Migrate datasets - for dataset in $(zfs list -H -t filesystem -o name,mountpoint,canmount -r "$rpool"/ROOT | grep -E "/var/lib/[0-9a-f]{64}(-init)?\slegacy\son" | cut -f1); do - dockerid=${dataset##*/} - zfs rename "$dataset" "$dockermnt/$dockerid" || true - done - # Purge their zsys history datasets - for dataset in $(zfs list -H -t snapshot -o name -r "$rpool"/var/lib/docker | grep "@autozsys_"); do - zfs destroy -R "$dataset" || true - done - invoke-rc.d docker start || true - fi - fi - fi - - ;; - abort-*) - # How'd we get here?? - exit 1 - ;; - *) - ;; -esac - -# restart Docker if it's running (thus this is an upgrade) and the user (via debconf) tells us they're OK with that -db_version 2.0 -db_fset docker.io/restart seen false -if [ -n "$2" ] && [ "$1" = 'configure' ] && { - # either: - # - we're doing "dpkg-reconfigure" (and thus need to "db_input" to make sure users can change their answer between installs/upgrades) - # - we're doing install/upgrade and Docker is running (and thus it matters whether or not the user wants us to restart Docker for them) - [ -n "${DEBCONF_RECONFIGURE:-}" ] \ - || invoke-rc.d --disclose-deny docker status > /dev/null 2>&1 -}; then - db_input high docker.io/restart || : - db_go || : - if [ -z "${DEBCONF_RECONFIGURE:-}" ]; then - # only perform the actual restart if we're doing install/upgrade (not during interactive "dpkg-reconfigure") - db_get docker.io/restart - if [ "$RET" = 'true' ]; then - # Docker daemon appears to be running and should be restarted - invoke-rc.d docker restart || : - fi - fi -fi -db_stop - -#DEBHELPER# - -# because we had to use "dh_installinit --no-start", we get to make sure the daemon is started on first install (and upgrades thereafter, if it isn't running) -# (this is adapted from debhelper's "autoscripts/postinst-init") -if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ]; then - if [ -z "${DEBCONF_RECONFIGURE:-}" ] && ! invoke-rc.d docker status > /dev/null 2>&1 ; then - invoke-rc.d docker start || : - fi -fi diff -Nru docker.io-20.10.21/debian/docker.io.postrm docker.io-20.10.24+dfsg1/debian/docker.io.postrm --- docker.io-20.10.21/debian/docker.io.postrm 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.postrm 1969-12-31 21:00:00.000000000 -0300 @@ -1,17 +0,0 @@ -#!/bin/sh -set -e - -#DEBHELPER# - -case "$1" in - purge) - # if we have our saved "nuke-graph-directory.sh", let's use it - # see also docker.io.prerm - if [ -x /var/lib/docker/nuke-graph-directory.sh ]; then - /var/lib/docker/nuke-graph-directory.sh /var/lib/docker - fi - ;; - - *) - ;; -esac diff -Nru docker.io-20.10.21/debian/docker.io.preinst docker.io-20.10.24+dfsg1/debian/docker.io.preinst --- docker.io-20.10.21/debian/docker.io.preinst 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.preinst 1969-12-31 21:00:00.000000000 -0300 @@ -1,10 +0,0 @@ -#!/bin/sh -set -e - -if [ -e "/var/lib/docker/aufs" ]; then - echo "The aufs storage-driver is no longer supported." - echo "Please ensure that none of your containers are" - echo "using the aufs storage driver, remove the directory" - echo "/var/lib/docker/aufs and try again." - exit 1 -fi diff -Nru docker.io-20.10.21/debian/docker.io.prerm docker.io-20.10.24+dfsg1/debian/docker.io.prerm --- docker.io-20.10.21/debian/docker.io.prerm 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.prerm 1969-12-31 21:00:00.000000000 -0300 @@ -1,29 +0,0 @@ -#!/bin/sh -set -e - -case "$1" in - remove) - # if we're removing, we need to save "nuke-graph-directory.sh" so that - # we can still purge "/var/lib/docker" later if necessary - # see also docker.io.postrm - if \ - [ -d /var/lib/docker ] \ - && [ -x /usr/share/docker.io/contrib/nuke-graph-directory.sh ] \ - ; then - if cp -v /usr/share/docker.io/contrib/nuke-graph-directory.sh /var/lib/docker/; then - chmod +x /var/lib/docker/nuke-graph-directory.sh || : - fi - fi - ;; - - *) - ;; -esac - -#DEBHELPER# - -# because we had to use "dh_installinit --no-start", we get to make sure the daemon is stopped on uninstall -# (this is adapted from debhelper's "autoscripts/prerm-init-norestart") -if [ "$1" = remove ]; then - invoke-rc.d docker stop -fi diff -Nru docker.io-20.10.21/debian/docker.io.templates docker.io-20.10.24+dfsg1/debian/docker.io.templates --- docker.io-20.10.21/debian/docker.io.templates 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/docker.io.templates 1969-12-31 21:00:00.000000000 -0300 @@ -1,14 +0,0 @@ -Template: docker.io/restart -Type: boolean -Default: false -Description: Automatically restart Docker daemon? - If Docker is upgraded without restarting the Docker daemon, Docker will often - have trouble starting new containers, and in some cases even maintaining the - containers it is currently running. See https://launchpad.net/bugs/1658691 for - an example of this breakage. - . - Normally, upgrading the package would simply restart the associated daemon(s). - In the case of the Docker daemon, that would also imply stopping all running - containers (which will only be restarted if they're part of a "service", have - an appropriate restart policy configured, or have some other means of being - restarted such as an external systemd unit). diff -Nru docker.io-20.10.21/debian/gbp.conf docker.io-20.10.24+dfsg1/debian/gbp.conf --- docker.io-20.10.21/debian/gbp.conf 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/gbp.conf 2023-01-14 05:55:59.000000000 -0300 @@ -1,15 +1,2 @@ [DEFAULT] -cleaner = fakeroot debian/rules clean -pristine-tar = True -merge = False -debian-tag = %(version)s - -[git-buildpackage] -export-dir = ../build-area/ -tarball-dir = ../tarballs/ - -[dch] -id-length = 0 -meta = True -auto = True -full = True +debian-branch = master diff -Nru docker.io-20.10.21/debian/get-orig-source.sh docker.io-20.10.24+dfsg1/debian/get-orig-source.sh --- docker.io-20.10.21/debian/get-orig-source.sh 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/get-orig-source.sh 2023-04-05 12:03:54.000000000 -0300 @@ -0,0 +1,201 @@ +#!/bin/bash +: <<=cut + +=head1 DESCRIPTION + +This script is called by uscan(1) as per "debian/watch" to download Multi +Upstream Tarball (MUT) components. + +=head1 COPYRIGHT + +Copyright: 2018-2019 Dmitry Smirnov + +=head1 LICENSE + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +=cut + +set -e +set -u + +if [ "$1" = '--upstream-version' ]; then + VERSION="$2" +else + printf "E: missing argument '--upstream-version'.\n" 1>&2 + exit 1 +fi + +# components, with optional '=VERSION' +COMPONENTS=( +"docker/cli=v$( debian/helpers/real-upstream-version.sh "$VERSION" )" +"docker/libnetwork" +"docker/swarmkit" +) + +DEB_SOURCE="$( dpkg-parsechangelog -SSource )" +#DEB_VERSION="$( dpkg-parsechangelog -SVersion )" +filename="$( readlink -f ../${DEB_SOURCE}_${VERSION}.orig.tar.xz )" +[ -s "${filename}" ] || exit 1 + +## _log() tries to mimic the style of uscan logs. +## However it does NOT separate between stdout (info) +## and stderr (warn, error), because uscan makes a mess +## of that (it seems like it displays the two streams +## one after another). +_log() { + local prefix=$1; shift + local first_line=1 + + while [ $# -gt 0 ]; do + if [ $first_line -eq 1 ]; then + printf "get-orig-source ${prefix}: " + first_line=0 + else + printf " " + fi + + printf "%s\n" "$1" + shift + done 1>&2 +} + +info() { _log 'info' "$@"; } +warn() { _log 'warn' "$@"; } +error() { _log 'error' "$@"; } + +drop_files_excluded() { + local work_dir + local files_excluded + local file + + # remove files excluded: + for work_dir in "$@"; do + files_excluded=$( perl -0nE 'say $1 if m{^Files\-Excluded:\s*(.*?)(?:\n\n|^Files|^Comment)}sm;' debian/copyright ) + pushd "${work_dir}" >/dev/null + for file in ${files_excluded}; do + if [ -e "${file}" ]; then + rm -fr "${file}" + else + warn "No files matched excluded pattern as the last matching glob: ${file}" + fi + done + popd >/dev/null + done + + # remove empty directories: + if [ -d "${work_dir}"/vendor ]; then + find "${work_dir}"/vendor -mindepth 1 -type d -empty -delete + fi +} + +## tarpack() takes two arguments: +## 1. directory to compress +## 2. tarball path/name +tarpack() { + ( cd "$1" && \ + find -L . -xdev -type f -print | LC_ALL=C sort \ + | XZ_OPT="-6v" tar -caf "$2" -T- --owner=root --group=root --mode=a+rX \ + ) +} + +echo 1>&2 "========================================" +echo 1>&2 "$(basename $0) $@" +echo 1>&2 "========================================" + +## prepare a workdir: +work_dir="$( mktemp -d -t get-orig-source_${DEB_SOURCE}_XXXXXXXX )" +trap "rm -rf '${work_dir}'" EXIT + +## extract main tarball:: +info "Unpack main tarball" +tar -xf "${filename}" -C "${work_dir}" + +## make sure there's one and only one top directory: +topdir=$( ls -1 "${work_dir}" ) +if [ $(echo "$topdir" | wc -l) -ne 1 ]; then + error "Unexpected content in orig tarball" + exit 1 +fi + +## move sources in a subdirectory: +mv "${work_dir}/${topdir}" "${work_dir}"/engine +mkdir "${work_dir}/${topdir}" +mv "${work_dir}"/engine "${work_dir}/${topdir}" + +## drop excluded files: +# not needed, already done by uscan/mk-origtargz +# drop_files_excluded "${work_dir}"/${topdir}/engine + +## repack: +info "Repack main tarball" +tarpack "${work_dir}" "${filename}" + +## fetch Docker components: +for I in "${COMPONENTS[@]}"; do + + C=$( echo ${I} | awk -F= '{print $1}' ) + REV=$( echo ${I} | awk -F= '{print $2}' ) + URL="github.com/${C}" + + if [ -z "$REV" ]; then + # get revision from engine/vendor.conf + REV=$( grep "${URL}" "${work_dir}"/*/engine/vendor.conf | head -1 | awk '{print $2}' ) + fi + if [ -z "${REV}" ]; then + error "Could not find commit for ${C}" + exit 1 + fi + + COMP=${C##*/} + FN="$( readlink -f ../${DEB_SOURCE}_${VERSION}.orig-${COMP}.tar.gz )" + + info "Process ${I}" "component = $COMP" "revision = $REV" "filename = $FN" + + if [ ! -s "${FN}" ]; then + ## download tarball: + archive_url="https://${URL}/archive/${REV}.tar.gz" + info "Requesting URL:" "$archive_url" + wget --quiet --tries=3 --timeout=40 --read-timeout=40 --continue \ + -O "${FN}" "$archive_url" + info "Successfully downloaded package: $(basename ${FN})" + + ## extract tarball: + info "Unpack tarball:" + component_dir="$( mktemp -d -t get-orig-source_XXXXXXXX )" + mkdir "${component_dir}"/${COMP} + tar -xf "${FN}" -C "${component_dir}"/${COMP} --strip-components=1 + + ## drop excluded files: + info "Drop excluded files:" + drop_files_excluded "${component_dir}"/${COMP} + + ## repack: + info "Repack tarball:" + tarpack "${component_dir}" "${FN}" + rm -rf "${component_dir}" + + ## make orig tarball: + mkorigtargz_opts=( + "--package" "${DEB_SOURCE}" "--version" "${VERSION}" + "--rename" "--repack" "--compression" "xz" "--directory" ".." + "--copyright-file" "debian/copyright" "--component" "${COMP}" + "${FN}") + info "Launch mk-origtargz with options:" "$(echo ${mkorigtargz_opts[@]})" + mk-origtargz "${mkorigtargz_opts[@]}" + fi +done + +# vim: et sts=4 sw=4 diff -Nru docker.io-20.10.21/debian/gitlab-ci.yml docker.io-20.10.24+dfsg1/debian/gitlab-ci.yml --- docker.io-20.10.21/debian/gitlab-ci.yml 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/gitlab-ci.yml 2023-01-14 05:55:59.000000000 -0300 @@ -0,0 +1,6 @@ +# auto-generated, DO NOT MODIFY. +# The authoritative copy of this file lives at: +# https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go +--- +include: + - https://salsa.debian.org/go-team/infra/pkg-go-tools/-/raw/master/pipeline/test-archive.yml diff -Nru docker.io-20.10.21/debian/golang-github-docker-docker-dev.install docker.io-20.10.24+dfsg1/debian/golang-github-docker-docker-dev.install --- docker.io-20.10.21/debian/golang-github-docker-docker-dev.install 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/golang-github-docker-docker-dev.install 2023-01-14 05:55:59.000000000 -0300 @@ -1,23 +1,44 @@ -#!/usr/bin/dh-exec +## CLI: +_build/src/github.com/docker/cli/cli/config usr/share/gocode/src/github.com/docker/cli/cli/ +_build/src/github.com/docker/cli/opts usr/share/gocode/src/github.com/docker/cli/ -engine/api usr/share/gocode/src/github.com/docker/docker/ -engine/client usr/share/gocode/src/github.com/docker/docker/ -engine/dockerversion usr/share/gocode/src/github.com/docker/docker/ -engine/errdefs usr/share/gocode/src/github.com/docker/docker/ -engine/image usr/share/gocode/src/github.com/docker/docker/ -engine/oci usr/share/gocode/src/github.com/docker/docker/ -engine/opts usr/share/gocode/src/github.com/docker/docker/ -engine/pkg usr/share/gocode/src/github.com/docker/docker/ -engine/registry usr/share/gocode/src/github.com/docker/docker/ -engine/rootless usr/share/gocode/src/github.com/docker/docker/ -engine/vendor usr/share/gocode/src/github.com/docker/docker/ -cli/cli usr/share/gocode/src/github.com/docker/cli/ -cli/opts usr/share/gocode/src/github.com/docker/cli/ -libnetwork/datastore usr/share/gocode/src/github.com/docker/libnetwork/ -libnetwork/discoverapi usr/share/gocode/src/github.com/docker/libnetwork/ -libnetwork/ipamutils usr/share/gocode/src/github.com/docker/libnetwork/ -libnetwork/ns usr/share/gocode/src/github.com/docker/libnetwork/ -libnetwork/options usr/share/gocode/src/github.com/docker/libnetwork/ -libnetwork/resolvconf usr/share/gocode/src/github.com/docker/libnetwork/ -libnetwork/testutils usr/share/gocode/src/github.com/docker/libnetwork/ -libnetwork/types usr/share/gocode/src/github.com/docker/libnetwork/ + +## Legacy / compatibility with older Docker: +_build/src/github.com/docker/cli/cli/config/* usr/share/gocode/src/github.com/docker/docker/cliconfig/ +#_build/src/github.com/docker/cli/cli/config/* usr/share/gocode/src/github.com/docker/docker/cli/config/ + + +## Engine +engine/dockerversion usr/share/gocode/src/github.com/docker/docker/ +engine/daemon usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/api usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/builder usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/client usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/cli usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/container usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/errdefs usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/image usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/oci usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/opts usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/pkg usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/profiles usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/reference usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/registry usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/rootless usr/share/gocode/src/github.com/docker/docker/ +_build/src/github.com/docker/docker/runconfig usr/share/gocode/src/github.com/docker/docker/ + + +## Libnetwork: +_build/src/github.com/docker/libnetwork/datastore usr/share/gocode/src/github.com/docker/libnetwork/ +_build/src/github.com/docker/libnetwork/discoverapi usr/share/gocode/src/github.com/docker/libnetwork/ +_build/src/github.com/docker/libnetwork/ipamutils usr/share/gocode/src/github.com/docker/libnetwork/ +_build/src/github.com/docker/libnetwork/ns usr/share/gocode/src/github.com/docker/libnetwork/ +_build/src/github.com/docker/libnetwork/options usr/share/gocode/src/github.com/docker/libnetwork/ +_build/src/github.com/docker/libnetwork/resolvconf usr/share/gocode/src/github.com/docker/libnetwork/ +_build/src/github.com/docker/libnetwork/testutils usr/share/gocode/src/github.com/docker/libnetwork/ +_build/src/github.com/docker/libnetwork/types usr/share/gocode/src/github.com/docker/libnetwork/ + + +## Moby +cli/vendor/github.com/moby/buildkit/ usr/share/gocode/src/github.com/moby/ +libnetwork/vendor/github.com/moby/ipvs/ usr/share/gocode/src/github.com/moby/ diff -Nru docker.io-20.10.21/debian/helpers/cli-gitcommits docker.io-20.10.24+dfsg1/debian/helpers/cli-gitcommits --- docker.io-20.10.21/debian/helpers/cli-gitcommits 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/helpers/cli-gitcommits 2023-04-05 12:06:26.000000000 -0300 @@ -0,0 +1,20 @@ +# https://github.com/docker/cli/tags + +20.10.24: 297e128 +20.10.23: 7155243 +20.10.22: 3a2c30b +20.10.21: baeda1f +20.10.19: d85ef84 +20.10.18: b40c2f6 +20.10.17: 100c701 +20.10.14: a224086 +20.10.11: dea9396 +20.10.10: b485636 +20.10.8: 3967b7d +20.10.5: 55c4c88 +20.10.4: d3cb89e +20.10.3: 48d30b5 +20.10.2: 2291f61 +20.10.1: 831ebea +20.10.0: 7287ab3 +20.10.0-rc1: 5cc2396 diff -Nru docker.io-20.10.21/debian/helpers/docker.sh docker.io-20.10.24+dfsg1/debian/helpers/docker.sh --- docker.io-20.10.21/debian/helpers/docker.sh 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/helpers/docker.sh 2023-01-14 05:55:59.000000000 -0300 @@ -0,0 +1,102 @@ +#!/bin/bash + +# Make it easy to build a docker image aimed at building the docker +# package, and the build the package, either as unprivileged user or +# as root. The idea with building as root is that it allows to run +# more unit tests. +# +# Copyright: Arnaud Rebillout +# License: GPL-3+ + +set -e +set -u + +DOCKER=docker +APT_PROXY= +IMAGE_TAG=${IMAGE_TAG:-debian/sid/docker-builder} +ACNG_PORT=${ACNG_PORT:-3142} + +CMD=${1:-} +shift || : + + +## misc helpers + +fail() { + echo >&2 "$@" + exit 1 +} + +user_in_docker_group() { + id -Gn | grep -q '\bdocker\b' +} + +apt_cacher_ng_running() { + command -v nc >/dev/null 2>&1 || return 1 + nc -z localhost $1 +} + + +## docker helpers + +docker_build() { + local opts=() + + [ "$APT_PROXY" ] && \ + opts+=("--build-arg" "http_proxy=$APT_PROXY") + + $DOCKER build \ + "${opts[@]}" \ + -t $IMAGE_TAG \ + . +} + +docker_run_as_user() { + $DOCKER run -it --rm \ + -u $(id -u):$(id -g) \ + -v /etc/group:/etc/group:ro \ + -v /etc/passwd:/etc/passwd:ro \ + -v $(pwd)/..:/usr/src/ \ + -w /usr/src/$(basename $(pwd)) \ + $IMAGE_TAG \ + "$@" +} + +docker_run_as_root() { + $DOCKER run -it --rm \ + --privileged \ + -v $(pwd)/..:/usr/src \ + -w /usr/src/$(basename $(pwd)) \ + $IMAGE_TAG \ + "$@" +} + + +## main + +[ -d debian ] || \ + fail "No 'debian' directory. Please run from the root of the source tree" + +if ! user_in_docker_group; then + DOCKER='sudo docker' + echo "You are not part of the docker group, running docker with '$DOCKER'" +fi + +if apt_cacher_ng_running $ACNG_PORT; then + APT_PROXY="http://172.17.0.1:$ACNG_PORT" + echo "Detected local apt proxy, using $APT_PROXY as container proxy" +fi + +case "$CMD" in + (build) + cd debian + docker_build ;; + (run-user) + docker_run_as_user "$@" ;; + (run-root) + docker_run_as_root "$@" ;; + (*) + fail "Usage: $(basename $0) build | run-user [CMD] | run-root [CMD]" ;; +esac + +# vim: et sts=4 sw=4 diff -Nru docker.io-20.10.21/debian/helpers/engine-gitcommits docker.io-20.10.24+dfsg1/debian/helpers/engine-gitcommits --- docker.io-20.10.21/debian/helpers/engine-gitcommits 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/helpers/engine-gitcommits 2023-04-05 12:06:25.000000000 -0300 @@ -0,0 +1,20 @@ +# https://github.com/moby/moby/tags + +20.10.24: 5d6db84 +20.10.23: 6051f14 +20.10.22: 42c8b31 +20.10.21: 3056208 +20.10.19: c964641 +20.10.18: e42327a +20.10.17: a89b842 +20.10.14: 87a90dc +20.10.11: 847da18 +20.10.10: e2f740d +20.10.8: 75249d8 +20.10.5: 363e9a8 +20.10.4: 363e9a8 +20.10.3: 46229ca +20.10.2: 8891c58 +20.10.1: f001486 +20.10.0: eeddea2 +20.10.0-rc1: 131bf7e diff -Nru docker.io-20.10.21/debian/helpers/gen-build-depends.sh docker.io-20.10.24+dfsg1/debian/helpers/gen-build-depends.sh --- docker.io-20.10.21/debian/helpers/gen-build-depends.sh 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/helpers/gen-build-depends.sh 2023-01-14 05:55:59.000000000 -0300 @@ -0,0 +1,193 @@ +#!/bin/bash +set -eu +set -o pipefail + +goBuildTags='apparmor cgo daemon pkcs11 selinux' + +debDir="$PWD/debian" + +debVer="$(dpkg-parsechangelog -SVersion)" +origVer="${debVer%-*}" # strip everything from the last dash +origVer="$(echo "$origVer" | sed -r 's/^[0-9]+://')" # strip epoch +upstreamVer="${origVer%%[+~]ds*}" +upstreamVer="${upstreamVer//[~]/-}" + +goImportPath="$(awk -F ': ' '$1 == "XS-Go-Import-Path" { print $2; exit }' debian/control)" +[ "$goImportPath" ] + +upstreamArchiveUri="https://$goImportPath/archive/v${upstreamVer}.tar.gz" + +tempDir="$(mktemp -d -t debian-docker-gen-build-depends-XXXXXXXXXX)" +trap "rm -rf '$tempDir'" EXIT +cd "$tempDir" + +mkdir -p "gopath/src/$goImportPath" +wget -qO archive.tar.gz "$upstreamArchiveUri" +tar \ + --extract \ + --file archive.tar.gz \ + --directory "gopath/src/$goImportPath" \ + --strip-components 1 +export GOPATH="$PWD/gopath:$PWD/gopath/src/$goImportPath/vendor" +cd "gopath/src/$goImportPath" + +IFS=$'\n' +# get the full list of "docker/docker" Go packages +goPkgs=( $(go list "$goImportPath/..." | grep -vE "^$goImportPath/vendor/") ) +# get the list of their dependencies, normalized: +# - skip stdlib, docker/docker +# - adjust known hosting locations for their top-level repos +goDeps=( $( + go list \ + -e \ + -tags "$goBuildTags" \ + -f '{{ join .Deps "\n" }}{{ "\n" }}{{ join .TestImports "\n" }}' \ + "${goPkgs[@]}" \ + | grep -vE '^$' \ + | grep -vE '^[^/]+$' \ + | grep -vE "^$goImportPath/" \ + | sort -u \ + | xargs \ + go list \ + -e \ + -f '{{ if not .Standard }}{{ .ImportPath }}{{ end }}' \ + | grep -vE '^$' \ + | sed -r \ + -e 's!^(github.com/[^/]+/[^/]+)/.*$!\1!' \ + -e 's!^(golang.org/x/[^/]+)/.*$!\1!' \ + -e 's!^(google.golang.org/[^/]+)/.*$!\1!' \ + -e 's!^(gopkg.in/[^/]+)/.*$!\1!' \ + | sort -u +) ) +unset IFS + +# converts a given "goPkg" into the relevant Debian "-dev" package name +debian_pkg() { + local goPkg="$1" + local domain="${goPkg%%/*}" + domain="${domain%%.*}" + local goPkgPath="${goPkg#*/}" + local package="golang-$domain-${goPkgPath//\//-}-dev" + package="${package,,}" + echo "$package" +} + +# converts "gitRepo" and "gitRef" into a concrete version number +git_version() { + local goPkg="$1"; shift + local gitRepo="$1"; shift + local gitRef="$1"; shift + + [ "$gitRef" ] || return + + local gitSnapshotPrefix='0.0~git' + + # normalize a few "special" cases + case "$goPkg=$gitRef" in + github.com/docker/go=*-*-*-*) + # turn "v1.5.1-1-1-gbaf439e" into "v1.5.1-1" so we can "ls-remote" and generate via commit instead of version + local remoteCommit="$(git ls-remote "$gitRepo" "refs/tags/${gitRef%-*-*}" | cut -d$'\t' -f1)" + if [ "$remoteCommit" ]; then + gitRef="$remoteCommit" + fi + ;; + + github.com/docker/libnetwork=v0.7.2-rc.1) + # TODO get newer version in the archive + gitRef='v0.7.0~rc.6' + ;; + + github.com/docker/distribution=467fc068d88aa6610691b7f1a677271a3fac4aac) + # TODO get newer version in the archive (467fc068d88aa6610691b7f1a677271a3fac4aac really corresponds to v2.5.0-rc.1+) + gitRef='v2.4.1' + ;; + + github.com/agl/ed25519=*) + gitSnapshotPrefix='0~' + ;; + + github.com/docker/containerd=*|github.com/opencontainers/runc=*) + # attempt to resolve commit to tag + local remoteTag="$(git ls-remote --tags "$gitRepo" | awk -F '[\t/]' '$1 == "'"$gitRef"'" { print $4; exit }')" + if [ "$remoteTag" ]; then + gitRef="$remoteTag" + fi + # TODO get newer (compatible) versions of each of these into the archive + case "$goPkg" in + github.com/docker/containerd) + gitRef='v0.2.1' + ;; + github.com/opencontainers/runc) + gitRef='v0.1.0' + ;; + esac + ;; + esac + + case "$gitRef" in + v[0-9]*|[0-9].*) + echo "${gitRef#v}" + return + ;; + esac + + local commitDate + case "$goPkg" in + github.com/*) + # for GitHub repos, we can shortcut the date calculation (saves a _lot_ of time) + local githubPatchUri="https://$goPkg/commit/$gitRef.patch" + commitDate="$(wget -qO- "$githubPatchUri" | awk -F ': ' '$1 == "Date" { print $2 }' | tail -1)" + # ".patch" returns potentially multiple commits, so we want the final "Date:" value, hence the "tail -1" + ;; + + *) + mkdir -p "$tempDir/git/$goPkg" + git clone --quiet "$gitRepo" "$tempDir/git/$goPkg" + local commitUnix="$(git -C "$tempDir/git/$goPkg" log -1 --format='%at' "$gitRef" --)" + commitDate="@$commitUnix" + ;; + esac + [ "$commitDate" ] + commitDate="$(TZ=UTC date --date="$commitDate" +'%Y%m%d')" + echo "$gitSnapshotPrefix$commitDate" +} + +declare -A transitionals=( + [golang-github-agl-ed25519-dev]='golang-ed25519-dev' + [golang-github-coreos-etcd-dev]='golang-etcd-server-dev' + [golang-github-go-check-check-dev]='golang-gopkg-check.v1-dev' + [golang-github-godbus-dbus-dev]='golang-dbus-dev' + [golang-github-golang-protobuf-dev]='golang-goprotobuf-dev' + [golang-github-miekg-dns-dev]='golang-dns-dev' + [golang-github-mistifyio-go-zfs-dev]='golang-go-zfs-dev' + [golang-github-syndtr-gocapability-dev]='golang-gocapability-dev' + [golang-github-ugorji-go-dev]='golang-github-ugorji-go-codec-dev' + [golang-gopkg-fsnotify.v1-dev]='golang-github-fsnotify-fsnotify-dev' + + # golang-golang-x-oauth2 version 0.0~git20161103.0.36bc617-2 introduced a separate google/ package + [golang-golang-x-oauth2-dev]='golang-golang-x-oauth2-google-dev' +) + +for goDep in "${goDeps[@]}"; do + if grep -q "^vendor/src/$goDep\$" "$debDir"/repack/keep/* 2>/dev/null; then + # skip vendored deps we don't remove + continue + fi + + debPkg="$(debian_pkg "$goDep")" + + gitRepoRef="$(awk '$1 == "clone" && $2 == "git" && $3 == "'"$goDep"'" { print ($5 && $5 != "#" ? $5 : "") "=" $4; exit }' hack/vendor.sh)" + gitRepo="${gitRepoRef%=*}" + gitRef="${gitRepoRef##$gitRepo=}" + : "${gitRepo:=https://$goDep}" + + debVer="$(git_version "$goDep" "$gitRepo" "$gitRef")" + + # deal with "golang-dns-dev" and friends of that nature + transitional="${transitionals[$debPkg]:-}" + if [ "$transitional" ]; then + echo -n "$transitional${debVer:+ (>= ${debVer}~)} | " + fi + + echo "$debPkg${debVer:+ (>= ${debVer}~)}," +done | sort diff -Nru docker.io-20.10.21/debian/helpers/gitcommit.sh docker.io-20.10.24+dfsg1/debian/helpers/gitcommit.sh --- docker.io-20.10.21/debian/helpers/gitcommit.sh 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/helpers/gitcommit.sh 2023-01-14 05:55:59.000000000 -0300 @@ -0,0 +1,20 @@ +#!/bin/bash + +# Print the git commit associated with a version, for a given component. + +set -e +set -u + +if [ $# -ne 2 ]; then + echo >&2 "Usage: $0 COMPONENT UPSTREAM_VERSION" + exit 1 +fi + +comp=$1 +version=$2 + +# Get the "real" upstream version +version=$( debian/helpers/real-upstream-version.sh "$version" ) + +# Get corresponding git commit +awk -F ': ' '$1 == "'"$version"'" {print $2}' debian/helpers/${comp}-gitcommits diff -Nru docker.io-20.10.21/debian/helpers/ls-vendor.sh docker.io-20.10.24+dfsg1/debian/helpers/ls-vendor.sh --- docker.io-20.10.21/debian/helpers/ls-vendor.sh 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/helpers/ls-vendor.sh 2023-01-14 05:55:59.000000000 -0300 @@ -0,0 +1,81 @@ +#!/bin/bash + +# List all vendored go packages in all of the MUT components, +# removing duplicates. It makes it easy to see what vendor +# directories are kept, and to spot anything that shouldn't +# be here. +# +# Typical use-case: after bumping the package to a new version, +# run it to see if new vendor directories were added by upstream. +# You might want to add those to the Files-Excluded list. +# +# Copyright: Arnaud Rebillout +# License: GPL-3+ + +set -e +set -u + +export LC_ALL=C + +get_vendor_tree() { + # Get the list of vendor directories. We distinguish two cases: + # 1. github.com: we need granularity down to the package level, + # ie. 'github.com/containerd/aufs' + # 2. others: we only need granularity to the project level, + # ie. 'code.cloudfoundry.org' + + local vendor_dir=$1/vendor + local dirs=() + local dir= + + if ! [ -d "$vendor_dir" ]; then + return + fi + + for dir in "$vendor_dir"/*; do + if ! [ -d "$dir" ]; then + continue + fi + case "$dir" in + (*/github.com) ;& + (*/golang.org) + dirs+=($( find "$dir" -mindepth 2 -maxdepth 2 -type d )) + ;; + (*) + dirs+=("$dir") + ;; + esac + done + + if [ ${#dirs[@]} -eq 0 ]; then + return + fi + + printf "%s\n" "${dirs[@]}" \ + | sed 's;^.*/vendor/;vendor/;' \ + | sort -u +} + +VD= # vendor directories +ALLVD= # all vendor directories + +for d in *; do + [ -d "$d" ] || continue + [ "$d" = debian ] && continue + VD=$( get_vendor_tree "$d" ) + #echo "==== ${d^^} ====" + #echo "$VD" + #echo + ALLVD=$( printf '%s\n' $ALLVD $VD | sort -u ) +done + +if [ -z "$ALLVD" ]; then + echo "Nothing in the vendor directories!" +else + echo "List of vendor directories in all MUT components." + echo "Anything that shouldn't be here must be added to Files-Excluded." + echo "" + echo "$ALLVD" +fi + +# vim: et sts=4 sw=4 diff -Nru docker.io-20.10.21/debian/helpers/real-upstream-version.sh docker.io-20.10.24+dfsg1/debian/helpers/real-upstream-version.sh --- docker.io-20.10.21/debian/helpers/real-upstream-version.sh 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/helpers/real-upstream-version.sh 2023-01-14 05:55:59.000000000 -0300 @@ -0,0 +1,17 @@ +#!/bin/bash + +# Transform Debian's upstream version into the "real" +# upstream version. That is, remove the typical Debian +# extension '+dfsgX', and turns '~' back into '-'. + +set -e +set -u + +if [ $# -ne 1 ]; then + echo >&2 "Usage: $0 UPSTREAM_VERSION" + exit 1 +fi + +echo "$1" | sed -E \ + -e 's/\+(dfsg|ds)[0-9]+$//' \ + -e 's/~/-/g' diff -Nru docker.io-20.10.21/debian/helpers/unpack-components.sh docker.io-20.10.24+dfsg1/debian/helpers/unpack-components.sh --- docker.io-20.10.21/debian/helpers/unpack-components.sh 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/helpers/unpack-components.sh 2023-01-14 05:55:59.000000000 -0300 @@ -0,0 +1,38 @@ +#!/bin/bash +: <<=cut + +=head1 DESCRIPTION + +Unpack MUT components. Since devscripts 2.19.7, 'origtargz --unpack' +unpacks MUT components automatically, and this script is not needed +anymore. Also see #929786. + +=head1 SYNOPSIS + + ./debian/helpers/unpack-components.sh + +=cut + +set -e +set -u + +DEB_SOURCE="$( dpkg-parsechangelog -SSource )" +DEB_VERSION_UPSTREAM="$( dpkg-parsechangelog -SVersion | sed -e 's/-[^-]*$//' )" + +if ls ../${DEB_SOURCE}_${DEB_VERSION_UPSTREAM}.orig-*.tar.* 2>>/dev/null; then + for T in ../${DEB_SOURCE}_${DEB_VERSION_UPSTREAM}.orig-*.tar.*; do + C="${T##*.orig-}" + C="${C%%.tar*}" + mkdir -p "${C}" + tar xf ${T} -C "${C}" --strip-components=1 + if [ "$(ls -m ${C})" == "${C}" ]; then + ## --strip-components=1 did not work. + mv "${C}" "${C}.tmp" + mv "${C}.tmp/${C}" . + rmdir "${C}.tmp" + fi + done +else + printf "W: no components to extract.\n" + exit 0 +fi diff -Nru docker.io-20.10.21/debian/helpers/uscan-summary.sh docker.io-20.10.24+dfsg1/debian/helpers/uscan-summary.sh --- docker.io-20.10.21/debian/helpers/uscan-summary.sh 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/helpers/uscan-summary.sh 2023-01-14 05:55:59.000000000 -0300 @@ -0,0 +1,105 @@ +#!/bin/bash + +# Read the logs from uscan + get-orig-source, and display +# the list of Files-Excluded patterns that were not matched +# in any of the MUT components. +# +# Typical use-case: after bumping the package to a new version, +# run it to see which Files-Excluded patterns are now useless. +# You might want to remove those from the Files-Excluded list, +# and possibly remove their equivalent packages from the +# Build-Depends field. +# +# Usage: +# +# uscan --verbose --download-current-version 2>&1 | tee uscan-logs +# ./debian/helpers/uscan-summary.sh < uscan-logs +# +# Copyright: Arnaud Rebillout +# License: GPL-3+ + +set -e +set -u + +export LC_ALL=C + +## key: component +## value: newline-separated list of unmatched patterns +declare -A COMPONENTS + +assert_empty() { + [ -z "$1" ] || exit 1 +} + +assert_nonempty() { + [ -n "$1" ] || exit 1 +} + +comp= + +## read uscan logs, get unmatched patterns for each component +while IFS= read -r line +do + case "$line" in + ('uscan info: Process watch file'*) + assert_empty "$comp" + comp=engine + continue + ;; + ('get-orig-source info: Process'*) + assert_nonempty "$comp" + comp= + continue + ;; + (' component = '*) + assert_empty "$comp" + comp=$(echo "$line" | sed 's/.* = //') + continue + ;; + (*'No files matched excluded pattern'*) + pattern=$(echo "$line" | sed 's/.* excluded pattern .*: //') + [ -n "${COMPONENTS[$comp]:-}" ] && COMPONENTS[$comp]+=$'\n' + COMPONENTS[$comp]+="$pattern" + continue + ;; + esac +done < /dev/stdin + +#for comp in "${!COMPONENTS[@]}"; do +# echo "==== ${comp^^} ====" +# echo "${COMPONENTS[$comp]}" +# echo "" +#done + +## get unmatched patterns altogether, while removing the +## patterns with '~', as we expect those to be unmatched. +ALL_UNMATCHED_PATTERNS=$(printf '%s\n' ${COMPONENTS[@]} | grep -v '^~' | sort -u) + +## useless patterns are those unmatched for all components +USELESS_PATTERNS= +for p in $ALL_UNMATCHED_PATTERNS; do + useless=1 + for c in "${!COMPONENTS[@]}"; do + if echo "${COMPONENTS[$c]}" | grep -qFx "$p"; then + continue + else + useless=0 + break + fi + done + if [ $useless -eq 1 ]; then + [ -n "${USELESS_PATTERNS}" ] && USELESS_PATTERNS+=$'\n' + USELESS_PATTERNS+="$p" + fi +done + +if [ -z "$USELESS_PATTERNS" ]; then + echo "No useless patterns found in Files-Excluded. All good here." +else + echo "The following patterns were not found in any of the MUT components." + echo "They can probably be removed from Files-Excluded in d/copyright." + echo + echo "$USELESS_PATTERNS" +fi + +# vim: et sts=4 sw=4 diff -Nru docker.io-20.10.21/debian/NEWS docker.io-20.10.24+dfsg1/debian/NEWS --- docker.io-20.10.21/debian/NEWS 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/NEWS 1969-12-31 21:00:00.000000000 -0300 @@ -1,41 +0,0 @@ -docker.io (20.10.2-0ubuntu2) hirsute; urgency=medium - - As of version 20.10.2-0ubuntu2, upgrading the docker.io package will fail if - any containers are still using AUFS. It will be necessary to take some - measures to move existing containers away from aufs and delete the directory - /var/lib/docker/aufs before upgrading can succeed. See the previous NEWS - entry for instructions on moving away from AUFS. - - Note: Option 3 from the previous NEWS entry is no longer going to be a valid - option moving forward. Users will have to either migrate their - containers to a supported storage driver or maintain their own kernel - builds with AUFS support. - - -- William 'jawn-smith' Wilson Wed, 24 Feb 2021 16:06:03 -0600 - -docker.io (1.8.3~ds1-3) unstable; urgency=medium - - As of src:linux 4.0+ (specifically, >= 3.18-1~exp1), AUFS support is no longer - included in official Debian-compiled kernels. What this means to Docker users - is that if your existing images are stored within the "AUFS" graph driver that - once you update your kernel, your images (and containers) will become - inaccessible (due to the kernel not having the necessary aufs modules to mount - them). To recover from this, there are a couple options (detailed below). - - 1. Use the included nuke script to blow away your existing "/var/lib/docker" - contents and start fresh with Linux 4.0+: - - service docker stop - /usr/share/docker.io/contrib/nuke-graph-directory.sh /var/lib/docker - service docker start - - 2. Use "docker save" (see "docker help save" for usage) before booting 4.0+ to - preserve your images on-disk as tar files, then follow the nuke step from - the previous option followed by using "docker load" to re-load your images. - - 3. Update to src:linux >= 4.1.1-1~exp1 ("aufs: Apply patches to enable - building aufs out-of-tree"), and then compile the aufs modules out-of-tree - (a package for doing this module compilation automatically doesn't yet - exist at the time of this writing, but might in the future). - - -- Tianon Gravi Tue, 01 Dec 2015 01:02:44 -0800 diff -Nru docker.io-20.10.21/debian/patches/avoid-consul.patch docker.io-20.10.24+dfsg1/debian/patches/avoid-consul.patch --- docker.io-20.10.21/debian/patches/avoid-consul.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/avoid-consul.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,65 @@ +Index: docker/libnetwork/store.go +=================================================================== +--- docker.orig/libnetwork/store.go ++++ docker/libnetwork/store.go +@@ -5,7 +5,6 @@ import ( + "strings" + + "github.com/docker/libkv/store/boltdb" +- "github.com/docker/libkv/store/consul" + "github.com/docker/libkv/store/etcd" + "github.com/docker/libkv/store/zookeeper" + "github.com/docker/libnetwork/datastore" +@@ -13,7 +12,6 @@ import ( + ) + + func registerKVStores() { +- consul.Register() + zookeeper.Register() + etcd.Register() + boltdb.Register() +Index: docker/engine/pkg/discovery/kv/kv.go +=================================================================== +--- docker.orig/engine/pkg/discovery/kv/kv.go ++++ docker/engine/pkg/discovery/kv/kv.go +@@ -10,7 +10,6 @@ import ( + "github.com/docker/go-connections/tlsconfig" + "github.com/docker/libkv" + "github.com/docker/libkv/store" +- "github.com/docker/libkv/store/consul" + "github.com/docker/libkv/store/etcd" + "github.com/docker/libkv/store/zookeeper" + "github.com/sirupsen/logrus" +@@ -38,12 +37,10 @@ func init() { + func Init() { + // Register to libkv + zookeeper.Register() +- consul.Register() + etcd.Register() + + // Register to internal discovery service + discovery.Register("zk", &Discovery{backend: store.ZK}) +- discovery.Register("consul", &Discovery{backend: store.CONSUL}) + discovery.Register("etcd", &Discovery{backend: store.ETCD}) + } + +Index: docker/libnetwork/hostdiscovery/hostdiscovery.go +=================================================================== +--- docker.orig/libnetwork/hostdiscovery/hostdiscovery.go ++++ docker/libnetwork/hostdiscovery/hostdiscovery.go +@@ -10,7 +10,6 @@ import ( + "github.com/docker/docker/pkg/discovery" + // Including KV + _ "github.com/docker/docker/pkg/discovery/kv" +- "github.com/docker/libkv/store/consul" + "github.com/docker/libkv/store/etcd" + "github.com/docker/libkv/store/zookeeper" + "github.com/docker/libnetwork/types" +@@ -24,7 +23,6 @@ type hostDiscovery struct { + } + + func init() { +- consul.Register() + etcd.Register() + zookeeper.Register() + } diff -Nru docker.io-20.10.21/debian/patches/cli-add-go.mod-file.patch docker.io-20.10.24+dfsg1/debian/patches/cli-add-go.mod-file.patch --- docker.io-20.10.21/debian/patches/cli-add-go.mod-file.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/cli-add-go.mod-file.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,17 @@ +From: Arnaud Rebillout +Date: Tue, 24 Nov 2020 09:14:00 +0700 +Subject: Add go.mod file to cli + +Fix build issue during tests with ++ gotest.tools/v3 +--- + go.mod | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 go.mod + +Index: docker/cli/go.mod +=================================================================== +--- /dev/null ++++ docker/cli/go.mod +@@ -0,0 +1 @@ ++module github.com/docker/cli diff -Nru docker.io-20.10.21/debian/patches/cli-dont-duplicate-authconfig.patch docker.io-20.10.24+dfsg1/debian/patches/cli-dont-duplicate-authconfig.patch --- docker.io-20.10.21/debian/patches/cli-dont-duplicate-authconfig.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/cli-dont-duplicate-authconfig.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,50 @@ +Author: Arnaud Rebillout +Bug-Upsteam: https://github.com/docker/cli/issues/2181 +Forwarded: not-needed, Debian-specific +Description: Prevent reverse build-deps nomad and gitlab-runner to FTBFS + +~~~~ gitlab-runner +src/gitlab.com/gitlab-org/gitlab-runner/helpers/docker/auth_config.go:102:22: cannot use config.AuthConfigs (type map[string]"github.com/docker/cli/cli/config/types".AuthConfig] as type map[string]"github.com/docker/docker/api/types".AuthConfig] in argument to addAll +src/gitlab.com/gitlab-org/gitlab-runner/helpers/docker/auth_config.go:130:2: cannot use newAuths (type map[string]"github.com/docker/cli/cli/config/types".AuthConfig] as type map[string]"github.com/docker/docker/api/types".AuthConfig] in return argument +src/gitlab.com/gitlab-org/gitlab-runner/helpers/docker/auth_config.go:144:26: cannot use newAuths (type "github.com/docker/cli/cli/config/types".AuthConfig) +~~~~ + +~~~~ nomad +src/github.com/hashicorp/nomad/drivers/docker/utils.go:118:57: cannot use cfile.AuthConfigs (type map[string]"github.com/docker/cli/cli/config/types".AuthConfig] as type map[string]"github.com/docker/docker/api/types".AuthConfig] in argument to "github.com/docker/docker/registry".ResolveAuthConfig +~~~~ + +Please update this patch when upstream provides a fix. + +Signed-off-by: Arnaud Rebillout + +Index: docker/cli/cli/config/types/authconfig.go +=================================================================== +--- docker.orig/cli/cli/config/types/authconfig.go ++++ docker/cli/cli/config/types/authconfig.go +@@ -1,22 +1,7 @@ + package types + +-// AuthConfig contains authorization information for connecting to a Registry +-type AuthConfig struct { +- Username string `json:"username,omitempty"` +- Password string `json:"password,omitempty"` +- Auth string `json:"auth,omitempty"` ++import ( ++ "github.com/docker/docker/api/types" ++) + +- // Email is an optional value associated with the username. +- // This field is deprecated and will be removed in a later +- // version of docker. +- Email string `json:"email,omitempty"` +- +- ServerAddress string `json:"serveraddress,omitempty"` +- +- // IdentityToken is used to authenticate the user and get +- // an access token for the registry. +- IdentityToken string `json:"identitytoken,omitempty"` +- +- // RegistryToken is a bearer token to be sent to a registry +- RegistryToken string `json:"registrytoken,omitempty"` +-} ++type AuthConfig = types.AuthConfig diff -Nru docker.io-20.10.21/debian/patches/debian-bash-completion-no-shebang.patch docker.io-20.10.24+dfsg1/debian/patches/debian-bash-completion-no-shebang.patch --- docker.io-20.10.21/debian/patches/debian-bash-completion-no-shebang.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/debian-bash-completion-no-shebang.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,23 @@ +Description: Remove shebang from bash completion file + Discussed upstream, rejected as most code editors rely on the shebang + to correctly indent and highlight the file. +Forwarded: https://github.com/docker/cli/pull/2853 +Author: Arnaud Rebillout +Last-Update: 2020-11-27 + +Index: docker/cli/contrib/completion/bash/docker +=================================================================== +--- docker.orig/cli/contrib/completion/bash/docker ++++ docker/cli/contrib/completion/bash/docker +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++# bash completion for docker(1) -*- shell-script -*- + # shellcheck disable=SC2016,SC2119,SC2155,SC2206,SC2207,SC2254 + # + # Shellcheck ignore list: +@@ -5673,3 +5673,5 @@ eval "$__docker_previous_extglob_setting + unset __docker_previous_extglob_setting + + complete -F _docker docker docker.exe dockerd dockerd.exe ++ ++# ex: filetype=sh diff -Nru docker.io-20.10.21/debian/patches/debian-cgroupfs-mount-convenience-copy.patch docker.io-20.10.24+dfsg1/debian/patches/debian-cgroupfs-mount-convenience-copy.patch --- docker.io-20.10.21/debian/patches/debian-cgroupfs-mount-convenience-copy.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/debian-cgroupfs-mount-convenience-copy.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,81 @@ +Author: Tianon Gravi +Description: remove convenience copies of cgroupfs-mount in init.d / upstart +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/783143 + +Index: docker/engine/contrib/init/sysvinit-debian/docker +=================================================================== +--- docker.orig/engine/contrib/init/sysvinit-debian/docker ++++ docker/engine/contrib/init/sysvinit-debian/docker +@@ -59,37 +59,12 @@ fail_unless_root() { + fi + } + +-cgroupfs_mount() { +- # see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount +- if grep -v '^#' /etc/fstab | grep -q cgroup \ +- || [ ! -e /proc/cgroups ] \ +- || [ ! -d /sys/fs/cgroup ]; then +- return +- fi +- if ! mountpoint -q /sys/fs/cgroup; then +- mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup +- fi +- ( +- cd /sys/fs/cgroup +- for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do +- mkdir -p $sys +- if ! mountpoint -q $sys; then +- if ! mount -n -t cgroup -o $sys cgroup $sys; then +- rmdir $sys || true +- fi +- fi +- done +- ) +-} +- + case "$1" in + start) + check_init + + fail_unless_root + +- cgroupfs_mount +- + touch "$DOCKER_LOGFILE" + chgrp docker "$DOCKER_LOGFILE" + +Index: docker/engine/contrib/init/upstart/docker.conf +=================================================================== +--- docker.orig/engine/contrib/init/upstart/docker.conf ++++ docker/engine/contrib/init/upstart/docker.conf +@@ -13,29 +13,6 @@ respawn + + kill timeout 20 + +-pre-start script +- # see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount +- if grep -v '^#' /etc/fstab | grep -q cgroup \ +- || [ ! -e /proc/cgroups ] \ +- || [ ! -d /sys/fs/cgroup ]; then +- exit 0 +- fi +- if ! mountpoint -q /sys/fs/cgroup; then +- mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup +- fi +- ( +- cd /sys/fs/cgroup +- for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do +- mkdir -p $sys +- if ! mountpoint -q $sys; then +- if ! mount -n -t cgroup -o $sys cgroup $sys; then +- rmdir $sys || true +- fi +- fi +- done +- ) +-end script +- + script + # modify these in /etc/default/$UPSTART_JOB (/etc/default/docker) + DOCKERD=/usr/sbin/dockerd diff -Nru docker.io-20.10.21/debian/patches/debian-dockerd-binary-location.patch docker.io-20.10.24+dfsg1/debian/patches/debian-dockerd-binary-location.patch --- docker.io-20.10.21/debian/patches/debian-dockerd-binary-location.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/debian-dockerd-binary-location.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,42 @@ +Forwarded: not-needed +Description: FHS compliance. + +Index: docker/engine/contrib/init/systemd/docker.service +=================================================================== +--- docker.orig/engine/contrib/init/systemd/docker.service ++++ docker/engine/contrib/init/systemd/docker.service +@@ -11,7 +11,7 @@ Type=notify + # exists and systemd currently does not support the cgroup feature set required + # for containers run by docker + EnvironmentFile=-/etc/default/docker +-ExecStart=/usr/bin/dockerd -H fd:// $DOCKER_OPTS ++ExecStart=/usr/sbin/dockerd -H fd:// $DOCKER_OPTS + ExecReload=/bin/kill -s HUP $MAINPID + LimitNOFILE=1048576 + # Having non-zero Limit*s causes performance problems due to accounting overhead +Index: docker/engine/contrib/init/sysvinit-debian/docker +=================================================================== +--- docker.orig/engine/contrib/init/sysvinit-debian/docker ++++ docker/engine/contrib/init/sysvinit-debian/docker +@@ -22,7 +22,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bi + BASE=docker + + # modify these in /etc/default/$BASE (/etc/default/docker) +-DOCKERD=/usr/bin/dockerd ++DOCKERD=/usr/sbin/dockerd + # This is the pid file managed by docker itself + DOCKER_PIDFILE=/var/run/$BASE.pid + # This is the pid file created/managed by start-stop-daemon +Index: docker/engine/contrib/init/upstart/docker.conf +=================================================================== +--- docker.orig/engine/contrib/init/upstart/docker.conf ++++ docker/engine/contrib/init/upstart/docker.conf +@@ -38,7 +38,7 @@ end script + + script + # modify these in /etc/default/$UPSTART_JOB (/etc/default/docker) +- DOCKERD=/usr/bin/dockerd ++ DOCKERD=/usr/sbin/dockerd + DOCKER_OPTS= + if [ -f /etc/default/$UPSTART_JOB ]; then + . /etc/default/$UPSTART_JOB diff -Nru docker.io-20.10.21/debian/patches/debian-nuke-no-prompt.patch docker.io-20.10.24+dfsg1/debian/patches/debian-nuke-no-prompt.patch --- docker.io-20.10.21/debian/patches/debian-nuke-no-prompt.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/debian-nuke-no-prompt.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,24 @@ +Last-Update: 2018-06-09 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853258 +Forwarded: not-needed +Author: Dmitry Smirnov +Description: remove prompt and delay + +Index: docker/engine/contrib/nuke-graph-directory.sh +=================================================================== +--- docker.orig/engine/contrib/nuke-graph-directory.sh ++++ docker/engine/contrib/nuke-graph-directory.sh +@@ -28,13 +28,6 @@ dir="$(readlink -f "$dir")" + + echo + echo "Nuking $dir ..." +-echo ' (if this is wrong, press Ctrl+C NOW!)' +-echo +- +-( +- set -x +- sleep 10 +-) + echo + + dir_in_dir() { diff -Nru docker.io-20.10.21/debian/patches/debian-systemd-unit-environment-file.patch docker.io-20.10.24+dfsg1/debian/patches/debian-systemd-unit-environment-file.patch --- docker.io-20.10.21/debian/patches/debian-systemd-unit-environment-file.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/debian-systemd-unit-environment-file.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,20 @@ +Author: Paul R. Tagliamonte +Last-Update: 2014-05-07 +Description: Use EnvironmentFile with the systemd unit file. +Bug-Debian: http://bugs.debian.org/746774 +Forwarded: no + +Index: docker/engine/contrib/init/systemd/docker.service +=================================================================== +--- docker.orig/engine/contrib/init/systemd/docker.service ++++ docker/engine/contrib/init/systemd/docker.service +@@ -10,7 +10,8 @@ Type=notify + # the default is not to use systemd for cgroups because the delegate issues still + # exists and systemd currently does not support the cgroup feature set required + # for containers run by docker +-ExecStart=/usr/bin/dockerd -H fd:// ++EnvironmentFile=-/etc/default/docker ++ExecStart=/usr/bin/dockerd -H fd:// $DOCKER_OPTS + ExecReload=/bin/kill -s HUP $MAINPID + LimitNOFILE=1048576 + # Having non-zero Limit*s causes performance problems due to accounting overhead diff -Nru docker.io-20.10.21/debian/patches/debian-systemd-unit-tasksmax.patch docker.io-20.10.24+dfsg1/debian/patches/debian-systemd-unit-tasksmax.patch --- docker.io-20.10.21/debian/patches/debian-systemd-unit-tasksmax.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/debian-systemd-unit-tasksmax.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,21 @@ +From 33a8ab29ed9e51697772a0642b8d651b9a845532 Mon Sep 17 00:00:00 2001 +From: Pierre Carrier , Tianon Gravi +Date: Thu, 24 Mar 2016 16:14:30 -0700 +Subject: [PATCH] docker.service: don't limit tasks +Origin: https://github.com/docker/docker/pull/21491 + +Signed-off-by: Pierre Carrier + +Index: docker/engine/contrib/init/systemd/docker.service +=================================================================== +--- docker.orig/engine/contrib/init/systemd/docker.service ++++ docker/engine/contrib/init/systemd/docker.service +@@ -19,7 +19,7 @@ LimitNPROC=infinity + LimitCORE=infinity + # Uncomment TasksMax if your systemd version supports it. + # Only systemd 226 and above support this version. +-#TasksMax=infinity ++TasksMax=infinity + TimeoutStartSec=0 + # set delegate yes so that systemd does not reset the cgroups of docker containers + Delegate=yes diff -Nru docker.io-20.10.21/debian/patches/engine-add-go.mod-file.patch docker.io-20.10.24+dfsg1/debian/patches/engine-add-go.mod-file.patch --- docker.io-20.10.21/debian/patches/engine-add-go.mod-file.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/engine-add-go.mod-file.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,18 @@ +From: Arnaud Rebillout +Date: Tue, 24 Nov 2020 09:14:00 +0700 +Subject: Add go.mod file to engine + +Fix build issue with ++ github.com/coreos/go-systemd/v22 ++ gotest.tools/v3 +--- + go.mod | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 go.mod + +Index: docker/engine/go.mod +=================================================================== +--- /dev/null ++++ docker/engine/go.mod +@@ -0,0 +1 @@ ++module github.com/docker/docker diff -Nru docker.io-20.10.21/debian/patches/engine-allow-exclude-unit-test.patch docker.io-20.10.24+dfsg1/debian/patches/engine-allow-exclude-unit-test.patch --- docker.io-20.10.21/debian/patches/engine-allow-exclude-unit-test.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/engine-allow-exclude-unit-test.patch 2023-06-02 16:06:10.000000000 -0300 @@ -0,0 +1,16 @@ +Description: Allow to pass extra paths to be excluded when running unit tests +Author: Lucas Kanashiro +Last-Updated: 2023-06-02 +Forwarded: yes, https://github.com/moby/moby/pull/45693 + +--- a/engine/hack/test/unit ++++ b/engine/hack/test/unit +@@ -15,7 +15,7 @@ + BUILDFLAGS=(-tags 'netgo seccomp libdm_no_deferred_remove') + TESTFLAGS+=" -test.timeout=${TIMEOUT:-5m}" + TESTDIRS="${TESTDIRS:-./...}" +-exclude_paths='/vendor/|/integration' ++exclude_paths="/vendor/|/integration${exclude_paths}" + pkg_list=$(go list $TESTDIRS | grep -vE "($exclude_paths)") + + mkdir -p bundles diff -Nru docker.io-20.10.21/debian/patches/engine-build-against-containerd-v1.5.2.patch docker.io-20.10.24+dfsg1/debian/patches/engine-build-against-containerd-v1.5.2.patch --- docker.io-20.10.21/debian/patches/engine-build-against-containerd-v1.5.2.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/engine-build-against-containerd-v1.5.2.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,34 @@ +From: Sebastiaan van Stijn +Date: Fri, 4 Jun 2021 16:32:37 +0200 +Subject: vendor: github.com/containerd/containerd v1.5.2 + +full diff: https://github.com/containerd/containerd/compare/19ee068f93c91f7b9b2a858457f1af2cabc7bc06...v1.5.2 + +Signed-off-by: Sebastiaan van Stijn +Origin: upstream, https://github.com/moby/moby/commit/7c1c1235 +--- + plugin/backend_linux.go | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: docker/engine/plugin/backend_linux.go +=================================================================== +--- docker.orig/engine/plugin/backend_linux.go ++++ docker/engine/plugin/backend_linux.go +@@ -420,7 +420,7 @@ func (pm *Manager) Push(ctx context.Cont + + // Make sure we can authenticate the request since the auth scope for plugin repos is different than a normal repo. + ctx = docker.WithScope(ctx, scope(ref, true)) +- if err := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, func(h images.Handler) images.Handler { ++ if err := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, nil, func(h images.Handler) images.Handler { + return images.Handlers(progressHandler, h) + }); err != nil { + // Try fallback to http. +@@ -432,7 +432,7 @@ func (pm *Manager) Push(ctx context.Cont + pusher, _ := resolver.Pusher(ctx, ref.String()) + if pusher != nil { + logrus.WithField("ref", ref).Debug("Re-attmpting push with http-fallback") +- err2 := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, func(h images.Handler) images.Handler { ++ err2 := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, nil, func(h images.Handler) images.Handler { + return images.Handlers(progressHandler, h) + }) + if err2 == nil { diff -Nru docker.io-20.10.21/debian/patches/engine-build-against-runc-1.0.patch docker.io-20.10.24+dfsg1/debian/patches/engine-build-against-runc-1.0.patch --- docker.io-20.10.21/debian/patches/engine-build-against-runc-1.0.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/engine-build-against-runc-1.0.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,33 @@ +replace uses of deprecated libcontainer/configs.Device + +Origin: backport, https://github.com/moby/moby/commit/d414c0c1e8c487170b1d2f5af4946771645c6564 +Last-Update: 2021-10-11 + +Index: docker/engine/oci/devices_linux.go +=================================================================== +--- docker.orig/engine/oci/devices_linux.go ++++ docker/engine/oci/devices_linux.go +@@ -6,13 +6,12 @@ import ( + "path/filepath" + "strings" + +- "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runc/libcontainer/devices" + specs "github.com/opencontainers/runtime-spec/specs-go" + ) + + // Device transforms a libcontainer configs.Device to a specs.LinuxDevice object. +-func Device(d *configs.Device) specs.LinuxDevice { ++func Device(d *devices.Device) specs.LinuxDevice { + return specs.LinuxDevice{ + Type: string(d.Type), + Path: d.Path, +@@ -24,7 +23,7 @@ func Device(d *configs.Device) specs.Lin + } + } + +-func deviceCgroup(d *configs.Device) specs.LinuxDeviceCgroup { ++func deviceCgroup(d *devices.Device) specs.LinuxDeviceCgroup { + return specs.LinuxDeviceCgroup{ + Allow: true, + Type: string(d.Type), diff -Nru docker.io-20.10.21/debian/patches/engine-seccomp-mipsx.patch docker.io-20.10.24+dfsg1/debian/patches/engine-seccomp-mipsx.patch --- docker.io-20.10.21/debian/patches/engine-seccomp-mipsx.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/engine-seccomp-mipsx.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,105 @@ +Origin: upstream, https://github.com/moby/moby/pull/43005 + +Index: docker/engine/profiles/seccomp/default.json +=================================================================== +--- docker.orig/engine/profiles/seccomp/default.json ++++ docker/engine/profiles/seccomp/default.json +@@ -686,11 +686,41 @@ + "action": "SCMP_ACT_ERRNO", + "errnoRet": 38, + "args": [], +- "comment": "", ++ "comment": "ENOSYS for clone3 on non-mips architectures", + "includes": {}, + "excludes": { + "caps": [ + "CAP_SYS_ADMIN" ++ ], ++ "arches": [ ++ "mips3l64n32", ++ "mips64", ++ "mips64n32", ++ "mipsel", ++ "mipsel64" ++ ] ++ } ++ }, ++ { ++ "names": [ ++ "clone3" ++ ], ++ "action": "SCMP_ACT_ERRNO", ++ "errnoRet": 89, ++ "args": [], ++ "comment": "ENOSYS for clone3 on mips architectures", ++ "includes": { ++ "arches": [ ++ "mips3l64n32", ++ "mips64", ++ "mips64n32", ++ "mipsel", ++ "mipsel64" ++ ] ++ }, ++ "excludes": { ++ "caps": [ ++ "CAP_SYS_ADMIN" + ] + } + }, +Index: docker/engine/profiles/seccomp/default_linux.go +=================================================================== +--- docker.orig/engine/profiles/seccomp/default_linux.go ++++ docker/engine/profiles/seccomp/default_linux.go +@@ -41,9 +41,26 @@ func arches() []Architecture { + } + } + ++const ( ++ enosys uint = 0x26 // enosys for non-mips architectures. ++ enosysMIPS uint = 0x59 // enosys for mips architectures. ++) ++ + // DefaultProfile defines the allowed syscalls for the default seccomp profile. + func DefaultProfile() *Seccomp { +- nosys := uint(unix.ENOSYS) ++ // The value of ENOSYS differs between MIPS and non-MIPS architectures. While ++ // this is not problematic for the embedded seccomp profile, it prevents the ++ // profile from being saved as a portable JSON file that can be used for both ++ // architectures. ++ // To work around this situation, we include conditional rules for both arches. ++ // and hard-code the value for ENOSYS in both. ++ // For more details, refer to https://github.com/moby/moby/pull/42836#issuecomment-963429850 ++ // and https://github.com/opencontainers/runtime-spec/pull/1087#issuecomment-963463475 ++ var ( ++ nosys = enosys ++ nosysMIPS = enosysMIPS ++ ) ++ + syscalls := []*Syscall{ + { + Names: []string{ +@@ -605,6 +622,23 @@ func DefaultProfile() *Seccomp { + Action: specs.ActErrno, + ErrnoRet: &nosys, + Args: []*specs.LinuxSeccompArg{}, ++ Comment: "ENOSYS for clone3 on non-mips architectures", ++ Excludes: Filter{ ++ Arches: []string{"mips3l64n32", "mips64", "mips64n32", "mipsel", "mipsel64"}, ++ Caps: []string{"CAP_SYS_ADMIN"}, ++ }, ++ }, ++ { ++ Names: []string{ ++ "clone3", ++ }, ++ Action: specs.ActErrno, ++ ErrnoRet: &nosysMIPS, ++ Args: []*specs.LinuxSeccompArg{}, ++ Comment: "ENOSYS for clone3 on mips architectures", ++ Includes: Filter{ ++ Arches: []string{"mips3l64n32", "mips64", "mips64n32", "mipsel", "mipsel64"}, ++ }, + Excludes: Filter{ + Caps: []string{"CAP_SYS_ADMIN"}, + }, diff -Nru docker.io-20.10.21/debian/patches/engine-systemd-service-after-containerd.patch docker.io-20.10.24+dfsg1/debian/patches/engine-systemd-service-after-containerd.patch --- docker.io-20.10.21/debian/patches/engine-systemd-service-after-containerd.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/engine-systemd-service-after-containerd.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,30 @@ +Description: Order docker.service after containerd.service + Fixes proper shutdown of containers. +Origin: upstream, cherry-picked parts of https://github.com/moby/moby/pull/42373 + and https://github.com/moby/moby/pull/42622 +Bug-Debian: https://bugs.debian.org/989490 + +Index: docker/engine/contrib/init/systemd/docker.service +=================================================================== +--- docker.orig/engine/contrib/init/systemd/docker.service ++++ docker/engine/contrib/init/systemd/docker.service +@@ -1,8 +1,8 @@ + [Unit] + Description=Docker Application Container Engine + Documentation=https://docs.docker.com +-After=network-online.target docker.socket firewalld.service +-Wants=network-online.target ++After=network-online.target docker.socket firewalld.service containerd.service ++Wants=network-online.target containerd.service + Requires=docker.socket + + [Service] +@@ -11,7 +11,7 @@ Type=notify + # exists and systemd currently does not support the cgroup feature set required + # for containers run by docker + EnvironmentFile=-/etc/default/docker +-ExecStart=/usr/sbin/dockerd -H fd:// $DOCKER_OPTS ++ExecStart=/usr/sbin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock $DOCKER_OPTS + ExecReload=/bin/kill -s HUP $MAINPID + LimitNOFILE=1048576 + # Having non-zero Limit*s causes performance problems due to accounting overhead diff -Nru docker.io-20.10.21/debian/patches/libnetwork-add-go.mod-file.patch docker.io-20.10.24+dfsg1/debian/patches/libnetwork-add-go.mod-file.patch --- docker.io-20.10.21/debian/patches/libnetwork-add-go.mod-file.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/libnetwork-add-go.mod-file.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,17 @@ +From: Arnaud Rebillout +Date: Tue, 24 Nov 2020 08:46:40 +0700 +Subject: Add go.mod file to libnetwork + +Fix build issue with ++ github.com/godbus/dbus/v5 +--- + go.mod | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 go.mod + +Index: docker/libnetwork/go.mod +=================================================================== +--- /dev/null ++++ docker/libnetwork/go.mod +@@ -0,0 +1 @@ ++module github.com/docker/libnetwork diff -Nru docker.io-20.10.21/debian/patches/libnetwork_proto_no_unrecognized_all.patch docker.io-20.10.24+dfsg1/debian/patches/libnetwork_proto_no_unrecognized_all.patch --- docker.io-20.10.21/debian/patches/libnetwork_proto_no_unrecognized_all.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/libnetwork_proto_no_unrecognized_all.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,23 @@ +Description: Since gogo/protobuf 1.2 unknown fields in proto3 are preserved. + This results in a XXX_unrecognized of type []byte to be created in the struct. + As a side effect the struct can't be used as a map key anymore, resulting in + a libnetwork build failure. + + Fix this by setting goproto_unrecognized_all=false which suppresses this field. + + Upstream doesn't have the problem because they have pinned an older version + of gogo/protobuf: https://github.com/docker/libnetwork/pull/2242 +Author: Felix Geyer + +Index: docker/libnetwork/agent.proto +=================================================================== +--- docker.orig/libnetwork/agent.proto ++++ docker/libnetwork/agent.proto +@@ -10,6 +10,7 @@ option (gogoproto.stringer_all) = true; + option (gogoproto.gostring_all) = true; + option (gogoproto.sizer_all) = true; + option (gogoproto.goproto_stringer_all) = false; ++option (gogoproto.goproto_unrecognized_all) = false; + + // EndpointRecord specifies all the endpoint specific information that + // needs to gossiped to nodes participating in the network. diff -Nru docker.io-20.10.21/debian/patches/libnetwork_proto.patch docker.io-20.10.24+dfsg1/debian/patches/libnetwork_proto.patch --- docker.io-20.10.21/debian/patches/libnetwork_proto.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/libnetwork_proto.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,41 @@ +Last-Update: 2018-06-15 +Forwarded: not-needed +Author: Dmitry Smirnov +Description: fix generation of .pb.go files. + +Index: docker/libnetwork/drivers/overlay/overlay.go +=================================================================== +--- docker.orig/libnetwork/drivers/overlay/overlay.go ++++ docker/libnetwork/drivers/overlay/overlay.go +@@ -1,6 +1,6 @@ + package overlay + +-//go:generate protoc -I.:../../Godeps/_workspace/src/github.com/gogo/protobuf --gogo_out=import_path=github.com/docker/libnetwork/drivers/overlay,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. overlay.proto ++//go:generate protoc -I.:../../../../../github.com/gogo/protobuf --gogo_out=import_path=github.com/docker/libnetwork/drivers/overlay,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. overlay.proto + + import ( + "context" +Index: docker/libnetwork/agent.go +=================================================================== +--- docker.orig/libnetwork/agent.go ++++ docker/libnetwork/agent.go +@@ -1,6 +1,6 @@ + package libnetwork + +-//go:generate protoc -I.:Godeps/_workspace/src/github.com/gogo/protobuf --gogo_out=import_path=github.com/docker/libnetwork,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. agent.proto ++//go:generate protoc -I.:../../../github.com/gogo/protobuf --gogo_out=import_path=github.com/docker/libnetwork,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. agent.proto + + import ( + "encoding/json" +Index: docker/libnetwork/networkdb/networkdb.go +=================================================================== +--- docker.orig/libnetwork/networkdb/networkdb.go ++++ docker/libnetwork/networkdb/networkdb.go +@@ -1,6 +1,6 @@ + package networkdb + +-//go:generate protoc -I.:../vendor/github.com/gogo/protobuf --gogo_out=import_path=github.com/docker/libnetwork/networkdb,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. networkdb.proto ++//go:generate protoc -I.:../../../../github.com/gogo/protobuf --gogo_out=import_path=github.com/docker/libnetwork/networkdb,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. networkdb.proto + + import ( + "context" diff -Nru docker.io-20.10.21/debian/patches/series docker.io-20.10.24+dfsg1/debian/patches/series --- docker.io-20.10.21/debian/patches/series 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/series 2023-06-02 16:06:10.000000000 -0300 @@ -0,0 +1,32 @@ +debian-bash-completion-no-shebang.patch +debian-systemd-unit-tasksmax.patch +# If upstream ever adds EnvFile, remove this patch. +# (see also https://github.com/docker/docker/pull/7220#issuecomment-50076589) +debian-systemd-unit-environment-file.patch +debian-dockerd-binary-location.patch +debian-cgroupfs-mount-convenience-copy.patch +debian-nuke-no-prompt.patch + +cli-add-go.mod-file.patch +cli-dont-duplicate-authconfig.patch + +engine-add-go.mod-file.patch +engine-build-against-containerd-v1.5.2.patch +engine-build-against-runc-1.0.patch +engine-seccomp-mipsx.patch +engine-systemd-service-after-containerd.patch +engine-allow-exclude-unit-test.patch + +libnetwork-add-go.mod-file.patch +libnetwork_proto.patch +libnetwork_proto_no_unrecognized_all.patch + +test--cli-skip-network-tests.patch +test--cli-skip-TestRunLabel.patch +test--cli-skip-TestSignCommandLocalFlag.patch +test--skip-daemon-oci-linux-pbuilder-tests.patch +test--skip-pkg-signal-flaky-tests.patch +test--skip-pkg-system-chtimes-mips64.patch +test--skip-TestGetRootUIDGID.patch +test--skip-TestStateRunStop.patch +avoid-consul.patch diff -Nru docker.io-20.10.21/debian/patches/test--cli-skip-network-tests.patch docker.io-20.10.24+dfsg1/debian/patches/test--cli-skip-network-tests.patch --- docker.io-20.10.21/debian/patches/test--cli-skip-network-tests.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/test--cli-skip-network-tests.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,31 @@ +From: Dmitry Smirnov +Last-Update: 2020-11-27 +Forwarded: not-needed +Description: cli/command: Skip network tests + Interestingly, the last time I tried, only the test + 'TestRunBuildFromGitHubSpecialCase' failed, and it failed only + for the armel architecture. Which makes absolutely no sense, + given that it's supposed to fail when there's no network, and + it should have nothing to do with the architecture. + . + Anyway. Let's disable this test. + . + Build error below: + . + === FAIL: cli/command/image TestRunBuildFromGitHubSpecialCase (0.10s) + Error: unable to prepare context: unable to 'git clone' to temporary context directory: error fetching: fatal: unable to access 'https://github.com/docker/for-win/': Couldn't connect to server + : exit status 128 + build_test.go:136: assertion failed: expected error to contain "docker-build-git", got "unable to prepare context: unable to 'git clone' to temporary context directory: error fetching: fatal: unable to access 'https://github.com/docker/for-win/': Couldn't connect to server\n: exit status 128" + +Index: docker/cli/cli/command/image/build_test.go +=================================================================== +--- docker.orig/cli/cli/command/image/build_test.go ++++ docker/cli/cli/command/image/build_test.go +@@ -125,6 +125,7 @@ COPY data /data + // TODO: test "context selection" logic directly when runBuild is refactored + // to support testing (ex: docker/cli#294) + func TestRunBuildFromGitHubSpecialCase(t *testing.T) { ++t.Skip("DM - disabled due to network access") + defer env.Patch(t, "DOCKER_BUILDKIT", "0")() + cmd := NewBuildCommand(test.NewFakeCli(&fakeClient{})) + // Clone a small repo that exists so git doesn't prompt for credentials diff -Nru docker.io-20.10.21/debian/patches/test--cli-skip-TestRunLabel.patch docker.io-20.10.24+dfsg1/debian/patches/test--cli-skip-TestRunLabel.patch --- docker.io-20.10.21/debian/patches/test--cli-skip-TestRunLabel.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/test--cli-skip-TestRunLabel.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,61 @@ +From: Arnaud Rebillout +Date: Mon, 13 Jul 2020 13:23:32 +0700 +Forwarded: not-needed +Subject: [PATCH] Disable unreliable test, failing randomly on multiple + architectures + +Starting from docker 19.03.12, this test fails on some buildd +architectures. It succeeds on my machine though. + +It *seems* that there is no change between docker 19.03.11 and docker +19.03.12, regarding this part of the code. + +So it could be due to a change in the golang package. docker 19.03.11 +was built with `golang-1.14-src amd64 1.14.4-1`, while 19.03.12 is now +built with `golang-1.14-src amd64 1.14.4-2`. However, looking at the +difference between both, once again there's no significant difference. + +So let's disable this particular test, out of a better solution. + +Buildd logs can be found at: +- https://buildd.debian.org/status/fetch.php?pkg=docker.io&arch=amd64&ver=19.03.12%2Bdfsg1-2&stamp=1594609442&raw=0 +- https://buildd.debian.org/status/fetch.php?pkg=docker.io&arch=arm64&ver=19.03.12%2Bdfsg1-2&stamp=1594609440&raw=0 + +~~~~ + === FAIL: cli/command/container TestRunLabel (unknown) + panic: runtime error: invalid memory address or nil pointer dereference + [signal SIGSEGV: segmentation violation code=0x1 addr=0x28 pc=0xb8c802] + + goroutine 194 [running]: + net/http.(*Client).deadline(0x0, 0x8, 0x14752e5, 0xa) + /usr/lib/go-1.14/src/net/http/client.go:189 +0x22 + net/http.(*Client).do(0x0, 0xc0000f0100, 0x0, 0x0, 0x0) + /usr/lib/go-1.14/src/net/http/client.go:585 +0x2ae + net/http.(*Client).Do(...) + /usr/lib/go-1.14/src/net/http/client.go:567 + github.com/docker/docker/client.(*Client).doRequest(0xc00037af00, 0x16027c0, 0xc00027c180, 0xc0000f0000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, ...) + /<>/.gopath/src/github.com/docker/docker/client/request.go:134 +0x151 + github.com/docker/docker/client.(*Client).sendRequest(0xc00037af00, 0x16027c0, 0xc00027c180, 0x146e9fd, 0x4, 0xc000492000, 0x13, 0xc000067d08, 0x0, 0x0, ...) + /<>/.gopath/src/github.com/docker/docker/client/request.go:122 +0x14e + github.com/docker/docker/client.(*Client).post(0xc00037af00, 0x16027c0, 0xc00027c180, 0xc000492000, 0x13, 0xc000067d08, 0x0, 0x0, 0x0, 0x0, ...) + /<>/.gopath/src/github.com/docker/docker/client/request.go:46 +0x15a + github.com/docker/docker/client.(*Client).ContainerKill(0xc00037af00, 0x16027c0, 0xc00027c180, 0x146e257, 0x2, 0x146e48f, 0x3, 0x0, 0x0) + /<>/.gopath/src/github.com/docker/docker/client/container_kill.go:13 +0x1da + github.com/docker/cli/cli/command/container.ForwardAllSignals.func1(0xc0003d40c0, 0x1614c60, 0xc00000c1e0, 0x16027c0, 0xc00027c180, 0x146e257, 0x2) + /<>/.gopath/src/github.com/docker/cli/cli/command/container/tty.go:120 +0x294 + created by github.com/docker/cli/cli/command/container.ForwardAllSignals + /<>/.gopath/src/github.com/docker/cli/cli/command/container/tty.go:103 +0xb1 +~~~~ + +Index: docker/cli/cli/command/container/run_test.go +=================================================================== +--- docker.orig/cli/cli/command/container/run_test.go ++++ docker/cli/cli/command/container/run_test.go +@@ -15,6 +15,7 @@ import ( + ) + + func TestRunLabel(t *testing.T) { ++ t.Skip("DM - skipping dodgy test") + cli := test.NewFakeCli(&fakeClient{ + createContainerFunc: func(_ *container.Config, _ *container.HostConfig, _ *network.NetworkingConfig, _ *specs.Platform, _ string) (container.ContainerCreateCreatedBody, error) { + return container.ContainerCreateCreatedBody{ diff -Nru docker.io-20.10.21/debian/patches/test--cli-skip-TestSignCommandLocalFlag.patch docker.io-20.10.24+dfsg1/debian/patches/test--cli-skip-TestSignCommandLocalFlag.patch --- docker.io-20.10.21/debian/patches/test--cli-skip-TestSignCommandLocalFlag.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/test--cli-skip-TestSignCommandLocalFlag.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,31 @@ +From: Arnaud Rebillout +Date: Sat, 28 Sep 2019 02:30:56 +0000 +Subject: Skip TestSignCommandLocalFlag + +No idea why this test used to pass before and fails now... + +~~~~ + === RUN TestSignCommandLocalFlag + --- FAIL: TestSignCommandLocalFlag (35.01s) + sign_test.go:307: assertion failed: expected error to contain "error contacting notary server: dial tcp: lookup reg-name.io", + got "Error: error contacting notary server: dial tcp 125.235.4.59:443: i/o timeout" + ... + FAIL github.com/docker/cli/cli/command/trust 49.235s +~~~~ + +Origin: vendor, Debian +Forwarded: not-needed, Debian-specific +Signed-off-by: Arnaud Rebillout + +Index: docker/cli/cli/command/trust/sign_test.go +=================================================================== +--- docker.orig/cli/cli/command/trust/sign_test.go ++++ docker/cli/cli/command/trust/sign_test.go +@@ -274,6 +274,7 @@ func TestSignCommandChangeListIsCleanedO + } + + func TestSignCommandLocalFlag(t *testing.T) { ++ t.Skip("DM - skip test that fails") + cli := test.NewFakeCli(&fakeClient{}) + cli.SetNotaryClient(notaryfake.GetEmptyTargetsNotaryRepository) + cmd := newSignCommand(cli) diff -Nru docker.io-20.10.21/debian/patches/test--skip-daemon-oci-linux-pbuilder-tests.patch docker.io-20.10.24+dfsg1/debian/patches/test--skip-daemon-oci-linux-pbuilder-tests.patch --- docker.io-20.10.21/debian/patches/test--skip-daemon-oci-linux-pbuilder-tests.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/test--skip-daemon-oci-linux-pbuilder-tests.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,18 @@ +From: Arnaud Rebillout +Date: Tue, 1 Dec 2020 10:30:25 +0700 +Subject: Skip test in pbuilder + +Forwarded: not-needed, Debian-specific + +Index: docker/engine/daemon/oci_linux_test.go +=================================================================== +--- docker.orig/engine/daemon/oci_linux_test.go ++++ docker/engine/daemon/oci_linux_test.go +@@ -191,6 +191,7 @@ func TestSysctlOverrideHost(t *testing.T + } + + func TestGetSourceMount(t *testing.T) { ++ skip.If(t, os.Getenv("PBUILDER_OPERATION") != "", "DM - skip test for pbuilder: Can't find mount point of /") + // must be able to find source mount for / + mnt, _, err := getSourceMount("/") + assert.NilError(t, err) diff -Nru docker.io-20.10.21/debian/patches/test--skip-pkg-signal-flaky-tests.patch docker.io-20.10.24+dfsg1/debian/patches/test--skip-pkg-signal-flaky-tests.patch --- docker.io-20.10.21/debian/patches/test--skip-pkg-signal-flaky-tests.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/test--skip-pkg-signal-flaky-tests.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,36 @@ +From: Arnaud Rebillout +Date: Wed, 09 Dec 2020 09:38:34 +0700 +Subject: Skip some pkg/signal linux tests + +Issue mentioned upstream at , +there was a tentative fix at , +but the issue is still present. + + === Failed + === FAIL: pkg/signal TestCatchAll (0.00s) + signal_linux_test.go:32: assertion failed: urgent I/O condition (string) != hangup (string) + signal_linux_test.go:32: assertion failed: hangup (string) != child exited (string) + signal_linux_test.go:32: assertion failed: child exited (string) != illegal instruction (string) + signal_linux_test.go:32: assertion failed: illegal instruction (string) != floating point exception (string) + signal_linux_test.go:32: assertion failed: floating point exception (string) != child exited (string) + +Index: docker/engine/pkg/signal/signal_linux_test.go +=================================================================== +--- docker.orig/engine/pkg/signal/signal_linux_test.go ++++ docker/engine/pkg/signal/signal_linux_test.go +@@ -14,6 +14,7 @@ import ( + ) + + func TestCatchAll(t *testing.T) { ++ t.Skip("DM - Skip flaky test") + sigs := make(chan os.Signal, 1) + CatchAll(sigs) + defer StopCatch(sigs) +@@ -53,6 +54,7 @@ func TestCatchAllIgnoreSigUrg(t *testing + } + + func TestStopCatch(t *testing.T) { ++ t.Skip("DM - Skip flaky test") + signal := SignalMap["HUP"] + channel := make(chan os.Signal, 1) + CatchAll(channel) diff -Nru docker.io-20.10.21/debian/patches/test--skip-pkg-system-chtimes-mips64.patch docker.io-20.10.24+dfsg1/debian/patches/test--skip-pkg-system-chtimes-mips64.patch --- docker.io-20.10.21/debian/patches/test--skip-pkg-system-chtimes-mips64.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/test--skip-pkg-system-chtimes-mips64.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,63 @@ +From: Arnaud Rebillout +Date: Mon, 04 Jan 2021 10:39:35 +0700 +Subject: Skip pkg/system chtimes tests on mips64 + + === RUN TestChtimesLinux + chtimes_linux_test.go:87: Expected: 2262-04-11 23:47:16 +0000 UTC, got: 1990-01-27 10:50:44 +0000 UTC + --- FAIL: TestChtimesLinux (0.00s) + === RUN TestChtimes + chtimes_test.go:92: Expected: 2262-04-11 23:47:16 +0000 UTC, got: 1990-01-27 10:50:44 +0000 UTC + --- FAIL: TestChtimes (0.00s) + +Bug: https://github.com/moby/moby/issues/41850 + +Index: docker/engine/pkg/system/chtimes_linux_test.go +=================================================================== +--- docker.orig/engine/pkg/system/chtimes_linux_test.go ++++ docker/engine/pkg/system/chtimes_linux_test.go +@@ -3,6 +3,8 @@ package system // import "github.com/doc + import ( + "os" + "syscall" ++ "runtime" ++ "strings" + "testing" + "time" + ) +@@ -74,6 +76,11 @@ func TestChtimesLinux(t *testing.T) { + } + + // Test both aTime and mTime set to Unix max time ++ // Doesn't work on mips64, as stat struct has 32-bits types ++ if strings.HasPrefix(runtime.GOARCH, "mips64") { ++ return ++ } ++ + Chtimes(file, unixMaxTime, unixMaxTime) + + f, err = os.Stat(file) +Index: docker/engine/pkg/system/chtimes_test.go +=================================================================== +--- docker.orig/engine/pkg/system/chtimes_test.go ++++ docker/engine/pkg/system/chtimes_test.go +@@ -3,6 +3,8 @@ package system // import "github.com/doc + import ( + "os" + "path/filepath" ++ "runtime" ++ "strings" + "testing" + "time" + ) +@@ -80,6 +82,11 @@ func TestChtimes(t *testing.T) { + } + + // Test both aTime and mTime set to Unix max time ++ // Doesn't work on mips64, as stat struct has 32-bits types ++ if strings.HasPrefix(runtime.GOARCH, "mips64") { ++ return ++ } ++ + Chtimes(file, unixMaxTime, unixMaxTime) + + f, err = os.Stat(file) diff -Nru docker.io-20.10.21/debian/patches/test--skip-TestGetRootUIDGID.patch docker.io-20.10.24+dfsg1/debian/patches/test--skip-TestGetRootUIDGID.patch --- docker.io-20.10.21/debian/patches/test--skip-TestGetRootUIDGID.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/test--skip-TestGetRootUIDGID.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,26 @@ +Last-Update: 2018-06-16 +Forwarded: not-needed +Author: Dmitry Smirnov +Description: disable test failing is sbuild. +~~~~ + 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 +~~~~ + +Index: docker/engine/pkg/idtools/idtools_unix_test.go +=================================================================== +--- docker.orig/engine/pkg/idtools/idtools_unix_test.go ++++ docker/engine/pkg/idtools/idtools_unix_test.go +@@ -267,6 +267,7 @@ dockremap:231072:65536` + } + + func TestGetRootUIDGID(t *testing.T) { ++t.Skip("DM - skipping malfunctioning test, fails on sbuild") + uidMap := []IDMap{ + { + ContainerID: 0, diff -Nru docker.io-20.10.21/debian/patches/test--skip-TestStateRunStop.patch docker.io-20.10.24+dfsg1/debian/patches/test--skip-TestStateRunStop.patch --- docker.io-20.10.21/debian/patches/test--skip-TestStateRunStop.patch 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/patches/test--skip-TestStateRunStop.patch 2023-04-05 12:19:59.000000000 -0300 @@ -0,0 +1,20 @@ +Last-Update: 2018-08-02 +Forwarded: not-needed +Author: Dmitry Smirnov +Description: disabled unreliable test. +~~~~ + state_test.go:102: ExitCode -1, expected 2, err "context deadline exceeded" +~~~~ + +Index: docker/engine/container/state_test.go +=================================================================== +--- docker.orig/engine/container/state_test.go ++++ docker/engine/container/state_test.go +@@ -29,6 +29,7 @@ func TestIsValidHealthString(t *testing. + } + + func TestStateRunStop(t *testing.T) { ++t.Skip("DM - disabled unreliable test") + s := NewState() + + // Begin another wait with WaitConditionRemoved. It should complete diff -Nru docker.io-20.10.21/debian/README.Debian docker.io-20.10.24+dfsg1/debian/README.Debian --- docker.io-20.10.21/debian/README.Debian 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/README.Debian 2023-01-14 05:55:59.000000000 -0300 @@ -1,6 +1,14 @@ Docker on Debian ================ +Please refer to upstream's documentation for information about what Docker is, +how it works, and how to use it: https://docs.docker.com/ + +The following notes are things that may have impact specifically to use of the +Docker package in Debian. + +--- + To enable docker memory limitation, the kernel needs to be loaded with boot parameters: cgroup_enable=memory swapaccount=1. @@ -17,6 +25,7 @@ Then run update-grub, and reboot. +--- It's worth pointing out that upstream maintains a "check-config.sh" script for verifying not only proper kernel configuration (which isn't terribly relevant in @@ -29,13 +38,14 @@ "/usr/share/docker.io/contrib/check-config.sh", which when run (does NOT require root/sudo) will report on problems with your installation/configuration. +--- As noted in the upstream documentation (https://docs.docker.io), Docker will allow non-root users in the "docker" group to access "docker.sock" and thus communicate with the daemon. To add yourself to the "docker" group, use something like: -adduser YOURUSER docker + adduser YOURUSER docker As also noted in the upstream documentation, the "docker" group (and any other means of accessing the Docker API) is root-equivalent. If you don't trust a @@ -45,3 +55,34 @@ upstream documentation: https://docs.docker.com/engine/security/security/ + +--- + + rpc error: code = 2 desc = "oci runtime error: could not synchronise with + container process: no subsystem for mount" + +This message is very likely related to https://bugs.debian.org/843530, and thus +https://github.com/opencontainers/runc/issues/1175. + +Adding "systemd.legacy_systemd_cgroup_controller=yes" to your system boot +parameters (in Grub, etc) is probably necessary to resolve it. + +--- + +## Restart dilemma + +Restarting Docker daemon terminates all running containers. Therefore +automatic restart is not an option as containers may be killed during +unattended upgrade, etc. + +This is Docker's design flaw and upstream gave up on idea of restoring +state of running containers on upgrade, bluntly stating "You must stop all +containers and plugins BEFORE upgrading" in release notes. + +** "rkt" container runtime is free from that flaw. ** + +Not restarting Docker daemon on upgrade can make CLI unusable until daemon +restart due to mismatch between CLI and running Daemon versions. + +Fortunately recommended "needrestart" package show interactive prompt to +restart Docker daemon after upgrade. diff -Nru docker.io-20.10.21/debian/README.source docker.io-20.10.24+dfsg1/debian/README.source --- docker.io-20.10.21/debian/README.source 1969-12-31 21:00:00.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/README.source 2023-01-14 05:55:59.000000000 -0300 @@ -0,0 +1,275 @@ +## Package build instructions + +Get the various orig tarballs and unpack it: + + origtargz --unpack + +Build the package with your favorite build tool, eg: + + # pbuilder + debuild + pdebuild + # sbuild + sbuild + +Build the package in a docker container: + + # Build a docker image that contains the build dependencies, + # according to the file debian/control. + ./debian/helpers/docker.sh build + # Build the package as normal user + ./debian/helpers/docker.sh run-user dpkg-buildpackage -us -uc + # Build the package as root (to run more tests) + ./debian/helpers/docker.sh run-root dpkg-buildpackage -us -uc + +Build a source package on your machine: + + dpkg-buildpackage -dS + +Cleanup: + + # Remove all non-debian files + origtargz --clean + # Remove all non-versioned files and hard-reset + git clean -dfx && git reset --hard + + +## Package update instructions + +Update the version in 'debian/changelog': + + V=20.10.0 + dch --newversion ${V:?}+dfsg1-1 "New upstream release [${V:?}]" + +Add git commits corresponding to the new version in the files: + + vi -O debian/helpers/{cli,engine}-gitcommits + +Run uscan as such: + + uscan -v -dd --download-current-version 2>&1 | tee uscan-logs + +Show which Files-Excluded patterns appear to be useless: + + ./debian/helpers/uscan-summary.sh < uscan-logs + +Remove those from Files-Excluded and Build-Depends. + + vi -O debian/{control,copyright} + +Unpack the orig tarballs: + + origtargz --unpack + +Check the global vendor tree: + + ./debian/helpers/ls-vendor.sh + +Add unwanted items in Files-Excluded: + + vi debian/copyright + +Cleanup, run uscan again. Then fix the build. + + +## Multiple Upstream Tarballs (MUT) + +Overview: + +- `d/watch`: ask uscan to invoke the script `debian/get-orig-source.sh`. +- `d/get-orig-source.sh`: this is where are listed all the orig tarballs that + need to be downloaded, and where the job is done (download and repack). +- `d/rules`: the various components are explicitly handled here. + +In `d/rules`, you will find that there are two ways to build components: + +- `DH_GOPKG=component dh_auto_build` leads to a standard, full build of + the component. It builds all the package directories found (think `go + list component/...`) +- `DH_GOLANG_BUILDPKG=component dh_auto_build` only builds the main package. + +A full build (using `DH_GOPKG=...`) is definitely needed for components that +produce a binary (ie. libnetwork). But for components that are only used as +build dependencies of docker (ie. swarmkit), a full build is not mandatory, +we can simply run `DH_GOLANG_BUILDPKG=...`. It will at least attempt to build +the main package. + +Attempting to build every component fully with `DH_GOPKG=...` is actually time +consuming, and in the end not very productive. For build-deps, only some parts +of the code are used by docker during the build, so there's no need to spend +time fixing FTBFS in parts of the code that are not used anyway. + + + +## "stable" versus "edge" releases + +As per [1], starting with Docker 18.09, CE "stable" releases will be +supported for 7 months. See [2] for details. + +This package should only ever ship "stable" Community Edition (CE) +releases. + +Docker version numbers are derived from date, e.g. `date +%g.%m`. + +The every-month releases are "edge" (17.04, 17.05, etc), are only supported +for the duration of their release month. Stable releases have longer +support cycles. Monthly "Edge" releases should be avoided. + +[1]: https://docs.docker.com/install/ +[2]: https://docs.docker.com/release-notes/docker-ce/ + + +## Incompetent upstream release process + +Upstream is notorious for incredibly sloppy versioning. Docker components +are inconsistently versioned; don't depend on same version of common +libraries and different revisions of dependency libraries are privately +vendored. Basically upstream couldn't care less about consistent, semantic +versioning and re-usable components. Shameful abomination of good software +development practices... :( + +**An overview of the various docker repositories** + +Some repositories used to release on a regular basis, then stopped: + + * https://github.com/moby/moby : last release on Jun 28, 2017 + * https://github.com/docker/distribution: last release on Jul 21, 2017 + * https://github.com/docker/libnetwork : last release on May 8, 2016 + +This seem to be due to the split between Moby and Docker, although it is highly +undocumented. For the Moby repository, you have to dig up this kind of thread: +"https://github.com/moby/moby/issues/33951#issuecomment-312995683" + +Some repositories never really had any releases: + + * https://github.com/docker/cli + * https://github.com/docker/go-events + * https://github.com/docker/swarmkit + +**The docker-ce super repository** + +docker-ce is the super repository from where Docker Community Edition is +produced, and this is where things get messy. + +Basically this is where the code from the docker engine (github.com/moby/moby) +docker client (github.com/docker/cli) is pulled together. But how? Looking at +the git history, we can see cherry-picked commits, merge requests, standalone +commits, and probably other things... In the end, when a docker-ce version is +released, it doesn't seem to correspond to a particular commit of moby/moby or +docker/cli. + +At some point I thought we should ignore docker-ce, and instead package +moby/moby and docker/cli separately. But because of the workflow described +above, I now think it's a very bad idea. We have no idea of which version of +moby/moby and docker/cli work together (no semantic versions), and we can't +really find this information from a tag in docker-ce. + +So we'd better package docker-ce instead. + +See https://github.com/moby/moby/issues/38063#issuecomment-431324613 +for details. + + +**Docker-ce releases** + +Upstream tags releases in "github.com/docker/docker-ce" and we have to ship +matching bundle of Docker engine, and Docker CLI from that repository. + +Docker-ce releases monthly, with a 2 or 3 release candidates before the +final release. Other than quarterly "stable" releases there doesn't seem to +be any long-term releases. The fact that there are release candidates +probably indicates that bugs are reported, test suites are run, and things +are fixed between various rc (hopefully). + +On top of that Docker depends on very particular commits of + + * github.com/containerd/containerd + * github.com/docker/libnetwork + * github.com/docker/swarmkit + +None of the above repositories have relevant tags. + +**Docker code base is spread among several name spaces.** + +We've made a mistake trying to treat it as several reusable components. + +Upstream abuse of versioning practices is a shameful and incompetent +disgrace. Docker people, if you are reading this I hope you feel sorry. +I, Dmitry Smirnov , find it difficult to politely +express how much I despise your release process. + + +## Circular dependencies + +Let me explain practical problem with dependencies. Docker and Libnetwork +both depend on each other and on "sirupsen/logrus". When in the 2018 the +latter exhibited minor/trivial problem I could not upload neither Docker +nor Libnetwork because each FTBFS in the "other" dependency. That's why +starting with 17.12.1 libnetwork has been incorporated into "docker.io". + + +## Docker package vendoring policy + +As highlighted above, it is unsustainable and impractical to package +individual Docker "components". Many libraries of Docker name space are +only ever used by Docker and depend on "github.com/docker/docker" which +makes them part of Docker code base. + +Combined with upstream resistance to good versioning practices, we have to +ship Docker bundle producing (only) reusable package from multi upstream +tarball (MUT) source package. + +Some vendored microlibraries, unless semantically versioned, are not +worth to be introduced as standalone source package. + +Therefore "docker.io" source package will ship all essential Docker +dependencies to avoid circular dependencies. Main criteria for inclusion of +a dependency library into "docker.io" source package is dependency on +"github.com/docker/docker". Additional criteria is assessment whether +Docker dependency is reusable (e.g. semantically versioned and used by +other packages). Age of tags is to be considered as Docker team stopped +tagging most of their dependencies in favour of vendoring them by some +random commit. + + +## Bundled versus external libraries + +### runc + +We should make an effort to use "runc" package which no longer depends on +Docker since 1.0.0~rc5 (no circular/mutual dependency). runc upstream is +tagging releases so it satisfies non-bundling criteria mentioned above. + +In 2017 all reverse build-deps of runc-dev were broken when Balint Reczey + forked "runc" source package as "docker-runc" +versioned to match Docker expectations. +New package "golang-github-opencontainers-docker-runc-dev" had explicit +Conflits with "golang-github-opencontainers-runc-dev" effectively hijacking +runc because all packages depending on runc-dev also depend on docker-dev +(which depends on docker-runc-dev) hence runc-dev could not be installed +together with docker-runc-dev. Maintainer of reverse runc-dev build-deps +was very unhappy... + +Let me stress it again: Docker should not hijack runc's name space +"github.com/opencontainers/runc". Docker's fork of the latter have its +own name space: "github.com/docker/runc". + +In the unfortunate situation if we ever have to use bundled runc in Docker, +we should NOT provide docker-runc-dev package ever again (or at least avoid +Conflicts with runc-dev at all costs). I suggest testing runc package for +run-time compatibility with Docker. That works well with Docker 17.12.1. + +Do not be mislead by particular (random) RUNC_COMMIT that Docker expects +(e.g. `docker info`, "engine/vendor.conf") - we can/should not comply with +upstream's systematic abuse of versioning. + +Perhaps expected commits are not to be trusted at all: for instance in +17.12.1, CONTAINERD_COMMIT in "engine/hack/dockerfile/binaries-commits" +does not match any of containerd commits in "engine/vendor.conf". + + +## Notable upstream bugs + + https://github.com/moby/moby/issues/37272 + https://github.com/docker/distribution/issues/2623 + https://github.com/docker/distribution/issues/2609 + https://github.com/moby/moby/issues/37930 diff -Nru docker.io-20.10.21/debian/rules docker.io-20.10.24+dfsg1/debian/rules --- docker.io-20.10.21/debian/rules 2023-02-23 16:29:50.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/rules 2023-06-02 16:06:10.000000000 -0300 @@ -1,133 +1,163 @@ #!/usr/bin/make -f # -*- makefile -*- -include /usr/share/dpkg/pkg-info.mk +include /usr/share/dpkg/default.mk -export VERSION := $(DEB_VERSION_UPSTREAM) +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -export DOCKER_GITCOMMIT := $(DEB_VERSION) +# The engine is built and tested using upstream scripts +# and Makefiles, rather than dh_auto_*. Therefore we can't rely +# on dh to set the environment for us, we have to do it here. +export GOPATH := $(CURDIR)/_build +export GOCACHE := $(GOPATH)/go-build +export GO111MODULE := off +export GOPROXY := off + +#export DH_GOLANG_BUILDPKG := github.com/docker/docker github.com/docker/cli +export DH_GOLANG_GO_GENERATE := 1 +export DH_GOLANG_INSTALL_ALL := 1 +export DH_GOLANG_INSTALL_EXTRA := testdata/ +export DH_GOLANG_EXCLUDES := \ + integration-cli \ + overlay_test \ + vendor + +# Package names +CLI_PKG := github.com/docker/cli +ENGINE_PKG := github.com/docker/docker +LIBNETWORK_PKG := github.com/docker/libnetwork +SWARMKIT_PKG := github.com/docker/swarmkit + +# Version and commits +DOCKER_VERSION := $(DEB_VERSION_UPSTREAM) +ENGINE_GITCOMMIT := $(shell ./debian/helpers/gitcommit.sh engine $(DOCKER_VERSION)) +ifndef ENGINE_GITCOMMIT + $(error Missing ENGINE_GITCOMMIT - see debian/helpers/engine-gitcommits) +endif +CLI_GITCOMMIT := $(shell ./debian/helpers/gitcommit.sh cli $(DOCKER_VERSION)) +ifndef CLI_GITCOMMIT + $(error Missing CLI_GITCOMMIT - see debian/helpers/cli-gitcommits) +endif -# temporary build path (see http://golang.org/doc/code.html#GOPATH) -OUR_GOPATH := $(CURDIR)/.gopath -export GOPATH := $(OUR_GOPATH) -export GOCACHE := $(CURDIR)/.gocache +# Cf. scripts/build/binary scripts/build/.variables +CLI_BUILDTIME := $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" +"%Y-%m-%dT%H:%M:%SZ") +CLI_BUILDTAGS := pkcs11 +CLI_LDFLAGS += -X $(CLI_PKG)/cli/version.BuildTime=$(CLI_BUILDTIME) +CLI_LDFLAGS += -X $(CLI_PKG)/cli/version.GitCommit=$(CLI_GITCOMMIT) +CLI_LDFLAGS += -X $(CLI_PKG)/cli/version.Version=$(DOCKER_VERSION) +ifeq (,$(filter $(DEB_BUILD_ARCH), mipsel mips64el)) +CLI_BUILDMODE := -buildmode=pie +endif -# https://blog.golang.org/go116-module-changes (TODO figure out a new solution for Go 1.17+) -export GO111MODULE := auto +# engine: have "make.sh" keep "bundle/$(DOCKER_VERSION)" around between runs +# (we clean it up appropriately ourselves) +ENGINE_KEEPBUNDLE := 1 -# AppArmor can be optionally used in Debian and is there by default in Ubuntu, so we need support for it compiled into our binary -# same story with SELinux -export DOCKER_BUILDTAGS := apparmor seccomp selinux +ENGINE_BUILDTAGS := apparmor seccomp +ENGINE_TESTFLAGS := -test.short -ifneq (,$(filter parallel=%, $(DEB_BUILD_OPTIONS))) - NUMJOBS := $(patsubst parallel=%, %, $(filter parallel=%, $(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j '$(NUMJOBS)' -endif +BUILT_LIBC := $(shell dpkg-query -f '$${source:Package} (= $${source:Version})' -W libc-dev-bin) -override_dh_gencontrol: - # if we're on Ubuntu, we need to Recommends: apparmor - echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker.io.substvars - echo 'libc:Built-Using=$(shell dpkg-query -f '$${source:Package} (= $${source:Version})' -W libc-dev-bin)' >> debian/docker.io.substvars - # use "dh_golang" to generate "misc:Built-Using" (via "go list") - DH_GOLANG_BUILDPKG=' \ - -tags "$(DOCKER_BUILDTAGS)" \ - github.com/docker/docker/cmd/dockerd \ - github.com/docker/cli/cmd/docker \ - github.com/docker/libnetwork/cmd/proxy \ - ' dh_golang --builddirectory='$(OUR_GOPATH:$(CURDIR)/%=%)' - dh_gencontrol +%: + dh $@ --buildsystem=golang --with=bash-completion,golang --builddirectory=_build + +override_dh_golang: +## Set DH_GOLANG_BUILDPKG so that Built-Using is properly generated. + DH_GOLANG_BUILDPKG="$(CLI_PKG)/... $(ENGINE_PKG)/... $(LIBNETWORK_PKG)/... $(SWARMKIT_PKG)/..." \ + dh_golang -O--buildsystem=golang -O--builddirectory=_build + +override_dh_clean: + dh_clean + $(RM) -v -r autogen bundles man/man*/ +# -find . -type f -name '*.pb.go' -delete -printf 'removed %p\n' ## delete generated .pb.go files + ## Remove Files-Excluded (when built from checkout or non-DFSG tarball): + $(RM) -rv `perl -0nE 'say grep { $$_=q{ */}.$$_ } split(/\s+/,$$1) if m{^Files\-Excluded:\s*(.*?)(?:\n\n|^Files|^Comment:)}sm;' debian/copyright` + -find */vendor -mindepth 1 -type d -empty -delete -printf 'removed %p\n' override_dh_auto_configure: - # set up GOPATH symlink farm - # libnetwork - mkdir -p '$(OUR_GOPATH)/src/github.com/docker' - ln -sfT '$(CURDIR)/libnetwork' '$(OUR_GOPATH)/src/github.com/docker/libnetwork' - # cli - mkdir -p '$(OUR_GOPATH)/src/github.com/docker' - ln -sfT '$(CURDIR)/cli' '$(OUR_GOPATH)/src/github.com/docker/cli' - # engine - mkdir -p '$(OUR_GOPATH)/src/github.com/docker' - ln -sfT '$(CURDIR)/engine' '$(OUR_GOPATH)/src/github.com/docker/docker' - -override_dh_auto_build: _build-tini _build-proxy _build-cli _build-manpages _build-engine - @# - -# several "supporting binaries" need to be built and installed -# (https://github.com/docker/docker-ce/tree/v19.03.6/components/engine/hack/dockerfile/install) - -_build-tini: # (docker-init) - mkdir -p tini/build - cd tini/build \ - && cmake .. \ - && make tini-static - -_build-proxy: # (from libnetwork) - go build -o libnetwork/docker-proxy github.com/docker/libnetwork/cmd/proxy - -_build-cli: - DISABLE_WARN_OUTSIDE_CONTAINER=1 \ - make -C cli \ - LDFLAGS='' \ - VERSION='$(VERSION)' \ - GITCOMMIT='$(DOCKER_GITCOMMIT)' \ - dynbinary - -# https://github.com/docker/docker-ce/blob/v19.03.6/components/cli/scripts/docs/generate-man.sh -# (replacing hard-coded "/tmp/gen-manpages" with "debian/tmp/gen-manpages") -_build-manpages: - cd '$(OUR_GOPATH)/src/github.com/docker/cli' \ - && export PATH='$(OUR_GOPATH)/bin':"$$PATH" \ - && sed 's!/tmp/gen-manpages!$(CURDIR)/debian/tmp/gen-manpages!g' scripts/docs/generate-man.sh \ - && sed 's!/go/bin/go-md2man!$(OUR_GOPATH)/bin/go-md2man!g' scripts/docs/generate-man.sh \ - | bash - -_build-engine: - cd engine \ - && PRODUCT=docker ./hack/make.sh dynbinary +## dh_auto_configure symlinks dirs from "/usr/share/gocode/src" into +## $(GOPATH) unless folders already exist there in which case files +## are copied. Pre-making directories allows us to use debhelper to +## create proper GOPATH source tree yet have certain directories writable +## even if they are provided by already installed package. + mkdir -pv $(GOPATH)/src/$(CLI_PKG) + mkdir -pv $(GOPATH)/src/$(ENGINE_PKG) + mkdir -pv $(GOPATH)/src/$(LIBNETWORK_PKG) + mkdir -pv $(GOPATH)/src/$(SWARMKIT_PKG) + +## Prepare builddirectory but throw away sourcedirectory. + DH_GOPKG="__IGNORE__" dh_auto_configure + +## Each package must be removed from working tree first, in case some +## of the packages that we are going to build are already installed. +## This is also useful for building in unclean environment. +## +## This is _necessary_ to avoid merging packages that we build with +## pre-installed packages. See #827226 for details. +## Debhelper knows only about "main" DH_GOPKG package but we build several +## and we have to ensure that build tree is properly prepared. + $(RM) -r $(GOPATH)/src/$(CLI_PKG) + cp -ra cli $(GOPATH)/src/$(CLI_PKG) + $(RM) -r $(GOPATH)/src/$(ENGINE_PKG) + cp -ra engine $(GOPATH)/src/$(ENGINE_PKG) + $(RM) -r $(GOPATH)/src/$(LIBNETWORK_PKG) + cp -ra libnetwork $(GOPATH)/src/$(LIBNETWORK_PKG) + $(RM) -r $(GOPATH)/src/$(SWARMKIT_PKG) + cp -ra swarmkit $(GOPATH)/src/$(SWARMKIT_PKG) + +override_dh_auto_build: +## Order is important: + + DH_GOPKG=$(LIBNETWORK_PKG) dh_auto_build -v + +## ## FIXME: DH_GOLANG_BUILDPKG --> DH_GOPKG + DH_GOLANG_BUILDPKG=$(SWARMKIT_PKG) dh_auto_build -v + +## build ("cd" first to ensure we build from within GOPATH) + cd $(GOPATH)/src/$(ENGINE_PKG) \ + && KEEPBUNDLE=$(ENGINE_KEEPBUNDLE) VERSION=$(DOCKER_VERSION) DOCKER_BUILDTAGS='$(ENGINE_BUILDTAGS)' \ + DOCKER_GITCOMMIT=$(ENGINE_GITCOMMIT) PRODUCT=docker ./hack/make.sh dynbinary + + DH_GOPKG=$(CLI_PKG) DH_GOLANG_BUILDPKG=$(CLI_PKG)/cmd/docker \ + dh_auto_build -v -- -tags '$(CLI_BUILDTAGS)' -ldflags '$(CLI_LDFLAGS)' $(CLI_BUILDMODE) + cd $(GOPATH)/src/$(CLI_PKG) && ./scripts/docs/generate-man.sh -# basic smoke test to ensure binaries built successfully -# (especially since their actual tests are *really* involved) override_dh_auto_test: - # tini - ./tini/build/tini-static --version - # cli - ./cli/build/docker --version - # engine - ./engine/bundles/dynbinary-daemon/dockerd --version +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + ## Test engine: + cd $(GOPATH)/src/$(ENGINE_PKG) \ + && TESTFLAGS='$(ENGINE_TESTFLAGS)' \ + exclude_paths='|/daemon/graphdriver/aufs' ./hack/test/unit + + ## Test CLI: + cd $(GOPATH)/src/$(CLI_PKG) \ + && DISABLE_WARN_OUTSIDE_CONTAINER=1 $(MAKE) test-unit +endif -override_dh_strip: - # Go has lots of problems with stripping, so just don't +override_dh_install: + ## Rename binaries + cd $(GOPATH)/src/$(ENGINE_PKG)/bundles/dynbinary-daemon \ + && mv dockerd-$(DOCKER_VERSION) dockerd + cd $(GOPATH)/bin \ + && mv proxy docker-proxy + ## Do not install extra license files: + dh_install -XLICENSE override_dh_auto_install: - # we use dh_install / dh-exec for installing files where they need to be + ## skip dh_auto_install to stop dh_golang trying to copy bits + ## for /usr/share/gocode (we use dh_install for that) -# "--no-start" because we have a debconf prompt to determine whether to restart during upgrades -# (which means we get to handle both "start" and "stop" ourselves too) override_dh_installinit: - dh_installinit --name=docker --no-start + dh_installinit -v --name=docker --no-stop-on-upgrade --no-restart-after-upgrade override_dh_installsystemd: - # We take care of determining whether the docker.io service should be - # restarted during upgrades or not ourselves, based on the debconf - # choice made by the user during installation. For this reason, we - # invoke dh_installsystemd with "--no-stop-on-upgrade" in order - # to avoid indiscriminately stopping the service during upgrades. - dh_installsystemd --name=docker --no-start -pdocker.io --no-stop-on-upgrade docker.service - dh_installsystemd --name=docker --no-start -pdocker.io --no-stop-on-upgrade docker.socket + dh_installsystemd -v --name=docker --no-stop-on-upgrade --no-restart-after-upgrade override_dh_installudev: # use priority z80 to match the upstream priority of 80 - dh_installudev --priority=z80 - -override_dh_install: - dh_install - dh_apparmor --profile-name=docker.io -pdocker.io - -override_dh_shlibdeps: - dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info + dh_installudev -v --name=docker --priority=z80 -override_dh_auto_clean: - @# stop debhelper from doing "make clean" - -%: - dh $@ --with=bash-completion +override_dh_gencontrol: + echo 'libc:Built-Using=$(BUILT_LIBC)' >> debian/docker.io.substvars + dh_gencontrol diff -Nru docker.io-20.10.21/debian/source/options docker.io-20.10.24+dfsg1/debian/source/options --- docker.io-20.10.21/debian/source/options 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/source/options 1969-12-31 21:00:00.000000000 -0300 @@ -1 +0,0 @@ -create-empty-orig diff -Nru docker.io-20.10.21/debian/tests/basic-smoke docker.io-20.10.24+dfsg1/debian/tests/basic-smoke --- docker.io-20.10.21/debian/tests/basic-smoke 2023-02-15 12:08:59.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/tests/basic-smoke 2023-01-14 05:55:59.000000000 -0300 @@ -1,19 +1,46 @@ #!/bin/bash -. debian/tests/common +set -eux +set -o pipefail -defer 'journalctl -u docker | tail' +DEBOOTSTRAP_SUITE=bullseye + + +## exit helpers + +exit_traps=( 'true' ) + +defer() { + exit_traps=( "$@" "${exit_traps[@]}" ) +} + +do_exit() { + for exit_trap in "${exit_traps[@]}"; do + eval "$exit_trap" || true + done +} + +trap 'do_exit' EXIT + + +## main + +systemctl start docker +defer 'systemctl stop docker' +defer 'journalctl -u docker | tail -n 100' -# make sure Docker itself is working before we go too deep down the rabbit hole docker version +tmpdir="$(mktemp -d)" +defer "rm -rf '$tmpdir'" + debootstrap \ --variant=minbase \ - stable \ - "$tempDir" \ - http://httpredir.debian.org/debian + $DEBOOTSTRAP_SUITE \ + "$tmpdir" \ + http://deb.debian.org/debian -tar -cC "$tempDir" . | docker import - debian +tar -cC "$tmpdir" . | docker import - debian defer 'docker rmi debian' docker run --name test debian true diff -Nru docker.io-20.10.21/debian/tests/common docker.io-20.10.24+dfsg1/debian/tests/common --- docker.io-20.10.21/debian/tests/common 2023-01-03 15:47:06.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/tests/common 1969-12-31 21:00:00.000000000 -0300 @@ -1,16 +0,0 @@ -set -eux -set -o pipefail - -exitTraps=( 'true' ) -doExit() { - for exitTrap in "${exitTraps[@]}"; do - eval "$exitTrap" || true - done -} -trap 'doExit' EXIT -defer() { - exitTraps=( "$@" "${exitTraps[@]}" ) -} - -tempDir="$(mktemp -d)" -defer "rm -rf '$tempDir'" diff -Nru docker.io-20.10.21/debian/tests/control docker.io-20.10.24+dfsg1/debian/tests/control --- docker.io-20.10.21/debian/tests/control 2023-02-23 16:29:50.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/tests/control 2023-01-14 05:55:59.000000000 -0300 @@ -1,10 +1,6 @@ Tests: basic-smoke -Depends: debian-archive-keyring, debootstrap, @ -Restrictions: allow-stderr isolation-machine needs-root - -Tests: docker-in-lxd -Depends: dctrl-tools, snapd -Restrictions: allow-stderr isolation-machine needs-root +Depends: debian-archive-keyring, debootstrap, docker.io +Restrictions: allow-stderr, needs-root, needs-internet, isolation-container, flaky #Tests: integration #Depends: ca-certificates, curl, git, golang-check.v1-dev, jq, @, @builddeps@ diff -Nru docker.io-20.10.21/debian/tests/docker-in-lxd docker.io-20.10.24+dfsg1/debian/tests/docker-in-lxd --- docker.io-20.10.21/debian/tests/docker-in-lxd 2023-02-28 09:17:52.000000000 -0300 +++ docker.io-20.10.24+dfsg1/debian/tests/docker-in-lxd 1969-12-31 21:00:00.000000000 -0300 @@ -1,227 +0,0 @@ -#!/bin/bash - -. debian/tests/common - -arch=$(dpkg --print-architecture) -release=$(lsb_release -rs) -suite=$(lsb_release -cs) - -if [ "$arch" = "i386" -a "$release" \> "19.04" ]; then - exit 0 -fi - -# lxd is not available as a .deb anymore -snap install lxd - -# This stolen from lxd's debconf magic. -random_ipv4() { - while :; do - SUBNET="10.$(shuf -i 1-255 -n 1).$(shuf -i 0-255 -n 1)" - - # Check if well known - if [ "${SUBNET}" = "10.10.10" ]; then - continue - fi - - # Check if used locally - if ip -4 route show | grep -q ${SUBNET}; then - continue - fi - - # Attempt to see if used behind the gateway - if ping -n -q ${SUBNET}.1 -c 1 -W 1 >/dev/null 2>&1; then - continue - fi - - if ping -n -q ${SUBNET}.254 -c 1 -W 1 >/dev/null 2>&1; then - continue - fi - - break - done - - echo ${SUBNET} -} - -# Detect LXD API extensions -lxd_extension() { - lxc info | grep -q "^\- ${1}$" -} - -# Copy the local apt package archive over to the lxd container. -# This function assumes that the container is named "docker". -copy_local_apt_files() { - for local_source in $(apt-get indextargets | grep-dctrl -F URI -e '^file:/' -sURI); do - local_source=${local_source#file:} - local_dir=$(dirname "${local_source}") - lxc exec docker -- mkdir -p "${local_dir}" - tar -cC "${local_dir}" . | lxc exec docker -- tar -xC "${local_dir}" - done -} - -time lxd waitready --timeout 600 - -# Attempt to auto-configure ipv4, but only when really running under -# autopkgtest. -if [ -n "${AUTOPKGTEST_TMP:-}" ]; then - lxd init --auto - if lxd_extension "network"; then - if ! lxc profile device list default | grep -q eth0; then - lxc network create adt-br0 - lxc network attach-profile adt-br0 default eth0 - fi - else - sleep 10 - systemctl stop lxd-bridge - SUBNET=$(random_ipv4) - cat < /etc/default/lxd-bridge -USE_LXD_BRIDGE="true" -LXD_BRIDGE="lxdbr0" -UPDATE_PROFILE="true" -LXD_IPV4_ADDR="${SUBNET}.1" -LXD_IPV4_NETMASK="255.255.255.0" -LXD_IPV4_NETWORK="${SUBNET}.1/24" -LXD_IPV4_DHCP_RANGE="${SUBNET}.2,${SUBNET}.254" -LXD_IPV4_DHCP_MAX="252" -LXD_IPV4_NAT="true" -LXD_IPV6_ADDR="" -LXD_IPV6_MASK="" -LXD_IPV6_NETWORK="" -LXD_IPV6_NAT="false" -LXD_IPV6_PROXY="false" -EOF - systemctl start lxd-bridge - fi -fi - -if [ -n "${http_proxy:-}" ]; then - lxc config set core.proxy_http $http_proxy -fi -if [ -n "${https_proxy:-}" ]; then - lxc config set core.proxy_https $https_proxy -fi -if [ -n "${noproxy:-}" ]; then - lxc config set core.proxy_ignore_hosts $noproxy -fi - -# Follow the official tutorial on how to run docker inside lxd containers -# https://ubuntu.com/tutorials/how-to-run-docker-inside-lxd-containers -lxc storage create docker-storage btrfs -lxc storage volume create docker-storage docker-vol -lxc launch ubuntu-daily:${suite}/${arch} docker -c security.nesting=true -c security.syscalls.intercept.mknod=true -c security.syscalls.intercept.setxattr=true -lxc storage volume attach docker-storage docker-vol docker /var/lib/docker - -defer 'lxc delete --force docker' - -# autopkgtest will have done some complicated things to ensure that "apt -# install docker.io" installs the version that should be tested in the -# host. But we want to test that version of docker in the container, so -# replace the entire apt configuration of the container with that of the host -# (after waiting for cloud-init to avoid racing with its attempts to rewrite -# the apt config). -lxc exec docker -- cloud-init status --wait -lxc exec docker -- rm -rf /etc/apt -lxc exec docker -- mkdir /etc/apt -tar -cC /etc/apt . | lxc exec docker -- tar -xC /etc/apt - -copy_local_apt_files - -if [ -n "${http_proxy:-}" ]; then - lxc exec docker -- mkdir -p /etc/systemd/system/docker.service.d - cat <