#2 [epel7] Update to 1.4.12.
Closed a month ago by gotmax23. Opened 10 months ago by gotmax23.
rpms/ gotmax23/containerd epel7  into  epel7

file modified
+129 -109
@@ -1,5 +1,5 @@ 

  %global goipath github.com/containerd/containerd

- Version:        1.2.14

+ Version:        1.4.12

  

  %if %{defined fedora}

  %gometa
@@ -20,13 +20,13 @@ 

  export PATH=$PWD/_bin${PATH:+:$PATH}

  export GOPATH=$GO_BUILD_PATH:%{gopath}

  }

+ %define gocompilerflags -buildmode pie -compiler gc

+ %define gobuildflags() %{expand:%{gocompilerflags} -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} %{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -compressdwarf=false -extldflags '%{build_ldflags} %{?__golang_extldflags}'" -a -v -x}

+ %define gomodulesmode GO111MODULE=off

  %define gobuild(o:) %{expand:

+ # https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12

  %global _dwz_low_mem_die_limit 0

- %ifnarch ppc64

- go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x %{?**};

- %else

- go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x %{?**};

- %endif

+ %{?gomodulesmode} go build %{gobuildflags} %{?**};

  }

  %endif

  
@@ -37,10 +37,9 @@ 

  License:        ASL 2.0

  URL:            https://containerd.io

  Source0:        %{gosource}

- Source1:        containerd.service

- Source2:        containerd.toml

+ Source1:        containerd.toml

  

- BuildRequires:  golang >= 1.10

+ BuildRequires:  golang

  BuildRequires:  btrfs-progs-devel

  BuildRequires:  go-md2man

  BuildRequires:  systemd
@@ -49,90 +48,99 @@ 

  

  # vendored libraries

  # grep -v -e '^$' -e '^#' containerd-*/vendor.conf | sort | awk '{print "Provides:       bundled(golang("$1")) = "$2}'

- Provides:       bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9

- Provides:       bundled(golang(github.com/blang/semver)) = v3.1.0

- Provides:       bundled(golang(github.com/BurntSushi/toml)) = a368813c5e648fee92e5f6c30e3944ff9d5e8895

- Provides:       bundled(golang(github.com/containerd/aufs)) = ffa39970e26ad01d81f540b21e65f9c1841a5f92

- Provides:       bundled(golang(github.com/containerd/btrfs)) = 2e1aa0ddf94f91fa282b6ed87c23bf0d64911244

- Provides:       bundled(golang(github.com/containerd/cgroups)) = c4b9ac5c7601384c965b9646fc515884e091ebb9

- Provides:       bundled(golang(github.com/containerd/console)) = 8375c3424e4d7b114e8a90a4a40c8e1b40d1d4e6

- Provides:       bundled(golang(github.com/containerd/continuity)) = bd77b46c8352f74eb12c85bdc01f4b90f69d66b4

- Provides:       bundled(golang(github.com/containerd/cri)) = b1052f3b73fb9f0a6805d3c20e884a4cef265a38

- Provides:       bundled(golang(github.com/containerd/fifo)) = 3d5202aec260678c48179c56f40e6f38a095738c

- Provides:       bundled(golang(github.com/containerd/go-cni)) = 40bcf8ec8acd7372be1d77031d585d5d8e561c90

- Provides:       bundled(golang(github.com/containerd/go-runc)) = e029b79d8cda8374981c64eba71f28ec38e5526f

- Provides:       bundled(golang(github.com/containerd/ttrpc)) = 92c8520ef9f86600c650dd540266a007bf03670f

- Provides:       bundled(golang(github.com/containerd/typeurl)) = a93fcdb778cd272c6e9b3028b2f42d813e785d40

- Provides:       bundled(golang(github.com/containerd/zfs)) = 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251

- Provides:       bundled(golang(github.com/containernetworking/cni)) = v0.6.0

- Provides:       bundled(golang(github.com/containernetworking/plugins)) = v0.7.5

- Provides:       bundled(golang(github.com/coreos/go-systemd)) = 48702e0da86bd25e76cfef347e2adeb434a0d0a6

- Provides:       bundled(golang(github.com/davecgh/go-spew)) = v1.1.0

- Provides:       bundled(golang(github.com/docker/distribution)) = 0d3efadf0154c2b8a4e7b6621fff9809655cc580

- Provides:       bundled(golang(github.com/docker/docker)) = 86f080cff0914e9694068ed78d503701667c4c00

- Provides:       bundled(golang(github.com/docker/go-events)) = 9461782956ad83b30282bf90e31fa6a70c255ba9

- Provides:       bundled(golang(github.com/docker/go-metrics)) = 4ea375f7759c82740c893fc030bc37088d2ec098

- Provides:       bundled(golang(github.com/docker/go-units)) = v0.3.1

+ Provides:       bundled(golang(github.com/beorn7/perks)) = v1.0.1

+ Provides:       bundled(golang(github.com/BurntSushi/toml)) = v0.3.1

+ Provides:       bundled(golang(github.com/cespare/xxhash/v2)) = v2.1.1

+ Provides:       bundled(golang(github.com/cilium/ebpf)) = 1c8d4c9ef7759622653a1d319284a44652333b28

+ Provides:       bundled(golang(github.com/containerd/aufs)) = 371312c1e31c210a21e49bf3dfd3f31729ed9f2f

+ Provides:       bundled(golang(github.com/containerd/btrfs)) = 404b9149801e455c8076f615b06dc0abee0a977a

+ Provides:       bundled(golang(github.com/containerd/cgroups)) = 318312a373405e5e91134d8063d04d59768a1bff

+ Provides:       bundled(golang(github.com/containerd/console)) = v1.0.0

+ Provides:       bundled(golang(github.com/containerd/continuity)) = 1d9893e5674b5260c3fc11316d0d5fc0d12ea9e2

+ Provides:       bundled(golang(github.com/containerd/cri)) = 3b02bec1603179debe2cde54509b2bfc45fc27d3

+ Provides:       bundled(golang(github.com/containerd/fifo)) = f15a3290365b9d2627d189e619ab4008e0069caf

+ Provides:       bundled(golang(github.com/containerd/go-cni)) = v1.0.1

+ Provides:       bundled(golang(github.com/containerd/go-runc)) = 7016d3ce2328dd2cb1192b2076ebd565c4e8df0c

+ Provides:       bundled(golang(github.com/containerd/imgcrypt)) = v1.0.1

+ Provides:       bundled(golang(github.com/containerd/ttrpc)) = v1.0.1

+ Provides:       bundled(golang(github.com/containerd/typeurl)) = v1.0.1

+ Provides:       bundled(golang(github.com/containerd/zfs)) = 9abf673ca6ff9ab8d9bd776a4ceff8f6dc699c3d

+ Provides:       bundled(golang(github.com/containernetworking/cni)) = v0.8.0

+ Provides:       bundled(golang(github.com/containernetworking/plugins)) = v0.8.6

+ Provides:       bundled(golang(github.com/containers/ocicrypt)) = v1.0.1

+ Provides:       bundled(golang(github.com/coreos/go-systemd/v22)) = v22.1.0

+ Provides:       bundled(golang(github.com/cpuguy83/go-md2man/v2)) = v2.0.0

+ Provides:       bundled(golang(github.com/davecgh/go-spew)) = v1.1.1

+ Provides:       bundled(golang(github.com/docker/docker)) = 4634ce647cf2ce2c6031129ccd109e557244986f

+ Provides:       bundled(golang(github.com/docker/go-events)) = e31b211e4f1cd09aa76fe4ac244571fab96ae47f

+ Provides:       bundled(golang(github.com/docker/go-metrics)) = v0.0.1

+ Provides:       bundled(golang(github.com/docker/go-units)) = v0.4.0

  Provides:       bundled(golang(github.com/docker/spdystream)) = 449fdfce4d962303d702fec724ef0ad181c92528

- Provides:       bundled(golang(github.com/emicklei/go-restful)) = v2.2.1

- Provides:       bundled(golang(github.com/ghodss/yaml)) = v1.0.0

- Provides:       bundled(golang(github.com/godbus/dbus)) = c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f

- Provides:       bundled(golang(github.com/gogo/googleapis)) = 08a7655d27152912db7aaf4f983275eaf8d128ef

- Provides:       bundled(golang(github.com/gogo/protobuf)) = v1.0.0

- Provides:       bundled(golang(github.com/golang/glog)) = 44145f04b68cf362d9c4df2182967c2275eaefed

- Provides:       bundled(golang(github.com/golang/protobuf)) = v1.1.0

- Provides:       bundled(golang(github.com/google/go-cmp)) = v0.1.0

- Provides:       bundled(golang(github.com/google/gofuzz)) = 44d81051d367757e1c7c6a5a86423ece9afcf63c

+ Provides:       bundled(golang(github.com/emicklei/go-restful)) = v2.9.5

+ Provides:       bundled(golang(github.com/fsnotify/fsnotify)) = v1.4.9

+ Provides:       bundled(golang(github.com/fullsailor/pkcs7)) = 8306686428a5fe132eac8cb7c4848af725098bd4

+ Provides:       bundled(golang(github.com/godbus/dbus/v5)) = v5.0.3

+ Provides:       bundled(golang(github.com/gogo/googleapis)) = v1.3.2

+ Provides:       bundled(golang(github.com/gogo/protobuf)) = v1.3.2

+ Provides:       bundled(golang(github.com/golang/protobuf)) = v1.3.5

+ Provides:       bundled(golang(github.com/go-logr/logr)) = v0.2.0

+ Provides:       bundled(golang(github.com/google/go-cmp)) = v0.2.0

+ Provides:       bundled(golang(github.com/google/gofuzz)) = v1.1.0

  Provides:       bundled(golang(github.com/google/uuid)) = v1.1.1

- Provides:       bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) = 6b7015e65d366bf3f19b2b2a000a831940f0f7e0

