autogen.sh | 4 2 + 2 - 0 !
configure.ac | 4 1 + 3 - 0 !
2 files changed, 3 insertions(+), 5 deletions(-)

 avoid self-describing as a beta

Using autoreconf against the source as distributed in tarball form
invariably results in a package that thinks it's a "beta" package,
which produces the "THIS IS A DEVELOPMENT VERSION" warning string.

since we use dh_autoreconf, i need this patch to avoid producing
builds that announce themselves as DEVELOPMENT VERSIONs.

See discussion at:

 http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029065.html

emacs/pinentry-emacs.c | 4 0 + 4 - 0 !
gnome3/pinentry-gnome3.c | 3 3 + 0 - 0 !
gtk+-2/pinentry-gtk-2.c | 10 8 + 2 - 0 !
pinentry/pinentry-emacs.c | 5 4 + 1 - 0 !
pinentry/pinentry.c | 34 18 + 16 - 0 !
pinentry/pinentry.h | 4 4 + 0 - 0 !
qt/main.cpp | 1 1 + 0 - 0 !
tty/pinentry-tty.c | 3 0 + 3 - 0 !
8 files changed, 38 insertions(+), 26 deletions(-)

 fix linkage problem in tty and emacs pinentries.

* emacs/pinentry-emacs.c (curses_cmd_handler): Remove var.
* tty/pinentry-tty.c (curses_cmd_handler): Remove var.
* pinentry/pinentry.c (flavor_flag): New local var.
(pinentry_set_flavor_flag): New function.
(cmd_getinfo): Use FLAVOR_FLAG for the "flavor" sub-command.
* gnome3/pinentry-gnome3.c (main): Call pinentry_set_flavor_flag.
* gtk+-2/pinentry-gtk-2.c (main): Ditto.
* pinentry/pinentry-emacs.c (initial_emacs_cmd_handler): Ditto.
* qt/main.cpp (main): Ditto.
--

Fixes-commit: e4e3a9cc88704dcffac660d0b92fd1ed8abecc11
Fixes-commit: d126036671e7dd631babc118cb4113f723f15748
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit c5c7bee68730c9f66a27f9bb0d023480623a2bfb)

doc/pinentry.texi | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 fix spelling errors.

--
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>

(cherry picked from commit cc0d783cf03a814df48c03ddcbb4d09115e9596d)

gnome3/pinentry-gnome3.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 gnome3: fix confirm condition.

* gnome3/pinentry-gnome3.c (gnome3_cmd_handler): No buffer for PIN means
it's not passphrase input but confirmation dialog.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
(cherry picked from commit c725fdd260b0c2291660ff954e6b2250006ec08f)

gnome3/pinentry-gnome3.c | 9 3 + 6 - 0 !
1 file changed, 3 insertions(+), 6 deletions(-)

 gnome3: use the program name as default title.

* gnome3/pinentry-gnome3.c (create_prompt): If no title is requested,
use the program name as the default title.  This mimics what the GTK+2
variant does (although the GTK+2 pinentry seems to use
basename(argv[0])).

GnuPG-bug-id: 2920
Signed-off-by: Justus Winter <justus@g10code.com>

gtk+-2/pinentry-gtk-2.c | 10 8 + 2 - 0 !
1 file changed, 8 insertions(+), 2 deletions(-)

 gtk2: fix a problem with fvwm

* gtk+-2/pinentry-gtk-2.c (grab_pointer): Take care of
GDK_GRAB_ALREADY_GRABBED.
--

Debian-bug-id: 850708
Co-authored-by: Vincent Lefevre <vincent@vinc17.net>
Signed-off-by: Werner Koch <wk@gnupg.org>

gtk+-2/pinentry-gtk-2.c | 10 6 + 4 - 0 !
1 file changed, 6 insertions(+), 4 deletions(-)

 gtk2: when x11 input grabbing fails, try again over ~0.4 seconds.

* gtk+-2/pinentry-gtk-2.c (grab_keyboard): Delay 1 ms before retrying
keyboard grab, limit to about 0.2 seconds.
(grab_pointer): Delay 1 ms before retrying pointer_grab, limit to
about 0.2 seconds.

--

These changes were proposed by Vincent Bernat in
https://bugs.debian.org/851707#124

Debian-bug-id: 851707
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>