From 338d9cc00f7cb299f03d896e156fbcc494ac1581 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 19 Jul 2014 14:20:55 -0500 Subject: [PATCH] /usr/bin/pinentry should not check if stderr is opened (#787775) --- pinentry-wrapper | 5 +---- pinentry.spec | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pinentry-wrapper b/pinentry-wrapper index 99bd6b2..f3a3e33 100644 --- a/pinentry-wrapper +++ b/pinentry-wrapper @@ -59,10 +59,6 @@ then elif [ -x /usr/bin/pinentry-qt ] then export PINENTRY_BINARY="/usr/bin/pinentry-qt" -# pinentry-curses is installed by default, test if we're in a terminal -elif [ -t 2 ] -then - export PINENTRY_BINARY="/usr/bin/pinentry-curses" else #test if gui binary is required for opt in "$@"; do @@ -72,6 +68,7 @@ else exit 1 fi done + export PINENTRY_BINARY="/usr/bin/pinentry-curses" fi fi diff --git a/pinentry.spec b/pinentry.spec index 6e1d493..2305261 100644 --- a/pinentry.spec +++ b/pinentry.spec @@ -1,7 +1,7 @@ Name: pinentry Version: 0.8.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Collection of simple PIN or passphrase entry dialogs # qt & qt4 subpackage have different license, see subpackage definitions @@ -129,6 +129,9 @@ fi %changelog +* Sat Jul 19 2014 Rex Dieter 0.8.3-4 +- /usr/bin/pinentry should not check if stderr is opened (#787775) + * Sat Jul 19 2014 Rex Dieter - 0.8.3-3 - .spec cleanup (drop support for old releases) - -gtk: Provides: pinentry-gtk2