From 3792330887eb59759c22b06fdccd3b76ab7f19d6 Mon Sep 17 00:00:00 2001
From: Luca BRUNO <lucab@lucabruno.net>
Date: Fri, 21 May 2021 10:58:36 +0000
Subject: [PATCH] New upstream version 0.0.21

This updates to latest release (0.0.21),
see https://github.com/coreos/zincati/releases/tag/v0.0.21.
---
 .gitignore                                   |  2 ++
 fedora-zincati-cargo-manifest-overrides.diff | 10 +++---
 rust-zincati.spec                            | 38 +++++++++++---------
 sources                                      |  4 +--
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 103fbc9..7e5116c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
 /zincati-0.0.19-vendor.tar.gz
 /zincati-0.0.20.crate
 /zincati-0.0.20-vendor.tar.gz
+/zincati-0.0.21.crate
+/zincati-0.0.21-vendor.tar.gz
diff --git a/fedora-zincati-cargo-manifest-overrides.diff b/fedora-zincati-cargo-manifest-overrides.diff
index 76e25a6..8add9a4 100644
--- a/fedora-zincati-cargo-manifest-overrides.diff
+++ b/fedora-zincati-cargo-manifest-overrides.diff
@@ -1,6 +1,8 @@
---- zincati-0.0.20/Cargo.toml
-+++ zincati-0.0.20/Cargo.toml
-@@ -92,7 +92,7 @@ version = "2.1"
+diff --git zincati-0.0.21/Cargo.toml zincati-0.0.21/Cargo.toml
+index f2bb13b..0f9baa4 100644
+--- zincati-0.0.21/Cargo.toml
++++ zincati-0.0.21/Cargo.toml
+@@ -93,7 +93,7 @@ version = "2.2"
  features = ["serde"]
  
  [dependencies.prometheus]
@@ -9,7 +11,7 @@
  default-features = false
  
  [dependencies.rand]
-@@ -147,10 +147,10 @@ version = "2.6.0"
+@@ -148,10 +148,10 @@ version = "2.6.0"
  version = "0.2"
  
  [dev-dependencies.mockito]
diff --git a/rust-zincati.spec b/rust-zincati.spec
index 6ff5732..96e3088 100644
--- a/rust-zincati.spec
+++ b/rust-zincati.spec
@@ -10,7 +10,7 @@
 %global crate zincati
 
 Name:           rust-%{crate}
-Version:        0.0.20
+Version:        0.0.21
 Release:        1%{?dist}
 Summary:        Update agent for Fedora CoreOS
 
@@ -20,6 +20,8 @@ URL:            https://crates.io/crates/%{crate}
 Source0:        %{crates_source}
 Source1:        https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz
 %if ! 0%{?with_bundled}
+# Fedora-specific crates overrides, generated with:
+# git diff --no-prefix zincati-*/Cargo.toml
 Patch0:         fedora-zincati-cargo-manifest-overrides.diff
 %endif
 
@@ -32,7 +34,7 @@ BuildRequires:  pkgconfig(openssl)
 Requires:       polkit
 
 # List of bundled crate in vendor tarball, generated with:
-# cargo metadata --locked --format-version 1 | CRATE_NAME="zincati" bundled-provides.jq
+# cargo metadata --locked --format-version 1 | CRATE_NAME="zincati" ../bundled-provides.jq
 %if 0%{?with_bundled}
 Provides: bundled(crate(actix)) = 0.11.1
 Provides: bundled(crate(actix-rt)) = 2.2.0
@@ -85,16 +87,16 @@ Provides: bundled(crate(fnv)) = 1.0.7
 Provides: bundled(crate(foreign-types)) = 0.3.2
 Provides: bundled(crate(foreign-types-shared)) = 0.1.1
 Provides: bundled(crate(form_urlencoded)) = 1.0.0
-Provides: bundled(crate(futures)) = 0.3.14
-Provides: bundled(crate(futures-channel)) = 0.3.14
-Provides: bundled(crate(futures-core)) = 0.3.14
-Provides: bundled(crate(futures-executor)) = 0.3.14
-Provides: bundled(crate(futures-io)) = 0.3.14
+Provides: bundled(crate(futures)) = 0.3.15
+Provides: bundled(crate(futures-channel)) = 0.3.15
+Provides: bundled(crate(futures-core)) = 0.3.15
+Provides: bundled(crate(futures-executor)) = 0.3.15
+Provides: bundled(crate(futures-io)) = 0.3.15
 Provides: bundled(crate(futures-lite)) = 1.11.3
