From d6bc5f570f93e9b5d48021a4e300e8438a579264 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Tue, 3 May 2016 18:39:19 +0100 Subject: [PATCH] cfssl: scrap go_resources Upstream vendor everything now, so these can all die. Hurrah for cleaner formulae. --- Formula/cfssl.rb | 51 ++++-------------------------------------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/Formula/cfssl.rb b/Formula/cfssl.rb index 06a98ab72f..8f436b92b0 100644 --- a/Formula/cfssl.rb +++ b/Formula/cfssl.rb @@ -1,5 +1,3 @@ -require "language/go" - class Cfssl < Formula desc "CloudFlare's PKI toolkit" homepage "https://cfssl.org/" @@ -19,51 +17,10 @@ class Cfssl < Formula depends_on "go" => :build depends_on "libtool" => :run - go_resource "golang.org/x/crypto" do - url "https://github.com/golang/crypto.git", - :revision => "3760e016850398b85094c4c99e955b8c3dea5711" - end - - go_resource "github.com/GeertJohan/go.rice" do - url "https://github.com/GeertJohan/go.rice.git", - :revision => "0f3f5fde32fd1f755632a3d31ba2ec6d449e387b" - end - - go_resource "github.com/cloudflare/cf-tls" do - url "https://github.com/cloudflare/cf-tls.git", - :revision => "358b61f346ff4384bd2b051a8d1a24c48444e388" - end - - go_resource "github.com/daaku/go.zipexe" do - url "https://github.com/daaku/go.zipexe.git", - :revision => "a5fe2436ffcb3236e175e5149162b41cd28bd27d" - end - - go_resource "github.com/dgryski/go-rc2" do - url "https://github.com/dgryski/go-rc2.git", - :revision => "8a9021637152186df738b1ec376caf2100fef194" - end - - go_resource "github.com/miekg/pkcs11" do - url "https://github.com/miekg/pkcs11.git", - :revision => "4b4363b37cd397baa396bcde75f4b09f40441bd8" - end - - go_resource "github.com/kardianos/osext" do - url "https://github.com/kardianos/osext.git", - :revision => "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc" - end - - go_resource "github.com/coreos/go-systemd" do - url "https://github.com/coreos/go-systemd.git", - :revision => "2ed5b5012ccde5f057c197890a2c801295941149" - end - def install ENV["GOPATH"] = buildpath cfsslpath = buildpath/"src/github.com/cloudflare/cfssl" cfsslpath.install Dir["{*,.git}"] - Language::Go.stage_deps resources, buildpath/"src" cd "src/github.com/cloudflare/cfssl" do system "go", "build", "-o", "#{bin}/cfssl", "cmd/cfssl/cfssl.go" system "go", "build", "-o", "#{bin}/cfssljson", "cmd/cfssljson/cfssljson.go" @@ -94,9 +51,9 @@ class Cfssl < Formula EOS shell_output("#{bin}/cfssl genkey -initca request.json > response.json") response = Utils::JSON.load(File.read(testpath/"response.json")) - assert_match /^-----BEGIN CERTIFICATE-----.*/, response["cert"] - assert_match /.*-----END CERTIFICATE-----$/, response["cert"] - assert_match /^-----BEGIN RSA PRIVATE KEY-----.*/, response["key"] - assert_match /.*-----END RSA PRIVATE KEY-----$/, response["key"] + assert_match(/^-----BEGIN CERTIFICATE-----.*/, response["cert"]) + assert_match(/.*-----END CERTIFICATE-----$/, response["cert"]) + assert_match(/^-----BEGIN RSA PRIVATE KEY-----.*/, response["key"]) + assert_match(/.*-----END RSA PRIVATE KEY-----$/, response["key"]) end end