runc (1.0.0~rc10+dfsg1-1) unstable; urgency=medium
authorDmitry Smirnov <onlyjob@debian.org>
Sun, 26 Jan 2020 09:24:01 +0000 (09:24 +0000)
committerDmitry Smirnov <onlyjob@debian.org>
Sun, 26 Jan 2020 09:24:01 +0000 (09:24 +0000)
  * New upstream release.
    + fixed CVE-2019-19921.
  * Un-vendored "golang-github-checkpoint-restore-go-criu-dev".
  * Build-Depends += "golang-golang-x-tools".
  * Standards-Version: 4.5.0.

[dgit import unpatched runc 1.0.0~rc10+dfsg1-1]

19 files changed:
1  2 
debian/changelog
debian/clean
debian/control
debian/copyright
debian/gbp.conf
debian/gitlab-ci.yml
debian/golang-github-opencontainers-runc-dev.install
debian/patches/series
debian/patches/test--fix_TestGetAdditionalGroups.patch
debian/patches/test--skip-Hugetlb.patch
debian/patches/test--skip_TestFactoryNewTmpfs.patch
debian/rules
debian/runc.docs
debian/runc.install
debian/runc.lintian-overrides
debian/runc.manpages
debian/source/format
debian/source/lintian-overrides
debian/watch

