From adfb358324a9e453eada7f4928a6dfb52f682e20 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 2 Dec 2021 16:36:05 +0000
Subject: [PATCH] import clevis-15-4.el8

---
 ...err-to-the-void-when-decryption-does.patch | 26 +++++++++++++++++++
 SPECS/clevis.spec                             |  9 +++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 SOURCES/0005-Stop-sending-stderr-to-the-void-when-decryption-does.patch

diff --git a/SOURCES/0005-Stop-sending-stderr-to-the-void-when-decryption-does.patch b/SOURCES/0005-Stop-sending-stderr-to-the-void-when-decryption-does.patch
new file mode 100644
index 0000000..e20b68b
--- /dev/null
+++ b/SOURCES/0005-Stop-sending-stderr-to-the-void-when-decryption-does.patch
@@ -0,0 +1,26 @@
+From da17589f0706b27690a11484165fd58dea1a5eb1 Mon Sep 17 00:00:00 2001
+From: Sergio Correia <scorreia@redhat.com>
+Date: Thu, 25 Nov 2021 19:18:03 -0300
+Subject: [PATCH 5/5] Stop sending stderr to the void when decryption doesn't
+ happen
+
+---
+ src/luks/clevis-luks-common-functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/luks/clevis-luks-common-functions b/src/luks/clevis-luks-common-functions
+index 879ca4c..df8e16d 100644
+--- a/src/luks/clevis-luks-common-functions
++++ b/src/luks/clevis-luks-common-functions
+@@ -323,7 +323,7 @@ clevis_luks_unlock_device_by_slot() {
+         return 1
+     fi
+ 
+-    if ! passphrase="$(printf '%s' "${jwe}" | clevis decrypt 2>/dev/null)" \
++    if ! passphrase="$(printf '%s' "${jwe}" | clevis decrypt)" \
+                        || [ -z "${passphrase}" ]; then
+         return 1
+     fi
+-- 
+2.33.1
+
diff --git a/SPECS/clevis.spec b/SPECS/clevis.spec
index 16e00b0..6160f23 100644
--- a/SPECS/clevis.spec
+++ b/SPECS/clevis.spec
@@ -2,7 +2,7 @@
 
 Name:           clevis
 Version:        15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Automated decryption framework
 
 License:        GPLv3+
@@ -13,6 +13,7 @@ Patch0001: 0001-Fixes-for-dealing-with-newer-tang-without-tangd-upda.patch
 Patch0002: 0002-Add-the-option-to-extract-luks-passphrase-used-for-b.patch
 Patch0003: 0003-systemd-account-for-unlocking-failures-in-clevis-luk.patch
 Patch0004: 0004-systemd-drop-ncat-dependency.patch
+Patch0005: 0005-Stop-sending-stderr-to-the-void-when-decryption-does.patch
 
 BuildRequires:  git
 BuildRequires:  gcc
@@ -36,7 +37,7 @@ BuildRequires:  tang >= 6
 BuildRequires:  curl
 BuildRequires:  luksmeta
 BuildRequires:  cracklib-dicts
-Buildrequires:  jq
+BuildRequires:  jq
 BuildRequires:  diffutils
 BuildRequires:  expect
 BuildRequires:  openssl
@@ -197,6 +198,10 @@ exit 0
 %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2
 
 %changelog
+* Thu Nov 25 2021 Sergio Correia <scorreia@redhat.com> - 15-4
+- Stop sending stderr to the void when decryption doesn't happen
+  Resolves: rhbz#1976880
+
 * Thu Nov 18 2021 Sergio Correia <scorreia@redhat.com> - 15-3
 - Drop ncat dependency
   Resolves: rhbz#1949289