rpms/gpgme03/devel gpgme-0.3.16-select.patch, NONE, 1.1 gpgme03.spec, 1.3, 1.4

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Fri Nov 12 03:59:41 UTC 2004


Changeset from: mschwendt

Update of /cvs/extras/rpms/gpgme03/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10812

Modified Files:
	gpgme03.spec 
Added Files:
	gpgme-0.3.16-select.patch 
Log Message:
Fix a race/lockup condition I see in make check t-edit.

gpgme-0.3.16-select.patch:

--- NEW FILE gpgme-0.3.16-select.patch ---
diff -Nur gpgme-0.3.16-orig/gpgme/wait.c gpgme-0.3.16/gpgme/wait.c
--- gpgme-0.3.16-orig/gpgme/wait.c	2002-08-28 22:31:31.000000000 +0200
+++ gpgme-0.3.16/gpgme/wait.c	2004-11-12 04:45:32.401570000 +0100
@@ -166,7 +166,7 @@
 	  fdt->fds[i].signaled = 0;
 	  UNLOCK (fdt->lock);
 	  item->handler (item->handler_value, fdt->fds[i].fd);
-	  LOCK (fdt->lock);
+	  return any; /* fdt 'signaled' flags may be out-of-date */
         }
     }
   UNLOCK (fdt->lock);


Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme03/devel/gpgme03.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gpgme03.spec	8 Nov 2004 04:29:31 -0000	1.3
+++ gpgme03.spec	12 Nov 2004 03:59:39 -0000	1.4
@@ -1,11 +1,12 @@
 Summary:        GnuPG Made Easy interface library
 Name:           gpgme03
 Version:        0.3.16
-Release:        0.fdr.3.2
+Release:        4
 Epoch:          0
 License:        GPL
 Group:          Applications/System
 Source:         ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-0.3.16.tar.gz
+Patch:          gpgme-0.3.16-select.patch
 URL:            http://www.gnupg.org/related_software/gpgme/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gnupg >= 0:1.2.0, %{_bindir}/gpgsm, pth-devel
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q -n gpgme-%{version}
+%patch -p1 -b .select
 
 
 %build
@@ -80,6 +82,9 @@
 
 
 %changelog
+* Fri Nov 12 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.3.16-4
+- Add patch to fix fd race/lockup in key editing interface.
+
 * Sun May  2 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.16-0.fdr.3
 - Require %%{_bindir}/gpgsm instead of newpg.
 - Cosmetic spec file improvements.




More information about the fedora-extras-commits mailing list