Merge pull request #531 from AkihiroSuda/dev

AkihiroSuda · web-flow · commit 236f31ec2258 · 2025-09-26T17:10:11.000+09:00
v3.0.0-alpha.0
diff --git a/cmd/rootlessctl/main.go b/cmd/rootlessctl/main.go
@@ -9,8 +9,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api/client"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/version"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api/client"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/version"
 )
 
 func main() {
diff --git a/cmd/rootlessctl/port.go b/cmd/rootlessctl/port.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port/portutil"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port/portutil"
 )
 
 var listPortsCommand = cli.Command{
diff --git a/cmd/rootlesskit-docker-proxy/main.go b/cmd/rootlesskit-docker-proxy/main.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api/client"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api/client"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/cmd/rootlesskit/main.go b/cmd/rootlesskit/main.go
@@ -15,23 +15,23 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 
-	"github.com/rootless-containers/rootlesskit/v2/cmd/rootlesskit/unshare"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/child"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/common"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/copyup/tmpfssymlink"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/gvisortapvsock"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/lxcusernic"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/none"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/pasta"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/slirp4netns"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/vpnkit"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/parent"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin"
-	gvisortapvsock_port "github.com/rootless-containers/rootlesskit/v2/pkg/port/gvisortapvsock"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port/portutil"
-	slirp4netns_port "github.com/rootless-containers/rootlesskit/v2/pkg/port/slirp4netns"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/systemd/activation"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/version"
+	"github.com/rootless-containers/rootlesskit/v3/cmd/rootlesskit/unshare"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/child"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/common"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/copyup/tmpfssymlink"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/gvisortapvsock"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/lxcusernic"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/none"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/pasta"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/slirp4netns"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/vpnkit"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/parent"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port/builtin"
+	gvisortapvsock_port "github.com/rootless-containers/rootlesskit/v3/pkg/port/gvisortapvsock"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port/portutil"
+	slirp4netns_port "github.com/rootless-containers/rootlesskit/v3/pkg/port/slirp4netns"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/systemd/activation"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/version"
 )
 
 const (
diff --git a/cmd/rootlesskit/unshare/unshare.go b/cmd/rootlesskit/unshare/unshare.go
@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/common"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/version"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/common"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/version"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/rootless-containers/rootlesskit/v2
+module github.com/rootless-containers/rootlesskit/v3
 
 go 1.24.2
 
diff --git a/pkg/api/client/client.go b/pkg/api/client/client.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/httputil"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/httputil"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
 )
 
 type Client interface {
diff --git a/pkg/api/router/router.go b/pkg/api/router/router.go
@@ -9,10 +9,10 @@ import (
 	"strconv"
 
 	"github.com/gorilla/mux"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/httputil"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/version"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/httputil"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/version"
 )
 
 // NetworkDriver is implemented by network.ParentDriver
diff --git a/pkg/child/child.go b/pkg/child/child.go
@@ -14,13 +14,13 @@ import (
 	"time"
 
 	"github.com/containernetworking/plugins/pkg/ns"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/common"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/copyup"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/messages"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/sigproxy"
-	sigproxysignal "github.com/rootless-containers/rootlesskit/v2/pkg/sigproxy/signal"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/common"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/copyup"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/messages"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/sigproxy"
+	sigproxysignal "github.com/rootless-containers/rootlesskit/v3/pkg/sigproxy/signal"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )
diff --git a/pkg/copyup/tmpfssymlink/tmpfssymlink.go b/pkg/copyup/tmpfssymlink/tmpfssymlink.go
@@ -8,7 +8,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/copyup"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/copyup"
 )
 
 func NewChildDriver() copyup.ChildDriver {
diff --git a/pkg/messages/messages.go b/pkg/messages/messages.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/lowlevelmsgutil"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/lowlevelmsgutil"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/network/gvisortapvsock/gvisortapvsock.go b/pkg/network/gvisortapvsock/gvisortapvsock.go
@@ -20,12 +20,12 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/songgao/water"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/common"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/messages"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/iputils"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/parentutils"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/common"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/messages"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/iputils"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/parentutils"
 )
 
 const (
diff --git a/pkg/network/lxcusernic/lxcusernic.go b/pkg/network/lxcusernic/lxcusernic.go
@@ -16,10 +16,10 @@ import (
 	"github.com/insomniacslk/dhcp/dhcpv4/client4"
 
 	"github.com/containernetworking/plugins/pkg/ns"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/common"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/messages"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/common"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/messages"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/network/network.go b/pkg/network/network.go
@@ -3,8 +3,8 @@ package network
 import (
 	"context"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/messages"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/messages"
 )
 
 // ParentDriver is called from the parent namespace
diff --git a/pkg/network/none/none.go b/pkg/network/none/none.go
@@ -7,10 +7,10 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/common"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/messages"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/common"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/messages"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network"
 )
 
 func NewParentDriver() (network.ParentDriver, error) {
diff --git a/pkg/network/parentutils/parentutils.go b/pkg/network/parentutils/parentutils.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/common"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/common"
 )
 
 func PrepareTap(childPID int, childNetNsPath string, tap string) error {
diff --git a/pkg/network/pasta/pasta.go b/pkg/network/pasta/pasta.go
@@ -12,11 +12,11 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/common"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/messages"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/iputils"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/common"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/messages"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/iputils"
 )
 
 type Features struct {
diff --git a/pkg/network/slirp4netns/slirp4netns.go b/pkg/network/slirp4netns/slirp4netns.go
@@ -17,12 +17,12 @@ import (
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/common"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/messages"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/iputils"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network/parentutils"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/common"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/messages"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/iputils"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network/parentutils"
 )
 
 type Features struct {
diff --git a/pkg/network/vpnkit/vpnkit.go b/pkg/network/vpnkit/vpnkit.go
@@ -21,10 +21,10 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/songgao/water"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/common"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/messages"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/common"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/messages"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network"
 )
 
 func NewParentDriver(binary string, mtu int, ifname string, disableHostLoopback bool) network.ParentDriver {
diff --git a/pkg/parent/dynidtools/dynidtools.go b/pkg/parent/dynidtools/dynidtools.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/parent/idtools"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/parent/idtools"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/parent/dynidtools/dynidtools_test.go b/pkg/parent/dynidtools/dynidtools_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/parent/idtools"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/parent/idtools"
 	"gotest.tools/v3/assert"
 )
 
diff --git a/pkg/parent/parent.go b/pkg/parent/parent.go
@@ -15,15 +15,15 @@ import (
 
 	"github.com/gofrs/flock"
 	"github.com/gorilla/mux"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api/router"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/messages"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/network"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/parent/cgrouputil"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/parent/dynidtools"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/parent/idtools"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/sigproxy"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/sigproxy/signal"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api/router"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/messages"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/network"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/parent/cgrouputil"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/parent/dynidtools"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/parent/idtools"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/sigproxy"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/sigproxy/signal"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )
diff --git a/pkg/parent/parent_test.go b/pkg/parent/parent_test.go
@@ -5,7 +5,7 @@ import (
 	"os/user"
 	"testing"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/parent/idtools"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/parent/idtools"
 	"golang.org/x/sys/unix"
 	"gotest.tools/v3/assert"
 )
diff --git a/pkg/port/builtin/builtin.go b/pkg/port/builtin/builtin.go
@@ -3,9 +3,9 @@ package builtin
 import (
 	"io"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/child"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/parent"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port/builtin/child"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port/builtin/parent"
 )
 
 var (
diff --git a/pkg/port/builtin/builtin_test.go b/pkg/port/builtin/builtin_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port/testsuite"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port/testsuite"
 )
 
 func TestMain(m *testing.M) {
diff --git a/pkg/port/builtin/child/child.go b/pkg/port/builtin/child/child.go
@@ -12,10 +12,10 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/containernetworking/plugins/pkg/ns"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/lowlevelmsgutil"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/msg"
-	opaquepkg "github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin/opaque"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/lowlevelmsgutil"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port/builtin/msg"
+	opaquepkg "github.com/rootless-containers/rootlesskit/v3/pkg/port/builtin/opaque"
 )
 
 func NewDriver(logWriter io.Writer) port.ChildDriver {
diff --git a/pkg/port/builtin/msg/msg.go b/pkg/port/builtin/msg/msg.go
@@ -8,8 +8,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/lowlevelmsgutil"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/lowlevelmsgutil"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
 )
 
 const (
diff --git a/pkg/port/builtin/parent/parent.go b/pkg/port/builtin/parent/parent.go
diff --git a/pkg/port/builtin/parent/tcp/tcp.go b/pkg/port/builtin/parent/tcp/tcp.go
diff --git a/pkg/port/builtin/parent/udp/udp.go b/pkg/port/builtin/parent/udp/udp.go
diff --git a/pkg/port/gvisortapvsock/gvisortapvsock.go b/pkg/port/gvisortapvsock/gvisortapvsock.go
diff --git a/pkg/port/port.go b/pkg/port/port.go
diff --git a/pkg/port/portutil/portutil.go b/pkg/port/portutil/portutil.go
diff --git a/pkg/port/portutil/portutil_test.go b/pkg/port/portutil/portutil_test.go
diff --git a/pkg/port/slirp4netns/slirp4netns.go b/pkg/port/slirp4netns/slirp4netns.go
diff --git a/pkg/port/testsuite/testsuite.go b/pkg/port/testsuite/testsuite.go
diff --git a/pkg/sigproxy/sigproxy.go b/pkg/sigproxy/sigproxy.go
diff --git a/pkg/version/version.go b/pkg/version/version.go

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import (`
`9`	`9`	`"github.com/sirupsen/logrus"`
`10`	`10`	`"github.com/urfave/cli/v2"`
`11`	`11`
`12`		`- "github.com/rootless-containers/rootlesskit/v2/pkg/api/client"`
`13`		`- "github.com/rootless-containers/rootlesskit/v2/pkg/version"`
	`12`	`+ "github.com/rootless-containers/rootlesskit/v3/pkg/api/client"`
	`13`	`+ "github.com/rootless-containers/rootlesskit/v3/pkg/version"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/urfave/cli/v2"`
`13`	`13`
`14`		`- "github.com/rootless-containers/rootlesskit/v2/pkg/port"`
`15`		`- "github.com/rootless-containers/rootlesskit/v2/pkg/port/portutil"`
	`14`	`+ "github.com/rootless-containers/rootlesskit/v3/pkg/port"`
	`15`	`+ "github.com/rootless-containers/rootlesskit/v3/pkg/port/portutil"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var listPortsCommand = cli.Command{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"os/exec"`
`8`	`8`	`"syscall"`
`9`	`9`
`10`		`- "github.com/rootless-containers/rootlesskit/v2/pkg/common"`
`11`		`- "github.com/rootless-containers/rootlesskit/v2/pkg/version"`
	`10`	`+ "github.com/rootless-containers/rootlesskit/v3/pkg/common"`
	`11`	`+ "github.com/rootless-containers/rootlesskit/v3/pkg/version"`
`12`	`12`	`"github.com/urfave/cli/v2"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/rootless-containers/rootlesskit/v2`
	`1`	`+module github.com/rootless-containers/rootlesskit/v3`
`2`	`2`
`3`	`3`	`go 1.24.2`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"golang.org/x/sys/unix"`
`10`	`10`
`11`		`- "github.com/rootless-containers/rootlesskit/v2/pkg/copyup"`
	`11`	`+ "github.com/rootless-containers/rootlesskit/v3/pkg/copyup"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func NewChildDriver() copyup.ChildDriver {`