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:   25-Jul-2007 17:04:33
  Branch: HEAD                             Handle: 2007072516043200

  Modified files:
    rpm/rpmdb               db3.c dbconfig.c

  Log:
    add new 4.6.18 functionality.

  Summary:
    Revision    Changes     Path
    1.70        +8  -0      rpm/rpmdb/db3.c
    1.42        +13 -0      rpm/rpmdb/dbconfig.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/db3.c
  ============================================================================
  $ cvs diff -u -r1.69 -r1.70 db3.c
  --- rpm/rpmdb/db3.c	25 Jul 2007 14:40:50 -0000	1.69
  +++ rpm/rpmdb/db3.c	25 Jul 2007 15:04:32 -0000	1.70
  @@ -375,6 +375,14 @@
   #endif
   	xx = dbenv->set_verbose(dbenv, DB_VERB_WAITSFOR,
   		(dbi->dbi_verbose & DB_VERB_WAITSFOR));
  +#if defined(DB_VERB_FILEOPS)
  +	xx = dbenv->set_verbose(dbenv, DB_VERB_FILEOPS,
  +		(dbi->dbi_verbose & DB_VERB_FILEOPS));
  +#endif
  +#if defined(DB_VERB_FILEOPS_ALL)
  +	xx = dbenv->set_verbose(dbenv, DB_VERB_FILEOPS_ALL,
  +		(dbi->dbi_verbose & DB_VERB_FILEOPS_ALL));
  +#endif
   
   	if (dbi->dbi_mmapsize) {
   	    xx = dbenv->set_mp_mmapsize(dbenv, dbi->dbi_mmapsize);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/dbconfig.c
  ============================================================================
  $ cvs diff -u -r1.41 -r1.42 dbconfig.c
  --- rpm/rpmdb/dbconfig.c	16 Jul 2007 01:32:32 -0000	1.41
  +++ rpm/rpmdb/dbconfig.c	25 Jul 2007 15:04:32 -0000	1.42
  @@ -145,6 +145,10 @@
    { "use_environ", 0,POPT_BIT_SET,	&db3dbi.dbi_eflags, DB_USE_ENVIRON,
   	NULL, NULL },
   #endif
  +#if defined(WITH_DB) && defined(DB_IGNORE_LEASE)
  + { "ignore_lease", 0,POPT_BIT_SET,	&db3dbi.dbi_eflags, DB_IGNORE_LEASE,
  +	NULL, NULL },
  +#endif
   
   #if defined(WITH_DB) && defined(DB_TXN_SYNC)
    { "txn_sync",	0,POPT_BIT_SET,	&db3dbi.dbi_tflags, DB_TXN_SYNC,
  @@ -154,6 +158,10 @@
    { "txn_nowait",0,POPT_BIT_SET,	&db3dbi.dbi_tflags, DB_TXN_NOWAIT,
   	NULL, NULL },
   #endif
  +#if defined(WITH_DB) && defined(DB_TXN_WAIT)
  + { "txn_wait",0,POPT_BIT_SET,	&db3dbi.dbi_tflags, DB_TXN_WAIT,
  +	NULL, NULL },
  +#endif
   
   #if defined(WITH_DB) && defined(NOTYET)
   DB_AUTO_COMMIT
  @@ -421,6 +429,11 @@
   #endif
   
   /* XXX DB_ENV->set_timeout */
  +#if defined(WITH_DB) && defined(NOTYET)
  +DB_SET_LOCK_TIMEOUT
  +DB_SET_TXN_NOW
  +DB_SET_TXN_TIMEOUT
  +#endif
   /* XXX DB_ENV->get_timeout */
   
   /* ==== Logging: */
  @@ .