From c85defa70be51fdae959162e6e66252982e24aa0b2bf061ea44749b0a494ac0a Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Tue, 23 Jan 2024 10:40:27 +0000
Subject: [PATCH 1/5] - Update to version 1.2.2~git79.59d55a8 to get all the
 precious cargo   (bsc#1218501, CVE-2023-50711)

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-nitro-enclaves-cli?expand=0&rev=32
---
 _service                                                    | 4 ++--
 aws-nitro-enclaves-cli-1.2.2~git0.4ccc639.tar.xz            | 3 ---
 aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz           | 3 +++
 aws-nitro-enclaves-cli.changes                              | 6 ++++++
 aws-nitro-enclaves-cli.spec                                 | 4 ++--
 ...ootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz | 3 ---
 ...ootstrap-ac43d103ba0f98044bf760477c088f1dc6f3702d.tar.xz | 3 +++
 vendor.tar.xz                                               | 4 ++--
 8 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 aws-nitro-enclaves-cli-1.2.2~git0.4ccc639.tar.xz
 create mode 100644 aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz
 delete mode 100644 aws-nitro-enclaves-sdk-bootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz
 create mode 100644 aws-nitro-enclaves-sdk-bootstrap-ac43d103ba0f98044bf760477c088f1dc6f3702d.tar.xz

diff --git a/_service b/_service
index 7834966..4ff184f 100644
--- a/_service
+++ b/_service
@@ -37,7 +37,7 @@
     <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">59d55a82527fa8a3ae308ec3a31619146643a348</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://github.com/aws/aws-nitro-enclaves-cli.git</param>
@@ -49,7 +49,7 @@
     <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>
diff --git a/aws-nitro-enclaves-cli-1.2.2~git0.4ccc639.tar.xz b/aws-nitro-enclaves-cli-1.2.2~git0.4ccc639.tar.xz
deleted file mode 100644
index 7f14390..0000000
--- a/aws-nitro-enclaves-cli-1.2.2~git0.4ccc639.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63150f0826426b16cc547ee1b63a53a32d2b6de7153e37cab260b7b7afe0831e
-size 23269384
diff --git a/aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz b/aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz
new file mode 100644
index 0000000..2e389b1
--- /dev/null
+++ b/aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4be20e77425d2145db741324d99c38a8247c162d6c0f08a1de7a513d5d39af0
+size 23279488
diff --git a/aws-nitro-enclaves-cli.changes b/aws-nitro-enclaves-cli.changes
index cb3a51e..678598f 100644
--- a/aws-nitro-enclaves-cli.changes
+++ b/aws-nitro-enclaves-cli.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 23 23:23:23 UTC 2024 - olaf@aepfle.de
+
+- Update to version 1.2.2~git79.59d55a8 to get all the precious cargo
+  (bsc#1218501, CVE-2023-50711)
+
 -------------------------------------------------------------------
 Fri Mar  3 03:03:03 UTC 2023 - olaf@aepfle.de
 
diff --git a/aws-nitro-enclaves-cli.spec b/aws-nitro-enclaves-cli.spec
index dadb79c..a8e909f 100644
--- a/aws-nitro-enclaves-cli.spec
+++ b/aws-nitro-enclaves-cli.spec
@@ -19,7 +19,7 @@
 
 
 Name:           aws-nitro-enclaves-cli
-Version:        1.2.2~git0.4ccc639
+Version:        1.2.2~git79.59d55a8
 Release:        0
 Summary:        Tools for managing enclaves
 License:        Apache-2.0
@@ -30,7 +30,7 @@ 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
diff --git a/aws-nitro-enclaves-sdk-bootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz b/aws-nitro-enclaves-sdk-bootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz
deleted file mode 100644
index 1d65036..0000000
--- a/aws-nitro-enclaves-sdk-bootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e975541261a383dfc8a4d3d517a25c26a0d266723738faf39625c2b81da13824
-size 4268
diff --git a/aws-nitro-enclaves-sdk-bootstrap-ac43d103ba0f98044bf760477c088f1dc6f3702d.tar.xz b/aws-nitro-enclaves-sdk-bootstrap-ac43d103ba0f98044bf760477c088f1dc6f3702d.tar.xz
new file mode 100644
index 0000000..bc1ebae
--- /dev/null
+++ b/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
diff --git a/vendor.tar.xz b/vendor.tar.xz
index e3320bc..a90fbc9 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4e9c35db12820a87a4eea07d612e170562299323c1043419003ddb47508ff3b
-size 18252780
+oid sha256:931254612e3ecef10581e6f30e414e4c3f854ba09cfbd1426250d0501bae38ae
+size 21078220

From a4db1cc182fb37ec7df2bbf023fc9f7494730c7e461741a87a791e07407e4170 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Tue, 23 Jan 2024 10:46:47 +0000
Subject: [PATCH 2/5] fix samples

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-nitro-enclaves-cli?expand=0&rev=33
---
 _service                                          | 1 -
 aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz | 4 ++--
 vendor.tar.xz                                     | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/_service b/_service
index 4ff184f..58a356a 100644
--- a/_service
+++ b/_service
@@ -29,7 +29,6 @@
     <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">sources</param>
     <param name="exclude">tests</param>
     <param name="exclude">third_party/linuxkit/README.md</param>
diff --git a/aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz b/aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz
index 2e389b1..5c8ef7d 100644
--- a/aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz
+++ b/aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4be20e77425d2145db741324d99c38a8247c162d6c0f08a1de7a513d5d39af0
-size 23279488
+oid sha256:13eb6461439003e416cbf9d4cdc875c1fbf9c4c5bccbd75651760b2d86def545
+size 23286116
diff --git a/vendor.tar.xz b/vendor.tar.xz
index a90fbc9..d43b184 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:931254612e3ecef10581e6f30e414e4c3f854ba09cfbd1426250d0501bae38ae
-size 21078220
+oid sha256:ba42b814700b631147685dcfdf44aa1394e792119e59e85ed7038a974777937c
+size 21086660

From 80497446ccc47bbed5e24ee5670cdc45036bd6f99da5ae431a3ff39c094f352f Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Fri, 5 Apr 2024 10:06:21 +0000
Subject: [PATCH 3/5] - Update to version 1.2.3~git11.d3d77e0 to get all the
 precious cargo

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-nitro-enclaves-cli?expand=0&rev=34
---
 _service                                          | 14 ++++++++------
 aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz |  3 ---
 aws-nitro-enclaves-cli-1.2.3~git11.d3d77e0.tar.xz |  3 +++
 aws-nitro-enclaves-cli.changes                    |  4 ++--
 aws-nitro-enclaves-cli.spec                       |  2 +-
 vendor.tar.xz                                     |  4 ++--
 6 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz
 create mode 100644 aws-nitro-enclaves-cli-1.2.3~git11.d3d77e0.tar.xz

diff --git a/_service b/_service
index 58a356a..40bba79 100644
--- a/_service
+++ b/_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,6 +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">scripts</param>
     <param name="exclude">sources</param>
     <param name="exclude">tests</param>
     <param name="exclude">third_party/linuxkit/README.md</param>
@@ -36,15 +37,16 @@
     <param name="exclude">vendor</param>
     <param name="filename">aws-nitro-enclaves-cli</param>
     <param name="match-tag">*</param>
-    <param name="revision">59d55a82527fa8a3ae308ec3a31619146643a348</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>
@@ -54,14 +56,14 @@
     <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>
diff --git a/aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz b/aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz
deleted file mode 100644
index 5c8ef7d..0000000
--- a/aws-nitro-enclaves-cli-1.2.2~git79.59d55a8.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13eb6461439003e416cbf9d4cdc875c1fbf9c4c5bccbd75651760b2d86def545
-size 23286116
diff --git a/aws-nitro-enclaves-cli-1.2.3~git11.d3d77e0.tar.xz b/aws-nitro-enclaves-cli-1.2.3~git11.d3d77e0.tar.xz
new file mode 100644
index 0000000..ff79fa7
--- /dev/null
+++ b/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
diff --git a/aws-nitro-enclaves-cli.changes b/aws-nitro-enclaves-cli.changes
index 678598f..d2c8e0a 100644
--- a/aws-nitro-enclaves-cli.changes
+++ b/aws-nitro-enclaves-cli.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
-Tue Jan 23 23:23:23 UTC 2024 - olaf@aepfle.de
+Thu Apr  4 04:04:04 UTC 2024 - olaf@aepfle.de
 
-- Update to version 1.2.2~git79.59d55a8 to get all the precious cargo
+- Update to version 1.2.3~git11.d3d77e0 to get all the precious cargo
   (bsc#1218501, CVE-2023-50711)
 
 -------------------------------------------------------------------
diff --git a/aws-nitro-enclaves-cli.spec b/aws-nitro-enclaves-cli.spec
index a8e909f..ca35fa5 100644
--- a/aws-nitro-enclaves-cli.spec
+++ b/aws-nitro-enclaves-cli.spec
@@ -19,7 +19,7 @@
 
 
 Name:           aws-nitro-enclaves-cli
-Version:        1.2.2~git79.59d55a8
+Version:        1.2.3~git11.d3d77e0
 Release:        0
 Summary:        Tools for managing enclaves
 License:        Apache-2.0
diff --git a/vendor.tar.xz b/vendor.tar.xz
index d43b184..1d388f3 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba42b814700b631147685dcfdf44aa1394e792119e59e85ed7038a974777937c
-size 21086660
+oid sha256:1abe61dc8883d442bf3f966ecc5849dca424d9e8a4170938af72e125bd8452a0
+size 21813840

From 06230d4c64e8a831d7bd4cc7e1277a8793287716d6e33145d754f681b7b70623 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Fri, 5 Apr 2024 10:19:31 +0000
Subject: [PATCH 4/5] M    aws-nitro-enclaves-cli.patch

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-nitro-enclaves-cli?expand=0&rev=35
---
 aws-nitro-enclaves-cli.patch | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/aws-nitro-enclaves-cli.patch b/aws-nitro-enclaves-cli.patch
index 6d1b863..b42a2a2 100644
--- a/aws-nitro-enclaves-cli.patch
+++ b/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 \
--                --config /etc/nitro_enclaves/vsock-proxy.yaml"
-+                --config $VSOCK_PROXY_CONFIG"
+-			RUST_LOG=warn exec /usr/bin/vsock-proxy 8000 kms.$${REGION}.amazonaws.com 443 --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"
  Restart=always
  TimeoutSec=0
  

From ae585294263ed85535b9707f40fcebb1051be0ec1077eb3ea9fc5e994a3707c5 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Fri, 5 Apr 2024 10:22:35 +0000
Subject: [PATCH 5/5] D    cargo_config

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-nitro-enclaves-cli?expand=0&rev=36
---
 aws-nitro-enclaves-cli.spec | 3 ---
 cargo_config                | 5 -----
 2 files changed, 8 deletions(-)
 delete mode 100644 cargo_config

diff --git a/aws-nitro-enclaves-cli.spec b/aws-nitro-enclaves-cli.spec
index ca35fa5..c0dc5ae 100644
--- a/aws-nitro-enclaves-cli.spec
+++ b/aws-nitro-enclaves-cli.spec
@@ -28,7 +28,6 @@ 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-ac43d103ba0f98044bf760477c088f1dc6f3702d.tar.xz
 Requires(pre):  system-group-%ne_system_group = %version-%release
@@ -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=
diff --git a/cargo_config b/cargo_config
deleted file mode 100644
index 6fb4ff4..0000000
--- a/cargo_config
+++ /dev/null
@@ -1,5 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
\ No newline at end of file