From 95fea7192a4fee1ebe9196c041662238d001ec0902ef041f69e6cbeae74ac1e5 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Tue, 7 Mar 2023 11:04:01 +0000
Subject: [PATCH 1/2] - Update to version 1.2.2~git0.4ccc639 to get all the
 precious cargo   (bsc#1208555, CVE-2022-31394)

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-nitro-enclaves-cli?expand=0&rev=29
---
 _service                                         | 4 +---
 aws-nitro-enclaves-cli-1.2.0~git2.841ef94.tar.xz | 3 ---
 aws-nitro-enclaves-cli-1.2.2~git0.4ccc639.tar.xz | 3 +++
 aws-nitro-enclaves-cli.changes                   | 6 ++++++
 aws-nitro-enclaves-cli.spec                      | 2 +-
 vendor.tar.xz                                    | 4 ++--
 6 files changed, 13 insertions(+), 9 deletions(-)
 delete mode 100644 aws-nitro-enclaves-cli-1.2.0~git2.841ef94.tar.xz
 create mode 100644 aws-nitro-enclaves-cli-1.2.2~git0.4ccc639.tar.xz

diff --git a/_service b/_service
index 9dbbaf7..7834966 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">841ef94fb5b95b59669b4378499d2b195b6796d4</param>
+    <param name="revision">4ccc639acfd35a24a4c8ea7c4179e0d1068eef76</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://github.com/aws/aws-nitro-enclaves-cli.git</param>
@@ -62,10 +62,8 @@
   <service name="set_version" mode="disabled">
     <param name="basename">aws-nitro-enclaves-cli</param>
   </service>
-<!--
   <service name="cargo_vendor" mode="disabled">
      <param name="srcdir">aws-nitro-enclaves-cli</param>
      <param name="compression">xz</param>
   </service>
--->
 </services>
diff --git a/aws-nitro-enclaves-cli-1.2.0~git2.841ef94.tar.xz b/aws-nitro-enclaves-cli-1.2.0~git2.841ef94.tar.xz
deleted file mode 100644
index 8ff7c44..0000000
--- a/aws-nitro-enclaves-cli-1.2.0~git2.841ef94.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23e1d72337f400543da8b84deb0a5fbf4f76fd2bfc7bb94f9110e290976afe69
-size 25924712
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
new file mode 100644
index 0000000..7f14390
--- /dev/null
+++ b/aws-nitro-enclaves-cli-1.2.2~git0.4ccc639.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63150f0826426b16cc547ee1b63a53a32d2b6de7153e37cab260b7b7afe0831e
+size 23269384
diff --git a/aws-nitro-enclaves-cli.changes b/aws-nitro-enclaves-cli.changes
index 3454c46..cb3a51e 100644
--- a/aws-nitro-enclaves-cli.changes
+++ b/aws-nitro-enclaves-cli.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar  3 03:03:03 UTC 2023 - olaf@aepfle.de
+
+- Update to version 1.2.2~git0.4ccc639 to get all the precious cargo
+  (bsc#1208555, CVE-2022-31394)
+
 -------------------------------------------------------------------
 Thu Mar 17 12:34:45 UTC 2022 - olaf@aepfle.de
 
diff --git a/aws-nitro-enclaves-cli.spec b/aws-nitro-enclaves-cli.spec
index 80170a7..4313673 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.0~git2.841ef94
+Version:        1.2.2~git0.4ccc639
 Release:        0
 Summary:        Tools for managing enclaves
 License:        Apache-2.0
diff --git a/vendor.tar.xz b/vendor.tar.xz
index d5e437c..e3320bc 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4bb8fa409ff7b485fd6a72c51ea5ff19b56461e1269f4c2b59b2151480eba98
-size 9734072
+oid sha256:c4e9c35db12820a87a4eea07d612e170562299323c1043419003ddb47508ff3b
+size 18252780

From 53a400ae3a03b94d41c23813c346e286fd6422907fe0c6613bae429ff9555fd4 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Tue, 7 Mar 2023 11:05:04 +0000
Subject: [PATCH 2/2] rust 1.58+

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-nitro-enclaves-cli?expand=0&rev=30
---
 aws-nitro-enclaves-cli.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aws-nitro-enclaves-cli.spec b/aws-nitro-enclaves-cli.spec
index 4313673..dadb79c 100644
--- a/aws-nitro-enclaves-cli.spec
+++ b/aws-nitro-enclaves-cli.spec
@@ -35,11 +35,11 @@ Requires(pre):  system-group-%ne_system_group = %version-%release
 Requires(post): coreutils
 Requires:       aws-nitro-enclaves-binaryblobs
 Requires:       jq
-BuildRequires:  cargo > 1.44
+BuildRequires:  cargo > 1.58
 BuildRequires:  clang
 BuildRequires:  glibc-devel-static
 BuildRequires:  openssl-devel
-BuildRequires:  rust > 1.44
+BuildRequires:  rust > 1.58
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  sysuser-tools