add inotify 0.21 patch

5 files changed, 179 insertions, 19 deletions

diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog
index 9fc9c66dc0a0..615e0edf064c 100644
--- a/app-admin/gamin/ChangeLog
+++ b/app-admin/gamin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/gamin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.18 2005/03/16 06:42:11 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.19 2005/03/21 21:51:06 foser Exp $
+
+*gamin-0.0.26-r5 (21 Mar 2005)
+
+  21 Mar 2005; foser <foser@gentoo.org> gamin-0.0.26-r5.ebuild :
+  Add patch to work with inotify 0.21
 
 *gamin-0.0.26 (15 Mar 2005)
 
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 29755785b986..181fecc8d28d 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3e1eb9458924ed0b517b9975191f310a ChangeLog 3585
-MD5 875135e8740bafa4dab79ee592cf9744 metadata.xml 279
-MD5 1a12b6356c49807d6a034d775c96575f gamin-0.0.20.ebuild 828
 MD5 59d28e6a7eced2cd85355b76c6ae02b4 gamin-0.0.26.ebuild 1186
-MD5 39ade60322eb86b40eca5ba38fd6d522 gamin-0.0.15.ebuild 842
-MD5 2695c38fbf4b4e11fe5d9c4d6f080ffc gamin-0.0.18.ebuild 889
+MD5 53bae81158628c4344478bd60cf48dd8 gamin-0.0.26-r5.ebuild 1260
 MD5 e14b51caa6ba40b1982f36284c19f75b gamin-0.0.19.ebuild 833
 MD5 d56aae268087693c5b5fe3fc58cdae4c gamin-0.0.25.ebuild 1185
-MD5 04ae13b77ce72f4c93d0460b1bbcfd57 files/digest-gamin-0.0.20 64
-MD5 caf15e7329c9675dff66e7f65b424e79 files/digest-gamin-0.0.26 64
-MD5 a6ae9d25c124ec87523b00e860cc0d2f files/digest-gamin-0.0.25 64
+MD5 1a12b6356c49807d6a034d775c96575f gamin-0.0.20.ebuild 828
+MD5 2695c38fbf4b4e11fe5d9c4d6f080ffc gamin-0.0.18.ebuild 889
+MD5 a92771d98b21d5dffb9b739c450ed3b1 ChangeLog 3720
+MD5 875135e8740bafa4dab79ee592cf9744 metadata.xml 279
+MD5 39ade60322eb86b40eca5ba38fd6d522 gamin-0.0.15.ebuild 842
+MD5 f37ab3721e3687f4ce0797dd6dac31d5 files/gamin-0.0.26-inotify_use_fd.patch 2739
+MD5 caf15e7329c9675dff66e7f65b424e79 files/digest-gamin-0.0.26-r5 64
 MD5 c576a2ec43ce151b5bc78b77e0f58c9a files/digest-gamin-0.0.15 64
 MD5 b183176dcfe9a0ad1609767f11cafc12 files/digest-gamin-0.0.18 64
 MD5 35d7d4d3208d674f62e4f2d7ef7d383f files/digest-gamin-0.0.19 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCN9YX1ZcsMnZjRyIRAicYAJ9ZHtB3GZfFCtjpIyt2h3bJ0W3rMACfXxjO
