|
| 1 | +From a962913c5d94d44abbe54bc2ac3e6ab9d9dcdf6b Mon Sep 17 00:00:00 2001 |
| 2 | +From: Rahul Ganesh <rahulgab@amazon.com> |
| 3 | +Date: Thu, 16 Apr 2026 18:27:36 -0700 |
| 4 | +Subject: [PATCH 6/6] Bump bmclib to 3269f94 (gofish v0.21.6) |
| 5 | + |
| 6 | +Update bmclib from fork pin to upstream bmc-toolbox/bmclib@3269f94 |
| 7 | +which merges all prior fork patches and bumps gofish to v0.21.6. |
| 8 | + |
| 9 | +Key fixes included via gofish v0.21.5/v0.21.6: |
| 10 | +- SetBoot tries main System resource before Settings URI, |
| 11 | + fixing one-time boot override on iDRAC 7.x-9.x |
| 12 | +- Restore HTTP/2 ALPN negotiation on custom TLS transports |
| 13 | +- Fix multi-type JSON Schema properties resolving to wrong type |
| 14 | + |
| 15 | +Also removes the rahulbabu95/bmclib fork replace directive since |
| 16 | +all fork commits (PRs #433, #434, #435) are now merged upstream. |
| 17 | + |
| 18 | +Signed-off-by: Rahul Ganesh <rahulgab@amazon.com> |
| 19 | +--- |
| 20 | + go.mod | 4 ++-- |
| 21 | + go.sum | 8 ++++---- |
| 22 | + 2 files changed, 6 insertions(+), 6 deletions(-) |
| 23 | + |
| 24 | +diff --git a/go.mod b/go.mod |
| 25 | +index cd60a943..3189dae0 100644 |
| 26 | +--- a/go.mod |
| 27 | ++++ b/go.mod |
| 28 | +@@ -7,7 +7,7 @@ require ( |
| 29 | + github.com/Masterminds/sprig/v3 v3.3.0 |
| 30 | + github.com/a-h/templ v0.3.977 |
| 31 | + github.com/avast/retry-go/v4 v4.7.0 |
| 32 | +- github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20251010091507-63cb571e5597 |
| 33 | ++ github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20260416064330-3269f94932e9 |
| 34 | + github.com/ccoveille/go-safecast/v2 v2.0.0 |
| 35 | + github.com/cenkalti/backoff/v5 v5.0.3 |
| 36 | + github.com/containerd/containerd/v2 v2.2.1 |
| 37 | +@@ -214,7 +214,7 @@ require ( |
| 38 | + github.com/soheilhy/cmux v0.1.5 // indirect |
| 39 | + github.com/spf13/cast v1.7.0 // indirect |
| 40 | + github.com/spf13/cobra v1.9.1 // indirect |
| 41 | +- github.com/stmcginnis/gofish v0.20.0 // indirect |
| 42 | ++ github.com/stmcginnis/gofish v0.21.6 // indirect |
| 43 | + github.com/stoewer/go-strcase v1.3.0 // indirect |
| 44 | + github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect |
| 45 | + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect |
| 46 | +diff --git a/go.sum b/go.sum |
| 47 | +index 56be1b85..35809760 100644 |
| 48 | +--- a/go.sum |
| 49 | ++++ b/go.sum |
| 50 | +@@ -49,8 +49,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= |
| 51 | + github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= |
| 52 | + github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= |
| 53 | + github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= |
| 54 | +-github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20251010091507-63cb571e5597 h1:V8lDpeWcQXhlarTtD5op6++v5Dh6wO4WTBXq8ugNuj4= |
| 55 | +-github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20251010091507-63cb571e5597/go.mod h1:2tYJD9JtY1tJxLHhslICrFOZhxE9O4gYMb1nJ5BKI5w= |
| 56 | ++github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20260416064330-3269f94932e9 h1:q4Sc06ok4ZDPuu6yYIkXDTJw8DEh5xA4Px9OQD087cg= |
| 57 | ++github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20260416064330-3269f94932e9/go.mod h1:NicaxDvwo1RbClp+6XPefZt28svygBT5wofYk/A1Sk0= |
| 58 | + github.com/bmc-toolbox/common v0.0.0-20250112191656-b6de52e8303d h1:5c0jhS9jNLm1t3GVEESsWv+p6recFRLGW90zp8HDIDs= |
| 59 | + github.com/bmc-toolbox/common v0.0.0-20250112191656-b6de52e8303d/go.mod h1:Cdnkm+edb6C0pVkyCrwh3JTXAe0iUF9diDG/DztPI9I= |
| 60 | + github.com/bombsimon/logrusr/v2 v2.0.1 h1:1VgxVNQMCvjirZIYaT9JYn6sAVGVEcNtRE0y4mvaOAM= |
| 61 | +@@ -458,8 +458,8 @@ github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wx |
| 62 | + github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= |
| 63 | + github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= |
| 64 | + github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= |
| 65 | +-github.com/stmcginnis/gofish v0.20.0 h1:hH2V2Qe898F2wWT1loApnkDUrXXiLKqbSlMaH3Y1n08= |
| 66 | +-github.com/stmcginnis/gofish v0.20.0/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU= |
| 67 | ++github.com/stmcginnis/gofish v0.21.6 h1:jK3TGD6VANaAHKHypVNfD6io2nPrU+6eF8X4qARsTlY= |
| 68 | ++github.com/stmcginnis/gofish v0.21.6/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU= |
| 69 | + github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= |
| 70 | + github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= |
| 71 | + github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= |
| 72 | +-- |
| 73 | +2.46.0 |
| 74 | + |
0 commit comments