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>
This commit is contained in:
Bruce Ashfield 2025-03-26 13:53:39 +00:00
parent bf401fcf61
commit c55420b33f
4 changed files with 91 additions and 48 deletions

View File

@ -5,7 +5,7 @@ export sites="gotest.tools/v3:gotest.tools/v3:force \
github.com/google/uuid:github.com/google/uuid:force \
github.com/gorilla/mux:github.com/gorilla/mux:force \
github.com/moby/vpnkit:github.com/moby/vpnkit:force \
github.com/u-root/uio:github.com/u-root/uio:force \
github.com/u-root/uio:github.com/u-root/uio:force \
github.com/songgao/water:github.com/songgao/water:force \
github.com/urfave/cli/v2:github.com/urfave/cli/v2:force \
github.com/google/go-cmp:github.com/google/go-cmp:force \

View File

@ -1,40 +1,83 @@
# github.com/Masterminds/semver/v3 v3.3.1
## explicit
# github.com/containernetworking/plugins v1.5.1
## explicit
## explicit; go 1.21
github.com/Masterminds/semver/v3
# github.com/containernetworking/plugins v1.6.2
## explicit; go 1.23
github.com/containernetworking/plugins/pkg/ns
# github.com/cpuguy83/go-md2man/v2 v2.0.5
## explicit; go 1.11
github.com/cpuguy83/go-md2man/v2/md2man
# github.com/gofrs/flock v0.12.1
## explicit
## explicit; go 1.21.0
github.com/gofrs/flock
# github.com/google/go-cmp v0.6.0
## explicit; go 1.13
github.com/google/go-cmp/cmp
github.com/google/go-cmp/cmp/internal/diff
github.com/google/go-cmp/cmp/internal/flags
github.com/google/go-cmp/cmp/internal/function
github.com/google/go-cmp/cmp/internal/value
# github.com/google/uuid v1.6.0
## explicit
github.com/google/uuid
# github.com/gorilla/mux v1.8.1
## explicit
# github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5
## explicit
## explicit; go 1.20
github.com/gorilla/mux
# github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905
## explicit; go 1.20
github.com/insomniacslk/dhcp/dhcpv4
github.com/insomniacslk/dhcp/dhcpv4/client4
github.com/insomniacslk/dhcp/iana
github.com/insomniacslk/dhcp/interfaces
github.com/insomniacslk/dhcp/rfc1035label
# github.com/moby/sys/mountinfo v0.7.2
## explicit
## explicit; go 1.17
github.com/moby/sys/mountinfo
# github.com/moby/vpnkit v0.5.0
## explicit
# github.com/sirupsen/logrus v1.9.3
## explicit
# github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
## explicit
# github.com/urfave/cli/v2 v2.27.5
## explicit
# golang.org/x/sys v0.29.0
## explicit
# gotest.tools/v3 v3.5.1
## explicit
# github.com/cpuguy83/go-md2man/v2 v2.0.5
## explicit
# github.com/google/go-cmp v0.6.0
## explicit
github.com/moby/vpnkit/go/pkg/vmnet
# github.com/pierrec/lz4/v4 v4.1.21
## explicit
## explicit; go 1.14
github.com/pierrec/lz4/v4
github.com/pierrec/lz4/v4/internal/lz4block
github.com/pierrec/lz4/v4/internal/lz4errors
github.com/pierrec/lz4/v4/internal/lz4stream
github.com/pierrec/lz4/v4/internal/xxh32
# github.com/russross/blackfriday/v2 v2.1.0
## explicit
github.com/russross/blackfriday/v2
# github.com/sirupsen/logrus v1.9.3
## explicit; go 1.13
github.com/sirupsen/logrus
# github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
## explicit
github.com/songgao/water
# github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701
## explicit
## explicit; go 1.21
github.com/u-root/uio/rand
github.com/u-root/uio/uio
# github.com/urfave/cli/v2 v2.27.6
## explicit; go 1.18
github.com/urfave/cli/v2
# github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1
## explicit
# golang.org/x/net v0.33.0
## explicit
## explicit; go 1.15
github.com/xrash/smetrics
# golang.org/x/net v0.36.0
## explicit; go 1.23.0
golang.org/x/net/bpf
golang.org/x/net/internal/iana
golang.org/x/net/internal/socket
golang.org/x/net/ipv4
# golang.org/x/sys v0.31.0
## explicit; go 1.23.0
golang.org/x/sys/unix
golang.org/x/sys/windows
golang.org/x/sys/windows/registry
# gotest.tools/v3 v3.5.2
## explicit; go 1.17
gotest.tools/v3/assert
gotest.tools/v3/assert/cmp
gotest.tools/v3/internal/assert
gotest.tools/v3/internal/difflib
gotest.tools/v3/internal/format
gotest.tools/v3/internal/source

View File

@ -14,7 +14,7 @@ DEPENDS = " \
"
# Specify the first two important SRCREVs as the format
SRCREV_FORMAT="rootless"
SRCREV_rootless = "0b4ed7b5ca2e6b7cd2b9fb003cc7f6913bd76abf"
SRCREV_rootless = "530859a92629689c0c17c96d9ab145f4d04b5b5a"
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.3.1+git"
PV = "v2.3.4+git"
ROOTLESS_PKG = "github.com/rootless-containers/rootlesskit"

View File

@ -1,16 +1,16 @@
# gotest.tools/v3 v3.5.1
# [1] git ls-remote https://github.com/gotestyourself/gotest.tools 81cea1abc596b025bf2573c7fdf97740512e4c6c
SRCREV_gotest.tools-v3="81cea1abc596b025bf2573c7fdf97740512e4c6c"
# gotest.tools/v3 v3.5.2
# [1] git ls-remote https://github.com/gotestyourself/gotest.tools 0b81523ff268a1f1b0baf4a5da67e42fbb86880b
SRCREV_gotest.tools-v3="0b81523ff268a1f1b0baf4a5da67e42fbb86880b"
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.29.0
# [1] git ls-remote https://github.com/golang/sys d4ac05dc8c4c953ec29cae3df56c0833f4010763
SRCREV_sys="d4ac05dc8c4c953ec29cae3df56c0833f4010763"
# golang.org/x/sys v0.31.0
# [1] git ls-remote https://github.com/golang/sys 74cfc93a99be6ca6f193856132e6799065b071af
SRCREV_sys="74cfc93a99be6ca6f193856132e6799065b071af"
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"
# golang.org/x/net v0.36.0
# [1] git ls-remote https://go.googlesource.com/net 85d1d54551b68719346cb9fec24b911da4e452a1
SRCREV_net="85d1d54551b68719346cb9fec24b911da4e452a1"
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-20240224005618-d2acac8f3701
@ -43,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.5
# [1] git ls-remote https://github.com/urfave/cli f035ffaa3749afda2cd26fb824aa940747297ef1
SRCREV_v2="f035ffaa3749afda2cd26fb824aa940747297ef1"
# github.com/urfave/cli/v2 v2.27.6
# [1] git ls-remote https://github.com/urfave/cli 9d76d15e478af5e952fffc872597c47b69ec7ee7
SRCREV_v2="9d76d15e478af5e952fffc872597c47b69ec7ee7"
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
@ -68,9 +68,9 @@ 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/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5
# [1] git ls-remote https://github.com/insomniacslk/dhcp b105c29bd1b57548c9b51874f2e43bcbc261860e
SRCREV_dhcp="b105c29bd1b57548c9b51874f2e43bcbc261860e"
# github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905
# [1] git ls-remote https://github.com/insomniacslk/dhcp 8abf58130905b866076c8002e77aac6cb2e26d0e
SRCREV_dhcp="8abf58130905b866076c8002e77aac6cb2e26d0e"
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.2
@ -93,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.1
# [1] git ls-remote https://github.com/containernetworking/plugins c29dc79f96cd50452a247a4591443d2aac033429
SRCREV_plugins="c29dc79f96cd50452a247a4591443d2aac033429"
# github.com/containernetworking/plugins v1.6.2
# [1] git ls-remote https://github.com/containernetworking/plugins 7f756b411efc3d3730c707e2cc1f2baf1a66e28c
SRCREV_plugins="7f756b411efc3d3730c707e2cc1f2baf1a66e28c"
SRC_URI += "git://github.com/containernetworking/plugins;name=plugins;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/containernetworking/plugins"