Merge branch 'master' of gparabola:abslibre-mips64el

2 files changed, 78 insertions, 3 deletions

diff --git a/extra/gamin/18_gam_server_deadlocks.patch b/extra/gamin/18_gam_server_deadlocks.patch
new file mode 100644
index 000000000..ef7749675
--- /dev/null
+++ b/extra/gamin/18_gam_server_deadlocks.patch
@@ -0,0 +1,70 @@
+From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi@mageia.org>
+Date: Wed, 4 Jan 2012 00:23:55 +0200
+Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
+
+ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
+However, ih_sub_cancel() locks it again, and locking GMutex recursively
+causes undefined behaviour.
+
+Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
+is its only user. Also make the function static so that it won't
+accidentally get used by other files without locking (inotify-helper.h
+is an internal server header).
+
+This should fix the intermittent deadlocks I've been experiencing
+causing KDE applications to no longer start, and probably also
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
+
+Origin: http://bugzilla-attachments.gnome.org/attachment.cgi?id=204537
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gamin/+bug/926862
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
+
+---
+ server/inotify-helper.c |    7 ++-----
+ server/inotify-helper.h |    1 -
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/server/inotify-helper.c b/server/inotify-helper.c
+index d77203e..0789fa4 100644
+--- a/server/inotify-helper.c
++++ b/server/inotify-helper.c
+@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
+ 
+ /**
+  * Cancels a subscription which was being monitored.
++ * inotify_lock must be held when calling.
+  */
+-gboolean
++static gboolean
+ ih_sub_cancel (ih_sub_t * sub)
+ {
+-	G_LOCK(inotify_lock);
+-
+-
+ 	if (!sub->cancelled)
+ 	{
+ 		IH_W("cancelling %s\n", sub->pathname);
+@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
+ 		sub_list = g_list_remove (sub_list, sub);
+ 	}
+ 
+-	G_UNLOCK(inotify_lock);
+ 	return TRUE;
+ }
+ 
+diff --git a/server/inotify-helper.h b/server/inotify-helper.h
+index 5d3b6d0..d36b5fd 100644
+--- a/server/inotify-helper.h
++++ b/server/inotify-helper.h
+@@ -34,7 +34,6 @@ gboolean	 ih_startup		(event_callback_t ecb,
+ 					 found_callback_t fcb);
+ gboolean	 ih_running		(void);
+ gboolean	 ih_sub_add		(ih_sub_t *sub);
+-gboolean	 ih_sub_cancel		(ih_sub_t *sub);
+ 
+ /* Return FALSE from 'f' if the subscription should be cancelled */
+ void		 ih_sub_foreach		(void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
+-- 
+1.7.7.2
+
diff --git a/extra/gamin/PKGBUILD b/extra/gamin/PKGBUILD
index 77713b212..f3bcff3a3 100644
--- a/extra/gamin/PKGBUILD
+++ b/extra/gamin/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gamin
 pkgver=0.1.10
-pkgrel=6.1
+pkgrel=7
 pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor)'
 url='http://www.gnome.org/~veillard/gamin'
 license=('GPL')
@@ -17,13 +17,18 @@ optdepends=('python2: for the python module.')
 provides=('fam')
 conflicts=('fam')
 source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"
-        'fix-deprecated-const.patch')
+        'fix-deprecated-const.patch'
+        '18_gam_server_deadlocks.patch')
 md5sums=('b4ec549e57da470c04edd5ec2876a028'
-         'f679aeb48fe9dd376c8828cc9b6941ab')
+         'f679aeb48fe9dd376c8828cc9b6941ab'
+         '4784359a3206bfa3c0dce1c23468f87f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # https://bugs.archlinux.org/task/33642
+  patch -p1 -i "${srcdir}"/18_gam_server_deadlocks.patch
+
   patch -p1 -i "${srcdir}"/fix-deprecated-const.patch
 
   # python 2