RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   31-Aug-2007 16:49:33
  Branch: HEAD                             Handle: 2007083115493200

  Modified files:
    rpm                     CHANGES
    rpm/lib                 rpmts.c

  Log:
    - afb: handle Mac OS X 10.3.9 statvfs deviance.

  Summary:
    Revision    Changes     Path
    1.1610      +1  -0      rpm/CHANGES
    2.91        +3  -0      rpm/lib/rpmts.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1609 -r1.1610 CHANGES
  --- rpm/CHANGES	30 Aug 2007 09:34:08 -0000	1.1609
  +++ rpm/CHANGES	31 Aug 2007 14:49:32 -0000	1.1610
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - afb: handle Mac OS X 10.3.9 statvfs deviance.
       - rse: make devtool %standalone fully modular for allowing its modules to be reused in other devtool targets
       - jbj: assume that mount(2) et al are linux-peculier for the moment.
       - jbj: add rpmio Mount/Umount/Umount2 stubs.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmts.c
  ============================================================================
  $ cvs diff -u -r2.90 -r2.91 rpmts.c
  --- rpm/lib/rpmts.c	28 Aug 2007 19:38:53 -0000	2.90
  +++ rpm/lib/rpmts.c	31 Aug 2007 14:49:32 -0000	2.91
  @@ -1260,6 +1260,9 @@
   	dsi->f_flag = sfb.f_flag;
   	dsi->f_favail = sfb.f_favail;
   	dsi->f_namemax = sfb.f_namemax;
  +#elif defined(__APPLE__) && defined(__MACH__) && !defined(_SYS_STATVFS_H_)
  +	dsi->f_fsid = 0; /* "Not meaningful in this implementation." */
  +	dsi->f_namemax = pathconf(ts->filesystems[i], _PC_NAME_MAX);
   #else
   	dsi->f_fsid = sfb.f_fsid;
   	dsi->f_namemax = sfb.f_namelen;
  @@ .