Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package runc for openSUSE:Factory checked in at 2022-01-21 01:24:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/runc (Old) and /work/SRC/openSUSE:Factory/.runc.new.1938 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "runc" Fri Jan 21 01:24:53 2022 rev:44 rq:947076 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/runc/runc.changes 2021-12-16 21:18:50.534510507 +0100 +++ /work/SRC/openSUSE:Factory/.runc.new.1938/runc.changes 2022-01-21 01:24:57.754775411 +0100 @@ -1,0 +2,11 @@ +Mon Jan 17 07:15:26 UTC 2022 - Aleksa Sarai <[email protected]> + +- Update to runc v1.1.0. Upstream changelog is available from + https://github.com/opencontainers/runc/releases/tag/v1.1.0. + + - libcontainer will now refuse to build without the nsenter package being + correctly compiled (specifically this requires CGO to be enabled). This + should avoid folks accidentally creating broken runc binaries (and + incorrectly importing our internal libraries into their projects). (#3331) + +------------------------------------------------------------------- Old: ---- runc-1.1.0~rc1.tar.xz runc-1.1.0~rc1.tar.xz.asc New: ---- runc-1.1.0.tar.xz runc-1.1.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ runc.spec ++++++ --- /var/tmp/diff_new_pack.rNonAH/_old 2022-01-21 01:24:58.226772175 +0100 +++ /var/tmp/diff_new_pack.rNonAH/_new 2022-01-21 01:24:58.234772120 +0100 @@ -1,7 +1,7 @@ # # spec file for package runc # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,16 +18,16 @@ # MANUAL: Make sure you update this each time you update runc. -%define git_version 55df1fc4c8b048118cd30a17b50f96a15ab0f3ea -%define git_short 55df1fc4c8b0 +%define git_version 605c1cb1cc0ce1492d040b5c221b35b606f9a3e0 +%define git_short 605c1cb1cc0c # Package-wide golang version %define go_version 1.17 %define project github.com/opencontainers/runc Name: runc -Version: 1.1.0~rc1 -%define _version 1.1.0-rc.1 +Version: 1.1.0 +%define _version 1.1.0 Release: 0 Summary: Tool for spawning and running OCI containers License: Apache-2.0 ++++++ runc-1.1.0~rc1.tar.xz -> runc-1.1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/CHANGELOG.md new/runc-1.1.0/CHANGELOG.md --- old/runc-1.1.0-rc.1/CHANGELOG.md 2021-12-14 04:23:00.000000000 +0100 +++ new/runc-1.1.0/CHANGELOG.md 2022-01-17 09:16:31.000000000 +0100 @@ -6,6 +6,15 @@ ## [Unreleased] +## [1.1.0] - 2022-01-14 + +> A plan depends as much upon execution as it does upon concept. + +## Changed + * libcontainer will now refuse to build without the nsenter package being + correctly compiled (specifically this requires CGO to be enabled). This + should avoid folks accidentally creating broken runc binaries (and + incorrectly importing our internal libraries into their projects). (#3331) ## [1.1.0-rc.1] - 2021-12-14 @@ -15,7 +24,7 @@ * runc run/start now warns if a new container cgroup is non-empty or frozen; this warning will become an error in runc 1.2. (#3132, #3223) * runc can only be built with Go 1.16 or later from this release onwards. - (#3100, #3245) + (#3100, #3245, #3325) ### Removed * `cgroup.GetHugePageSizes` has been removed entirely, and been replaced with @@ -224,12 +233,16 @@ cgroups at all during `runc update`). (#2994) <!-- minor releases --> -[Unreleased]: https://github.com/opencontainers/runc/compare/v1.1.0-rc.1...HEAD -[1.1.0-rc.1]: https://github.com/opencontainers/runc/compare/v1.0.0...v1.1.0-rc.1 +[Unreleased]: https://github.com/opencontainers/runc/compare/v1.1.0...HEAD +[1.1.0]: https://github.com/opencontainers/runc/compare/v1.1.0-rc.1...v1.1.0 [1.0.0]: https://github.com/opencontainers/runc/releases/tag/v1.0.0 -<!-- 1.0.x patch releases --> +<!-- 1.0.z patch releases --> [Unreleased 1.0.z]: https://github.com/opencontainers/runc/compare/v1.0.3...release-1.0 [1.0.3]: https://github.com/opencontainers/runc/compare/v1.0.2...v1.0.3 [1.0.2]: https://github.com/opencontainers/runc/compare/v1.0.1...v1.0.2 [1.0.1]: https://github.com/opencontainers/runc/compare/v1.0.0...v1.0.1 + +<!-- 1.1.z patch releases --> +[Unreleased 1.1.z]: https://github.com/opencontainers/runc/compare/v1.1.0...release-1.1 +[1.1.0-rc.1]: https://github.com/opencontainers/runc/compare/v1.0.0...v1.1.0-rc.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/VERSION new/runc-1.1.0/VERSION --- old/runc-1.1.0-rc.1/VERSION 2021-12-14 04:23:00.000000000 +0100 +++ new/runc-1.1.0/VERSION 2022-01-17 09:16:31.000000000 +0100 @@ -1 +1 @@ -1.1.0-rc.1 +1.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/go.mod new/runc-1.1.0/go.mod --- old/runc-1.1.0-rc.1/go.mod 2021-12-14 04:23:00.000000000 +0100 +++ new/runc-1.1.0/go.mod 2022-01-17 09:16:31.000000000 +0100 @@ -3,7 +3,7 @@ go 1.16 require ( - github.com/checkpoint-restore/go-criu/v5 v5.2.0 + github.com/checkpoint-restore/go-criu/v5 v5.3.0 github.com/cilium/ebpf v0.7.0 github.com/containerd/console v1.0.3 github.com/coreos/go-systemd/v22 v22.3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/go.sum new/runc-1.1.0/go.sum --- old/runc-1.1.0-rc.1/go.sum 2021-12-14 04:23:00.000000000 +0100 +++ new/runc-1.1.0/go.sum 2022-01-17 09:16:31.000000000 +0100 @@ -1,6 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/checkpoint-restore/go-criu/v5 v5.2.0 h1:QwsRK9EdBr2kQr44DqSdBrP4dULp2+4EkqounYQOnF8= -github.com/checkpoint-restore/go-criu/v5 v5.2.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= +github.com/checkpoint-restore/go-criu/v5 v5.3.0 h1:wpFFOoomK3389ue2lAb0Boag6XPht5QYpipxmSNL4d8= +github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/libcontainer/cgroups/getallpids.go new/runc-1.1.0/libcontainer/cgroups/getallpids.go --- old/runc-1.1.0-rc.1/libcontainer/cgroups/getallpids.go 2021-12-14 04:23:00.000000000 +0100 +++ new/runc-1.1.0/libcontainer/cgroups/getallpids.go 2022-01-17 09:16:31.000000000 +0100 @@ -1,6 +1,3 @@ -//go:build go1.16 -// +build go1.16 - package cgroups import ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/libcontainer/cgroups/getallpids_go115.go new/runc-1.1.0/libcontainer/cgroups/getallpids_go115.go --- old/runc-1.1.0-rc.1/libcontainer/cgroups/getallpids_go115.go 2021-12-14 04:23:00.000000000 +0100 +++ new/runc-1.1.0/libcontainer/cgroups/getallpids_go115.go 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -//go:build !go1.16 -// +build !go1.16 - -package cgroups - -import ( - "os" - "path/filepath" -) - -// GetAllPids returns all pids, that were added to cgroup at path and to all its -// subcgroups. -func GetAllPids(path string) ([]int, error) { - var pids []int - // collect pids from all sub-cgroups - err := filepath.Walk(path, func(p string, info os.FileInfo, iErr error) error { - if iErr != nil { - return iErr - } - if !info.IsDir() { - return nil - } - cPids, err := readProcsFile(p) - if err != nil { - return err - } - pids = append(pids, cPids...) - return nil - }) - return pids, err -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/libcontainer/nsenter/nsenter_unsupported.go new/runc-1.1.0/libcontainer/nsenter/nsenter_unsupported.go --- old/runc-1.1.0-rc.1/libcontainer/nsenter/nsenter_unsupported.go 2021-12-14 04:23:00.000000000 +0100 +++ new/runc-1.1.0/libcontainer/nsenter/nsenter_unsupported.go 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -//go:build !linux || !cgo -// +build !linux !cgo - -package nsenter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/vendor/github.com/checkpoint-restore/go-criu/v5/Makefile new/runc-1.1.0/vendor/github.com/checkpoint-restore/go-criu/v5/Makefile --- old/runc-1.1.0-rc.1/vendor/github.com/checkpoint-restore/go-criu/v5/Makefile 2021-12-14 04:23:00.000000000 +0100 +++ new/runc-1.1.0/vendor/github.com/checkpoint-restore/go-criu/v5/Makefile 2022-01-17 09:16:31.000000000 +0100 @@ -2,6 +2,11 @@ GO ?= go CC ?= gcc COVERAGE_PATH ?= $(shell pwd)/.coverage +CRIU_FEATURE_MEM_TRACK = $(shell if criu check --feature mem_dirty_track > /dev/null; then echo 1; else echo 0; fi) +CRIU_FEATURE_LAZY_PAGES = $(shell if criu check --feature uffd-noncoop > /dev/null; then echo 1; else echo 0; fi) +CRIU_FEATURE_PIDFD_STORE = $(shell if criu check --feature pidfd_store > /dev/null; then echo 1; else echo 0; fi) + +export CRIU_FEATURE_MEM_TRACK CRIU_FEATURE_LAZY_PAGES CRIU_FEATURE_PIDFD_STORE all: build test phaul-test @@ -70,6 +75,8 @@ test/phaul/phaul.coverage -test.coverprofile=coverprofile.integration.$$RANDOM -test.outputdir=${COVERAGE_PATH} COVERAGE $$PID; \ pkill -9 piggie; \ } + echo "mode: set" > .coverage/coverage.out && cat .coverage/coverprofile* | \ + grep -v mode: | sort -r | awk '{if($$1 != last) {print $$0;last=$$1}}' >> .coverage/coverage.out clean: @rm -f $(TEST_BINARIES) $(COVERAGE_BINARIES) codecov @@ -95,6 +102,6 @@ codecov: curl -Os https://uploader.codecov.io/latest/linux/codecov chmod +x codecov - ./codecov -f '.coverage/*' + ./codecov -f '.coverage/coverage.out' .PHONY: build test phaul-test test-bin clean lint vendor coverage codecov diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/vendor/github.com/checkpoint-restore/go-criu/v5/features.go new/runc-1.1.0/vendor/github.com/checkpoint-restore/go-criu/v5/features.go --- old/runc-1.1.0-rc.1/vendor/github.com/checkpoint-restore/go-criu/v5/features.go 1970-01-01 01:00:00.000000000 +0100 +++ new/runc-1.1.0/vendor/github.com/checkpoint-restore/go-criu/v5/features.go 2022-01-17 09:16:31.000000000 +0100 @@ -0,0 +1,45 @@ +package criu + +import ( + "fmt" + + "github.com/checkpoint-restore/go-criu/v5/rpc" +) + +// Feature checking in go-criu is based on the libcriu feature checking function. + +// Feature checking allows the user to check if CRIU supports +// certain features. There are CRIU features which do not depend +// on the version of CRIU but on kernel features or architecture. +// +// One example is memory tracking. Memory tracking can be disabled +// in the kernel or there are architectures which do not support +// it (aarch64 for example). By using the feature check a libcriu +// user can easily query CRIU if a certain feature is available. +// +// The features which should be checked can be marked in the +// structure 'struct criu_feature_check'. Each structure member +// that is set to true will result in CRIU checking for the +// availability of that feature in the current combination of +// CRIU/kernel/architecture. +// +// Available features will be set to true when the function +// returns successfully. Missing features will be set to false. + +func (c *Criu) FeatureCheck(features *rpc.CriuFeatures) (*rpc.CriuFeatures, error) { + resp, err := c.doSwrkWithResp( + rpc.CriuReqType_FEATURE_CHECK, + nil, + nil, + features, + ) + if err != nil { + return nil, err + } + + if resp.GetType() != rpc.CriuReqType_FEATURE_CHECK { + return nil, fmt.Errorf("Unexpected CRIU RPC response") + } + + return features, nil +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/vendor/github.com/checkpoint-restore/go-criu/v5/main.go new/runc-1.1.0/vendor/github.com/checkpoint-restore/go-criu/v5/main.go --- old/runc-1.1.0-rc.1/vendor/github.com/checkpoint-restore/go-criu/v5/main.go 2021-12-14 04:23:00.000000000 +0100 +++ new/runc-1.1.0/vendor/github.com/checkpoint-restore/go-criu/v5/main.go 2022-01-17 09:16:31.000000000 +0100 @@ -87,19 +87,19 @@ } func (c *Criu) doSwrk(reqType rpc.CriuReqType, opts *rpc.CriuOpts, nfy Notify) error { - resp, err := c.doSwrkWithResp(reqType, opts, nfy) + resp, err := c.doSwrkWithResp(reqType, opts, nfy, nil) if err != nil { return err } respType := resp.GetType() if respType != reqType { - return errors.New("unexpected responce") + return errors.New("unexpected CRIU RPC response") } return nil } -func (c *Criu) doSwrkWithResp(reqType rpc.CriuReqType, opts *rpc.CriuOpts, nfy Notify) (*rpc.CriuResp, error) { +func (c *Criu) doSwrkWithResp(reqType rpc.CriuReqType, opts *rpc.CriuOpts, nfy Notify, features *rpc.CriuFeatures) (*rpc.CriuResp, error) { var resp *rpc.CriuResp req := rpc.CriuReq{ @@ -111,6 +111,10 @@ opts.NotifyScripts = proto.Bool(true) } + if features != nil { + req.Features = features + } + if c.swrkCmd == nil { err := c.Prepare() if err != nil { @@ -209,7 +213,7 @@ // StartPageServerChld starts the page server and returns PID and port func (c *Criu) StartPageServerChld(opts *rpc.CriuOpts) (int, int, error) { - resp, err := c.doSwrkWithResp(rpc.CriuReqType_PAGE_SERVER_CHLD, opts, nil) + resp, err := c.doSwrkWithResp(rpc.CriuReqType_PAGE_SERVER_CHLD, opts, nil, nil) if err != nil { return 0, 0, err } @@ -220,7 +224,7 @@ // GetCriuVersion executes the VERSION RPC call and returns the version // as an integer. Major * 10000 + Minor * 100 + SubLevel func (c *Criu) GetCriuVersion() (int, error) { - resp, err := c.doSwrkWithResp(rpc.CriuReqType_VERSION, nil, nil) + resp, err := c.doSwrkWithResp(rpc.CriuReqType_VERSION, nil, nil, nil) if err != nil { return 0, err } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/runc-1.1.0-rc.1/vendor/modules.txt new/runc-1.1.0/vendor/modules.txt --- old/runc-1.1.0-rc.1/vendor/modules.txt 2021-12-14 04:23:00.000000000 +0100 +++ new/runc-1.1.0/vendor/modules.txt 2022-01-17 09:16:31.000000000 +0100 @@ -1,4 +1,4 @@ -# github.com/checkpoint-restore/go-criu/v5 v5.2.0 +# github.com/checkpoint-restore/go-criu/v5 v5.3.0 ## explicit github.com/checkpoint-restore/go-criu/v5 github.com/checkpoint-restore/go-criu/v5/rpc