index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..fb96bf47b7140c23588f783e85ce8570880da5d4
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,293 @@@
++runc (1.0.0~rc10+dfsg1-1) unstable; urgency=medium
++
++  * New upstream release.
++    + fixed CVE-2019-19921.
++  * Un-vendored "golang-github-checkpoint-restore-go-criu-dev".
++  * Build-Depends += "golang-golang-x-tools".
++  * Standards-Version: 4.5.0.
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 26 Jan 2020 20:24:01 +1100
++
++runc (1.0.0~rc9+dfsg1-1) unstable; urgency=medium
++
++  * New upstream release.
++    + fixed CVE-2019-16884.
++  * Recommends += "criu" (Closes: #912821).
++    Thanks, Qian Cai.
++  * (Build-)Depends:
++    = golang-github-docker-go-units-dev (>= 0.4.0~)
++    = golang-github-opencontainers-selinux-dev (>= 1.3.0~)
++    = golang-github-seccomp-libseccomp-golang-dev (>= 0.9.1~)
++    = golang-gocapability-dev (>= 0.0+git20180916~)
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Wed, 09 Oct 2019 19:09:07 +1100
++
++runc (1.0.0~rc8+dfsg1-1) unstable; urgency=medium
++
++  * New upstream release.
++  * Standards-Version: 4.4.0.
++  * DH & compat to version 12.
++  * (Build-)Depends:
++    + golang-github-cyphar-filepath-securejoin-dev
++    = golang-github-coreos-go-systemd-dev (>= 20~)
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 10 Sep 2019 00:22:06 +1000
++
++runc (1.0.0~rc6+dfsg1-3) unstable; urgency=medium
++
++  * Team upload.
++
++  [ Shengjing Zhu ]
++  * Improve patch for CVE-2019-5736 based on upstream commits.
++    Now the patch includes following commits:
++    + 2d4a37b nsenter: cloned_binary: userspace copy fallback if sendfile fails
++    + 16612d7 nsenter: cloned_binary: try to ro-bind /proc/self/exe before
++              copying
++    + af9da0a nsenter: cloned_binary: use the runc statedir for O_TMPFILE
++    + 2429d59 nsenter: cloned_binary: expand and add pre-3.11 fallbacks
++    + 5b775bf nsenter: cloned_binary: detect and handle short copies
++    + bb7d8b1 nsexec (CVE-2019-5736): avoid parsing environ
++    + 0a8e411 nsenter: clone /proc/self/exe to avoid exposing host binary to
++              container
++
++  [ Arnaud Rebillout ]
++  * Add version and gitcommit to the ldflags (Closes: #909644)
++    Note that we fill the git commit with something that is NOT a git commit
++    at all, instead we use it as a placeholder for the debian version. The
++    debian version is a relevant information for the user, and it's nice to
++    be able to show it, some way or another.
++
++ -- Shengjing Zhu <zhsj@debian.org>  Sun, 10 Mar 2019 17:51:44 +0800
++
++runc (1.0.0~rc6+dfsg1-2) unstable; urgency=medium
++
++  * Team upload.
++  * Apply upstream patch addressing CVE-2019-5736 (Closes: #922050)
++    Thanks Noah Meyerhans!
++
++ -- Shengjing Zhu <zhsj@debian.org>  Tue, 12 Feb 2019 23:45:09 +0800
++
++runc (1.0.0~rc6+dfsg1-1) unstable; urgency=medium
++
++  * Standards-Version: 4.3.0.
++  * New upstream release.
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Fri, 25 Jan 2019 07:55:34 +1100
++
++runc (1.0.0~rc5+dfsg1-4) unstable; urgency=medium
++
++  * New patch to disable Hugetlb tests.
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 27 Sep 2018 08:16:11 +1000
++
++runc (1.0.0~rc5+dfsg1-3) unstable; urgency=medium
++
++  * TAGS += ambient
++  * New patch to fix FTBFS on mips* architectures.
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 18 Jun 2018 11:47:25 +1000
++
++runc (1.0.0~rc5+dfsg1-2) unstable; urgency=medium
++
++  * New patch to fix integer overflow on i686.
++  * Build with "selinux" tag (Closes: #865993).
++    Thanks, Laurent Bigonville.
++  * Added myself to uploaders.
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Sat, 16 Jun 2018 22:12:23 +1000
++
++runc (1.0.0~rc5+dfsg1-1) unstable; urgency=medium
++
++  * Team upload.
++
++  [ Arnaud Rebillout ]
++  * Set minimum requirement for golang-gocapability-dev.
++    And drop the alternative name golang-github-syndtr-gocapability-dev,
++    this name never existed in the first place.
++
++  [ Dmitry Smirnov ]
++  * New upstream release
++  * Testsuite: autopkgtest-pkg-go
++  * Standards-Version: 4.1.4; Priority: optional
++  * debhelper to version 11; compat to version 10.
++  * Added "XS-Go-Import-Path".
++  * (Build-)Depends:
++    - golang-github-codegangsta-cli-dev
++    - golang-github-coreos-pkg-dev
++    - golang-golang-x-sys-dev
++    - golang-logrus-dev
++    + golang-github-containerd-console-dev
++    + golang-github-pkg-errors-dev
++    + golang-github-sirupsen-logrus-dev
++    + golang-github-urfave-cli-dev
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Fri, 15 Jun 2018 21:48:18 +1000
++
++runc (1.0.0~rc4+dfsg1-6) unstable; urgency=medium
++
++  [ Michael Stapelberg ]
++  * update debian/gitlab-ci.yml (using salsa.debian.org/go-team/ci/cmd/ci)
++
++  [ Dmitry Smirnov ]
++  * Removed myself from uploaders.
++
++  [ Balint Reczey ]
++  * Team upload
++  * Stop using unix.SIGUNUSED which has been removed from golang.org/x/sys
++    (Closes: #889704)
++
++ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 10 Apr 2018 18:40:56 +0200
++
++runc (1.0.0~rc4+dfsg1-5) unstable; urgency=medium
++
++  * Vcs-* urls: pkg-go-team -> go-team.
++
++ -- Alexandre Viau <aviau@debian.org>  Mon, 05 Feb 2018 23:05:40 -0500
++
++runc (1.0.0~rc4+dfsg1-4) unstable; urgency=medium
++
++  * Point vcs-* urls to packages subgroup.
++
++ -- Alexandre Viau <aviau@debian.org>  Thu, 25 Jan 2018 15:23:12 -0500
++
++runc (1.0.0~rc4+dfsg1-3) unstable; urgency=medium
++
++  * Change my email to @debian.org.
++  * Move to salsa.debian.org.
++
++ -- Alexandre Viau <aviau@debian.org>  Fri, 29 Dec 2017 00:34:59 -0500
++
++runc (1.0.0~rc4+dfsg1-2) unstable; urgency=medium
++
++  * Mark runc breaking docker.io (<= 1.13.1~ds1-2) (Closes: #877146)
++
++ -- Balint Reczey <rbalint@ubuntu.com>  Sat, 30 Sep 2017 11:50:52 -0400
++
++runc (1.0.0~rc4+dfsg1-1) unstable; urgency=medium
++
++  * Team Upload
++  * Update watch file to match release candidates
++  * Update Files-Excuded and d/control to match dependencies of rc4
++  * New upstream release candidate 1.0.0-rc4
++  * Drop obsoleted patches
++  * Drop outdated README.source
++  * Require at least final 1.0.0 release of
++    golang-github-opencontainers-specs-dev (Closes: #858250)
++  * Fix typo in golang-github-opencontainers-runc-dev package description
++    (Closes: #873760)
++
++ -- Balint Reczey <rbalint@ubuntu.com>  Sat, 30 Sep 2017 11:50:50 -0400
++
++runc (1.0.0~rc2+git20170201.133.9df8b30-3) unstable; urgency=medium
++
++  * Replace golang-go with golang-any in Build-Depends
++
++ -- Konstantinos Margaritis <markos@debian.org>  Wed, 09 Aug 2017 15:00:55 +0300
++
++runc (1.0.0~rc2+git20170201.133.9df8b30-2) unstable; urgency=medium
++
++  * Patch to make libcontainer ignore cgroup2 hierarchy. Patch pulled from
++    https://github.com/opencontainers/runc/pull/1266.
++
++ -- Vincent Bernat <bernat@debian.org>  Fri, 30 Jun 2017 07:10:34 +0200
++
++runc (1.0.0~rc2+git20170201.133.9df8b30-1) unstable; urgency=medium
++
++  * New upstream snapshot for Docker 1.13.1.
++
++ -- Tim Potter <tpot@hpe.com>  Wed, 24 May 2017 11:36:40 +1000
++
++runc (1.0.0~rc2+git20161109.131.5137186-2) unstable; urgency=medium
++
++  * Add Breaks line to binary package to avoid messing up previous
++    Docker installs.
++
++ -- Tim Potter <tpot@hpe.com>  Fri, 24 Feb 2017 09:49:06 +1100
++
++runc (1.0.0~rc2+git20161109.131.5137186-1) unstable; urgency=medium
++
++  * New upstream snapshot.
++  * Refresh backported patch for CVE-2016-9962.
++
++ -- Tim Potter <tpot@hpe.com>  Wed, 15 Feb 2017 09:08:52 +1100
++
++runc (0.1.1+dfsg1-2) unstable; urgency=medium
++
++  * Team upload.
++  * Backport patch for CVE-2016-9962 (Closes: #850951)
++
++ -- Tianon Gravi <tianon@debian.org>  Wed, 01 Feb 2017 07:17:54 -0800
++
++runc (0.1.1+dfsg1-1) unstable; urgency=medium
++
++  * New upstream release [June 2016].
++  * testworks: disabled privileged and failing tests.
++  * Build with "apparmor seccomp" tags (Closes: #830818);
++    Build-Depends += "libapparmor-dev".
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Wed, 13 Jul 2016 23:00:43 +1000
++
++runc (0.1.0+dfsg1-1) unstable; urgency=medium
++
++  * Dropped dependency on "golang-docker-dev" in favour of bundled
++    (or build time sub-vendored) "github.com/docker/docker" in order
++    to avoid circular dependency with Docker.
++  * Standards-Version: 3.9.8.
++  * Corrected Vcs-Git URL.
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 12 Jun 2016 17:56:45 +1000
++
++runc (0.1.0+dfsg-1) unstable; urgency=medium
++
++  [ Tim Potter ]
++  * Team upload
++  * New upstream release [April 2016]
++    = golang-github-opencontainers-specs-dev (>= 0.5.0~)
++  * De-vendor new dependencies; pquerna/ffjson appears unused
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Sat, 23 Apr 2016 07:59:18 +1000
++
++runc (0.0.9+dfsg-1) unstable; urgency=medium
++
++  * New upstream release [March 2016].
++  * (Build-)Depends:
++    = golang-github-opencontainers-specs-dev (>= 0.4.0~)
++    = golang-github-codegangsta-cli-dev (>= 0.0~git20151221~)
++    - help2man
++    + go-md2man
++  * Install upstream man pages.
++  * Install "runc" binary to "/usr/sbin".
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Sat, 16 Apr 2016 17:23:48 +1000
++
++runc (0.0.8+dfsg-2) unstable; urgency=medium
++
++  * (Build-)Depends:
++    + golang-github-docker-go-units-dev
++    + golang-github-seccomp-libseccomp-golang-dev
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Wed, 23 Mar 2016 20:05:01 +1100
++
++runc (0.0.8+dfsg-1) unstable; urgency=medium
++
++  * New upstream release [February 2016].
++  * Build-Depends:
++    + golang-github-vishvananda-netlink-dev
++  * Updated Vcs URLs.
++  * Standards-Version: 3.9.7.
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Fri, 26 Feb 2016 18:19:24 +1100
++
++runc (0.0.4~dfsg-1) unstable; urgency=medium
++
++  * New upstream release (Closes: #802507).
++  * Dropped obsolete lintian-overrides.
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Wed, 21 Oct 2015 09:02:42 +1100
++
++runc (0.0.3~dfsg2-1) unstable; urgency=low
++
++  * Initial release (Closes: #796486).
++    Thanks, Alexandre Viau.
++
++ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 06 Sep 2015 18:06:34 +1000
diff --cc debian/clean
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..bcf0b01e15cf26afd69300ad3f799ffb3ebd633f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,23 @@@
++libcontainer/criurpc/criurpc.pb.go
++
++## Remove generated man pages:
++man/man8/*
++
++## Drop hanging test (introduced in 0.0.9).
++## https://github.com/opencontainers/runc/issues/692
++libcontainer/nsenter/nsenter_test.go
++
++## Generated:
++libcontainer/criurpc/criurpc.pb.go
++
++
++## Failing tests:
++
++## Privileged tests:
++### couldn't get cgroup root: mountpoint for cgroup not found
++libcontainer/cgroups/fs/apply_raw_test.go
++
++### FAIL: TestXattr (0.00s)
++###     xattr_test.go:26: Success
++###     xattr_test.go:30: failed
++libcontainer/xattr/xattr_test.go
diff --cc debian/control
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..8a6c1184e6a65ea89d4f08e907947c27ac8f1f89
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,71 @@@
++Source: runc
++Section: devel
++Priority: optional
++Standards-Version: 4.5.0
++Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
++Uploaders: Alexandre Viau <aviau@debian.org>, Dmitry Smirnov <onlyjob@debian.org>,
++           Tim Potter <tpot@hpe.com>
++Build-Depends: debhelper-compat (= 12),
++               dh-golang,
++               go-md2man,
++               golang-any,
++    golang-dbus-dev,
++    golang-github-checkpoint-restore-go-criu-dev,
++    golang-github-containerd-console-dev,
++    golang-github-coreos-go-systemd-dev (>= 20~),
++    golang-github-cyphar-filepath-securejoin-dev,
++    golang-github-docker-go-units-dev (>= 0.4.0~),
++    golang-github-mrunalp-fileutils-dev,
++    golang-github-opencontainers-selinux-dev (>= 1.3.0~),
++    golang-github-opencontainers-specs-dev (>= 1.0.1-5~),
++    golang-github-pkg-errors-dev,
++    golang-github-seccomp-libseccomp-golang-dev (>= 0.9.1~),
++    golang-github-sirupsen-logrus-dev (>= 1.0.2~),
++    golang-github-urfave-cli-dev,
++    golang-github-vishvananda-netlink-dev,
++    golang-gocapability-dev (>= 0.0+git20180916~),
++    golang-golang-x-tools,
++    golang-goprotobuf-dev,
++    libapparmor-dev,
++    protobuf-compiler,
++Homepage: https://github.com/opencontainers/runc
++Vcs-Git: https://salsa.debian.org/go-team/packages/runc.git
++Vcs-Browser: https://salsa.debian.org/go-team/packages/runc
++XS-Go-Import-Path: github.com/opencontainers/runc
++Testsuite: autopkgtest-pkg-go
++
++Package: runc
++Architecture: any
++Depends: ${misc:Depends}, ${shlibs:Depends}
++Breaks: docker.io (<= 1.13.1~ds1-2)
++Built-Using: ${misc:Built-Using}
++Recommends: ${misc:Recommends}
++    ,criu
++Description: Open Container Project - runtime
++ "runc" is a command line client for running applications packaged according
++ to the Open Container Format (OCF) and is a compliant implementation of
++ the Open Container Project specification.
++
++Package: golang-github-opencontainers-runc-dev
++Architecture: all
++Depends: ${misc:Depends},
++    golang-dbus-dev,
++    golang-github-checkpoint-restore-go-criu-dev,
++    golang-github-coreos-go-systemd-dev (>= 20~),
++    golang-github-cyphar-filepath-securejoin-dev,
++    golang-github-docker-go-units-dev (>= 0.4.0~),
++    golang-github-opencontainers-selinux-dev (>= 1.3.0~),
++    golang-github-opencontainers-specs-dev (>= 1.0.1-5~),
++    golang-github-seccomp-libseccomp-golang-dev (>= 0.9.1~),
++    golang-github-sirupsen-logrus-dev (>= 1.0.2~),
++    golang-github-urfave-cli-dev,
++    golang-github-vishvananda-netlink-dev,
++    golang-gocapability-dev (>= 0.0+git20180916~),
++    golang-goprotobuf-dev,
++Description: Open Container Project - development files
++ "runc" is a command line client for running applications packaged according
++ to the Open Container Format (OCF) and is a compliant implementation of
++ the Open Container Project specification.
++ .
++ This package provides development files formerly known as
++ "github.com/docker/libcontainer".
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..bce0efbc2cc700244296be3189a09dce7eb7d557
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,96 @@@
++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: runc
++Source: https://github.com/opencontainers/runc
++Files-Excluded:
++    vendor/github.com/checkpoint-restore/go-criu
++  ~~vendor/github.com/cilium/ebpf
++    vendor/github.com/containerd/console
++    vendor/github.com/coreos/go-systemd
++    vendor/github.com/coreos/pkg
++    vendor/github.com/cyphar/filepath-securejoin
++    vendor/github.com/docker/go-units
++    vendor/github.com/godbus/dbus
++    vendor/github.com/golang/protobuf
++    vendor/github.com/mrunalp/fileutils
++    vendor/github.com/opencontainers/runtime-spec
++    vendor/github.com/opencontainers/selinux
++    vendor/github.com/pkg/errors
++    vendor/github.com/seccomp/libseccomp-golang
++    vendor/github.com/sirupsen/logrus
++    vendor/github.com/syndtr/gocapability
++    vendor/github.com/urfave/cli
++    vendor/github.com/vishvananda/netlink
++    vendor/golang.org/x/sys
++
++Files: *
++Copyright:
++    2012-2015 Docker, Inc.
++    2019      Aleksa Sarai <cyphar@cyphar.com>
++    2019      SUSE LLC
++License: Apache-2.0
++
++Files:
++    vendor/github.com/cilium/ebpf/*
++Copyright:
++    2017      Nathan Sweet
++    2018-2019 Cloudflare
++    2019      Authors of Cilium
++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
++ in the Software without restriction, including without limitation the rights
++ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ 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 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.
++
++Files: debian/*
++Copyright:
++    2015      Alexandre Viau <alexandre@alexandreviau.net>
++    2015-2019 Dmitry Smirnov <onlyjob@debian.org>
++License: GPL-3+
++
++Files: debian/patches/*
++Copyright: 2015 Dmitry Smirnov <onlyjob@debian.org>
++License: GPL-3+ or Apache-2.0
++Comment: patches can be licensed under the same terms as upstream.
++
++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.
++ You may obtain a copy of the License at
++ .
++ http://www.apache.org/licenses/LICENSE-2.0
++ .
++ Unless required by applicable law or agreed to in writing, software
++ distributed under the License is distributed on an "AS IS" BASIS,
++ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ See the License for the specific language governing permissions and
++ limitations under the License.
++ .
++ The complete text of the Apache version 2.0 license
++ can be found in "/usr/share/common-licenses/Apache-2.0".
++
++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 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.
++ ․
++ The complete text of the GNU General Public License version 3
++ can be found in "/usr/share/common-licenses/GPL-3".
diff --cc debian/gbp.conf
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..433de423a155cfe0fa21df8e88db699b30839048
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,11 @@@
++[buildpackage]
++overlay = True
++export-dir = ../build-area/
++tarball-dir = ../
++
++[dch]
++id-length    = 0
++
++[import-orig]
++pristine-tar = True
++merge        = False
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5c8c31bf48a6bbac279a15c1bc69327b8199aebb
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,28 @@@
++
++# auto-generated, DO NOT MODIFY.
++# The authoritative copy of this file lives at:
++# https://salsa.debian.org/go-team/ci/blob/master/cmd/ci/gitlabciyml.go
++
++# TODO: publish under debian-go-team/ci
++image: stapelberg/ci2
++
++test_the_archive:
++  artifacts:
++    paths:
++    - before-applying-commit.json
++    - after-applying-commit.json
++  script:
++    # Create an overlay to discard writes to /srv/gopath/src after the build:
++    - "rm -rf /cache/overlay/{upper,work}"
++    - "mkdir -p /cache/overlay/{upper,work}"
++    - "mount -t overlay overlay -o lowerdir=/srv/gopath/src,upperdir=/cache/overlay/upper,workdir=/cache/overlay/work /srv/gopath/src"
++    - "export GOPATH=/srv/gopath"
++    - "export GOCACHE=/cache/go"
++    # Build the world as-is:
++    - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > before-applying-commit.json"
++    # Copy this package into the overlay:
++    - "GBP_CONF_FILES=:debian/gbp.conf gbp buildpackage --git-no-pristine-tar --git-ignore-branch --git-ignore-new --git-export-dir=/tmp/export --git-no-overlay --git-tarball-dir=/nonexistant --git-cleaner=/bin/true --git-builder='dpkg-buildpackage -S -d --no-sign'"
++    - "pgt-gopath -dsc /tmp/export/*.dsc"
++    # Rebuild the world:
++    - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > after-applying-commit.json"
++    - "ci-diff before-applying-commit.json after-applying-commit.json"
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3e409b1e8e9c79dd2d526c8377b0e339dee38ed4
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++usr/share/gocode/src
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a674b36d2bf1d64e50bf2f58a96e746f01245722
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,3 @@@
++test--fix_TestGetAdditionalGroups.patch
++test--skip-Hugetlb.patch
++test--skip_TestFactoryNewTmpfs.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..39fb84d6430e74fc7e536a96eb4cacab14019d3c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,33 @@@
++Last-Update: 2018-06-16
++Forwarded: https://github.com/opencontainers/runc/pull/1821
++Bug-Upstream: https://github.com/opencontainers/runc/issues/941
++Author: Dmitry Smirnov <onlyjob@debian.org>
++Description: fix FTBFS on i686
++ src/github.com/opencontainers/runc/libcontainer/user/user_test.go:448:36: constant 2147483648 overflows int
++
++--- a/libcontainer/user/user_test.go
+++++ b/libcontainer/user/user_test.go
++@@ -444,9 +444,9 @@
++ 
++      if utils.GetIntSize() > 4 {
++              tests = append(tests, foo{
++                      // groups with too large id
++-                     groups:   []string{strconv.Itoa(1 << 31)},
+++                     groups:   []string{strconv.Itoa( 1<<31 -1 )},
++                      expected: nil,
++                      hasError: true,
++              })
++      }
++--- a/libcontainer/user/user.go
+++++ b/libcontainer/user/user.go
++@@ -472,9 +472,9 @@
++                      if err != nil {
++                              return nil, fmt.Errorf("Unable to find group %s", ag)
++                      }
++                      // Ensure gid is inside gid range.
++-                     if gid < minId || gid > maxId {
+++                     if gid < minId || gid >= maxId {
++                              return nil, ErrRange
++                      }
++                      gidMap[gid] = struct{}{}
++              }
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..bfd28032ac6e1669d0f796c15c754392193056dd
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,48 @@@
++Last-Update: 2018-09-27
++Forwarded: not-needed
++Bug-Upstream: https://github.com/opencontainers/runc/issues/1822
++Author: Dmitry Smirnov <onlyjob@debian.org>
++Description: disabled unreliable tests due to random failures on [ppc64el, s390x].
++
++--- a/libcontainer/cgroups/fs/hugetlb_test.go
+++++ b/libcontainer/cgroups/fs/hugetlb_test.go
++@@ -88,8 +88,9 @@
++      }
++ }
++ 
++ func TestHugetlbStatsNoUsageFile(t *testing.T) {
+++t.Skip("Disabled unreliable test")
++      helper := NewCgroupTestUtil("hugetlb", t)
++      defer helper.cleanup()
++      helper.writeFileContents(map[string]string{
++              maxUsage: hugetlbMaxUsageContents,
++@@ -103,8 +104,9 @@
++      }
++ }
++ 
++ func TestHugetlbStatsNoMaxUsageFile(t *testing.T) {
+++t.Skip("Disabled unreliable test")
++      helper := NewCgroupTestUtil("hugetlb", t)
++      defer helper.cleanup()
++      for _, pageSize := range HugePageSizes {
++              helper.writeFileContents(map[string]string{
++@@ -120,8 +122,9 @@
++      }
++ }
++ 
++ func TestHugetlbStatsBadUsageFile(t *testing.T) {
+++t.Skip("Disabled unreliable test")
++      helper := NewCgroupTestUtil("hugetlb", t)
++      defer helper.cleanup()
++      for _, pageSize := range HugePageSizes {
++              helper.writeFileContents(map[string]string{
++@@ -138,8 +141,9 @@
++      }
++ }
++ 
++ func TestHugetlbStatsBadMaxUsageFile(t *testing.T) {
+++t.Skip("Disabled unreliable test")
++      helper := NewCgroupTestUtil("hugetlb", t)
++      defer helper.cleanup()
++      helper.writeFileContents(map[string]string{
++              usage:    hugetlbUsageContents,
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a49a504de65a5da6be80034f8d4b4187dc433843
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,17 @@@
++Last-Update: 2018-06-15
++Forwarded: not-needed
++Author: Dmitry Smirnov <onlyjob@debian.org>
++Description: disable test (requires root)
++
++--- a/libcontainer/factory_linux_test.go
+++++ b/libcontainer/factory_linux_test.go
++@@ -77,8 +77,9 @@
++      }
++ }
++ 
++ func TestFactoryNewTmpfs(t *testing.T) {
+++t.Skip("DM - skipping privileged test")
++      root, rerr := newTestRoot()
++      if rerr != nil {
++              t.Fatal(rerr)
++      }
diff --cc debian/rules
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b4e46258264bb2d674a215d18a56d2ad1ad9d2ed
new file mode 100755 (executable)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,49 @@@
++#!/usr/bin/make -f
++
++# Uncomment this to turn on verbose mode.
++#export DH_VERBOSE=1
++
++export DH_GOLANG_GO_GENERATE := 1
++export DH_GOPKG := github.com/opencontainers/runc
++export DH_GOLANG_INSTALL_EXTRA := libcontainer/seccomp/fixtures
++
++include /usr/share/dpkg/pkg-info.mk
++
++TAGS=apparmor seccomp selinux ambient
++LDFLAGS := -X main.version=$(DEB_VERSION_UPSTREAM) -X main.gitCommit=$(DEB_VERSION)
++
++%:
++      dh $@ --buildsystem=golang --with=golang --builddirectory=_build
++
++override_dh_clean:
++      dh_clean
++      ## Remove Files-Excluded (when built from checkout or non-DFSG tarball):
++      $(RM) -rv `perl -0nE 'say $$1 if m{^Files\-Excluded\:\s*(.*?)(?:\n\n|Files:|Comment:)}sm;' debian/copyright`
++
++override_dh_auto_configure:
++      cd man && ./md2man-all.sh
++      dh_auto_configure
++
++      export DH_GOPKG="$(DH_GOPKG)/vendor/github.com/cilium/ebpf" \
++      && dh_auto_build -v \
++      ;
++
++#     ## Sub-vendor "github.com/docker/docker/pkg" (system lib takes preference over bundled one):
++#     mkdir -p _build/src/$(DH_GOPKG)/vendor/github.com/docker/docker
++#     if [   -d "/usr/share/gocode/src/github.com/docker/docker/pkg" ]; then \
++#            cp -vr /usr/share/gocode/src/github.com/docker/docker/pkg  _build/src/$(DH_GOPKG)/vendor/github.com/docker/docker/ ;\
++#        elif [ -d "vendor/github.com/docker/docker/pkg" ]; then \
++#            cp -vr vendor/github.com/docker/docker/pkg  _build/src/$(DH_GOPKG)/vendor/github.com/docker/docker/ ;\
++#        fi
++      ## Remove extra license files:
++      $(RM) -v \
++            _build/src/$(DH_GOPKG)/vendor/github.com/docker/docker/*/*/LICENSE* \
++        ;
++#     ln -svrf vendor/github.com/opencontainers/specs  _build/src/github.com/opencontainers/
++
++override_dh_auto_build:
++      dh_auto_build -- -tags "$(TAGS)" -ldflags "$(LDFLAGS)"
++
++override_dh_auto_test:
++      DH_GOLANG_EXCLUDES="libcontainer/integration" \
++        dh_auto_test -- -tags "$(TAGS)"
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a0eacdbe8bdd7da8764ea0a5c319738514099338
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,2 @@@
++README*
++NOTICE
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9456224014c320381ac42df7b5b1db77c683c488
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++usr/bin/*    /usr/sbin/
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..eaa0b299ecea0ec219db3c62dacae2aacfad8c18
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++runc: spelling-error-in-binary
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..99cddbc1c31581ba9a0f2f3a14c4139d6794ac14
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++man/man8/*.8
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..163aaf8d82b6c54f23c45f32895dbdfdcc27b047
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..81ccd6d23982be751b93ce66d27f473f676d2117
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,2 @@@
++# Result of Files-Excluded:
++source-contains-empty-directory vendor/*
diff --cc debian/watch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ec26c94687f86ae96e46812d1151dfd12700110a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,9 @@@
++version=3
++
++opts=\
++repack,\
++repacksuffix=+dfsg1,\
++uversionmangle=s/-rc/~rc/,\
++dversionmangle=s/[~+]dfsg\d*$// \
++ https://github.com/opencontainers/runc/releases \
++ .*archive/v?(\d\.\d\.\d.*)\.tar\.gz