rpms/gvfs/F-11 gvfs-1.2.2-dnssd-deadlock.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 gvfs-0.99.2-archive-integration.patch, 1.2, 1.3 gvfs.spec, 1.131, 1.132 sources, 1.40, 1.41 gvfs-1.2.2-ssh-auth-sock.patch, 1.1, NONE gvfs-1.2.3-ftp-filesize.patch, 1.1, NONE gvfs-bash-completion.patch, 1.1, NONE
Tomas Bzatek
tbzatek at fedoraproject.org
Mon May 18 13:18:29 UTC 2009
Author: tbzatek
Update of /cvs/extras/rpms/gvfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25070
Modified Files:
.cvsignore gvfs-0.99.2-archive-integration.patch gvfs.spec
sources
Added Files:
gvfs-1.2.2-dnssd-deadlock.patch
Removed Files:
gvfs-1.2.2-ssh-auth-sock.patch gvfs-1.2.3-ftp-filesize.patch
gvfs-bash-completion.patch
Log Message:
* Mon May 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-1
- Update to 1.2.3
- Prevent deadlocks in dnssd resolver (#497631)
gvfs-1.2.2-dnssd-deadlock.patch:
--- NEW FILE gvfs-1.2.2-dnssd-deadlock.patch ---
>From c89b238b4a03e08ca8c793c5689948b1fa9c2722 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 15 May 2009 14:29:28 +0200
Subject: [PATCH] Avoid deadlock when pulling resolved record from cache
When the host has already been resolved and is present in the cache,
it's returned immediately. But we always started the mainloop even
if it was quit before, resulting in endless waiting for an event
which had been received before that.
---
common/gvfsdnssdresolver.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/common/gvfsdnssdresolver.c b/common/gvfsdnssdresolver.c
index 7794042..957d2cb 100644
--- a/common/gvfsdnssdresolver.c
+++ b/common/gvfsdnssdresolver.c
@@ -1249,14 +1249,21 @@ g_vfs_dns_sd_resolver_resolve_sync (GVfsDnsSdResolver *resolver,
g_return_val_if_fail (G_VFS_IS_DNS_SD_RESOLVER (resolver), FALSE);
data = g_new0 (ResolveDataSync, 1);
- data->loop = g_main_loop_new (NULL, FALSE);
+ /* mark the main loop as running to have an indication whether
+ * g_main_loop_quit() was called before g_main_loop_run()
+ */
+ data->loop = g_main_loop_new (NULL, TRUE);
g_vfs_dns_sd_resolver_resolve (resolver,
cancellable,
(GAsyncReadyCallback) resolve_sync_cb,
data);
- g_main_loop_run (data->loop);
+ /* start the loop only if it wasn't quit before
+ * (i.e. in case when pulling the record from cache)
+ */
+ if (g_main_loop_is_running (data->loop))
+ g_main_loop_run (data->loop);
ret = data->ret;
if (data->error != NULL)
--
1.6.2.2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore 13 Apr 2009 18:33:12 -0000 1.40
+++ .cvsignore 18 May 2009 13:17:58 -0000 1.41
@@ -1 +1 @@
-gvfs-1.2.2.tar.bz2
+gvfs-1.2.3.tar.bz2
gvfs-0.99.2-archive-integration.patch:
Index: gvfs-0.99.2-archive-integration.patch
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs-0.99.2-archive-integration.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gvfs-0.99.2-archive-integration.patch 9 Dec 2008 13:24:14 -0000 1.2
+++ gvfs-0.99.2-archive-integration.patch 18 May 2009 13:17:58 -0000 1.3
@@ -42,9 +42,9 @@ Index: Makefile.am
SUBDIRS = \
common \
client \
-@@ -15,6 +30,8 @@
-
- EXTRA_DIST = \
+@@ -18,6 +33,8 @@ EXTRA_DIST = \
+ gvfs.doap \
+ README.commits \
MAINTAINERS \
+ mount-archive.desktop.in.in \
+ $(desktop_in_files) \
Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- gvfs.spec 13 May 2009 04:58:39 -0000 1.131
+++ gvfs.spec 18 May 2009 13:17:58 -0000 1.132
@@ -1,7 +1,7 @@
Summary: Backends for the gio framework in GLib
Name: gvfs
-Version: 1.2.2
-Release: 8%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
@@ -32,12 +32,8 @@ BuildRequires: libtool
Patch1: gvfs-0.99.2-archive-integration.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=573826
Patch2: gvfs-1.1.7-gdu-computer-expose-devices.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=578681
-Patch3: gvfs-bash-completion.patch
-# From svn:
-Patch4: gvfs-1.2.2-ssh-auth-sock.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=499286
-Patch5: gvfs-1.2.3-ftp-filesize.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=497631
+Patch3: gvfs-1.2.2-dnssd-deadlock.patch
# Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
#
@@ -159,9 +155,7 @@ media players (Media Transfer Protocol)
%setup -q
%patch1 -p0 -b .archive-integration
%patch2 -p1 -b .computer-expose-devices
-%patch3 -p1 -b .bash-completion
-%patch4 -p0 -b .ssh-auth-sock
-%patch5 -p1 -b .ftp-size
+%patch3 -p1 -b .dnssd-deadlock
%patch101 -p1 -b .gdu-volume-monitor
%patch102 -p1 -b .gdu-volumes-typo
@@ -323,6 +317,10 @@ update-desktop-database &> /dev/null ||:
%changelog
+* Mon May 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-1
+- Update to 1.2.3
+- Prevent deadlocks in dnssd resolver (#497631)
+
* Wed May 13 2009 Matthias Clasen <mclasen at redhat.com> - 1.2.2-8
- Try to fix issues with webdav authentication
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources 13 Apr 2009 18:33:12 -0000 1.40
+++ sources 18 May 2009 13:17:59 -0000 1.41
@@ -1 +1 @@
-85f69289185b0c9c42644c0e730b67c8 gvfs-1.2.2.tar.bz2
+04a7f9c892b962cfedf0637dd2b01196 gvfs-1.2.3.tar.bz2
--- gvfs-1.2.2-ssh-auth-sock.patch DELETED ---
--- gvfs-1.2.3-ftp-filesize.patch DELETED ---
--- gvfs-bash-completion.patch DELETED ---
More information about the scm-commits
mailing list