-Provides: bundled(crate(futures-macro)) = 0.3.14
-Provides: bundled(crate(futures-sink)) = 0.3.14
-Provides: bundled(crate(futures-task)) = 0.3.14
-Provides: bundled(crate(futures-util)) = 0.3.14
+Provides: bundled(crate(futures-macro)) = 0.3.15
+Provides: bundled(crate(futures-sink)) = 0.3.15
+Provides: bundled(crate(futures-task)) = 0.3.15
+Provides: bundled(crate(futures-util)) = 0.3.15
 Provides: bundled(crate(generic-array)) = 0.12.3
 Provides: bundled(crate(getrandom)) = 0.1.16
 Provides: bundled(crate(getrandom)) = 0.2.1
@@ -143,7 +145,7 @@ Provides: bundled(crate(opaque-debug)) = 0.2.3
 Provides: bundled(crate(openssl)) = 0.10.32
 Provides: bundled(crate(openssl-probe)) = 0.1.2
 Provides: bundled(crate(openssl-sys)) = 0.9.60
-Provides: bundled(crate(ordered-float)) = 2.1.1
+Provides: bundled(crate(ordered-float)) = 2.2.0
 Provides: bundled(crate(parking)) = 2.0.0
 Provides: bundled(crate(parking_lot)) = 0.11.1
 Provides: bundled(crate(parking_lot_core)) = 0.8.2
@@ -188,8 +190,8 @@ Provides: bundled(crate(scoped-tls)) = 1.0.0
 Provides: bundled(crate(scopeguard)) = 1.1.0
 Provides: bundled(crate(security-framework)) = 2.0.0
 Provides: bundled(crate(security-framework-sys)) = 2.0.0
-Provides: bundled(crate(serde)) = 1.0.125
-Provides: bundled(crate(serde_derive)) = 1.0.125
+Provides: bundled(crate(serde)) = 1.0.126
+Provides: bundled(crate(serde_derive)) = 1.0.126
 Provides: bundled(crate(serde_json)) = 1.0.64
 Provides: bundled(crate(serde_repr)) = 0.1.6
 Provides: bundled(crate(serde_urlencoded)) = 0.7.0
@@ -212,7 +214,7 @@ Provides: bundled(crate(thiserror-impl)) = 1.0.24
 Provides: bundled(crate(time)) = 0.1.43
 Provides: bundled(crate(tinyvec)) = 1.1.0
 Provides: bundled(crate(tinyvec_macros)) = 0.1.0
-Provides: bundled(crate(tokio)) = 1.5.0
+Provides: bundled(crate(tokio)) = 1.6.0
 Provides: bundled(crate(tokio-native-tls)) = 0.3.0
 Provides: bundled(crate(tokio-util)) = 0.6.6
 Provides: bundled(crate(toml)) = 0.5.8
@@ -227,7 +229,7 @@ Provides: bundled(crate(unicode-normalization)) = 0.1.16
 Provides: bundled(crate(unicode-segmentation)) = 1.7.1
 Provides: bundled(crate(unicode-width)) = 0.1.8
 Provides: bundled(crate(unicode-xid)) = 0.2.1
-Provides: bundled(crate(url)) = 2.2.1
+Provides: bundled(crate(url)) = 2.2.2
 Provides: bundled(crate(users)) = 0.11.0
 Provides: bundled(crate(uuid)) = 0.8.2
 Provides: bundled(crate(vcpkg)) = 0.2.11
@@ -379,6 +381,10 @@ ln -snf /run/%{crate}/public/metrics.promsock %{buildroot}/run/%{crate}/private/
 %endif
 
 %changelog
+* Fri May 21 2021 Luca BRUNO <lucab@lucabruno.net> - 0.0.21-1
+- New upstream version
+  https://github.com/coreos/zincati/releases/tag/v0.0.21
+
 * Tue May 04 2021 Luca BRUNO <lucab@lucabruno.net> - 0.0.20-1
 - New upstream version
   https://github.com/coreos/zincati/releases/tag/v0.0.20
diff --git a/sources b/sources
index ca80b67..1ca18dd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (zincati-0.0.20.crate) = 650e25e4ed7787a06b5864a573f8385b681bd29b767f1279b0677c27fc32d176f8bbf6d95ea345b553140b99028d12895c26e0d70373c5e5e7f4dc84f2165daf
-SHA512 (zincati-0.0.20-vendor.tar.gz) = d59315d2b0a713b7fe40b6aac5822b3ed8fed315ca16d3ef46c334e8d772752857da5469c688efe84e02762dd03e894d2d9d837aee6f6ae7900fa0ac8ca277a1
+SHA512 (zincati-0.0.21.crate) = 36b6e706fafccf4a449ad967e13da07cb12df359af81b9daad872847d60afd026448f782db8464ffd199dcd89074982b8105c9e3d131940bbb7cfbf04bac6646
+SHA512 (zincati-0.0.21-vendor.tar.gz) = d67b7aaf02f0eddc3627aa0079ac4f215343fa457cebbacfd7d8f0810e26057fe5b181debe6e65bb3d7ffc44b5c14f635f0681d9a1d8b39f0ab571c883c20185