[patch] required patch

incron-0.4.0-gentoo.patch (text/plain), 8.09 KB, created by Wolfgang Herget on 2007-01-16 12:59:14 UTC

diff -iPu incron-0.4.0/Makefile incron-0.4.0-r1/Makefile
--- incron-0.4.0/Makefile	2007-01-13 17:46:45.000000000 +0000
+++ incron-0.4.0-r1/Makefile	2007-01-16 11:22:39.000000000 +0000
@@ -1,8 +1,9 @@
 
-PREFIX = /usr/local
-USERDATADIR = /var/spool/incron
-SYSDATADIR = /etc/incron.d
-MANPATH = /usr/share/man
+PREFIX = $(DESTDIR)usr
+USERDATADIR = $(DESTDIR)var/spool/incron
+SYSDATADIR = $(DESTDIR)etc/incron.d
+MANPATH = $(DESTDIR)usr/share/man
+INITDIR = $(DESTDIR)etc/init.d
 RELEASE = incron-`cat VERSION`
 RELEASEDIR = /tmp/$(RELEASE)
 
@@ -15,10 +16,11 @@
 DEBUG = -g0
 WARNINGS = -Wall
 CXXAUX = -pipe
+LDFLAGS += -Wl,-z,now
 
 CPPFLAGS = 
 CXXFLAGS = $(OPTIMIZE) $(DEBUG) $(WARNINGS) $(CXXAUX)
-LDFLAGS = $(WARNINGS)
+LDFLAGS += $(WARNINGS)
 
 PROGRAMS = incrond incrontab
 
@@ -45,8 +47,12 @@
 
 install:	all install-man
 	[ -d $(PREFIX) ]
+	$(INSTALL) -m 0755 -d $(PREFIX)/bin
+	$(INSTALL) -m 0755 -d $(PREFIX)/sbin
+	$(INSTALL) -m 0755 -d $(INITDIR)/
 	$(INSTALL) -m 04755 -o $(USER) incrontab $(PREFIX)/bin/
 	$(INSTALL) -m 0755 incrond $(PREFIX)/sbin/
+	$(INSTALL) -m 0755 incrond-init.d $(INITDIR)/incrond
 	$(INSTALL) -m 0755 -o $(USER) -d $(USERDATADIR)
 	$(INSTALL) -m 0755 -o $(USER) -d $(SYSDATADIR)
 
Common subdirectories: incron-0.4.0/doc and incron-0.4.0-r1/doc
diff -iPu incron-0.4.0/incrond-init.d incron-0.4.0-r1/incrond-init.d
--- incron-0.4.0/incrond-init.d	1970-01-01 00:00:00.000000000 +0000
+++ incron-0.4.0-r1/incrond-init.d	2007-01-16 11:23:29.000000000 +0000
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+
+
+depend() {
+	need localmount
+	use logger
+}
+
+start() {
+	ebegin "Starting incrond"
+	/usr/sbin/incrond 
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping incrond"
+	/usr/sbin/incrond -k
+	eend ${?}
+}
diff -iPu incron-0.4.0/inotify-cxx.h incron-0.4.0-r1/inotify-cxx.h
--- incron-0.4.0/inotify-cxx.h	2007-01-13 17:46:45.000000000 +0000
+++ incron-0.4.0-r1/inotify-cxx.h	2007-01-16 10:24:20.000000000 +0000
@@ -32,11 +32,11 @@
 
 // Please ensure that the following headers take the right place
 #include <sys/syscall.h>
-#include <sys/inotify.h>
+//#include <sys/inotify.h>
 
 // Use this if syscalls not defined
 #ifndef __NR_inotify_init
-#include <sys/inotify-syscalls.h>
+#include "inotify-nosys.h"
 #endif // __NR_inotify_init
 
 /// Event struct size
