diff options
| -rw-r--r-- | tests/auth.testscript | 6 | ||||
| -rwxr-xr-x | tests/auth/cert | 2 | ||||
| -rw-r--r-- | tests/common/hello/libhello-1.0.0.tar.gz | bin | 2448 -> 2458 bytes | |||
| -rw-r--r-- | tests/common/libhello-1.0.0/manifest | 2 | ||||
| -rw-r--r-- | tests/rep-auth.testscript | 12 | ||||
| -rw-r--r-- | tests/rep-auth/expired/packages.manifest | 2 | ||||
| -rw-r--r-- | tests/rep-auth/expired/repositories.manifest | 2 | ||||
| -rw-r--r-- | tests/rep-auth/expired/signature.manifest | 22 |
8 files changed, 24 insertions, 24 deletions
diff --git a/tests/auth.testscript b/tests/auth.testscript index 5dd8769..4e7b0c9 100644 --- a/tests/auth.testscript +++ b/tests/auth.testscript @@ -17,6 +17,6 @@ cert = $src_base/auth/default-cert.pem # file to sign the repository. # cert_manifest = $~/cert-manifest -+echo 'certificate: \' >=$cert_manifest -+cat <<<$cert >+$cert_manifest -+echo '\' >+$cert_manifest ++echo 'certificate:\' >=$cert_manifest ++cat <<<$cert >+$cert_manifest ++echo '\' >+$cert_manifest diff --git a/tests/auth/cert b/tests/auth/cert index b246d87..87ec9b5 100755 --- a/tests/auth/cert +++ b/tests/auth/cert @@ -33,7 +33,7 @@ openssl req -x509 -new -key key.pem -days 36500 -config self-any-openssl.cnf > \ # To regenerate the packages and signature manifest files run bpkg rep-create # command, for example: # -# ../../bpkg/bpkg rep-create ../rep-auth/expired --key key.pem +# bpkg rep-create ../rep-auth/expired --key key.pem # # We cannot do it in the testscript since the certificate has expired. This is # also the reason why we store these auto-generated manifests in git. diff --git a/tests/common/hello/libhello-1.0.0.tar.gz b/tests/common/hello/libhello-1.0.0.tar.gz Binary files differindex fa71182..12c2354 100644 --- a/tests/common/hello/libhello-1.0.0.tar.gz +++ b/tests/common/hello/libhello-1.0.0.tar.gz diff --git a/tests/common/libhello-1.0.0/manifest b/tests/common/libhello-1.0.0/manifest index 1fdd50c..1cb2ae0 100644 --- a/tests/common/libhello-1.0.0/manifest +++ b/tests/common/libhello-1.0.0/manifest @@ -4,7 +4,7 @@ version: 1.0.0 summary: The "Hello World" example library license: MIT tags: c++, hello, world, example -description: \ +description:\ A simple library that implements the "Hello World" example in C++. Its primary goal is to show a canonical build2/bpkg project/package. \ diff --git a/tests/rep-auth.testscript b/tests/rep-auth.testscript index 0ba46fa..ee86327 100644 --- a/tests/rep-auth.testscript +++ b/tests/rep-auth.testscript @@ -50,7 +50,7 @@ # cp -r $src/unsigned $out/self-match - echo 'certificate: \' >+$out/self-match/repositories.manifest + echo 'certificate:\' >+$out/self-match/repositories.manifest cat <<<$src_base/auth/self-cert.pem >+$out/self-match/repositories.manifest echo '\' >+$out/self-match/repositories.manifest @@ -62,7 +62,7 @@ # cp -r $src/unsigned $out/self-any-match - echo 'certificate: \' >+$out/self-any-match/repositories.manifest + echo 'certificate:\' >+$out/self-any-match/repositories.manifest cat <<<$src_base/auth/self-any-cert.pem >+$out/self-any-match/repositories.manifest echo '\' >+$out/self-any-match/repositories.manifest @@ -75,7 +75,7 @@ # cp -r $src/unsigned $out/subdomain-match - echo 'certificate: \' >+$out/subdomain-match/repositories.manifest + echo 'certificate:\' >+$out/subdomain-match/repositories.manifest cat <<<$src_base/auth/subdomain-cert.pem >+$out/subdomain-match/repositories.manifest echo '\' >+$out/subdomain-match/repositories.manifest @@ -87,7 +87,7 @@ # cp -r $src/unsigned $out/name-mismatch - echo 'certificate: \' >+$out/name-mismatch/repositories.manifest + echo 'certificate:\' >+$out/name-mismatch/repositories.manifest cat <<<$src_base/auth/mismatch-cert.pem >+$out/name-mismatch/repositories.manifest echo '\' >+$out/name-mismatch/repositories.manifest @@ -605,7 +605,7 @@ sc = " " # Space character to append to here-document line when required. { cp -r $src/unsigned rep; - echo 'certificate: \' >+rep/repositories.manifest; + echo 'certificate:\' >+rep/repositories.manifest; cat <<<$src_base/auth/noemail-cert.pem >+rep/repositories.manifest; echo '\' >+rep/repositories.manifest; @@ -620,7 +620,7 @@ sc = " " # Space character to append to here-document line when required. { cp -r $src/unsigned rep; - echo 'certificate: \' >+rep/repositories.manifest; + echo 'certificate:\' >+rep/repositories.manifest; cat <<<$src_base/auth/expired-cert.pem >+rep/repositories.manifest; echo '\' >+rep/repositories.manifest; diff --git a/tests/rep-auth/expired/packages.manifest b/tests/rep-auth/expired/packages.manifest index 4fa075a..aac8bfd 100644 --- a/tests/rep-auth/expired/packages.manifest +++ b/tests/rep-auth/expired/packages.manifest @@ -1,5 +1,5 @@ : 1 -sha256sum: dbeea68d374f6ca66b5f65652e26a0d8324d3fe118341ac470c07214ceb34b60 +sha256sum: 28183f366660bb265ef488c2b5b8696cd007392f7c204a9ee6ecbcba6b44b375 : name: foo version: 1 diff --git a/tests/rep-auth/expired/repositories.manifest b/tests/rep-auth/expired/repositories.manifest index 7e68ee8..3658269 100644 --- a/tests/rep-auth/expired/repositories.manifest +++ b/tests/rep-auth/expired/repositories.manifest @@ -1,5 +1,5 @@ : 1 -certificate: \ +certificate:\ -----BEGIN CERTIFICATE----- MIIFLzCCAxegAwIBAgIJAOx1KvcHxv3GMA0GCSqGSIb3DQEBCwUAMDMxFzAVBgNV BAoMDkNvZGUgU3ludGhlc2lzMRgwFgYDVQQDDA9uYW1lOmJ1aWxkMi5vcmcwHhcN diff --git a/tests/rep-auth/expired/signature.manifest b/tests/rep-auth/expired/signature.manifest index 454653f..99095f4 100644 --- a/tests/rep-auth/expired/signature.manifest +++ b/tests/rep-auth/expired/signature.manifest @@ -1,13 +1,13 @@ : 1 -sha256sum: ad6c46b7c2b994957215025de0f0ce9be192f6973a8b36f5d3f3d1670172af1e -signature: \ -PQrvkr6ONdIIrEaORzsgpXNpNkMVmdjW8Ahgpi+sdwyjsxkgMj/0gHjyF0amPi6ae+zUu4igDeKM -JnWuShDMbxLy+zxy6IpjpchwtPymM3euqQnLWebRJ2b+9RlBVGIRCl25VnFn+mmHW76+yRnOT6nI -fYNCM6eiLihWKLRUCnsj18PZSV7EK68Q3iPAUws4F4A63eKqJe/qSWkRjJrVpi+UFDjYkJi9542D -MELmYFXV592UVoQ3PPK+ZU/Ja+cosHND9mHe2xvLKHFnBKUi5LKvZ+aZdiZXisnisX9PgvGzk+5j -qzzJUse21NLA2J4D+jiH8r2fj4qjh1dLHgocQj3GQeN8r18XvaLtP9+tcLYfphWnyOfk3q12xtn8 -h9yNoVPHVsMiYrB7JXX2TM4qPqepi3f8iQmEfZxWqlI5/cpeQz3DTDZ4wagNbBoYzavUqTjriXCU -eLWVZz89JkYhWYTBPx26XZp56TsN16ZrN6oMtHgVy6YmmbjIea7sZXhNc8a/7FCdxap8PZfJS1cW -LieoZqQF5C0O8+sJnYl88Pp76mtQIgXEsfc5TnvgMosQfXbHzMbD7naD0woWqu5GVKWx6+AdK2uH -KbuSXYrJYfmuS2Ptp/T7ZIkRE2YZPe4+lsMkIiqY1fg2qIdWgpQiH0ZE3Ki3GH4FUWEkurWgxYk= +sha256sum: a7642c76aba10b702453882504d1d39033ad5e19d1fcd97ad40b37005e9e2927 +signature:\ +ClTGigHFr2VpVZIz5KjxNHKJyEszJ2eP0CLyOS63rim02Vrpl9kIeIIceRdTfs3R6u62gu89MsFi +0VbO37h8DDHY+aZKtlAKg4t5pZjdQ3T56AP+GcB0m0t5oXxEFiGF1JdWOz+ukbvWaA8BmSPWzTsl +m7aU+MdyiQKg7bdyXzKqc/vSY28CuTvhaTpDz43qJOVFC2ezk7jbmPuhaQIVqmLHEiKMQGCynVUV +DI9OZZ98QpplY9d1qNMdc0jWVAhtAuTBW+E+zD4fT4j6mL/1zEz5WWoOAbceyD0Gg5pp0P8ZBg1+ +gzzOLL3ikdMqq+fQY2AKcYzxyTFNCJsnX6KeaYESZZUsI4YOURf+VcjJb24AX3KBevidMcbcGyoo +zBNmqWOLIheK983zDovccj3bRnmByprV95VxWEl7omifZ56Lsfow6rQM2KEVmdSk2ScJUJew4zR6 +1OI7m3GEqrwqlBzKn0uviasMSZMSj4pbBr5bv5Y6bvryB3RUnJft0ui1p3vP1s9zxmVAdDhuRmQ0 +ntcQey/vEPyU/q3vQ3riJop5cYXu9IJpg7EGcRJTNDKq1OMtFbnEY5ZljmtD9e/neplPb6p/hacK +PIEzHP8aWzJjDxoXibt8CSfwCfn5mCiBrtfoJ3u7V8Ghish9/SVxKwoJ3dfso4gBSgfdHk/LsPI= \ |