diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2025-03-26 13:53:39 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2025-03-26 15:45:16 +0000 |
commit | c55420b33f6ca1122e806d79a4b6554db9def106 (patch) | |
tree | a79b645cada4a0068cd39ce3d3d08c2ecfafcef0 | |
parent | bf401fcf61efac0670085e28b318feab0801ca76 (diff) | |
download | meta-virtualization-c55420b33f6ca1122e806d79a4b6554db9def106.tar.gz |
rootlesskit: update to v2.3.4
Bumping rootlesskit to version v2.3.4-4-g530859a, which comprises the following commits:
8d196ce Build(deps): Bump golang.org/x/net from 0.33.0 to 0.36.0
c4026e3 v2.3.4+dev
59a459d v2.3.4
0ba161d Revert "detach-netns: simplify unshare helper"
f36cdb1 v2.3.3+dev
67494d9 v2.3.3
984c06b CI: release: update Ubuntu 24.04
1ebaa93 CI: update passt to 2025_02_17.a1e48a0
63d6a16 CI: update slirp4netns to 1.3.2
694339b CI: update Go to 1.24
0dfe464 detach-netns: simplify unshare helper
dd377ba Fix detach-netns permission error on Ubuntu 25.04
b949c1e Build(deps): Bump golang.org/x/sys from 0.30.0 to 0.31.0
01f93c6 Build(deps): Bump github.com/urfave/cli/v2 from 2.27.5 to 2.27.6
8f2b39f CI: test Docker v28 in addition to v27
68f2c8c Build(deps): Bump github.com/containernetworking/plugins
5688cce Build(deps): Bump golang.org/x/sys from 0.29.0 to 0.30.0
e5eed65 Build(deps): Bump gotest.tools/v3 from 3.5.1 to 3.5.2
f0427e9 v2.3.2+dev
b8175e1 v2.3.2
e3b42e9 CI: update Docker (27.5.0)
0db252c go.mod: github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905
f858ea0 Build(deps): Bump actions/attest-build-provenance from 1 to 2
57f093a dependabot: add github-actions
35080d8 CI: update pasta (2024_12_11.09478d5)
0d11cdb pasta: set `--host-lo-to-ns-lo`
b4fe9a7 go fmt
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-extended/rootlesskit/relocation.inc | 2 | ||||
-rw-r--r-- | recipes-extended/rootlesskit/rootlesskit/modules.txt | 97 | ||||
-rw-r--r-- | recipes-extended/rootlesskit/rootlesskit_git.bb | 4 | ||||
-rw-r--r-- | recipes-extended/rootlesskit/src_uri.inc | 36 |
4 files changed, 91 insertions, 48 deletions
diff --git a/recipes-extended/rootlesskit/relocation.inc b/recipes-extended/rootlesskit/relocation.inc index 14ff0645..f968694a 100644 --- a/recipes-extended/rootlesskit/relocation.inc +++ b/recipes-extended/rootlesskit/relocation.inc | |||
@@ -5,7 +5,7 @@ export sites="gotest.tools/v3:gotest.tools/v3:force \ | |||
5 | github.com/google/uuid:github.com/google/uuid:force \ | 5 | github.com/google/uuid:github.com/google/uuid:force \ |
6 | github.com/gorilla/mux:github.com/gorilla/mux:force \ | 6 | github.com/gorilla/mux:github.com/gorilla/mux:force \ |
7 | github.com/moby/vpnkit:github.com/moby/vpnkit:force \ | 7 | github.com/moby/vpnkit:github.com/moby/vpnkit:force \ |
8 | github.com/u-root/uio:github.com/u-root/uio:force \ | 8 | github.com/u-root/uio:github.com/u-root/uio:force \ |
9 | github.com/songgao/water:github.com/songgao/water:force \ | 9 | github.com/songgao/water:github.com/songgao/water:force \ |
10 | github.com/urfave/cli/v2:github.com/urfave/cli/v2:force \ | 10 | github.com/urfave/cli/v2:github.com/urfave/cli/v2:force \ |
11 | github.com/google/go-cmp:github.com/google/go-cmp:force \ | 11 | github.com/google/go-cmp:github.com/google/go-cmp:force \ |
diff --git a/recipes-extended/rootlesskit/rootlesskit/modules.txt b/recipes-extended/rootlesskit/rootlesskit/modules.txt index 641d0996..29954c7c 100644 --- a/recipes-extended/rootlesskit/rootlesskit/modules.txt +++ b/recipes-extended/rootlesskit/rootlesskit/modules.txt | |||
@@ -1,40 +1,83 @@ | |||
1 | # github.com/Masterminds/semver/v3 v3.3.1 | 1 | # github.com/Masterminds/semver/v3 v3.3.1 |
2 | ## explicit | 2 | ## explicit; go 1.21 |
3 | # github.com/containernetworking/plugins v1.5.1 | 3 | github.com/Masterminds/semver/v3 |
4 | ## explicit | 4 | # github.com/containernetworking/plugins v1.6.2 |
5 | ## explicit; go 1.23 | ||
6 | github.com/containernetworking/plugins/pkg/ns | ||
7 | # github.com/cpuguy83/go-md2man/v2 v2.0.5 | ||
8 | ## explicit; go 1.11 | ||
9 | github.com/cpuguy83/go-md2man/v2/md2man | ||
5 | # github.com/gofrs/flock v0.12.1 | 10 | # github.com/gofrs/flock v0.12.1 |
6 | ## explicit | 11 | ## explicit; go 1.21.0 |
12 | github.com/gofrs/flock | ||
13 | # github.com/google/go-cmp v0.6.0 | ||
14 | ## explicit; go 1.13 | ||
15 | github.com/google/go-cmp/cmp | ||
16 | github.com/google/go-cmp/cmp/internal/diff | ||
17 | github.com/google/go-cmp/cmp/internal/flags | ||
18 | github.com/google/go-cmp/cmp/internal/function | ||
19 | github.com/google/go-cmp/cmp/internal/value | ||
7 | # github.com/google/uuid v1.6.0 | 20 | # github.com/google/uuid v1.6.0 |
8 | ## explicit | 21 | ## explicit |
22 | github.com/google/uuid | ||
9 | # github.com/gorilla/mux v1.8.1 | 23 | # github.com/gorilla/mux v1.8.1 |
10 | ## explicit | 24 | ## explicit; go 1.20 |
11 | # github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5 | 25 | github.com/gorilla/mux |
12 | ## explicit | 26 | # github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 |
27 | ## explicit; go 1.20 | ||
28 | github.com/insomniacslk/dhcp/dhcpv4 | ||
29 | github.com/insomniacslk/dhcp/dhcpv4/client4 | ||
30 | github.com/insomniacslk/dhcp/iana | ||
31 | github.com/insomniacslk/dhcp/interfaces | ||
32 | github.com/insomniacslk/dhcp/rfc1035label | ||
13 | # github.com/moby/sys/mountinfo v0.7.2 | 33 | # github.com/moby/sys/mountinfo v0.7.2 |
14 | ## explicit | 34 | ## explicit; go 1.17 |
35 | github.com/moby/sys/mountinfo | ||
15 | # github.com/moby/vpnkit v0.5.0 | 36 | # github.com/moby/vpnkit v0.5.0 |
16 | ## explicit | 37 | ## explicit |
17 | # github.com/sirupsen/logrus v1.9.3 | 38 | github.com/moby/vpnkit/go/pkg/vmnet |
18 | ## explicit | ||
19 | # github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 | ||
20 | ## explicit | ||
21 | # github.com/urfave/cli/v2 v2.27.5 | ||
22 | ## explicit | ||
23 | # golang.org/x/sys v0.29.0 | ||
24 | ## explicit | ||
25 | # gotest.tools/v3 v3.5.1 | ||
26 | ## explicit | ||
27 | # github.com/cpuguy83/go-md2man/v2 v2.0.5 | ||
28 | ## explicit | ||
29 | # github.com/google/go-cmp v0.6.0 | ||
30 | ## explicit | ||
31 | # github.com/pierrec/lz4/v4 v4.1.21 | 39 | # github.com/pierrec/lz4/v4 v4.1.21 |
32 | ## explicit | 40 | ## explicit; go 1.14 |
41 | github.com/pierrec/lz4/v4 | ||
42 | github.com/pierrec/lz4/v4/internal/lz4block | ||
43 | github.com/pierrec/lz4/v4/internal/lz4errors | ||
44 | github.com/pierrec/lz4/v4/internal/lz4stream | ||
45 | github.com/pierrec/lz4/v4/internal/xxh32 | ||
33 | # github.com/russross/blackfriday/v2 v2.1.0 | 46 | # github.com/russross/blackfriday/v2 v2.1.0 |
34 | ## explicit | 47 | ## explicit |
35 | # github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 | 48 | github.com/russross/blackfriday/v2 |
49 | # github.com/sirupsen/logrus v1.9.3 | ||
50 | ## explicit; go 1.13 | ||
51 | github.com/sirupsen/logrus | ||
52 | # github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 | ||
36 | ## explicit | 53 | ## explicit |
54 | github.com/songgao/water | ||
55 | # github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 | ||
56 | ## explicit; go 1.21 | ||
57 | github.com/u-root/uio/rand | ||
58 | github.com/u-root/uio/uio | ||
59 | # github.com/urfave/cli/v2 v2.27.6 | ||
60 | ## explicit; go 1.18 | ||
61 | github.com/urfave/cli/v2 | ||
37 | # github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 | 62 | # github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 |
38 | ## explicit | 63 | ## explicit; go 1.15 |
39 | # golang.org/x/net v0.33.0 | 64 | github.com/xrash/smetrics |
40 | ## explicit | 65 | # golang.org/x/net v0.36.0 |
66 | ## explicit; go 1.23.0 | ||
67 | golang.org/x/net/bpf | ||
68 | golang.org/x/net/internal/iana | ||
69 | golang.org/x/net/internal/socket | ||
70 | golang.org/x/net/ipv4 | ||
71 | # golang.org/x/sys v0.31.0 | ||
72 | ## explicit; go 1.23.0 | ||
73 | golang.org/x/sys/unix | ||
74 | golang.org/x/sys/windows | ||
75 | golang.org/x/sys/windows/registry | ||
76 | # gotest.tools/v3 v3.5.2 | ||
77 | ## explicit; go 1.17 | ||
78 | gotest.tools/v3/assert | ||
79 | gotest.tools/v3/assert/cmp | ||
80 | gotest.tools/v3/internal/assert | ||
81 | gotest.tools/v3/internal/difflib | ||
82 | gotest.tools/v3/internal/format | ||
83 | gotest.tools/v3/internal/source | ||
diff --git a/recipes-extended/rootlesskit/rootlesskit_git.bb b/recipes-extended/rootlesskit/rootlesskit_git.bb index 0f66c64f..fcc38e7a 100644 --- a/recipes-extended/rootlesskit/rootlesskit_git.bb +++ b/recipes-extended/rootlesskit/rootlesskit_git.bb | |||
@@ -14,7 +14,7 @@ DEPENDS = " \ | |||
14 | " | 14 | " |
15 | # Specify the first two important SRCREVs as the format | 15 | # Specify the first two important SRCREVs as the format |
16 | SRCREV_FORMAT="rootless" | 16 | SRCREV_FORMAT="rootless" |
17 | SRCREV_rootless = "0b4ed7b5ca2e6b7cd2b9fb003cc7f6913bd76abf" | 17 | SRCREV_rootless = "530859a92629689c0c17c96d9ab145f4d04b5b5a" |
18 | 18 | ||
19 | SRC_URI = "git://github.com/rootless-containers/rootlesskit;name=rootless;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" | 19 | SRC_URI = "git://github.com/rootless-containers/rootlesskit;name=rootless;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" |
20 | 20 | ||
@@ -31,7 +31,7 @@ GO_IMPORT = "import" | |||
31 | 31 | ||
32 | S = "${WORKDIR}/git" | 32 | S = "${WORKDIR}/git" |
33 | 33 | ||
34 | PV = "v2.3.1+git" | 34 | PV = "v2.3.4+git" |
35 | 35 | ||
36 | ROOTLESS_PKG = "github.com/rootless-containers/rootlesskit" | 36 | ROOTLESS_PKG = "github.com/rootless-containers/rootlesskit" |
37 | 37 | ||
diff --git a/recipes-extended/rootlesskit/src_uri.inc b/recipes-extended/rootlesskit/src_uri.inc index a21bf05c..0d13fcf7 100644 --- a/recipes-extended/rootlesskit/src_uri.inc +++ b/recipes-extended/rootlesskit/src_uri.inc | |||
@@ -1,16 +1,16 @@ | |||
1 | # gotest.tools/v3 v3.5.1 | 1 | # gotest.tools/v3 v3.5.2 |
2 | # [1] git ls-remote https://github.com/gotestyourself/gotest.tools 81cea1abc596b025bf2573c7fdf97740512e4c6c | 2 | # [1] git ls-remote https://github.com/gotestyourself/gotest.tools 0b81523ff268a1f1b0baf4a5da67e42fbb86880b |
3 | SRCREV_gotest.tools-v3="81cea1abc596b025bf2573c7fdf97740512e4c6c" | 3 | SRCREV_gotest.tools-v3="0b81523ff268a1f1b0baf4a5da67e42fbb86880b" |
4 | SRC_URI += "git://github.com/gotestyourself/gotest.tools;name=gotest.tools-v3;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/gotest.tools/v3" | 4 | SRC_URI += "git://github.com/gotestyourself/gotest.tools;name=gotest.tools-v3;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/gotest.tools/v3" |
5 | 5 | ||
6 | # golang.org/x/sys v0.29.0 | 6 | # golang.org/x/sys v0.31.0 |
7 | # [1] git ls-remote https://github.com/golang/sys d4ac05dc8c4c953ec29cae3df56c0833f4010763 | 7 | # [1] git ls-remote https://github.com/golang/sys 74cfc93a99be6ca6f193856132e6799065b071af |
8 | SRCREV_sys="d4ac05dc8c4c953ec29cae3df56c0833f4010763" | 8 | SRCREV_sys="74cfc93a99be6ca6f193856132e6799065b071af" |
9 | SRC_URI += "git://github.com/golang/sys;name=sys;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/sys" | 9 | SRC_URI += "git://github.com/golang/sys;name=sys;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/sys" |
10 | 10 | ||
11 | # golang.org/x/net v0.33.0 | 11 | # golang.org/x/net v0.36.0 |
12 | # [1] git ls-remote https://go.googlesource.com/net dfc720dfe0cfc125116068c20efcdcb5e4eab464 | 12 | # [1] git ls-remote https://go.googlesource.com/net 85d1d54551b68719346cb9fec24b911da4e452a1 |
13 | SRCREV_net="dfc720dfe0cfc125116068c20efcdcb5e4eab464" | 13 | SRCREV_net="85d1d54551b68719346cb9fec24b911da4e452a1" |
14 | SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/net" | 14 | SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/net" |
15 | 15 | ||
16 | # github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 | 16 | # github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 |
@@ -43,9 +43,9 @@ SRC_URI += "git://github.com/moby/vpnkit;name=vpnkit;protocol=https;nobranch=1;d | |||
43 | SRCREV_water="2b4b6d7c09d80835e5f13f6b040d69f00a158b24" | 43 | SRCREV_water="2b4b6d7c09d80835e5f13f6b040d69f00a158b24" |
44 | SRC_URI += "git://github.com/songgao/water;name=water;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/songgao/water" | 44 | SRC_URI += "git://github.com/songgao/water;name=water;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/songgao/water" |
45 | 45 | ||
46 | # github.com/urfave/cli/v2 v2.27.5 | 46 | # github.com/urfave/cli/v2 v2.27.6 |
47 | # [1] git ls-remote https://github.com/urfave/cli f035ffaa3749afda2cd26fb824aa940747297ef1 | 47 | # [1] git ls-remote https://github.com/urfave/cli 9d76d15e478af5e952fffc872597c47b69ec7ee7 |
48 | SRCREV_v2="f035ffaa3749afda2cd26fb824aa940747297ef1" | 48 | SRCREV_v2="9d76d15e478af5e952fffc872597c47b69ec7ee7" |
49 | SRC_URI += "git://github.com/urfave/cli;name=v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/urfave/cli/v2" | 49 | SRC_URI += "git://github.com/urfave/cli;name=v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/urfave/cli/v2" |
50 | 50 | ||
51 | # github.com/google/go-cmp v0.6.0 | 51 | # github.com/google/go-cmp v0.6.0 |
@@ -68,9 +68,9 @@ SRC_URI += "git://github.com/xrash/smetrics;name=smetrics;protocol=https;nobranc | |||
68 | SRCREV_logrus="d40e25cd45ed9c6b2b66e6b97573a0413e4c23bd" | 68 | SRCREV_logrus="d40e25cd45ed9c6b2b66e6b97573a0413e4c23bd" |
69 | SRC_URI += "git://github.com/sirupsen/logrus;name=logrus;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/sirupsen/logrus" | 69 | SRC_URI += "git://github.com/sirupsen/logrus;name=logrus;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/sirupsen/logrus" |
70 | 70 | ||
71 | # github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5 | 71 | # github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 |
72 | # [1] git ls-remote https://github.com/insomniacslk/dhcp b105c29bd1b57548c9b51874f2e43bcbc261860e | 72 | # [1] git ls-remote https://github.com/insomniacslk/dhcp 8abf58130905b866076c8002e77aac6cb2e26d0e |
73 | SRCREV_dhcp="b105c29bd1b57548c9b51874f2e43bcbc261860e" | 73 | SRCREV_dhcp="8abf58130905b866076c8002e77aac6cb2e26d0e" |
74 | SRC_URI += "git://github.com/insomniacslk/dhcp;name=dhcp;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/insomniacslk/dhcp" | 74 | SRC_URI += "git://github.com/insomniacslk/dhcp;name=dhcp;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/insomniacslk/dhcp" |
75 | 75 | ||
76 | # github.com/moby/sys/mountinfo v0.7.2 | 76 | # github.com/moby/sys/mountinfo v0.7.2 |
@@ -93,8 +93,8 @@ SRC_URI += "git://github.com/cpuguy83/go-md2man;name=go-md2man-v2;protocol=https | |||
93 | SRCREV_blackfriday-v2="4c9bf9512682b995722660a4196c0013228e2049" | 93 | SRCREV_blackfriday-v2="4c9bf9512682b995722660a4196c0013228e2049" |
94 | SRC_URI += "git://github.com/russross/blackfriday;name=blackfriday-v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/russross/blackfriday/v2" | 94 | SRC_URI += "git://github.com/russross/blackfriday;name=blackfriday-v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/russross/blackfriday/v2" |
95 | 95 | ||
96 | # github.com/containernetworking/plugins v1.5.1 | 96 | # github.com/containernetworking/plugins v1.6.2 |
97 | # [1] git ls-remote https://github.com/containernetworking/plugins c29dc79f96cd50452a247a4591443d2aac033429 | 97 | # [1] git ls-remote https://github.com/containernetworking/plugins 7f756b411efc3d3730c707e2cc1f2baf1a66e28c |
98 | SRCREV_plugins="c29dc79f96cd50452a247a4591443d2aac033429" | 98 | SRCREV_plugins="7f756b411efc3d3730c707e2cc1f2baf1a66e28c" |
99 | SRC_URI += "git://github.com/containernetworking/plugins;name=plugins;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/containernetworking/plugins" | 99 | SRC_URI += "git://github.com/containernetworking/plugins;name=plugins;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/containernetworking/plugins" |
100 | 100 | ||