remove references to statvfs to fix connections to remote fams and for non-xfs filesystems.

5 files changed, 111 insertions, 3 deletions

diff --git a/app-admin/fam-oss/ChangeLog b/app-admin/fam-oss/ChangeLog
index a10b8298a41f..e5d57a116ab8 100644
--- a/app-admin/fam-oss/ChangeLog
+++ b/app-admin/fam-oss/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/fam-oss
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/ChangeLog,v 1.25 2003/07/01 21:05:22 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/ChangeLog,v 1.26 2003/07/30 21:43:55 raker Exp $
+
+*fam-oss-2.6.10-r1 (30 Jul 2003)
+
+  30 Jul 2003; Nick Hadaway <raker@gentoo.org> fam-oss-2.6.10-r1.ebuild,
+  files/fam-oss-2.6.10-nostatvfs.patch:
+  Added a patch to removed the hooks for statvfs which appears to be
+  b0rked on Linux.  Even in the source are comments re: it's brokenness.
+  Thanks to Danny Milosavljevic on bug #24280 for doing research on 
+  this.
 
   25 Jun 2003; Bartosch Pixa <darkspecter@gentoo.org> fam-oss-2.6.10.ebuild:
   set ppc in keywords
diff --git a/app-admin/fam-oss/Manifest b/app-admin/fam-oss/Manifest
index 4985c3ce3ed7..413e35c2af75 100644
--- a/app-admin/fam-oss/Manifest
+++ b/app-admin/fam-oss/Manifest
@@ -1,10 +1,10 @@
-MD5 cb1522ce5b393e8cd61df1045322b347 fam-oss-2.6.10-r1.ebuild 1397
+MD5 88da7cbe7fb9e0581a7a61d68cbca88b fam-oss-2.6.10-r1.ebuild 1399
 MD5 dca3e983deaf1294a426844e11b159b6 fam-oss-2.6.9-r1.ebuild 1308
 MD5 40981d28d4e6491863cd7b34110024bf fam-oss-2.6.9.ebuild 1199
 MD5 4e08886a070ee23ea3a7cb09e9450098 fam-oss-2.6.9-r3.ebuild 1493
 MD5 d2ab2fdcac3b293ac5649b57c23f8014 fam-oss-2.6.10.ebuild 1459
 MD5 3df904e8c11efc079e19b0263075b11d fam-oss-2.6.9-r2.ebuild 1444
-MD5 57c99e6ffd6bd9d361e572b58341af0e ChangeLog 3639
+MD5 91ef6fd9a30d920e71a33b07f72f1e26 ChangeLog 4005
 MD5 179cf9d7c004f510debb9f40bb21c34e files/fam 504
 MD5 b03797e114f768833ab0291a940e9038 files/fam-oss-2.6.9-gcc3.patch 435
 MD5 28ba151456fe1d493cdbafe08c3c0e5e files/fam-oss-2.6.9-largefile.patch 525
diff --git a/app-admin/fam-oss/fam-oss-2.6.10-r1.ebuild b/app-admin/fam-oss/fam-oss-2.6.10-r1.ebuild
new file mode 100644
index 000000000000..539072a643c4
--- /dev/null
+++ b/app-admin/fam-oss/fam-oss-2.6.10-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.10-r1.ebuild,v 1.1 2003/07/30 21:43:55 raker Exp $
+
+IUSE=""
+
+inherit libtool eutils
+
+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"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+
+DEPEND=">=dev-lang/perl-5.6.1"
+RDEPEND=">=net-nds/portmap-5b-r6"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${S}
+
+	epatch ${FILESDIR}/dnotify.patch.new
+	epatch ${FILESDIR}/fam-2.6.7-cleanup.patch
+	epatch ${FILESDIR}/${P}-largefile.patch
+
+	# The original code says that statvfs isn't supported
+	# on linux, YET it enables it.  See:
+	# http://bugs.gentoo.org/show_bug.cgi?id=24280
+	epatch ${FILESDIR}/${P}-nostatvfs.patch
+
+	elibtoolize
+
+	# This one is old, and automake will install new one
+	rm -rf ${S}/missing
+	
+	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOMAKE_1_5=1
+	aclocal
+	autoconf
+	automake --add-missing
+}
+
+src_install() {
+	sed -i -e s:"local_only = false":"local_only = true":g fam/fam.conf
+			
+	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.10-r1 b/app-admin/fam-oss/files/digest-fam-oss-2.6.10-r1
new file mode 100644
index 000000000000..ef684e7ab983
--- /dev/null
+++ b/app-admin/fam-oss/files/digest-fam-oss-2.6.10-r1
@@ -0,0 +1 @@
+MD5 1c5a2ea659680bdd1e238d7828a857a7 fam-2.6.10.tar.gz 321189
diff --git a/app-admin/fam-oss/files/fam-oss-2.6.10-nostatvfs.patch b/app-admin/fam-oss/files/fam-oss-2.6.10-nostatvfs.patch
new file mode 100644
index 000000000000..46783ea4f89f
--- /dev/null
+++ b/app-admin/fam-oss/files/fam-oss-2.6.10-nostatvfs.patch
@@ -0,0 +1,41 @@
+diff -urN fam-2.6.10/configure.in fam-2.6.10-modified/configure.in
+--- fam-2.6.10/configure.in	2003-07-30 16:28:14.000000000 -0500
++++ fam-2.6.10-modified/configure.in	2003-07-30 16:28:59.000000000 -0500
+@@ -151,35 +151,11 @@
+ 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))
+ 
+-dnl  Linux has statvfs, but its f_fsid is a struct, and SmallTable can't
+-dnl  be instantiated for it because there's no > or < operator for it yet.
+-dnl  fam does work without the fs_by_id table, so we'll pretend we don't
+-dnl  have statvfs for now.  This should be fixed, though.
+-if test `uname` != 'IRIX' && test `uname` != 'IRIX64'; then
+-    AC_DEFINE(HAVE_STATVFS, 0)
+-    have_statvfs="no"
+-fi
+-dnl dnl
+-dnl dnl  If we have statvfs, test for fsid_t.
+-dnl dnl
+-dnl if test "$have_statvfs" = "yes"; then
+-dnl     for fsid_t in ulong_t fsid_t __fsid_t; do
+-dnl         AC_MSG_CHECKING([sys/statvfs.h for $fsid_t fsid])
+-dnl         AC_TRY_COMPILE([#include <sys/statvfs.h>], [struct statvfs s; $fsid_t i = s.f_fsid;], have_fsid_t=yes, have_fsid_t=no)
+-dnl         AC_MSG_RESULT($have_fsid_t)
+-dnl         if test "$have_fsid_t" = "yes"; then
+-dnl             AC_DEFINE_UNQUOTED(CONFIG_FSID_T, $fsid_t)
+-dnl             break
+-dnl         fi
+-dnl     done
+-dnl     if test "$have_fsid_t" != "yes"; then
+-dnl         AC_MSG_ERROR([Have sys/statvfs.h, but couldn't get statvfs.f_fsid type])
+-dnl     fi
+-dnl fi
++AC_DEFINE(HAVE_STATVFS, 0)
++have_statvfs="no"
+ 
+ dnl
+ dnl  Test for SGI_NOHANG in syssgi.h