diff -iPu incron-0.4.0/inotify-nosys.h incron-0.4.0-r1/inotify-nosys.h
--- incron-0.4.0/inotify-nosys.h	1970-01-01 00:00:00.000000000 +0000
+++ incron-0.4.0-r1/inotify-nosys.h	2007-01-16 10:23:20.000000000 +0000
@@ -0,0 +1,167 @@
+/*
+ * This header is used if <sys/inotify.h> cannot be found.
+ *
+ * Inode based directory notification for Linux
+ *
+ * Copyright (C) 2005 John McCutchan
+ */
+
+#ifndef _LINUX_INOTIFY_H
+#define _LINUX_INOTIFY_H
+
+#include <stdint.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+
+/*
+ * struct inotify_event - structure read from the inotify device for each event
+ *
+ * When you are watching a directory, you will receive the filename for events
+ * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd.
+ */
+struct inotify_event {
+	int		wd;		/* watch descriptor */
+	uint32_t		mask;		/* watch mask */
+	uint32_t		cookie;		/* cookie to synchronize two events */
+	uint32_t		len;		/* length (including nulls) of name */
+	char		name __flexarr;	/* stub for possible name */
+};
+
+/* the following are legal, implemented events that user-space can watch for */
+#define IN_ACCESS		0x00000001	/* File was accessed */
+#define IN_MODIFY		0x00000002	/* File was modified */
+#define IN_ATTRIB		0x00000004	/* Metadata changed */
+#define IN_CLOSE_WRITE		0x00000008	/* Writtable file was closed */
+#define IN_CLOSE_NOWRITE	0x00000010	/* Unwrittable file closed */
+#define IN_OPEN			0x00000020	/* File was opened */
+#define IN_MOVED_FROM		0x00000040	/* File was moved from X */
+#define IN_MOVED_TO		0x00000080	/* File was moved to Y */
+#define IN_CREATE		0x00000100	/* Subfile was created */
+#define IN_DELETE		0x00000200	/* Subfile was deleted */
+#define IN_DELETE_SELF		0x00000400	/* Self was deleted */
+#define IN_MOVE_SELF		0x00000800	/* Self was moved */
+
+/* the following are legal events.  they are sent as needed to any watch */
+#define IN_UNMOUNT		0x00002000	/* Backing fs was unmounted */
+#define IN_Q_OVERFLOW		0x00004000	/* Event queued overflowed */
+#define IN_IGNORED		0x00008000	/* File was ignored */
+
+/* helper events */
+#define IN_CLOSE		(IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* close */
+#define IN_MOVE			(IN_MOVED_FROM | IN_MOVED_TO) /* moves */
+
+/* special flags */
+#define IN_ONLYDIR		0x01000000	/* only watch the path if it is a directory */
+#define IN_DONT_FOLLOW		0x02000000	/* don't follow a sym link */
+#define IN_MASK_ADD		0x20000000	/* add to the mask of an already existing watch */
+#define IN_ISDIR		0x40000000	/* event occurred against dir */
+#define IN_ONESHOT		0x80000000	/* only send event once */
+
+/*
+ * All of the events - we build the list by hand so that we can add flags in
+ * the future and not break backward compatibility.  Apps will get only the
+ * events that they originally wanted.  Be sure to add new events here!
+ */
+#define IN_ALL_EVENTS	(IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
+			 IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
+			 IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \
+			 IN_MOVE_SELF)
+
+#if defined (__alpha__)
+# define __NR_inotify_init 444
+# define __NR_inotify_add_watch 445
+# define __NR_inotify_rm_watch 446
+
+#elif defined (__arm__)
+# define __NR_inotify_init (__NR_SYSCALL_BASE+316)
+# define __NR_inotify_add_watch (__NR_SYSCALL_BASE+317)
+# define __NR_inotify_rm_watch (__NR_SYSCALL_BASE+318)
+
+#elif defined (__frv__)
+# define __NR_inotify_init 291
+# define __NR_inotify_add_watch 292
+# define __NR_inotify_rm_watch 293
+
+#elif defined(__i386__)
+# define __NR_inotify_init 291
+# define __NR_inotify_add_watch 292
+# define __NR_inotify_rm_watch 293
+
+#elif defined (__ia64__)
+# define __NR_inotify_init 1277
+# define __NR_inotify_add_watch 1278
+# define __NR_inotify_rm_watch 1279
+
+#elif defined (__mips__)
+# if _MIPS_SIM == _MIPS_SIM_ABI32
+#  define __NR_inotify_init (__NR_Linux + 284)
+#  define __NR_inotify_add_watch (__NR_Linux + 285)
+#  define __NR_inotify_rm_watch (__NR_Linux + 286)
+# endif
+# if _MIPS_SIM == _MIPS_SIM_ABI64
+#  define __NR_inotify_init (__NR_Linux + 243)
+#  define __NR_inotify_add_watch (__NR_Linux + 243)
+#  define __NR_inotify_rm_watch (__NR_Linux + 243)
+# endif
+# if _MIPS_SIM == _MIPS_SIM_NABI32
+#  define __NR_inotify_init (__NR_Linux + 247)
+#  define __NR_inotify_add_watch (__NR_Linux + 248)
+#  define __NR_inotify_rm_watch (__NR_Linux + 249)
+# endif
+
+#elif defined(__parisc__)
+# define __NR_inotify_init (__NR_Linux + 269)
+# define __NR_inotify_add_watch (__NR_Linux + 270)
+# define __NR_inotify_rm_watch (__NR_Linux + 271)
+
+#elif defined(__powerpc__) || defined(__powerpc64__)
+# define __NR_inotify_init 275
+# define __NR_inotify_add_watch 276
+# define __NR_inotify_rm_watch 277
+
+#elif defined (__s390__)
+# define __NR_inotify_init 284
+# define __NR_inotify_add_watch 285
+# define __NR_inotify_rm_watch 286
+
+#elif defined (__sh__)
+# define __NR_inotify_init 290
+# define __NR_inotify_add_watch 291
+# define __NR_inotify_rm_watch 292
+
+#elif defined (__sh64__)
+# define __NR_inotify_init 318
+# define __NR_inotify_add_watch 319
+# define __NR_inotify_rm_watch 320
+
+#elif defined (__sparc__) || defined (__sparc64__)
+# define __NR_inotify_init 151
+# define __NR_inotify_add_watch 152
+# define __NR_inotify_rm_watch 156
+
+#elif defined(__x86_64__)
+# define __NR_inotify_init 253
+# define __NR_inotify_add_watch 254
+# define __NR_inotify_rm_watch 255
+
+#else
+# error "Unsupported architecture!"
+#endif
+
+static inline int inotify_init (void)
+{
+	return syscall (__NR_inotify_init);
+}
+
+static inline int inotify_add_watch (int fd, const char *name, uint32_t mask)
+{
+	return syscall (__NR_inotify_add_watch, fd, name, mask);
+}
+
+static inline int inotify_rm_watch (int fd, uint32_t wd)
+{
+	return syscall (__NR_inotify_rm_watch, fd, wd);
+}
+
+
+#endif	/* _LINUX_INOTIFY_H */