pagure pushed to rpms/receptor (rawhide). "properly rebase 0001-Bump-quic-go-to-0.37.4.patch (..more)"

Notification time stamped 2023-11-15 19:57:59 UTC

From abec2028d08dcfd3d786c58a3ac35c539d4c3184 Mon Sep 17 00:00:00 2001
From: Maxwell G 
Date: Nov 04 2023 05:02:00 +0000
Subject: properly rebase 0001-Bump-quic-go-to-0.37.4.patch

- Remove old patch
- Fix quic.Dial call

[skip changelog]

---

diff --git a/0001-Bump-quic-go-to-0.37.4.patch b/0001-Bump-quic-go-to-0.37.4.patch
deleted file mode 100644
index 67fd4e2..0000000
--- a/0001-Bump-quic-go-to-0.37.4.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From c7924757ee4a58230d9ba697496ef1f834d7508f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= 
-Date: Sat, 12 Aug 2023 09:12:34 +0200
-Subject: [PATCH] Bump quic-go to 0.37.4
-
-This is necessary to run on Go 1.21.
-
-Fix #815.
----
- go.mod                | 11 +++++------
- go.sum                | 22 ++++++++++------------
- pkg/netceptor/conn.go |  4 ++--
- 3 files changed, 17 insertions(+), 20 deletions(-)
-
-diff --git a/go.mod b/go.mod
-index 1734118..d5b7f1a 100644
---- a/go.mod
-+++ b/go.mod
-@@ -15,12 +15,12 @@ require (
- 	github.com/minio/highwayhash v1.0.2
- 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
- 	github.com/prep/socketpair v0.0.0-20171228153254-c2c6a7f821c2
--	github.com/quic-go/quic-go v0.34.0
-+	github.com/quic-go/quic-go v0.37.4
- 	github.com/rogpeppe/go-internal v1.10.0
- 	github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
- 	github.com/stretchr/testify v1.8.1
- 	github.com/vishvananda/netlink v1.1.0
--	golang.org/x/net v0.9.0
-+	golang.org/x/net v0.10.0
- 	gopkg.in/yaml.v2 v2.4.0
- 	k8s.io/api v0.27.1
- 	k8s.io/apimachinery v0.27.1
-@@ -50,10 +50,9 @@ require (
- 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
- 	github.com/modern-go/reflect2 v1.0.2 // indirect
- 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
--	github.com/onsi/ginkgo/v2 v2.9.4 // indirect
-+	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
- 	github.com/pmezard/go-difflib v1.0.0 // indirect
--	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
--	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
-+	github.com/quic-go/qtls-go1-20 v0.3.1 // indirect
- 	github.com/spf13/pflag v1.0.5 // indirect
- 	github.com/vishvananda/netns v0.0.4 // indirect
- 	golang.org/x/crypto v0.8.0 // indirect
-@@ -64,7 +63,7 @@ require (
- 	golang.org/x/term v0.8.0 // indirect
- 	golang.org/x/text v0.9.0 // indirect
- 	golang.org/x/time v0.3.0 // indirect
--	golang.org/x/tools v0.8.0 // indirect
-+	golang.org/x/tools v0.9.1 // indirect
- 	google.golang.org/appengine v1.6.7 // indirect
- 	google.golang.org/protobuf v1.30.0 // indirect
- 	gopkg.in/inf.v0 v0.9.1 // indirect
-diff --git a/go.sum b/go.sum
-index afc5207..3bf6f35 100644
---- a/go.sum
-+++ b/go.sum
-@@ -124,8 +124,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
- github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
- github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
- github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
--github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
--github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM=
-+github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
-+github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
- github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
- github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
- github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
-@@ -135,12 +135,10 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
- github.com/prep/socketpair v0.0.0-20171228153254-c2c6a7f821c2 h1:vzKDZ0uNPcOdITzZT5d4Tn2YOalCMqIhYzVNq/oRjlw=
- github.com/prep/socketpair v0.0.0-20171228153254-c2c6a7f821c2/go.mod h1:E/IaW35yb7xPACTLciISfz5w+jqPwmnXwDdmilSl/Nc=
- github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
--github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc86Z5U=
--github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
--github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E=
--github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
--github.com/quic-go/quic-go v0.34.0 h1:OvOJ9LFjTySgwOTYUZmNoq0FzVicP8YujpV0kB7m2lU=
--github.com/quic-go/quic-go v0.34.0/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g=
-+github.com/quic-go/qtls-go1-20 v0.3.1 h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg=
-+github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
-+github.com/quic-go/quic-go v0.37.4 h1:ke8B73yMCWGq9MfrCCAw0Uzdm7GaViC3i39dsIdDlH4=
-+github.com/quic-go/quic-go v0.37.4/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU=
- github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
- github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
- github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
-@@ -201,8 +199,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
- golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
- golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
- golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
--golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
--golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
- golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
- golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
- golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
-@@ -249,8 +247,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
- golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
- golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
- golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
--golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
--golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
-+golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
-+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
- golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-diff --git a/pkg/netceptor/conn.go b/pkg/netceptor/conn.go
-index 1f2ec13..8c482b9 100644
---- a/pkg/netceptor/conn.go
-+++ b/pkg/netceptor/conn.go
-@@ -37,7 +37,7 @@ type acceptResult struct {
- type Listener struct {
- 	s          *Netceptor
- 	pc         *PacketConn
--	ql         quic.Listener
-+	ql         *quic.Listener
- 	acceptChan chan *acceptResult
- 	doneChan   chan struct{}
- 	doneOnce   *sync.Once
-@@ -319,7 +319,7 @@ func (s *Netceptor) DialContext(ctx context.Context, node string, service string
- 	doneChan := make(chan struct{}, 1)
- 	go monitorUnreachable(pc, doneChan, rAddr, ccancel)
- 	_ = os.Setenv("QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING", "1")
--	qc, err := quic.DialContext(cctx, pc, rAddr, s.nodeID, tlscfg, cfg)
-+	qc, err := quic.Dial(cctx, pc, rAddr, tlscfg, cfg)
- 	if err != nil {
- 		close(okChan)
- 		pcClose()
--- 
-2.41.0
-
diff --git a/golang-1.21.patch b/golang-1.21.patch
index 36367df..93b9b13 100644
--- a/golang-1.21.patch
+++ b/golang-1.21.patch
@@ -400,7 +400,7 @@ index 2d24569..6e9f72f 100644
    go monitorUnreachable(pc, doneChan, rAddr, ccancel)
    _ = os.Setenv("QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING", "1")
 -	qc, err := quic.DialContext(cctx, pc, rAddr, s.nodeID, tlscfg, cfg)
-+	qc, err := quic.Dial(cctx, pc, rAddr, s.nodeID, tlscfg, cfg)
++	qc, err := quic.Dial(cctx, pc, rAddr, tlscfg, cfg)
    if err != nil {
    	close(okChan)
    	pcClose()

https://src.fedoraproject.org/rpms/receptor/c/abec2028d08dcfd3d786c58a3ac35c...