From d3b1e46bc2fe66735da1fb81cd5d85b9bd1df69a Mon Sep 17 00:00:00 2001
From: Erdem MEYDANLI <meydanli@amazon.com>
Date: Mon, 3 Jun 2024 09:02:14 +0000
Subject: [PATCH 1/2] vsock-proxy: Bump version to 1.0.1

Signed-off-by: Erdem MEYDANLI <meydanli@amazon.com>
---
 Cargo.lock              | 2 +-
 vsock_proxy/Cargo.toml  | 2 +-
 vsock_proxy/src/main.rs | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ddd4776..f60a6f67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2149,7 +2149,7 @@ dependencies = [
 
 [[package]]
 name = "vsock-proxy"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "chrono",
  "clap",
diff --git a/vsock_proxy/Cargo.toml b/vsock_proxy/Cargo.toml
index 4b4018dd..c27c3e77 100644
--- a/vsock_proxy/Cargo.toml
+++ b/vsock_proxy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "vsock-proxy"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["The AWS Nitro Enclaves Team <aws-nitro-enclaves-devel@amazon.com>"]
 edition = "2018"
 rust-version = "1.68"
diff --git a/vsock_proxy/src/main.rs b/vsock_proxy/src/main.rs
index 142465ed..691c6bfc 100644
--- a/vsock_proxy/src/main.rs
+++ b/vsock_proxy/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2019-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 #![deny(warnings)]
 
@@ -6,7 +6,7 @@
 /// Example of usage:
 /// vsock-proxy 8000 127.0.0.1 9000
 ///
-use clap::{App, AppSettings, Arg};
+use clap::{App, Arg};
 use env_logger::init;
 use log::info;
 
@@ -20,7 +20,7 @@ fn main() -> VsockProxyResult<()> {
 
     let matches = App::new("Vsock-TCP proxy")
         .about("Vsock-TCP proxy")
-        .setting(AppSettings::DisableVersion)
+        .version(env!("CARGO_PKG_VERSION"))
         .arg(
             Arg::with_name("ipv4")
                 .short('4')

From c21d14ed04a7503d30cdfee2de5ea4a9f58fbdbf Mon Sep 17 00:00:00 2001
From: Erdem MEYDANLI <meydanli@amazon.com>
Date: Mon, 3 Jun 2024 09:25:36 +0000
Subject: [PATCH 2/2] Prepare for Release v1.3.1

This commit updates the following files to prepare for the v1.3.1
release.

 - Cargo.lock
 - Cargo.toml
 - SPECS/aws-nitro-enclaves-cli.spec
 - THIRD_PARTY_LICENSES_RUST_CRATES.html
 - sources

Signed-off-by: Erdem MEYDANLI <meydanli@amazon.com>
---
 Cargo.lock                            | 2 +-
 Cargo.toml                            | 2 +-
 SPECS/aws-nitro-enclaves-cli.spec     | 8 +++++++-
 THIRD_PARTY_LICENSES_RUST_CRATES.html | 2 +-
 sources                               | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f60a6f67..7b57e9aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1175,7 +1175,7 @@ dependencies = [
 
 [[package]]
 name = "nitro-cli"
-version = "1.3.0"
+version = "1.3.1"
 dependencies = [
  "aws-nitro-enclaves-image-format",
  "bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index 49e3b456..9791a416 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nitro-cli"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["The AWS Nitro Enclaves Team <aws-nitro-enclaves-devel@amazon.com>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/SPECS/aws-nitro-enclaves-cli.spec b/SPECS/aws-nitro-enclaves-cli.spec
index 69735143..30f11c22 100644
--- a/SPECS/aws-nitro-enclaves-cli.spec
+++ b/SPECS/aws-nitro-enclaves-cli.spec
@@ -20,7 +20,7 @@
 
 Summary:    AWS Nitro Enclaves tools for managing enclaves
 Name:       aws-nitro-enclaves-cli
-Version:    1.3.0
+Version:    1.3.1
 Release:    0%{?dist}
 
 License:    Apache 2.0
@@ -195,6 +195,12 @@ fi
 %{ne_include_dir}/*
 
 %changelog
+* Mon Jun 3 2024 Erdem Meydanli <meydanli@amazon.com> - 1.3.1-0
+- vsock-proxy: Bump version to 1.0.1
+- vsock_proxy: Use system-configured nameservers for DNS resolution
+- Update init blob to support user namespaces
+- clippy: resolve build errors for Rust 1.78
+
 * Tue Apr 16 2024 Erdem Meydanli <meydanli@amazon.com> - 1.3.0-0
 + This release focuses on resolving two critical issues:
 the vsock-proxy DNS lookup limitation (#553) and the compatibility
diff --git a/THIRD_PARTY_LICENSES_RUST_CRATES.html b/THIRD_PARTY_LICENSES_RUST_CRATES.html
index 54b3d39f..faa14ad2 100644
--- a/THIRD_PARTY_LICENSES_RUST_CRATES.html
+++ b/THIRD_PARTY_LICENSES_RUST_CRATES.html
@@ -639,7 +639,7 @@ <h4>Used by:</h4>
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://crates.io/crates/nitro-cli ">nitro-cli 1.3.0</a></li>
+                    <li><a href=" https://crates.io/crates/nitro-cli ">nitro-cli 1.3.1</a></li>
                 </ul>
                 <pre class="license-text">
                                  Apache License
diff --git a/sources b/sources
index 9bbff69f..0b8d358a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53eac21b7bfd5c336846d04c2288c2a62cddd992  nitro-cli-dependencies.tar.gz
+27e70be63e4c1f05eb80dbea6985753f2da61083  nitro-cli-dependencies.tar.gz