commit: 3847abc7f7991bc2cba6b123d011c7aabb84c1eb
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 19 01:27:49 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Dec 19 01:33:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3847abc7
sys-cluster/k3s: 1.22.5-r1 to fix runc version
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
sys-cluster/k3s/Manifest | 3 ++-
.../{k3s-1.22.5.ebuild => k3s-1.22.5-r1.ebuild} | 25 +++++-----------------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest
index 4e8bb0bd0460..694bd8e5903a 100644
--- a/sys-cluster/k3s/Manifest
+++ b/sys-cluster/k3s/Manifest
@@ -712,6 +712,7 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip
206762 BLAKE2B 13c74350dfc
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B
3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e
SHA512
9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B
da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2
SHA512
8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod 129 BLAKE2B
15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd
SHA512
467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.zip 206670 BLAKE2B
8af535e80e1e73926cb7de0c16827156c89f41b1ec164ed6a0e8c9fff2316b5bb6f6e55b62775e4a46cde45ed36f440608bcc762d983b11e936cc9237f37482c
SHA512
e91f339e9b4ccbdc3c7d4f8c3c0e23cbb5b55ef7ced715a7a80387232a25dc86918904e40159fda8a4d8bc20ed4404bbc15a425f24cac56d6c3eca1c1abefaec
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod 124 BLAKE2B
4f470777c8d8816c52e0fb82b2ef37d4e9879c46fa93e8e4fc87c46b85c36ee6b4b1ffea22db22af2946c0fd3a12affa9df706f13f2367b14bb1a72c737ddb66
SHA512
6b46c8a019e49c6ed2307e7bf633d4fa04627938bcdffec22da42f722aeceb35de8655b04f69eb651fbc662ac5554b54b393340bec3ef4cdd01be2d7f6d07eab
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod 192 BLAKE2B
08ac45ddd213c260f4b9d33fec4ba9758ce949c699e2d8d6c7b31bc0fbd7498618cd5144a6ccc3e1b852e9f1a6b7d00191ada7d464dd5784d132506c9a8639ce
SHA512
44c996ad31bf02aec42bef934d7cd65379ae5eca4d1069dab8c478be169f9479cbd55f8f72bd9567e51535d31c9f65cd1d56bbefb8b745f96cad0f5953f8c420
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip 206858 BLAKE2B
42c113333104cf0335d16d24748ca111dc44a52b3c6ceb8e11388c85b8ac80c5c324ca9c6d90d08c07dc865909eed4510fb145153024890e4e160cde2b877269
SHA512
6df84a92489b04e55e35bb2334f7e9e55f4fac646e9ad904eca189d069443609fe1affc4cf5e92d0f90ea9c75162a72f134c6298f828608efe9a71b6e496eeb5
@@ -2448,7 +2449,7 @@ DIST k3s-root-amd64-0.9.1.tar 16404480 BLAKE2B
66f279d1eb43338fd0a6b71f7ba5d9e8e
DIST k3s-runc-v1.0.0-rc95.tar.gz 2309875 BLAKE2B
8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841
SHA512
c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
DIST k3s-runc-v1.0.1.tar.gz 2309875 BLAKE2B
8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841
SHA512
c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
DIST k3s-runc-v1.0.2.tar.gz 2309875 BLAKE2B
8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841
SHA512
c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
-DIST k3s-runc-v1.0.3.tar.gz 2309875 BLAKE2B
8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841
SHA512
c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
+DIST k3s-runc-v1.0.3-r1.tar.gz 2375241 BLAKE2B
0fb9368ab5442462001c15a67a71821133ad90d16cac5aac760e52b2477db69c0a5dd59df42601119b19ede508889796c994a24624f88ec6a1a29dad19e0bf33
SHA512
64a1894c2b4ed5a68b185e88548fc9fbbd01d8a9495feed59fb196aa06763d64cfb71ca6cbc09d1defa26a0d94ad58626296585741f23df2e290147ba6c4c26e
DIST k8s.io%2Fapi%2F@v%2Fv0.19.10.mod 252 BLAKE2B
917c8bfb55fdc4035dd1663548facddf265cc3225fdd1a02a0f1377217d8a4456cf43a1065be097ab6c3c63e296199dc197b79d5c9eca2b82b2e439d6ff2a864
SHA512
0d8666945e227c2c76d89662679b01d588b8b6889c48387cb9ad683ed3e4eaa83d2d5795846972d455deda5c4a96f24fde242b2b48f31f08b77549f0a088379b
DIST k8s.io%2Fapi%2F@v%2Fv0.19.10.zip 3841866 BLAKE2B
cdafb0c350b3ba9199dcd26a8f995eb8d8aa922b93ce54064b54b71c393b26c361b1c163bcfa830c0b11075dfcee94bee9c718667d1daaba29bf759627d1a67e
SHA512
d0c4ee75cc5eaafe1fa299fd5e9aced99dfdfbe0b8b615329b82b738a352c5dc356481b819bbb7390eed32000427aaf431d5cb8e3477863d48ab7b4c015c4a1f
DIST k8s.io%2Fapi%2F@v%2Fv0.22.0.mod 250 BLAKE2B
50f9c60e31b553e4c802180a3f935658d59c2f4f66962e76897c644a33bc49cdd4e0ff2957aa39297ab99c85d07a7662d36cabb6d63e0a2ab5578873765955d5
SHA512
444cba85841af04bfa7d9d83ff661f9906282002ae3825bbd82f990db68204ed6015fcb85c9da545f8266343217c30b941f60a1d8e5c0db26d6b56ec7b612511
diff --git a/sys-cluster/k3s/k3s-1.22.5.ebuild
b/sys-cluster/k3s/k3s-1.22.5-r1.ebuild
similarity index 98%
rename from sys-cluster/k3s/k3s-1.22.5.ebuild
rename to sys-cluster/k3s/k3s-1.22.5-r1.ebuild
index 36675271487d..2bbf4465b5c6 100644
--- a/sys-cluster/k3s/k3s-1.22.5.ebuild
+++ b/sys-cluster/k3s/k3s-1.22.5-r1.ebuild
@@ -188,8 +188,6 @@ EGO_SUM=(
"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
"github.com/cilium/ebpf v0.2.0/go.mod"
"github.com/cilium/ebpf v0.4.0/go.mod"
-"github.com/cilium/ebpf v0.5.0"
-"github.com/cilium/ebpf v0.5.0/go.mod"
"github.com/cilium/ebpf v0.6.2"
"github.com/cilium/ebpf v0.6.2/go.mod"
"github.com/client9/misspell v0.3.4/go.mod"
@@ -269,8 +267,6 @@ EGO_SUM=(
"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
-"github.com/coreos/go-systemd/v22 v22.3.1"
-"github.com/coreos/go-systemd/v22 v22.3.1/go.mod"
"github.com/coreos/go-systemd/v22 v22.3.2"
"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
@@ -430,8 +426,8 @@ EGO_SUM=(
"github.com/golang/protobuf v1.4.0/go.mod"
"github.com/golang/protobuf v1.4.1/go.mod"
"github.com/golang/protobuf v1.4.2/go.mod"
-"github.com/golang/protobuf v1.4.3"
"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/golang/protobuf v1.5.0"
"github.com/golang/protobuf v1.5.0/go.mod"
"github.com/golang/protobuf v1.5.1/go.mod"
"github.com/golang/protobuf v1.5.2"
@@ -462,8 +458,8 @@ EGO_SUM=(
"github.com/google/go-cmp v0.5.1/go.mod"
"github.com/google/go-cmp v0.5.2/go.mod"
"github.com/google/go-cmp v0.5.3/go.mod"
-"github.com/google/go-cmp v0.5.4"
"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5"
"github.com/google/go-cmp v0.5.5/go.mod"
"github.com/google/go-cmp v0.5.6"
"github.com/google/go-cmp v0.5.6/go.mod"
@@ -925,7 +921,6 @@ EGO_SUM=(
"github.com/opencontainers/runtime-spec
v1.0.3-0.20210316141917-a8c4a9ee0f6b/go.mod"
"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417"
"github.com/opencontainers/runtime-spec
v1.0.3-0.20210326190908-1c3f411f0417/go.mod"
-"github.com/opencontainers/selinux v1.8.0"
"github.com/opencontainers/selinux v1.8.0/go.mod"
"github.com/opencontainers/selinux v1.8.2"
"github.com/opencontainers/selinux v1.8.2/go.mod"
@@ -1040,7 +1035,6 @@ EGO_SUM=(
"github.com/sirupsen/logrus v1.4.1/go.mod"
"github.com/sirupsen/logrus v1.4.2/go.mod"
"github.com/sirupsen/logrus v1.6.0/go.mod"
-"github.com/sirupsen/logrus v1.7.0"
"github.com/sirupsen/logrus v1.7.0/go.mod"
"github.com/sirupsen/logrus v1.8.1"
"github.com/sirupsen/logrus v1.8.1/go.mod"
@@ -1137,7 +1131,6 @@ EGO_SUM=(
"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod"
"github.com/vmware/govmomi v0.20.3"
"github.com/vmware/govmomi v0.20.3/go.mod"
-"github.com/willf/bitset v1.1.11"
"github.com/willf/bitset v1.1.11/go.mod"
"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
@@ -1182,7 +1175,6 @@ EGO_SUM=(
"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
@@ -1217,7 +1209,6 @@ EGO_SUM=(
"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
@@ -1329,7 +1320,6 @@ EGO_SUM=(
"golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod"
"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
-"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c"
"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
"golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod"
"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
@@ -1371,7 +1361,6 @@ EGO_SUM=(
"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
@@ -1487,11 +1476,8 @@ EGO_SUM=(
"google.golang.org/appengine v1.6.6/go.mod"
"google.golang.org/appengine v1.6.7"
"google.golang.org/appengine v1.6.7/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63"
"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
"google.golang.org/grpc v1.19.0/go.mod"
"google.golang.org/grpc v1.20.1/go.mod"
"google.golang.org/grpc v1.21.0/go.mod"
@@ -1516,9 +1502,8 @@ EGO_SUM=(
"google.golang.org/protobuf v1.21.0/go.mod"
"google.golang.org/protobuf v1.22.0/go.mod"
"google.golang.org/protobuf v1.23.0/go.mod"
-"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-"google.golang.org/protobuf v1.25.0"
"google.golang.org/protobuf v1.25.0/go.mod"
+"google.golang.org/protobuf v1.26.0"
"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
"google.golang.org/protobuf v1.26.0/go.mod"
"google.golang.org/protobuf v1.27.1"
@@ -1720,7 +1705,7 @@ go-module_set_globals
MY_PV=${PV}+k3s1
SRC_URI="https://github.com/k3s-io/k3s/archive/refs/tags/v${MY_PV}.tar.gz ->
${P}.tar.gz
${EGO_SUM_SRC_URI}
-
https://github.com/opencontainers/runc/archive/refs/tags/v1.0.0-rc95.tar.gz ->
k3s-runc-${K3S_RUNC_VERSION}.tar.gz
+
https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz
-> k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz
https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz
-> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
amd64? (
https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar
-> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
@@ -1765,7 +1750,7 @@ src_prepare() {
local RUNC_DIR=build/src/github.com/opencontainers/runc
mkdir -p "${RUNC_DIR}" || die
- tar -x --strip-components=1 -f
"${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die
+ tar -x --strip-components=1 -f
"${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz" -C "${RUNC_DIR}" || die
sed -e 's|mod=vendor|mod=readonly|g' -i "${RUNC_DIR}/Makefile" || die
sed -e 's:github.com/containerd/containerd =>
./.empty-mod/:github.com/containerd/containerd => ./:' \