-QqVFkCmZF8xl1fe22eyZ4wo=
-=iCQY
------END PGP SIGNATURE-----
+MD5 04ae13b77ce72f4c93d0460b1bbcfd57 files/digest-gamin-0.0.20 64
+MD5 a6ae9d25c124ec87523b00e860cc0d2f files/digest-gamin-0.0.25 64
+MD5 caf15e7329c9675dff66e7f65b424e79 files/digest-gamin-0.0.26 64
diff --git a/app-admin/gamin/files/digest-gamin-0.0.26-r5 b/app-admin/gamin/files/digest-gamin-0.0.26-r5
new file mode 100644
index 000000000000..804bee05dd70
--- /dev/null
+++ b/app-admin/gamin/files/digest-gamin-0.0.26-r5
@@ -0,0 +1 @@
+MD5 3d716b6533466f9ca69df13c58009981 gamin-0.0.26.tar.gz 484070
diff --git a/app-admin/gamin/files/gamin-0.0.26-inotify_use_fd.patch b/app-admin/gamin/files/gamin-0.0.26-inotify_use_fd.patch
new file mode 100644
index 000000000000..b40ede6f1a01
--- /dev/null
+++ b/app-admin/gamin/files/gamin-0.0.26-inotify_use_fd.patch
@@ -0,0 +1,98 @@
+Index: server/gam_inotify.c
+===================================================================
+RCS file: /cvs/gnome/gamin/server/gam_inotify.c,v
+retrieving revision 1.13
+diff -u -r1.13 gam_inotify.c
+--- server/gam_inotify.c	10 Feb 2005 22:51:00 -0000	1.13
++++ server/gam_inotify.c	16 Mar 2005 21:22:32 -0000
+@@ -116,11 +116,19 @@
+             return;
+         }
+ 
+-	iwr.name = g_strdup(path);
+-	iwr.mask = 0xffffffff; // all events
++	{
++	    int fd = open(path, O_RDONLY);
+ 
+-        wd = ioctl(fd, INOTIFY_WATCH, &iwr);
+-        g_free(iwr.name);
++	    if (fd < 0) {
++		G_UNLOCK(inotify);
++		return;
++	    }
++
++	    iwr.fd = fd;
++	    iwr.mask = 0xffffffff; // all events
++	    wd = ioctl(fd, INOTIFY_WATCH, &iwr);
++	    close (fd);
++	}
+ 
+         if (wd < 0) {
+             G_UNLOCK(inotify);
+Index: server/local_inotify.h
+===================================================================
+RCS file: /cvs/gnome/gamin/server/local_inotify.h,v
+retrieving revision 1.5
+diff -u -r1.5 local_inotify.h
+--- server/local_inotify.h	10 Feb 2005 22:51:00 -0000	1.5
++++ server/local_inotify.h	16 Mar 2005 21:22:32 -0000
+@@ -17,11 +17,11 @@
+  * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd.
+  */
+ struct inotify_event {
+-	__s32 wd;	/* watch descriptor */
+-	__u32 mask;	/* watch mask */
+-	__u32 cookie;	/* cookie used for synchronizing two events */
+-	size_t len;	/* length (including nulls) of name */
+-	char name[0];	/* stub for possible name */
++	__s32		wd;		/* watch descriptor */
++	__u32		mask;		/* watch mask */
++	__u32		cookie;		/* cookie to synchronize two events */
++	size_t		len;		/* length (including nulls) of name */
++	char		name[0];	/* stub for possible name */
+ };
+ 
+ /*
+@@ -30,8 +30,8 @@
+  * Pass to the inotify device via the INOTIFY_WATCH ioctl
+  */
+ struct inotify_watch_request {
+-	char *name;		/* directory name */
+-	__u32 mask;		/* event mask */
++	int		fd;		/* fd of filename to watch */
++	__u32		mask;		/* event mask */
+ };
+ 
+ /* the following are legal, implemented events */
+@@ -67,12 +67,7 @@
+ #include <linux/dcache.h>
+ #include <linux/fs.h>
+ #include <linux/config.h>
+-
+-struct inotify_inode_data {
+-	struct list_head watches;	/* list of watches on this inode */
+-	spinlock_t lock;		/* lock protecting the struct */
+-	atomic_t count;			/* ref count */
+-};
++#include <asm/atomic.h>
+ 
+ #ifdef CONFIG_INOTIFY
+ 
+@@ -82,7 +77,7 @@
+ 					      const char *);
+ extern void inotify_super_block_umount(struct super_block *);
+ extern void inotify_inode_is_dead(struct inode *);
+-extern __u32 inotify_get_cookie(void);
++extern u32 inotify_get_cookie(void);
+ 
+ #else
+ 
+@@ -106,7 +101,7 @@
+ {
+ }
+ 
+-static inline __u32 inotify_get_cookie(void)
++static inline u32 inotify_get_cookie(void)
+ {
+ 	return 0;
+ }
diff --git a/app-admin/gamin/gamin-0.0.26-r5.ebuild b/app-admin/gamin/gamin-0.0.26-r5.ebuild
new file mode 100644
index 000000000000..512ca0eaec44
--- /dev/null
+++ b/app-admin/gamin/gamin-0.0.26-r5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.0.26-r5.ebuild,v 1.1 2005/03/21 21:51:06 foser Exp $
+
+inherit eutils
+
+DESCRIPTION="Library providing the FAM File Alteration Monitor API"
+HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
+SRC_URI="http://www.gnome.org/~veillard/gamin/sources/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390"
+IUSE="debug doc"
+
+RDEPEND="virtual/libc
+	>=dev-libs/glib-2
+	!app-admin/fam"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PROVIDE="virtual/fam"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# patch to work with inotify 0.21
+	epatch ${FILESDIR}/${P}-inotify_use_fd.patch
+
+}
+
+src_compile() {
+
+	econf \
+		--enable-inotify \
+		`use_enable debug` \
+		`use_enable debug debug-api` \
+		|| die
+
+	emake || die "emake failed"
+
+}
+
+src_install() {
+
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt
+
+	use doc && dohtml doc/*
+
+}
+
+pkg_postinst() {
+
+	einfo "It is strongly suggested you use Gamin with an inotify enabled"
+	einfo "kernel for best performance. For this release of gamin you need"
+	einfo "at least an inotify-0.21 patched kernel."
+
+}