- Provides:       bundled(golang(github.com/hashicorp/errwrap)) = 7554cd9344cec97297fa6649b055a8c98c2a1e55

- Provides:       bundled(golang(github.com/hashicorp/go-multierror)) = ed905158d87462226a13fe39ddf685ea65f1c11f

- Provides:       bundled(golang(github.com/json-iterator/go)) = 1.1.5

- Provides:       bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = v1.0.0

- Provides:       bundled(golang(github.com/Microsoft/go-winio)) = v0.4.11

- Provides:       bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.1

+ Provides:       bundled(golang(github.com/grpc-ecosystem/go-grpc-prometheus)) = v1.2.0

+ Provides:       bundled(golang(github.com/hashicorp/errwrap)) = v1.0.0

+ Provides:       bundled(golang(github.com/hashicorp/golang-lru)) = v0.5.3

+ Provides:       bundled(golang(github.com/hashicorp/go-multierror)) = v1.0.0

+ Provides:       bundled(golang(github.com/imdario/mergo)) = v0.3.7

+ Provides:       bundled(golang(github.com/json-iterator/go)) = v1.1.10

+ Provides:       bundled(golang(github.com/konsorten/go-windows-terminal-sequences)) = v1.0.3

+ Provides:       bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = v1.0.1

+ Provides:       bundled(golang(github.com/Microsoft/go-winio)) = v0.4.19

