gamin:moved from contrib
This commit is contained in:
blue-devil
@@ -0,0 +1,36 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
import os
|
||||
|
||||
def setup():
|
||||
autotools.autoreconf("-fi")
|
||||
# suppress compiler warnings
|
||||
pisitools.cflags.add("-Wno-unused-result -Wno-return-type -Wno-deprecated-declarations -Wno-format-truncation\
|
||||
-Wno-nested-externs -Wno-implicit-function-declaration -Wno-missing-prototypes -Wno-address\
|
||||
-Wno-unused-but-set-variable -Wno-misleading-indentation -Wno-unused-variable")
|
||||
autotools.configure("--disable-static \
|
||||
--enable-inotify")
|
||||
|
||||
for root, dirs, files in os.walk(get.workDIR()):
|
||||
for name in files:
|
||||
if name.endswith(".py"):
|
||||
pisitools.dosed("%s/%s" % (root, name), "#!/usr/bin/env python", "#!/usr/bin/python")
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
# remove static lib.
|
||||
pisitools.remove("/usr/lib/libgamin_shared.a")
|
||||
|
||||
pisitools.dodoc("COPYING", "README")
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
Index: gamin-0.1.10/python/Makefile.am
|
||||
===================================================================
|
||||
--- gamin-0.1.10.orig/python/Makefile.am
|
||||
+++ gamin-0.1.10/python/Makefile.am
|
||||
@@ -11,7 +11,7 @@ python_LTLIBRARIES = _gamin.la
|
||||
|
||||
_gamin_la_SOURCES = gamin.c
|
||||
_gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la
|
||||
-_gamin_la_LDFLAGS = -module -avoid-version
|
||||
+_gamin_la_LDFLAGS = -module -avoid-version `python-config --libs`
|
||||
|
||||
python_PYTHON = gamin.py
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- server/gam_node.c.orig 2011-10-18 16:09:04.873780685 +0200
|
||||
+++ server/gam_node.c 2011-10-18 16:09:01.965780543 +0200
|
||||
@@ -122,7 +122,7 @@
|
||||
* it has finished with the string. If it must keep it longer, it
|
||||
* should makes its own copy. The returned string must not be freed.
|
||||
*/
|
||||
-G_CONST_RETURN char *
|
||||
+const char *
|
||||
gam_node_get_path(GamNode * node)
|
||||
{
|
||||
g_assert(node);
|
||||
@@ -0,0 +1,11 @@
|
||||
--- server/gam_node.h.orig 2012-10-02 19:46:52.000000000 +0300
|
||||
+++ server/gam_node.h 2012-10-02 19:48:22.978078187 +0300
|
||||
@@ -58,7 +58,7 @@
|
||||
void gam_node_set_is_dir (GamNode *node,
|
||||
gboolean is_dir);
|
||||
|
||||
-G_CONST_RETURN char *gam_node_get_path (GamNode *node);
|
||||
+const char *gam_node_get_path (GamNode *node);
|
||||
|
||||
GList *gam_node_get_subscriptions (GamNode *node);
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- server/gam_subscription.c.orig 2011-10-18 16:09:04.817780682 +0200
|
||||
+++ server/gam_subscription.c 2011-10-18 16:09:01.965780543 +0200
|
||||
@@ -141,7 +141,7 @@
|
||||
* @param sub the GamSubscription
|
||||
* @returns The path being monitored. It should not be freed.
|
||||
*/
|
||||
-G_CONST_RETURN char *
|
||||
+const char *
|
||||
gam_subscription_get_path(GamSubscription * sub)
|
||||
{
|
||||
if (sub == NULL)
|
||||
@@ -0,0 +1,10 @@
|
||||
--- server/gam_subscription.h.orig 2007-07-04 16:36:49.000000000 +0300
|
||||
+++ server/gam_subscription.h 2012-10-02 19:57:55.549094734 +0300
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
int gam_subscription_get_reqno (GamSubscription *sub);
|
||||
|
||||
-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
|
||||
+const char *gam_subscription_get_path (GamSubscription *sub);
|
||||
|
||||
GamListener *gam_subscription_get_listener (GamSubscription *sub);
|
||||
@@ -0,0 +1,52 @@
|
||||
diff -up gamin-0.1.9/server/gam_channel.c.xxx gamin-0.1.9/server/gam_channel.c
|
||||
--- gamin-0.1.9/server/gam_channel.c.xxx 2007-07-04 15:36:49.000000000 +0200
|
||||
+++ gamin-0.1.9/server/gam_channel.c 2008-02-14 10:00:38.654849392 +0100
|
||||
@@ -3,7 +3,6 @@
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <glib.h>
|
||||
-#include <sys/socket.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/un.h>
|
||||
#include <sys/uio.h>
|
||||
@@ -12,6 +11,14 @@
|
||||
#include "gam_channel.h"
|
||||
#include "gam_protocol.h"
|
||||
|
||||
+#ifdef HAVE_LINUX
|
||||
+ /* Workaround for undefined struct ucred */
|
||||
+ #define __USE_GNU
|
||||
+#endif
|
||||
+
|
||||
+#include <sys/socket.h>
|
||||
+
|
||||
+
|
||||
/* #define CHANNEL_VERBOSE_DEBUGGING */
|
||||
/************************************************************************
|
||||
* *
|
||||
diff -up gamin-0.1.9/libgamin/gam_api.c.xxx gamin-0.1.9/libgamin/gam_api.c
|
||||
--- gamin-0.1.9/libgamin/gam_api.c.xxx 2007-07-04 15:36:48.000000000 +0200
|
||||
+++ gamin-0.1.9/libgamin/gam_api.c 2008-02-13 17:41:50.697896914 +0100
|
||||
@@ -11,7 +11,6 @@
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
-#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#include <sys/uio.h>
|
||||
#include "fam.h"
|
||||
@@ -20,6 +19,14 @@
|
||||
#include "gam_fork.h"
|
||||
#include "gam_error.h"
|
||||
|
||||
+#ifdef HAVE_LINUX
|
||||
+ /* Workaround for undefined struct ucred */
|
||||
+ #define __USE_GNU
|
||||
+#endif
|
||||
+
|
||||
+#include <sys/socket.h>
|
||||
+
|
||||
+
|
||||
#define TEST_DEBUG
|
||||
|
||||
#define MAX_RETRIES 25
|
||||
@@ -0,0 +1,93 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>gamin</Name>
|
||||
<Homepage>http://www.gnome.org/~veillard/gamin/</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<PartOf>desktop.gnome.base</PartOf>
|
||||
<License>LGPLv2</License>
|
||||
<IsA>library</IsA>
|
||||
<Summary>File alteration monitor library</Summary>
|
||||
<Description>Gamin is a file and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor) system. This is a serviceprovided by a library which allows to detect when a file or a directory has been modified.</Description>
|
||||
<Archive sha1sum="c4d5462d8cef5e412f55861bd317dcce5cac3318" type="tarbz2" >mirrors://gnome/gamin/0.1/gamin-0.1.10.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>glib2-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">18_gam_server_deadlocks.patch</Patch>
|
||||
<!--<Patch level="1">fix-deprecated-const-01.patch</Patch> -->
|
||||
<Patch level="1">explicitly-link-with-python.patch</Patch>
|
||||
<Patch level="0">fix-deprecated-const-01.patch</Patch>
|
||||
<Patch level="0">fix-deprecated-const-02.patch</Patch>
|
||||
<Patch level="0">fix-deprecated-const-03.patch</Patch>
|
||||
<Patch level="0">fix-deprecated-const-04.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>gamin</Name>
|
||||
<Summary>File alteration monitor library</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>glib2</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/libexec</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>gamin-devel</Name>
|
||||
<Summary>Development files for gamin</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">gamin</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2020-02-26</Date>
|
||||
<Version>0.1.10</Version>
|
||||
<Comment>Rebuild for new toolchain</Comment>
|
||||
<Name>Blue Devil</Name>
|
||||
<Email>bluedevil@sctzine.com</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2016-02-25</Date>
|
||||
<Version>0.1.10</Version>
|
||||
<Comment>Rebuilt with docker</Comment>
|
||||
<Name>İbrahim KARAGÜZEL</Name>
|
||||
<Email>karaguzelibrahim@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2014-05-22</Date>
|
||||
<Version>0.1.10</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvarice@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2014-01-25</Date>
|
||||
<Version>0.1.10</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Stefan Gronewold(groni)</Name>
|
||||
<Email>groni@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2012-10-02</Date>
|
||||
<Version>0.1.10</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>gamin</Name>
|
||||
<Summary xml:lang="tr">Dosya değişim izleme kitaplığı</Summary>
|
||||
<Description xml:lang="tr">Gamin bir dosya ve klasör izleme kitaplığıdır. FAM (Dosya değişim izleyicisi) sisteminin bir alt kolu olarak tanımlanmaktadır. Bir dosyanın veya bir klasörün değiştiğini anlamamıza yarayan bir kitaplığıdır.</Description>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>gamin-devel</Name>
|
||||
<Summary xml:lang="tr">gamin için geliştirme dosyaları</Summary>
|
||||
<Description xml:lang="tr">gamin-devel, gamin için geliştirme dosyalarını içerir.</Description>
|
||||
</Package>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user