Version bump, cleaned files/ dir.

7 files changed, 53 insertions, 2314 deletions

diff --git a/app-admin/fam-oss/ChangeLog b/app-admin/fam-oss/ChangeLog
index bc40897580d6..7fde68f3b9a0 100644
--- a/app-admin/fam-oss/ChangeLog
+++ b/app-admin/fam-oss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/fam-oss
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/ChangeLog,v 1.7 2002/07/25 12:57:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/ChangeLog,v 1.8 2002/08/16 15:39:48 aliz Exp $
+
+*fam-oss-2.6.9 (16 Aug 2002)
+
+  16 Aug 2002; Daniel Ahlberg <aliz@gentoo.org>
+  Version bump. Ebuild submitted by Felix Kurth <felix@fkurth.de>.
 
 *fam-oss-2.6.7-r1 (25 Jul 2002)
 
diff --git a/app-admin/fam-oss/fam-oss-2.6.9.ebuild b/app-admin/fam-oss/fam-oss-2.6.9.ebuild
new file mode 100644
index 000000000000..1c4f257fa1fa
--- /dev/null
+++ b/app-admin/fam-oss/fam-oss-2.6.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Joshua Pierre <joshua@swool.com>
+# /space/gentoo/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.7-r1.ebuild,v 1.2 2002/06/02 04:06:49 prez Exp
+
+inherit libtool
+
+MY_P=${P/-oss/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="FAM, the File Alteration Monitor."
+SRC_URI=ftp://oss.sgi.com/projects/fam/download/${MY_P}.tar.gz"
+	ftp://oss.sgi.com/projects/fam/download/contrib/dnotify.patch"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+KEYWORDS="x86"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+DEPEND=">=sys-devel/perl-5.6.1"
+
+RDEPEND=">=net-nds/portmap-5b-r6"
+
+src_unpack() {
+
+	unpack ${MY_P}.tar.gz
+
+	cd ${S}
+	patch -p1 < ${DISTDIR}/dnotify.patch || die
+	patch -p1 < ${FILESDIR}/${PF}-gcc3.patch || die
+
+	cp ${FILESDIR}/${PF}-aclocal.m4 aclocal.m4
+	elibtoolize
+	aclocal
+	autoconf
+	autoheader
+	automake --add-missing
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		install || die
+	     
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/fam
+	
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS TODO README*
+}
diff --git a/app-admin/fam-oss/files/digest-fam-oss-2.6.9 b/app-admin/fam-oss/files/digest-fam-oss-2.6.9
new file mode 100644
index 000000000000..242f0bac17c8
--- /dev/null
+++ b/app-admin/fam-oss/files/digest-fam-oss-2.6.9
@@ -0,0 +1,2 @@
+MD5 8b647472152940b9789e649fa2734443 fam-2.6.9.tar.gz 282627
+MD5 ea0b75543516dcfb3dbf48576ad83942 dnotify.patch 28962
diff --git a/app-admin/fam-oss/files/fam-oss-2.6.4-creds.patch b/app-admin/fam-oss/files/fam-oss-2.6.4-creds.patch
deleted file mode 100644
index f534061542fa..000000000000
--- a/app-admin/fam-oss/files/fam-oss-2.6.4-creds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur fam-oss-2.6.4.orig/fam/Listener.c++ fam-oss-2.6.4/fam/Listener.c++
---- fam-oss-2.6.4.orig/fam/Listener.c++	Tue Aug  7 13:03:44 2001
-+++ fam-oss-2.6.4/fam/Listener.c++	Tue Aug  7 14:52:08 2001
-@@ -213,6 +213,7 @@
-     strcpy(sun.sun_path, tmpfile);
-     free(tmpfile);
- 
-+    Cred::SuperUser.become_user();
-     int client_sock = socket(PF_UNIX, SOCK_STREAM, 0);
-     if (client_sock < 0)
-     {   Log::perror("localclient socket(PF_UNIX, SOCK_STREAM, 0)");
diff --git a/app-admin/fam-oss/files/fam-oss-2.6.4-dnotify.patch b/app-admin/fam-oss/files/fam-oss-2.6.4-dnotify.patch
deleted file mode 100644
index 498ff88a97dd..000000000000
--- a/app-admin/fam-oss/files/fam-oss-2.6.4-dnotify.patch
+++ /dev/null
@@ -1,1093 +0,0 @@
-diff -ur fam-oss-2.6.4/acconfig.h fam-oss-2.6.4-alex/acconfig.h
---- fam-oss-2.6.4/acconfig.h	Mon Jul  2 11:43:38 2001
-+++ fam-oss-2.6.4-alex/acconfig.h	Mon Jul  2 11:43:46 2001
-@@ -17,6 +17,9 @@
- /*  Define if the system has imon and IMONIOC_ ioctl flags.  */
- #undef HAVE_IMON
- 
-+/*  Define if the system has the dnotify fcntl and it's gonna be used.  */
-+#undef USE_DNOTIFY
-+
- /*  Define if the system has the struct revokdi and the IMONIOC_REVOKDI
- **  ioctl flag.  (IRIX 5.3 doesn't.)
- */
-diff -ur fam-oss-2.6.4/configure.in fam-oss-2.6.4-alex/configure.in
---- fam-oss-2.6.4/configure.in	Mon Jul  2 11:43:38 2001
-+++ fam-oss-2.6.4-alex/configure.in	Mon Jul  2 11:43:45 2001
-@@ -39,6 +39,9 @@
- dnl  Put configuration #defines in config.h.
- AM_CONFIG_HEADER(config.h)
- 
-+dnl Initialize libtool
-+AM_PROG_LIBTOOL
-+
- dnl
- dnl  We want to include our header in $(top_srcdir)/include
- dnl
-@@ -79,14 +82,14 @@
- dnl I don't know why, but automake wants to use ./mkinstalldirs.
- dnl AC_PATH_PROG(MKINSTALLDIRS, mkinstalldirs)
- AC_PROG_MAKE_SET
-+
-+
- dnl AC_PROG_AWK
- dnl AC_PATH_PROG(LIBTOOL, libtool)
--AM_PROG_LIBTOOL
- dnl  autoconf/automake expects GNU tar, so find it on IRIX.
- AC_PATH_PROG(TAR, tar, tar, /usr/freeware/bin:$PATH)
- AC_PATH_PROG(LDCONFIG, ldconfig)
- 
--
- dnl
- dnl  Checks for header files.
- dnl
-@@ -96,6 +99,24 @@
- dnl AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h syslog.h unistd.h)
- 
- dnl
-+dnl  Test for the linux dnotify fcntl
-+dnl
-+AC_MSG_CHECKING([for dnotify fcntl support])
-+fam_save_cppflags="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-+AC_TRY_COMPILE([
-+#define _GNU_SOURCE  
-+#include <fcntl.h>
-+#include <unistd.h>
-+],
-+[ int fd = 1;
-+  fcntl (fd, F_NOTIFY, (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB)|DN_MULTISHOT);
-+], have_dnotify=yes, have_dnotify=no)
-+use_dnotify=false
-+CPPFLAGS="$pango_save_cppflags"
-+AC_MSG_RESULT($have_dnotify)
-+
-+dnl
- dnl  See if imon is available; if so, is it IRIX or Linux?
- dnl
- if test `uname` = 'IRIX' || test `uname` = 'IRIX64'; then
-@@ -118,11 +136,17 @@
- if test "$have_imon" != "yes"; then
-     have_imon=no
-     AC_DEFINE(HAVE_IMON, 0)
-+    if test "$have_dnotify" = "yes"; then
-+        AC_DEFINE(USE_DNOTIFY)
-+	use_dnotify=true
-+    fi
-     IMON_FUNCS=IMonNone
- fi
-+AM_CONDITIONAL(USE_DNOTIFY, $use_dnotify)
- AC_SUBST(IMON_FUNCS)
- echo "Using imon support module $IMON_FUNCS"
- 
-+
- AC_CHECK_HEADER(sys/statvfs.h, [AC_DEFINE(HAVE_STATVFS, 1) have_statvfs="yes"], [AC_DEFINE(HAVE_STATVFS, 0) have_statvfs="no"])
- AC_CHECK_HEADER(sys/syssgi.h,  AC_DEFINE(HAVE_SYSSGI,  1), AC_DEFINE(HAVE_SYSSGI,  0))
- AC_CHECK_HEADER(sys/fs/nfs_clnt.h, AC_DEFINE(HAVE_SYS_FS_NFS_CLNT_H, 1), AC_DEFINE(HAVE_SYS_FS_NFS_CLNT_H, 0))
-@@ -560,7 +584,7 @@
- dnl 
- dnl  fam is a good deal less interesting without imon.
- dnl 
--if test "$have_imon" != 'yes'; then
-+if test "$have_imon" != 'yes' -a "$have_dnotify" != 'yes'; then
-     cat << EOF
- 
-   ******************************************************************
-diff -ur fam-oss-2.6.4/fam/IMon.h fam-oss-2.6.4-alex/fam/IMon.h
---- fam-oss-2.6.4/fam/IMon.h	Mon Jul  2 11:43:36 2001
-+++ fam-oss-2.6.4-alex/fam/IMon.h	Mon Jul  2 11:43:40 2001
-@@ -24,10 +24,7 @@
- #define IMon_included
- 
- #include "config.h"
--#include <sys/stat.h>
--#include <sys/types.h>
--
--#include "Boolean.h"
-+#include "Monitor.h"
- 
- struct stat;
- 
-@@ -41,25 +38,18 @@
- //
- //  The user of the IMon object is the Interest class.
- 
--class IMon {
-+class IMon : public Monitor {
- 
- public:
--
--    enum Status { OK = 0, BAD = -1 };
--    enum Event { EXEC, EXIT, CHANGE };
--
--    typedef void (*EventHandler)(dev_t, ino_t, int event);
--
-     IMon(EventHandler h);
-     ~IMon();
- 
-     static bool is_active();
- 
--    Status express(const char *name, struct stat *stat_return);
--    Status revoke(const char *name, dev_t dev, ino_t ino);
-+    virtual Status express(const char *name, struct stat *stat_return);
-+    virtual Status revoke(const char *name, dev_t dev, ino_t ino);
- 
- private:
--
-     //  Class Variables
- 
-     static int imonfd;
-diff -ur fam-oss-2.6.4/fam/Interest.c++ fam-oss-2.6.4-alex/fam/Interest.c++
---- fam-oss-2.6.4/fam/Interest.c++	Mon Jul  2 11:43:36 2001
-+++ fam-oss-2.6.4-alex/fam/Interest.c++	Mon Jul  2 11:43:38 2001
-@@ -41,12 +41,21 @@
- #include "Event.h"
- #include "FileSystem.h"
- #include "IMon.h"
-+#include "DNotify.h"
- #include "Log.h"
- #include "Pollster.h"
- #include "timeval.h"
- 
- Interest *Interest::hashtable[];
--IMon      Interest::imon(imon_handler);
-+
-+#ifdef USE_DNOTIFY 
-+static DNotify dnotify(Interest::monitor_handler);
-+Monitor * Interest::monitor = &dnotify;
-+#else
-+static IMon imon(Interest::monitor_handler);
-+Monitor * Interest::monitor = &imon;
-+#endif
-+
- bool      Interest::xtab_verification = true;
- 
- Interest::Interest(const char *name, FileSystem *fs, in_addr host, ExportVerification ev)
-@@ -58,11 +67,11 @@
-       myhost(host),
-       mypath_exported_to_host(ev == NO_VERIFY_EXPORTED)
- {
--    memset(&old_stat, 0, sizeof(old_stat)); 
--    IMon::Status s = IMon::BAD;
--
--    s = imon.express(name, &old_stat);
--    if (s != IMon::OK)
-+    memset(&old_stat, 0, sizeof(old_stat));
-+    
-+    Monitor::Status s = Monitor::BAD;
-+    s = monitor->express(name, &old_stat);
-+    if (s != Monitor::OK)
-     {   int rc = lstat(name, &old_stat);
- 	if (rc < 0)
- 	{   Log::info("can't lstat %s", name);
-@@ -95,7 +104,7 @@
-     }
- #endif
- 
--    if (exported_to_host()) fs->ll_monitor(this, s == IMon::OK);
-+    if (exported_to_host()) fs->ll_monitor(this, s == Monitor::OK);
- }
- 
- Interest::~Interest()
-@@ -123,7 +132,7 @@
- 		pp = &p->hashlink;	// move to next element
- 	    }
- 	if (!found_same)
--	    (void) imon.revoke(name(), dev, ino);
-+	  (void) monitor->revoke(name(), dev, ino);
-     }
- }
- 
-@@ -147,7 +156,7 @@
- 
- 	// Express interest.
- 
--	imon.express(name(), NULL);
-+	monitor->express(name(), NULL);
-     }
-     else
- 	hashlink = NULL;
-@@ -221,23 +230,23 @@
- }
- 
- void
--Interest::imon_handler(dev_t device, ino_t inumber, int event)
-+Interest::monitor_handler(dev_t device, ino_t inumber, int event)
- {
-     assert(device || inumber);
- 
-     for (Interest *p = *hashchain(device, inumber), *next = p; p; p = next)
-     {	next = p->hashlink;
- 	if (p->ino == inumber && p->dev == device)
--	{   if (event == IMon::EXEC)
-+	  {   if (event == Monitor::EXEC)
- 	    {   p->cur_exec_state = EXECUTING;
- 		(void) p->report_exec_state();
- 	    }
--	    else if (event == IMon::EXIT)
-+	    else if (event == Monitor::EXIT)
- 	    {   p->cur_exec_state = NOT_EXECUTING;
- 		(void) p->report_exec_state();
- 	    }
- 	    else
--	    {   assert(event == IMon::CHANGE);
-+	    {   assert(event == Monitor::CHANGE);
- 		p->scan();
- 	    }
- 	}
-diff -ur fam-oss-2.6.4/fam/Interest.h fam-oss-2.6.4-alex/fam/Interest.h
---- fam-oss-2.6.4/fam/Interest.h	Mon Jul  2 11:43:36 2001
-+++ fam-oss-2.6.4-alex/fam/Interest.h	Mon Jul  2 11:43:39 2001
-@@ -32,7 +32,7 @@
- 
- class Event;
- class FileSystem;
--class IMon;
-+class Monitor;
- struct stat;
- 
- //  Interest -- abstract base class for filesystem entities of interest.
-@@ -74,7 +74,7 @@
- 
-     //  Public Class Method
- 
--    static void imon_handler(dev_t, ino_t, int event);
-+    static void monitor_handler(dev_t, ino_t, int event);
- 
-     static void enable_xtab_verification(bool enable);
- 
-@@ -120,7 +120,7 @@
- 
-     //  Class Variables
- 
--    static IMon imon;
-+    static Monitor *monitor;
-     static Interest *hashtable[HASHSIZE];
-     static bool xtab_verification;
- 
-diff -ur fam-oss-2.6.4/fam/Makefile.am fam-oss-2.6.4-alex/fam/Makefile.am
---- fam-oss-2.6.4/fam/Makefile.am	Mon Jul  2 11:43:36 2001
-+++ fam-oss-2.6.4-alex/fam/Makefile.am	Mon Jul  2 11:43:39 2001
-@@ -3,6 +3,12 @@
- bin_PROGRAMS = fam
- sysconf_DATA = fam.conf
- 
-+if USE_DNOTIFY
-+DNOTIFY_FILES = DNotify.c++
-+else
-+DNOTIFY_FILES =
-+endif
-+
- fam_SOURCES = \
-   Activity.c++ \
-   Activity.h \
-@@ -20,6 +26,7 @@
-   Directory.h \
-   DirectoryScanner.c++ \
-   DirectoryScanner.h \
-+  DNotify.h \
-   Event.c++ \
-   Event.h \
-   File.c++ \
-@@ -48,6 +55,7 @@
-   NFSFileSystem.h \
-   NetConnection.c++ \
-   NetConnection.h \
-+  Monitor.h \
-   Pollster.c++ \
-   Pollster.h \
-   Request.h \
-@@ -72,9 +80,10 @@
-   main.c++ \
-   timeval.c++ \
-   timeval.h \
--  @IMON_FUNCS@.c++
-+  @IMON_FUNCS@.c++ \
-+  $(DNOTIFY_FILES)
- 
--EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
-+EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ DNotify.c++
- 
- fam_LDADD = -lrpcsvc $(top_srcdir)/support/libsupport.a
- 
-diff -ur fam-oss-2.6.4/include/BTree.h fam-oss-2.6.4-alex/include/BTree.h
---- fam-oss-2.6.4/include/BTree.h	Mon Jul  2 11:43:38 2001
-+++ fam-oss-2.6.4-alex/include/BTree.h	Mon Jul  2 11:43:45 2001
-@@ -271,7 +271,7 @@
-     n += that->n + 1;
-     link[n] = that->link[that->n];
-     that->n = 0;
--    that->link[0] = NULL;
-+    that->link[0] = 0;
- }
- 
- ///////////////////////////////////////////////////////////////////////////////
-@@ -280,7 +280,7 @@
- 
- template <class K, class V>
- BTree<K, V>::BTree()
--    : root(NULL), npairs(0)
-+    : root(0), npairs(0)
- {
-     assert(!(fanout % 2));
- }
-@@ -407,7 +407,7 @@
- BTree<Key, Value>::Closure
- BTree<Key, Value>::insert(Node *p, const Key& key, const Value& value)
- {
--    if (!p) return Closure(key, value, NULL);
-+    if (!p) return Closure(key, value, 0);
-     //  If you're running Purify on a client linking with libfam, and it says
-     //  that line is causing a 3-byte UMR for BTree<int, bool>::insert() in
-     //  FAMNextEvent() ("Reading 8 bytes from 0x... on the stack (3 bytes at
-@@ -475,7 +475,7 @@
-     case UNDER:
- 	if (root->n == 0)
- 	{   Node *nr = root->link[0];
--	    root->link[0] = NULL;	// don't delete subtree
-+	    root->link[0] = 0;	// don't delete subtree
- 	    delete root;
- 	    root = nr;
- 	}
-@@ -507,8 +507,8 @@
-     Node *cp = p->link[i];
-     assert(cp);
-     
--    Node *rp = i < p->n ? p->link[i + 1] : NULL;
--    Node *lp = i > 0    ? p->link[i - 1] : NULL;
-+    Node *rp = i < p->n ? p->link[i + 1] : 0;
-+    Node *lp = i > 0    ? p->link[i - 1] : 0;
-     assert(!rp || rp->n >= fanout / 2);
-     assert(!lp || lp->n >= fanout / 2);
- 
-diff -ur fam-oss-2.6.4/test/test.c++ fam-oss-2.6.4-alex/test/test.c++
---- fam-oss-2.6.4/test/test.c++	Mon Jul  2 11:43:37 2001
-+++ fam-oss-2.6.4-alex/test/test.c++	Mon Jul  2 11:43:44 2001
-@@ -5,6 +5,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <stdarg.h>
-+#include <stdlib.h>
- //#include <fcntl.h>
- #include "fam.h"
- //#include "Boolean.h"
---- /dev/null	Fri Mar 23 23:37:44 2001
-+++ fam-oss-2.6.4-alex/fam/Monitor.h	Mon Jul  2 11:43:44 2001
-@@ -0,0 +1,57 @@
-+//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
-+//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
-+//  
-+//  This program is free software; you can redistribute it and/or modify it
-+//  under the terms of version 2 of the GNU General Public License as
-+//  published by the Free Software Foundation.
-+//
-+//  This program is distributed in the hope that it would be useful, but
-+//  WITHOUT ANY WARRANTY; without even the implied warranty of
-+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
-+//  license provided herein, whether implied or otherwise, is limited to
-+//  this program in accordance with the express provisions of the GNU
-+//  General Public License.  Patent licenses, if any, provided herein do not
-+//  apply to combinations of this program with other product or programs, or
-+//  any other product whatsoever.  This program is distributed without any
-+//  warranty that the program is delivered free of the rightful claim of any
-+//  third person by way of infringement or the like.  See the GNU General
-+//  Public License for more details.
-+//
-+//  You should have received a copy of the GNU General Public License along
-+//  with this program; if not, write the Free Software Foundation, Inc., 59
-+//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
-+
-+#ifndef Monitor_included
-+#define Monitor_included
-+
-+#include "config.h"
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+
-+struct stat;
-+
-+//  Monitor is an abstract baseclass for differend file monitoring
-+//  systems. The original system used was IMon, and the Montor API
-+//  is heavily influenced by that.
-+//  There can only be one instantiation of the Monitor object.
-+//
-+//  The user of this object uses express() and revoke() to
-+//  express/revoke interest in a file to imon.  There is also
-+//  a callback, the EventHandler.  When an event comes in,
-+//  the EventHandler is called.
-+//
-+//  The main implementers of the Monitor class is IMon and DNotify
-+
-+class Monitor {
-+public:
-+
-+    enum Status { OK = 0, BAD = -1 };
-+    enum Event { EXEC, EXIT, CHANGE };
-+
-+    typedef void (*EventHandler)(dev_t, ino_t, int event);
-+
-+    virtual Status express(const char *name, struct stat *stat_return) = 0;
-+    virtual Status revoke(const char *name, dev_t dev, ino_t ino) = 0;
-+};
-+
-+#endif /* !Monitor_included */
---- /dev/null	Fri Mar 23 23:37:44 2001
-+++ fam-oss-2.6.4-alex/fam/DNotify.c++	Mon Jul  2 15:55:32 2001
-@@ -0,0 +1,557 @@
-+//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
-+//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
-+//  
-+//  This program is free software; you can redistribute it and/or modify it
-+//  under the terms of version 2 of the GNU General Public License as
-+//  published by the Free Software Foundation.
-+//
-+//  This program is distributed in the hope that it would be useful, but
-+//  WITHOUT ANY WARRANTY; without even the implied warranty of
-+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
-+//  license provided herein, whether implied or otherwise, is limited to
-+//  this program in accordance with the express provisions of the GNU
-+//  General Public License.  Patent licenses, if any, provided herein do not
-+//  apply to combinations of this program with other product or programs, or
-+//  any other product whatsoever.  This program is distributed without any
-+//  warranty that the program is delivered free of the rightful claim of any
-+//  third person by way of infringement or the like.  See the GNU General
-+//  Public License for more details.
-+//
-+//  You should have received a copy of the GNU General Public License along
-+//  with this program; if not, write the Free Software Foundation, Inc., 59
-+//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
-+
-+#define _GNU_SOURCE  
-+#include <fcntl.h>
-+
-+#include <string.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <libgen.h>
-+
-+#include "DNotify.h"
-+
-+#include "Interest.h"
-+#include "Log.h"
-+#include "Scheduler.h"
-+#include "alloc.h"
-+
-+
-+int DNotify::pipe_write_fd = -2;
-+int DNotify::pipe_read_fd = -2;
-+volatile sig_atomic_t DNotify::queue_overflowed = 0;
-+volatile sig_atomic_t DNotify::queue_changed = 0;
-+int DNotify::change_queue[QUEUESIZE];
-+volatile int DNotify::queue_head = 0; // Only modified by read handler
-+volatile int DNotify::queue_tail = 0; // Only modified by signal handler
-+DNotify::EventHandler DNotify::ehandler;
-+
-+DNotify::DirWatch *DNotify::dir_hash[DIR_HASHSIZE];
-+DNotify::FileWatch *DNotify::file_hash[FILE_HASHSIZE];
-+
-+struct DNotify::FileWatch
-+{
-+    DirWatch *dir_watch;
-+    dev_t file_dev;
-+    ino_t file_ino;
-+    FileWatch *next; // The DirWatch.watches list
-+    FileWatch *hash_link;
-+};
-+
-+struct DNotify::DirWatch
-+{
-+    int fd;
-+    dev_t dir_dev;
-+    ino_t dir_ino;
-+    
-+    DirWatch *hash_link;
-+    FileWatch *watches;
-+};
-+
-+DNotify::DNotify(EventHandler h)
-+{
-+    assert(ehandler == NULL);
-+    ehandler = h;
-+}
-+
-+DNotify::~DNotify()
-+{
-+    if (pipe_read_fd >= 0)
-+    {
-+	//  Tell the scheduler.
-+
-+	(void) Scheduler::remove_read_handler(pipe_read_fd);
-+
-+	//  Close the pipe.
-+
-+	if (close(pipe_read_fd) < 0)
-+	    Log::perror("can't pipe read end");
-+	else
-+	    Log::debug("closed pipe read end");
-+	
-+	if (close(pipe_write_fd) < 0)
-+	    Log::perror("can't pipe write end");
-+	else
-+	    Log::debug("closed pipe write end");
-+	pipe_read_fd = -1;
-+    }
-+    ehandler = NULL;
-+}
-+
-+void
-+DNotify::overflow_signal_handler(int sig, siginfo_t *si, void *data)
-+{
-+  char c = 'x';
-+  
-+  {
-+    char *str = "*************** overflow sigqueue ***********************\n";
-+    write (0, str, strlen(str));
-+  }
-+
-+  if (!queue_overflowed)
-+  {
-+      queue_overflowed = 1;
-+      // Trigger the read handler
-+      write(pipe_write_fd, &c, 1);
-+  }
-+}
-+
-+void
-+DNotify::signal_handler(int sig, siginfo_t *si, void *data)
-+{
-+  int left;
-+  char c = 'x';
-+
-+  if (queue_head <= queue_tail)
-+    left = (QUEUESIZE + queue_head) - queue_tail;
-+  else 
-+    left = queue_head - queue_tail;
-+  
-+  // Must leave at least one item unused to see difference
-+  // Betweeen empty and full
-+  if (left <= 1)
-+  {
-+      queue_overflowed = 1;
-+      {
-+	char *str = "*************** overflow famqueue ****************\n";
-+	write (0, str, strlen(str));
-+      }
-+  }
-+  else
-+  {
-+      change_queue[queue_tail] = si->si_fd;
-+      queue_tail = (queue_tail + 1) % QUEUESIZE;
-+  }
-+  
-+  if (!queue_changed)
-+  {
-+      queue_changed = 1;
-+      // Trigger the read handler
-+      write(pipe_write_fd, &c, 1);
-+  }
-+}
-+
-+bool
-+DNotify::is_active()
-+{
-+    if (pipe_read_fd == -2)
-+    {
-+        int filedes[2];
-+	int res;
-+	
-+	res = pipe (filedes);
-+	if (res >= 0)
-+	{   Log::debug("opened pipe");
-+   	    pipe_read_fd = filedes[0];
-+   	    pipe_write_fd = filedes[1];
-+
-+	    // Setup signal handler:
-+	    struct sigaction act;
-+	    
-+	    act.sa_sigaction = signal_handler;
-+	    sigemptyset(&act.sa_mask);
-+	    act.sa_flags = SA_SIGINFO;
-+	    sigaction(SIGRTMIN, &act, NULL);
-+
-+	    // When the RT queue overflows we get a SIGIO
-+	    act.sa_sigaction = overflow_signal_handler;
-+	    sigemptyset(&act.sa_mask);
-+	    sigaction(SIGIO, &act, NULL);
-+
-+	    (void) Scheduler::install_read_handler(pipe_read_fd, read_handler, NULL);
-+	}
-+    }
-+    return pipe_read_fd >= 0;
-+}
-+
-+DNotify::DirWatch *
-+DNotify::lookup_dirwatch (int fd)
-+{
-+  DirWatch **p;
-+  DirWatch *w;
-+
-+  p = dir_hashchain (fd);
-+
-+  while (*p)
-+    {
-+      w = *p;
-+
-+      if (w->fd == fd)
-+	return w;
-+
-+      p = &w->hash_link;
-+    }
-+  
-+  return *p;
-+}
-+
-+// This colud be made faster by using another hash table.
-+// But it's not that bad, since it is only used by express/revoke
-+DNotify::DirWatch *
-+DNotify::lookup_dirwatch (dev_t dir_dev, ino_t dir_ino)
-+{
-+  DirWatch *p;
-+  int i;
-+
-+  for (i=0;i<DIR_HASHSIZE;i++)
-+    {
-+      p = dir_hash[i];
-+      
-+      while (p)
-+	{
-+	  if (p->dir_dev == dir_dev && p->dir_ino == dir_ino)
-+	    return p;
-+	  
-+	  p = p->hash_link;
-+	}
-+    }
-+  
-+  return NULL;
-+}
-+
-+DNotify::FileWatch *
-+DNotify::lookup_filewatch (dev_t dev, ino_t ino)
-+{
-+  FileWatch **p;
-+  FileWatch *w;
-+
-+  p = file_hashchain (dev, ino);
-+
-+  while (*p)
-+    {
-+      w = *p;
-+
-+      if (w->file_dev == dev && w->file_ino == ino)
-+	return w;
-+
-+      p = &w->hash_link;
-+    }
-+  
-+  return *p;
-+}
-+
-+// Make sure w is not already in the hash table before calling
-+// this function.
-+void
-+DNotify::hash_dirwatch(DirWatch *w)
-+{
-+  DirWatch **p;
-+  p = dir_hashchain (w->fd);
-+  w->hash_link = *p;
-+  *p = w;
-+}
-+
-+// Make sure w is not already in the hash table before calling
-+// this function.
-+void
-+DNotify::hash_filewatch(FileWatch *w)
-+{
-+  FileWatch **p;
-+  p = file_hashchain (w->file_dev, w->file_ino);
-+  w->hash_link = *p;
-+  *p = w;
-+}
-+
-+void
-+DNotify::unhash_dirwatch(DirWatch *w)
-+{
-+  DirWatch **p;
-+  
-+  p = dir_hashchain (w->fd);
-+  
-+  while (*p)
-+    {
-+      if (*p == w)
-+	{
-+	  *p = w->hash_link;
-+	  break;
-+	}
-+      p = &(*p)->hash_link;
-+    }
-+  w->hash_link = NULL;
-+}
-+
-+void
-+DNotify::unhash_filewatch(FileWatch *w)
-+{
-+  FileWatch **p;
-+  
-+  p = file_hashchain (w->file_dev, w->file_ino);
-+  
-+  while (*p)
-+    {
-+      if (*p == w)
-+	{
-+	  *p = w->hash_link;
-+	  break;
-+	}
-+      p = &(*p)->hash_link;
-+    }
-+  w->hash_link = NULL;
-+}
-+
-+DNotify::Status
-+DNotify::watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino)
-+{
-+  struct stat stat;
-+  dev_t dir_dev;
-+  ino_t dir_ino;
-+  DirWatch *dwatch;
-+  FileWatch **p;
-+  FileWatch *fw;
-+    
-+  if (lstat (notify_dir, &stat) == -1)
-+      return BAD;
-+  
-+  dwatch = lookup_dirwatch(stat.st_dev, stat.st_ino);
-+  if (!dwatch)
-+    {
-+      Log::debug ("New DirWatch for %s (%x %x)\n",
-+		  notify_dir, (int)stat.st_dev, (int)stat.st_ino);
-+      dwatch = new DirWatch;
-+      dwatch->watches = NULL;
-+      dwatch->hash_link = NULL;
-+      dwatch->dir_dev = stat.st_dev;
-+      dwatch->dir_ino = stat.st_ino;
-+      
-+      dwatch->fd = open(notify_dir, O_RDONLY);
-+      fcntl (dwatch->fd, F_SETSIG, SIGRTMIN);
-+      fcntl (dwatch->fd, F_NOTIFY,
-+	     (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB) | DN_MULTISHOT);
-+      hash_dirwatch (dwatch);
-+    }
-+
-+  for (p=&dwatch->watches; *p; p=&(*p)->next)
-+    {
-+      fw = *p;
-+      if (fw->file_dev == file_dev && fw->file_ino == file_ino)
-+	return OK;
-+    }
-+  
-+  // No old FileWatch, need to add one:
-+  Log::debug("New FileWatch for %x %x\n", (int)file_dev, (int)file_ino);
-+  *p = new FileWatch;
-+  fw = *p;
-+  fw->next = NULL;
-+  fw->file_dev = file_dev;
-+  fw->file_ino = file_ino;
-+  fw->dir_watch = dwatch;
-+  hash_filewatch(fw);
-+  return OK;
-+}
-+
-+char *
-+dirname_dup (const char *name)
-+{
-+  char *copy = strdup(name);
-+  char *res = dirname(copy);
-+  res = strdup(res);
-+  free (copy);
-+  return res;
-+}
-+
-+DNotify::Status
-+DNotify::express(const char *name, struct stat *status)
-+{
-+    struct stat stat;
-+    char *notify_dir;
-+    int res;
-+    Status s;
-+    dev_t dev;
-+    ino_t ino;
-+
-+    Log::debug("express() name: %s\n", name);
-+
-+    if (!is_active())
-+	return BAD;
-+
-+    if (::lstat (name, &stat) == -1)
-+      return BAD;
-+
-+    dev = stat.st_dev;
-+    ino = stat.st_ino;
-+    
-+    if ((stat.st_mode & S_IFMT) != S_IFDIR)
-+	notify_dir = dirname_dup (name);
-+    else
-+	notify_dir = (char *)name;
-+
-+    s = watch_dir (notify_dir, dev, ino);
-+    if (notify_dir != name)
-+        free (notify_dir);
-+    if (s)
-+      return s;
-+
-+    // Check for a race condition; if someone removed or changed the
-+    // file at the same time that we are expressing interest in it,
-+    // revoke the interest so we don't get notifications about changes
-+    // to a recycled inode that we don't otherwise care about.
-+    //
-+    struct stat st;
-+    if (status == NULL) {
-+	status = &st;
-+    }
-+    if (::lstat(name, status) == -1) {
-+	Log::perror("stat on \"%s\" failed", name);
-+	revoke(name, stat.st_dev, stat.st_ino);
-+	return BAD;
-+    }
-+    if (status->st_dev != stat.st_dev
-+	|| status->st_ino != stat.st_ino) {
-+	Log::error("File \"%s\" changed between express and stat",
-+		   name);
-+	revoke(name, stat.st_dev, stat.st_ino);
-+	return BAD;
-+    }	
-+
-+    Log::debug("told dnotify to monitor \"%s\" = dev %d/%d, ino %d", name,
-+	       major(status->st_dev), minor(status->st_dev),
-+	       status->st_ino);
-+    return OK;
-+}
-+
-+DNotify::Status
-+DNotify::revoke(const char *name, dev_t dev, ino_t ino)
-+{
-+    FileWatch *fwatch;
-+    DirWatch *dwatch;
-+    
-+    Log::debug("revoke() name: %s, dev: %x, ino: %x\n", name, dev, ino);
-+
-+    if (!is_active())
-+	return BAD;
-+
-+    // Lookup FileWatch by dev:ino, and its DirWatch.
-+    fwatch = lookup_filewatch (dev, ino);
-+    if (fwatch == NULL)
-+	return BAD;
-+    
-+    dwatch = fwatch->dir_watch;
-+    
-+    // delete FileWatch, if last FileWatch: close fd, delete DirWatch
-+    Log::debug ("Destroying FileWatch for (%x %x)\n",
-+		(int)fwatch->file_dev, (int)fwatch->file_ino);
-+    FileWatch **p;
-+    for (p=&dwatch->watches; *p; p=&(*p)->next)
-+    {
-+      if (*p == fwatch)
-+	{
-+	  *p = (*p)->next;
-+	  break;
-+	}
-+    }
-+    unhash_filewatch(fwatch);
-+    delete fwatch;
-+    if (dwatch->watches == NULL)
-+      {
-+	Log::debug ("Destroying DirWatch for (%x %x)\n",
-+		    (int)dwatch->dir_dev, (int)dwatch->dir_ino);
-+	close(dwatch->fd);
-+	unhash_dirwatch(dwatch);
-+	delete dwatch;
-+      }
-+  
-+    return OK;
-+}
-+
-+
-+void
-+DNotify::all_watches_changed(void)
-+{
-+  int i;
-+  FileWatch *fw;
-+
-+  for (i=0; i<FILE_HASHSIZE; i++)
-+  {
-+      fw = file_hash[i];
-+      while (fw)
-+      {
-+	  (*ehandler)(fw->file_dev, fw->file_ino, CHANGE);
-+
-+	  fw = fw->hash_link;
-+      }
-+  }
-+}
-+
-+
-+void
-+DNotify::read_handler(int fd, void *)
-+{
-+    static char readbuf[5000];
-+    DirWatch *dw;
-+    FileWatch *fw;
-+    int snap_queue_tail;
-+    int last_fd;
-+
-+    int rc = read(fd, readbuf, sizeof readbuf);
-+    queue_changed = 0;
-+    if (rc < 0)
-+        Log::perror("pipe read");
-+    else if (queue_overflowed)
-+    {
-+	  // There is a *slight* race condition here. Between reading
-+	  // the queue_overflow flag and resetting it. But it doesn't
-+	  // matter, since I'm gonna handle the overflow after reseting
-+	  // anyway.
-+	  queue_overflowed = false;
-+
-+	  // We're soon gonna check all watches anyway, so
-+	  // get rid of the current queue
-+	  queue_head = queue_tail;
-+	  
-+	  all_watches_changed ();
-+    }
-+    else
-+    {
-+	// Don't read events that happen later than
-+	// the initial read. (Otherwise skipping fd's
-+	// might miss some changes).
-+	snap_queue_tail = queue_tail;
-+	last_fd = -1;
-+	while (queue_head != snap_queue_tail)
-+	{
-+	    fd = change_queue[queue_head];
-+	    queue_head = (queue_head + 1) % QUEUESIZE;
-+
-+	    // Skip multiple changes to the same fd
-+	    if (fd != last_fd)
-+	    {
-+		dw = lookup_dirwatch (fd);
-+		if (dw)
-+		{
-+		    Log::debug("dnotify said dev %d/%d, ino %ld changed",
-+			       major(dw->dir_dev), minor(dw->dir_dev), dw->dir_ino);
-+		    for (fw=dw->watches; fw; fw=fw->next)
-+		    {
-+			(*ehandler)(fw->file_dev, fw->file_ino, CHANGE);
-+		    }
-+		}
-+	    }
-+	    last_fd = fd;
-+	}
-+    }
-+}
-+
---- /dev/null	Fri Mar 23 23:37:44 2001
-+++ fam-oss-2.6.4-alex/fam/DNotify.h	Mon Jul  2 15:21:46 2001
-@@ -0,0 +1,97 @@
-+//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
-+//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
-+//
-+//  This program is free software; you can redistribute it and/or modify it
-+//  under the terms of version 2 of the GNU General Public License as
-+//  published by the Free Software Foundation.
-+//
-+//  This program is distributed in the hope that it would be useful, but
-+//  WITHOUT ANY WARRANTY; without even the implied warranty of
-+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
-+//  license provided herein, whether implied or otherwise, is limited to
-+//  this program in accordance with the express provisions of the GNU
-+//  General Public License.  Patent licenses, if any, provided herein do not
-+//  apply to combinations of this program with other product or programs, or
-+//  any other product whatsoever.  This program is distributed without any
-+//  warranty that the program is delivered free of the rightful claim of any
-+//  third person by way of infringement or the like.  See the GNU General
-+//  Public License for more details.
-+//
-+//  You should have received a copy of the GNU General Public License along
-+//  with this program; if not, write the Free Software Foundation, Inc., 59
-+//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
-+
-+#ifndef DNotify_included
-+#define DNotify_included
-+
-+#include "config.h"
-+#include "Monitor.h"
-+#include <signal.h>
-+
-+//  DNotify is an object encapsulating the dnotify linux fcntl.
-+//  It "emulates" the IMon interface.
-+//  There can only be one instantiation of the DNotify object.
-+//
-+//  The user of this object uses express() and revoke() to
-+//  express/revoke interest in a file.  There is also
-+//  a callback, the EventHandler.  When an dnotify event comes in,
-+//  the EventHandler is called.
-+//
-+//  The user of the DNotify object is the Interest class.
-+
-+class DNotify : public Monitor {
-+public:
-+    DNotify(EventHandler h);
-+    ~DNotify();
-+
-+    static bool is_active();
-+
-+    virtual Status express(const char *name, struct stat *stat_return);
-+    virtual Status revoke(const char *name, dev_t dev, ino_t ino);
-+
-+private:
-+    struct FileWatch;
-+    struct DirWatch;
-+  
-+    //  Class Variables
-+    enum { QUEUESIZE = 1024 };
-+    static int pipe_write_fd;
-+    static int pipe_read_fd;
-+    static int change_queue[QUEUESIZE];
-+    static volatile sig_atomic_t DNotify::queue_overflowed;
-+    static volatile sig_atomic_t DNotify::queue_changed;
-+    static volatile int queue_head; // Only modified by read handler
-+    static volatile int queue_tail; // Only modified by signal handler
-+    static EventHandler ehandler;
-+    static void overflow_signal_handler(int sig, siginfo_t *si, void *data);
-+    static void signal_handler(int sig, siginfo_t *si, void *data);
-+    static void read_handler(int fd, void *closure);
-+ 
-+    enum { DIR_HASHSIZE = 257 };
-+    static DirWatch *dir_hash[DIR_HASHSIZE];
-+    enum { FILE_HASHSIZE = 257 };
-+    static FileWatch *file_hash[FILE_HASHSIZE];
-+
-+    static DirWatch **dir_hashchain(int fd)
-+			  { return &dir_hash[(unsigned) (fd) % DIR_HASHSIZE]; }
-+    static FileWatch **file_hashchain(dev_t d, ino_t i)
-+			  { return &file_hash[(unsigned) (d+i) % FILE_HASHSIZE]; }
-+
-+    static DirWatch *lookup_dirwatch (int fd);
-+    static DirWatch *lookup_dirwatch (dev_t dir_dev, ino_t dir_ino);
-+    static FileWatch *lookup_filewatch (dev_t file_dev, ino_t file_ino);
-+    static void hash_dirwatch(DirWatch *w);
-+    static void hash_filewatch(FileWatch *w);
-+    static void unhash_dirwatch(DirWatch *w);
-+    static void unhash_filewatch(FileWatch *w);
-+    static Status watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino);
-+
-+    static void all_watches_changed(void);
-+    
-+    DNotify(const DNotify&);			// Do not copy
-+    DNotify & operator = (const DNotify&);	//  or assign.
-+};
-+
-+#endif /* !IMon_included */
-+
-+
diff --git a/app-admin/fam-oss/files/fam-oss-2.6.4-gentoo.patch b/app-admin/fam-oss/files/fam-oss-2.6.4-gentoo.patch
deleted file mode 100644
index 172b3391e759..000000000000
--- a/app-admin/fam-oss/files/fam-oss-2.6.4-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur fam-oss-2.6.4.vanilla/include/BTree.h fam-oss-2.6.4/include/BTree.h
---- fam-oss-2.6.4.vanilla/include/BTree.h	Sat May 20 12:46:32 2000
-+++ fam-oss-2.6.4/include/BTree.h	Tue Oct 16 03:25:41 2001
-@@ -22,7 +22,7 @@
- 
- #ifndef BTree_included
- #define BTree_included
--
-+#include <stdio.h>
- #include "Boolean.h"
- 
- //  This is an in-core B-Tree implementation.
diff --git a/app-admin/fam-oss/files/fam-oss-2.6.7-gentoo.patch b/app-admin/fam-oss/files/fam-oss-2.6.7-gentoo.patch
deleted file mode 100644
index fbf631256729..000000000000
--- a/app-admin/fam-oss/files/fam-oss-2.6.7-gentoo.patch
+++ /dev/null
@@ -1,1197 +0,0 @@
-diff -urP orig/acconfig.h dnotify/acconfig.h
---- orig/acconfig.h	Mon Oct 22 02:33:09 2001
-+++ dnotify/acconfig.h	Thu Nov 29 18:18:10 2001
-@@ -17,6 +17,9 @@
- /*  Define if the system has imon and IMONIOC_ ioctl flags.  */
- #undef HAVE_IMON
- 
-+/*  Define if the system has the dnotify fcntl and it's gonna be used.  */
-+#undef USE_DNOTIFY
-+
- /*  Define if the system has the struct revokdi and the IMONIOC_REVOKDI
- **  ioctl flag.  (IRIX 5.3 doesn't.)
- */
-diff -urP orig/configure.in dnotify/configure.in
---- orig/configure.in	Mon Nov  5 00:31:30 2001
-+++ dnotify/configure.in	Thu Nov 29 18:18:10 2001
-@@ -39,6 +39,9 @@
- dnl  Put configuration #defines in config.h.
- AM_CONFIG_HEADER(config.h)
- 
-+dnl Initialize libtool
-+AM_PROG_LIBTOOL
-+
- dnl
- dnl  We want to include our header in $(top_srcdir)/include
- dnl
-@@ -79,14 +82,14 @@
- dnl I don't know why, but automake wants to use ./mkinstalldirs.
- dnl AC_PATH_PROG(MKINSTALLDIRS, mkinstalldirs)
- AC_PROG_MAKE_SET
-+
-+
- dnl AC_PROG_AWK
- dnl AC_PATH_PROG(LIBTOOL, libtool)
--AM_PROG_LIBTOOL
- dnl  autoconf/automake expects GNU tar, so find it on IRIX.
- AC_PATH_PROG(TAR, tar, tar, /usr/freeware/bin:$PATH)
- AC_PATH_PROG(LDCONFIG, ldconfig)
- 
--
- dnl
- dnl  Checks for header files.
- dnl
-@@ -96,6 +99,24 @@
- dnl AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h syslog.h unistd.h)
- 
- dnl
-+dnl  Test for the linux dnotify fcntl
-+dnl
-+AC_MSG_CHECKING([for dnotify fcntl support])
-+fam_save_cppflags="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-+AC_TRY_COMPILE([
-+#define _GNU_SOURCE  
-+#include <fcntl.h>
-+#include <unistd.h>
-+],
-+[ int fd = 1;
-+  fcntl (fd, F_NOTIFY, (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB)|DN_MULTISHOT);
-+], have_dnotify=yes, have_dnotify=no)
-+use_dnotify=false
-+CPPFLAGS="$pango_save_cppflags"
-+AC_MSG_RESULT($have_dnotify)
-+
-+dnl
- dnl  See if imon is available; if so, is it IRIX or Linux?
- dnl
- if test `uname` = 'IRIX' || test `uname` = 'IRIX64'; then
-@@ -118,11 +139,17 @@
- if test "$have_imon" != "yes"; then
-     have_imon=no
-     AC_DEFINE(HAVE_IMON, 0)
-+    if test "$have_dnotify" = "yes"; then
-+        AC_DEFINE(USE_DNOTIFY)
-+	use_dnotify=true
-+    fi
-     IMON_FUNCS=IMonNone
- fi
-+AM_CONDITIONAL(USE_DNOTIFY, $use_dnotify)
- AC_SUBST(IMON_FUNCS)
- echo "Using imon support module $IMON_FUNCS"
- 
-+
- AC_CHECK_HEADER(sys/statvfs.h, [AC_DEFINE(HAVE_STATVFS, 1) have_statvfs="yes"], [AC_DEFINE(HAVE_STATVFS, 0) have_statvfs="no"])
- AC_CHECK_HEADER(sys/syssgi.h,  AC_DEFINE(HAVE_SYSSGI,  1), AC_DEFINE(HAVE_SYSSGI,  0))
- AC_CHECK_HEADER(sys/fs/nfs_clnt.h, AC_DEFINE(HAVE_SYS_FS_NFS_CLNT_H, 1), AC_DEFINE(HAVE_SYS_FS_NFS_CLNT_H, 0))
-@@ -572,7 +599,7 @@
- dnl 
- dnl  fam is a good deal less interesting without imon.
- dnl 
--if test "$have_imon" != 'yes'; then
-+if test "$have_imon" != 'yes' -a "$have_dnotify" != 'yes'; then
-     cat << EOF
- 
-   ******************************************************************
-diff -urP orig/fam/DNotify.c++ dnotify/fam/DNotify.c++
---- orig/fam/DNotify.c++	Wed Dec 31 19:00:00 1969
-+++ dnotify/fam/DNotify.c++	Thu Nov 29 18:18:10 2001
-@@ -0,0 +1,557 @@
-+//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
-+//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
-+//  
-+//  This program is free software; you can redistribute it and/or modify it
-+//  under the terms of version 2 of the GNU General Public License as
-+//  published by the Free Software Foundation.
-+//
-+//  This program is distributed in the hope that it would be useful, but
-+//  WITHOUT ANY WARRANTY; without even the implied warranty of
-+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
-+//  license provided herein, whether implied or otherwise, is limited to
-+//  this program in accordance with the express provisions of the GNU
-+//  General Public License.  Patent licenses, if any, provided herein do not
-+//  apply to combinations of this program with other product or programs, or
-+//  any other product whatsoever.  This program is distributed without any
-+//  warranty that the program is delivered free of the rightful claim of any
-+//  third person by way of infringement or the like.  See the GNU General
-+//  Public License for more details.
-+//
-+//  You should have received a copy of the GNU General Public License along
-+//  with this program; if not, write the Free Software Foundation, Inc., 59
-+//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
-+
-+#define _GNU_SOURCE  
-+#include <fcntl.h>
-+
-+#include <string.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <libgen.h>
-+
-+#include "DNotify.h"
-+
-+#include "Interest.h"
-+#include "Log.h"
-+#include "Scheduler.h"
-+#include "alloc.h"
-+
-+
-+int DNotify::pipe_write_fd = -2;
-+int DNotify::pipe_read_fd = -2;
-+volatile sig_atomic_t DNotify::queue_overflowed = 0;
-+volatile sig_atomic_t DNotify::queue_changed = 0;
-+int DNotify::change_queue[QUEUESIZE];
-+volatile int DNotify::queue_head = 0; // Only modified by read handler
-+volatile int DNotify::queue_tail = 0; // Only modified by signal handler
-+DNotify::EventHandler DNotify::ehandler;
-+
-+DNotify::DirWatch *DNotify::dir_hash[DIR_HASHSIZE];
-+DNotify::FileWatch *DNotify::file_hash[FILE_HASHSIZE];
-+
-+struct DNotify::FileWatch
-+{
-+    DirWatch *dir_watch;
-+    dev_t file_dev;
-+    ino_t file_ino;
-+    FileWatch *next; // The DirWatch.watches list
-+    FileWatch *hash_link;
-+};
-+
-+struct DNotify::DirWatch
-+{
-+    int fd;
-+    dev_t dir_dev;
-+    ino_t dir_ino;
-+    
-+    DirWatch *hash_link;
-+    FileWatch *watches;
-+};
-+
-+DNotify::DNotify(EventHandler h)
-+{
-+    assert(ehandler == NULL);
-+    ehandler = h;
-+}
-+
-+DNotify::~DNotify()
-+{
-+    if (pipe_read_fd >= 0)
-+    {
-+	//  Tell the scheduler.
-+
-+	(void) Scheduler::remove_read_handler(pipe_read_fd);
-+
-+	//  Close the pipe.
-+
-+	if (close(pipe_read_fd) < 0)
-+	    Log::perror("can't pipe read end");
-+	else
-+	    Log::debug("closed pipe read end");
-+	
-+	if (close(pipe_write_fd) < 0)
-+	    Log::perror("can't pipe write end");
-+	else
-+	    Log::debug("closed pipe write end");
-+	pipe_read_fd = -1;
-+    }
-+    ehandler = NULL;
-+}
-+
-+void
-+DNotify::overflow_signal_handler(int sig, siginfo_t *si, void *data)
-+{
-+  char c = 'x';
-+  
-+  {
-+    char *str = "*************** overflow sigqueue ***********************\n";
-+    write (0, str, strlen(str));
-+  }
-+
-+  if (!queue_overflowed)
-+  {
-+      queue_overflowed = 1;
-+      // Trigger the read handler
-+      write(pipe_write_fd, &c, 1);
-+  }
-+}
-+
-+void
-+DNotify::signal_handler(int sig, siginfo_t *si, void *data)
-+{
-+  int left;
-+  char c = 'x';
-+
-+  if (queue_head <= queue_tail)
-+    left = (QUEUESIZE + queue_head) - queue_tail;
-+  else 
-+    left = queue_head - queue_tail;
-+  
-+  // Must leave at least one item unused to see difference
-+  // Betweeen empty and full
-+  if (left <= 1)
-+  {
-+      queue_overflowed = 1;
-+      {
-+	char *str = "*************** overflow famqueue ****************\n";
-+	write (0, str, strlen(str));
-+      }
-+  }
-+  else
-+  {
-+      change_queue[queue_tail] = si->si_fd;
-+      queue_tail = (queue_tail + 1) % QUEUESIZE;
-+  }
-+  
-+  if (!queue_changed)
-+  {
-+      queue_changed = 1;
-+      // Trigger the read handler
-+      write(pipe_write_fd, &c, 1);
-+  }
-+}
-+
-+bool
-+DNotify::is_active()
-+{
-+    if (pipe_read_fd == -2)
-+    {
-+        int filedes[2];
-+	int res;
-+	
-+	res = pipe (filedes);
-+	if (res >= 0)
-+	{   Log::debug("opened pipe");
-+   	    pipe_read_fd = filedes[0];
-+   	    pipe_write_fd = filedes[1];
-+
-+	    // Setup signal handler:
-+	    struct sigaction act;
-+	    
-+	    act.sa_sigaction = signal_handler;
-+	    sigemptyset(&act.sa_mask);
-+	    act.sa_flags = SA_SIGINFO;
-+	    sigaction(SIGRTMIN, &act, NULL);
-+
-+	    // When the RT queue overflows we get a SIGIO
-+	    act.sa_sigaction = overflow_signal_handler;
-+	    sigemptyset(&act.sa_mask);
-+	    sigaction(SIGIO, &act, NULL);
-+
-+	    (void) Scheduler::install_read_handler(pipe_read_fd, read_handler, NULL);
-+	}
-+    }
-+    return pipe_read_fd >= 0;
-+}
-+
-+DNotify::DirWatch *
-+DNotify::lookup_dirwatch (int fd)
-+{
-+  DirWatch **p;
-+  DirWatch *w;
-+
-+  p = dir_hashchain (fd);
-+
-+  while (*p)
-+    {
-+      w = *p;
-+
-+      if (w->fd == fd)
-+	return w;
-+
-+      p = &w->hash_link;
-+    }
-+  
-+  return *p;
-+}
-+
-+// This colud be made faster by using another hash table.
-+// But it's not that bad, since it is only used by express/revoke
-+DNotify::DirWatch *
-+DNotify::lookup_dirwatch (dev_t dir_dev, ino_t dir_ino)
-+{
-+  DirWatch *p;
-+  int i;
-+
-+  for (i=0;i<DIR_HASHSIZE;i++)
-+    {
-+      p = dir_hash[i];
-+      
-+      while (p)
-+	{
-+	  if (p->dir_dev == dir_dev && p->dir_ino == dir_ino)
-+	    return p;
-+	  
-+	  p = p->hash_link;
-+	}
-+    }
-+  
-+  return NULL;
-+}
-+
-+DNotify::FileWatch *
-+DNotify::lookup_filewatch (dev_t dev, ino_t ino)
-+{
-+  FileWatch **p;
-+  FileWatch *w;
-+
-+  p = file_hashchain (dev, ino);
-+
-+  while (*p)
-+    {
-+      w = *p;
-+
-+      if (w->file_dev == dev && w->file_ino == ino)
-+	return w;
-+
-+      p = &w->hash_link;
-+    }
-+  
-+  return *p;
-+}
-+
-+// Make sure w is not already in the hash table before calling
-+// this function.
-+void
-+DNotify::hash_dirwatch(DirWatch *w)
-+{
-+  DirWatch **p;
-+  p = dir_hashchain (w->fd);
-+  w->hash_link = *p;
-+  *p = w;
-+}
-+
-+// Make sure w is not already in the hash table before calling
-+// this function.
-+void
-+DNotify::hash_filewatch(FileWatch *w)
-+{
-+  FileWatch **p;
-+  p = file_hashchain (w->file_dev, w->file_ino);
-+  w->hash_link = *p;
-+  *p = w;
-+}
-+
-+void
-+DNotify::unhash_dirwatch(DirWatch *w)
-+{
-+  DirWatch **p;
-+  
-+  p = dir_hashchain (w->fd);
-+  
-+  while (*p)
-+    {
-+      if (*p == w)
-+	{
-+	  *p = w->hash_link;
-+	  break;
-+	}
-+      p = &(*p)->hash_link;
-+    }
-+  w->hash_link = NULL;
-+}
-+
-+void
-+DNotify::unhash_filewatch(FileWatch *w)
-+{
-+  FileWatch **p;
-+  
-+  p = file_hashchain (w->file_dev, w->file_ino);
-+  
-+  while (*p)
-+    {
-+      if (*p == w)
-+	{
-+	  *p = w->hash_link;
-+	  break;
-+	}
-+      p = &(*p)->hash_link;
-+    }
-+  w->hash_link = NULL;
-+}
-+
-+DNotify::Status
-+DNotify::watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino)
-+{
-+  struct stat stat;
-+  dev_t dir_dev;
-+  ino_t dir_ino;
-+  DirWatch *dwatch;
-+  FileWatch **p;
-+  FileWatch *fw;
-+    
-+  if (lstat (notify_dir, &stat) == -1)
-+      return BAD;
-+  
-+  dwatch = lookup_dirwatch(stat.st_dev, stat.st_ino);
-+  if (!dwatch)
-+    {
-+      Log::debug ("New DirWatch for %s (%x %x)\n",
-+		  notify_dir, (int)stat.st_dev, (int)stat.st_ino);
-+      dwatch = new DirWatch;
-+      dwatch->watches = NULL;
-+      dwatch->hash_link = NULL;
-+      dwatch->dir_dev = stat.st_dev;
-+      dwatch->dir_ino = stat.st_ino;
-+      
-+      dwatch->fd = open(notify_dir, O_RDONLY);
-+      fcntl (dwatch->fd, F_SETSIG, SIGRTMIN);
-+      fcntl (dwatch->fd, F_NOTIFY,
-+	     (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB) | DN_MULTISHOT);
-+      hash_dirwatch (dwatch);
-+    }
-+
-+  for (p=&dwatch->watches; *p; p=&(*p)->next)
-+    {
-+      fw = *p;
-+      if (fw->file_dev == file_dev && fw->file_ino == file_ino)
-+	return OK;
-+    }
-+  
-+  // No old FileWatch, need to add one:
-+  Log::debug("New FileWatch for %x %x\n", (int)file_dev, (int)file_ino);
-+  *p = new FileWatch;
-+  fw = *p;
-+  fw->next = NULL;
-+  fw->file_dev = file_dev;
-+  fw->file_ino = file_ino;
-+  fw->dir_watch = dwatch;
-+  hash_filewatch(fw);
-+  return OK;
-+}
-+
-+char *
-+dirname_dup (const char *name)
-+{
-+  char *copy = strdup(name);
-+  char *res = dirname(copy);
-+  res = strdup(res);
-+  free (copy);
-+  return res;
-+}
-+
-+DNotify::Status
-+DNotify::express(const char *name, struct stat *status)
-+{
-+    struct stat stat;
-+    char *notify_dir;
-+    int res;
-+    Status s;
-+    dev_t dev;
-+    ino_t ino;
-+
-+    Log::debug("express() name: %s\n", name);
-+
-+    if (!is_active())
-+	return BAD;
-+
-+    if (::lstat (name, &stat) == -1)
-+      return BAD;
-+
-+    dev = stat.st_dev;
-+    ino = stat.st_ino;
-+    
-+    if ((stat.st_mode & S_IFMT) != S_IFDIR)
-+	notify_dir = dirname_dup (name);
-+    else
-+	notify_dir = (char *)name;
-+
-+    s = watch_dir (notify_dir, dev, ino);
-+    if (notify_dir != name)
-+        free (notify_dir);
-+    if (s)
-+      return s;
-+
-+    // Check for a race condition; if someone removed or changed the
-+    // file at the same time that we are expressing interest in it,
-+    // revoke the interest so we don't get notifications about changes
-+    // to a recycled inode that we don't otherwise care about.
-+    //
-+    struct stat st;
-+    if (status == NULL) {
-+	status = &st;
-+    }
-+    if (::lstat(name, status) == -1) {
-+	Log::perror("stat on \"%s\" failed", name);
-+	revoke(name, stat.st_dev, stat.st_ino);
-+	return BAD;
-+    }
-+    if (status->st_dev != stat.st_dev
-+	|| status->st_ino != stat.st_ino) {
-+	Log::error("File \"%s\" changed between express and stat",
-+		   name);
-+	revoke(name, stat.st_dev, stat.st_ino);
-+	return BAD;
-+    }	
-+
-+    Log::debug("told dnotify to monitor \"%s\" = dev %d/%d, ino %d", name,
-+	       major(status->st_dev), minor(status->st_dev),
-+	       status->st_ino);
-+    return OK;
-+}
-+
-+DNotify::Status
-+DNotify::revoke(const char *name, dev_t dev, ino_t ino)
-+{
-+    FileWatch *fwatch;
-+    DirWatch *dwatch;
-+    
-+    Log::debug("revoke() name: %s, dev: %x, ino: %x\n", name, dev, ino);
-+
-+    if (!is_active())
-+	return BAD;
-+
-+    // Lookup FileWatch by dev:ino, and its DirWatch.
-+    fwatch = lookup_filewatch (dev, ino);
-+    if (fwatch == NULL)
-+	return BAD;
-+    
-+    dwatch = fwatch->dir_watch;
-+    
-+    // delete FileWatch, if last FileWatch: close fd, delete DirWatch
-+    Log::debug ("Destroying FileWatch for (%x %x)\n",
-+		(int)fwatch->file_dev, (int)fwatch->file_ino);
-+    FileWatch **p;
-+    for (p=&dwatch->watches; *p; p=&(*p)->next)
-+    {
-+      if (*p == fwatch)
-+	{
-+	  *p = (*p)->next;
-+	  break;
-+	}
-+    }
-+    unhash_filewatch(fwatch);
-+    delete fwatch;
-+    if (dwatch->watches == NULL)
-+      {
-+	Log::debug ("Destroying DirWatch for (%x %x)\n",
-+		    (int)dwatch->dir_dev, (int)dwatch->dir_ino);
-+	close(dwatch->fd);
-+	unhash_dirwatch(dwatch);
-+	delete dwatch;
-+      }
-+  
-+    return OK;
-+}
-+
-+
-+void
-+DNotify::all_watches_changed(void)
-+{
-+  int i;
-+  FileWatch *fw;
-+
-+  for (i=0; i<FILE_HASHSIZE; i++)
-+  {
-+      fw = file_hash[i];
-+      while (fw)
-+      {
-+	  (*ehandler)(fw->file_dev, fw->file_ino, CHANGE);
-+
-+	  fw = fw->hash_link;
-+      }
-+  }
-+}
-+
-+
-+void
-+DNotify::read_handler(int fd, void *)
-+{
-+    static char readbuf[5000];
-+    DirWatch *dw;
-+    FileWatch *fw;
-+    int snap_queue_tail;
-+    int last_fd;
-+
-+    int rc = read(fd, readbuf, sizeof readbuf);
-+    queue_changed = 0;
-+    if (rc < 0)
-+        Log::perror("pipe read");
-+    else if (queue_overflowed)
-+    {
-+	  // There is a *slight* race condition here. Between reading
-+	  // the queue_overflow flag and resetting it. But it doesn't
-+	  // matter, since I'm gonna handle the overflow after reseting
-+	  // anyway.
-+	  queue_overflowed = false;
-+
-+	  // We're soon gonna check all watches anyway, so
-+	  // get rid of the current queue
-+	  queue_head = queue_tail;
-+	  
-+	  all_watches_changed ();
-+    }
-+    else
-+    {
-+	// Don't read events that happen later than
-+	// the initial read. (Otherwise skipping fd's
-+	// might miss some changes).
-+	snap_queue_tail = queue_tail;
-+	last_fd = -1;
-+	while (queue_head != snap_queue_tail)
-+	{
-+	    fd = change_queue[queue_head];
-+	    queue_head = (queue_head + 1) % QUEUESIZE;
-+
-+	    // Skip multiple changes to the same fd
-+	    if (fd != last_fd)
-+	    {
-+		dw = lookup_dirwatch (fd);
-+		if (dw)
-+		{
-+		    Log::debug("dnotify said dev %d/%d, ino %ld changed",
-+			       major(dw->dir_dev), minor(dw->dir_dev), dw->dir_ino);
-+		    for (fw=dw->watches; fw; fw=fw->next)
-+		    {
-+			(*ehandler)(fw->file_dev, fw->file_ino, CHANGE);
-+		    }
-+		}
-+	    }
-+	    last_fd = fd;
-+	}
-+    }
-+}
-+
-diff -urP orig/fam/DNotify.h dnotify/fam/DNotify.h
---- orig/fam/DNotify.h	Wed Dec 31 19:00:00 1969
-+++ dnotify/fam/DNotify.h	Thu Nov 29 18:18:10 2001
-@@ -0,0 +1,97 @@
-+//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
-+//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
-+//
-+//  This program is free software; you can redistribute it and/or modify it
-+//  under the terms of version 2 of the GNU General Public License as
-+//  published by the Free Software Foundation.
-+//
-+//  This program is distributed in the hope that it would be useful, but
-+//  WITHOUT ANY WARRANTY; without even the implied warranty of
-+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
-+//  license provided herein, whether implied or otherwise, is limited to
-+//  this program in accordance with the express provisions of the GNU
-+//  General Public License.  Patent licenses, if any, provided herein do not
-+//  apply to combinations of this program with other product or programs, or
-+//  any other product whatsoever.  This program is distributed without any
-+//  warranty that the program is delivered free of the rightful claim of any
-+//  third person by way of infringement or the like.  See the GNU General
-+//  Public License for more details.
-+//
-+//  You should have received a copy of the GNU General Public License along
-+//  with this program; if not, write the Free Software Foundation, Inc., 59
-+//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
-+
-+#ifndef DNotify_included
-+#define DNotify_included
-+
-+#include "config.h"
-+#include "Monitor.h"
-+#include <signal.h>
-+
-+//  DNotify is an object encapsulating the dnotify linux fcntl.
-+//  It "emulates" the IMon interface.
-+//  There can only be one instantiation of the DNotify object.
-+//
-+//  The user of this object uses express() and revoke() to
-+//  express/revoke interest in a file.  There is also
-+//  a callback, the EventHandler.  When an dnotify event comes in,
-+//  the EventHandler is called.
-+//
-+//  The user of the DNotify object is the Interest class.
-+
-+class DNotify : public Monitor {
-+public:
-+    DNotify(EventHandler h);
-+    ~DNotify();
-+
-+    static bool is_active();
-+
-+    virtual Status express(const char *name, struct stat *stat_return);
-+    virtual Status revoke(const char *name, dev_t dev, ino_t ino);
-+
-+private:
-+    struct FileWatch;
-+    struct DirWatch;
-+  
-+    //  Class Variables
-+    enum { QUEUESIZE = 1024 };
-+    static int pipe_write_fd;
-+    static int pipe_read_fd;
-+    static int change_queue[QUEUESIZE];
-+    static volatile sig_atomic_t DNotify::queue_overflowed;
-+    static volatile sig_atomic_t DNotify::queue_changed;
-+    static volatile int queue_head; // Only modified by read handler
-+    static volatile int queue_tail; // Only modified by signal handler
-+    static EventHandler ehandler;
-+    static void overflow_signal_handler(int sig, siginfo_t *si, void *data);
-+    static void signal_handler(int sig, siginfo_t *si, void *data);
-+    static void read_handler(int fd, void *closure);
-+ 
-+    enum { DIR_HASHSIZE = 257 };
-+    static DirWatch *dir_hash[DIR_HASHSIZE];
-+    enum { FILE_HASHSIZE = 257 };
-+    static FileWatch *file_hash[FILE_HASHSIZE];
-+
-+    static DirWatch **dir_hashchain(int fd)
-+			  { return &dir_hash[(unsigned) (fd) % DIR_HASHSIZE]; }
-+    static FileWatch **file_hashchain(dev_t d, ino_t i)
-+			  { return &file_hash[(unsigned) (d+i) % FILE_HASHSIZE]; }
-+
-+    static DirWatch *lookup_dirwatch (int fd);
-+    static DirWatch *lookup_dirwatch (dev_t dir_dev, ino_t dir_ino);
-+    static FileWatch *lookup_filewatch (dev_t file_dev, ino_t file_ino);
-+    static void hash_dirwatch(DirWatch *w);
-+    static void hash_filewatch(FileWatch *w);
-+    static void unhash_dirwatch(DirWatch *w);
-+    static void unhash_filewatch(FileWatch *w);
-+    static Status watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino);
-+
-+    static void all_watches_changed(void);
-+    
-+    DNotify(const DNotify&);			// Do not copy
-+    DNotify & operator = (const DNotify&);	//  or assign.
-+};
-+
-+#endif /* !IMon_included */
-+
-+
-diff -urP orig/fam/IMon.h dnotify/fam/IMon.h
---- orig/fam/IMon.h	Mon Oct 22 02:33:10 2001
-+++ dnotify/fam/IMon.h	Thu Nov 29 18:18:10 2001
-@@ -24,10 +24,7 @@
- #define IMon_included
- 
- #include "config.h"
--#include <sys/stat.h>
--#include <sys/types.h>
--
--#include "Boolean.h"
-+#include "Monitor.h"
- 
- struct stat;
- 
-@@ -41,25 +38,18 @@
- //
- //  The user of the IMon object is the Interest class.
- 
--class IMon {
-+class IMon : public Monitor {
- 
- public:
--
--    enum Status { OK = 0, BAD = -1 };
--    enum Event { EXEC, EXIT, CHANGE };
--
--    typedef void (*EventHandler)(dev_t, ino_t, int event);
--
-     IMon(EventHandler h);
-     ~IMon();
- 
-     static bool is_active();
- 
--    Status express(const char *name, struct stat *stat_return);
--    Status revoke(const char *name, dev_t dev, ino_t ino);
-+    virtual Status express(const char *name, struct stat *stat_return);
-+    virtual Status revoke(const char *name, dev_t dev, ino_t ino);
- 
- private:
--
-     //  Class Variables
- 
-     static int imonfd;
-diff -urP orig/fam/Interest.c++ dnotify/fam/Interest.c++
---- orig/fam/Interest.c++	Mon Oct 22 02:33:10 2001
-+++ dnotify/fam/Interest.c++	Thu Nov 29 18:19:59 2001
-@@ -41,12 +41,21 @@
- #include "Event.h"
- #include "FileSystem.h"
- #include "IMon.h"
-+#include "DNotify.h"
- #include "Log.h"
- #include "Pollster.h"
- #include "timeval.h"
- 
- Interest *Interest::hashtable[];
--IMon      Interest::imon(imon_handler);
-+
-+#ifdef USE_DNOTIFY 
-+static DNotify dnotify(Interest::monitor_handler);
-+Monitor * Interest::monitor = &dnotify;
-+#else
-+static IMon imon(Interest::monitor_handler);
-+Monitor * Interest::monitor = &imon;
-+#endif
-+
- bool      Interest::xtab_verification = true;
- 
- Interest::Interest(const char *name, FileSystem *fs, in_addr host, ExportVerification ev)
-@@ -58,11 +67,11 @@
-       myhost(host),
-       mypath_exported_to_host(ev == NO_VERIFY_EXPORTED)
- {
--    memset(&old_stat, 0, sizeof(old_stat)); 
--    IMon::Status s = IMon::BAD;
--
--    s = imon.express(name, &old_stat);
--    if (s != IMon::OK)
-+    memset(&old_stat, 0, sizeof(old_stat));
-+    
-+    Monitor::Status s = Monitor::BAD;
-+    s = monitor->express(name, &old_stat);
-+    if (s != Monitor::OK)
-     {   int rc = lstat(name, &old_stat);
- 	if (rc < 0)
- 	{   Log::info("can't lstat %s", name);
-@@ -99,7 +108,7 @@
-     }
- #endif
- 
--    if (exported_to_host()) fs->ll_monitor(this, s == IMon::OK);
-+    if (exported_to_host()) fs->ll_monitor(this, s == Monitor::OK);
- }
- 
- Interest::~Interest()
-@@ -127,7 +136,7 @@
- 		pp = &p->hashlink;	// move to next element
- 	    }
- 	if (!found_same)
--	    (void) imon.revoke(name(), dev, ino);
-+	  (void) monitor->revoke(name(), dev, ino);
-     }
- }
- 
-@@ -146,7 +155,7 @@
- 
-         // Express interest.
-         IMon::Status s = IMon::BAD;
--	s = imon.express(name(), NULL);
-+	s = monitor->express(name(), NULL);
-         if (s != IMon::OK) {
-             return true;
-         }
-@@ -242,23 +251,23 @@
- }
- 
- void
--Interest::imon_handler(dev_t device, ino_t inumber, int event)
-+Interest::monitor_handler(dev_t device, ino_t inumber, int event)
- {
-     assert(device || inumber);
- 
-     for (Interest *p = *hashchain(device, inumber), *next = p; p; p = next)
-     {	next = p->hashlink;
- 	if (p->ino == inumber && p->dev == device)
--	{   if (event == IMon::EXEC)
-+	  {   if (event == Monitor::EXEC)
- 	    {   p->cur_exec_state = EXECUTING;
- 		(void) p->report_exec_state();
- 	    }
--	    else if (event == IMon::EXIT)
-+	    else if (event == Monitor::EXIT)
- 	    {   p->cur_exec_state = NOT_EXECUTING;
- 		(void) p->report_exec_state();
- 	    }
- 	    else
--	    {   assert(event == IMon::CHANGE);
-+	    {   assert(event == Monitor::CHANGE);
- 		p->scan();
- 	    }
- 	}
-diff -urP orig/fam/Interest.h dnotify/fam/Interest.h
---- orig/fam/Interest.h	Mon Oct 22 02:33:10 2001
-+++ dnotify/fam/Interest.h	Thu Nov 29 18:18:10 2001
-@@ -32,7 +32,7 @@
- 
- class Event;
- class FileSystem;
--class IMon;
-+class Monitor;
- struct stat;
- 
- //  Interest -- abstract base class for filesystem entities of interest.
-@@ -74,7 +74,7 @@
- 
-     //  Public Class Method
- 
--    static void imon_handler(dev_t, ino_t, int event);
-+    static void monitor_handler(dev_t, ino_t, int event);
- 
-     static void enable_xtab_verification(bool enable);
- 
-@@ -121,7 +121,7 @@
- 
-     //  Class Variables
- 
--    static IMon imon;
-+    static Monitor *monitor;
-     static Interest *hashtable[HASHSIZE];
-     static bool xtab_verification;
- 
-diff -urP orig/fam/Makefile.am dnotify/fam/Makefile.am
---- orig/fam/Makefile.am	Mon Oct 22 02:33:10 2001
-+++ dnotify/fam/Makefile.am	Thu Nov 29 18:18:10 2001
-@@ -3,6 +3,12 @@
- bin_PROGRAMS = fam
- sysconf_DATA = fam.conf
- 
-+if USE_DNOTIFY
-+DNOTIFY_FILES = DNotify.c++
-+else
-+DNOTIFY_FILES =
-+endif
-+
- fam_SOURCES = \
-   Activity.c++ \
-   Activity.h \
-@@ -20,6 +26,7 @@
-   Directory.h \
-   DirectoryScanner.c++ \
-   DirectoryScanner.h \
-+  DNotify.h \
-   Event.c++ \
-   Event.h \
-   File.c++ \
-@@ -48,6 +55,7 @@
-   NFSFileSystem.h \
-   NetConnection.c++ \
-   NetConnection.h \
-+  Monitor.h \
-   Pollster.c++ \
-   Pollster.h \
-   Request.h \
-@@ -72,9 +80,10 @@
-   main.c++ \
-   timeval.c++ \
-   timeval.h \
--  @IMON_FUNCS@.c++
-+  @IMON_FUNCS@.c++ \
-+  $(DNOTIFY_FILES)
- 
--EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
-+EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ DNotify.c++
- 
- fam_LDADD = -lrpcsvc $(top_srcdir)/support/libsupport.a
- 
-diff -urP orig/fam/Monitor.h dnotify/fam/Monitor.h
---- orig/fam/Monitor.h	Wed Dec 31 19:00:00 1969
-+++ dnotify/fam/Monitor.h	Thu Nov 29 18:18:10 2001
-@@ -0,0 +1,57 @@
-+//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
-+//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
-+//  
-+//  This program is free software; you can redistribute it and/or modify it
-+//  under the terms of version 2 of the GNU General Public License as
-+//  published by the Free Software Foundation.
-+//
-+//  This program is distributed in the hope that it would be useful, but
-+//  WITHOUT ANY WARRANTY; without even the implied warranty of
-+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
-+//  license provided herein, whether implied or otherwise, is limited to
-+//  this program in accordance with the express provisions of the GNU
-+//  General Public License.  Patent licenses, if any, provided herein do not
-+//  apply to combinations of this program with other product or programs, or
-+//  any other product whatsoever.  This program is distributed without any
-+//  warranty that the program is delivered free of the rightful claim of any
-+//  third person by way of infringement or the like.  See the GNU General
-+//  Public License for more details.
-+//
-+//  You should have received a copy of the GNU General Public License along
-+//  with this program; if not, write the Free Software Foundation, Inc., 59
-+//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
-+
-+#ifndef Monitor_included
-+#define Monitor_included
-+
-+#include "config.h"
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+
-+struct stat;
-+
-+//  Monitor is an abstract baseclass for differend file monitoring
-+//  systems. The original system used was IMon, and the Montor API
-+//  is heavily influenced by that.
-+//  There can only be one instantiation of the Monitor object.
-+//
-+//  The user of this object uses express() and revoke() to
-+//  express/revoke interest in a file to imon.  There is also
-+//  a callback, the EventHandler.  When an event comes in,
-+//  the EventHandler is called.
-+//
-+//  The main implementers of the Monitor class is IMon and DNotify
-+
-+class Monitor {
-+public:
-+
-+    enum Status { OK = 0, BAD = -1 };
-+    enum Event { EXEC, EXIT, CHANGE };
-+
-+    typedef void (*EventHandler)(dev_t, ino_t, int event);
-+
-+    virtual Status express(const char *name, struct stat *stat_return) = 0;
-+    virtual Status revoke(const char *name, dev_t dev, ino_t ino) = 0;
-+};
-+
-+#endif /* !Monitor_included */
-diff -urP orig/include/BTree.h dnotify/include/BTree.h
---- orig/include/BTree.h	Wed Nov  7 23:09:50 2001
-+++ dnotify/include/BTree.h	Thu Nov 29 18:18:10 2001
-@@ -272,7 +272,7 @@
-     n += that->n + 1;
-     link[n] = that->link[that->n];
-     that->n = 0;
--    that->link[0] = NULL;
-+    that->link[0] = 0;
- }
- 
- ///////////////////////////////////////////////////////////////////////////////
-@@ -281,7 +281,7 @@
- 
- template <class K, class V>
- BTree<K, V>::BTree()
--    : root(NULL), npairs(0)
-+    : root(0), npairs(0)
- {
-     assert(!(fanout % 2));
- }
-@@ -408,7 +408,7 @@
- BTree<Key, Value>::Closure
- BTree<Key, Value>::insert(Node *p, const Key& key, const Value& value)
- {
--    if (!p) return Closure(key, value, NULL);
-+    if (!p) return Closure(key, value, 0);
-     //  If you're running Purify on a client linking with libfam, and it says
-     //  that line is causing a 3-byte UMR for BTree<int, bool>::insert() in
-     //  FAMNextEvent() ("Reading 8 bytes from 0x... on the stack (3 bytes at
-@@ -476,7 +476,7 @@
-     case UNDER:
- 	if (root->n == 0)
- 	{   Node *nr = root->link[0];
--	    root->link[0] = NULL;	// don't delete subtree
-+	    root->link[0] = 0;	// don't delete subtree
- 	    delete root;
- 	    root = nr;
- 	}
-@@ -508,8 +508,8 @@
-     Node *cp = p->link[i];
-     assert(cp);
-     
--    Node *rp = i < p->n ? p->link[i + 1] : NULL;
--    Node *lp = i > 0    ? p->link[i - 1] : NULL;
-+    Node *rp = i < p->n ? p->link[i + 1] : 0;
-+    Node *lp = i > 0    ? p->link[i - 1] : 0;
-     assert(!rp || rp->n >= fanout / 2);
-     assert(!lp || lp->n >= fanout / 2);
- 
-diff -u fam-oss-2.6.4/Makefile.am fam-oss-2.6.4-alex/Makefile.am
---- fam-oss-2.6.4/Makefile.am	Sat May 20 06:46:31 2000
-+++ fam-oss-2.6.4-alex/Makefile.am	Tue Jun 26 22:43:18 2001
-@@ -7,30 +7,3 @@
- rpm: dist
- 	@cd build && $(MAKE) $(AM_MAKEFLAGS) rpm
- 
--#  We proceed even if these commands fail because this might be an install
--#  into $DESTDIR by a non-root user.
--install-exec-hook:
--	-@if test "no$(LDCONFIG)" != "no"; then \
--##	    echo "Adding $(libdir) to ld.so.conf..."; \
--	    $(EDITCONF) ld.so.conf add $(DESTDIR)$(libdir) $(DESTDIR)$(libdir); \
--	    exec $(LDCONFIG); \
--	fi
--##	@echo "Adding fam to rpc..."
--	-@$(EDITCONF) rpc add 391002 "sgi_fam		391002"
--##	@echo "Adding fam to inetd.conf..."
--	-@$(EDITCONF) inetd.conf add '\b(fam|FAM)\b' \
--	    "#  fam, the File Alteration Monitor, http://oss.sgi.com/projects/fam/" \
--	    "sgi_fam/1-2 stream rpc/tcp wait root $(DESTDIR)$(bindir)/fam fam"
--	@echo "Restarting inetd..."
--	-@killall -HUP inetd
--
--#  We don't remove $(libdir) from ld.so.conf here because we don't have
--#  a way to tell whether we're the ones who added it, and other things
--#  probably use it as well.
--uninstall-local:
--##	@echo "Removing fam from rpc..."
--	-@$(EDITCONF) rpc remove 391002
--##	@echo "Removing fam from inetd.conf..."
--	-@$(EDITCONF) inetd.conf remove '\b(fam|FAM)\b'
--	@echo "Restarting inetd..."
--	-@killall -HUP inetd
---- fam-2.6.6/common.am.CLEANFILES	Thu Nov 29 19:06:58 2001
-+++ fam-2.6.6/common.am	Thu Nov 29 19:07:13 2001
-@@ -10,3 +10,5 @@
- EDITCONF = perl $(top_srcdir)/util/editconf/editconf.perl
- 
- uninstallscriptdir = $(pkglibdir)
-+
-+CLEANFILES =
---- fam-2.6.7/fam/Listener.c++.cleanup	Mon Dec 17 20:03:37 2001
-+++ fam-2.6.7/fam/Listener.c++	Tue Jan 15 11:44:45 2002
-@@ -287,10 +287,18 @@
-     //  Keep the scheduler from helpfully cleaning this up.
-     Scheduler::remove_onetime_task(cleanup_negotiation, nc);
- 
-+    //  Remove the temp file
-+    uid_t preveuid = geteuid();
-+    if (preveuid) seteuid(0);
-+    seteuid(nc->uid);
-+    unlink(nc->sun.sun_path);
-+    if (nc->uid) seteuid(0);
-+    seteuid(preveuid);
-+
-     Log::debug("client fd %d is local/trusted (socket %s, uid %d).",
-                client_fd, nc->sun.sun_path, nc->uid);
-     Cred cred(nc->uid, client_fd);
--    new LocalClient(client_fd, &(nc->sun), cred);
-+    new LocalClient(client_fd, cred);
-     // We don't need a reference to this object.  The constructor
-     // takes care of registering it with the Scheduler.
- 
---- fam-2.6.7/fam/LocalClient.c++.cleanup	Mon Dec 17 20:03:37 2001
-+++ fam-2.6.7/fam/LocalClient.c++	Tue Jan 15 11:43:04 2002
-@@ -29,17 +29,12 @@
- #include "Log.h"
- #include "Cred.h"
- 
--LocalClient::LocalClient(int fd, const struct sockaddr_un *addr, Cred &cred)
-+LocalClient::LocalClient(int fd, Cred &cred)
- : TCP_Client(LOCALHOST(), fd, cred)
- {
-     assert(cred.is_valid());
--    sun.sun_family = AF_UNIX;
--    strncpy(sun.sun_path, addr->sun_path, sizeof(sun.sun_path));
--    sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
- }
- 
- LocalClient::~LocalClient()
- {
--    if (geteuid() != cred.uid()) cred.become_user();
--    unlink(sun.sun_path);
- }
---- fam-2.6.7/fam/LocalClient.h.cleanup	Mon Dec 17 20:03:37 2001
-+++ fam-2.6.7/fam/LocalClient.h	Tue Jan 15 11:43:04 2002
-@@ -33,13 +33,8 @@
- 
- public:
- 
--    LocalClient(int fd, const struct sockaddr_un *addr, Cred &cred);
-+    LocalClient(int fd, Cred &cred);
-     ~LocalClient();
--
--private:
--
--    struct sockaddr_un sun;
--
- };
- 
- #endif /* !RemoteClient_included */
---- fam-2.6.7/libfam/Makefile.am.supc++	Mon Jan  7 14:12:01 2002
-+++ fam-2.6.7/libfam/Makefile.am	Mon Jan  7 14:13:26 2002
-@@ -8,6 +8,7 @@
-   fam.c++
- 
- libfam_la_LDFLAGS = -export-symbols fam.sym
-+libfam_la_LIBADD = -lstdc++
- 
- EXTRA_DIST = fam.sym
-