From f809e9547c367783d00bae26ff210fba09b899e8 Mon Sep 17 00:00:00 2001
From: Sergio Correia <scorreia@redhat.com>
Date: Sun, 10 May 2020 11:10:44 -0300
Subject: [PATCH] Update to latest upstream version, v13

---
 .gitignore  |  1 +
 clevis.spec | 26 ++++++++++++++++----------
 sources     |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6ee42b0..6950695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /clevis-11.tar.xz
 /clevis-12.tar.xz
+/clevis-13.tar.xz
diff --git a/clevis.spec b/clevis.spec
index 99daff4..4728826 100644
--- a/clevis.spec
+++ b/clevis.spec
@@ -1,8 +1,6 @@
-%global _hardened_build 1
-
 Name:           clevis
-Version:        12
-Release:        4%{?dist}
+Version:        13
+Release:        1%{?dist}
 Summary:        Automated decryption framework
 
 License:        GPLv3+
@@ -31,6 +29,8 @@ BuildRequires:  curl
 BuildRequires:  cracklib-dicts
 BuildRequires:  luksmeta
 BuildRequires:  openssl
+BuildRequires:  diffutils
+BuildRequires:  jq
 
 Requires:       cracklib-dicts
 Requires:       tpm2-tools >= 3.0.0
@@ -51,13 +51,13 @@ and clevis-dracut packages for automatic root volume unlocking of LUKSv1
 volumes during early boot.
 
 %package luks
-Summary:        LUKSv1 integration for clevis
+Summary:        LUKS integration for clevis
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       cryptsetup
 Requires:       luksmeta >= 8
 
 %description luks
-LUKSv1 integration for clevis. This package allows you to bind a LUKSv1
+LUKS integration for clevis. This package allows you to bind a LUKS
 volume to a clevis unlocking policy. For automated unlocking, an unlocker
 will also be required. See, for example, clevis-dracut and clevis-udisks2.
 
@@ -80,7 +80,7 @@ Requires:       systemd%{?_isa} >= 236
 Requires:       nc
 
 %description systemd
-Automatically unlocks LUKSv1 _netdev block devices from /etc/crypttab.
+Automatically unlocks LUKS _netdev block devices from /etc/crypttab.
 
 %package dracut
 Summary:        Dracut integration for clevis
@@ -88,14 +88,14 @@ Requires:       %{name}-systemd%{?_isa} = %{version}-%{release}
 Requires:       dracut-network
 
 %description dracut
-Automatically unlocks LUKSv1 block devices in early boot.
+Automatically unlocks LUKS block devices in early boot.
 
 %package udisks2
 Summary:        UDisks2/Storaged integration for clevis
 Requires:       %{name}-luks%{?_isa} = %{version}-%{release}
 
 %description udisks2
-Automatically unlocks LUKSv1 block devices in desktop environments that
+Automatically unlocks LUKS block devices in desktop environments that
 use UDisks2 or storaged (like GNOME).
 
 %prep
@@ -142,9 +142,12 @@ exit 0
 %{_mandir}/man1/%{name}-luks-unlock.1*
 %{_mandir}/man1/%{name}-luks-unbind.1*
 %{_mandir}/man1/%{name}-luks-bind.1*
+%{_mandir}/man1/%{name}-luks-list.1.*
 %{_bindir}/%{name}-luks-unlock
 %{_bindir}/%{name}-luks-unbind
 %{_bindir}/%{name}-luks-bind
+%{_bindir}/%{name}-luks-common-functions
+%{_bindir}/%{name}-luks-list
 
 %files systemd
 %{_libexecdir}/%{name}-luks-askpass
@@ -162,7 +165,10 @@ exit 0
 %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2
 
 %changelog
-* Thu May 07 2020 Sergio Correia <scorreia@redhat.com> - 12.4
+* Sun May 10 2020 Sergio Correia <scorreia@redhat.com> - 13-1
+- Update to new clevis upstream release, v13.
+
+* Thu May 07 2020 Sergio Correia <scorreia@redhat.com> - 12-4
 - cracklib-dicts should be also listed as a build dependency, since
   it's required for running some of the tests
 
diff --git a/sources b/sources
index c6b863c..53ff7c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clevis-12.tar.xz) = c71144590cf2528d20892d3ef49b2b1ea948286410385b15f6a3eda01539846c7154b6396b78c0ed8a28f3056b4c3f88ff043978e5483b2ac360ee0f156f78e7
+SHA512 (clevis-13.tar.xz) = b9bdc0cb981a816b2c1e4fe77b4b0fec53a8c99546a00be63e9ab5bba376fcba24e5a5dbd8fc2f189d1ed2a74e8eb58ba3a42c19cc490a976694445233f4d7ed