diff --git a/kubernetes.spec b/kubernetes.spec index 69a2c94af0403824ba7dcc35c27d97a40b4817af..d10e9bd17ec16b77ba2770b0010c958dfcedf09c 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -3,7 +3,7 @@ Name: kubernetes Version: 1.20.2 -Release: 21 +Release: 22 Summary: Container cluster management License: ASL 2.0 URL: https://k8s.io/kubernetes @@ -23,6 +23,10 @@ Source12: env-scheduler Source13: kubernetes-accounting.conf Source14: kubeadm.conf Source15: kubernetes.conf +# https://github.com/golang/net/releases/tag/v0.5.0 +Source16: net-0.5.0.tar.gz +# https://github.com/golang/sys/releases/tag/v0.5.0 +Source17: sys-0.5.0.tar.gz Patch6000: 0001-kubelet-support-exec-websocket-protocol.patch Patch6001: 0002-fix-compile-options.patch @@ -104,16 +108,12 @@ Help documents for kubernetes. %prep %autosetup -n kubernetes-1.20.2 -p1 %ifarch loongarch64 -curl -OL https://github.com/golang/sys/archive/refs/tags/v0.5.0.zip rm -rf vendor/golang.org/x/sys -unzip v0.5.0.zip -d vendor/golang.org/x +tar -xf %{SOURCE17} -C vendor/golang.org/x mv vendor/golang.org/x/sys-0.5.0 vendor/golang.org/x/sys -rm v0.5.0.zip -curl -OL https://github.com/golang/net/archive/refs/tags/v0.5.0.zip rm -rf vendor/golang.org/x/net -unzip v0.5.0.zip -d vendor/golang.org/x +tar -xf %{SOURCE16} -C vendor/golang.org/x mv vendor/golang.org/x/net-0.5.0 vendor/golang.org/x/net -rm v0.5.0.zip %endif mkdir -p src/k8s.io/kubernetes mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/. @@ -285,6 +285,11 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun kubelet kube-proxy %changelog +* Wed Nov 15 2023 lwg K - 1.20.2-22 +- CVE:NA +- SUG:NA +- DESC:modify golang/sys and golang/net online acquisition for offline use + * Tue Sep 12 2023 ZeweiY - 1.20.2-21 - CVE:NA - SUG:NA diff --git a/net-0.5.0.tar.gz b/net-0.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c27f7f00441725f2f2592586f8cf2cf4ad94ca41 Binary files /dev/null and b/net-0.5.0.tar.gz differ diff --git a/sys-0.5.0.tar.gz b/sys-0.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..941195568ab75bffba944416ce611abd7678b5ef Binary files /dev/null and b/sys-0.5.0.tar.gz differ