rpms/pinentry/devel 0002-Fix-sigabrt-on-fail-grab-r229.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 pinentry.spec, 1.29, 1.30 sources, 1.8, 1.9

[Stanislav Ochotnicky]

Author: sochotni

Update of /cvs/pkgs/rpms/pinentry/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26476/devel

Modified Files:
	.cvsignore pinentry.spec sources 
Added Files:
	0002-Fix-sigabrt-on-fail-grab-r229.patch 
Log Message:
pinentry-gtk 0.8.0

also fixes pinentry-gtk keyboard grab fail results in SIGABRT
(#585422)



0002-Fix-sigabrt-on-fail-grab-r229.patch:
 pinentry-gtk-2.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE 0002-Fix-sigabrt-on-fail-grab-r229.patch ---
Index: gtk+-2/pinentry-gtk-2.c
===================================================================
--- gtk+-2/pinentry-gtk-2.c	(revision 228)
+++ gtk+-2/pinentry-gtk-2.c	(revision 229)
@@ -52,6 +52,7 @@
 #endif
 
 static pinentry_t pinentry;
+static int grab_failed;
 static int passphrase_ok;
 typedef enum { CONFIRM_CANCEL, CONFIRM_OK, CONFIRM_NOTOK } confirm_value_t;
 static confirm_value_t confirm_value;
@@ -135,7 +136,11 @@
     return;
 
   if (gdk_keyboard_grab (win->window, FALSE, gdk_event_get_time (event)))
-    g_error ("could not grab keyboard");
+    {
+      g_critical ("could not grab keyboard");
+      grab_failed = 1;
+      gtk_main_quit ();
+    }
 }
 
 
@@ -520,7 +525,7 @@
   while (gtk_events_pending ())
     gtk_main_iteration ();
 
-  if (confirm_value == CONFIRM_CANCEL)
+  if (confirm_value == CONFIRM_CANCEL || grab_failed)
     pe->canceled = 1;
 
   pinentry = NULL;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Jun 2009 15:28:41 -0000	1.8
+++ .cvsignore	27 Apr 2010 08:57:22 -0000	1.9
@@ -1,2 +1,2 @@
-pinentry-0.7.6.tar.gz
-pinentry-0.7.6.tar.gz.sig
+pinentry-0.8.0.tar.gz
+pinentry-0.8.0.tar.gz.sig


Index: pinentry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- pinentry.spec	18 Apr 2010 16:51:23 -0000	1.29
+++ pinentry.spec	27 Apr 2010 08:57:22 -0000	1.30
@@ -9,8 +9,8 @@
 %endif
 
 Name:    pinentry
-Version: 0.7.6
-Release: 5%{?dist}
+Version: 0.8.0
+Release: 1%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 Group:   Applications/System
@@ -23,9 +23,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # borrowed from opensuse
 Source10: pinentry-wrapper
 
-## Upstreamable patches
-# from gpa-devel list, archives seem 404'd atm
+## Backported patches from SVN
 Patch50: 0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch
+Patch51: 0002-Fix-sigabrt-on-fail-grab-r229.patch
 
 BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
@@ -88,6 +88,7 @@ Support for Qt4 is new, and a bit experi
 %setup -q
 
 %patch50 -p1 -b .rhbug_520236
+%patch51 -p0 -b .rhbug_585422
 
 # hack around auto* madness, lack of proper support for moc
 %if %{?_enable_pinentry_qt4:1}
@@ -171,6 +172,10 @@ fi
 
 
 %changelog
+* Tue Apr 27 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.8.0-1
+- pinentry-0.8.0
+- pinentry-gtk keyboard grab fail results in SIGABRT (#585422)
+
 * Sun Apr 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-5
 - pinentry-gtk -g segfaults on focus change (#520236)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Jun 2009 15:28:41 -0000	1.8
+++ sources	27 Apr 2010 08:57:22 -0000	1.9
@@ -1,2 +1,2 @@
-5a4f676375fa882009da02013d77210f  pinentry-0.7.6.tar.gz
-36cd76923724de5d10830346f4b0f915  pinentry-0.7.6.tar.gz.sig
+590be1b00f9ab63205843c7fed8caf35  pinentry-0.8.0.tar.gz
+12467655a6ba5188c5204f2fbe7f4015  pinentry-0.8.0.tar.gz.sig