From 9f4d93e2256ee682945fb3f8d12e2398f36b229e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 16 Jan 2025 20:09:45 +0000 Subject: rootlesskit: update to v2.3.1 Bumping rootlesskit to version v2.3.1-28-g0b4ed7b, which comprises the following commits: b4fe9a7 go fmt a1beb23 Build(deps): Bump golang.org/x/net from 0.28.0 to 0.33.0 9546d0d Build(deps): Bump golang.org/x/sys from 0.28.0 to 0.29.0 2363620 fix: allow to propagate the address specified in -p option a710d84 Build(deps): Bump golang.org/x/sys from 0.27.0 to 0.28.0 7c52d16 Build(deps): Bump golang.org/x/sys from 0.25.0 to 0.27.0 16c6608 Build(deps): Bump github.com/Masterminds/semver/v3 from 3.3.0 to 3.3.1 19fab4c Build(deps): Bump github.com/urfave/cli/v2 from 2.27.4 to 2.27.5 b26bc59 Build(deps): Bump golang.org/x/sys from 0.24.0 to 0.25.0 f11b0e6 port/builtin: return proper error for sctp f98e27e Build(deps): Bump github.com/Masterminds/semver/v3 from 3.2.1 to 3.3.0 3bb2efa docs/network: Mention that pasta won't work with some Ubuntu package versions baec6fd docs/network: Don't suggest removing AppArmor rules for pasta ae0c97d pasta: Update comment about issue with AppArmor and creation of user namespace 3c35024 v2.3.1+dev fcc67fe v2.3.1 56337e7 CI: attest-build-provenance: fix a subject-path issue (461) 2c2a107 v2.3.0+dev 5bf364f v2.3.0 f3948fd Enable actions/attest-build-provenance e403655 CI: update Docker (27.1.2) 169edeb CI: update pasta (2024_08_14.61c0b0d) d5a270f go.mod: golang.org/x/net v0.28.0 5e81602 go.mod: github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5 8751f26 Deprecate rootlesskit-docker-proxy (no longer needed since Docker v28) 36ceb0e child, pasta: Allow drivers to configure their own interface, let pasta do that ade4c86 pasta: Let it run in background, and wait until it forks 8cbb3ae CI: update Go to 1.23 1139aed Build(deps): Bump github.com/urfave/cli/v2 from 2.27.3 to 2.27.4 fba675b Build(deps): Bump golang.org/x/sys from 0.22.0 to 0.24.0 926c6aa Build(deps): Bump github.com/urfave/cli/v2 from 2.27.2 to 2.27.3 90ad956 Build(deps): Bump github.com/gofrs/flock from 0.12.0 to 0.12.1 1899165 Build(deps): Bump github.com/moby/sys/mountinfo from 0.7.1 to 0.7.2 c5a4fbf v2.2.0+dev 17a2cd4 v2.2.0 b8197ef go.mod: update d6a8962 CI: update dependencies a631a8c Build(deps): Bump github.com/gofrs/flock from 0.8.1 to 0.12.0 ca26493 Add reexec branch for socket activation to correct LISTEN_PID c202896 Build(deps): Bump golang.org/x/sys from 0.21.0 to 0.22.0 8ce63fd Build(deps): Bump github.com/containernetworking/plugins f68acb9 Build(deps): Bump golang.org/x/sys from 0.20.0 to 0.21.0 c784875 Build(deps): Bump github.com/containernetworking/plugins Signed-off-by: Bruce Ashfield --- recipes-extended/rootlesskit/relocation.inc | 1 - .../rootlesskit/rootlesskit/modules.txt | 26 ++++--- recipes-extended/rootlesskit/rootlesskit_git.bb | 4 +- recipes-extended/rootlesskit/src_uri.inc | 80 ++++++++++------------ 4 files changed, 51 insertions(+), 60 deletions(-) diff --git a/recipes-extended/rootlesskit/relocation.inc b/recipes-extended/rootlesskit/relocation.inc index 02c5c85c..14ff0645 100644 --- a/recipes-extended/rootlesskit/relocation.inc +++ b/recipes-extended/rootlesskit/relocation.inc @@ -12,7 +12,6 @@ export sites="gotest.tools/v3:gotest.tools/v3:force \ github.com/pierrec/lz4/v4:github.com/pierrec/lz4/v4:force \ github.com/xrash/smetrics:github.com/xrash/smetrics:force \ github.com/sirupsen/logrus:github.com/sirupsen/logrus:force \ - github.com/josharian/native:github.com/josharian/native:force \ github.com/insomniacslk/dhcp:github.com/insomniacslk/dhcp:force \ github.com/Masterminds/semver/v3:github.com/Masterminds/semver/v3:force \ github.com/cpuguy83/go-md2man/v2:github.com/cpuguy83/go-md2man/v2:force \ diff --git a/recipes-extended/rootlesskit/rootlesskit/modules.txt b/recipes-extended/rootlesskit/rootlesskit/modules.txt index b38f0371..641d0996 100644 --- a/recipes-extended/rootlesskit/rootlesskit/modules.txt +++ b/recipes-extended/rootlesskit/rootlesskit/modules.txt @@ -1,16 +1,16 @@ -# github.com/Masterminds/semver/v3 v3.2.1 +# github.com/Masterminds/semver/v3 v3.3.1 ## explicit -# github.com/containernetworking/plugins v1.5.0 +# github.com/containernetworking/plugins v1.5.1 ## explicit -# github.com/gofrs/flock v0.8.1 +# github.com/gofrs/flock v0.12.1 ## explicit # github.com/google/uuid v1.6.0 ## explicit # github.com/gorilla/mux v1.8.1 ## explicit -# github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb +# github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5 ## explicit -# github.com/moby/sys/mountinfo v0.7.1 +# github.com/moby/sys/mountinfo v0.7.2 ## explicit # github.com/moby/vpnkit v0.5.0 ## explicit @@ -18,25 +18,23 @@ ## explicit # github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 ## explicit -# github.com/urfave/cli/v2 v2.27.2 +# github.com/urfave/cli/v2 v2.27.5 ## explicit -# golang.org/x/sys v0.20.0 +# golang.org/x/sys v0.29.0 ## explicit # gotest.tools/v3 v3.5.1 ## explicit -# github.com/cpuguy83/go-md2man/v2 v2.0.4 +# github.com/cpuguy83/go-md2man/v2 v2.0.5 ## explicit # github.com/google/go-cmp v0.6.0 ## explicit -# github.com/josharian/native v1.1.0 -## explicit -# github.com/pierrec/lz4/v4 v4.1.17 +# github.com/pierrec/lz4/v4 v4.1.21 ## explicit # github.com/russross/blackfriday/v2 v2.1.0 ## explicit -# github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 +# github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 ## explicit -# github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 +# github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 ## explicit -# golang.org/x/net v0.24.0 +# golang.org/x/net v0.33.0 ## explicit diff --git a/recipes-extended/rootlesskit/rootlesskit_git.bb b/recipes-extended/rootlesskit/rootlesskit_git.bb index 26b4c57c..0f66c64f 100644 --- a/recipes-extended/rootlesskit/rootlesskit_git.bb +++ b/recipes-extended/rootlesskit/rootlesskit_git.bb @@ -14,7 +14,7 @@ DEPENDS = " \ " # Specify the first two important SRCREVs as the format SRCREV_FORMAT="rootless" -SRCREV_rootless = "d942cd5880099d8ce0fddeef051cad4894eba25e" +SRCREV_rootless = "0b4ed7b5ca2e6b7cd2b9fb003cc7f6913bd76abf" SRC_URI = "git://github.com/rootless-containers/rootlesskit;name=rootless;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" @@ -31,7 +31,7 @@ GO_IMPORT = "import" S = "${WORKDIR}/git" -PV = "v2.1.0+git" +PV = "v2.3.1+git" ROOTLESS_PKG = "github.com/rootless-containers/rootlesskit" diff --git a/recipes-extended/rootlesskit/src_uri.inc b/recipes-extended/rootlesskit/src_uri.inc index 91385f1f..a21bf05c 100644 --- a/recipes-extended/rootlesskit/src_uri.inc +++ b/recipes-extended/rootlesskit/src_uri.inc @@ -3,25 +3,24 @@ SRCREV_gotest.tools-v3="81cea1abc596b025bf2573c7fdf97740512e4c6c" 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" -# golang.org/x/sys v0.20.0 -# [1] git ls-remote https://go.googlesource.com/sys 7d69d983c4522784860c781a0d7b80408fdc0cd1 -SRCREV_sys="7d69d983c4522784860c781a0d7b80408fdc0cd1" -SRC_URI += "git://go.googlesource.com/sys;name=sys;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/sys" - -# golang.org/x/net v0.24.0 -# [1] git ls-remote https://go.googlesource.com/net 7bbe32058aba7159e4d273710e6f4f1c16c627fb -SRCREV_net="7bbe32058aba7159e4d273710e6f4f1c16c627fb" +# golang.org/x/sys v0.29.0 +# [1] git ls-remote https://github.com/golang/sys d4ac05dc8c4c953ec29cae3df56c0833f4010763 +SRCREV_sys="d4ac05dc8c4c953ec29cae3df56c0833f4010763" +SRC_URI += "git://github.com/golang/sys;name=sys;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/sys" + +# golang.org/x/net v0.33.0 +# [1] git ls-remote https://go.googlesource.com/net dfc720dfe0cfc125116068c20efcdcb5e4eab464 +SRCREV_net="dfc720dfe0cfc125116068c20efcdcb5e4eab464" SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/net" -# github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 -# [1] git ls-remote https://github.com/u-root/uio 3e8cd9d6bf6310d57e3e1e95ffda926a4be34cce -#SRCREV_uio="3e8cd9d6bf6310d57e3e1e95ffda926a4be34cce" +# github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 +# [1] git ls-remote https://github.com/u-root/uio d2acac8f37018c514adec45c51f58eace3795df4 SRCREV_uio="d2acac8f37018c514adec45c51f58eace3795df4" SRC_URI += "git://github.com/u-root/uio;name=uio;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/u-root/uio" -# github.com/gofrs/flock v0.8.1 -# [1] git ls-remote https://github.com/gofrs/flock 6f010d1acea74a32f2f2066bfe324c08bbee30e3 -SRCREV_flock="6f010d1acea74a32f2f2066bfe324c08bbee30e3" +# github.com/gofrs/flock v0.12.1 +# [1] git ls-remote https://github.com/gofrs/flock 9de625d921bf362f81e0760056fdff11c8542435 +SRCREV_flock="9de625d921bf362f81e0760056fdff11c8542435" SRC_URI += "git://github.com/gofrs/flock;name=flock;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/gofrs/flock" # github.com/google/uuid v1.6.0 @@ -44,9 +43,9 @@ SRC_URI += "git://github.com/moby/vpnkit;name=vpnkit;protocol=https;nobranch=1;d SRCREV_water="2b4b6d7c09d80835e5f13f6b040d69f00a158b24" SRC_URI += "git://github.com/songgao/water;name=water;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/songgao/water" -# github.com/urfave/cli/v2 v2.27.2 -# [1] git ls-remote https://github.com/urfave/cli a1a099bd1c28a2a6beac29123308e87b9606fcc0 -SRCREV_v2="a1a099bd1c28a2a6beac29123308e87b9606fcc0" +# github.com/urfave/cli/v2 v2.27.5 +# [1] git ls-remote https://github.com/urfave/cli f035ffaa3749afda2cd26fb824aa940747297ef1 +SRCREV_v2="f035ffaa3749afda2cd26fb824aa940747297ef1" SRC_URI += "git://github.com/urfave/cli;name=v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/urfave/cli/v2" # github.com/google/go-cmp v0.6.0 @@ -54,14 +53,14 @@ SRC_URI += "git://github.com/urfave/cli;name=v2;protocol=https;nobranch=1;destsu SRCREV_go-cmp="c3ad8435e7bef96af35732bc0789e5a2278c6d5f" SRC_URI += "git://github.com/google/go-cmp;name=go-cmp;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/google/go-cmp" -# github.com/pierrec/lz4/v4 v4.1.17 -# [1] git ls-remote https://github.com/pierrec/lz4 d2b3f5d3e4659cc4fd720d1649c39b5627187261 -SRCREV_v4="d2b3f5d3e4659cc4fd720d1649c39b5627187261" +# github.com/pierrec/lz4/v4 v4.1.21 +# [1] git ls-remote https://github.com/pierrec/lz4 294e7659e17723306ebf3a44cd7ad2c11f456c37 +SRCREV_v4="294e7659e17723306ebf3a44cd7ad2c11f456c37" SRC_URI += "git://github.com/pierrec/lz4;name=v4;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/pierrec/lz4/v4" -# github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 -# [1] git ls-remote https://github.com/xrash/smetrics 5f08fbb34913bc8ab95bb4f2a89a0637ca922666 -SRCREV_smetrics="5f08fbb34913bc8ab95bb4f2a89a0637ca922666" +# github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 +# [1] git ls-remote https://github.com/xrash/smetrics 686a1a2994c11fac124829fadcb683a24ab8d25f +SRCREV_smetrics="686a1a2994c11fac124829fadcb683a24ab8d25f" SRC_URI += "git://github.com/xrash/smetrics;name=smetrics;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/xrash/smetrics" # github.com/sirupsen/logrus v1.9.3 @@ -69,29 +68,24 @@ SRC_URI += "git://github.com/xrash/smetrics;name=smetrics;protocol=https;nobranc SRCREV_logrus="d40e25cd45ed9c6b2b66e6b97573a0413e4c23bd" SRC_URI += "git://github.com/sirupsen/logrus;name=logrus;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/sirupsen/logrus" -# github.com/josharian/native v1.1.0 -# [1] git ls-remote https://github.com/josharian/native c1e37c09b531b14ae12a501eb6fd529b31cecdaa -SRCREV_native="c1e37c09b531b14ae12a501eb6fd529b31cecdaa" -SRC_URI += "git://github.com/josharian/native;name=native;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/josharian/native" - -# github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb -# [1] git ls-remote https://github.com/insomniacslk/dhcp 49801966e6cb2cfc58a2bd98f69a9c182c1d4c18 -SRCREV_dhcp="49801966e6cb2cfc58a2bd98f69a9c182c1d4c18" +# github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5 +# [1] git ls-remote https://github.com/insomniacslk/dhcp b105c29bd1b57548c9b51874f2e43bcbc261860e +SRCREV_dhcp="b105c29bd1b57548c9b51874f2e43bcbc261860e" SRC_URI += "git://github.com/insomniacslk/dhcp;name=dhcp;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/insomniacslk/dhcp" -# github.com/moby/sys/mountinfo v0.7.1 -# [1] git ls-remote https://github.com/moby/sys 4950d7687cf6c9b138dc0e18c2c7351e1f6ed497 -SRCREV_mountinfo="4950d7687cf6c9b138dc0e18c2c7351e1f6ed497" +# github.com/moby/sys/mountinfo v0.7.2 +# [1] git ls-remote https://github.com/moby/sys cafbe42351600ca9b363e220722f66d96f6e71f4 +SRCREV_mountinfo="cafbe42351600ca9b363e220722f66d96f6e71f4" SRC_URI += "git://github.com/moby/sys;name=mountinfo;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/moby/sys/mountinfo" -# github.com/Masterminds/semver/v3 v3.2.1 -# [1] git ls-remote https://github.com/Masterminds/semver e06051f8fcc4c8b4a4990c337b9862a2448722e5 -SRCREV_v3="e06051f8fcc4c8b4a4990c337b9862a2448722e5" +# github.com/Masterminds/semver/v3 v3.3.1 +# [1] git ls-remote https://github.com/Masterminds/semver 1558ca3488226e3490894a145e831ad58a5ff958 +SRCREV_v3="1558ca3488226e3490894a145e831ad58a5ff958" SRC_URI += "git://github.com/Masterminds/semver;name=v3;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/Masterminds/semver/v3" -# github.com/cpuguy83/go-md2man/v2 v2.0.4 -# [1] git ls-remote https://github.com/cpuguy83/go-md2man d6816bfbea7506064a28119f805fb79f9bc5aeec -SRCREV_go-md2man-v2="d6816bfbea7506064a28119f805fb79f9bc5aeec" +# github.com/cpuguy83/go-md2man/v2 v2.0.5 +# [1] git ls-remote https://github.com/cpuguy83/go-md2man b14773d4db11046c50d0d1c05955839604aae991 +SRCREV_go-md2man-v2="b14773d4db11046c50d0d1c05955839604aae991" SRC_URI += "git://github.com/cpuguy83/go-md2man;name=go-md2man-v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/cpuguy83/go-md2man/v2" # github.com/russross/blackfriday/v2 v2.1.0 @@ -99,8 +93,8 @@ SRC_URI += "git://github.com/cpuguy83/go-md2man;name=go-md2man-v2;protocol=https SRCREV_blackfriday-v2="4c9bf9512682b995722660a4196c0013228e2049" 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" -# github.com/containernetworking/plugins v1.5.0 -# [1] git ls-remote https://github.com/containernetworking/plugins 0259301ae2eab8cb4f5755d790c29cb869765f8a -SRCREV_plugins="0259301ae2eab8cb4f5755d790c29cb869765f8a" +# github.com/containernetworking/plugins v1.5.1 +# [1] git ls-remote https://github.com/containernetworking/plugins c29dc79f96cd50452a247a4591443d2aac033429 +SRCREV_plugins="c29dc79f96cd50452a247a4591443d2aac033429" SRC_URI += "git://github.com/containernetworking/plugins;name=plugins;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/containernetworking/plugins" -- cgit v1.2.3-54-g00ecf