+ Provides:       bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.21

  Provides:       bundled(golang(github.com/mistifyio/go-zfs)) = f784269be439d704d3dfa1906f45dd848fed2beb

  Provides:       bundled(golang(github.com/modern-go/concurrent)) = 1.0.3

- Provides:       bundled(golang(github.com/modern-go/reflect2)) = 1.0.1

- Provides:       bundled(golang(github.com/opencontainers/go-digest)) = c9281466c8b2f606084ac71339773efd177436e7

+ Provides:       bundled(golang(github.com/modern-go/reflect2)) = v1.0.1

+ Provides:       bundled(golang(github.com/opencontainers/go-digest)) = v1.0.0

  Provides:       bundled(golang(github.com/opencontainers/image-spec)) = v1.0.1

- Provides:       bundled(golang(github.com/opencontainers/runc)) = dc9208a3303feef5b3839f4323d9beb36df0a9dd

- Provides:       bundled(golang(github.com/opencontainers/runtime-spec)) = eba862dc2470385a233c7507392675cbeadf7353

- Provides:       bundled(golang(github.com/opencontainers/runtime-tools)) = v0.6.0

- Provides:       bundled(golang(github.com/opencontainers/selinux)) = 5215b1806f52b1fcc2070a8826c542c9d33cd3cf

- Provides:       bundled(golang(github.com/pkg/errors)) = v0.8.0

- Provides:       bundled(golang(github.com/prometheus/client_golang)) = f4fb1b73fb099f396a7f0036bf86aa8def4ed823

- Provides:       bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c

- Provides:       bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563

- Provides:       bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd

- Provides:       bundled(golang(github.com/seccomp/libseccomp-golang)) = v0.9.1

- Provides:       bundled(golang(github.com/sirupsen/logrus)) = v1.0.0

- Provides:       bundled(golang(github.com/syndtr/gocapability)) = db04d3cc01c8b54962a58ec7e491717d06cfcc16

+ Provides:       bundled(golang(github.com/opencontainers/runc)) = v1.0.0-rc94

