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:00:08
  Branch: HEAD                             Handle: 2007082821000601

  Added files:
    rpm/rpmio               mount.c
  Modified files:
    rpm                     CHANGES
    rpm/rpmio               Makefile.am librpmio.vers rpmio.h

  Log:
    - add rpmio Mount/Umount/Umount2 stubs.

  Summary:
    Revision    Changes     Path
    1.1607      +1  -0      rpm/CHANGES
    1.106       +1  -1      rpm/rpmio/Makefile.am
    2.8         +3  -0      rpm/rpmio/librpmio.vers
    2.1         +26 -0      rpm/rpmio/mount.c
    1.56        +23 -0      rpm/rpmio/rpmio.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1606 -r1.1607 CHANGES
  --- rpm/CHANGES	28 Aug 2007 19:37:19 -0000	1.1606
  +++ rpm/CHANGES	28 Aug 2007 20:00:06 -0000	1.1607
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - 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.
       - jbj: update id.po (Translation Project).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.105 -r1.106 Makefile.am
  --- rpm/rpmio/Makefile.am	22 Aug 2007 19:09:16 -0000	1.105
  +++ rpm/rpmio/Makefile.am	28 Aug 2007 20:00:07 -0000	1.106
  @@ -43,7 +43,7 @@
   usrlibdir = $(libdir)
   usrlib_LTLIBRARIES = librpmio.la
   librpmio_la_SOURCES = \
  -	argv.c digest.c fts.c getpass.c macro.c mire.c \
  +	argv.c digest.c fts.c getpass.c macro.c mire.c mount.c \
   	md2.c md4.c rmd128.c rmd160.c rmd256.c rmd320.c sha224.c \
   	salsa10.c salsa20.c tiger.c \
   	rpmio-stub.c rpmmg.c \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/librpmio.vers
  ============================================================================
  $ cvs diff -u -r2.7 -r2.8 librpmio.vers
  --- rpm/rpmio/librpmio.vers	1 Aug 2007 19:03:01 -0000	2.7
  +++ rpm/rpmio/librpmio.vers	28 Aug 2007 20:00:07 -0000	2.8
  @@ -138,6 +138,7 @@
       _Mkfifo;
       Mknod;
       _Mknod;
  +    Mount;
       noLibio;
       Opendir;
       _Opendir;
  @@ -290,6 +291,8 @@
       ufdGetUrlinfo;
       ufdio;
       uidToUname;
  +    Umount;
  +    Umount2;
       unameToUid;
       Unlink;
       _Unlink;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/mount.c
  ============================================================================
  $ cvs diff -u -r0 -r2.1 mount.c
  --- /dev/null	2007-08-28 22:00:06 +0200
  +++ mount.c	2007-08-28 22:00:08 +0200
  @@ -0,0 +1,26 @@
  +
  +/** \ingroup rpmio
  + * \file rpmio/mount.c
  + */
  +
  +#include "system.h"
  +#include <sys/mount.h>
  +#include "rpmio.h"
  +#include "debug.h"
  +
  +int Mount(const char *source, const char *target,
  +		const char *filesystemtype, unsigned long mountflags,
  +		const void *data)
  +{
  +    return mount(source, target, filesystemtype, mountflags, data);
  +}
  +
  +int Umount(const char *target)
  +{
  +    return umount(target);
  +}
  +
  +int Umount2(const char *target, int flags)
  +{
  +    return umount2(target, flags);
  +}
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.h
  ============================================================================
  $ cvs diff -u -r1.55 -r1.56 rpmio.h
  --- rpm/rpmio/rpmio.h	19 Jul 2007 06:44:54 -0000	1.55
  +++ rpm/rpmio/rpmio.h	28 Aug 2007 20:00:07 -0000	1.56
  @@ -470,6 +470,29 @@
   	/*@modifies errno, fileSystem @*/;
   
   /**
  + * mount(2) clone.
  + */
  +int Mount(const char *source, const char *target,
  +		const char *filesystemtype, unsigned long mountflags,
  +		const void *data)
  +	/*@globals errno, fileSystem @*/
  +	/*@modifies errno, fileSystem @*/;
  +
  +/**
  + * umount(2) clone.
  + */
  +int Umount(const char *target)
  +	/*@globals errno, fileSystem @*/
  +	/*@modifies errno, fileSystem @*/;
  +
  +/**
  + * umount2(2) clone.
  + */
  +int Umount2(const char *target, int flags)
  +	/*@globals errno, fileSystem @*/
  +	/*@modifies errno, fileSystem @*/;
  +
  +/**
    * glob_pattern_p(3) clone.
    */
   int Glob_pattern_p (const char *pattern, int quote)
  @@ .