From d4a3735d61e136f1825f2bdf19e22d346063876c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 Dec 2019 18:50:13 +0100
Subject: [PATCH] cfssl: update to 1.4.1, replace cjssljson

Closes #16591.
---
 srcpkgs/cfssl/template     | 11 +++++++----
 srcpkgs/cfssljson/template | 18 ------------------
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/cfssljson/template

diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index d59347bba0c..822903d181a 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,17 +1,20 @@
 # Template file for 'cfssl'
 pkgname=cfssl
-version=1.3.4
+version=1.4.1
 revision=1
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
-go_package="${go_import_path}/cmd/cfssl"
+go_package="${go_import_path}/cmd/..."
 short_desc="CFSSL: Cloudflare's PKI and TLS toolkit"
 maintainer="hanspolo <itself@hanspolo.net>"
 license="BSD-2-Clause"
 homepage="https://github.com/cloudflare/cfssl"
-distfiles="https://github.com/cloudflare/cfssl/archive/${version}.tar.gz"
-checksum=ca120300f5bf3b2f8da229d10d4b2882a87075861541608bd07cd68238cef86c
+distfiles="https://github.com/cloudflare/cfssl/archive/v${version}.tar.gz"
+checksum=c8a86ef10cbb0c168f3b597db15b31f98b170edb7958f7154edeb29aee41315e
+replaces="cfssljson>=0"
 
 post_install() {
 	vlicense LICENSE
+	vdoc README.md
+	vcopy 'doc/*' "usr/share/doc/${pkgname}"
 }
diff --git a/srcpkgs/cfssljson/template b/srcpkgs/cfssljson/template
deleted file mode 100644
index 268ffc9e0fe..00000000000
--- a/srcpkgs/cfssljson/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'cfssljson'
-pkgname=cfssljson
-version=1.3.4
-revision=1
-wrksrc="cfssl-${version}"
-build_style=go
-go_import_path=github.com/cloudflare/cfssl
-go_package="${go_import_path}/cmd/${pkgname}"
-short_desc="CFSSL: Cloudflare's PKI and TLS toolkit"
-maintainer="hanspolo <itself@hanspolo.net>"
-license="BSD-2-Clause"
-homepage="https://${go_import_path}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ca120300f5bf3b2f8da229d10d4b2882a87075861541608bd07cd68238cef86c
-
-post_install() {
-	vlicense LICENSE
-}