[arch-commits] Commit in step-cli/trunk (3 files)

[Jelle van der Waa]

    Date: Monday, September 6, 2021 @ 13:40:49
  Author: jelle
Revision: 1011874

upgpkg: step-cli 0.17.2-1

Added:
  step-cli/trunk/update_identity_test.patch
  step-cli/trunk/update_tests.patch
Modified:
  step-cli/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   12 ++++++++---
 update_identity_test.patch |   23 +++++++++++++++++++++
 update_tests.patch         |   46 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-06 13:37:02 UTC (rev 1011873)
+++ PKGBUILD	2021-09-06 13:40:49 UTC (rev 1011874)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud <foxboron at archlinux.org>
 
 pkgname=step-cli
-pkgver=0.16.1
+pkgver=0.17.2
 pkgrel=1
 pkgdesc="A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc."
 url="https://github.com/smallstep/cli"
@@ -11,11 +11,17 @@
 depends=(glibc)
 makedepends=(go)
 optdepends=("step-ca: setup CA/SSO/ACME server")
-source=(https://github.com/smallstep/cli/releases/download/v${pkgver}/step_${pkgver}.tar.gz)
-sha512sums=('234fa1095a2ed44fcd3da53b17b9c5a675d7bb6110a239eac223967d9bb85a878865651253d252b5ba856e69f50049ed633ee08870f125a90308298b2a0dd8e2')
+source=(https://github.com/smallstep/cli/releases/download/v${pkgver}/step_${pkgver}.tar.gz
+        update_tests.patch
+        update_identity_test.patch)
+sha512sums=('30c8a0c1cbc28ff1d8e9ceecd89ecc45ea67e78540502e831590668be15baef8fffd09f2acaf719627a36f22de9361d91a1c98bcaa7e57a50aca7e6339a1ba66'
+            'b3226046764984c67a7e9b489d043e360560633b637778a9eed359ce26c3d23087b4ba5ab18d7467348e5086a68e0a588f50a5f99078dc1da59ad01ab0e8226a'
+            '2c5084bad7105cfc2a8bc2cbebfaaefbb163e0acfafe758995993d75d859b8610cdf5faca0b97bac47c04a8399617bf42d3f0a8deef4e7025c7cf48e84b48d26')
 
 prepare() {
   sed -i "s/step/${pkgname}/g" "autocomplete/zsh_autocomplete"
+  patch -Np1 -i update_tests.patch
+  patch -Np1 -i update_identity_test.patch
 }
 
 build() {

Added: update_identity_test.patch
===================================================================
--- update_identity_test.patch	                        (rev 0)
+++ update_identity_test.patch	2021-09-06 13:40:49 UTC (rev 1011874)
@@ -0,0 +1,23 @@
+From 638897281d10d8bf511dac813b509805e643c574 Mon Sep 17 00:00:00 2001
+From: davideger <david.eger at gmail.com>
+Date: Fri, 3 Sep 2021 15:02:07 -0700
+Subject: [PATCH] Update crypto/x509util/identity_test.go
+
+Co-authored-by: Mariano Cano <mariano.cano at gmail.com>
+---
+ crypto/x509util/identity_test.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/crypto/x509util/identity_test.go b/crypto/x509util/identity_test.go
+index 4e9ba728..1b411ea2 100644
+--- a/crypto/x509util/identity_test.go
++++ b/crypto/x509util/identity_test.go
+@@ -26,7 +26,7 @@ func TestLoadIdentityFromDisk(t *testing.T) {
+ 			crtPath: testBadCert,
+ 			keyPath: "",
+ 			pass:    "",
+-			err: errors.Errorf("error parsing %s: x509: trailing data",
++			err: errors.Errorf("error parsing %s:",
+ 				testBadCert),
+ 		},
+ 		"error parsing rsa key": {

Added: update_tests.patch
===================================================================
--- update_tests.patch	                        (rev 0)
+++ update_tests.patch	2021-09-06 13:40:49 UTC (rev 1011874)
@@ -0,0 +1,46 @@
+From 3bf37e55ffecfd9b76e736e91ccdae0b37a8b2ca Mon Sep 17 00:00:00 2001
+From: David Eger <david.eger at gmail.com>
+Date: Fri, 3 Sep 2021 14:04:31 -0700
+Subject: [PATCH] Update tests to match current exception strings for malformed
+ certs.
+
+---
+ crypto/pemutil/pem_test.go       | 4 ++--
+ crypto/x509util/identity_test.go | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/crypto/pemutil/pem_test.go b/crypto/pemutil/pem_test.go
+index 30851dcc..3c4249e2 100644
+--- a/crypto/pemutil/pem_test.go
++++ b/crypto/pemutil/pem_test.go
+@@ -230,7 +230,7 @@ func TestReadCertificate(t *testing.T) {
+ 		{"testdata/notexists.crt", errors.New("open testdata/notexists.crt failed: no such file or directory")},
+ 		{"testdata/badca.crt", errors.New("error parsing testdata/badca.crt")},
+ 		{"testdata/badpem.crt", errors.New("error decoding testdata/badpem.crt: not a valid PEM encoded block")},
+-		{"testdata/badder.crt", errors.New("error parsing testdata/badder.crt: asn1: syntax error: data truncated")},
++		{"testdata/badder.crt", errors.New("error parsing testdata/badder.crt: x509:")},
+ 		{"testdata/openssl.p256.pem", errors.New("error decoding PEM: file 'testdata/openssl.p256.pem' does not contain a certificate")},
+ 	}
+ 
+@@ -259,7 +259,7 @@ func TestReadCertificateBundle(t *testing.T) {
+ 		{"testdata/notexists.crt", 0, errors.New("open testdata/notexists.crt failed: no such file or directory")},
+ 		{"testdata/badca.crt", 0, errors.New("error parsing testdata/badca.crt")},
+ 		{"testdata/badpem.crt", 0, errors.New("error decoding PEM: file 'testdata/badpem.crt' contains unexpected data")},
+-		{"testdata/badder.crt", 0, errors.New("error parsing testdata/badder.crt: asn1: syntax error: data truncated")},
++		{"testdata/badder.crt", 0, errors.New("error parsing testdata/badder.crt: x509:")},
+ 		{"testdata/openssl.p256.pem", 0, errors.New("error decoding PEM: file 'testdata/openssl.p256.pem' is not a certificate bundle")},
+ 	}
+ 
+diff --git a/crypto/x509util/identity_test.go b/crypto/x509util/identity_test.go
+index 06020356..4e9ba728 100644
+--- a/crypto/x509util/identity_test.go
++++ b/crypto/x509util/identity_test.go
+@@ -26,7 +26,7 @@ func TestLoadIdentityFromDisk(t *testing.T) {
+ 			crtPath: testBadCert,
+ 			keyPath: "",
+ 			pass:    "",
+-			err: errors.Errorf("error parsing %s: asn1: syntax error: trailing data",
++			err: errors.Errorf("error parsing %s: x509: trailing data",
+ 				testBadCert),
+ 		},
+ 		"error parsing rsa key": {