Your message dated Fri, 04 Sep 2020 04:33:28 +0000
with message-id <e1ke3pk-0008ej...@fasolo.debian.org>
and subject line Bug#969227: fixed in docker.io 19.03.12+dfsg1-4
has caused the Debian Bug report #969227,
regarding FTBFS with new runc 1.0.0~rc92 and libcap2 2.43
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
969227: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=969227
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: docker.io
Version: 19.03.12+dfsg1-3
Severity: serious
Please see the patches attached.
BTW, is there any instruction to work with the docker.io git repo?
It seems `gbp buildpackage` or `gbp pq` are hard to use with it.
Description: Fix build with runc 1.0.0~rc92
Author: Shengjing Zhu <z...@debian.org>
Forwarded: not-needed
Last-Update: 2020-08-29
--- docker.io-19.03.12+dfsg1.orig/containerd/vendor/github.com/containerd/cri/pkg/containerd/opts/spec.go
+++ docker.io-19.03.12+dfsg1/containerd/vendor/github.com/containerd/cri/pkg/containerd/opts/spec.go
@@ -421,7 +421,7 @@ func WithDevices(osi osinterface.OS, con
Type: string(dev.Type),
Major: &dev.Major,
Minor: &dev.Minor,
- Access: dev.Permissions,
+ Access: string(dev.Permissions),
})
}
return nil
--- docker.io-19.03.12+dfsg1.orig/engine/daemon/stats/collector_unix.go
+++ docker.io-19.03.12+dfsg1/engine/daemon/stats/collector_unix.go
@@ -8,14 +8,14 @@ import (
"strconv"
"strings"
- "github.com/opencontainers/runc/libcontainer/system"
"golang.org/x/sys/unix"
)
// platformNewStatsCollector performs platform specific initialisation of the
// Collector structure.
func platformNewStatsCollector(s *Collector) {
- s.clockTicksPerSecond = uint64(system.GetClockTicks())
+ // modified from https://github.com/moby/moby/pull/41186
+ s.clockTicksPerSecond = 100
}
const nanoSecondsPerSecond = 1e9
--- docker.io-19.03.12+dfsg1.orig/engine/oci/devices_linux.go
+++ docker.io-19.03.12+dfsg1/engine/oci/devices_linux.go
@@ -31,7 +31,7 @@ func deviceCgroup(d *configs.Device) spe
Type: t,
Major: &d.Major,
Minor: &d.Minor,
- Access: d.Permissions,
+ Access: string(d.Permissions),
}
}
--- docker.io-19.03.12+dfsg1.orig/containerd/sys/proc.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// +build linux
-
-/*
- Copyright The containerd Authors.
-
- 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.
-*/
-
-package sys
-
-import (
- "bufio"
- "fmt"
- "os"
- "strconv"
- "strings"
-
- "github.com/opencontainers/runc/libcontainer/system"
-)
-
-const nanoSecondsPerSecond = 1e9
-
-var clockTicksPerSecond = uint64(system.GetClockTicks())
-
-// GetSystemCPUUsage returns the host system's cpu usage in
-// nanoseconds. An error is returned if the format of the underlying
-// file does not match.
-//
-// Uses /proc/stat defined by POSIX. Looks for the cpu
-// statistics line and then sums up the first seven fields
-// provided. See `man 5 proc` for details on specific field
-// information.
-func GetSystemCPUUsage() (uint64, error) {
- var line string
- f, err := os.Open("/proc/stat")
- if err != nil {
- return 0, err
- }
- bufReader := bufio.NewReaderSize(nil, 128)
- defer func() {
- bufReader.Reset(nil)
- f.Close()
- }()
- bufReader.Reset(f)
- err = nil
- for err == nil {
- line, err = bufReader.ReadString('\n')
- if err != nil {
- break
- }
- parts := strings.Fields(line)
- switch parts[0] {
- case "cpu":
- if len(parts) < 8 {
- return 0, fmt.Errorf("bad format of cpu stats")
- }
- var totalClockTicks uint64
- for _, i := range parts[1:8] {
- v, err := strconv.ParseUint(i, 10, 64)
- if err != nil {
- return 0, fmt.Errorf("error parsing cpu stats")
- }
- totalClockTicks += v
- }
- return (totalClockTicks * nanoSecondsPerSecond) /
- clockTicksPerSecond, nil
- }
- }
- return 0, fmt.Errorf("bad stats format")
-}
Description: Fix build against libcap2 2.43
Author: Shengjing Zhu <z...@debian.org>
Bug: https://github.com/moby/moby/issues/41398
Forwarded: no
Last-Update: 2020-08-29
--- docker.io-19.03.12+dfsg1.orig/engine/pkg/archive/archive_unix_test.go
+++ docker.io-19.03.12+dfsg1/engine/pkg/archive/archive_unix_test.go
@@ -264,7 +264,7 @@ func TestTarUntarWithXattr(t *testing.T)
}
out, err := exec.Command("getcap", filepath.Join(origin, "2")).CombinedOutput()
assert.NilError(t, err, string(out))
- assert.Check(t, is.Contains(string(out), "= cap_block_suspend+ep"), "untar should have kept the 'security.capability' xattr")
+ assert.Check(t, is.Contains(string(out), "cap_block_suspend=ep"), "untar should have kept the 'security.capability' xattr")
}
}
--- End Message ---
--- Begin Message ---
Source: docker.io
Source-Version: 19.03.12+dfsg1-4
Done: Arnaud Rebillout <elboulang...@gmail.com>
We believe that the bug you reported is fixed in the latest version of
docker.io, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 969...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Arnaud Rebillout <elboulang...@gmail.com> (supplier of updated docker.io
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Mon, 31 Aug 2020 12:46:39 +0700
Source: docker.io
Architecture: source
Version: 19.03.12+dfsg1-4
Distribution: unstable
Urgency: medium
Maintainer: Arnaud Rebillout <elboulang...@gmail.com>
Changed-By: Arnaud Rebillout <elboulang...@gmail.com>
Closes: 969227
Changes:
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
Checksums-Sha1:
c212d316d30c9d9e02bd23bd0027109ee0c51f73 8659 docker.io_19.03.12+dfsg1-4.dsc
5a0e8b428633a8ed8b16813776d30a9ab7f35db2 51000
docker.io_19.03.12+dfsg1-4.debian.tar.xz
88f9c5261bcbaf5e5164b56f7e5b91b7db22bfd2 25488
docker.io_19.03.12+dfsg1-4_amd64.buildinfo
Checksums-Sha256:
9c33963ced1a3774e259892d32f3368c3e3d1a7207b66fc77feaad3cfc774fb9 8659
docker.io_19.03.12+dfsg1-4.dsc
9311b2ea7ea13b40ede6aa27a60f24bb1954fdb1ffb36d98465426c9590f4aa1 51000
docker.io_19.03.12+dfsg1-4.debian.tar.xz
ad340060a6346037d8f6d3e6df14a6111b5c013fb38f9c1cb59905b24c48ba8f 25488
docker.io_19.03.12+dfsg1-4_amd64.buildinfo
Files:
0b642a6b64678aee2e3e4dc59e253953 8659 admin optional
docker.io_19.03.12+dfsg1-4.dsc
7214c02798827bb64391df1d4cb8541b 51000 admin optional
docker.io_19.03.12+dfsg1-4.debian.tar.xz
f0748988e8c96ddee58e5195e1dcea49 25488 admin optional
docker.io_19.03.12+dfsg1-4_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEULx8+TnSDCcqawZWUra72VOWjRsFAl9Rvl8ACgkQUra72VOW
jRtJBg//TUB7fA5T70hcIHLqJtr2WARiH+sH5t4E1ktqD+Zq7tDZXondrfu318Io
GSe7WLTdvpUelBs9M2OfqbPmLKu/QQwjYByKUVOkVBTqwXH6ipoWs0mHcku6RQhv
AfLOm2c8PtIzMzawtI3hWSEYEOXior3Jvj4aexiRSo+en5a5ZIvmockHAjlAvlmU
8PmDRJ340X8uqA17s+7KstguNwd/0OC6YT+8JKiPtqf+osB57/D9lmnPd08fsJ/q
Lf/0v2tJlqTj0n2j+sNWTqr9uuRyD5CEuUR5ZrNuAnMElbbbW/znOf4oaWjSlidZ
yJRF5qkquDoPGU8RIsXZhZBdZnDERgLqnzenVCzjshsMAqghCjNIIJcA26TlBDJG
QyR2GDy3O+XyxBJTFCl0ZkQolV6eO6NfBwfwKXE/ddWXy0xdxR8RjnO/pmbbvTPL
2+Qg9ssdmiNVPc48ciiZsnT9k2EIL466OmP99g4NGrO8Jnbk2bqhcWNbmKF/SSUr
NpDL6ullstDjFA8D/T2ujwCtBubGVd4lB58Lp1ct2gtqbmGqMaPWSiKu66HwBxKI
aydTqduFSuV03R1h1nf+8YH/3nRhG87XR7deWeSgcr2s7IoLipLl3zBkiP1dFXIW
TYl2HCtaFiERZOohn1tG35f6lJ8JGN8VDVxbzMsyTK/6ubxs2qw=
=33A1
-----END PGP SIGNATURE-----
--- End Message ---