+ Provides:       bundled(golang(github.com/opencontainers/runtime-spec)) = 4d89ac9fbff6c455f46a5bb59c6b1bb7184a5e43

+ Provides:       bundled(golang(github.com/opencontainers/selinux)) = v1.6.0

+ Provides:       bundled(golang(github.com/pkg/errors)) = v0.9.1

+ Provides:       bundled(golang(github.com/prometheus/client_golang)) = v1.6.0

+ Provides:       bundled(golang(github.com/prometheus/client_model)) = v0.2.0

+ Provides:       bundled(golang(github.com/prometheus/common)) = v0.9.1

+ Provides:       bundled(golang(github.com/prometheus/procfs)) = v0.0.11

+ Provides:       bundled(golang(github.com/russross/blackfriday/v2)) = v2.0.1

+ Provides:       bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = v1.0.0

+ Provides:       bundled(golang(github.com/sirupsen/logrus)) = v1.6.0

+ Provides:       bundled(golang(github.com/syndtr/gocapability)) = d98352740cb2c55f81556b63d4a1ec64c5a319c2

  Provides:       bundled(golang(github.com/tchap/go-patricia)) = v2.2.6

- Provides:       bundled(golang(github.com/urfave/cli)) = 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c

- Provides:       bundled(golang(github.com/xeipuuv/gojsonpointer)) = 4e3ac2762d5f479393488629ee9370b50873b3a6

- Provides:       bundled(golang(github.com/xeipuuv/gojsonreference)) = bd5ef7bd5415a7ac448318e64f11a24cd21e594b

- Provides:       bundled(golang(github.com/xeipuuv/gojsonschema)) = 1d523034197ff1f222f6429836dd36a2457a1874

- Provides:       bundled(golang(go.etcd.io/bbolt)) = v1.3.1-etcd.8

- Provides:       bundled(golang(golang.org/x/crypto)) = 69ecbb4d6d5dab05e49161c6e77ea40a030884e1

- Provides:       bundled(golang(golang.org/x/net)) = b3756b4b77d7b13260a0a2ec658753cf48922eac

- Provides:       bundled(golang(golang.org/x/oauth2)) = a6bd8cefa1811bd24b86f8902872e4e8225f74c4

- Provides:       bundled(golang(golang.org/x/sync)) = 450f422ab23cf9881c94e2db30cac0eb1b7cf80c

- Provides:       bundled(golang(golang.org/x/sys)) = 41f3e6584952bb034a481797859f6ab34b6803bd

- Provides:       bundled(golang(golang.org/x/text)) = 19e51611da83d6be54ddafce4a4af510cb3e9ea4

- Provides:       bundled(golang(golang.org/x/time)) = f51c12702a4d776e4c1fa9b0fabab841babae631

- Provides:       bundled(golang(google.golang.org/appengine)) = 54a98f90d1c46b7731eb8fb305d2a321c30ef610

- Provides:       bundled(golang(google.golang.org/genproto)) = d80a6e20e776b0b17a324d0ba1ab50a39c8e8944

- Provides:       bundled(golang(google.golang.org/grpc)) = 39e8a7b072a67ca2a75f57fa2e0d50995f5b22f6

- Provides:       bundled(golang(gopkg.in/inf.v0)) = 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4

- Provides:       bundled(golang(gopkg.in/yaml.v2)) = 53403b58ad1b561927d19068c655246f2db79d48

- Provides:       bundled(golang(gotest.tools)) = v2.1.0

- Provides:       bundled(golang(k8s.io/api)) = kubernetes-1.12.0

- Provides:       bundled(golang(k8s.io/apimachinery)) = kubernetes-1.12.0

- Provides:       bundled(golang(k8s.io/apiserver)) = kubernetes-1.12.0

- Provides:       bundled(golang(k8s.io/client-go)) = kubernetes-1.12.0

- Provides:       bundled(golang(k8s.io/kubernetes)) = v1.12.0

- Provides:       bundled(golang(k8s.io/utils)) = cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb

+ Provides:       bundled(golang(github.com/urfave/cli)) = v1.22.1

+ Provides:       bundled(golang(github.com/willf/bitset)) = v1.1.11

+ Provides:       bundled(golang(go.etcd.io/bbolt)) = v1.3.5

+ Provides:       bundled(golang(golang.org/x/crypto)) = 75b288015ac94e66e3d6715fb68a9b41bf046ec2

+ Provides:       bundled(golang(golang.org/x/net)) = 69a78807bb2bb6d1599c68698c6b009505012083

