diff --git a/.gitignore b/.gitignore index 7aa2143..e7eeeec 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /cfssl-1.3.4.tar.gz /cfssl-1.4.1.tar.gz /cfssl-1.5.0.tar.gz +/cfssl-1.6.0.tar.gz diff --git a/golang-github-cloudflare-cfssl.spec b/golang-github-cloudflare-cfssl.spec index 119ec97..6d1fdc3 100644 --- a/golang-github-cloudflare-cfssl.spec +++ b/golang-github-cloudflare-cfssl.spec @@ -3,7 +3,7 @@ # https://github.com/cloudflare/cfssl %global goipath github.com/cloudflare/cfssl -Version: 1.5.0 +Version: 1.6.0 %gometa @@ -27,7 +27,6 @@ URL: %{gourl} Source0: %{gosource} BuildRequires: golang(github.com/cloudflare/backoff) -BuildRequires: golang(github.com/cloudflare/go-metrics) BuildRequires: golang(github.com/cloudflare/redoctober/client) BuildRequires: golang(github.com/cloudflare/redoctober/core) BuildRequires: golang(github.com/GeertJohan/go.rice) @@ -44,9 +43,12 @@ BuildRequires: golang(github.com/kisielk/sqlstruct) BuildRequires: golang(github.com/kisom/goutils/assert) BuildRequires: golang(github.com/lib/pq) BuildRequires: golang(github.com/mattn/go-sqlite3) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promauto) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promhttp) BuildRequires: golang(github.com/zmap/zcrypto/x509) -BuildRequires: golang(github.com/zmap/zlint/v2) -BuildRequires: golang(github.com/zmap/zlint/v2/lint) +BuildRequires: golang(github.com/zmap/zlint/v3) +BuildRequires: golang(github.com/zmap/zlint/v3/lint) BuildRequires: golang(golang.org/x/crypto/ed25519) BuildRequires: golang(golang.org/x/crypto/ocsp) BuildRequires: golang(golang.org/x/crypto/pkcs12) @@ -80,6 +82,7 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ %if %{with check} %check # api/bundle, bundler, revoke: needs network +# signer/remote: https://github.com/cloudflare/cfssl/issues/1200 %gocheck -d api/bundle \ -d bundler \ -d certdb/ocspstapling \ @@ -87,7 +90,8 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ -d revoke \ -d scan/crypto/tls \ -d signer/local \ - -d api/generator + -d api/generator \ + -d signer/remote %endif %files diff --git a/sources b/sources index 6f11230..2071cf6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cfssl-1.5.0.tar.gz) = ab93f0d99be4ebbdbdfe6011d87ee3a87f8aca90752f8e8638de502eb2f8290a7ed3cbf69e43c78afb9244c1dfff487626bd5058c453263dee95e14621ca849f +SHA512 (cfssl-1.6.0.tar.gz) = a1470c50a6ffa506d2c1798a9e8af5a60206cd41d24cc3ca8a071e9ddfc3249a07fa79c03dabc3df0800985be7e930018045ae95ee83d31486cba93e516da111