From 1b15c6da33bac1f8c79415a66f22463511ac15a8 Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Fri, 7 Jun 2019 11:41:54 +0200 Subject: [PATCH] accounts/scwallet: Disable macos support (#19679) --- .../gballet/go-libpcsclite/doc_bsd.go | 4 +-- .../gballet/go-libpcsclite/doc_darwin.go | 35 +++++++++++++++++++ vendor/vendor.json | 6 ++-- 3 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 vendor/github.com/gballet/go-libpcsclite/doc_darwin.go diff --git a/vendor/github.com/gballet/go-libpcsclite/doc_bsd.go b/vendor/github.com/gballet/go-libpcsclite/doc_bsd.go index ddec46c670..672c672e4f 100644 --- a/vendor/github.com/gballet/go-libpcsclite/doc_bsd.go +++ b/vendor/github.com/gballet/go-libpcsclite/doc_bsd.go @@ -28,8 +28,8 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// +build dragonfly darwin freebsd netbsd openbsd solaris +// +build dragonfly freebsd netbsd openbsd solaris package pcsc -const PCSCDSockName string = "/var/run/pcscd/pcscd.comm" \ No newline at end of file +const PCSCDSockName string = "/var/run/pcscd/pcscd.comm" diff --git a/vendor/github.com/gballet/go-libpcsclite/doc_darwin.go b/vendor/github.com/gballet/go-libpcsclite/doc_darwin.go new file mode 100644 index 0000000000..3dec7c79b4 --- /dev/null +++ b/vendor/github.com/gballet/go-libpcsclite/doc_darwin.go @@ -0,0 +1,35 @@ +// BSD 3-Clause License +// +// Copyright (c) 2019, Guillaume Ballet +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// * Redistributions of source code must retain the above copyright notice, this +// list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// * Neither the name of the copyright holder nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// +build darwin + +package pcsc + +const PCSCDSockName string = "" diff --git a/vendor/vendor.json b/vendor/vendor.json index 94f4742e65..a1f21f0e17 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -135,10 +135,10 @@ "revisionTime": "2018-04-18T12:24:29Z" }, { - "checksumSHA1": "+fiJGimxPPRSfi9sED4Lp6ytBeo=", + "checksumSHA1": "gsiYVjwKzFKe+JuIimgKlrPyipA=", "path": "github.com/gballet/go-libpcsclite", - "revision": "2fd9b619dd3c5d74acbd975f997a6441984d74a7", - "revisionTime": "2019-05-28T10:50:17Z" + "revision": "2772fd86a8ff4306d2749f610a386bfee9e0d727", + "revisionTime": "2019-06-07T06:51:34Z" }, { "checksumSHA1": "gxV/cPPLkByTdY8y172t7v4qcZA=",