Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rootlesskit for openSUSE:Factory
checked in at 2024-06-11 18:27:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rootlesskit (Old)
and /work/SRC/openSUSE:Factory/.rootlesskit.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rootlesskit"
Tue Jun 11 18:27:11 2024 rev:9 rq:1179655 version:2.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rootlesskit/rootlesskit.changes 2024-03-13
22:16:54.920600548 +0100
+++ /work/SRC/openSUSE:Factory/.rootlesskit.new.19518/rootlesskit.changes
2024-06-11 18:27:23.768714509 +0200
@@ -1,0 +2,18 @@
+Mon Jun 10 07:41:21 UTC 2024 - danish.prak...@suse.com
+
+- Update to version 2.1.0:
+ * v2.1.0
+ * Build(deps): Bump golang.org/x/net from 0.20.0 to 0.23.0
+ * feat: add new none network
+ * Build(deps): Bump golang.org/x/sys from 0.18.0 to 0.19.0
+ * testing: add test for systemd socket activation
+ * child: createCmd: propogate systemd files to actual process within
namespace
+ * parent: setupFilesAndEnv: retrieve socket count from systemd environment
variable
+ * parent: setupFilesAndEnv: systemd socket activation concept
+ * parent: setupFilesAndEnv: introduce dynamic array for cmd.ExtraFiles
+ * parent: setupFilesAndEnv: avoid hardcoded file descriptor numbers
+ * parent: refactor cmd files and environment to helper function
+ * Build(deps): Bump github.com/containernetworking/plugins
+ * v2.0.2+dev
+
+-------------------------------------------------------------------
Old:
----
rootlesskit-2.0.2.tar.gz
New:
----
rootlesskit-2.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rootlesskit.spec ++++++
--- /var/tmp/diff_new_pack.FjFFsE/_old 2024-06-11 18:27:24.636746186 +0200
+++ /var/tmp/diff_new_pack.FjFFsE/_new 2024-06-11 18:27:24.636746186 +0200
@@ -17,7 +17,7 @@
Name: rootlesskit
-Version: 2.0.2
+Version: 2.1.0
Release: 0
Summary: Linux-native fakeroot using user namespaces
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.FjFFsE/_old 2024-06-11 18:27:24.676747646 +0200
+++ /var/tmp/diff_new_pack.FjFFsE/_new 2024-06-11 18:27:24.680747792 +0200
@@ -4,7 +4,7 @@
<param
name="url">https://github.com/rootless-containers/rootlesskit.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v2.0.2</param>
+ <param name="revision">v2.1.0</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.FjFFsE/_old 2024-06-11 18:27:24.700748522 +0200
+++ /var/tmp/diff_new_pack.FjFFsE/_new 2024-06-11 18:27:24.704748668 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/rootless-containers/rootlesskit.git</param>
- <param
name="changesrevision">9e7dd3380db22481df6c9570a04ba4f3c10315ed</param></service></servicedata>
+ <param
name="changesrevision">da77c66a62412f8631fd9ce17653a3ee36802215</param></service></servicedata>
(No newline at EOF)
++++++ rootlesskit-2.0.2.tar.gz -> rootlesskit-2.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rootlesskit-2.0.2/cmd/rootlesskit/main.go
new/rootlesskit-2.1.0/cmd/rootlesskit/main.go
--- old/rootlesskit-2.0.2/cmd/rootlesskit/main.go 2024-03-05
22:47:56.000000000 +0100
+++ new/rootlesskit-2.1.0/cmd/rootlesskit/main.go 2024-04-26
02:16:44.000000000 +0200
@@ -21,6 +21,7 @@
"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/network/none"
"github.com/rootless-containers/rootlesskit/v2/pkg/parent"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin"
"github.com/rootless-containers/rootlesskit/v2/pkg/port/portutil"
@@ -83,7 +84,7 @@
}, CategoryState),
Categorize(&cli.StringFlag{
Name: "net",
- Usage: "network driver [host, pasta(experimental),
slirp4netns, vpnkit, lxc-user-nic(experimental)]",
+ Usage: "network driver [host, none,
pasta(experimental), slirp4netns, vpnkit, lxc-user-nic(experimental)]",
Value: "host",
}, CategoryNetwork),
Categorize(&cli.StringFlag{
@@ -368,7 +369,7 @@
}
disableHostLoopback := clicontext.Bool("disable-host-loopback")
- if !disableHostLoopback && clicontext.String("net") != "host" {
+ if !disableHostLoopback && clicontext.String("net") != "host" &&
clicontext.String("net") != "none" {
logrus.Warn("specifying --disable-host-loopback is highly
recommended to prohibit connecting to 127.0.0.1:* on the host namespace
(requires pasta, slirp4netns, or VPNKit)")
}
@@ -388,6 +389,26 @@
if ifname != "" {
return opt, errors.New("ifname cannot be specified for
--net=host")
}
+ case "none":
+ if mtu != 0 {
+ logrus.Warnf("unsupported mtu for --net=none: %d", mtu)
+ }
+ if ipnet != nil {
+ return opt, errors.New("custom cidr is not supported
for --net=none")
+ }
+ if ifname != "" {
+ return opt, errors.New("ifname cannot be specified for
--net=none")
+ }
+ switch portDriver := clicontext.String("port-driver");
portDriver {
+ case "none", "builtin":
+ // NOP
+ default:
+ return opt, errors.New("network \"none\" requires
either port driver \"none\" or \"builtin\"")
+ }
+ opt.NetworkDriver, err = none.NewParentDriver()
+ if err != nil {
+ return opt, err
+ }
case "pasta":
logrus.Warn("\"pasta\" network driver is experimental. Needs
very recent version of pasta (see docs/network.md).")
binary := clicontext.String("pasta-binary")
@@ -582,6 +603,8 @@
switch s := clicontext.String("net"); s {
case "host":
// NOP
+ case "none":
+ // NOP
case "pasta":
opt.NetworkDriver = pasta.NewChildDriver()
case "slirp4netns":
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rootlesskit-2.0.2/go.mod new/rootlesskit-2.1.0/go.mod
--- old/rootlesskit-2.0.2/go.mod 2024-03-05 22:47:56.000000000 +0100
+++ new/rootlesskit-2.1.0/go.mod 2024-04-26 02:16:44.000000000 +0200
@@ -4,7 +4,7 @@
require (
github.com/Masterminds/semver/v3 v3.2.1
- github.com/containernetworking/plugins v1.4.0
+ github.com/containernetworking/plugins v1.4.1
github.com/gofrs/flock v0.8.1
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1
@@ -14,7 +14,7 @@
github.com/sirupsen/logrus v1.9.3
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
github.com/urfave/cli/v2 v2.27.1
- golang.org/x/sys v0.18.0
+ golang.org/x/sys v0.19.0
gotest.tools/v3 v3.5.1
)
@@ -26,5 +26,5 @@
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
- golang.org/x/net v0.17.0 // indirect
+ golang.org/x/net v0.23.0 // indirect
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rootlesskit-2.0.2/go.sum new/rootlesskit-2.1.0/go.sum
--- old/rootlesskit-2.0.2/go.sum 2024-03-05 22:47:56.000000000 +0100
+++ new/rootlesskit-2.1.0/go.sum 2024-04-26 02:16:44.000000000 +0200
@@ -1,14 +1,14 @@
github.com/Masterminds/semver/v3 v3.2.1
h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
github.com/Masterminds/semver/v3 v3.2.1/go.mod
h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
github.com/containernetworking/cni v1.1.2
h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl31EQbXALQ=
-github.com/containernetworking/plugins v1.4.0
h1:+w22VPYgk7nQHw7KT92lsRmuToHvb7wwSv9iTbXzzic=
-github.com/containernetworking/plugins v1.4.0/go.mod
h1:UYhcOyjefnrQvKvmmyEKsUA+M9Nfn7tqULPpH0Pkcj0=
+github.com/containernetworking/plugins v1.4.1
h1:+sJRRv8PKhLkXIl6tH1D7RMi+CbbHutDGU+ErLBORWA=
+github.com/containernetworking/plugins v1.4.1/go.mod
h1:n6FFGKcaY4o2o5msgu/UImtoC+fpQXM3076VHfHbj60=
github.com/cpuguy83/go-md2man/v2 v2.0.2
h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod
h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/davecgh/go-spew v1.1.0/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
github.com/gofrs/flock v0.8.1/go.mod
h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
@@ -28,8 +28,8 @@
github.com/moby/sys/mountinfo v0.7.1/go.mod
h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
github.com/moby/vpnkit v0.5.0 h1:VcDpS9y+PmT9itf+mH5Qdh9GME7ungLMt9yjf9o4REY=
github.com/moby/vpnkit v0.5.0/go.mod
h1:KyjUrL9cb6ZSNNAUwZfqRjhwwgJ3BJN+kXh0t43WTUQ=
-github.com/onsi/ginkgo/v2 v2.13.2
h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs=
-github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
+github.com/onsi/ginkgo/v2 v2.16.0
h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
+github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
github.com/pierrec/lz4/v4 v4.1.14/go.mod
h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
github.com/pierrec/lz4/v4 v4.1.17
h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
github.com/pierrec/lz4/v4 v4.1.17/go.mod
h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
@@ -42,23 +42,23 @@
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
h1:TG/diQgUe0pntT/2D9tmUCz4VNwm9MfrtPr0SU2qSX8=
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8/go.mod
h1:P5HUIBuIWKbyjl083/loAegFkfbFNx5i2qEP4CNbm7E=
github.com/stretchr/objx v0.1.0/go.mod
h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0
h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod
h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.2
h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63
h1:YcojQL98T/OO+rybuzn2+5KrD5dBwXIvYBvQ2cD3Avg=
github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63/go.mod
h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264=
github.com/urfave/cli/v2 v2.27.1
h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
github.com/urfave/cli/v2 v2.27.1/go.mod
h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673
h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod
h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405
h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod
h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rootlesskit-2.0.2/hack/integration-systemd-socket.sh
new/rootlesskit-2.1.0/hack/integration-systemd-socket.sh
--- old/rootlesskit-2.0.2/hack/integration-systemd-socket.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/rootlesskit-2.1.0/hack/integration-systemd-socket.sh 2024-04-26
02:16:44.000000000 +0200
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+if [ -z "$EXECED" ]
+then
+ systemd-socket-activate -E EXECED=1 -l /tmp/activate.sock socat
ACCEPT-FD:3 EXEC:"rootlesskit $0",nofork 2>/dev/null &
+ OUTPUT="$(curl --unix-socket /tmp/activate.sock http://localhost/hello
2>/dev/null)"
+ [ "$(printf 'Hello\n' )" = "$OUTPUT" ] || exit 1
+else
+ [ "$LISTEN_FDS" = "1" ] || exit 1
+ read -r REQUEST
+ if [ "$(printf 'GET /hello HTTP/1.1\r\n')" = "$REQUEST" ]
+ then
+ printf 'HTTP/1.1 200 OK\r\nContent-Length: 6\r\n\r\nHello\n'
+ else
+ printf 'HTTP/1.1 400 Bad Request\r\nContent-Length: 5\r\n\r\nBad!\n'
+ fi
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rootlesskit-2.0.2/pkg/child/child.go
new/rootlesskit-2.1.0/pkg/child/child.go
--- old/rootlesskit-2.0.2/pkg/child/child.go 2024-03-05 22:47:56.000000000
+0100
+++ new/rootlesskit-2.1.0/pkg/child/child.go 2024-04-26 02:16:44.000000000
+0200
@@ -34,6 +34,23 @@
"rslave": uintptr(unix.MS_REC | unix.MS_SLAVE),
}
+func setupFiles(cmd *exec.Cmd) {
+ // 0 1 and 2 are used for stdin. stdout, and stderr
+ const firstExtraFD = 3
+ systemdActivationFDs := 0
+ // check for systemd socket activation sockets
+ if v := os.Getenv("LISTEN_FDS"); v != "" {
+ if num, err := strconv.Atoi(v); err == nil {
+ systemdActivationFDs = num
+ cmd.ExtraFiles = make([]*os.File, systemdActivationFDs)
+ }
+ }
+ for fd := 0; fd < systemdActivationFDs; fd++ {
+ cmd.ExtraFiles[fd] = os.NewFile(uintptr(firstExtraFD + fd), "")
+ }
+}
+
+
func createCmd(targetCmd []string) (*exec.Cmd, error) {
var args []string
if len(targetCmd) > 1 {
@@ -47,6 +64,7 @@
cmd.SysProcAttr = &syscall.SysProcAttr{
Pdeathsig: syscall.SIGKILL,
}
+ setupFiles(cmd)
return cmd, nil
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rootlesskit-2.0.2/pkg/network/none/none.go
new/rootlesskit-2.1.0/pkg/network/none/none.go
--- old/rootlesskit-2.0.2/pkg/network/none/none.go 1970-01-01
01:00:00.000000000 +0100
+++ new/rootlesskit-2.1.0/pkg/network/none/none.go 2024-04-26
02:16:44.000000000 +0200
@@ -0,0 +1,60 @@
+package none
+
+import (
+ "context"
+ "os"
+ "os/exec"
+ "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"
+)
+
+func NewParentDriver() (network.ParentDriver, error) {
+ return &parentDriver{}, nil
+}
+
+type parentDriver struct {
+}
+
+const DriverName = "none"
+
+func (d *parentDriver) MTU() int {
+ return 0
+}
+
+func (d *parentDriver) Info(ctx context.Context) (*api.NetworkDriverInfo,
error) {
+ return &api.NetworkDriverInfo{
+ Driver: DriverName,
+ }, nil
+}
+
+func (d *parentDriver) ConfigureNetwork(childPID int, stateDir,
detachedNetNSPath string) (*messages.ParentInitNetworkDriverCompleted, func()
error, error) {
+ var cleanups []func() error
+
+ if detachedNetNSPath != "" {
+ cmd := exec.Command("nsenter", "-t", strconv.Itoa(childPID),
"-n"+detachedNetNSPath, "-m", "-U", "--no-fork", "--preserve-credentials",
"sleep", "infinity")
+ cmd.SysProcAttr = &syscall.SysProcAttr{
+ Pdeathsig: syscall.SIGKILL,
+ }
+ err := cmd.Start()
+ if err != nil {
+ return nil, nil, err
+ }
+ childPID = cmd.Process.Pid
+ }
+
+ cmds := [][]string{
+ []string{"nsenter", "-t", strconv.Itoa(childPID), "-n", "-m",
"-U", "--no-fork", "--preserve-credentials", "ip", "address", "add",
"127.0.0.1/8", "dev", "lo"},
+ []string{"nsenter", "-t", strconv.Itoa(childPID), "-n", "-m",
"-U", "--no-fork", "--preserve-credentials", "ip", "link", "set", "lo", "up"},
+ }
+ if err := common.Execs(os.Stderr, os.Environ(), cmds); err != nil {
+ return nil, nil, err
+ }
+
+ netmsg := messages.ParentInitNetworkDriverCompleted{}
+ return &netmsg, common.Seq(cleanups), nil
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rootlesskit-2.0.2/pkg/parent/parent.go
new/rootlesskit-2.1.0/pkg/parent/parent.go
--- old/rootlesskit-2.0.2/pkg/parent/parent.go 2024-03-05 22:47:56.000000000
+0100
+++ new/rootlesskit-2.1.0/pkg/parent/parent.go 2024-04-26 02:16:44.000000000
+0200
@@ -125,6 +125,27 @@
return lock, nil
}
+func setupFilesAndEnv(cmd *exec.Cmd, readPipe *os.File, writePipe *os.File,
envKey string) {
+ // 0 1 and 2 are used for stdin. stdout, and stderr
+ const firstExtraFD = 3
+ systemdActivationFDs := 0
+ // check for systemd socket activation sockets
+ if v := os.Getenv("LISTEN_FDS"); v != "" {
+ if num, err := strconv.Atoi(v); err == nil {
+ systemdActivationFDs = num
+ }
+ }
+ cmd.ExtraFiles = make([]*os.File, systemdActivationFDs + 2)
+ for fd := 0; fd < systemdActivationFDs; fd++ {
+ cmd.ExtraFiles[fd] = os.NewFile(uintptr(firstExtraFD + fd), "")
+ }
+ readIndex := systemdActivationFDs
+ writeIndex := readIndex + 1
+ cmd.ExtraFiles[readIndex] = readPipe
+ cmd.ExtraFiles[writeIndex] = writePipe
+ cmd.Env = append(os.Environ(),
envKey+"="+strconv.Itoa(firstExtraFD+readIndex)+","+strconv.Itoa(firstExtraFD+writeIndex))
+}
+
func Parent(opt Opt) error {
if err := checkPreflight(opt); err != nil {
return err
@@ -178,8 +199,7 @@
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
- cmd.ExtraFiles = []*os.File{pipeR, pipe2W}
- cmd.Env = append(os.Environ(), opt.PipeFDEnvKey+"=3,4")
+ setupFilesAndEnv(cmd, pipeR, pipe2W, opt.PipeFDEnvKey)
if opt.StateDirEnvKey != "" {
cmd.Env = append(cmd.Env, opt.StateDirEnvKey+"="+opt.StateDir)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rootlesskit-2.0.2/pkg/version/version.go
new/rootlesskit-2.1.0/pkg/version/version.go
--- old/rootlesskit-2.0.2/pkg/version/version.go 2024-03-05
22:47:56.000000000 +0100
+++ new/rootlesskit-2.1.0/pkg/version/version.go 2024-04-26
02:16:44.000000000 +0200
@@ -1,3 +1,3 @@
package version
-const Version = "2.0.2"
+const Version = "2.1.0"
++++++ vendor.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/internal/socket/cmsghdr.go
new/vendor/golang.org/x/net/internal/socket/cmsghdr.go
--- old/vendor/golang.org/x/net/internal/socket/cmsghdr.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/cmsghdr.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
|| solaris || zos
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/cmsghdr_bsd.go
new/vendor/golang.org/x/net/internal/socket/cmsghdr_bsd.go
--- old/vendor/golang.org/x/net/internal/socket/cmsghdr_bsd.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/cmsghdr_bsd.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd
-// +build aix darwin dragonfly freebsd netbsd openbsd
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_32bit.go
new/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_32bit.go
--- old/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_32bit.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_32bit.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (arm || mips || mipsle || 386 || ppc) && linux
-// +build arm mips mipsle 386 ppc
-// +build linux
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go
new/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go
--- old/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/cmsghdr_linux_64bit.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (arm64 || amd64 || loong64 || ppc64 || ppc64le || mips64 ||
mips64le || riscv64 || s390x) && linux
-// +build arm64 amd64 loong64 ppc64 ppc64le mips64 mips64le riscv64 s390x
-// +build linux
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/cmsghdr_solaris_64bit.go
new/vendor/golang.org/x/net/internal/socket/cmsghdr_solaris_64bit.go
--- old/vendor/golang.org/x/net/internal/socket/cmsghdr_solaris_64bit.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/cmsghdr_solaris_64bit.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 && solaris
-// +build amd64,solaris
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/cmsghdr_stub.go
new/vendor/golang.org/x/net/internal/socket/cmsghdr_stub.go
--- old/vendor/golang.org/x/net/internal/socket/cmsghdr_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/cmsghdr_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd &&
!openbsd && !solaris && !zos
-// +build
!aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/cmsghdr_unix.go
new/vendor/golang.org/x/net/internal/socket/cmsghdr_unix.go
--- old/vendor/golang.org/x/net/internal/socket/cmsghdr_unix.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/cmsghdr_unix.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
|| solaris || zos
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/complete_dontwait.go
new/vendor/golang.org/x/net/internal/socket/complete_dontwait.go
--- old/vendor/golang.org/x/net/internal/socket/complete_dontwait.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/complete_dontwait.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd ||
solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/complete_nodontwait.go
new/vendor/golang.org/x/net/internal/socket/complete_nodontwait.go
--- old/vendor/golang.org/x/net/internal/socket/complete_nodontwait.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/complete_nodontwait.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || windows || zos
-// +build aix windows zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/internal/socket/empty.s
new/vendor/golang.org/x/net/internal/socket/empty.s
--- old/vendor/golang.org/x/net/internal/socket/empty.s 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/empty.s 2024-06-10
09:41:21.000000000 +0200
@@ -3,6 +3,5 @@
// license that can be found in the LICENSE file.
//go:build darwin && go1.12
-// +build darwin,go1.12
// This exists solely so we can linkname in symbols from syscall.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/error_unix.go
new/vendor/golang.org/x/net/internal/socket/error_unix.go
--- old/vendor/golang.org/x/net/internal/socket/error_unix.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/error_unix.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
|| solaris || zos
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/iovec_32bit.go
new/vendor/golang.org/x/net/internal/socket/iovec_32bit.go
--- old/vendor/golang.org/x/net/internal/socket/iovec_32bit.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/iovec_32bit.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (arm || mips || mipsle || 386 || ppc) && (darwin || dragonfly ||
freebsd || linux || netbsd || openbsd)
-// +build arm mips mipsle 386 ppc
-// +build darwin dragonfly freebsd linux netbsd openbsd
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/iovec_64bit.go
new/vendor/golang.org/x/net/internal/socket/iovec_64bit.go
--- old/vendor/golang.org/x/net/internal/socket/iovec_64bit.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/iovec_64bit.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (arm64 || amd64 || loong64 || ppc64 || ppc64le || mips64 ||
mips64le || riscv64 || s390x) && (aix || darwin || dragonfly || freebsd ||
linux || netbsd || openbsd || zos)
-// +build arm64 amd64 loong64 ppc64 ppc64le mips64 mips64le riscv64 s390x
-// +build aix darwin dragonfly freebsd linux netbsd openbsd zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/iovec_solaris_64bit.go
new/vendor/golang.org/x/net/internal/socket/iovec_solaris_64bit.go
--- old/vendor/golang.org/x/net/internal/socket/iovec_solaris_64bit.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/iovec_solaris_64bit.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 && solaris
-// +build amd64,solaris
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/iovec_stub.go
new/vendor/golang.org/x/net/internal/socket/iovec_stub.go
--- old/vendor/golang.org/x/net/internal/socket/iovec_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/iovec_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd &&
!openbsd && !solaris && !zos
-// +build
!aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/mmsghdr_stub.go
new/vendor/golang.org/x/net/internal/socket/mmsghdr_stub.go
--- old/vendor/golang.org/x/net/internal/socket/mmsghdr_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/mmsghdr_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !linux && !netbsd
-// +build !aix,!linux,!netbsd
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/mmsghdr_unix.go
new/vendor/golang.org/x/net/internal/socket/mmsghdr_unix.go
--- old/vendor/golang.org/x/net/internal/socket/mmsghdr_unix.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/mmsghdr_unix.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || linux || netbsd
-// +build aix linux netbsd
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/msghdr_bsd.go
new/vendor/golang.org/x/net/internal/socket/msghdr_bsd.go
--- old/vendor/golang.org/x/net/internal/socket/msghdr_bsd.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/msghdr_bsd.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd
-// +build aix darwin dragonfly freebsd netbsd openbsd
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/msghdr_bsdvar.go
new/vendor/golang.org/x/net/internal/socket/msghdr_bsdvar.go
--- old/vendor/golang.org/x/net/internal/socket/msghdr_bsdvar.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/msghdr_bsdvar.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || netbsd
-// +build aix darwin dragonfly freebsd netbsd
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/msghdr_linux_32bit.go
new/vendor/golang.org/x/net/internal/socket/msghdr_linux_32bit.go
--- old/vendor/golang.org/x/net/internal/socket/msghdr_linux_32bit.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/msghdr_linux_32bit.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (arm || mips || mipsle || 386 || ppc) && linux
-// +build arm mips mipsle 386 ppc
-// +build linux
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go
new/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go
--- old/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/msghdr_linux_64bit.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (arm64 || amd64 || loong64 || ppc64 || ppc64le || mips64 ||
mips64le || riscv64 || s390x) && linux
-// +build arm64 amd64 loong64 ppc64 ppc64le mips64 mips64le riscv64 s390x
-// +build linux
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/msghdr_solaris_64bit.go
new/vendor/golang.org/x/net/internal/socket/msghdr_solaris_64bit.go
--- old/vendor/golang.org/x/net/internal/socket/msghdr_solaris_64bit.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/msghdr_solaris_64bit.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 && solaris
-// +build amd64,solaris
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/msghdr_stub.go
new/vendor/golang.org/x/net/internal/socket/msghdr_stub.go
--- old/vendor/golang.org/x/net/internal/socket/msghdr_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/msghdr_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd &&
!openbsd && !solaris && !zos
-// +build
!aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/msghdr_zos_s390x.go
new/vendor/golang.org/x/net/internal/socket/msghdr_zos_s390x.go
--- old/vendor/golang.org/x/net/internal/socket/msghdr_zos_s390x.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/msghdr_zos_s390x.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build s390x && zos
-// +build s390x,zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/internal/socket/norace.go
new/vendor/golang.org/x/net/internal/socket/norace.go
--- old/vendor/golang.org/x/net/internal/socket/norace.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/norace.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !race
-// +build !race
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/internal/socket/race.go
new/vendor/golang.org/x/net/internal/socket/race.go
--- old/vendor/golang.org/x/net/internal/socket/race.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/race.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build race
-// +build race
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go
new/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go
--- old/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
-// +build linux
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/rawconn_msg.go
new/vendor/golang.org/x/net/internal/socket/rawconn_msg.go
--- old/vendor/golang.org/x/net/internal/socket/rawconn_msg.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/rawconn_msg.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
|| solaris || windows || zos
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/rawconn_nommsg.go
new/vendor/golang.org/x/net/internal/socket/rawconn_nommsg.go
--- old/vendor/golang.org/x/net/internal/socket/rawconn_nommsg.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/rawconn_nommsg.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
-// +build !linux
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/rawconn_nomsg.go
new/vendor/golang.org/x/net/internal/socket/rawconn_nomsg.go
--- old/vendor/golang.org/x/net/internal/socket/rawconn_nomsg.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/rawconn_nomsg.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd &&
!openbsd && !solaris && !windows && !zos
-// +build
!aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/internal/socket/sys_bsd.go
new/vendor/golang.org/x/net/internal/socket/sys_bsd.go
--- old/vendor/golang.org/x/net/internal/socket/sys_bsd.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/sys_bsd.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd openbsd solaris
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/sys_const_unix.go
new/vendor/golang.org/x/net/internal/socket/sys_const_unix.go
--- old/vendor/golang.org/x/net/internal/socket/sys_const_unix.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/sys_const_unix.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
|| solaris || zos
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/internal/socket/sys_linux.go
new/vendor/golang.org/x/net/internal/socket/sys_linux.go
--- old/vendor/golang.org/x/net/internal/socket/sys_linux.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/sys_linux.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && !s390x && !386
-// +build linux,!s390x,!386
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/sys_linux_loong64.go
new/vendor/golang.org/x/net/internal/socket/sys_linux_loong64.go
--- old/vendor/golang.org/x/net/internal/socket/sys_linux_loong64.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/sys_linux_loong64.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build loong64
-// +build loong64
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/sys_linux_riscv64.go
new/vendor/golang.org/x/net/internal/socket/sys_linux_riscv64.go
--- old/vendor/golang.org/x/net/internal/socket/sys_linux_riscv64.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/sys_linux_riscv64.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build riscv64
-// +build riscv64
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/internal/socket/sys_posix.go
new/vendor/golang.org/x/net/internal/socket/sys_posix.go
--- old/vendor/golang.org/x/net/internal/socket/sys_posix.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/sys_posix.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
|| solaris || windows || zos
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/internal/socket/sys_stub.go
new/vendor/golang.org/x/net/internal/socket/sys_stub.go
--- old/vendor/golang.org/x/net/internal/socket/sys_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/sys_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd &&
!openbsd && !solaris && !windows && !zos
-// +build
!aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/internal/socket/sys_unix.go
new/vendor/golang.org/x/net/internal/socket/sys_unix.go
--- old/vendor/golang.org/x/net/internal/socket/sys_unix.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/sys_unix.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
|| solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/zsys_aix_ppc64.go
new/vendor/golang.org/x/net/internal/socket/zsys_aix_ppc64.go
--- old/vendor/golang.org/x/net/internal/socket/zsys_aix_ppc64.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/zsys_aix_ppc64.go
2024-06-10 09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// Added for go1.11 compatibility
//go:build aix
-// +build aix
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/zsys_linux_loong64.go
new/vendor/golang.org/x/net/internal/socket/zsys_linux_loong64.go
--- old/vendor/golang.org/x/net/internal/socket/zsys_linux_loong64.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/zsys_linux_loong64.go
2024-06-10 09:41:21.000000000 +0200
@@ -2,7 +2,6 @@
// cgo -godefs defs_linux.go
//go:build loong64
-// +build loong64
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/net/internal/socket/zsys_linux_riscv64.go
new/vendor/golang.org/x/net/internal/socket/zsys_linux_riscv64.go
--- old/vendor/golang.org/x/net/internal/socket/zsys_linux_riscv64.go
2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/internal/socket/zsys_linux_riscv64.go
2024-06-10 09:41:21.000000000 +0200
@@ -2,7 +2,6 @@
// cgo -godefs defs_linux.go
//go:build riscv64
-// +build riscv64
package socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/control_bsd.go
new/vendor/golang.org/x/net/ipv4/control_bsd.go
--- old/vendor/golang.org/x/net/ipv4/control_bsd.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/control_bsd.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd
-// +build aix darwin dragonfly freebsd netbsd openbsd
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/control_pktinfo.go
new/vendor/golang.org/x/net/ipv4/control_pktinfo.go
--- old/vendor/golang.org/x/net/ipv4/control_pktinfo.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/control_pktinfo.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || linux || solaris
-// +build darwin linux solaris
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/control_stub.go
new/vendor/golang.org/x/net/ipv4/control_stub.go
--- old/vendor/golang.org/x/net/ipv4/control_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/control_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd &&
!openbsd && !solaris && !windows && !zos
-// +build
!aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/control_unix.go
new/vendor/golang.org/x/net/ipv4/control_unix.go
--- old/vendor/golang.org/x/net/ipv4/control_unix.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/control_unix.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
|| solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/icmp_stub.go
new/vendor/golang.org/x/net/ipv4/icmp_stub.go
--- old/vendor/golang.org/x/net/ipv4/icmp_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/icmp_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
-// +build !linux
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/payload_cmsg.go
new/vendor/golang.org/x/net/ipv4/payload_cmsg.go
--- old/vendor/golang.org/x/net/ipv4/payload_cmsg.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/payload_cmsg.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
|| solaris || zos
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
new/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
--- old/vendor/golang.org/x/net/ipv4/payload_nocmsg.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/payload_nocmsg.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd &&
!openbsd && !solaris && !zos
-// +build
!aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sockopt_posix.go
new/vendor/golang.org/x/net/ipv4/sockopt_posix.go
--- old/vendor/golang.org/x/net/ipv4/sockopt_posix.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/sockopt_posix.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
|| solaris || windows || zos
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows zos
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sockopt_stub.go
new/vendor/golang.org/x/net/ipv4/sockopt_stub.go
--- old/vendor/golang.org/x/net/ipv4/sockopt_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/sockopt_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd &&
!openbsd && !solaris && !windows && !zos
-// +build
!aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_aix.go
new/vendor/golang.org/x/net/ipv4/sys_aix.go
--- old/vendor/golang.org/x/net/ipv4/sys_aix.go 2024-03-11 11:48:04.000000000
+0100
+++ new/vendor/golang.org/x/net/ipv4/sys_aix.go 2024-06-10 09:41:21.000000000
+0200
@@ -4,7 +4,6 @@
// Added for go1.11 compatibility
//go:build aix
-// +build aix
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_asmreq.go
new/vendor/golang.org/x/net/ipv4/sys_asmreq.go
--- old/vendor/golang.org/x/net/ipv4/sys_asmreq.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/sys_asmreq.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd ||
solaris || windows
-// +build aix darwin dragonfly freebsd netbsd openbsd solaris windows
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_asmreq_stub.go
new/vendor/golang.org/x/net/ipv4/sys_asmreq_stub.go
--- old/vendor/golang.org/x/net/ipv4/sys_asmreq_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/sys_asmreq_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !netbsd && !openbsd &&
!solaris && !windows
-// +build !aix,!darwin,!dragonfly,!freebsd,!netbsd,!openbsd,!solaris,!windows
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_asmreqn.go
new/vendor/golang.org/x/net/ipv4/sys_asmreqn.go
--- old/vendor/golang.org/x/net/ipv4/sys_asmreqn.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/sys_asmreqn.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || freebsd || linux
-// +build darwin freebsd linux
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_asmreqn_stub.go
new/vendor/golang.org/x/net/ipv4/sys_asmreqn_stub.go
--- old/vendor/golang.org/x/net/ipv4/sys_asmreqn_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/sys_asmreqn_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !darwin && !freebsd && !linux
-// +build !darwin,!freebsd,!linux
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_bpf.go
new/vendor/golang.org/x/net/ipv4/sys_bpf.go
--- old/vendor/golang.org/x/net/ipv4/sys_bpf.go 2024-03-11 11:48:04.000000000
+0100
+++ new/vendor/golang.org/x/net/ipv4/sys_bpf.go 2024-06-10 09:41:21.000000000
+0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
-// +build linux
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_bpf_stub.go
new/vendor/golang.org/x/net/ipv4/sys_bpf_stub.go
--- old/vendor/golang.org/x/net/ipv4/sys_bpf_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/sys_bpf_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
-// +build !linux
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_bsd.go
new/vendor/golang.org/x/net/ipv4/sys_bsd.go
--- old/vendor/golang.org/x/net/ipv4/sys_bsd.go 2024-03-11 11:48:04.000000000
+0100
+++ new/vendor/golang.org/x/net/ipv4/sys_bsd.go 2024-06-10 09:41:21.000000000
+0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build netbsd || openbsd
-// +build netbsd openbsd
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_ssmreq.go
new/vendor/golang.org/x/net/ipv4/sys_ssmreq.go
--- old/vendor/golang.org/x/net/ipv4/sys_ssmreq.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/sys_ssmreq.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || freebsd || linux || solaris
-// +build darwin freebsd linux solaris
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_ssmreq_stub.go
new/vendor/golang.org/x/net/ipv4/sys_ssmreq_stub.go
--- old/vendor/golang.org/x/net/ipv4/sys_ssmreq_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/sys_ssmreq_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !darwin && !freebsd && !linux && !solaris
-// +build !darwin,!freebsd,!linux,!solaris
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/sys_stub.go
new/vendor/golang.org/x/net/ipv4/sys_stub.go
--- old/vendor/golang.org/x/net/ipv4/sys_stub.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/sys_stub.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd &&
!openbsd && !solaris && !windows && !zos
-// +build
!aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/zsys_aix_ppc64.go
new/vendor/golang.org/x/net/ipv4/zsys_aix_ppc64.go
--- old/vendor/golang.org/x/net/ipv4/zsys_aix_ppc64.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/zsys_aix_ppc64.go 2024-06-10
09:41:21.000000000 +0200
@@ -3,7 +3,6 @@
// Added for go1.11 compatibility
//go:build aix
-// +build aix
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/zsys_linux_loong64.go
new/vendor/golang.org/x/net/ipv4/zsys_linux_loong64.go
--- old/vendor/golang.org/x/net/ipv4/zsys_linux_loong64.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/zsys_linux_loong64.go 2024-06-10
09:41:21.000000000 +0200
@@ -2,7 +2,6 @@
// cgo -godefs defs_linux.go
//go:build loong64
-// +build loong64
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/net/ipv4/zsys_linux_riscv64.go
new/vendor/golang.org/x/net/ipv4/zsys_linux_riscv64.go
--- old/vendor/golang.org/x/net/ipv4/zsys_linux_riscv64.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/net/ipv4/zsys_linux_riscv64.go 2024-06-10
09:41:21.000000000 +0200
@@ -2,7 +2,6 @@
// cgo -godefs defs_linux.go
//go:build riscv64
-// +build riscv64
package ipv4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/mmap_nomremap.go
new/vendor/golang.org/x/sys/unix/mmap_nomremap.go
--- old/vendor/golang.org/x/sys/unix/mmap_nomremap.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/mmap_nomremap.go 2024-06-10
09:41:21.000000000 +0200
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build aix || darwin || dragonfly || freebsd || openbsd || solaris
+//go:build aix || darwin || dragonfly || freebsd || openbsd || solaris || zos
package unix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
new/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
--- old/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go 2024-06-10
09:41:21.000000000 +0200
@@ -1520,6 +1520,14 @@
return nil
}
+func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte,
err error) {
+ return mapper.Mmap(fd, offset, length, prot, flags)
+}
+
+func Munmap(b []byte) (err error) {
+ return mapper.Munmap(b)
+}
+
func Read(fd int, p []byte) (n int, err error) {
n, err = read(fd, p)
if raceenabled {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/windows/syscall_windows.go
new/vendor/golang.org/x/sys/windows/syscall_windows.go
--- old/vendor/golang.org/x/sys/windows/syscall_windows.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/sys/windows/syscall_windows.go 2024-06-10
09:41:21.000000000 +0200
@@ -165,6 +165,7 @@
//sys CreateFile(name *uint16, access uint32, mode uint32, sa
*SecurityAttributes, createmode uint32, attrs uint32, templatefile Handle)
(handle Handle, err error) [failretval==InvalidHandle] = CreateFileW
//sys CreateNamedPipe(name *uint16, flags uint32, pipeMode uint32,
maxInstances uint32, outSize uint32, inSize uint32, defaultTimeout uint32, sa
*SecurityAttributes) (handle Handle, err error) [failretval==InvalidHandle] =
CreateNamedPipeW
//sys ConnectNamedPipe(pipe Handle, overlapped *Overlapped) (err error)
+//sys DisconnectNamedPipe(pipe Handle) (err error)
//sys GetNamedPipeInfo(pipe Handle, flags *uint32, outSize *uint32, inSize
*uint32, maxInstances *uint32) (err error)
//sys GetNamedPipeHandleState(pipe Handle, state *uint32, curInstances
*uint32, maxCollectionCount *uint32, collectDataTimeout *uint32, userName
*uint16, maxUserNameSize uint32) (err error) = GetNamedPipeHandleStateW
//sys SetNamedPipeHandleState(pipe Handle, state *uint32, maxCollectionCount
*uint32, collectDataTimeout *uint32) (err error) = SetNamedPipeHandleState
@@ -348,8 +349,19 @@
//sys SetProcessPriorityBoost(process Handle, disable bool) (err error) =
kernel32.SetProcessPriorityBoost
//sys GetProcessWorkingSetSizeEx(hProcess Handle, lpMinimumWorkingSetSize
*uintptr, lpMaximumWorkingSetSize *uintptr, flags *uint32)
//sys SetProcessWorkingSetSizeEx(hProcess Handle, dwMinimumWorkingSetSize
uintptr, dwMaximumWorkingSetSize uintptr, flags uint32) (err error)
+//sys ClearCommBreak(handle Handle) (err error)
+//sys ClearCommError(handle Handle, lpErrors *uint32, lpStat *ComStat) (err
error)
+//sys EscapeCommFunction(handle Handle, dwFunc uint32) (err error)
+//sys GetCommState(handle Handle, lpDCB *DCB) (err error)
+//sys GetCommModemStatus(handle Handle, lpModemStat *uint32) (err error)
//sys GetCommTimeouts(handle Handle, timeouts *CommTimeouts) (err error)
+//sys PurgeComm(handle Handle, dwFlags uint32) (err error)
+//sys SetCommBreak(handle Handle) (err error)
+//sys SetCommMask(handle Handle, dwEvtMask uint32) (err error)
+//sys SetCommState(handle Handle, lpDCB *DCB) (err error)
//sys SetCommTimeouts(handle Handle, timeouts *CommTimeouts) (err error)
+//sys SetupComm(handle Handle, dwInQueue uint32, dwOutQueue uint32) (err
error)
+//sys WaitCommEvent(handle Handle, lpEvtMask *uint32, lpOverlapped
*Overlapped) (err error)
//sys GetActiveProcessorCount(groupNumber uint16) (ret uint32)
//sys GetMaximumProcessorCount(groupNumber uint16) (ret uint32)
//sys EnumWindows(enumFunc uintptr, param unsafe.Pointer) (err error) =
user32.EnumWindows
@@ -1834,3 +1846,73 @@
// accept arguments that can be casted to uintptr, and Coord can't.
return resizePseudoConsole(pconsole,
*((*uint32)(unsafe.Pointer(&size))))
}
+
+// DCB constants. See
https://learn.microsoft.com/en-us/windows/win32/api/winbase/ns-winbase-dcb.
+const (
+ CBR_110 = 110
+ CBR_300 = 300
+ CBR_600 = 600
+ CBR_1200 = 1200
+ CBR_2400 = 2400
+ CBR_4800 = 4800
+ CBR_9600 = 9600
+ CBR_14400 = 14400
+ CBR_19200 = 19200
+ CBR_38400 = 38400
+ CBR_57600 = 57600
+ CBR_115200 = 115200
+ CBR_128000 = 128000
+ CBR_256000 = 256000
+
+ DTR_CONTROL_DISABLE = 0x00000000
+ DTR_CONTROL_ENABLE = 0x00000010
+ DTR_CONTROL_HANDSHAKE = 0x00000020
+
+ RTS_CONTROL_DISABLE = 0x00000000
+ RTS_CONTROL_ENABLE = 0x00001000
+ RTS_CONTROL_HANDSHAKE = 0x00002000
+ RTS_CONTROL_TOGGLE = 0x00003000
+
+ NOPARITY = 0
+ ODDPARITY = 1
+ EVENPARITY = 2
+ MARKPARITY = 3
+ SPACEPARITY = 4
+
+ ONESTOPBIT = 0
+ ONE5STOPBITS = 1
+ TWOSTOPBITS = 2
+)
+
+// EscapeCommFunction constants. See
https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-escapecommfunction.
+const (
+ SETXOFF = 1
+ SETXON = 2
+ SETRTS = 3
+ CLRRTS = 4
+ SETDTR = 5
+ CLRDTR = 6
+ SETBREAK = 8
+ CLRBREAK = 9
+)
+
+// PurgeComm constants. See
https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-purgecomm.
+const (
+ PURGE_TXABORT = 0x0001
+ PURGE_RXABORT = 0x0002
+ PURGE_TXCLEAR = 0x0004
+ PURGE_RXCLEAR = 0x0008
+)
+
+// SetCommMask constants. See
https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-setcommmask.
+const (
+ EV_RXCHAR = 0x0001
+ EV_RXFLAG = 0x0002
+ EV_TXEMPTY = 0x0004
+ EV_CTS = 0x0008
+ EV_DSR = 0x0010
+ EV_RLSD = 0x0020
+ EV_BREAK = 0x0040
+ EV_ERR = 0x0080
+ EV_RING = 0x0100
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/windows/types_windows.go
new/vendor/golang.org/x/sys/windows/types_windows.go
--- old/vendor/golang.org/x/sys/windows/types_windows.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/sys/windows/types_windows.go 2024-06-10
09:41:21.000000000 +0200
@@ -3380,3 +3380,27 @@
Size uint32
BlobData *byte
}
+
+type ComStat struct {
+ Flags uint32
+ CBInQue uint32
+ CBOutQue uint32
+}
+
+type DCB struct {
+ DCBlength uint32
+ BaudRate uint32
+ Flags uint32
+ wReserved uint16
+ XonLim uint16
+ XoffLim uint16
+ ByteSize uint8
+ Parity uint8
+ StopBits uint8
+ XonChar byte
+ XoffChar byte
+ ErrorChar byte
+ EofChar byte
+ EvtChar byte
+ wReserved1 uint16
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/windows/zsyscall_windows.go
new/vendor/golang.org/x/sys/windows/zsyscall_windows.go
--- old/vendor/golang.org/x/sys/windows/zsyscall_windows.go 2024-03-11
11:48:04.000000000 +0100
+++ new/vendor/golang.org/x/sys/windows/zsyscall_windows.go 2024-06-10
09:41:21.000000000 +0200
@@ -188,6 +188,8 @@
procAssignProcessToJobObject =
modkernel32.NewProc("AssignProcessToJobObject")
procCancelIo =
modkernel32.NewProc("CancelIo")
procCancelIoEx =
modkernel32.NewProc("CancelIoEx")
+ procClearCommBreak =
modkernel32.NewProc("ClearCommBreak")
+ procClearCommError =
modkernel32.NewProc("ClearCommError")
procCloseHandle =
modkernel32.NewProc("CloseHandle")
procClosePseudoConsole =
modkernel32.NewProc("ClosePseudoConsole")
procConnectNamedPipe =
modkernel32.NewProc("ConnectNamedPipe")
@@ -212,7 +214,9 @@
procDeleteProcThreadAttributeList =
modkernel32.NewProc("DeleteProcThreadAttributeList")
procDeleteVolumeMountPointW =
modkernel32.NewProc("DeleteVolumeMountPointW")
procDeviceIoControl =
modkernel32.NewProc("DeviceIoControl")
+ procDisconnectNamedPipe =
modkernel32.NewProc("DisconnectNamedPipe")
procDuplicateHandle =
modkernel32.NewProc("DuplicateHandle")
+ procEscapeCommFunction =
modkernel32.NewProc("EscapeCommFunction")
procExitProcess =
modkernel32.NewProc("ExitProcess")
procExpandEnvironmentStringsW =
modkernel32.NewProc("ExpandEnvironmentStringsW")
procFindClose =
modkernel32.NewProc("FindClose")
@@ -236,6 +240,8 @@
procGenerateConsoleCtrlEvent =
modkernel32.NewProc("GenerateConsoleCtrlEvent")
procGetACP =
modkernel32.NewProc("GetACP")
procGetActiveProcessorCount =
modkernel32.NewProc("GetActiveProcessorCount")
+ procGetCommModemStatus =
modkernel32.NewProc("GetCommModemStatus")
+ procGetCommState =
modkernel32.NewProc("GetCommState")
procGetCommTimeouts =
modkernel32.NewProc("GetCommTimeouts")
procGetCommandLineW =
modkernel32.NewProc("GetCommandLineW")
procGetComputerNameExW =
modkernel32.NewProc("GetComputerNameExW")
@@ -322,6 +328,7 @@
procProcess32NextW =
modkernel32.NewProc("Process32NextW")
procProcessIdToSessionId =
modkernel32.NewProc("ProcessIdToSessionId")
procPulseEvent =
modkernel32.NewProc("PulseEvent")
+ procPurgeComm =
modkernel32.NewProc("PurgeComm")
procQueryDosDeviceW =
modkernel32.NewProc("QueryDosDeviceW")
procQueryFullProcessImageNameW =
modkernel32.NewProc("QueryFullProcessImageNameW")
procQueryInformationJobObject =
modkernel32.NewProc("QueryInformationJobObject")
@@ -335,6 +342,9 @@
procResetEvent =
modkernel32.NewProc("ResetEvent")
procResizePseudoConsole =
modkernel32.NewProc("ResizePseudoConsole")
procResumeThread =
modkernel32.NewProc("ResumeThread")
+ procSetCommBreak =
modkernel32.NewProc("SetCommBreak")
+ procSetCommMask =
modkernel32.NewProc("SetCommMask")
+ procSetCommState =
modkernel32.NewProc("SetCommState")
procSetCommTimeouts =
modkernel32.NewProc("SetCommTimeouts")
procSetConsoleCursorPosition =
modkernel32.NewProc("SetConsoleCursorPosition")
procSetConsoleMode =
modkernel32.NewProc("SetConsoleMode")
@@ -342,7 +352,6 @@
procSetDefaultDllDirectories =
modkernel32.NewProc("SetDefaultDllDirectories")
procSetDllDirectoryW =
modkernel32.NewProc("SetDllDirectoryW")
procSetEndOfFile =
modkernel32.NewProc("SetEndOfFile")
- procSetFileValidData =
modkernel32.NewProc("SetFileValidData")
procSetEnvironmentVariableW =
modkernel32.NewProc("SetEnvironmentVariableW")
procSetErrorMode =
modkernel32.NewProc("SetErrorMode")
procSetEvent =
modkernel32.NewProc("SetEvent")
@@ -351,6 +360,7 @@
procSetFileInformationByHandle =
modkernel32.NewProc("SetFileInformationByHandle")
procSetFilePointer =
modkernel32.NewProc("SetFilePointer")
procSetFileTime =
modkernel32.NewProc("SetFileTime")
+ procSetFileValidData =
modkernel32.NewProc("SetFileValidData")
procSetHandleInformation =
modkernel32.NewProc("SetHandleInformation")
procSetInformationJobObject =
modkernel32.NewProc("SetInformationJobObject")
procSetNamedPipeHandleState =
modkernel32.NewProc("SetNamedPipeHandleState")
@@ -361,6 +371,7 @@
procSetStdHandle =
modkernel32.NewProc("SetStdHandle")
procSetVolumeLabelW =
modkernel32.NewProc("SetVolumeLabelW")
procSetVolumeMountPointW =
modkernel32.NewProc("SetVolumeMountPointW")
+ procSetupComm =
modkernel32.NewProc("SetupComm")
procSizeofResource =
modkernel32.NewProc("SizeofResource")
procSleepEx =
modkernel32.NewProc("SleepEx")
procTerminateJobObject =
modkernel32.NewProc("TerminateJobObject")
@@ -379,6 +390,7 @@
procVirtualQueryEx =
modkernel32.NewProc("VirtualQueryEx")
procVirtualUnlock =
modkernel32.NewProc("VirtualUnlock")
procWTSGetActiveConsoleSessionId =
modkernel32.NewProc("WTSGetActiveConsoleSessionId")
+ procWaitCommEvent =
modkernel32.NewProc("WaitCommEvent")
procWaitForMultipleObjects =
modkernel32.NewProc("WaitForMultipleObjects")
procWaitForSingleObject =
modkernel32.NewProc("WaitForSingleObject")
procWriteConsoleW =
modkernel32.NewProc("WriteConsoleW")
@@ -1641,6 +1653,22 @@
return
}
+func ClearCommBreak(handle Handle) (err error) {
+ r1, _, e1 := syscall.Syscall(procClearCommBreak.Addr(), 1,
uintptr(handle), 0, 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+func ClearCommError(handle Handle, lpErrors *uint32, lpStat *ComStat) (err
error) {
+ r1, _, e1 := syscall.Syscall(procClearCommError.Addr(), 3,
uintptr(handle), uintptr(unsafe.Pointer(lpErrors)),
uintptr(unsafe.Pointer(lpStat)))
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
func CloseHandle(handle Handle) (err error) {
r1, _, e1 := syscall.Syscall(procCloseHandle.Addr(), 1,
uintptr(handle), 0, 0)
if r1 == 0 {
@@ -1845,6 +1873,14 @@
return
}
+func DisconnectNamedPipe(pipe Handle) (err error) {
+ r1, _, e1 := syscall.Syscall(procDisconnectNamedPipe.Addr(), 1,
uintptr(pipe), 0, 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
func DuplicateHandle(hSourceProcessHandle Handle, hSourceHandle Handle,
hTargetProcessHandle Handle, lpTargetHandle *Handle, dwDesiredAccess uint32,
bInheritHandle bool, dwOptions uint32) (err error) {
var _p0 uint32
if bInheritHandle {
@@ -1857,6 +1893,14 @@
return
}
+func EscapeCommFunction(handle Handle, dwFunc uint32) (err error) {
+ r1, _, e1 := syscall.Syscall(procEscapeCommFunction.Addr(), 2,
uintptr(handle), uintptr(dwFunc), 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
func ExitProcess(exitcode uint32) {
syscall.Syscall(procExitProcess.Addr(), 1, uintptr(exitcode), 0, 0)
return
@@ -2058,6 +2102,22 @@
return
}
+func GetCommModemStatus(handle Handle, lpModemStat *uint32) (err error) {
+ r1, _, e1 := syscall.Syscall(procGetCommModemStatus.Addr(), 2,
uintptr(handle), uintptr(unsafe.Pointer(lpModemStat)), 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+func GetCommState(handle Handle, lpDCB *DCB) (err error) {
+ r1, _, e1 := syscall.Syscall(procGetCommState.Addr(), 2,
uintptr(handle), uintptr(unsafe.Pointer(lpDCB)), 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
func GetCommTimeouts(handle Handle, timeouts *CommTimeouts) (err error) {
r1, _, e1 := syscall.Syscall(procGetCommTimeouts.Addr(), 2,
uintptr(handle), uintptr(unsafe.Pointer(timeouts)), 0)
if r1 == 0 {
@@ -2810,6 +2870,14 @@
return
}
+func PurgeComm(handle Handle, dwFlags uint32) (err error) {
+ r1, _, e1 := syscall.Syscall(procPurgeComm.Addr(), 2, uintptr(handle),
uintptr(dwFlags), 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
func QueryDosDevice(deviceName *uint16, targetPath *uint16, max uint32) (n
uint32, err error) {
r0, _, e1 := syscall.Syscall(procQueryDosDeviceW.Addr(), 3,
uintptr(unsafe.Pointer(deviceName)), uintptr(unsafe.Pointer(targetPath)),
uintptr(max))
n = uint32(r0)
@@ -2924,6 +2992,30 @@
return
}
+func SetCommBreak(handle Handle) (err error) {
+ r1, _, e1 := syscall.Syscall(procSetCommBreak.Addr(), 1,
uintptr(handle), 0, 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+func SetCommMask(handle Handle, dwEvtMask uint32) (err error) {
+ r1, _, e1 := syscall.Syscall(procSetCommMask.Addr(), 2,
uintptr(handle), uintptr(dwEvtMask), 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+func SetCommState(handle Handle, lpDCB *DCB) (err error) {
+ r1, _, e1 := syscall.Syscall(procSetCommState.Addr(), 2,
uintptr(handle), uintptr(unsafe.Pointer(lpDCB)), 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
func SetCommTimeouts(handle Handle, timeouts *CommTimeouts) (err error) {
r1, _, e1 := syscall.Syscall(procSetCommTimeouts.Addr(), 2,
uintptr(handle), uintptr(unsafe.Pointer(timeouts)), 0)
if r1 == 0 {
@@ -2989,14 +3081,6 @@
return
}
-func SetFileValidData(handle Handle, validDataLength int64) (err error) {
- r1, _, e1 := syscall.Syscall(procSetFileValidData.Addr(), 2,
uintptr(handle), uintptr(validDataLength), 0)
- if r1 == 0 {
- err = errnoErr(e1)
- }
- return
-}
-
func SetEnvironmentVariable(name *uint16, value *uint16) (err error) {
r1, _, e1 := syscall.Syscall(procSetEnvironmentVariableW.Addr(), 2,
uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(value)), 0)
if r1 == 0 {
@@ -3060,6 +3144,14 @@
return
}
+func SetFileValidData(handle Handle, validDataLength int64) (err error) {
+ r1, _, e1 := syscall.Syscall(procSetFileValidData.Addr(), 2,
uintptr(handle), uintptr(validDataLength), 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
func SetHandleInformation(handle Handle, mask uint32, flags uint32) (err
error) {
r1, _, e1 := syscall.Syscall(procSetHandleInformation.Addr(), 3,
uintptr(handle), uintptr(mask), uintptr(flags))
if r1 == 0 {
@@ -3145,6 +3237,14 @@
return
}
+func SetupComm(handle Handle, dwInQueue uint32, dwOutQueue uint32) (err error)
{
+ r1, _, e1 := syscall.Syscall(procSetupComm.Addr(), 3, uintptr(handle),
uintptr(dwInQueue), uintptr(dwOutQueue))
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
func SizeofResource(module Handle, resInfo Handle) (size uint32, err error) {
r0, _, e1 := syscall.Syscall(procSizeofResource.Addr(), 2,
uintptr(module), uintptr(resInfo), 0)
size = uint32(r0)
@@ -3291,6 +3391,14 @@
return
}
+func WaitCommEvent(handle Handle, lpEvtMask *uint32, lpOverlapped *Overlapped)
(err error) {
+ r1, _, e1 := syscall.Syscall(procWaitCommEvent.Addr(), 3,
uintptr(handle), uintptr(unsafe.Pointer(lpEvtMask)),
uintptr(unsafe.Pointer(lpOverlapped)))
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
func waitForMultipleObjects(count uint32, handles uintptr, waitAll bool,
waitMilliseconds uint32) (event uint32, err error) {
var _p0 uint32
if waitAll {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt 2024-03-11 11:48:04.000000000 +0100
+++ new/vendor/modules.txt 2024-06-10 09:41:21.000000000 +0200
@@ -1,7 +1,7 @@
# github.com/Masterminds/semver/v3 v3.2.1
## explicit; go 1.18
github.com/Masterminds/semver/v3
-# github.com/containernetworking/plugins v1.4.0
+# github.com/containernetworking/plugins v1.4.1
## explicit; go 1.20
github.com/containernetworking/plugins/pkg/ns
# github.com/cpuguy83/go-md2man/v2 v2.0.2
@@ -65,13 +65,13 @@
# github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673
## explicit
github.com/xrash/smetrics
-# golang.org/x/net v0.17.0
-## explicit; go 1.17
+# golang.org/x/net v0.23.0
+## explicit; go 1.18
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.18.0
+# golang.org/x/sys v0.19.0
## explicit; go 1.18
golang.org/x/sys/unix
golang.org/x/sys/windows
