From 897e53d60956e8d589e8da43b9a57d6565fe3175 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sat, 28 Jan 2023 06:10:05 +0000 Subject: [PATCH] import clevis-15-14.el8 --- ...014-luks-edit-remove-unnecessary-redirection.patch | 11 +++++++++++ SPECS/clevis.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0014-luks-edit-remove-unnecessary-redirection.patch diff --git a/SOURCES/0014-luks-edit-remove-unnecessary-redirection.patch b/SOURCES/0014-luks-edit-remove-unnecessary-redirection.patch new file mode 100644 index 0000000..0280ec5 --- /dev/null +++ b/SOURCES/0014-luks-edit-remove-unnecessary-redirection.patch @@ -0,0 +1,11 @@ +--- clevis-15.ori/src/luks/clevis-luks-edit 2020-10-28 19:55:47.663228800 +0100 ++++ clevis-15/src/luks/clevis-luks-edit 2023-01-16 12:03:14.006998399 +0100 +@@ -173,7 +173,7 @@ + + echo "Updating binding..." + if ! clevis_luks_do_bind "${DEV}" "${SLT}" "" "${pin}" "${new_cfg}" \ +- "-y" "overwrite" 2>/dev/null; then ++ "-y" "overwrite"; then + echo "Unable to update binding in ${DEV}:${SLT}. Operation cancelled." >&2 + exit 1 + fi diff --git a/SPECS/clevis.spec b/SPECS/clevis.spec index 38a8ed6..592ac6e 100644 --- a/SPECS/clevis.spec +++ b/SPECS/clevis.spec @@ -2,7 +2,7 @@ Name: clevis Version: 15 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Automated decryption framework License: GPLv3+ @@ -22,6 +22,7 @@ Patch0010: 0010-avoid-clevis-invalid-msg.patch Patch0011: 0011-Improve-boot-performance-by-removing-key-check.patch Patch0012: 0012-ignore-empty-and-comment-lines-in-crypttab.patch Patch0013: 0013-luks-define-max-entropy-bits-for-pwmake.patch +Patch0014: 0014-luks-edit-remove-unnecessary-redirection.patch BuildRequires: git BuildRequires: gcc @@ -202,6 +203,10 @@ systemctl preset %{name}-luks-askpass.path >/dev/null 2>&1 || : %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2 %changelog +* Mon Jan 16 2023 Sergio Arroutbi - 15-14 +- luks-edit: remove unnecessary 2>/dev/null + Resolves: rhbz#2159739 + * Wed Jan 11 2023 Sergio Arroutbi - 15-13 - luks: define max entropy bits for pwmake Resolves: rhbz#2159736