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:   28-Aug-2007 22:45:49
  Branch: HEAD                             Handle: 2007082821454801

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               mount.c rpmio.h

  Log:
    - assume that mount(2) et al are linux-peculier for the moment.

  Summary:
    Revision    Changes     Path
    1.1608      +1  -0      rpm/CHANGES
    2.2         +2  -0      rpm/rpmio/mount.c
    1.57        +2  -0      rpm/rpmio/rpmio.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1607 -r1.1608 CHANGES
  --- rpm/CHANGES	28 Aug 2007 20:00:06 -0000	1.1607
  +++ rpm/CHANGES	28 Aug 2007 20:45:48 -0000	1.1608
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: assume that mount(2) et al are linux-peculier for the moment.
       - jbj: add rpmio Mount/Umount/Umount2 stubs.
       - jbj: permit keyutils caching disable, don't re-add if already cached.
       - jbj: use keyutils for pubkey cache.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/mount.c
  ============================================================================
  $ cvs diff -u -r2.1 -r2.2 mount.c
  --- rpm/rpmio/mount.c	28 Aug 2007 20:00:07 -0000	2.1
  +++ rpm/rpmio/mount.c	28 Aug 2007 20:45:49 -0000	2.2
  @@ -3,6 +3,7 @@
    * \file rpmio/mount.c
    */
   
  +#if defined(__linux__)
   #include "system.h"
   #include <sys/mount.h>
   #include "rpmio.h"
  @@ -24,3 +25,4 @@
   {
       return umount2(target, flags);
   }
  +#endif
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.h
  ============================================================================
  $ cvs diff -u -r1.56 -r1.57 rpmio.h
  --- rpm/rpmio/rpmio.h	28 Aug 2007 20:00:07 -0000	1.56
  +++ rpm/rpmio/rpmio.h	28 Aug 2007 20:45:49 -0000	1.57
  @@ -469,6 +469,7 @@
   	/*@globals errno, fileSystem @*/
   	/*@modifies errno, fileSystem @*/;
   
  +#if defined(__linux__)
   /**
    * mount(2) clone.
    */
  @@ -491,6 +492,7 @@
   int Umount2(const char *target, int flags)
   	/*@globals errno, fileSystem @*/
   	/*@modifies errno, fileSystem @*/;
  +#endif
   
   /**
    * glob_pattern_p(3) clone.
  @@ .