From 12597bd58298c5d1486261fa619f614c2fdf31fe Mon Sep 17 00:00:00 2001
From: "red-hat-konflux[bot]"
<126015336+red-hat-konflux[bot]@users.noreply.github.com>
Date: Sun, 13 Apr 2025 18:04:10 +0000
Subject: [PATCH] chore(deps): update module github.com/cenkalti/rpc2 to v1
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
---
go.mod | 4 ++--
go.sum | 10 ++++------
vendor/github.com/cenkalti/hub/.travis.yml | 6 ++++--
vendor/github.com/cenkalti/rpc2/README.md | 1 -
vendor/github.com/cenkalti/rpc2/server.go | 5 ++++-
vendor/modules.txt | 8 ++++----
6 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/go.mod b/go.mod
index 52671351..1f71b362 100644
--- a/go.mod
+++ b/go.mod
@@ -41,8 +41,8 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
- github.com/cenkalti/hub v1.0.1 // indirect
- github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984 // indirect
+ github.com/cenkalti/hub v1.0.2 // indirect
+ github.com/cenkalti/rpc2 v1.0.4 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containernetworking/cni v1.1.2 // indirect
github.com/containernetworking/plugins v1.2.0 // indirect
diff --git a/go.sum b/go.sum
index fb092baa..e40607c4 100644
--- a/go.sum
+++ b/go.sum
@@ -125,16 +125,14 @@ github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOC
github.com/caarlos0/env/v11 v11.3.1 h1:cArPWC15hWmEt+gWk7YBi7lEXTXCvpaSdCiZE2X5mCA=
github.com/caarlos0/env/v11 v11.3.1/go.mod h1:qupehSf/Y0TUTsxKywqRt/vJjN5nz6vauiYEUUr8P4U=
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/cenk/hub v1.0.1 h1:RBwXNOF4a8KjD8BJ08XqN8KbrqaGiQLDrgvUGJSHuPA=
-github.com/cenk/hub v1.0.1/go.mod h1:rJM1LNAW0ppT8FMMuPK6c2NP/R2nH/UthtuRySSaf6Y=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/cenkalti/hub v1.0.1 h1:UMtjc6dHSaOQTO15SVA50MBIR9zQwvsukQupDrkIRtg=
-github.com/cenkalti/hub v1.0.1/go.mod h1:tcYwtS3a2d9NO/0xDXVJWx3IedurUjYCqFCmpi0lpHs=
-github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984 h1:CNwZyGS6KpfaOWbh2yLkSy3rSTUh3jub9CzpFpP6PVQ=
-github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984/go.mod h1:v2npkhrXyk5BCnkNIiPdRI23Uq6uWPUQGL2hnRcRr/M=
+github.com/cenkalti/hub v1.0.2 h1:Nqv9TNaA9boeO2wQFW8o87BY3zKthtnzXmWGmJqhAV8=
+github.com/cenkalti/hub v1.0.2/go.mod h1:8LAFAZcCasb83vfxatMUnZHRoQcffho2ELpHb+kaTJU=
+github.com/cenkalti/rpc2 v1.0.4 h1:MJWmm7mbt8r/ZkQS+qr/e2KMMrhMLPr/62CYZIHybdI=
+github.com/cenkalti/rpc2 v1.0.4/go.mod h1:2yfU5b86vOr16+iY1jN3MvT6Kxc9Nf8j5iZWwUf7iaw=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
diff --git a/vendor/github.com/cenkalti/hub/.travis.yml b/vendor/github.com/cenkalti/hub/.travis.yml
index b05e4c53..d8cecb0d 100644
--- a/vendor/github.com/cenkalti/hub/.travis.yml
+++ b/vendor/github.com/cenkalti/hub/.travis.yml
@@ -1,3 +1,5 @@
language: go
-go: 1.2
-
+go: 1.13
+arch:
+ - amd64
+ - ppc64le
diff --git a/vendor/github.com/cenkalti/rpc2/README.md b/vendor/github.com/cenkalti/rpc2/README.md
index 3dffd26e..da7ffdc4 100644
--- a/vendor/github.com/cenkalti/rpc2/README.md
+++ b/vendor/github.com/cenkalti/rpc2/README.md
@@ -2,7 +2,6 @@ rpc2
====
[](https://godoc.org/github.com/cenkalti/rpc2)
-[](https://travis-ci.org/cenkalti/rpc2)
rpc2 is a fork of net/rpc package in the standard library.
The main goal is to add bi-directional support to calls.
diff --git a/vendor/github.com/cenkalti/rpc2/server.go b/vendor/github.com/cenkalti/rpc2/server.go
index 2a5be7ed..df4cdc83 100644
--- a/vendor/github.com/cenkalti/rpc2/server.go
+++ b/vendor/github.com/cenkalti/rpc2/server.go
@@ -1,6 +1,7 @@
package rpc2
import (
+ "errors"
"io"
"log"
"net"
@@ -142,7 +143,9 @@ func (s *Server) Accept(lis net.Listener) {
for {
conn, err := lis.Accept()
if err != nil {
- log.Print("rpc.Serve: accept:", err.Error())
+ if !errors.Is(err, net.ErrClosed) {
+ log.Print("rpc.Serve: accept:", err.Error())
+ }
return
}
go s.ServeConn(conn)
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 8ccdd81e..c03de7af 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -32,11 +32,11 @@ github.com/caarlos0/env/v11
# github.com/cenkalti/backoff/v4 v4.3.0
## explicit; go 1.18
github.com/cenkalti/backoff/v4
-# github.com/cenkalti/hub v1.0.1
-## explicit
+# github.com/cenkalti/hub v1.0.2
+## explicit; go 1.20
github.com/cenkalti/hub
-# github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984
-## explicit
+# github.com/cenkalti/rpc2 v1.0.4
+## explicit; go 1.20
github.com/cenkalti/rpc2
github.com/cenkalti/rpc2/jsonrpc
# github.com/cespare/xxhash/v2 v2.3.0
--
GitLab