Accepting request 1167039 from Cloud:Tools

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1167039
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aws-nitro-enclaves-cli?expand=0&rev=6

_service

@@ -1,5 +1,5 @@
 <services>
-  <service name="tar_scm" mode="disabled">
+  <service name="tar_scm" mode="manual">
     <param name="exclude">.github</param>
     <param name="exclude">CODE_OF_CONDUCT.md</param>
     <param name="exclude">CONTRIBUTING.md</param>
@@ -29,7 +29,7 @@
     <param name="exclude">install.sh</param>
     <param name="exclude">run-nitro-cli-integration-tests</param>
     <param name="exclude">run_tests.sh</param>
-    <param name="exclude">samples</param>
+    <param name="exclude">scripts</param>
     <param name="exclude">sources</param>
     <param name="exclude">tests</param>
     <param name="exclude">third_party/linuxkit/README.md</param>
@@ -37,32 +37,33 @@
     <param name="exclude">vendor</param>
     <param name="filename">aws-nitro-enclaves-cli</param>
     <param name="match-tag">*</param>
-    <param name="revision">4ccc639acfd35a24a4c8ea7c4179e0d1068eef76</param>
+    <param name="revision">d3d77e02e0239364f4ccc757357e4d96012640af</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://github.com/aws/aws-nitro-enclaves-cli.git</param>
     <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
+    <param name="match-tag">v[0-9]*.[0-9]*.[0-9]*</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
-  <service name="tar_scm" mode="disabled">
+  <service name="tar_scm" mode="manual">
     <param name="exclude">Makefile</param>
     <param name="filename">aws-nitro-enclaves-sdk-bootstrap</param>
     <param name="subdir">init</param>
-    <param name="revision">746ec5d2713e539b94e651601b5c24ec1247c955</param>
+    <param name="revision">ac43d103ba0f98044bf760477c088f1dc6f3702d</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://github.com/aws/aws-nitro-enclaves-sdk-bootstrap.git</param>
     <param name="versionformat">%H</param>
   </service>
-  <service name="recompress" mode="disabled">
+  <service name="recompress" mode="manual">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
-  <service name="set_version" mode="disabled">
+  <service name="set_version" mode="manual">
     <param name="basename">aws-nitro-enclaves-cli</param>
   </service>
-  <service name="cargo_vendor" mode="disabled">
+  <service name="cargo_vendor" mode="manual">
      <param name="srcdir">aws-nitro-enclaves-cli</param>
      <param name="compression">xz</param>
   </service>

aws-nitro-enclaves-cli-1.2.2~git0.4ccc639.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63150f0826426b16cc547ee1b63a53a32d2b6de7153e37cab260b7b7afe0831e
-size 23269384

aws-nitro-enclaves-cli-1.2.3~git11.d3d77e0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aca78035ccf666045090c6c663f1585286578104cd44e7e1be3095da8b6e0b39
+size 23269552

aws-nitro-enclaves-cli.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr  4 04:04:04 UTC 2024 - olaf@aepfle.de
+
+- Update to version 1.2.3~git11.d3d77e0 to get all the precious cargo
+  (bsc#1218501, CVE-2023-50711)
+
 -------------------------------------------------------------------
 Fri Mar  3 03:03:03 UTC 2023 - olaf@aepfle.de
 

aws-nitro-enclaves-cli.patch

@@ -1,3 +1,7 @@
+---
+ vsock_proxy/service/nitro-enclaves-vsock-proxy.service |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 --- a/vsock_proxy/service/nitro-enclaves-vsock-proxy.service
 +++ b/vsock_proxy/service/nitro-enclaves-vsock-proxy.service
 @@ -8,11 +8,12 @@ Type=simple
@@ -5,12 +9,12 @@
  StandardError=journal
  SyslogIdentifier=vsock-proxy
 +Environment=VSOCK_PROXY_CONFIG=/usr/share/nitro_enclaves/vsock-proxy.yaml
+ # Use RUST_LOG=trace for more verbose logging
  ExecStart=/bin/bash -ce "TOKEN=$(curl --silent -X PUT \"http://169.254.169.254/latest/api/token\" -H \"X-aws-ec2-metadata-token-ttl-seconds: 21600\") ; \
  			REGION=$(curl --silent -H \"X-aws-ec2-metadata-token: $TOKEN\" http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .region) ; \
  			[ -z \"$REGION\" ] && REGION=$(curl --silent http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .region) ; \
- 			exec /usr/bin/vsock-proxy 8000 kms.$${REGION}.amazonaws.com 443 \
+-			RUST_LOG=warn exec /usr/bin/vsock-proxy 8000 kms.$${REGION}.amazonaws.com 443 --config /etc/nitro_enclaves/vsock-proxy.yaml"
--                --config /etc/nitro_enclaves/vsock-proxy.yaml"
++			RUST_LOG=warn exec /usr/bin/vsock-proxy 8000 kms.$${REGION}.amazonaws.com 443 --config $VSOCK_PROXY_CONFIG"
-+                --config $VSOCK_PROXY_CONFIG"
  Restart=always
  TimeoutSec=0
  

aws-nitro-enclaves-cli.spec

@@ -19,7 +19,7 @@
 
 
 Name:           aws-nitro-enclaves-cli
-Version:        1.2.2~git0.4ccc639
+Version:        1.2.3~git11.d3d77e0
 Release:        0
 Summary:        Tools for managing enclaves
 License:        Apache-2.0
@@ -28,9 +28,8 @@ ExclusiveArch:  aarch64 x86_64
 Patch0:         %name.patch
 Source0:        %name-%version.tar.xz
 Source1:        vendor.tar.xz
-Source2:        cargo_config
 Source3:        aws-nitro-enclaves-cli-rpmlintrc
-Source9:        aws-nitro-enclaves-sdk-bootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz
+Source9:        aws-nitro-enclaves-sdk-bootstrap-ac43d103ba0f98044bf760477c088f1dc6f3702d.tar.xz
 Requires(pre):  system-group-%ne_system_group = %version-%release
 Requires(post): coreutils
 Requires:       aws-nitro-enclaves-binaryblobs
@@ -113,8 +112,6 @@ _EOF_
   nitro-cli run-enclave --eif-path hello.eif --cpu-count 2 --memory 512 --debug-mode --attach-console
 _EOR_
 %install
-mkdir .cargo
-cp %{SOURCE2} .cargo/config
 %if 0%{?__debug_package}
 rustflags='-Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2'
 release=

aws-nitro-enclaves-sdk-bootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e975541261a383dfc8a4d3d517a25c26a0d266723738faf39625c2b81da13824
-size 4268

aws-nitro-enclaves-sdk-bootstrap-ac43d103ba0f98044bf760477c088f1dc6f3702d.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c22a27c304953a5811e3fbc3dd98400d368a5f8951f291ee3e19b401d5aa5699
+size 4268

cargo_config

@@ -1,5 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"

vendor.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4e9c35db12820a87a4eea07d612e170562299323c1043419003ddb47508ff3b
+oid sha256:1abe61dc8883d442bf3f966ecc5849dca424d9e8a4170938af72e125bd8452a0
-size 18252780
+size 21813840