From 5988592af317915885cba8d53e882303219caf5b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 27 2022 04:53:34 +0000
Subject: import clevis-15-7.el8


---

diff --git a/SOURCES/0008-tang-dump-url-on-error-communication.patch b/SOURCES/0008-tang-dump-url-on-error-communication.patch
new file mode 100644
index 0000000..e907694
--- /dev/null
+++ b/SOURCES/0008-tang-dump-url-on-error-communication.patch
@@ -0,0 +1,16 @@
+--- clevis-15-ori/src/pins/tang/clevis-decrypt-tang	2020-10-28 19:55:47.673228700 +0100
++++ clevis-15/src/pins/tang/clevis-decrypt-tang	2022-01-21 10:37:40.327825491 +0100
+@@ -73,10 +73,10 @@
+ 
+ xfr="$(jose jwk exc -i '{"alg":"ECMR"}' -l- -r- <<< "$clt$eph")"
+ 
+-url="$url/rec/$kid"
++rec_url="$url/rec/$kid"
+ ct="Content-Type: application/jwk+json"
+-if ! rep="$(curl -sfg -X POST -H "$ct" --data-binary @- "$url" <<< "$xfr")"; then
+-    echo "Error communicating with the server!" >&2
++if ! rep="$(curl -sfg -X POST -H "$ct" --data-binary @- "$rec_url" <<< "$xfr")"; then
++    echo "Error communicating with the server $url" >&2
+     exit 1
+ fi
+ 
diff --git a/SPECS/clevis.spec b/SPECS/clevis.spec
index 0ea213e..d34b7d8 100644
--- a/SPECS/clevis.spec
+++ b/SPECS/clevis.spec
@@ -2,7 +2,7 @@
 
 Name:           clevis
 Version:        15
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Automated decryption framework
 
 License:        GPLv3+
@@ -16,6 +16,7 @@ Patch0004: 0004-systemd-drop-ncat-dependency.patch
 Patch0005: 0005-Stop-sending-stderr-to-the-void-when-decryption-does.patch
 Patch0006: 0006-luks-enable-debugging-in-clevis-scripts-when-rd.debu.patch
 Patch0007: 0007-luks-explicitly-specify-pbkdf-iterations-to-cryptset.patch
+Patch0008: 0008-tang-dump-url-on-error-communication.patch
 
 BuildRequires:  git
 BuildRequires:  gcc
@@ -200,6 +201,10 @@ exit 0
 %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2
 
 %changelog
+* Fri Jan 21 2022 Sergio Arroutbi <sarroutb@redhat.com> - 15-7
+- Dump server information on server error communication
+  Resolves: rhbz#2020193
+
 * Tue Jan 04 2022 Sergio Correia <scorreia@redhat.com> - 15-6
 - Explicitly specify pbkdf iterations to cryptsetup
   Resolves: rhbz#1979256