rpm-chroot-hack.patch

   1 --- rpm-4.5/rpmdb/db3.c~        2009-06-06 17:54:26.000000000 +0300
   2 +++ rpm-4.5/rpmdb/db3.c 2009-06-06 17:55:36.050580710 +0300
   3 @@ -1329,6 +1329,8 @@
   4         } else {
   5  assert(rpmdb && rpmdb->db_dbenv);
   6             dbenv = rpmdb->db_dbenv;
   7 +           if (rpmdb->db_chrootDone)
   8 +                   dbenv->set_data_dir(dbenv, dbhome);
   9             rpmdb->db_opens++;
  10         }
  11         /*@=mods@*/
  12 @@ -1511,13 +1511,7 @@
  13                 if (dbfile)
  14                     t = stpcpy( stpcpy( t, "/"), dbfile);
  15  /*@=boundswrite@*/
  16 -#ifdef HACK    /* XXX necessary to support dbsubfile */
  17 -               dbpath = (!dbi->dbi_use_dbenv && !dbi->dbi_temporary)
  18 -                       ? dbfullpath : dbfile;
  19 -#else
  20 -               dbpath = (!dbi->dbi_temporary)
  21 -                       ? dbfullpath : dbfile;
  22 -#endif
  23 +               dbpath = (!dbi->dbi_temporary) ? dbfullpath : dbfile;
  24
  25  #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
  26                 rc = (db->open)(db, txnid, dbpath, dbsubfile,