Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package fortio for openSUSE:Factory checked
in at 2023-12-10 19:39:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fortio (Old)
and /work/SRC/openSUSE:Factory/.fortio.new.25432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fortio"
Sun Dec 10 19:39:44 2023 rev:55 rq:1132266 version:1.63.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/fortio/fortio.changes 2023-11-23
21:42:47.076212765 +0100
+++ /work/SRC/openSUSE:Factory/.fortio.new.25432/fortio.changes 2023-12-10
19:39:48.487314188 +0100
@@ -1,0 +2,10 @@
+Sat Dec 09 19:51:07 UTC 2023 - ka...@b1-systems.de
+
+- Update to version 1.63.0:
+ * Use the default http config for all server UI and rapi
+ operations + Indicate when the UI/echo server is using https
+ (#868)
+ * go 1.21.5 (#867)
+ * Bump golang.org/x/net from 0.18.0 to 0.19.0 (#864)
+
+-------------------------------------------------------------------
Old:
----
fortio-1.62.1.obscpio
New:
----
fortio-1.63.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fortio.spec ++++++
--- /var/tmp/diff_new_pack.aZofSp/_old 2023-12-10 19:39:49.267342915 +0100
+++ /var/tmp/diff_new_pack.aZofSp/_new 2023-12-10 19:39:49.267342915 +0100
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: fortio
-Version: 1.62.1
+Version: 1.63.0
Release: 0
Summary: Load testing library, command line tool, advanced echo server
and web UI
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.aZofSp/_old 2023-12-10 19:39:49.295343947 +0100
+++ /var/tmp/diff_new_pack.aZofSp/_new 2023-12-10 19:39:49.299344094 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/fortio/fortio</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v1.62.1</param>
+ <param name="revision">v1.63.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.aZofSp/_old 2023-12-10 19:39:49.319344831 +0100
+++ /var/tmp/diff_new_pack.aZofSp/_new 2023-12-10 19:39:49.319344831 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/fortio/fortio</param>
- <param
name="changesrevision">a95f803d5082c3745ae02315bbc24f1608182009</param></service></servicedata>
+ <param
name="changesrevision">6b492e20fffc070f3ab624cf960793a01651cd19</param></service></servicedata>
(No newline at EOF)
++++++ fortio-1.62.1.obscpio -> fortio-1.63.0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/.circleci/config.yml
new/fortio-1.63.0/.circleci/config.yml
--- old/fortio-1.62.1/.circleci/config.yml 2023-11-22 07:43:04.000000000
+0100
+++ new/fortio-1.63.0/.circleci/config.yml 2023-12-09 01:00:11.000000000
+0100
@@ -8,7 +8,7 @@
&defaultEnv
docker:
# specify the version
- - image:
docker.io/fortio/fortio.build:v65@sha256:0b39aa58b72f8594581ef02cfd1d3c493096335e5e33a49b94390a695ff9efbb
+ - image:
docker.io/fortio/fortio.build:v66@sha256:0e6ae8095ca4442328d99d20de02e3bcba23fb4afcb046fcfbf6284dceaafb80
working_directory: /build/fortio
jobs:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/Dockerfile new/fortio-1.63.0/Dockerfile
--- old/fortio-1.62.1/Dockerfile 2023-11-22 07:43:04.000000000 +0100
+++ new/fortio-1.63.0/Dockerfile 2023-12-09 01:00:11.000000000 +0100
@@ -1,5 +1,5 @@
# Build the binaries in larger image
-FROM
docker.io/fortio/fortio.build:v65@sha256:0b39aa58b72f8594581ef02cfd1d3c493096335e5e33a49b94390a695ff9efbb
as build
+FROM
docker.io/fortio/fortio.build:v66@sha256:0e6ae8095ca4442328d99d20de02e3bcba23fb4afcb046fcfbf6284dceaafb80
as build
WORKDIR /build
COPY --chown=build:build . fortio
ARG MODE=install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/Dockerfile.build
new/fortio-1.63.0/Dockerfile.build
--- old/fortio-1.62.1/Dockerfile.build 2023-11-22 07:43:04.000000000 +0100
+++ new/fortio-1.63.0/Dockerfile.build 2023-12-09 01:00:11.000000000 +0100
@@ -1,5 +1,5 @@
# Dependencies and linters for build:
-FROM
golang:1.21.4@sha256:81cd210ae58a6529d832af2892db822b30d84f817a671b8e1c15cff0b271a3db
+FROM
golang:1.21.5@sha256:58e14a93348a3515c2becc54ebd35302128225169d166b7c6802451ab336c907
# Need gcc for -race test (and some linters though those work with
CGO_ENABLED=0)
RUN apt-get -y update && \
apt-get --no-install-recommends -y upgrade && \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/Dockerfile.echosrv
new/fortio-1.63.0/Dockerfile.echosrv
--- old/fortio-1.62.1/Dockerfile.echosrv 2023-11-22 07:43:04.000000000
+0100
+++ new/fortio-1.63.0/Dockerfile.echosrv 2023-12-09 01:00:11.000000000
+0100
@@ -1,5 +1,5 @@
# Build the binaries in larger image
-FROM
docker.io/fortio/fortio.build:v65@sha256:0b39aa58b72f8594581ef02cfd1d3c493096335e5e33a49b94390a695ff9efbb
as build
+FROM
docker.io/fortio/fortio.build:v66@sha256:0e6ae8095ca4442328d99d20de02e3bcba23fb4afcb046fcfbf6284dceaafb80
as build
WORKDIR /build
COPY . fortio
RUN make -C fortio official-build-version BUILD_DIR=/build
OFFICIAL_TARGET=fortio.org/fortio/echosrv
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/Dockerfile.fcurl
new/fortio-1.63.0/Dockerfile.fcurl
--- old/fortio-1.62.1/Dockerfile.fcurl 2023-11-22 07:43:04.000000000 +0100
+++ new/fortio-1.63.0/Dockerfile.fcurl 2023-12-09 01:00:11.000000000 +0100
@@ -1,5 +1,5 @@
# Build the binaries in larger image
-FROM
docker.io/fortio/fortio.build:v65@sha256:0b39aa58b72f8594581ef02cfd1d3c493096335e5e33a49b94390a695ff9efbb
as build
+FROM
docker.io/fortio/fortio.build:v66@sha256:0e6ae8095ca4442328d99d20de02e3bcba23fb4afcb046fcfbf6284dceaafb80
as build
WORKDIR /build
COPY . fortio
RUN make -C fortio official-build-version BUILD_DIR=/build
OFFICIAL_TARGET=fortio.org/fortio/fcurl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/Makefile new/fortio-1.63.0/Makefile
--- old/fortio-1.62.1/Makefile 2023-11-22 07:43:04.000000000 +0100
+++ new/fortio-1.63.0/Makefile 2023-12-09 01:00:11.000000000 +0100
@@ -7,7 +7,7 @@
IMAGES=echosrv fcurl # plus the combo image / Dockerfile without ext.
DOCKER_PREFIX := docker.io/fortio/fortio
-BUILD_IMAGE_TAG :=
v65@sha256:0b39aa58b72f8594581ef02cfd1d3c493096335e5e33a49b94390a695ff9efbb
+BUILD_IMAGE_TAG :=
v66@sha256:0e6ae8095ca4442328d99d20de02e3bcba23fb4afcb046fcfbf6284dceaafb80
BUILDX_PLATFORMS := linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
BUILDX_POSTFIX :=
ifeq '$(shell echo $(BUILDX_PLATFORMS) | awk -F "," "{print NF-1}")' '0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/README.md new/fortio-1.63.0/README.md
--- old/fortio-1.62.1/README.md 2023-11-22 07:43:04.000000000 +0100
+++ new/fortio-1.63.0/README.md 2023-12-09 01:00:11.000000000 +0100
@@ -1,4 +1,4 @@
-<!-- 1.62.1 -->
+<!-- 1.63.0 -->
# Fortio
[](https://github.com/avelino/awesome-go#networking)
@@ -60,13 +60,13 @@
The [releases](https://github.com/fortio/fortio/releases) page has binaries
for many OS/architecture combinations (see assets):
```shell
-curl -L
https://github.com/fortio/fortio/releases/download/v1.62.1/fortio-linux_amd64-1.62.1.tgz
\
+curl -L
https://github.com/fortio/fortio/releases/download/v1.63.0/fortio-linux_amd64-1.63.0.tgz
\
| sudo tar -C / -xvzpf -
# or the debian package
-wget
https://github.com/fortio/fortio/releases/download/v1.62.1/fortio_1.62.1_amd64.deb
-dpkg -i fortio_1.62.1_amd64.deb
+wget
https://github.com/fortio/fortio/releases/download/v1.63.0/fortio_1.63.0_amd64.deb
+dpkg -i fortio_1.63.0_amd64.deb
# or the rpm
-rpm -i
https://github.com/fortio/fortio/releases/download/v1.62.1/fortio-1.62.1-1.x86_64.rpm
+rpm -i
https://github.com/fortio/fortio/releases/download/v1.63.0/fortio-1.63.0-1.x86_64.rpm
# and more, see assets in release page
```
@@ -76,7 +76,7 @@
brew install fortio
```
-On Windows, download
https://github.com/fortio/fortio/releases/download/v1.62.1/fortio_win_1.62.1.zip
and extract `fortio.exe` to any location, then using the Windows Command
Prompt:
+On Windows, download
https://github.com/fortio/fortio/releases/download/v1.63.0/fortio_win_1.63.0.zip
and extract `fortio.exe` to any location, then using the Windows Command
Prompt:
```
fortio.exe server
```
@@ -123,12 +123,14 @@
| `-logger-force-color` | For interactive runs for color instead of JSON
output|
| `-logger-no-color` | Force JSON output even when run from terminal|
+Changing the http options like the TLS options `-cert`, `-key`, `-cacert` when
launching an echo/UI/rapi server will make these options the default for runs
initiated from that server (or fetches/proxies etc).
+
Full list of command line flags (`fortio help`):
<details>
<!-- use release/updateFlags.sh to update this section -->
<pre>
<!-- USAGE_START -->
-ΦοÏÏίο 1.62.1 usage:
+ΦοÏÏίο 1.63.0 usage:
fortio command [flags] target
where command is one of: load (load testing), server (starts ui, rest api,
http-echo, redirect, proxies, tcp-echo, udp-echo and grpc ping servers),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/Webtest.sh new/fortio-1.63.0/Webtest.sh
--- old/fortio-1.62.1/Webtest.sh 2023-11-22 07:43:04.000000000 +0100
+++ new/fortio-1.63.0/Webtest.sh 2023-12-09 01:00:11.000000000 +0100
@@ -140,7 +140,7 @@
PPROF_URL="$BASE_URL/debug/pprof/heap?debug=1"
$CURL "$PPROF_URL" | grep -i TotalAlloc # should find this in memory profile
# creating dummy container to hold a volume for test certs due to remote
docker bind mount limitation.
-DOCKERCURLID=$(docker run -d -v $TEST_CERT_VOL --net host --name
$DOCKERSECVOLNAME
docker.io/fortio/fortio.build:v65@sha256:0b39aa58b72f8594581ef02cfd1d3c493096335e5e33a49b94390a695ff9efbb
sleep 120)
+DOCKERCURLID=$(docker run -d -v $TEST_CERT_VOL --net host --name
$DOCKERSECVOLNAME
docker.io/fortio/fortio.build:v66@sha256:0e6ae8095ca4442328d99d20de02e3bcba23fb4afcb046fcfbf6284dceaafb80
sleep 120)
# while we have something with actual curl binary do
# Test for h2c upgrade (#562)
docker exec $DOCKERSECVOLNAME /usr/bin/curl -v --http2 -m 10 -d foo42
http://localhost:8080/debug | tee >(cat 1>&2) | grep foo42
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/bincommon/commonflags.go
new/fortio-1.63.0/bincommon/commonflags.go
--- old/fortio-1.62.1/bincommon/commonflags.go 2023-11-22 07:43:04.000000000
+0100
+++ new/fortio-1.63.0/bincommon/commonflags.go 2023-12-09 01:00:11.000000000
+0100
@@ -194,7 +194,7 @@
}
// SharedHTTPOptions is the flag->httpoptions transfer code shared between
-// fortio_main and fcurl.
+// fortio_main and fcurl. It also sets fhttp.DefaultHTTPOptions.
func SharedHTTPOptions() *fhttp.HTTPOptions {
url := strings.TrimLeft(flag.Arg(0), " \t\r\n")
httpOpts.URL = url
@@ -235,5 +235,6 @@
httpOpts.SequentialWarmup = *warmupFlag
httpOpts.NoResolveEachConn = *NoReResolveFlag
httpOpts.MethodOverride = *MethodFlag
+ fhttp.DefaultHTTPOptions = &httpOpts
return &httpOpts
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/fhttp/http_client.go
new/fortio-1.63.0/fhttp/http_client.go
--- old/fortio-1.62.1/fhttp/http_client.go 2023-11-22 07:43:04.000000000
+0100
+++ new/fortio-1.63.0/fhttp/http_client.go 2023-12-09 01:00:11.000000000
+0100
@@ -179,6 +179,7 @@
)
// HTTPOptions holds the common options of both http clients and the headers.
+// Careful when adding fields that this gets shallow copied through
DefaultHTTPOptions copies.
type HTTPOptions struct {
TLSOptions
URL string
@@ -223,6 +224,12 @@
DataWriter io.Writer `json:"-"` // if set, the response body is
written to this writer.
}
+// DefaultHTTPOptions is meant to be set by the main() from
bincommon.SharedHTTPOptions() and used
+// as a starting point for CommonHTTPOptionsFromForm which is used for
FetchHandler and forwarder as
+// well as the UI.
+// Initialized to empty to avoid nil pointer deref in unit tests that do not
call bincommon.SharedHTTPOptions().
+var DefaultHTTPOptions = &HTTPOptions{}
+
type CreateClientTrace func(ctx context.Context) *httptrace.ClientTrace
type CreateTransport func(base http.RoundTripper) http.RoundTripper
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/fhttp/http_server.go
new/fortio-1.63.0/fhttp/http_server.go
--- old/fortio-1.62.1/fhttp/http_server.go 2023-11-22 07:43:04.000000000
+0100
+++ new/fortio-1.63.0/fhttp/http_server.go 2023-12-09 01:00:11.000000000
+0100
@@ -464,7 +464,7 @@
startTime = time.Now()
var mux *http.ServeMux
var addr net.Addr
- if to.Cert != "" && to.Key != "" {
+ if to.DoTLS() {
mux, addr = HTTPSServer("https-echo", port, to)
} else {
mux, addr = HTTPServer("http-echo", port)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/fhttp/http_utils.go
new/fortio-1.63.0/fhttp/http_utils.go
--- old/fortio-1.62.1/fhttp/http_utils.go 2023-11-22 07:43:04.000000000
+0100
+++ new/fortio-1.63.0/fhttp/http_utils.go 2023-12-09 01:00:11.000000000
+0100
@@ -47,6 +47,10 @@
UnixDomainSocket string // `Path`` of unix domain socket to use instead
of host:port
}
+func (to *TLSOptions) DoTLS() bool {
+ return to.Cert != "" && to.Key != ""
+}
+
// TLSConfig creates a tls.Config based on input TLSOptions.
// For https, ServerName is set later (once host is determined after URL
parsing
// and depending on hostOverride). Used for both client and server TLS config.
@@ -642,7 +646,7 @@
resolve := r.FormValue("resolve")
timeoutStr := strings.TrimSpace(r.FormValue("timeout"))
timeout, _ := time.ParseDuration(timeoutStr) // will be 0 if empty,
which is handled by runner and opts
- httpopts := &HTTPOptions{}
+ httpopts := *DefaultHTTPOptions
// to be normalized in init 0 replaced by default value only in http
runner, not here as this could be a tcp or udp runner
httpopts.URL = url // fixes #651 - ie don't normalize here
httpopts.HTTPReqTimeOut = timeout
@@ -664,5 +668,5 @@
log.Errf("Error adding custom headers: %v", err)
}
}
- return httpopts
+ return &httpopts
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/go.mod new/fortio-1.63.0/go.mod
--- old/fortio-1.62.1/go.mod 2023-11-22 07:43:04.000000000 +0100
+++ new/fortio-1.63.0/go.mod 2023-12-09 01:00:11.000000000 +0100
@@ -1,6 +1,6 @@
module fortio.org/fortio
-go 1.18
+go 1.19 // As a library the current version of fortio works with 1.18 (first
version with generics) but tests use 1.19 features
require (
fortio.org/assert v1.2.0
@@ -13,7 +13,7 @@
fortio.org/version v1.0.3
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.4.0
- golang.org/x/net v0.18.0
+ golang.org/x/net v0.19.0
google.golang.org/grpc v1.59.0
)
@@ -30,10 +30,10 @@
require (
fortio.org/struct2env v0.4.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
- golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
- golang.org/x/sys v0.14.0 // indirect
+ golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
+ golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
- golang.org/x/tools v0.15.0 // indirect
- google.golang.org/genproto/googleapis/rpc
v0.0.0-20231120223509-83a465c0220f // indirect
+ golang.org/x/tools v0.16.0 // indirect
+ google.golang.org/genproto/googleapis/rpc
v0.0.0-20231127180814-3a041ad873d4 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/go.sum new/fortio-1.63.0/go.sum
--- old/fortio-1.62.1/go.sum 2023-11-22 07:43:04.000000000 +0100
+++ new/fortio-1.63.0/go.sum 2023-12-09 01:00:11.000000000 +0100
@@ -25,19 +25,19 @@
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
github.com/google/uuid v1.4.0/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
-golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod
h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb
h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
+golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod
h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod
h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
-golang.org/x/tools v0.15.0/go.mod
h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
+golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
+golang.org/x/tools v0.16.0/go.mod
h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f
h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
-google.golang.org/genproto/googleapis/rpc
v0.0.0-20231120223509-83a465c0220f/go.mod
h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4
h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE=
+google.golang.org/genproto/googleapis/rpc
v0.0.0-20231127180814-3a041ad873d4/go.mod
h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM=
google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
google.golang.org/grpc v1.59.0/go.mod
h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
google.golang.org/protobuf v1.26.0-rc.1/go.mod
h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/rapi/restHandler.go
new/fortio-1.63.0/rapi/restHandler.go
--- old/fortio-1.62.1/rapi/restHandler.go 2023-11-22 07:43:04.000000000
+0100
+++ new/fortio-1.63.0/rapi/restHandler.go 2023-12-09 01:00:11.000000000
+0100
@@ -278,7 +278,8 @@
runid := NextRunID()
ro.RunID = runid
log.Infof("New run id %d", runid)
- httpopts := &fhttp.HTTPOptions{}
+ defaultOptionsCopy := *fhttp.DefaultHTTPOptions
+ httpopts := &defaultOptionsCopy
httpopts.HTTPReqTimeOut = timeout // to be normalized in init, 0 is
replaced by default value (for all runners)
// We don't call Init because this could be a tcp:// or udp:// url. Was
httpopts = httpopts.Init(url) - fixes #651
httpopts.URL = url
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/release/Dockerfile.in
new/fortio-1.63.0/release/Dockerfile.in
--- old/fortio-1.62.1/release/Dockerfile.in 2023-11-22 07:43:04.000000000
+0100
+++ new/fortio-1.63.0/release/Dockerfile.in 2023-12-09 01:00:11.000000000
+0100
@@ -1,5 +1,5 @@
# Concatenated after ../Dockerfile to create the tgz
-FROM
docker.io/fortio/fortio.build:v65@sha256:0b39aa58b72f8594581ef02cfd1d3c493096335e5e33a49b94390a695ff9efbb
as stage
+FROM
docker.io/fortio/fortio.build:v66@sha256:0e6ae8095ca4442328d99d20de02e3bcba23fb4afcb046fcfbf6284dceaafb80
as stage
ARG archs="amd64 arm64 ppc64le s390x"
ENV archs=${archs}
# Build image defaults to build user, switch back to root for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fortio-1.62.1/ui/uihandler.go
new/fortio-1.63.0/ui/uihandler.go
--- old/fortio-1.62.1/ui/uihandler.go 2023-11-22 07:43:04.000000000 +0100
+++ new/fortio-1.63.0/ui/uihandler.go 2023-12-09 01:00:11.000000000 +0100
@@ -733,7 +733,11 @@
if strings.Contains(urlHostPort, "-unix-socket=") {
uiMsg += fmt.Sprintf("fortio curl %s http://localhost%s";,
urlHostPort, uiPath)
} else {
- uiMsg += fmt.Sprintf("http://%s%s";, urlHostPort, uiPath)
+ isHTTPS := ""
+ if cfg.TLSOptions.DoTLS() {
+ isHTTPS = "s"
+ }
+ uiMsg += fmt.Sprintf("http%s://%s%s", isHTTPS, urlHostPort,
uiPath)
if strings.Contains(urlHostPort, "localhost") {
uiMsg += "\n\t (or any host/ip reachable on this
server)"
}
++++++ fortio.obsinfo ++++++
--- /var/tmp/diff_new_pack.aZofSp/_old 2023-12-10 19:39:49.467350281 +0100
+++ /var/tmp/diff_new_pack.aZofSp/_new 2023-12-10 19:39:49.471350429 +0100
@@ -1,5 +1,5 @@
name: fortio
-version: 1.62.1
-mtime: 1700635384
-commit: a95f803d5082c3745ae02315bbc24f1608182009
+version: 1.63.0
+mtime: 1702080011
+commit: 6b492e20fffc070f3ab624cf960793a01651cd19
++++++ vendor.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/fcntl.go
new/vendor/golang.org/x/sys/unix/fcntl.go
--- old/vendor/golang.org/x/sys/unix/fcntl.go 2023-11-23 07:25:10.000000000
+0100
+++ new/vendor/golang.org/x/sys/unix/fcntl.go 2023-12-09 20:51:12.000000000
+0100
@@ -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 dragonfly || freebsd || linux || netbsd || openbsd
+//go:build dragonfly || freebsd || linux || netbsd
package unix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/ioctl_linux.go
new/vendor/golang.org/x/sys/unix/ioctl_linux.go
--- old/vendor/golang.org/x/sys/unix/ioctl_linux.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/ioctl_linux.go 2023-12-09
20:51:12.000000000 +0100
@@ -231,3 +231,8 @@
func IoctlLoopSetStatus64(fd int, value *LoopInfo64) error {
return ioctlPtr(fd, LOOP_SET_STATUS64, unsafe.Pointer(value))
}
+
+// IoctlLoopConfigure configures all loop device parameters in a single step
+func IoctlLoopConfigure(fd int, value *LoopConfig) error {
+ return ioctlPtr(fd, LOOP_CONFIGURE, unsafe.Pointer(value))
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/mkerrors.sh
new/vendor/golang.org/x/sys/unix/mkerrors.sh
--- old/vendor/golang.org/x/sys/unix/mkerrors.sh 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/mkerrors.sh 2023-12-09
20:51:12.000000000 +0100
@@ -519,6 +519,7 @@
$2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
$2 ~ /^LO_(KEY|NAME)_SIZE$/ ||
$2 ~ /^LOOP_(CLR|CTL|GET|SET)_/ ||
+ $2 == "LOOP_CONFIGURE" ||
$2 ~
/^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|TCP|MCAST|EVFILT|NOTE|SHUT|PROT|MAP|MREMAP|MFD|T?PACKET|MSG|SCM|MCL|DT|MADV|PR|LOCAL|TCPOPT|UDP)_/
||
$2 ~ /^NFC_(GENL|PROTO|COMM|RF|SE|DIRECTION|LLCP|SOCKPROTO)_/ ||
$2 ~ /^NFC_.*_(MAX)?SIZE$/ ||
@@ -560,7 +561,7 @@
$2 ~
/^RLIMIT_(AS|CORE|CPU|DATA|FSIZE|LOCKS|MEMLOCK|MSGQUEUE|NICE|NOFILE|NPROC|RSS|RTPRIO|RTTIME|SIGPENDING|STACK)|RLIM_INFINITY/
||
$2 ~ /^PRIO_(PROCESS|PGRP|USER)/ ||
$2 ~ /^CLONE_[A-Z_]+/ ||
- $2 !~ /^(BPF_TIMEVAL|BPF_FIB_LOOKUP_[A-Z]+)$/ &&
+ $2 !~ /^(BPF_TIMEVAL|BPF_FIB_LOOKUP_[A-Z]+|BPF_F_LINK)$/ &&
$2 ~ /^(BPF|DLT)_/ ||
$2 ~ /^AUDIT_/ ||
$2 ~ /^(CLOCK|TIMER)_/ ||
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_bsd.go
new/vendor/golang.org/x/sys/unix/syscall_bsd.go
--- old/vendor/golang.org/x/sys/unix/syscall_bsd.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/syscall_bsd.go 2023-12-09
20:51:12.000000000 +0100
@@ -316,7 +316,7 @@
if err != nil {
return "", err
}
- return string(buf[:vallen-1]), nil
+ return ByteSliceToString(buf[:vallen]), nil
}
//sys recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen
*_Socklen) (n int, err error)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_linux.go
new/vendor/golang.org/x/sys/unix/syscall_linux.go
--- old/vendor/golang.org/x/sys/unix/syscall_linux.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/syscall_linux.go 2023-12-09
20:51:12.000000000 +0100
@@ -61,15 +61,23 @@
}
//sys fchmodat(dirfd int, path string, mode uint32) (err error)
+//sys fchmodat2(dirfd int, path string, mode uint32, flags int) (err error)
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
- // Linux fchmodat doesn't support the flags parameter. Mimick glibc's
behavior
- // and check the flags. Otherwise the mode would be applied to the
symlink
- // destination which is not what the user expects.
- if flags&^AT_SYMLINK_NOFOLLOW != 0 {
- return EINVAL
- } else if flags&AT_SYMLINK_NOFOLLOW != 0 {
- return EOPNOTSUPP
+func Fchmodat(dirfd int, path string, mode uint32, flags int) error {
+ // Linux fchmodat doesn't support the flags parameter, but fchmodat2
does.
+ // Try fchmodat2 if flags are specified.
+ if flags != 0 {
+ err := fchmodat2(dirfd, path, mode, flags)
+ if err == ENOSYS {
+ // fchmodat2 isn't available. If the flags are known to
be valid,
+ // return EOPNOTSUPP to indicate that fchmodat doesn't
support them.
+ if flags&^(AT_SYMLINK_NOFOLLOW|AT_EMPTY_PATH) != 0 {
+ return EINVAL
+ } else if flags&(AT_SYMLINK_NOFOLLOW|AT_EMPTY_PATH) !=
0 {
+ return EOPNOTSUPP
+ }
+ }
+ return err
}
return fchmodat(dirfd, path, mode)
}
@@ -1302,7 +1310,7 @@
return "", err
}
}
- return string(buf[:vallen-1]), nil
+ return ByteSliceToString(buf[:vallen]), nil
}
func GetsockoptTpacketStats(fd, level, opt int) (*TpacketStats, error) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_openbsd.go
new/vendor/golang.org/x/sys/unix/syscall_openbsd.go
--- old/vendor/golang.org/x/sys/unix/syscall_openbsd.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/syscall_openbsd.go 2023-12-09
20:51:12.000000000 +0100
@@ -166,6 +166,20 @@
//sys sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen
uintptr) (err error) = SYS___SYSCTL
+//sys fcntl(fd int, cmd int, arg int) (n int, err error)
+//sys fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) =
SYS_FCNTL
+
+// FcntlInt performs a fcntl syscall on fd with the provided command and
argument.
+func FcntlInt(fd uintptr, cmd, arg int) (int, error) {
+ return fcntl(int(fd), cmd, arg)
+}
+
+// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW
command.
+func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
+ _, err := fcntlPtr(int(fd), cmd, unsafe.Pointer(lk))
+ return err
+}
+
//sys ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n
int, err error)
func Ppoll(fds []PollFd, timeout *Timespec, sigmask *Sigset_t) (n int, err
error) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/syscall_solaris.go
new/vendor/golang.org/x/sys/unix/syscall_solaris.go
--- old/vendor/golang.org/x/sys/unix/syscall_solaris.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/syscall_solaris.go 2023-12-09
20:51:12.000000000 +0100
@@ -158,7 +158,7 @@
if err != nil {
return "", err
}
- return string(buf[:vallen-1]), nil
+ return ByteSliceToString(buf[:vallen]), nil
}
const ImplementsGetwd = true
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 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go 2023-12-09
20:51:12.000000000 +0100
@@ -1104,7 +1104,7 @@
return "", err
}
- return string(buf[:vallen-1]), nil
+ return ByteSliceToString(buf[:vallen]), nil
}
func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int,
from Sockaddr, err error) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zerrors_linux.go
new/vendor/golang.org/x/sys/unix/zerrors_linux.go
--- old/vendor/golang.org/x/sys/unix/zerrors_linux.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zerrors_linux.go 2023-12-09
20:51:13.000000000 +0100
@@ -486,7 +486,6 @@
BPF_F_ANY_ALIGNMENT = 0x2
BPF_F_BEFORE = 0x8
BPF_F_ID = 0x20
- BPF_F_LINK = 0x2000
BPF_F_NETFILTER_IP_DEFRAG = 0x1
BPF_F_QUERY_EFFECTIVE = 0x1
BPF_F_REPLACE = 0x4
@@ -1802,6 +1801,7 @@
LOCK_SH = 0x1
LOCK_UN = 0x8
LOOP_CLR_FD = 0x4c01
+ LOOP_CONFIGURE = 0x4c0a
LOOP_CTL_ADD = 0x4c80
LOOP_CTL_GET_FREE = 0x4c82
LOOP_CTL_REMOVE = 0x4c81
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_linux.go
new/vendor/golang.org/x/sys/unix/zsyscall_linux.go
--- old/vendor/golang.org/x/sys/unix/zsyscall_linux.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_linux.go 2023-12-09
20:51:13.000000000 +0100
@@ -37,6 +37,21 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func fchmodat2(dirfd int, path string, mode uint32, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_FCHMODAT2, uintptr(dirfd),
uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ioctl(fd int, req uint, arg uintptr) (err error) {
_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
if e1 != 0 {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go 2023-12-09
20:51:13.000000000 +0100
@@ -584,6 +584,32 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func fcntl(fd int, cmd int, arg int) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+var libc_fcntl_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n
int, err error) {
r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr,
uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)),
uintptr(unsafe.Pointer(sigmask)), 0, 0)
n = int(r0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s 2023-12-09
20:51:13.000000000 +0100
@@ -178,6 +178,11 @@
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $4
DATA ·libc_sysctl_trampoline_addr(SB)/4, $libc_sysctl_trampoline<>(SB)
+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
+ JMP libc_fcntl(SB)
+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $4
+DATA ·libc_fcntl_trampoline_addr(SB)/4, $libc_fcntl_trampoline<>(SB)
+
TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_ppoll(SB)
GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go 2023-12-09
20:51:13.000000000 +0100
@@ -584,6 +584,32 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func fcntl(fd int, cmd int, arg int) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+var libc_fcntl_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n
int, err error) {
r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr,
uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)),
uintptr(unsafe.Pointer(sigmask)), 0, 0)
n = int(r0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s 2023-12-09
20:51:13.000000000 +0100
@@ -178,6 +178,11 @@
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
+ JMP libc_fcntl(SB)
+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $8
+DATA ·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
+
TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_ppoll(SB)
GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go 2023-12-09
20:51:13.000000000 +0100
@@ -584,6 +584,32 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func fcntl(fd int, cmd int, arg int) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+var libc_fcntl_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n
int, err error) {
r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr,
uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)),
uintptr(unsafe.Pointer(sigmask)), 0, 0)
n = int(r0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s 2023-12-09
20:51:13.000000000 +0100
@@ -178,6 +178,11 @@
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $4
DATA ·libc_sysctl_trampoline_addr(SB)/4, $libc_sysctl_trampoline<>(SB)
+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
+ JMP libc_fcntl(SB)
+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $4
+DATA ·libc_fcntl_trampoline_addr(SB)/4, $libc_fcntl_trampoline<>(SB)
+
TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_ppoll(SB)
GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go 2023-12-09
20:51:13.000000000 +0100
@@ -584,6 +584,32 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func fcntl(fd int, cmd int, arg int) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+var libc_fcntl_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n
int, err error) {
r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr,
uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)),
uintptr(unsafe.Pointer(sigmask)), 0, 0)
n = int(r0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s 2023-12-09
20:51:13.000000000 +0100
@@ -178,6 +178,11 @@
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
+ JMP libc_fcntl(SB)
+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $8
+DATA ·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
+
TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_ppoll(SB)
GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go 2023-12-09
20:51:13.000000000 +0100
@@ -584,6 +584,32 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func fcntl(fd int, cmd int, arg int) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+var libc_fcntl_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n
int, err error) {
r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr,
uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)),
uintptr(unsafe.Pointer(sigmask)), 0, 0)
n = int(r0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s 2023-12-09
20:51:13.000000000 +0100
@@ -178,6 +178,11 @@
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
+ JMP libc_fcntl(SB)
+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $8
+DATA ·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
+
TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_ppoll(SB)
GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go 2023-12-09
20:51:13.000000000 +0100
@@ -584,6 +584,32 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func fcntl(fd int, cmd int, arg int) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+var libc_fcntl_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n
int, err error) {
r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr,
uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)),
uintptr(unsafe.Pointer(sigmask)), 0, 0)
n = int(r0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s 2023-12-09
20:51:13.000000000 +0100
@@ -213,6 +213,12 @@
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
+ CALL libc_fcntl(SB)
+ RET
+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $8
+DATA ·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
+
TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
CALL libc_ppoll(SB)
RET
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
2023-11-23 07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
2023-12-09 20:51:13.000000000 +0100
@@ -584,6 +584,32 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func fcntl(fd int, cmd int, arg int) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+var libc_fcntl_trampoline_addr uintptr
+
+//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntlPtr(fd int, cmd int, arg unsafe.Pointer) (n int, err error) {
+ r0, _, e1 := syscall_syscall(libc_fcntl_trampoline_addr, uintptr(fd),
uintptr(cmd), uintptr(arg))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n
int, err error) {
r0, _, e1 := syscall_syscall6(libc_ppoll_trampoline_addr,
uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)),
uintptr(unsafe.Pointer(sigmask)), 0, 0)
n = int(r0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
--- old/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s 2023-12-09
20:51:13.000000000 +0100
@@ -178,6 +178,11 @@
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
+TEXT libc_fcntl_trampoline<>(SB),NOSPLIT,$0-0
+ JMP libc_fcntl(SB)
+GLOBL ·libc_fcntl_trampoline_addr(SB), RODATA, $8
+DATA ·libc_fcntl_trampoline_addr(SB)/8, $libc_fcntl_trampoline<>(SB)
+
TEXT libc_ppoll_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_ppoll(SB)
GLOBL ·libc_ppoll_trampoline_addr(SB), RODATA, $8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/golang.org/x/sys/unix/ztypes_linux.go
new/vendor/golang.org/x/sys/unix/ztypes_linux.go
--- old/vendor/golang.org/x/sys/unix/ztypes_linux.go 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/unix/ztypes_linux.go 2023-12-09
20:51:13.000000000 +0100
@@ -2671,6 +2671,7 @@
BPF_PROG_TYPE_LSM = 0x1d
BPF_PROG_TYPE_SK_LOOKUP = 0x1e
BPF_PROG_TYPE_SYSCALL = 0x1f
+ BPF_PROG_TYPE_NETFILTER = 0x20
BPF_CGROUP_INET_INGRESS = 0x0
BPF_CGROUP_INET_EGRESS = 0x1
BPF_CGROUP_INET_SOCK_CREATE = 0x2
@@ -2715,6 +2716,11 @@
BPF_PERF_EVENT = 0x29
BPF_TRACE_KPROBE_MULTI = 0x2a
BPF_LSM_CGROUP = 0x2b
+ BPF_STRUCT_OPS = 0x2c
+ BPF_NETFILTER = 0x2d
+ BPF_TCX_INGRESS = 0x2e
+ BPF_TCX_EGRESS = 0x2f
+ BPF_TRACE_UPROBE_MULTI = 0x30
BPF_LINK_TYPE_UNSPEC = 0x0
BPF_LINK_TYPE_RAW_TRACEPOINT = 0x1
BPF_LINK_TYPE_TRACING = 0x2
@@ -2725,6 +2731,18 @@
BPF_LINK_TYPE_PERF_EVENT = 0x7
BPF_LINK_TYPE_KPROBE_MULTI = 0x8
BPF_LINK_TYPE_STRUCT_OPS = 0x9
+ BPF_LINK_TYPE_NETFILTER = 0xa
+ BPF_LINK_TYPE_TCX = 0xb
+ BPF_LINK_TYPE_UPROBE_MULTI = 0xc
+ BPF_PERF_EVENT_UNSPEC = 0x0
+ BPF_PERF_EVENT_UPROBE = 0x1
+ BPF_PERF_EVENT_URETPROBE = 0x2
+ BPF_PERF_EVENT_KPROBE = 0x3
+ BPF_PERF_EVENT_KRETPROBE = 0x4
+ BPF_PERF_EVENT_TRACEPOINT = 0x5
+ BPF_PERF_EVENT_EVENT = 0x6
+ BPF_F_KPROBE_MULTI_RETURN = 0x1
+ BPF_F_UPROBE_MULTI_RETURN = 0x1
BPF_ANY = 0x0
BPF_NOEXIST = 0x1
BPF_EXIST = 0x2
@@ -2742,6 +2760,8 @@
BPF_F_MMAPABLE = 0x400
BPF_F_PRESERVE_ELEMS = 0x800
BPF_F_INNER_MAP = 0x1000
+ BPF_F_LINK = 0x2000
+ BPF_F_PATH_FD = 0x4000
BPF_STATS_RUN_TIME = 0x0
BPF_STACK_BUILD_ID_EMPTY = 0x0
BPF_STACK_BUILD_ID_VALID = 0x1
@@ -2762,6 +2782,7 @@
BPF_F_ZERO_CSUM_TX = 0x2
BPF_F_DONT_FRAGMENT = 0x4
BPF_F_SEQ_NUMBER = 0x8
+ BPF_F_NO_TUNNEL_KEY = 0x10
BPF_F_TUNINFO_FLAGS = 0x10
BPF_F_INDEX_MASK = 0xffffffff
BPF_F_CURRENT_CPU = 0xffffffff
@@ -2778,6 +2799,8 @@
BPF_F_ADJ_ROOM_ENCAP_L4_UDP = 0x10
BPF_F_ADJ_ROOM_NO_CSUM_RESET = 0x20
BPF_F_ADJ_ROOM_ENCAP_L2_ETH = 0x40
+ BPF_F_ADJ_ROOM_DECAP_L3_IPV4 = 0x80
+ BPF_F_ADJ_ROOM_DECAP_L3_IPV6 = 0x100
BPF_ADJ_ROOM_ENCAP_L2_MASK = 0xff
BPF_ADJ_ROOM_ENCAP_L2_SHIFT = 0x38
BPF_F_SYSCTL_BASE_NAME = 0x1
@@ -2866,6 +2889,8 @@
BPF_DEVCG_DEV_CHAR = 0x2
BPF_FIB_LOOKUP_DIRECT = 0x1
BPF_FIB_LOOKUP_OUTPUT = 0x2
+ BPF_FIB_LOOKUP_SKIP_NEIGH = 0x4
+ BPF_FIB_LOOKUP_TBID = 0x8
BPF_FIB_LKUP_RET_SUCCESS = 0x0
BPF_FIB_LKUP_RET_BLACKHOLE = 0x1
BPF_FIB_LKUP_RET_UNREACHABLE = 0x2
@@ -2901,6 +2926,7 @@
BPF_CORE_ENUMVAL_EXISTS = 0xa
BPF_CORE_ENUMVAL_VALUE = 0xb
BPF_CORE_TYPE_MATCHES = 0xc
+ BPF_F_TIMER_ABS = 0x1
)
const (
@@ -2979,6 +3005,12 @@
Encrypt_key [32]uint8
Init [2]uint64
}
+type LoopConfig struct {
+ Fd uint32
+ Size uint32
+ Info LoopInfo64
+ _ [8]uint64
+}
type TIPCSocketAddr struct {
Ref uint32
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 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/windows/syscall_windows.go 2023-12-09
20:51:13.000000000 +0100
@@ -155,6 +155,8 @@
//sys GetModuleFileName(module Handle, filename *uint16, size uint32) (n
uint32, err error) = kernel32.GetModuleFileNameW
//sys GetModuleHandleEx(flags uint32, moduleName *uint16, module *Handle)
(err error) = kernel32.GetModuleHandleExW
//sys SetDefaultDllDirectories(directoryFlags uint32) (err error)
+//sys AddDllDirectory(path *uint16) (cookie uintptr, err error) =
kernel32.AddDllDirectory
+//sys RemoveDllDirectory(cookie uintptr) (err error) =
kernel32.RemoveDllDirectory
//sys SetDllDirectory(path string) (err error) = kernel32.SetDllDirectoryW
//sys GetVersion() (ver uint32, err error)
//sys FormatMessage(flags uint32, msgsrc uintptr, msgid uint32, langid
uint32, buf []uint16, args *byte) (n uint32, err error) = FormatMessageW
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 2023-11-23
07:25:10.000000000 +0100
+++ new/vendor/golang.org/x/sys/windows/zsyscall_windows.go 2023-12-09
20:51:13.000000000 +0100
@@ -184,6 +184,7 @@
procGetAdaptersInfo =
modiphlpapi.NewProc("GetAdaptersInfo")
procGetBestInterfaceEx =
modiphlpapi.NewProc("GetBestInterfaceEx")
procGetIfEntry =
modiphlpapi.NewProc("GetIfEntry")
+ procAddDllDirectory =
modkernel32.NewProc("AddDllDirectory")
procAssignProcessToJobObject =
modkernel32.NewProc("AssignProcessToJobObject")
procCancelIo =
modkernel32.NewProc("CancelIo")
procCancelIoEx =
modkernel32.NewProc("CancelIoEx")
@@ -330,6 +331,7 @@
procReadProcessMemory =
modkernel32.NewProc("ReadProcessMemory")
procReleaseMutex =
modkernel32.NewProc("ReleaseMutex")
procRemoveDirectoryW =
modkernel32.NewProc("RemoveDirectoryW")
+ procRemoveDllDirectory =
modkernel32.NewProc("RemoveDllDirectory")
procResetEvent =
modkernel32.NewProc("ResetEvent")
procResizePseudoConsole =
modkernel32.NewProc("ResizePseudoConsole")
procResumeThread =
modkernel32.NewProc("ResumeThread")
@@ -1605,6 +1607,15 @@
return
}
+func AddDllDirectory(path *uint16) (cookie uintptr, err error) {
+ r0, _, e1 := syscall.Syscall(procAddDllDirectory.Addr(), 1,
uintptr(unsafe.Pointer(path)), 0, 0)
+ cookie = uintptr(r0)
+ if cookie == 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
func AssignProcessToJobObject(job Handle, process Handle) (err error) {
r1, _, e1 := syscall.Syscall(procAssignProcessToJobObject.Addr(), 2,
uintptr(job), uintptr(process), 0)
if r1 == 0 {
@@ -2876,6 +2887,14 @@
if r1 == 0 {
err = errnoErr(e1)
}
+ return
+}
+
+func RemoveDllDirectory(cookie uintptr) (err error) {
+ r1, _, e1 := syscall.Syscall(procRemoveDllDirectory.Addr(), 1,
uintptr(cookie), 0, 0)
+ if r1 == 0 {
+ err = errnoErr(e1)
+ }
return
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt 2023-11-23 07:25:10.000000000 +0100
+++ new/vendor/modules.txt 2023-12-09 20:51:14.000000000 +0100
@@ -48,11 +48,11 @@
# github.com/google/uuid v1.4.0
## explicit
github.com/google/uuid
-# golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
+# golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb
## explicit; go 1.20
golang.org/x/exp/constraints
golang.org/x/exp/slices
-# golang.org/x/net v0.18.0
+# golang.org/x/net v0.19.0
## explicit; go 1.18
golang.org/x/net/context
golang.org/x/net/http/httpguts
@@ -62,7 +62,7 @@
golang.org/x/net/idna
golang.org/x/net/internal/timeseries
golang.org/x/net/trace
-# golang.org/x/sys v0.14.0
+# golang.org/x/sys v0.15.0
## explicit; go 1.18
golang.org/x/sys/unix
golang.org/x/sys/windows
@@ -72,10 +72,10 @@
golang.org/x/text/transform
golang.org/x/text/unicode/bidi
golang.org/x/text/unicode/norm
-# golang.org/x/tools v0.15.0
+# golang.org/x/tools v0.16.0
## explicit; go 1.18
golang.org/x/tools/txtar
-# google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f
+# google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4
## explicit; go 1.19
google.golang.org/genproto/googleapis/rpc/status
# google.golang.org/grpc v1.59.0
