rpms/pinentry
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/pinentry.git#df36c013d5db9d129a67d7829bc7312f5f4877ca
This commit is contained in:
DistroBaker 2021-02-04 13:51:39 +00:00
parent 4adb1330cb
commit 3365f307a0
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pinentry-wrapper
View File

@ -71,12 +71,12 @@ then
elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt ] elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt ]
then then
export PINENTRY_BINARY="/usr/bin/pinentry-qt" export PINENTRY_BINARY="/usr/bin/pinentry-qt"
# use pinentry-curses for interactive mode # use pinentry-tty if installed
elif [ -t 0 -a -t 1 ]; elif [ -x /usr/bin/pinentry-tty ]
then then
export PINENTRY_BINARY="/usr/bin/pinentry-curses"
# fallback to pinentry-tty in no TTY is provided
else
export PINENTRY_BINARY="/usr/bin/pinentry-tty" export PINENTRY_BINARY="/usr/bin/pinentry-tty"
# pinentry-curses is installed by default
else
export PINENTRY_BINARY="/usr/bin/pinentry-curses"
fi fi
exec $PINENTRY_BINARY "$@" exec $PINENTRY_BINARY "$@"

22
pinentry.spec
View File

@ -1,7 +1,7 @@
Name: pinentry Name: pinentry
Version: 1.1.1 Version: 1.1.1
Release: 1%{?dist} Release: 3%{?dist}
Summary: Collection of simple PIN or passphrase entry dialogs Summary: Collection of simple PIN or passphrase entry dialogs
License: GPLv2+ License: GPLv2+
@ -75,6 +75,15 @@ utilize the Assuan protocol as described by the aegypten project; see
http://www.gnupg.org/aegypten/ for details. http://www.gnupg.org/aegypten/ for details.
This package contains the emacs based version of the PIN entry dialog. This package contains the emacs based version of the PIN entry dialog.
%package tty
Summary: Passphrase/PIN entry dialog in tty
Requires: %{name} = %{version}-%{release}
%description tty
Pinentry is a collection of simple PIN or passphrase entry dialogs which
utilize the Assuan protocol as described by the aegypten project; see
http://www.gnupg.org/aegypten/ for details.
This package contains the tty version of the PIN entry dialog.
%prep %prep
%setup -q %setup -q
@ -111,7 +120,6 @@ rm -fv $RPM_BUILD_ROOT%{_infodir}/dir
%license COPYING %license COPYING
%doc AUTHORS ChangeLog NEWS README THANKS TODO %doc AUTHORS ChangeLog NEWS README THANKS TODO
%{_bindir}/pinentry-curses %{_bindir}/pinentry-curses
%{_bindir}/pinentry-tty
%{_bindir}/pinentry %{_bindir}/pinentry
%{_infodir}/pinentry.info* %{_infodir}/pinentry.info*
@ -131,7 +139,17 @@ rm -fv $RPM_BUILD_ROOT%{_infodir}/dir
%files emacs %files emacs
%{_bindir}/pinentry-emacs %{_bindir}/pinentry-emacs
%files tty
%{_bindir}/pinentry-tty
%changelog %changelog
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 26 2021 Jakub Jelen <jjelen@redhat.com> - 1.1.1-2
- Move pinentry-tty to separate subpackage (#1782442)
- Update the wrapper selecting the appropriate version (#1918969)
* Fri Jan 22 2021 Jakub Jelen <jjelen@redhat.com> - 1.1.1-1 * Fri Jan 22 2021 Jakub Jelen <jjelen@redhat.com> - 1.1.1-1
- New upstream release (#1919127) - New upstream release (#1919127)