From a54577b7576b6d32d1abf00c8ff70950b7a065f5 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Wed, 3 Mar 2021 23:49:48 -0800 Subject: [PATCH] vendor: update notary to 5f1f4a34 Brings in fixes for darwin/arm64 targets Signed-off-by: Tonis Tiigi --- vendor.conf | 2 +- vendor/github.com/theupdateframework/notary/go.mod | 4 ++-- .../notary/trustmanager/yubikey/pkcs11_darwin.go | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/vendor.conf b/vendor.conf index c1a1276880..8a8acca29f 100755 --- a/vendor.conf +++ b/vendor.conf @@ -67,7 +67,7 @@ github.com/shurcooL/sanitized_anchor_name 7bfe4c7ecddb3666a94b053b422c github.com/sirupsen/logrus 6699a89a232f3db797f2e280639854bbc4b89725 # v1.7.0 github.com/spf13/cobra 86f8bfd7fef868a174e1b606783bd7f5c82ddf8f # v1.1.1 github.com/spf13/pflag 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab # v1.0.5 -github.com/theupdateframework/notary b0b6bfdd4933081e8d5ae026b24e8337311dd598 # v0.7.0 +github.com/theupdateframework/notary 5f1f4a34f4cfa3066e44f652e895f4b24b96248e github.com/tonistiigi/fsutil 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9 github.com/tonistiigi/go-rosetta f79598599c5d34ea253b56a1d7c89bc6a96de7db github.com/tonistiigi/units 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2 diff --git a/vendor/github.com/theupdateframework/notary/go.mod b/vendor/github.com/theupdateframework/notary/go.mod index 0f682d932e..d96f67517d 100644 --- a/vendor/github.com/theupdateframework/notary/go.mod +++ b/vendor/github.com/theupdateframework/notary/go.mod @@ -19,7 +19,7 @@ require ( github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect github.com/dvsekhvalnov/jose2go v0.0.0-20170216131308-f21a8cedbbae github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect - github.com/go-sql-driver/mysql v1.3.0 + github.com/go-sql-driver/mysql v1.5.0 github.com/gogo/protobuf v1.0.0 // indirect github.com/golang/protobuf v1.3.4 github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93 // indirect @@ -30,7 +30,7 @@ require ( github.com/jinzhu/now v1.1.1 // indirect github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 // indirect github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect - github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f + github.com/lib/pq v1.9.0 github.com/magiconair/properties v1.5.3 // indirect github.com/mattn/go-sqlite3 v1.6.0 github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect diff --git a/vendor/github.com/theupdateframework/notary/trustmanager/yubikey/pkcs11_darwin.go b/vendor/github.com/theupdateframework/notary/trustmanager/yubikey/pkcs11_darwin.go index f399dff3bb..949fd621c3 100644 --- a/vendor/github.com/theupdateframework/notary/trustmanager/yubikey/pkcs11_darwin.go +++ b/vendor/github.com/theupdateframework/notary/trustmanager/yubikey/pkcs11_darwin.go @@ -6,4 +6,6 @@ var possiblePkcs11Libs = []string{ "/usr/local/lib/libykcs11.dylib", "/usr/local/docker/lib/libykcs11.dylib", "/usr/local/docker-experimental/lib/libykcs11.dylib", + // default location on arm64 + "/opt/homebrew/lib/libykcs11.dylib", }