From 4c52f19a9a339738ee191c323128b8878614524d750f6b504c9de64242c7bfca Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Mon, 24 Jan 2022 12:34:20 +0000
Subject: [PATCH] baserev update by copy to link target

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-nitro-enclaves-cli?expand=0&rev=23
---
 _service                                         | 16 ++++++++++++++--
 ...nitro-enclaves-cli-1.1.0~git16.860cfe4.tar.xz |  3 ---
 ...nitro-enclaves-cli-1.1.0~git32.8f6ed74.tar.xz |  3 +++
 aws-nitro-enclaves-cli.changes                   |  7 +++++++
 aws-nitro-enclaves-cli.spec                      |  4 +++-
 ...6ec5d2713e539b94e651601b5c24ec1247c955.tar.xz |  3 +++
 vendor.tar.xz                                    |  4 ++--
 7 files changed, 32 insertions(+), 8 deletions(-)
 delete mode 100644 aws-nitro-enclaves-cli-1.1.0~git16.860cfe4.tar.xz
 create mode 100644 aws-nitro-enclaves-cli-1.1.0~git32.8f6ed74.tar.xz
 create mode 100644 aws-nitro-enclaves-sdk-bootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz

diff --git a/_service b/_service
index f782607..74af6c3 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">860cfe4491f6afbf5ade10a6f4016ace6a97146c</param>
+    <param name="revision">8f6ed740b05225512d86163f8b02292668c4b056</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://github.com/aws/aws-nitro-enclaves-cli.git</param>
@@ -45,11 +45,23 @@
     <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
+  <service name="tar_scm" mode="disabled">
+    <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="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">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
-  <service name="set_version" mode="disabled"/>
+  <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>
diff --git a/aws-nitro-enclaves-cli-1.1.0~git16.860cfe4.tar.xz b/aws-nitro-enclaves-cli-1.1.0~git16.860cfe4.tar.xz
deleted file mode 100644
index ef5080c..0000000
--- a/aws-nitro-enclaves-cli-1.1.0~git16.860cfe4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89e67014a3837ffa1e5363d309b421d800d5401c1010120c060101078cbbfcf3
-size 25875752
diff --git a/aws-nitro-enclaves-cli-1.1.0~git32.8f6ed74.tar.xz b/aws-nitro-enclaves-cli-1.1.0~git32.8f6ed74.tar.xz
new file mode 100644
index 0000000..1eafa72
--- /dev/null
+++ b/aws-nitro-enclaves-cli-1.1.0~git32.8f6ed74.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1adf86d868bd346f6dc6288e30af529c443ce54dddda03c4c4ccaf12ad7a0a0
+size 25856300
diff --git a/aws-nitro-enclaves-cli.changes b/aws-nitro-enclaves-cli.changes
index e32123d..e7faf25 100644
--- a/aws-nitro-enclaves-cli.changes
+++ b/aws-nitro-enclaves-cli.changes
@@ -1,7 +1,14 @@
+-------------------------------------------------------------------
+Mon Jan 24 12:34:45 UTC 2022 - olaf@aepfle.de
+
+- Update to version 1.1.0~git32.8f6ed74 to get all the precious cargo
+- init.c is maintained in aws-nitro-enclaves-sdk-bootstrap.git
+
 -------------------------------------------------------------------
 Tue Dec 14 14:14:14 UTC 2021 - olaf@aepfle.de
 
 - Update to version 1.1.0~git16.860cfe4 to get all the precious cargo
+  (bsc#1195053)
 
 -------------------------------------------------------------------
 Mon Nov 22 11:22:33 UTC 2021 - olaf@aepfle.de
diff --git a/aws-nitro-enclaves-cli.spec b/aws-nitro-enclaves-cli.spec
index 8951eb8..cd458a1 100644
--- a/aws-nitro-enclaves-cli.spec
+++ b/aws-nitro-enclaves-cli.spec
@@ -19,7 +19,7 @@
 
 
 Name:           aws-nitro-enclaves-cli
-Version:        1.1.0~git16.860cfe4
+Version:        1.1.0~git32.8f6ed74
 Release:        0
 Summary:        Tools for managing enclaves
 License:        Apache-2.0
@@ -30,6 +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
 Requires(pre):  system-group-%ne_system_group = %version-%release
 Requires(post): coreutils
 Requires:       aws-nitro-enclaves-binaryblobs
@@ -66,6 +67,7 @@ System group %ne_system_group for Nitro Enclaves.
 %autosetup -p1 -a1
 
 %build
+tar --extract --verbose --strip-components=1 '--file=%SOURCE9'
 ln vsock_proxy/README.md README.vsock_proxy.md
 ln third_party/linuxkit/LICENSE LICENSE.linuxkit
 ln drivers/COPYING COPYING.binary-kernel
diff --git a/aws-nitro-enclaves-sdk-bootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz b/aws-nitro-enclaves-sdk-bootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz
new file mode 100644
index 0000000..1d65036
--- /dev/null
+++ b/aws-nitro-enclaves-sdk-bootstrap-746ec5d2713e539b94e651601b5c24ec1247c955.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e975541261a383dfc8a4d3d517a25c26a0d266723738faf39625c2b81da13824
+size 4268
diff --git a/vendor.tar.xz b/vendor.tar.xz
index b8787aa..ce72d47 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54536acf5847cf18f650ed40eaecc0875c4d8ae807c4b9c1ecc5ff2b344387e8
-size 9872240
+oid sha256:f5e6c7a6a001f91bd1c9b3f0a44255f5cfb839faa382672c63a3742a7461d54f
+size 9733144