+ Provides:       bundled(golang(golang.org/x/oauth2)) = 858c2ad4c8b6c5d10852cb89079f6ca1c7309787

+ Provides:       bundled(golang(golang.org/x/sync)) = 67f06af15bc961c363a7260195bcd53487529a21

+ Provides:       bundled(golang(golang.org/x/sys)) = d19ff857e887eacb631721f188c7d365c2331456

+ Provides:       bundled(golang(golang.org/x/text)) = v0.3.3

+ Provides:       bundled(golang(golang.org/x/time)) = 555d28b269f0569763d25dbe1a237ae74c6bcc82

+ Provides:       bundled(golang(google.golang.org/genproto)) = e50cd9704f63023d62cd06a1994b98227fc4d21a

+ Provides:       bundled(golang(google.golang.org/grpc)) = v1.27.1

+ Provides:       bundled(golang(go.opencensus.io)) = v0.22.0

+ Provides:       bundled(golang(gopkg.in/inf.v0)) = v0.9.1

+ Provides:       bundled(golang(gopkg.in/square/go-jose.v2)) = v2.3.1

+ Provides:       bundled(golang(gopkg.in/yaml.v2)) = v2.2.8

+ Provides:       bundled(golang(gotest.tools/v3)) = v3.0.2

+ Provides:       bundled(golang(k8s.io/apimachinery)) = v0.19.10

+ Provides:       bundled(golang(k8s.io/apiserver)) = v0.19.10

+ Provides:       bundled(golang(k8s.io/api)) = v0.19.10

+ Provides:       bundled(golang(k8s.io/client-go)) = v0.19.10

+ Provides:       bundled(golang(k8s.io/cri-api)) = v0.19.10

+ Provides:       bundled(golang(k8s.io/klog/v2)) = v2.2.0

+ Provides:       bundled(golang(k8s.io/utils)) = d5654de09c73da55eb19ae4ab4f734f7a61747a6

+ Provides:       bundled(golang(sigs.k8s.io/structured-merge-diff/v4)) = v4.0.3

+ Provides:       bundled(golang(sigs.k8s.io/yaml)) = v1.2.0

  

  

  %description
@@ -144,32 +152,34 @@ 

  

  

  %prep

- %autosetup

+ %autosetup -p1

+ # Replace default bin directory

+ sed -i "s|/usr/local/bin/containerd|/usr/bin/containerd|" containerd.service

  

  

  %build

  %gobuildroot

  export LDFLAGS="-X %{goipath}/version.Version=%{version}"

- %gobuild -o _bin/containerd %{goipath}/cmd/containerd

- %gobuild -o _bin/containerd-shim %{goipath}/cmd/containerd-shim

- %gobuild -o _bin/ctr %{goipath}/cmd/ctr

+ for cmd in cmd/{containerd,containerd-shim-*,containerd-stress,ctr,gen-manpages} ; do

+   %gobuild -o _bin/$(basename $cmd) %{goipath}/$cmd

+ done

  mkdir _man

- go-md2man -in docs/man/containerd.1.md -out _man/containerd.1

- go-md2man -in docs/man/containerd-config.1.md -out _man/containerd-config.1

- go-md2man -in docs/man/ctr.1.md -out _man/ctr.1

+ go-md2man -in docs/man/containerd-config.8.md -out _man/containerd-config.8

  go-md2man -in docs/man/containerd-config.toml.5.md -out _man/containerd-config.toml.5

+ _bin/gen-manpages containerd.8 _man

+ _bin/gen-manpages ctr.8 _man

+ rm -rf _bin/gen-manpages

  

  

  %install

- install -D -p -m 0755 _bin/containerd %{buildroot}%{_bindir}/containerd

- install -D -p -m 0755 _bin/containerd-shim %{buildroot}%{_bindir}/containerd-shim

- install -D -p -m 0755 _bin/ctr %{buildroot}%{_bindir}/ctr

- install -D -p -m 0644 _man/containerd.1 %{buildroot}%{_mandir}/man1/containerd.1

- install -D -p -m 0644 _man/containerd-config.1 %{buildroot}%{_mandir}/man1/containerd-config.1

- install -D -p -m 0644 _man/ctr.1 %{buildroot}%{_mandir}/man1/ctr.1

+ install -dp %{buildroot}%{_bindir}

+ install -D -p -m 0755 _bin/{containerd,containerd-shim-*,containerd-stress,ctr} -t %{buildroot}%{_bindir}/

+ install -D -p -m 0644 _man/containerd.8 %{buildroot}%{_mandir}/man8/containerd.8

+ install -D -p -m 0644 _man/containerd-config.8 %{buildroot}%{_mandir}/man8/containerd-config.8

+ install -D -p -m 0644 _man/ctr.8 %{buildroot}%{_mandir}/man8/ctr.8

  install -D -p -m 0644 _man/containerd-config.toml.5 %{buildroot}%{_mandir}/man5/containerd-config.toml.5

- install -D -p -m 0644 %{S:1} %{buildroot}%{_unitdir}/containerd.service

- install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml

+ install -D -p -m 0644 containerd.service %{buildroot}%{_unitdir}/containerd.service

+ install -D -p -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/containerd/config.toml

  

  

  %if %{with tests}
@@ -193,19 +203,29 @@ 

  %files

  %license LICENSE

  %doc README.md

- %{_bindir}/containerd

- %{_bindir}/containerd-shim

+ %dir %{_sysconfdir}/containerd

+ %config(noreplace) %{_sysconfdir}/containerd/config.toml

+ %{_bindir}/containerd*

  %{_bindir}/ctr

- %{_mandir}/man1/containerd.1*

- %{_mandir}/man1/containerd-config.1*

- %{_mandir}/man1/ctr.1*

  %{_mandir}/man5/containerd-config.toml.5*

+ %{_mandir}/man8/containerd.8*

+ %{_mandir}/man8/containerd-config.8*

+ %{_mandir}/man8/ctr.8*

  %{_unitdir}/containerd.service

- %dir %{_sysconfdir}/containerd

- %config(noreplace) %{_sysconfdir}/containerd/config.toml

+ %dir %{_sharedstatedir}/containerd

+ %dir %{_sharedstatedir}/containerd/opt

  

  

  %changelog

+ * Sun Feb 20 2022 Maxwell G <gotmax@e.email> - 1.4.12-1

+ - Update to 1.4.12.

+ - CVE-2020-15257: Fixes rhbz#1899487; Fixes rhbz#1903051.

+ - CVE-2021-21334: Fixes rhbz#1937935; Fixes rhbz#1937937.

+ - CVE-2021-32760: Fixes rhbz#1982681; Fixes rhbz#1983934.

+ - CVE-2021-41103: Fixes rhbz#2011007; Fixes rhbz#2011013.

+ - Modernize specfile

+ - Backport fix for rhbz#1798419 from Fedora.

+ 

  * Thu Oct 29 2020 Olivier Lemasle <o.lemasle@gmail.com> - 1.2.14-1

  - Latest upstream - Fix CVE-2020-15157 (#1890620)

  

file modified
+8 -14
@@ -1,15 +1,9 @@ 

- #root = "/var/lib/containerd"

- #state = "/run/containerd"

- #subreaper = true

- #oom_score = 0

+ version = 2

  

- #[grpc]

- #  address = "/run/containerd/containerd.sock"

- #  uid = 0

- #  gid = 0

- 

- #[debug]

- #  address = "/run/containerd/debug.sock"

- #  uid = 0

- #  gid = 0

- #  level = "info"

+ [plugins]

+   [plugins."io.containerd.grpc.v1.cri"]

+     [plugins."io.containerd.grpc.v1.cri".cni]

+       bin_dir = "/usr/libexec/cni/"

+       conf_dir = "/etc/cni/net.d"

+   [plugins."io.containerd.internal.v1.opt"]

+     path = "/var/lib/containerd/opt"

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (containerd-1.2.14.tar.gz) = 054be08332512089f27206739a3740c16f690f79c0beb6b53d9b94f5ec27c9ea1b7ea905f8e0bc072cc405dcfbdedd1cd7034c2e3ed9ebbb30a83268842d78b8

+ SHA512 (containerd-1.4.12.tar.gz) = 52dc4b0344eb4c6a6f1cc5690ff0c70ee052ef05c02300ed4a806458c40bb1970c26b374b0733b2c30a05c04a731d62a7c4206b1d768075d51c202912efd32b1

  • Update to 1.4.12.
  • CVE-2020-15257: Fixes rhbz#1899487; Fixes rhbz#1903051.
  • CVE-2021-21334: Fixes rhbz#1937935; Fixes rhbz#1937937.
  • CVE-2021-32760: Fixes rhbz#1982681; Fixes rhbz#1983934.
  • CVE-2021-41103: Fixes rhbz#2011007; Fixes rhbz#2011013.
  • Modernize specfile
  • Backport fix for rhbz#1798419 from Fedora.

Pull-Request has been closed by gotmax23

a month ago