public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/grpcurl] f44: Update to 1.9.4 - Closes rhbz#2526612
@ 2026-09-02 7:05 Mikel Olasagasti Uranga
0 siblings, 0 replies; only message in thread
From: Mikel Olasagasti Uranga @ 2026-09-02 7:05 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/grpcurl
Branch : f44
Commit : 1aa1cda2b6ffc087540ba6d2b7558fee88b8634c
Author : Mikel Olasagasti Uranga <mikel@olasagasti.info>
Date : 2026-09-02T09:04:02+02:00
Stats : +66/-56 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/grpcurl/c/1aa1cda2b6ffc087540ba6d2b7558fee88b8634c?branch=f44
Log:
Update to 1.9.4 - Closes rhbz#2526612
---
diff --git a/.gitignore b/.gitignore
index 113ef5a..ebad969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
/grpcurl-1.9.2-vendor.tar.bz2
/grpcurl-1.9.3.tar.gz
/grpcurl-1.9.3-vendor.tar.bz2
+/grpcurl-1.9.4.tar.gz
+/grpcurl-1.9.4-vendor.tar.bz2
diff --git a/0001-fix-handle-nil-JSON-readers-with-Go-1.27-jsonv2.patch b/0001-fix-handle-nil-JSON-readers-with-Go-1.27-jsonv2.patch
new file mode 100644
index 0000000..6bc2b36
--- /dev/null
+++ b/0001-fix-handle-nil-JSON-readers-with-Go-1.27-jsonv2.patch
@@ -0,0 +1,59 @@
+From 77bc6825dc54b19a049662ed8b6fc75c7ddd19bb Mon Sep 17 00:00:00 2001
+From: Mikel Olasagasti Uranga <mikel@olasagasti.info>
+Date: Wed, 2 Sep 2026 08:51:55 +0200
+Subject: [PATCH] fix: handle nil JSON readers with Go 1.27 jsonv2
+
+---
+ format.go | 6 ++++++
+ format_test.go | 11 +++++++++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/format.go b/format.go
+index 5d802be..1929616 100644
+--- a/format.go
++++ b/format.go
+@@ -49,6 +49,9 @@ type jsonRequestParser struct {
+ // If the given reader has no data, the returned parser will return io.EOF on
+ // the very first call.
+ func NewJSONRequestParser(in io.Reader, resolver jsonpb.AnyResolver) RequestParser {
++ if in == nil {
++ in = strings.NewReader("")
++ }
+ return &jsonRequestParser{
+ dec: json.NewDecoder(in),
+ unmarshaler: jsonpb.Unmarshaler{AnyResolver: resolver},
+@@ -58,6 +61,9 @@ func NewJSONRequestParser(in io.Reader, resolver jsonpb.AnyResolver) RequestPars
+ // NewJSONRequestParserWithUnmarshaler is like NewJSONRequestParser but
+ // accepts a protobuf jsonpb.Unmarshaler instead of jsonpb.AnyResolver.
+ func NewJSONRequestParserWithUnmarshaler(in io.Reader, unmarshaler jsonpb.Unmarshaler) RequestParser {
++ if in == nil {
++ in = strings.NewReader("")
++ }
+ return &jsonRequestParser{
+ dec: json.NewDecoder(in),
+ unmarshaler: unmarshaler,
+diff --git a/format_test.go b/format_test.go
+index 96f64ef..939f87f 100644
+--- a/format_test.go
++++ b/format_test.go
+@@ -94,6 +94,17 @@ func TestRequestParser(t *testing.T) {
+ }
+ }
+
++func TestJSONRequestParserNilReader(t *testing.T) {
++ parser := NewJSONRequestParser(nil, nil)
++ var message structpb.Value
++ if err := parser.Next(&message); err != io.EOF {
++ t.Fatalf("expected io.EOF, got %v", err)
++ }
++ if parser.NumRequests() != 0 {
++ t.Fatalf("expected no requests, got %d", parser.NumRequests())
++ }
++}
++
+ // Handler prints response data (and headers/trailers in verbose mode).
+ // This verifies that we get the right output in both JSON and proto text modes.
+ func TestHandler(t *testing.T) {
+--
+2.55.0
+
diff --git a/0001-test-Update-TLS-error-checks-for-Go-1.25-compatibili.patch b/0001-test-Update-TLS-error-checks-for-Go-1.25-compatibili.patch
deleted file mode 100644
index 2162448..0000000
--- a/0001-test-Update-TLS-error-checks-for-Go-1.25-compatibili.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 40f2159e71382a96a0a3f6828137dee937c84847 Mon Sep 17 00:00:00 2001
-From: Mikel Olasagasti Uranga <mikel@olasagasti.info>
-Date: Thu, 24 Jul 2025 22:36:31 +0200
-Subject: [PATCH] test: Update TLS error checks for Go 1.25 compatibility
-
-The error message for client certificate failures changed in Go 1.25.
-Update tests to check for both the old ("bad certificate") and new
-("handshake failure") error strings to support multiple Go versions.
-
-Signed-off-by: Mikel Olasagasti Uranga <mikel@olasagasti.info>
----
- tls_settings_test.go | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/tls_settings_test.go b/tls_settings_test.go
-index b12a251..ad8958f 100644
---- a/tls_settings_test.go
-+++ b/tls_settings_test.go
-@@ -253,8 +253,12 @@ func TestBrokenTLS_ClientNotTrusted(t *testing.T) {
- e.Close()
- t.Fatal("expecting TLS failure setting up server and client")
- }
-- if !strings.Contains(err.Error(), "bad certificate") {
-- t.Fatalf("expecting TLS certificate error, got: %v", err)
-+ // Check for either the old error (Go <=1.24) or the new one (Go 1.25+)
-+ // Go 1.24: "bad certificate"
-+ // Go 1.25: "handshake failure"
-+ errMsg := err.Error()
-+ if !strings.Contains(errMsg, "bad certificate") && !strings.Contains(errMsg, "handshake failure") {
-+ t.Fatalf("expecting a specific TLS certificate or handshake error, got: %v", err)
- }
- }
-
-@@ -293,8 +297,12 @@ func TestBrokenTLS_RequireClientCertButNonePresented(t *testing.T) {
- e.Close()
- t.Fatal("expecting TLS failure setting up server and client")
- }
-- if !strings.Contains(err.Error(), "bad certificate") {
-- t.Fatalf("expecting TLS certificate error, got: %v", err)
-+ // Check for either the old error (Go <=1.24) or the new one (Go 1.25+)
-+ // Go 1.24: "bad certificate"
-+ // Go 1.25: "handshake failure"
-+ errMsg := err.Error()
-+ if !strings.Contains(errMsg, "bad certificate") && !strings.Contains(errMsg, "handshake failure") {
-+ t.Fatalf("expecting a specific TLS certificate or handshake error, got: %v", err)
- }
- }
-
---
-2.50.1
-
diff --git a/grpcurl.spec b/grpcurl.spec
index 600d4eb..1aa61fd 100644
--- a/grpcurl.spec
+++ b/grpcurl.spec
@@ -3,7 +3,7 @@
# https://github.com/fullstorydev/grpcurl
%global goipath github.com/fullstorydev/grpcurl
-Version: 1.9.3
+Version: 1.9.4
%gometa -L -f
@@ -19,8 +19,8 @@ Source0: %{gosource}
# Generated by go-vendor-tools
Source1: %{archivename}-vendor.tar.bz2
Source2: go-vendor-tools.toml
-# https://github.com/fullstorydev/grpcurl/pull/522
-Patch: 0001-test-Update-TLS-error-checks-for-Go-1.25-compatibili.patch
+# https://github.com/fullstorydev/grpcurl/pull/582
+Patch: 0001-fix-handle-nil-JSON-readers-with-Go-1.27-jsonv2.patch
BuildRequires: go-vendor-tools
diff --git a/sources b/sources
index f85ebcf..1918b26 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (grpcurl-1.9.3.tar.gz) = bd5e9e1a9a45ba96f6d238f956de3dfddb128fc57d0754e661326a421584979f5b64ed6dd9b4e4ac2a3ada51695b60ce6c2f03fe4ca266747155db50ada02404
-SHA512 (grpcurl-1.9.3-vendor.tar.bz2) = 44adeea48daa45e43f92834cca3befd7f6bc5020e6583c86130fb1c1bf6d2e259b100941ff9070920741da01024b7d54873357ff21d0a7248827549e5dc020bf
+SHA512 (grpcurl-1.9.4.tar.gz) = 0d10d3eb4de24e63d2f3c01d24c92adc98835defd257ed21ef0663bef93fbff96d854c4f1225d85cbf7e53b0ffd8b2c460b6973a5661fe1b4e6d7697c98e00b7
+SHA512 (grpcurl-1.9.4-vendor.tar.bz2) = abe4414ad5e1ac39257978d7cb8ec0b1880d34c3291035354f48be4c0f711a7e494eeebe37f9db9945b638e78c5b6b15ff0647f5db75536004c6d557a94c1b16
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-02 7:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-02 7:05 [rpms/grpcurl] f44: Update to 1.9.4 - Closes rhbz#2526612 Mikel Olasagasti Uranga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox