spot pushed to cura-lulzbot (f33). "3.6.22"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-10-01 00:43:01 UTC
From d152e4f73374837a69c910bb6597ca8866ace8bf Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot(a)fedoraproject.org>
Date: Sep 30 2020 22:40:01 +0000
Subject: 3.6.22
---
diff --git a/.gitignore b/.gitignore
index ecafe3d..2534169 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/cura-lulzbot-3.6.12.tar.gz
/cura-lulzbot-3.6.18.tar.gz
/cura-lulzbot-3.6.21.tar.gz
+/cura-lulzbot-3.6.22.tar.gz
diff --git a/cura-lulzbot.spec b/cura-lulzbot.spec
index cbaae00..f61b9fd 100644
--- a/cura-lulzbot.spec
+++ b/cura-lulzbot.spec
@@ -1,15 +1,15 @@
%global shortname cura-lulzbot
Name: cura-lulzbot
-Version: 3.6.21
-Release: 5%{?dist}
+Version: 3.6.22
+Release: 1%{?dist}
Epoch: 1
Summary: 3D printer control software
License: AGPLv3+
URL: https://code.alephobjects.com/project/profile/10/
-# git clone https://code.alephobjects.com/source/cura-lulzbot.git
+# git clone https://gitlab.com/lulzbot3d/cura-le/cura-lulzbot.git
# cd cura-lulzbot
-# git checkout v3.6.21
+# git checkout v3.6.22
## CANNOT use git archive here, need git hash for version
# cd ..
# mv cura-lulzbot cura-lulzbot-3.6.21
@@ -33,19 +33,20 @@ BuildRequires: gettext
BuildRequires: git
BuildRequires: python3-devel
BuildRequires: python3-pytest
-BuildRequires: python3-uranium-lulzbot == %{version}
-BuildRequires: CuraEngine-lulzbot >= 1:%{version}
+BuildRequires: python3-uranium-lulzbot >= 3.6.21
+BuildRequires: CuraEngine-lulzbot >= 1:3.6.21
Requires: open-sans-fonts
Requires: python3-numpy-stl
Requires: python3-pyserial
Requires: python3-savitar >= 2.6
-Requires: python3-uranium-lulzbot == %{version}
+Requires: python3-uranium-lulzbot >= 3.6.21
Requires: python3-zeroconf
Requires: qt5-qtquickcontrols2, qt5-qtquickcontrols
-Requires: CuraEngine-lulzbot >= 1:%{version}
-Requires: lulzbot-marlin-firmware >= 1:1.1.9.34
-Requires: lulzbot-marlin-firmware-pro >= 1:2.0.0.144
+Requires: CuraEngine-lulzbot >= 1:3.6.21
+# -12 has the M175 firmware needed for cura-le 3.6.22
+Requires: lulzbot-marlin-firmware >= 1:1.1.9.34-12
+Requires: lulzbot-marlin-firmware-pro >= 1:2.0.0.144-12
Requires: lulzbot-marlin-firmware-bio >= 1:2.0.0.174
# lulzbot package has the materials inside it, does not conflict
# Requires: cura-fdm-materials == %%{version}
@@ -205,6 +206,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{shortname}.desktop
%{_prefix}/lib/%{shortname}
%changelog
+* Wed Sep 23 2020 Tom Callaway <spot(a)fedoraproject.org> - 1:3.6.22-1
+- update to 3.6.22
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:3.6.21-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index b769bcc..c2c7b91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cura-lulzbot-3.6.21.tar.gz) = fc9f936dbcb82486605ba7a9bb84bce919c17471b67a48886538937cd323788a679477cd3b8afaacac6d64568281fd75efc925cadc64a8d9639e8298d8699261
+SHA512 (cura-lulzbot-3.6.22.tar.gz) = ad4c93c16c7a0d68871d65c591e9ab45d004f22dcd4d1e537c3e086617e3269356b2c8a2fd6ef716c6798615128a575307aa4f958b7aa9df8a3d9b3503a6e956
https://src.fedoraproject.org/rpms/cura-lulzbot/c/d152e4f73374837a69c910b...
3Â years, 6Â months
spontsle pushed to ipmctl (epel8). "update to version 02.00.00.3825
from GitHub"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-10-01 00:10:59 UTC
From 2b081ccd2898b803e3c04f75ddf459e5d8034a32 Mon Sep 17 00:00:00 2001
From: Steven Pontsler <steven.pontsler(a)intel.com>
Date: Sep 30 2020 22:17:39 +0000
Subject: update to version 02.00.00.3825 from GitHub
---
diff --git a/.gitignore b/.gitignore
index e0def91..efd2147 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/ipmctl-02.00.00.3759.tar.gz
/ipmctl-02.00.00.3764.tar.gz
/ipmctl-02.00.00.3809.tar.gz
+/ipmctl-02.00.00.3825.tar.gz
diff --git a/ipmctl.spec b/ipmctl.spec
index 1b2dd1e..51362d0 100644
--- a/ipmctl.spec
+++ b/ipmctl.spec
@@ -1,5 +1,5 @@
Name: ipmctl
-Version: 02.00.00.3809
+Version: 02.00.00.3825
Release: 1%{?dist}
Summary: Utility for managing Intel Optane DC persistent memory modules
License: BSD
@@ -83,6 +83,7 @@ API for development of Intel Optane DC persistent memory management utilities.
%{_libdir}/libipmctl.so.4*
%dir %{_datadir}/doc/ipmctl
%doc %{_datadir}/doc/ipmctl/ipmctl_default.conf
+%doc %{_datadir}/doc/ipmctl/LICENSE
%config(noreplace) %{_datadir}/ipmctl/ipmctl.conf
%dir %{_localstatedir}/log/ipmctl
%config(noreplace) %{_sysconfdir}/logrotate.d/ipmctl
@@ -96,6 +97,9 @@ API for development of Intel Optane DC persistent memory management utilities.
%{_libdir}/pkgconfig/libipmctl.pc
%changelog
+* Wed Sep 30 2020 Steven Pontsler <steven.pontsler(a)intel.com> - 02.00.00.3825-1
+- Release 02.00.00.3825
+
* Mon Aug 31 2020 Steven Pontsler <steven.pontsler(a)intel.com> - 02.00.00.3809-1
- Release 02.00.00.3809
diff --git a/sources b/sources
index b025f21..f10feb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ipmctl-02.00.00.3809.tar.gz) = f1981667e8c8b050dba3fb0c84257440f05895e2fce3e43ca136c22a34454c32aebb05543c91531162ebc7c3dfee455d4a53b29be545288407031803f3b2d55d
+SHA512 (ipmctl-02.00.00.3825.tar.gz) = 71b68003986635417f7d8980c3d61f0e0042193ff4d500bfb0b1b7e2cb528f68609d412623a7f97b34d87352fa2638d3c6cb0748dea1609d18569e30edc4e1bc
https://src.fedoraproject.org/rpms/ipmctl/c/2b081ccd2898b803e3c04f75ddf45...
3Â years, 6Â months
spontsle pushed to ipmctl (epel7). "update to version 02.00.00.3825
from GitHub"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-10-01 00:05:47 UTC
From 60aa96ef33962a72393664a900242e2913e4d1f7 Mon Sep 17 00:00:00 2001
From: Steven Pontsler <steven.pontsler(a)intel.com>
Date: Sep 30 2020 22:12:21 +0000
Subject: update to version 02.00.00.3825 from GitHub
---
diff --git a/.gitignore b/.gitignore
index e0def91..efd2147 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/ipmctl-02.00.00.3759.tar.gz
/ipmctl-02.00.00.3764.tar.gz
/ipmctl-02.00.00.3809.tar.gz
+/ipmctl-02.00.00.3825.tar.gz
diff --git a/ipmctl.spec b/ipmctl.spec
index e4d481b..9ec1f7c 100644
--- a/ipmctl.spec
+++ b/ipmctl.spec
@@ -1,5 +1,5 @@
Name: ipmctl
-Version: 02.00.00.3809
+Version: 02.00.00.3825
Release: 1%{?dist}
Summary: Utility for managing Intel Optane DC persistent memory modules
License: BSD
@@ -83,6 +83,7 @@ API for development of Intel Optane DC persistent memory management utilities.
%{_libdir}/libipmctl.so.4*
%dir %{_datadir}/doc/ipmctl
%doc %{_datadir}/doc/ipmctl/ipmctl_default.conf
+%doc %{_datadir}/doc/ipmctl/LICENSE
%config(noreplace) %{_datadir}/ipmctl/ipmctl.conf
%dir %{_localstatedir}/log/ipmctl
%config(noreplace) %{_sysconfdir}/logrotate.d/ipmctl
@@ -96,6 +97,9 @@ API for development of Intel Optane DC persistent memory management utilities.
%{_libdir}/pkgconfig/libipmctl.pc
%changelog
+* Wed Sep 30 2020 Steven Pontsler <steven.pontsler(a)intel.com> - 02.00.00.3825-1
+- Release 02.00.00.3825
+
* Mon Aug 31 2020 Steven Pontsler <steven.pontsler(a)intel.com> - 02.00.00.3809-1
- Release 02.00.00.3809
diff --git a/sources b/sources
index b025f21..f10feb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ipmctl-02.00.00.3809.tar.gz) = f1981667e8c8b050dba3fb0c84257440f05895e2fce3e43ca136c22a34454c32aebb05543c91531162ebc7c3dfee455d4a53b29be545288407031803f3b2d55d
+SHA512 (ipmctl-02.00.00.3825.tar.gz) = 71b68003986635417f7d8980c3d61f0e0042193ff4d500bfb0b1b7e2cb528f68609d412623a7f97b34d87352fa2638d3c6cb0748dea1609d18569e30edc4e1bc
https://src.fedoraproject.org/rpms/ipmctl/c/60aa96ef33962a72393664a900242...
3Â years, 6Â months
eclipseo pushed to golang-github-containerd-cri (f33). "Update to
1.19.0 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-10-01 00:04:40 UTC
From 552b07700b86560938df5bd5f5f190252122d6d6 Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Oct 01 2020 00:03:34 +0000
Subject: Update to 1.19.0
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
---
diff --git a/.gitignore b/.gitignore
index 56a2937..ea00dd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/cri-1.11.1.tar.gz
/cri-50b9e10ea54a9b57049fe311e4fe0a96277ef1c2.tar.gz
+/cri-1.19.0.tar.gz
diff --git a/0001-Fix-compile-error-with-k8s-io-apimachinery-1-17.patch b/0001-Fix-compile-error-with-k8s-io-apimachinery-1-17.patch
deleted file mode 100644
index cbb537e..0000000
--- a/0001-Fix-compile-error-with-k8s-io-apimachinery-1-17.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru cri/pkg/server/streaming.go cri-fix-k8s-io-apimachinery-1-17/pkg/server/streaming.go
---- cri/pkg/server/streaming.go 2020-02-04 17:23:41.000000000 +0100
-+++ cri-fix-k8s-io-apimachinery-1-17/pkg/server/streaming.go 2020-03-31 23:26:16.499304454 +0200
-@@ -68,7 +68,7 @@
-
- func newStreamServer(c *criService, addr, port, streamIdleTimeout string) (streaming.Server, error) {
- if addr == "" {
-- a, err := k8snet.ChooseBindAddress(nil)
-+ a, err := k8snet.ChooseHostInterface()
- if err != nil {
- return nil, errors.Wrap(err, "failed to get stream server address")
- }
diff --git a/Remove-windows-only-dep.patch b/Remove-windows-only-dep.patch
new file mode 100644
index 0000000..78c728d
--- /dev/null
+++ b/Remove-windows-only-dep.patch
@@ -0,0 +1,23 @@
+diff -up cri-1.19.0/pkg/server/helpers.go.orig cri-1.19.0/pkg/server/helpers.go
+--- cri-1.19.0/pkg/server/helpers.go.orig 2020-08-20 19:16:29.000000000 +0200
++++ cri-1.19.0/pkg/server/helpers.go 2020-08-22 15:23:04.336557870 +0200
+@@ -24,7 +24,7 @@ import (
+ "strings"
+
+ "github.com/BurntSushi/toml"
+- runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
++// runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
+ "github.com/containerd/containerd"
+ "github.com/containerd/containerd/containers"
+ "github.com/containerd/containerd/plugin"
+@@ -325,8 +325,8 @@ func getRuntimeOptionsType(t string) int
+ return &runcoptions.Options{}
+ case plugin.RuntimeLinuxV1:
+ return &runctypes.RuncOptions{}
+- case runtimeRunhcsV1:
+- return &runhcsoptions.Options{}
++// case runtimeRunhcsV1:
++// return &runhcsoptions.Options{}
+ default:
+ return &runtimeoptions.Options{}
+ }
diff --git a/golang-github-containerd-cri.spec b/golang-github-containerd-cri.spec
index 59bf26a..def6442 100644
--- a/golang-github-containerd-cri.spec
+++ b/golang-github-containerd-cri.spec
@@ -3,8 +3,7 @@
# https://github.com/containerd/cri
%global goipath github.com/containerd/cri
-Version: 1.3
-%global commit 50b9e10ea54a9b57049fe311e4fe0a96277ef1c2
+Version: 1.19.0
%gometa
@@ -19,27 +18,27 @@ Name: %{goname}
# containerd-cri changed versioning scheme to match containerd
Epoch: 1
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Containerd Plugin for Kubernetes Container Runtime Interface
# Upstream license specification: Apache-2.0
License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
-# To work with k8s.io/apimachinery 1.17.2 (golang-k8s-apimachinery-devel)
-Patch0: 0001-Fix-compile-error-with-k8s-io-apimachinery-1-17.patch
+# Remove windows only dep (github.com/Microsoft/hcsshim)
+Patch0: Remove-windows-only-dep.patch
-BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/containerd/cgroups)
BuildRequires: golang(github.com/containerd/containerd)
BuildRequires: golang(github.com/containerd/containerd/api/events)
BuildRequires: golang(github.com/containerd/containerd/api/services/containers/v1)
BuildRequires: golang(github.com/containerd/containerd/api/services/diff/v1)
BuildRequires: golang(github.com/containerd/containerd/api/services/images/v1)
+BuildRequires: golang(github.com/containerd/containerd/api/services/introspection/v1)
BuildRequires: golang(github.com/containerd/containerd/api/services/namespaces/v1)
BuildRequires: golang(github.com/containerd/containerd/api/services/tasks/v1)
BuildRequires: golang(github.com/containerd/containerd/api/types)
BuildRequires: golang(github.com/containerd/containerd/cio)
+# BuildRequires: golang(github.com/containerd/containerd/cmd/containerd/command)
BuildRequires: golang(github.com/containerd/containerd/containers)
BuildRequires: golang(github.com/containerd/containerd/content)
BuildRequires: golang(github.com/containerd/containerd/contrib/apparmor)
@@ -52,11 +51,14 @@ BuildRequires: golang(github.com/containerd/containerd/images)
BuildRequires: golang(github.com/containerd/containerd/leases)
BuildRequires: golang(github.com/containerd/containerd/log)
BuildRequires: golang(github.com/containerd/containerd/metrics/cgroups)
+BuildRequires: golang(github.com/containerd/containerd/metrics/types/v1)
+BuildRequires: golang(github.com/containerd/containerd/metrics/types/v2)
BuildRequires: golang(github.com/containerd/containerd/mount)
BuildRequires: golang(github.com/containerd/containerd/namespaces)
BuildRequires: golang(github.com/containerd/containerd/oci)
BuildRequires: golang(github.com/containerd/containerd/platforms)
BuildRequires: golang(github.com/containerd/containerd/plugin)
+BuildRequires: golang(github.com/containerd/containerd/reference/docker)
BuildRequires: golang(github.com/containerd/containerd/remotes/docker)
BuildRequires: golang(github.com/containerd/containerd/runtime/linux/runctypes)
BuildRequires: golang(github.com/containerd/containerd/runtime/v1/linux)
@@ -77,29 +79,30 @@ BuildRequires: golang(github.com/containerd/containerd/services/tasks)
BuildRequires: golang(github.com/containerd/containerd/services/version)
BuildRequires: golang(github.com/containerd/containerd/snapshots)
BuildRequires: golang(github.com/containerd/containerd/snapshots/overlay)
+BuildRequires: golang(github.com/containerd/containerd/sys)
BuildRequires: golang(github.com/containerd/containerd/version)
BuildRequires: golang(github.com/containerd/continuity)
BuildRequires: golang(github.com/containerd/continuity/fs)
BuildRequires: golang(github.com/containerd/fifo)
BuildRequires: golang(github.com/containerd/go-cni)
+BuildRequires: golang(github.com/containerd/imgcrypt)
+BuildRequires: golang(github.com/containerd/imgcrypt/images/encryption)
BuildRequires: golang(github.com/containerd/typeurl)
BuildRequires: golang(github.com/containernetworking/plugins/pkg/ns)
BuildRequires: golang(github.com/davecgh/go-spew/spew)
-BuildRequires: golang(github.com/docker/distribution/digestset)
-BuildRequires: golang(github.com/docker/distribution/reference)
BuildRequires: golang(github.com/docker/docker/pkg/symlink)
-BuildRequires: golang(github.com/docker/docker/pkg/system)
BuildRequires: golang(github.com/docker/docker/pkg/truncindex)
+BuildRequires: golang(github.com/emicklei/go-restful)
+BuildRequires: golang(github.com/fsnotify/fsnotify)
BuildRequires: golang(github.com/gogo/protobuf/gogoproto)
BuildRequires: golang(github.com/gogo/protobuf/proto)
BuildRequires: golang(github.com/gogo/protobuf/types)
BuildRequires: golang(github.com/opencontainers/go-digest)
+BuildRequires: golang(github.com/opencontainers/go-digest/digestset)
BuildRequires: golang(github.com/opencontainers/image-spec/identity)
BuildRequires: golang(github.com/opencontainers/image-spec/specs-go/v1)
BuildRequires: golang(github.com/opencontainers/runc/libcontainer/apparmor)
BuildRequires: golang(github.com/opencontainers/runc/libcontainer/devices)
-BuildRequires: golang(github.com/opencontainers/runc/libcontainer/seccomp)
-BuildRequires: golang(github.com/opencontainers/runc/libcontainer/system)
BuildRequires: golang(github.com/opencontainers/runtime-spec/specs-go)
BuildRequires: golang(github.com/opencontainers/selinux/go-selinux)
BuildRequires: golang(github.com/opencontainers/selinux/go-selinux/label)
@@ -108,24 +111,36 @@ BuildRequires: golang(github.com/sirupsen/logrus)
BuildRequires: golang(golang.org/x/net/context)
BuildRequires: golang(golang.org/x/sys/unix)
BuildRequires: golang(google.golang.org/grpc)
+BuildRequires: golang(google.golang.org/grpc/codes)
+BuildRequires: golang(google.golang.org/grpc/status)
+BuildRequires: golang(k8s.io/api/core/v1)
+BuildRequires: golang(k8s.io/apimachinery/pkg/api/errors)
+BuildRequires: golang(k8s.io/apimachinery/pkg/api/resource)
+BuildRequires: golang(k8s.io/apimachinery/pkg/apis/meta/v1)
+BuildRequires: golang(k8s.io/apimachinery/pkg/types)
BuildRequires: golang(k8s.io/apimachinery/pkg/util/clock)
+BuildRequires: golang(k8s.io/apimachinery/pkg/util/httpstream)
+BuildRequires: golang(k8s.io/apimachinery/pkg/util/httpstream/spdy)
BuildRequires: golang(k8s.io/apimachinery/pkg/util/net)
+BuildRequires: golang(k8s.io/apimachinery/pkg/util/remotecommand)
BuildRequires: golang(k8s.io/apimachinery/pkg/util/runtime)
+BuildRequires: golang(k8s.io/apimachinery/pkg/util/sets)
+BuildRequires: golang(k8s.io/apiserver/pkg/server/httplog)
+BuildRequires: golang(k8s.io/apiserver/pkg/util/wsstream)
BuildRequires: golang(k8s.io/client-go/tools/remotecommand)
BuildRequires: golang(k8s.io/client-go/util/cert)
+BuildRequires: golang(k8s.io/component-base/logs/logreduction)
BuildRequires: golang(k8s.io/cri-api/pkg/apis)
BuildRequires: golang(k8s.io/cri-api/pkg/apis/runtime/v1alpha2)
-BuildRequires: golang(k8s.io/klog)
-BuildRequires: golang(k8s.io/kubernetes/pkg/kubelet/remote)
-BuildRequires: golang(k8s.io/kubernetes/pkg/kubelet/server/streaming)
-BuildRequires: golang(k8s.io/kubernetes/pkg/kubelet/util)
-BuildRequires: golang(k8s.io/kubernetes/pkg/util/bandwidth)
+BuildRequires: golang(k8s.io/klog/v2)
BuildRequires: golang(k8s.io/utils/exec)
%if %{with check}
# Tests
+BuildRequires: golang(github.com/containerd/cgroups/stats/v1)
BuildRequires: golang(github.com/containerd/containerd/reference)
BuildRequires: golang(github.com/golang/protobuf/proto)
+BuildRequires: golang(github.com/opencontainers/runc/libcontainer/configs)
BuildRequires: golang(github.com/stretchr/testify/assert)
BuildRequires: golang(github.com/stretchr/testify/require)
%endif
@@ -139,7 +154,6 @@ BuildRequires: golang(github.com/stretchr/testify/require)
%goprep
%autopatch -p1
rm -rf cmd
-find . -name "*.go" -exec sed -i "s|k8s.io/kubernetes/pkg/kubelet/apis/cri|k8s.io/cri-api/pkg/apis|" "{}" +;
%install
%gopkginstall
@@ -153,6 +167,9 @@ find . -name "*.go" -exec sed -i "s|k8s.io/kubernetes/pkg/kubelet/apis/cri|k8s.i
%gopkgfiles
%changelog
+* Fri Aug 21 20:39:11 CEST 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 1:1.19.0-1
+- Update to 1.19.0
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 91c934a..8815943 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cri-50b9e10ea54a9b57049fe311e4fe0a96277ef1c2.tar.gz) = 0aabec47323f4d9046017fd383889af8b46920b3ae965117f1897586b6698f9849499eb1e3a58de40d338fa8cfadcaf8d1c6e817d4b18731066e3cf7b61c06b9
+SHA512 (cri-1.19.0.tar.gz) = 86047b86ab2c632990e33c3e1b9bccdd82abfe94a116996a91b2fc9627b858eeebcb65e81c76478ff18391f66deb734c994ac272848a097abb016f2d0ff80976
https://src.fedoraproject.org/rpms/golang-github-containerd-cri/c/552b077...
3Â years, 6Â months
eclipseo pushed to golang-github-containerd-cri (master). "Update to
1.19.0 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-10-01 00:03:52 UTC
From 552b07700b86560938df5bd5f5f190252122d6d6 Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Oct 01 2020 00:03:34 +0000
Subject: Update to 1.19.0
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
---
diff --git a/.gitignore b/.gitignore
index 56a2937..ea00dd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/cri-1.11.1.tar.gz
/cri-50b9e10ea54a9b57049fe311e4fe0a96277ef1c2.tar.gz
+/cri-1.19.0.tar.gz
diff --git a/0001-Fix-compile-error-with-k8s-io-apimachinery-1-17.patch b/0001-Fix-compile-error-with-k8s-io-apimachinery-1-17.patch
deleted file mode 100644
index cbb537e..0000000
--- a/0001-Fix-compile-error-with-k8s-io-apimachinery-1-17.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru cri/pkg/server/streaming.go cri-fix-k8s-io-apimachinery-1-17/pkg/server/streaming.go
---- cri/pkg/server/streaming.go 2020-02-04 17:23:41.000000000 +0100
-+++ cri-fix-k8s-io-apimachinery-1-17/pkg/server/streaming.go 2020-03-31 23:26:16.499304454 +0200
-@@ -68,7 +68,7 @@
-
- func newStreamServer(c *criService, addr, port, streamIdleTimeout string) (streaming.Server, error) {
- if addr == "" {
-- a, err := k8snet.ChooseBindAddress(nil)
-+ a, err := k8snet.ChooseHostInterface()
- if err != nil {
- return nil, errors.Wrap(err, "failed to get stream server address")
- }
diff --git a/Remove-windows-only-dep.patch b/Remove-windows-only-dep.patch
new file mode 100644
index 0000000..78c728d
--- /dev/null
+++ b/Remove-windows-only-dep.patch
@@ -0,0 +1,23 @@
+diff -up cri-1.19.0/pkg/server/helpers.go.orig cri-1.19.0/pkg/server/helpers.go
+--- cri-1.19.0/pkg/server/helpers.go.orig 2020-08-20 19:16:29.000000000 +0200
++++ cri-1.19.0/pkg/server/helpers.go 2020-08-22 15:23:04.336557870 +0200
+@@ -24,7 +24,7 @@ import (
+ "strings"
+
+ "github.com/BurntSushi/toml"
+- runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
++// runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
+ "github.com/containerd/containerd"
+ "github.com/containerd/containerd/containers"
+ "github.com/containerd/containerd/plugin"
+@@ -325,8 +325,8 @@ func getRuntimeOptionsType(t string) int
+ return &runcoptions.Options{}
+ case plugin.RuntimeLinuxV1:
+ return &runctypes.RuncOptions{}
+- case runtimeRunhcsV1:
+- return &runhcsoptions.Options{}
++// case runtimeRunhcsV1:
++// return &runhcsoptions.Options{}
+ default:
+ return &runtimeoptions.Options{}
+ }
diff --git a/golang-github-containerd-cri.spec b/golang-github-containerd-cri.spec
index 59bf26a..def6442 100644
--- a/golang-github-containerd-cri.spec
+++ b/golang-github-containerd-cri.spec
@@ -3,8 +3,7 @@
# https://github.com/containerd/cri
%global goipath github.com/containerd/cri
-Version: 1.3
-%global commit 50b9e10ea54a9b57049fe311e4fe0a96277ef1c2
+Version: 1.19.0
%gometa
@@ -19,27 +18,27 @@ Name: %{goname}
# containerd-cri changed versioning scheme to match containerd
Epoch: 1
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Containerd Plugin for Kubernetes Container Runtime Interface
# Upstream license specification: Apache-2.0
License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
-# To work with k8s.io/apimachinery 1.17.2 (golang-k8s-apimachinery-devel)
-Patch0: 0001-Fix-compile-error-with-k8s-io-apimachinery-1-17.patch
+# Remove windows only dep (github.com/Microsoft/hcsshim)
+Patch0: Remove-windows-only-dep.patch
-BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/containerd/cgroups)
BuildRequires: golang(github.com/containerd/containerd)
BuildRequires: golang(github.com/containerd/containerd/api/events)
BuildRequires: golang(github.com/containerd/containerd/api/services/containers/v1)
BuildRequires: golang(github.com/containerd/containerd/api/services/diff/v1)
BuildRequires: golang(github.com/containerd/containerd/api/services/images/v1)
+BuildRequires: golang(github.com/containerd/containerd/api/services/introspection/v1)
BuildRequires: golang(github.com/containerd/containerd/api/services/namespaces/v1)
BuildRequires: golang(github.com/containerd/containerd/api/services/tasks/v1)
BuildRequires: golang(github.com/containerd/containerd/api/types)
BuildRequires: golang(github.com/containerd/containerd/cio)
+# BuildRequires: golang(github.com/containerd/containerd/cmd/containerd/command)
BuildRequires: golang(github.com/containerd/containerd/containers)
BuildRequires: golang(github.com/containerd/containerd/content)
BuildRequires: golang(github.com/containerd/containerd/contrib/apparmor)
@@ -52,11 +51,14 @@ BuildRequires: golang(github.com/containerd/containerd/images)
BuildRequires: golang(github.com/containerd/containerd/leases)
BuildRequires: golang(github.com/containerd/containerd/log)
BuildRequires: golang(github.com/containerd/containerd/metrics/cgroups)
+BuildRequires: golang(github.com/containerd/containerd/metrics/types/v1)
+BuildRequires: golang(github.com/containerd/containerd/metrics/types/v2)
BuildRequires: golang(github.com/containerd/containerd/mount)
BuildRequires: golang(github.com/containerd/containerd/namespaces)
BuildRequires: golang(github.com/containerd/containerd/oci)
BuildRequires: golang(github.com/containerd/containerd/platforms)
BuildRequires: golang(github.com/containerd/containerd/plugin)
+BuildRequires: golang(github.com/containerd/containerd/reference/docker)
BuildRequires: golang(github.com/containerd/containerd/remotes/docker)
BuildRequires: golang(github.com/containerd/containerd/runtime/linux/runctypes)
BuildRequires: golang(github.com/containerd/containerd/runtime/v1/linux)
@@ -77,29 +79,30 @@ BuildRequires: golang(github.com/containerd/containerd/services/tasks)
BuildRequires: golang(github.com/containerd/containerd/services/version)
BuildRequires: golang(github.com/containerd/containerd/snapshots)
BuildRequires: golang(github.com/containerd/containerd/snapshots/overlay)
+BuildRequires: golang(github.com/containerd/containerd/sys)
BuildRequires: golang(github.com/containerd/containerd/version)
BuildRequires: golang(github.com/containerd/continuity)
BuildRequires: golang(github.com/containerd/continuity/fs)
BuildRequires: golang(github.com/containerd/fifo)
BuildRequires: golang(github.com/containerd/go-cni)
+BuildRequires: golang(github.com/containerd/imgcrypt)
+BuildRequires: golang(github.com/containerd/imgcrypt/images/encryption)
BuildRequires: golang(github.com/containerd/typeurl)
BuildRequires: golang(github.com/containernetworking/plugins/pkg/ns)
BuildRequires: golang(github.com/davecgh/go-spew/spew)
-BuildRequires: golang(github.com/docker/distribution/digestset)
-BuildRequires: golang(github.com/docker/distribution/reference)
BuildRequires: golang(github.com/docker/docker/pkg/symlink)
-BuildRequires: golang(github.com/docker/docker/pkg/system)
BuildRequires: golang(github.com/docker/docker/pkg/truncindex)
+BuildRequires: golang(github.com/emicklei/go-restful)
+BuildRequires: golang(github.com/fsnotify/fsnotify)
BuildRequires: golang(github.com/gogo/protobuf/gogoproto)
BuildRequires: golang(github.com/gogo/protobuf/proto)
BuildRequires: golang(github.com/gogo/protobuf/types)
BuildRequires: golang(github.com/opencontainers/go-digest)
+BuildRequires: golang(github.com/opencontainers/go-digest/digestset)
BuildRequires: golang(github.com/opencontainers/image-spec/identity)
BuildRequires: golang(github.com/opencontainers/image-spec/specs-go/v1)
BuildRequires: golang(github.com/opencontainers/runc/libcontainer/apparmor)
BuildRequires: golang(github.com/opencontainers/runc/libcontainer/devices)
-BuildRequires: golang(github.com/opencontainers/runc/libcontainer/seccomp)
-BuildRequires: golang(github.com/opencontainers/runc/libcontainer/system)
BuildRequires: golang(github.com/opencontainers/runtime-spec/specs-go)
BuildRequires: golang(github.com/opencontainers/selinux/go-selinux)
BuildRequires: golang(github.com/opencontainers/selinux/go-selinux/label)
@@ -108,24 +111,36 @@ BuildRequires: golang(github.com/sirupsen/logrus)
BuildRequires: golang(golang.org/x/net/context)
BuildRequires: golang(golang.org/x/sys/unix)
BuildRequires: golang(google.golang.org/grpc)
+BuildRequires: golang(google.golang.org/grpc/codes)
+BuildRequires: golang(google.golang.org/grpc/status)
+BuildRequires: golang(k8s.io/api/core/v1)
+BuildRequires: golang(k8s.io/apimachinery/pkg/api/errors)
+BuildRequires: golang(k8s.io/apimachinery/pkg/api/resource)
+BuildRequires: golang(k8s.io/apimachinery/pkg/apis/meta/v1)
+BuildRequires: golang(k8s.io/apimachinery/pkg/types)
BuildRequires: golang(k8s.io/apimachinery/pkg/util/clock)
+BuildRequires: golang(k8s.io/apimachinery/pkg/util/httpstream)
+BuildRequires: golang(k8s.io/apimachinery/pkg/util/httpstream/spdy)
BuildRequires: golang(k8s.io/apimachinery/pkg/util/net)
+BuildRequires: golang(k8s.io/apimachinery/pkg/util/remotecommand)
BuildRequires: golang(k8s.io/apimachinery/pkg/util/runtime)
+BuildRequires: golang(k8s.io/apimachinery/pkg/util/sets)
+BuildRequires: golang(k8s.io/apiserver/pkg/server/httplog)
+BuildRequires: golang(k8s.io/apiserver/pkg/util/wsstream)
BuildRequires: golang(k8s.io/client-go/tools/remotecommand)
BuildRequires: golang(k8s.io/client-go/util/cert)
+BuildRequires: golang(k8s.io/component-base/logs/logreduction)
BuildRequires: golang(k8s.io/cri-api/pkg/apis)
BuildRequires: golang(k8s.io/cri-api/pkg/apis/runtime/v1alpha2)
-BuildRequires: golang(k8s.io/klog)
-BuildRequires: golang(k8s.io/kubernetes/pkg/kubelet/remote)
-BuildRequires: golang(k8s.io/kubernetes/pkg/kubelet/server/streaming)
-BuildRequires: golang(k8s.io/kubernetes/pkg/kubelet/util)
-BuildRequires: golang(k8s.io/kubernetes/pkg/util/bandwidth)
+BuildRequires: golang(k8s.io/klog/v2)
BuildRequires: golang(k8s.io/utils/exec)
%if %{with check}
# Tests
+BuildRequires: golang(github.com/containerd/cgroups/stats/v1)
BuildRequires: golang(github.com/containerd/containerd/reference)
BuildRequires: golang(github.com/golang/protobuf/proto)
+BuildRequires: golang(github.com/opencontainers/runc/libcontainer/configs)
BuildRequires: golang(github.com/stretchr/testify/assert)
BuildRequires: golang(github.com/stretchr/testify/require)
%endif
@@ -139,7 +154,6 @@ BuildRequires: golang(github.com/stretchr/testify/require)
%goprep
%autopatch -p1
rm -rf cmd
-find . -name "*.go" -exec sed -i "s|k8s.io/kubernetes/pkg/kubelet/apis/cri|k8s.io/cri-api/pkg/apis|" "{}" +;
%install
%gopkginstall
@@ -153,6 +167,9 @@ find . -name "*.go" -exec sed -i "s|k8s.io/kubernetes/pkg/kubelet/apis/cri|k8s.i
%gopkgfiles
%changelog
+* Fri Aug 21 20:39:11 CEST 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 1:1.19.0-1
+- Update to 1.19.0
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 91c934a..8815943 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cri-50b9e10ea54a9b57049fe311e4fe0a96277ef1c2.tar.gz) = 0aabec47323f4d9046017fd383889af8b46920b3ae965117f1897586b6698f9849499eb1e3a58de40d338fa8cfadcaf8d1c6e817d4b18731066e3cf7b61c06b9
+SHA512 (cri-1.19.0.tar.gz) = 86047b86ab2c632990e33c3e1b9bccdd82abfe94a116996a91b2fc9627b858eeebcb65e81c76478ff18391f66deb734c994ac272848a097abb016f2d0ff80976
https://src.fedoraproject.org/rpms/golang-github-containerd-cri/c/552b077...
3Â years, 6Â months