diff --git a/go.mod b/go.mod index 13d0d9a6d4..a227b31e3f 100644 --- a/go.mod +++ b/go.mod @@ -220,6 +220,7 @@ require ( sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect ) -replace github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b +// branch: extend-include-path-apple-silicon +replace github.com/apcera/gssapi => github.com/tchap/gssapi v0.0.0-20260403121208-047531cb33ea replace github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 diff --git a/go.sum b/go.sum index 70d08ea152..546f9f7f6e 100644 --- a/go.sum +++ b/go.sum @@ -375,8 +375,6 @@ github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af h1:Ui github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= github.com/openshift/client-go v0.0.0-20260306160707-3935d929fc7d h1:T+9HFgEEcnu1TDDfsO5JcJC6N0/Kzob5AtG9IpITHJ8= github.com/openshift/client-go v0.0.0-20260306160707-3935d929fc7d/go.mod h1:tIA3XSb/WsC/Fg0YNRfs/JrMrloBKPGF+NKVutd7nMI= -github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b h1:it0YPE/evO6/m8t8wxis9KFI2F/aleOKsI6d9uz0cEk= -github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b/go.mod h1:tNrEB5k8SI+g5kOlsCmL2ELASfpqEofI0+FLBgBdN08= github.com/openshift/library-go v0.0.0-20260303171201-5d9eb6295ff6 h1:xjqy0OolrFdJ+ofI/aD0+2k9+MSk5anP5dXifFt539Q= github.com/openshift/library-go v0.0.0-20260303171201-5d9eb6295ff6/go.mod h1:D797O/ssKTNglbrGchjIguFq+DbyRYdeds5w4/VTrKM= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 h1:PMTgifBcBRLJJiM+LgSzPDTk9/Rx4qS09OUrfpY6GBQ= @@ -460,6 +458,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/tchap/gssapi v0.0.0-20260403121208-047531cb33ea h1:qg5uvBpWX+no879/J/HjishOHgaiOkCp+vOJFbPzgU0= +github.com/tchap/gssapi v0.0.0-20260403121208-047531cb33ea/go.mod h1:xQz4s+i4JqtlGyYPzsvBxduNunUHCXucLrJNtkgmVbY= github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0= github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs= github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= diff --git a/vendor/github.com/apcera/gssapi/name.go b/vendor/github.com/apcera/gssapi/name.go index 751d32e469..8811d375e0 100644 --- a/vendor/github.com/apcera/gssapi/name.go +++ b/vendor/github.com/apcera/gssapi/name.go @@ -16,9 +16,10 @@ package gssapi // // Using "MacPorts" on MacOS gives us: -I/opt/local/include // Using "brew" on MacOS gives us: -I/usr/local/opt/heimdal/include +// Using "brew" on MacOS (Apple Silicon) gives us: -I/opt/homebrew/opt/heimdal/include /* -#cgo darwin CFLAGS: -I/opt/local/include -I/usr/local/opt/heimdal/include +#cgo darwin CFLAGS: -I/opt/local/include -I/usr/local/opt/heimdal/include -I/opt/homebrew/opt/heimdal/include #include #include diff --git a/vendor/modules.txt b/vendor/modules.txt index f40b235142..ceeb351cee 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -51,7 +51,7 @@ github.com/alicebob/sqlittle/sql # github.com/antlr4-go/antlr/v4 v4.13.0 ## explicit; go 1.20 github.com/antlr4-go/antlr/v4 -# github.com/apcera/gssapi v0.0.0-00010101000000-000000000000 => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b +# github.com/apcera/gssapi v0.0.0-00010101000000-000000000000 => github.com/tchap/gssapi v0.0.0-20260403121208-047531cb33ea ## explicit github.com/apcera/gssapi # github.com/aws/aws-sdk-go-v2 v1.41.3 @@ -2040,5 +2040,5 @@ sigs.k8s.io/structured-merge-diff/v6/value sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v3 sigs.k8s.io/yaml/kyaml -# github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b +# github.com/apcera/gssapi => github.com/tchap/gssapi v0.0.0-20260403121208-047531cb33ea # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1