From 406200ebf5ec215484f91d1288d65328ea2e7c46 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Wed, 14 Feb 2024 23:42:58 +0100 Subject: [PATCH 1/2] tkey-ssh-agent: update artifact url and checksum Signed-off-by: Rui Chen tkey-ssh-agent: patch `go.bug.st/serial` to build with go1.22 Signed-off-by: Rui Chen --- Formula/t/tkey-ssh-agent.rb | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/Formula/t/tkey-ssh-agent.rb b/Formula/t/tkey-ssh-agent.rb index 45d3e78616e3..62f98093b822 100644 --- a/Formula/t/tkey-ssh-agent.rb +++ b/Formula/t/tkey-ssh-agent.rb @@ -1,9 +1,10 @@ class TkeySshAgent < Formula desc "SSH agent for use with the TKey security stick" homepage "https://tillitis.se/" - url "https://github.com/tillitis/tillitis-key1-apps/archive/refs/tags/v0.0.6.tar.gz" - sha256 "d15fc7f556548951989abf6973374f71e039028202e8cad4b70f79539da00aff" + url "https://github.com/tillitis/tkey-ssh-agent/archive/refs/tags/v0.0.6.tar.gz" + sha256 "b0ace3e21b9fc739a05c0049131f7386efa766936576d56c206d3abd0caed668" license "GPL-2.0-only" + revision 1 livecheck do url :stable @@ -36,6 +37,9 @@ class TkeySshAgent < Formula sha256 "639bdba7e61c3e1d551e9c462c7447e4908cf0153edaebc2e6843c9f78e477a6" end + # patch `go.bug.st/serial` to v1.6.2 to fix `cannot define new methods on non-local type C.CFTypeRef` error + patch :DATA + def install resource("signerapp").stage("./cmd/tkey-ssh-agent/app.bin") ldflags = "-s -w -X main.version=#{version}" @@ -83,3 +87,31 @@ def caveats assert_predicate socket, :exist? end end + +__END__ +diff --git a/go.mod b/go.mod +index aaf7fbd..22b4ff6 100644 +--- a/go.mod ++++ b/go.mod +@@ -6,7 +6,7 @@ require ( + github.com/gen2brain/beeep v0.0.0-20220909211152-5a9ec94374f6 + github.com/spf13/pflag v1.0.5 + github.com/twpayne/go-pinentry-minimal v0.0.0-20220113210447-2a5dc4396c2a +- go.bug.st/serial v1.5.0 ++ go.bug.st/serial v1.6.2 + golang.org/x/crypto v0.5.0 + golang.org/x/term v0.4.0 + ) +diff --git a/go.sum b/go.sum +index f0652fe..805352e 100644 +--- a/go.sum ++++ b/go.sum +@@ -26,6 +26,8 @@ github.com/twpayne/go-pinentry-minimal v0.0.0-20220113210447-2a5dc4396c2a h1:a1b + github.com/twpayne/go-pinentry-minimal v0.0.0-20220113210447-2a5dc4396c2a/go.mod h1:ARJJXqNuaxVS84jX6ST52hQh0TtuQZWABhTe95a6BI4= + go.bug.st/serial v1.5.0 h1:ThuUkHpOEmCVXxGEfpoExjQCS2WBVV4ZcUKVYInM9T4= + go.bug.st/serial v1.5.0/go.mod h1:UABfsluHAiaNI+La2iESysd9Vetq7VRdpxvjx7CmmOE= ++go.bug.st/serial v1.6.2 h1:kn9LRX3sdm+WxWKufMlIRndwGfPWsH1/9lCWXQCasq8= ++go.bug.st/serial v1.6.2/go.mod h1:UABfsluHAiaNI+La2iESysd9Vetq7VRdpxvjx7CmmOE= + golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= + golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= + golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From 04860f7bcecdecce7da339858b1a75c0356a50bd Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Sun, 3 Mar 2024 03:43:10 +0000 Subject: [PATCH 2/2] tkey-ssh-agent: update 0.0.6_1 bottle. --- Formula/t/tkey-ssh-agent.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Formula/t/tkey-ssh-agent.rb b/Formula/t/tkey-ssh-agent.rb index 62f98093b822..1a49e0559ea7 100644 --- a/Formula/t/tkey-ssh-agent.rb +++ b/Formula/t/tkey-ssh-agent.rb @@ -12,14 +12,13 @@ class TkeySshAgent < Formula end bottle do - rebuild 2 - sha256 cellar: :any_skip_relocation, arm64_ventura: "b00f8db7fb3ec5aea7d08770da1a30de735ea365845c0dba0bd70c039116d82a" - sha256 cellar: :any_skip_relocation, arm64_monterey: "6ee703b7d46264fb1adce0b6187d19719cd2210be3fd183bc1fa34ce0b33ed8c" - sha256 cellar: :any_skip_relocation, arm64_big_sur: "bdba6e501630f4265b5905162e3c7adc3ce7360451422660b6ddf3872630b901" - sha256 cellar: :any_skip_relocation, ventura: "155165d00aac01bbad4dae356ad2c240ad33d53458da154e8f8173d5ebbbcfce" - sha256 cellar: :any_skip_relocation, monterey: "95d87b785d72bfe0ef2bf50601c2f780c6096119734b6d81962c3f035066f0ec" - sha256 cellar: :any_skip_relocation, big_sur: "4947e759c1abfe46536aadfe8f2ab7b1651a3568b6b49a1cecced1d81b576238" - sha256 cellar: :any_skip_relocation, x86_64_linux: "3ea710fcd774b3c3f75da1f62462b0137952f8f6b4f9fc50350a45a5830fb18e" + sha256 cellar: :any_skip_relocation, arm64_sonoma: "d1693eb4c1246a0d6afd2dd24902f34cf8e8f92e3009c0b95325e29f1e576e0e" + sha256 cellar: :any_skip_relocation, arm64_ventura: "79f70b9d9de1d77985992cb64e3a455e6863a7a2a0697b1295a31bada78b544d" + sha256 cellar: :any_skip_relocation, arm64_monterey: "4b0c368897a67c585ec79ccef5e95940637a8bbcf47db37037b6f29f652606f8" + sha256 cellar: :any_skip_relocation, sonoma: "8f62ea8147b984c3efb65831704ab4c8de14c65622ad5fb94ee3aeebfc561fb0" + sha256 cellar: :any_skip_relocation, ventura: "9ef52e8c902faaa44b64409de0baea593a7ac1075ab179308cf926109deba6b7" + sha256 cellar: :any_skip_relocation, monterey: "60d5a0a4f086a93f1c994209604cfa2a4e4b304b6e6b8025f5d1561551009c6a" + sha256 cellar: :any_skip_relocation, x86_64_linux: "6330e99e8ada1967925e768f19ab93405c445a18876baddd43d8d8cd9d91a3c0" end depends_on "go" => :build