Imported Upstream version 0.6.7
[platform/upstream/libsolv.git] / src / pool.c
index 930a5a0..8de4cc5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Novell Inc.
+ * Copyright (c) 2007-2009, Novell Inc.
  *
  * This program is licensed under the BSD license, read LICENSE.BSD
  * for further information
@@ -7,7 +7,7 @@
 
 /*
  * pool.c
- * 
+ *
  * The pool contains information about solvables
  * stored optimized for memory consumption and fast retrieval.
  */
@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include "pool.h"
+#include "poolvendor.h"
 #include "repo.h"
 #include "poolid.h"
 #include "poolid_private.h"
@@ -29,6 +30,7 @@
 
 #define SOLVABLE_BLOCK 255
 
+#undef LIBSOLV_KNOWNID_H
 #define KNOWNID_INITIALIZE
 #include "knownid.h"
 #undef KNOWNID_INITIALIZE
@@ -40,27 +42,56 @@ pool_create(void)
   Pool *pool;
   Solvable *s;
 
-  pool = (Pool *)sat_calloc(1, sizeof(*pool));
+  pool = (Pool *)solv_calloc(1, sizeof(*pool));
 
   stringpool_init (&pool->ss, initpool_data);
 
   /* alloc space for RelDep 0 */
-  pool->rels = sat_extend_resize(0, 1, sizeof(Reldep), REL_BLOCK);
+  pool->rels = solv_extend_resize(0, 1, sizeof(Reldep), REL_BLOCK);
   pool->nrels = 1;
   memset(pool->rels, 0, sizeof(Reldep));
 
   /* alloc space for Solvable 0 and system solvable */
-  pool->solvables = sat_extend_resize(0, 2, sizeof(Solvable), SOLVABLE_BLOCK);
+  pool->solvables = solv_extend_resize(0, 2, sizeof(Solvable), SOLVABLE_BLOCK);
   pool->nsolvables = 2;
   memset(pool->solvables, 0, 2 * sizeof(Solvable));
+
+  queue_init(&pool->vendormap);
+  queue_init(&pool->pooljobs);
+  queue_init(&pool->lazywhatprovidesq);
+
+#if defined(DEBIAN)
+  pool->disttype = DISTTYPE_DEB;
+  pool->noarchid = ARCH_ALL;
+#elif defined(ARCHLINUX)
+  pool->disttype = DISTTYPE_ARCH;
+  pool->noarchid = ARCH_ANY;
+#elif defined(HAIKU)
+  pool->disttype = DISTTYPE_HAIKU;
+  pool->noarchid = ARCH_ANY;
+  pool->obsoleteusesprovides = 1;
+#else
+  pool->disttype = DISTTYPE_RPM;
+  pool->noarchid = ARCH_NOARCH;
+#endif
+
+  /* initialize the system solvable */
   s = pool->solvables + SYSTEMSOLVABLE;
   s->name = SYSTEM_SYSTEM;
-  s->arch = ARCH_NOARCH;
+  s->arch = pool->noarchid;
   s->evr = ID_EMPTY;
 
-  queue_init(&pool->vendormap);
-
-  pool->debugmask = SAT_DEBUG_RESULT;  /* FIXME */
+  pool->debugmask = SOLV_DEBUG_RESULT; /* FIXME */
+#ifdef FEDORA
+  pool->implicitobsoleteusescolors = 1;
+#endif
+#ifdef RPM5
+  pool->noobsoletesmultiversion = 1;
+  pool->forbidselfconflicts = 1;
+  pool->obsoleteusesprovides = 1;
+  pool->implicitobsoleteusesprovides = 1;
+  pool->havedistepoch = 1;
+#endif
   return pool;
 }
 
@@ -73,26 +104,149 @@ pool_free(Pool *pool)
 
   pool_freewhatprovides(pool);
   pool_freeidhashes(pool);
-  repo_freeallrepos(pool, 1);
-  sat_free(pool->id2arch);
-  sat_free(pool->solvables);
-  sat_free(pool->ss.stringspace);
-  sat_free(pool->ss.strings);
-  sat_free(pool->rels);
+  pool_freeallrepos(pool, 1);
+  solv_free(pool->id2arch);
+  solv_free(pool->id2color);
+  solv_free(pool->solvables);
+  stringpool_free(&pool->ss);
+  solv_free(pool->rels);
+  pool_setvendorclasses(pool, 0);
   queue_free(&pool->vendormap);
+  queue_free(&pool->pooljobs);
+  queue_free(&pool->lazywhatprovidesq);
   for (i = 0; i < POOL_TMPSPACEBUF; i++)
-    sat_free(pool->tmpspacebuf[i]);
+    solv_free(pool->tmpspace.buf[i]);
   for (i = 0; i < pool->nlanguages; i++)
     free((char *)pool->languages[i]);
-  sat_free(pool->languages);
-  sat_free(pool->languagecache);
-  sat_free(pool);
+  solv_free((void *)pool->languages);
+  solv_free(pool->languagecache);
+  solv_free(pool->errstr);
+  solv_free(pool->rootdir);
+  solv_free(pool);
+}
+
+void
+pool_freeallrepos(Pool *pool, int reuseids)
+{
+  int i;
+
+  pool_freewhatprovides(pool);
+  for (i = 1; i < pool->nrepos; i++)
+    if (pool->repos[i])
+      repo_freedata(pool->repos[i]);
+  pool->repos = solv_free(pool->repos);
+  pool->nrepos = 0;
+  pool->urepos = 0;
+  /* the first two solvables don't belong to a repo */
+  pool_free_solvable_block(pool, 2, pool->nsolvables - 2, reuseids);
+}
+
+int
+pool_setdisttype(Pool *pool, int disttype)
+{
+#ifdef MULTI_SEMANTICS
+  int olddisttype = pool->disttype;
+  switch(disttype)
+    {
+    case DISTTYPE_RPM:
+      pool->noarchid = ARCH_NOARCH;
+      break;
+    case DISTTYPE_DEB:
+      pool->noarchid = ARCH_ALL;
+      break;
+    case DISTTYPE_ARCH:
+    case DISTTYPE_HAIKU:
+      pool->noarchid = ARCH_ANY;
+      break;
+    default:
+      return -1;
+    }
+  pool->disttype = disttype;
+  pool->solvables[SYSTEMSOLVABLE].arch = pool->noarchid;
+  return olddisttype;
+#else
+  return pool->disttype == disttype ? disttype : -1;
+#endif
+}
+
+int
+pool_get_flag(Pool *pool, int flag)
+{
+  switch (flag)
+    {
+    case POOL_FLAG_PROMOTEEPOCH:
+      return pool->promoteepoch;
+    case POOL_FLAG_FORBIDSELFCONFLICTS:
+      return pool->forbidselfconflicts;
+    case POOL_FLAG_OBSOLETEUSESPROVIDES:
+      return pool->obsoleteusesprovides;
+    case POOL_FLAG_IMPLICITOBSOLETEUSESPROVIDES:
+      return pool->implicitobsoleteusesprovides;
+    case POOL_FLAG_OBSOLETEUSESCOLORS:
+      return pool->obsoleteusescolors;
+    case POOL_FLAG_IMPLICITOBSOLETEUSESCOLORS:
+      return pool->implicitobsoleteusescolors;
+    case POOL_FLAG_NOINSTALLEDOBSOLETES:
+      return pool->noinstalledobsoletes;
+    case POOL_FLAG_HAVEDISTEPOCH:
+      return pool->havedistepoch;
+    case POOL_FLAG_NOOBSOLETESMULTIVERSION:
+      return pool->noobsoletesmultiversion;
+    case POOL_FLAG_ADDFILEPROVIDESFILTERED:
+      return pool->addfileprovidesfiltered;
+    default:
+      break;
+    }
+  return -1;
+}
+
+int
+pool_set_flag(Pool *pool, int flag, int value)
+{
+  int old = pool_get_flag(pool, flag);
+  switch (flag)
+    {
+    case POOL_FLAG_PROMOTEEPOCH:
+      pool->promoteepoch = value;
+      break;
+    case POOL_FLAG_FORBIDSELFCONFLICTS:
+      pool->forbidselfconflicts = value;
+      break;
+    case POOL_FLAG_OBSOLETEUSESPROVIDES:
+      pool->obsoleteusesprovides = value;
+      break;
+    case POOL_FLAG_IMPLICITOBSOLETEUSESPROVIDES:
+      pool->implicitobsoleteusesprovides = value;
+      break;
+    case POOL_FLAG_OBSOLETEUSESCOLORS:
+      pool->obsoleteusescolors = value;
+      break;
+    case POOL_FLAG_IMPLICITOBSOLETEUSESCOLORS:
+      pool->implicitobsoleteusescolors = value;
+      break;
+    case POOL_FLAG_NOINSTALLEDOBSOLETES:
+      pool->noinstalledobsoletes = value;
+      break;
+    case POOL_FLAG_HAVEDISTEPOCH:
+      pool->havedistepoch = value;
+      break;
+    case POOL_FLAG_NOOBSOLETESMULTIVERSION:
+      pool->noobsoletesmultiversion = value;
+      break;
+    case POOL_FLAG_ADDFILEPROVIDESFILTERED:
+      pool->addfileprovidesfiltered = value;
+      break;
+    default:
+      break;
+    }
+  return old;
 }
 
+
 Id
 pool_add_solvable(Pool *pool)
 {
-  pool->solvables = sat_extend(pool->solvables, pool->nsolvables, 1, sizeof(Solvable), SOLVABLE_BLOCK);
+  pool->solvables = solv_extend(pool->solvables, pool->nsolvables, 1, sizeof(Solvable), SOLVABLE_BLOCK);
   memset(pool->solvables + pool->nsolvables, 0, sizeof(Solvable));
   return pool->nsolvables++;
 }
@@ -103,7 +257,7 @@ pool_add_solvable_block(Pool *pool, int count)
   Id nsolvables = pool->nsolvables;
   if (!count)
     return nsolvables;
-  pool->solvables = sat_extend(pool->solvables, pool->nsolvables, count, sizeof(Solvable), SOLVABLE_BLOCK);
+  pool->solvables = solv_extend(pool->solvables, pool->nsolvables, count, sizeof(Solvable), SOLVABLE_BLOCK);
   memset(pool->solvables + nsolvables, 0, sizeof(Solvable) * count);
   pool->nsolvables += count;
   return nsolvables;
@@ -124,22 +278,25 @@ pool_free_solvable_block(Pool *pool, Id start, int count, int reuseids)
 }
 
 
-static Pool *pool_shrink_whatprovides_sortcmp_data;
+void
+pool_set_installed(Pool *pool, Repo *installed)
+{
+  if (pool->installed == installed)
+    return;
+  pool->installed = installed;
+  pool_freewhatprovides(pool);
+}
 
 static int
-pool_shrink_whatprovides_sortcmp(const void *ap, const void *bp)
+pool_shrink_whatprovides_sortcmp(const void *ap, const void *bp, void *dp)
 {
   int r;
-  Pool *pool = pool_shrink_whatprovides_sortcmp_data;
+  Pool *pool = dp;
   Id oa, ob, *da, *db;
   oa = pool->whatprovides[*(Id *)ap];
   ob = pool->whatprovides[*(Id *)bp];
   if (oa == ob)
     return *(Id *)ap - *(Id *)bp;
-  if (!oa)
-    return -1;
-  if (!ob)
-    return 1;
   da = pool->whatprovidesdata + oa;
   db = pool->whatprovidesdata + ob;
   while (*db)
@@ -159,7 +316,7 @@ pool_shrink_whatprovides_sortcmp(const void *ap, const void *bp)
 static void
 pool_shrink_whatprovides(Pool *pool)
 {
-  Id i, id;
+  Id i, n, id;
   Id *sorted;
   Id lastid, *last, *dp, *lp;
   Offset o;
@@ -167,19 +324,18 @@ pool_shrink_whatprovides(Pool *pool)
 
   if (pool->ss.nstrings < 3)
     return;
-  sorted = sat_malloc2(pool->ss.nstrings, sizeof(Id));
-  for (id = 0; id < pool->ss.nstrings; id++)
-    sorted[id] = id;
-  pool_shrink_whatprovides_sortcmp_data = pool;
-  qsort(sorted + 1, pool->ss.nstrings - 1, sizeof(Id), pool_shrink_whatprovides_sortcmp);
+  sorted = solv_malloc2(pool->ss.nstrings, sizeof(Id));
+  for (i = id = 0; id < pool->ss.nstrings; id++)
+    if (pool->whatprovides[id] >= 4)
+      sorted[i++] = id;
+  n = i;
+  solv_sort(sorted, n, sizeof(Id), pool_shrink_whatprovides_sortcmp, pool);
   last = 0;
   lastid = 0;
-  for (i = 1; i < pool->ss.nstrings; i++)
+  for (i = 0; i < n; i++)
     {
       id = sorted[i];
       o = pool->whatprovides[id];
-      if (o == 0 || o == 1)
-       continue;
       dp = pool->whatprovidesdata + o;
       if (last)
        {
@@ -201,12 +357,12 @@ pool_shrink_whatprovides(Pool *pool)
       last = pool->whatprovidesdata + o;
       lastid = id;
     }
-  sat_free(sorted);
-  dp = pool->whatprovidesdata + 2;
+  solv_free(sorted);
+  dp = pool->whatprovidesdata + 4;
   for (id = 1; id < pool->ss.nstrings; id++)
     {
       o = pool->whatprovides[id];
-      if (o == 0 || o == 1)
+      if (!o)
        continue;
       if ((Id)o < 0)
        {
@@ -216,6 +372,8 @@ pool_shrink_whatprovides(Pool *pool)
          pool->whatprovides[id] = pool->whatprovides[i];
          continue;
        }
+      if (o < 4)
+       continue;
       lp = pool->whatprovidesdata + o;
       if (lp < dp)
        abort();
@@ -224,12 +382,12 @@ pool_shrink_whatprovides(Pool *pool)
        ;
     }
   o = dp - pool->whatprovidesdata;
-  POOL_DEBUG(SAT_DEBUG_STATS, "shrunk whatprovidesdata from %d to %d\n", pool->whatprovidesdataoff, o);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "shrunk whatprovidesdata from %d to %d\n", pool->whatprovidesdataoff, o);
   if (pool->whatprovidesdataoff == o)
     return;
   r = pool->whatprovidesdataoff - o;
   pool->whatprovidesdataoff = o;
-  pool->whatprovidesdata = sat_realloc(pool->whatprovidesdata, (o + pool->whatprovidesdataleft) * sizeof(Id));
+  pool->whatprovidesdata = solv_realloc(pool->whatprovidesdata, (o + pool->whatprovidesdataleft) * sizeof(Id));
   if (r > pool->whatprovidesdataleft)
     r = pool->whatprovidesdataleft;
   memset(pool->whatprovidesdata + o, 0, r * sizeof(Id));
@@ -238,9 +396,9 @@ pool_shrink_whatprovides(Pool *pool)
 
 /*
  * pool_createwhatprovides()
- * 
+ *
  * create hashes over pool of solvables to ease provide lookups
- * 
+ *
  */
 void
 pool_createwhatprovides(Pool *pool)
@@ -252,27 +410,35 @@ pool_createwhatprovides(Pool *pool)
   Offset *idp, n;
   Offset *whatprovides;
   Id *whatprovidesdata, *d;
+  Repo *installed = pool->installed;
+  unsigned int now;
 
-  POOL_DEBUG(SAT_DEBUG_STATS, "number of solvables: %d\n", pool->nsolvables);
-  POOL_DEBUG(SAT_DEBUG_STATS, "number of ids: %d + %d\n", pool->ss.nstrings, pool->nrels);
+  now = solv_timems(0);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "number of solvables: %d, memory used: %d K\n", pool->nsolvables, pool->nsolvables * (int)sizeof(Solvable) / 1024);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "number of ids: %d + %d\n", pool->ss.nstrings, pool->nrels);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "string memory used: %d K array + %d K data,  rel memory used: %d K array\n", pool->ss.nstrings / (1024 / (int)sizeof(Id)), pool->ss.sstrings / 1024, pool->nrels * (int)sizeof(Reldep) / 1024);
+  if (pool->ss.stringhashmask || pool->relhashmask)
+    POOL_DEBUG(SOLV_DEBUG_STATS, "string hash memory: %d K, rel hash memory : %d K\n", (pool->ss.stringhashmask + 1) / (int)(1024/sizeof(Id)), (pool->relhashmask + 1) / (int)(1024/sizeof(Id)));
 
   pool_freeidhashes(pool);     /* XXX: should not be here! */
   pool_freewhatprovides(pool);
   num = pool->ss.nstrings;
-  pool->whatprovides = whatprovides = sat_calloc_block(num, sizeof(Offset), WHATPROVIDES_BLOCK);
-  pool->whatprovides_rel = sat_calloc_block(pool->nrels, sizeof(Offset), WHATPROVIDES_BLOCK);
+  pool->whatprovides = whatprovides = solv_calloc_block(num, sizeof(Offset), WHATPROVIDES_BLOCK);
+  pool->whatprovides_rel = solv_calloc_block(pool->nrels, sizeof(Offset), WHATPROVIDES_BLOCK);
 
   /* count providers for each name */
-  for (i = 1; i < pool->nsolvables; i++)
+  for (i = pool->nsolvables - 1; i > 0; i--)
     {
       Id *pp;
       s = pool->solvables + i;
-      if (!s->provides)
+      if (!s->provides || !s->repo || s->repo->disabled)
        continue;
-      if (!pool_installable(pool, s))
+      /* we always need the installed solvable in the whatprovides data,
+         otherwise obsoletes/conflicts on them won't work */
+      if (s->repo != installed && !pool_installable(pool, s))
        continue;
       pp = s->repo->idarraydata + s->provides;
-      while ((id = *pp++) != ID_NULL)
+      while ((id = *pp++) != 0)
        {
          while (ISRELDEP(id))
            {
@@ -283,39 +449,42 @@ pool_createwhatprovides(Pool *pool)
        }
     }
 
-  off = 2;     /* first entry is undef, second is empty list */
-  idp = whatprovides;
+  off = 4;     /* first entry is undef, second is empty list, third is system solvable  */
   np = 0;                             /* number of names provided */
-  for (i = 0; i < num; i++, idp++)
+  for (i = 0, idp = whatprovides; i < num; i++, idp++)
     {
       n = *idp;
-      if (!n)                         /* no providers */
-       continue;
-      *idp = off;                     /* move from counts to offsets into whatprovidesdata */
-      off += n + 1;                   /* make space for all providers + terminating ID_NULL */
-      np++;                           /* inc # of provider 'slots' */
+      if (!n)                          /* no providers */
+       {
+         *idp = 1;                     /* offset for empty list */
+         continue;
+       }
+      off += n;                                /* make space for all providers */
+      *idp = off++;                    /* now idp points to terminating zero */
+      np++;                            /* inc # of provider 'slots' for stats */
     }
 
-  POOL_DEBUG(SAT_DEBUG_STATS, "provide ids: %d\n", np);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "provide ids: %d\n", np);
 
   /* reserve some space for relation data */
   extra = 2 * pool->nrels;
   if (extra < 256)
     extra = 256;
 
-  POOL_DEBUG(SAT_DEBUG_STATS, "provide space needed: %d + %d\n", off, extra);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "provide space needed: %d + %d\n", off, extra);
 
   /* alloc space for all providers + extra */
-  whatprovidesdata = sat_calloc(off + extra, sizeof(Id));
+  whatprovidesdata = solv_calloc(off + extra, sizeof(Id));
+  whatprovidesdata[2] = SYSTEMSOLVABLE;
 
   /* now fill data for all provides */
-  for (i = 1; i < pool->nsolvables; i++)
+  for (i = pool->nsolvables - 1; i > 0; i--)
     {
       Id *pp;
       s = pool->solvables + i;
-      if (!s->provides)
+      if (!s->provides || !s->repo || s->repo->disabled)
        continue;
-      if (!pool_installable(pool, s))
+      if (s->repo != installed && !pool_installable(pool, s))
        continue;
 
       /* for all provides of this solvable */
@@ -328,33 +497,54 @@ pool_createwhatprovides(Pool *pool)
              id = rd->name;
            }
          d = whatprovidesdata + whatprovides[id];   /* offset into whatprovidesdata */
-         if (*d)
+         if (*d != i)          /* don't add same solvable twice */
            {
-             d++;
-             while (*d)               /* find free slot */
-               d++;
-             if (d[-1] == i)
-               continue;
+             d[-1] = i;
+             whatprovides[id]--;
            }
-         *d = i;                      /* put solvable Id into data */
        }
     }
   pool->whatprovidesdata = whatprovidesdata;
   pool->whatprovidesdataoff = off;
   pool->whatprovidesdataleft = extra;
   pool_shrink_whatprovides(pool);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "whatprovides memory used: %d K id array, %d K data\n", (pool->ss.nstrings + pool->nrels + WHATPROVIDES_BLOCK) / (int)(1024/sizeof(Id)), (pool->whatprovidesdataoff + pool->whatprovidesdataleft) / (int)(1024/sizeof(Id)));
+
+  queue_empty(&pool->lazywhatprovidesq);
+  if ((!pool->addedfileprovides && pool->disttype == DISTTYPE_RPM) || pool->addedfileprovides == 1)
+    {
+      if (!pool->addedfileprovides)
+       POOL_DEBUG(SOLV_DEBUG_STATS, "WARNING: pool_addfileprovides was not called, this may result in slow operation\n");
+      /* lazyly add file provides */
+      for (i = 1; i < num; i++)
+       {
+         const char *str = pool->ss.stringspace + pool->ss.strings[i];
+         if (str[0] != '/')
+           continue;
+         if (pool->addedfileprovides == 1 && repodata_filelistfilter_matches(0, str))
+           continue;
+         /* setup lazy adding, but remember old value */
+         if (pool->whatprovides[i] > 1)
+           queue_push2(&pool->lazywhatprovidesq, i, pool->whatprovides[i]);
+         pool->whatprovides[i] = 0;
+       }
+      POOL_DEBUG(SOLV_DEBUG_STATS, "lazywhatprovidesq size: %d entries\n", pool->lazywhatprovidesq.count / 2);
+    }
+
+  POOL_DEBUG(SOLV_DEBUG_STATS, "createwhatprovides took %d ms\n", solv_timems(now));
 }
 
 /*
  * free all of our whatprovides data
- * be careful, everything internalized with pool_queuetowhatprovides is gone, too
+ * be careful, everything internalized with pool_queuetowhatprovides is
+ * gone, too
  */
 void
 pool_freewhatprovides(Pool *pool)
 {
-  pool->whatprovides = sat_free(pool->whatprovides);
-  pool->whatprovides_rel = sat_free(pool->whatprovides_rel);
-  pool->whatprovidesdata = sat_free(pool->whatprovidesdata);
+  pool->whatprovides = solv_free(pool->whatprovides);
+  pool->whatprovides_rel = solv_free(pool->whatprovides_rel);
+  pool->whatprovidesdata = solv_free(pool->whatprovidesdata);
   pool->whatprovidesdataoff = 0;
   pool->whatprovidesdataleft = 0;
 }
@@ -364,11 +554,10 @@ pool_freewhatprovides(Pool *pool)
 
 /*
  * pool_queuetowhatprovides  - add queue contents to whatprovidesdata
- * 
- * on-demand filling of provider information
- * move queue data into whatprovidesdata
- * q: queue of Ids
- * returns: Offset into whatprovides
+ *
+ * used for whatprovides, jobs, learnt rules, selections
+ * input: q: queue of Ids
+ * returns: Offset into whatprovidesdata
  *
  */
 Id
@@ -377,14 +566,16 @@ pool_queuetowhatprovides(Pool *pool, Queue *q)
   Offset off;
   int count = q->count;
 
-  if (count == 0)                     /* queue empty -> ID_EMPTY */
-    return ID_EMPTY;
+  if (count == 0)                     /* queue empty -> 1 */
+    return 1;
+  if (count == 1 && q->elements[0] == SYSTEMSOLVABLE)
+    return 2;
 
-  /* extend whatprovidesdata if needed, +1 for ID_NULL-termination */
+  /* extend whatprovidesdata if needed, +1 for 0-termination */
   if (pool->whatprovidesdataleft < count + 1)
     {
-      POOL_DEBUG(SAT_DEBUG_STATS, "growing provides hash data...\n");
-      pool->whatprovidesdata = sat_realloc(pool->whatprovidesdata, (pool->whatprovidesdataoff + count + 4096) * sizeof(Id));
+      POOL_DEBUG(SOLV_DEBUG_STATS, "growing provides hash data...\n");
+      pool->whatprovidesdata = solv_realloc(pool->whatprovidesdata, (pool->whatprovidesdataoff + count + 4096) * sizeof(Id));
       pool->whatprovidesdataleft = count + 4096;
     }
 
@@ -392,9 +583,9 @@ pool_queuetowhatprovides(Pool *pool, Queue *q)
   off = pool->whatprovidesdataoff;
   memcpy(pool->whatprovidesdata + pool->whatprovidesdataoff, q->elements, count * sizeof(Id));
 
-  /* adapt count and ID_NULL-terminate */
+  /* adapt count and 0-terminate */
   pool->whatprovidesdataoff += count;
-  pool->whatprovidesdata[pool->whatprovidesdataoff++] = ID_NULL;
+  pool->whatprovidesdata[pool->whatprovidesdataoff++] = 0;
   pool->whatprovidesdataleft -= count + 1;
 
   return (Id)off;
@@ -403,258 +594,767 @@ pool_queuetowhatprovides(Pool *pool, Queue *q)
 
 /*************************************************************************/
 
-/*
- * addrelproviders
- * 
- * add packages fulfilling the relation to whatprovides array
- * no exact providers, do range match
- * 
- */
+#if defined(MULTI_SEMANTICS)
+# define EVRCMP_DEPCMP (pool->disttype == DISTTYPE_DEB ? EVRCMP_COMPARE : EVRCMP_MATCH_RELEASE)
+#elif defined(DEBIAN)
+# define EVRCMP_DEPCMP EVRCMP_COMPARE
+#else
+# define EVRCMP_DEPCMP EVRCMP_MATCH_RELEASE
+#endif
 
-Id *
-pool_addrelproviders(Pool *pool, Id d)
+/* check if a package's nevr matches a dependency */
+/* semi-private, called from public pool_match_nevr */
+
+int
+pool_match_nevr_rel(Pool *pool, Solvable *s, Id d)
 {
   Reldep *rd = GETRELDEP(pool, d);
-  Reldep *prd;
-  Queue plist;
-  Id buf[16];
   Id name = rd->name;
   Id evr = rd->evr;
   int flags = rd->flags;
-  Id pid, *pidp;
-  Id p, *pp, *pp2, *pp3;
 
-  d = GETRELID(d);
-  queue_init_buffer(&plist, buf, sizeof(buf)/sizeof(*buf));
-  switch (flags)
+  if (flags > 7)
     {
-    case REL_AND:
-    case REL_WITH:
-      pp = pool_whatprovides(pool, name);
-      pp2 = pool_whatprovides(pool, evr);
-      while ((p = *pp++) != 0)
+      switch (flags)
        {
-         for (pp3 = pp2; *pp3;)
-           if (*pp3++ == p)
-             {
-               queue_push(&plist, p);
-               break;
-             }
-       }
-      break;
-    case REL_OR:
-      pp = pool_whatprovides(pool, name);
-      while ((p = *pp++) != 0)
-       queue_push(&plist, p);
-      pp = pool_whatprovides(pool, evr);
-      while ((p = *pp++) != 0)
-       queue_pushunique(&plist, p);
-      break;
-    case REL_NAMESPACE:
-      if (pool->nscallback)
-       {
-         /* ask callback which packages provide the dependency
-           * 0:  none
-           * 1:  the system (aka SYSTEMSOLVABLE)
-           * >1: a set of packages, stored as offset on whatprovidesdata
-           */
-         p = pool->nscallback(pool, pool->nscallbackdata, name, evr);
-         if (p > 1)
+       case REL_ARCH:
+         if (s->arch != evr)
            {
-             queue_free(&plist);
-             pool->whatprovides_rel[d] = p;
-             return pool->whatprovidesdata + p;
+             if (evr != ARCH_SRC || s->arch != ARCH_NOSRC)
+               return 0;
            }
-         if (p == 1)
-           queue_push(&plist, SYSTEMSOLVABLE);
-       }
-      break;
-    case REL_ARCH:
-      pp = pp2 = pool_whatprovides(pool, name);
-      while ((p = *pp++) != 0)
-       {
-         Solvable *s = pool->solvables + p;
-         if (s->arch == evr)
-           queue_push(&plist, p);
-         else
-           pp2 = 0;
+         return pool_match_nevr(pool, s, name);
+       case REL_OR:
+         if (pool_match_nevr(pool, s, name))
+           return 1;
+         return pool_match_nevr(pool, s, evr);
+       case REL_AND:
+       case REL_WITH:
+         if (!pool_match_nevr(pool, s, name))
+           return 0;
+         return pool_match_nevr(pool, s, evr);
+       case REL_MULTIARCH:
+         if (evr != ARCH_ANY)
+           return 0;
+         /* XXX : need to check for Multi-Arch: allowed! */
+         return pool_match_nevr(pool, s, name);
+       default:
+         return 0;
        }
-      if (pp2)
-       return pp2;
-      break;
+    }
+  if (!pool_match_nevr(pool, s, name))
+    return 0;
+  if (evr == s->evr)
+    return (flags & REL_EQ) ? 1 : 0;
+  if (!flags)
+    return 0;
+  if (flags == 7)
+    return 1;
+  switch (pool_evrcmp(pool, s->evr, evr, EVRCMP_DEPCMP))
+    {
+    case -2:
+      return 1;
+    case -1:
+      return (flags & REL_LT) ? 1 : 0;
+    case 0:
+      return (flags & REL_EQ) ? 1 : 0;
+    case 1:
+      return (flags & REL_GT) ? 1 : 0;
+    case 2:
+      return (flags & REL_EQ) ? 1 : 0;
     default:
       break;
     }
+  return 0;
+}
 
-  /* convert to whatprovides id */
-#if 0
-  POOL_DEBUG(SAT_DEBUG_STATS, "addrelproviders: what provides %s?\n", dep2str(pool, name));
-#endif
-  if (flags && flags < 8)
-    {
-      pp = pool_whatprovides(pool, name);
-      while (ISRELDEP(name))
-       {
-          rd = GETRELDEP(pool, name);
-         name = rd->name;
-       }
-      while ((p = *pp++) != 0)
-       {
-#if 0
-         POOL_DEBUG(DEBUG_1, "addrelproviders: checking package %s\n", id2str(pool, pool->p[p].name));
+#if defined(HAIKU) || defined(MULTI_SEMANTICS)
+/* forward declaration */
+static int pool_match_flags_evr_rel_compat(Pool *pool, Reldep *range, int flags, int evr);
 #endif
-         /* solvable p provides name in some rels */
-         pidp = pool->solvables[p].repo->idarraydata + pool->solvables[p].provides;
-         while ((pid = *pidp++) != 0)
-           {
-             int pflags;
-             Id pevr;
 
-             if (pid == name)
-               {
-#ifdef DEBIAN_SEMANTICS
-                 continue;             /* unversioned provides can
-                                        * never match versioned deps */
-#else
-                 break;                /* yes, provides all versions */
+/* match (flags, evr) against provider (pflags, pevr) */
+static inline int
+pool_match_flags_evr(Pool *pool, int pflags, Id pevr, int flags, int evr)
+{
+  if (!pflags || !flags || pflags >= 8 || flags >= 8)
+    return 0;
+  if (flags == 7 || pflags == 7)
+    return 1;          /* rel provides every version */
+  if ((pflags & flags & (REL_LT | REL_GT)) != 0)
+    return 1;          /* both rels show in the same direction */
+  if (pevr == evr)
+    return (flags & pflags & REL_EQ) ? 1 : 0;
+#if defined(HAIKU) || defined(MULTI_SEMANTICS)
+  if (ISRELDEP(pevr))
+    {
+      Reldep *rd = GETRELDEP(pool, pevr);
+      if (rd->flags == REL_COMPAT)
+       return pool_match_flags_evr_rel_compat(pool, rd, flags, evr);
+    }
 #endif
-               }
-             if (!ISRELDEP(pid))
-               continue;               /* wrong provides name */
-             prd = GETRELDEP(pool, pid);
-             if (prd->name != name)
-               continue;               /* wrong provides name */
-             /* right package, both deps are rels */
-             pflags = prd->flags;
-             if (!pflags)
-               continue;
-             if (flags == 7 || pflags == 7)
-               break; /* included */
-             if ((pflags & flags & 5) != 0)
-               break; /* same direction, match */
-             pevr = prd->evr;
-             if (pevr == evr)
-               {
-                 if ((pflags & flags & 2) != 0)
-                   break; /* both have =, match */
-               }
-             else
-               {
-                 int f = flags == 5 ? 5 : flags == 2 ? pflags : (flags ^ 5) & (pflags | 5);
-                 if ((f & (1 << (1 + evrcmp(pool, pevr, evr, EVRCMP_MATCH_RELEASE)))) != 0)
-                   break;
-               }
-           }
-         if (!pid)
-           continue;   /* no rel match */
-         queue_push(&plist, p);
-       }
-      /* make our system solvable provide all unknown rpmlib() stuff */
-      if (plist.count == 0 && !strncmp(id2str(pool, name), "rpmlib(", 7))
-       queue_push(&plist, SYSTEMSOLVABLE);
+  switch (pool_evrcmp(pool, pevr, evr, EVRCMP_DEPCMP))
+    {
+    case -2:
+      return (pflags & REL_EQ) ? 1 : 0;
+    case -1:
+      return (flags & REL_LT) || (pflags & REL_GT) ? 1 : 0;
+    case 0:
+      return (flags & pflags & REL_EQ) ? 1 : 0;
+    case 1:
+      return (flags & REL_GT) || (pflags & REL_LT) ? 1 : 0;
+    case 2:
+      return (flags & REL_EQ) ? 1 : 0;
+    default:
+      break;
     }
-  /* add providers to whatprovides */
-#if 0
-  POOL_DEBUG(SAT_DEBUG_STATS, "addrelproviders: adding %d packages to %d\n", plist.count, d);
+  return 0;
+}
+
+#if defined(HAIKU) || defined(MULTI_SEMANTICS)
+static int
+pool_match_flags_evr_rel_compat(Pool *pool, Reldep *range, int flags, int evr)
+{
+  /* range->name is the actual version, range->evr the backwards compatibility
+     version. If flags are '>=' or '>', we match the compatibility version
+     as well, otherwise only the actual version. */
+  if (!(flags & REL_GT) || (flags & REL_LT))
+    return pool_match_flags_evr(pool, REL_EQ, range->name, flags, evr);
+  return pool_match_flags_evr(pool, REL_LT | REL_EQ, range->name, flags, evr) &&
+         pool_match_flags_evr(pool, REL_GT | REL_EQ, range->evr, REL_EQ, evr);
+}
 #endif
-  pool->whatprovides_rel[d] = pool_queuetowhatprovides(pool, &plist);
-  queue_free(&plist);
 
-  return pool->whatprovidesdata + pool->whatprovides_rel[d];
+/* public (i.e. not inlined) version of pool_match_flags_evr */
+int
+pool_intersect_evrs(Pool *pool, int pflags, Id pevr, int flags, int evr)
+{
+  return pool_match_flags_evr(pool, pflags, pevr, flags, evr);
 }
 
-/*************************************************************************/
+/* match two dependencies (d1 = provider) */
 
-void
-pool_debug(Pool *pool, int type, const char *format, ...)
+int
+pool_match_dep(Pool *pool, Id d1, Id d2)
 {
-  va_list args;
-  char buf[1024];
+  Reldep *rd1, *rd2;
 
-  if ((type & (SAT_FATAL|SAT_ERROR)) == 0)
+  if (d1 == d2)
+    return 1;
+  if (!ISRELDEP(d1))
     {
-      if ((pool->debugmask & type) == 0)
-       return;
+      if (!ISRELDEP(d2))
+       return 0;
+      rd2 = GETRELDEP(pool, d2);
+      return pool_match_dep(pool, d1, rd2->name);
     }
-  va_start(args, format);
-  if (!pool->debugcallback)
+  rd1 = GETRELDEP(pool, d1);
+  if (!ISRELDEP(d2))
     {
-      if ((type & (SAT_FATAL|SAT_ERROR)) == 0)
-        vprintf(format, args);
-      else
-        vfprintf(stderr, format, args);
-      return;
+      return pool_match_dep(pool, rd1->name, d2);
     }
-  vsnprintf(buf, sizeof(buf), format, args);
-  pool->debugcallback(pool, pool->debugcallbackdata, type, buf);
+  rd2 = GETRELDEP(pool, d2);
+  /* first match name */
+  if (!pool_match_dep(pool, rd1->name, rd2->name))
+    return 0;
+  /* name matches, check flags and evr */
+  return pool_intersect_evrs(pool, rd1->flags, rd1->evr, rd2->flags, rd2->evr);
 }
 
-void
-pool_setdebuglevel(Pool *pool, int level)
+Id
+pool_searchlazywhatprovidesq(Pool *pool, Id d)
 {
-  int mask = SAT_DEBUG_RESULT;
-  if (level > 0)
-    mask |= SAT_DEBUG_STATS|SAT_DEBUG_ANALYZE|SAT_DEBUG_UNSOLVABLE;
-  if (level > 1)
-    mask |= SAT_DEBUG_JOB|SAT_DEBUG_SOLUTIONS|SAT_DEBUG_POLICY;
-  if (level > 2)
-    mask |= SAT_DEBUG_PROPAGATE;
-  if (level > 3)
-    mask |= SAT_DEBUG_RULE_CREATION;
-  if (level > 4)
-    mask |= SAT_DEBUG_SCHUBI;
-  pool->debugmask = mask;
+  int start = 0;
+  int end = pool->lazywhatprovidesq.count;
+  Id *elements;
+  if (!end)
+    return 0;
+  elements = pool->lazywhatprovidesq.elements;
+  while (end - start > 16)
+    {
+      int mid = (start + end) / 2 & ~1;
+      if (elements[mid] == d)
+       return elements[mid + 1];
+      if (elements[mid] < d)
+       start = mid + 2;
+      else
+       end = mid;
+    }
+  for (; start < end; start += 2)
+    if (elements[start] == d)
+      return elements[start + 1];
+  return 0;
 }
 
-/*************************************************************************/
-
-struct searchfiles {
-  Id *ids;
-  char **dirs;
-  char **names;
-  int nfiles;
-  Map seen;
-};
-
-#define SEARCHFILES_BLOCK 127
-
-static void
-pool_addfileprovides_dep(Pool *pool, Id *ida, struct searchfiles *sf, struct searchfiles *isf)
+/*
+ * addstdproviders
+ *
+ * lazy populating of the whatprovides array, non relation case
+ */
+static Id
+pool_addstdproviders(Pool *pool, Id d)
 {
-  Id dep, sid;
-  const char *s, *sr;
-  struct searchfiles *csf;
+  const char *str;
+  Queue q;
+  Id qbuf[16];
+  Dataiterator di;
+  Id oldoffset;
 
-  while ((dep = *ida++) != 0)
+  if (pool->addedfileprovides == 2)
     {
-      csf = sf;
-      while (ISRELDEP(dep))
+      pool->whatprovides[d] = 1;
+      return 1;
+    }
+  str =  pool->ss.stringspace + pool->ss.strings[d];
+  if (*str != '/')
+    {
+      pool->whatprovides[d] = 1;
+      return 1;
+    }
+  queue_init_buffer(&q, qbuf, sizeof(qbuf)/sizeof(*qbuf));
+  dataiterator_init(&di, pool, 0, 0, SOLVABLE_FILELIST, str, SEARCH_STRING|SEARCH_FILES|SEARCH_COMPLETE_FILELIST);
+  for (; dataiterator_step(&di); dataiterator_skip_solvable(&di))
+    {
+      Solvable *s = pool->solvables + di.solvid;
+      /* XXX: maybe should add a provides dependency to the solvables
+       * OTOH this is only needed for rel deps that filter the provides,
+       * and those should not use filelist entries */
+      if (s->repo->disabled)
+       continue;
+      if (s->repo != pool->installed && !pool_installable(pool, s))
+       continue;
+      queue_push(&q, di.solvid);
+    }
+  dataiterator_free(&di);
+  oldoffset = pool_searchlazywhatprovidesq(pool, d);
+  if (!q.count)
+    pool->whatprovides[d] = oldoffset ? oldoffset : 1;
+  else
+    {
+      if (oldoffset)
        {
-         Reldep *rd;
-         sid = pool->ss.nstrings + GETRELID(dep);
-         if (MAPTST(&csf->seen, sid))
+         Id *oo = pool->whatprovidesdata + oldoffset;
+         int i;
+         /* unify both queues. easy, as we know both are sorted */
+         for (i = 0; i < q.count; i++)
            {
-             dep = 0;
-             break;
+             if (*oo > q.elements[i])
+               continue;
+             if (*oo < q.elements[i])
+               queue_insert(&q, i, *oo);
+             oo++;
+             if (!*oo)
+               break;
            }
-         MAPSET(&csf->seen, sid);
-         rd = GETRELDEP(pool, dep);
-         if (rd->flags < 8)
-           dep = rd->name;
-         else if (rd->flags == REL_NAMESPACE)
+         while (*oo)
+           queue_push(&q, *oo++);
+         if (q.count == oo - (pool->whatprovidesdata + oldoffset))
            {
-             if (rd->name == NAMESPACE_INSTALLED || rd->name == NAMESPACE_SPLITPROVIDES)
-               {
-                 csf = isf;
-                 if (!csf || MAPTST(&csf->seen, sid))
-                   {
-                     dep = 0;
-                     break;
-                   }
-                 MAPSET(&csf->seen, sid);
+             /* end result has same size as oldoffset -> no new entries */
+             queue_free(&q);
+             pool->whatprovides[d] = oldoffset;
+             return oldoffset;
+           }
+       }
+      pool->whatprovides[d] = pool_queuetowhatprovides(pool, &q);
+    }
+  queue_free(&q);
+  return pool->whatprovides[d];
+}
+
+
+static inline int
+pool_is_kind(Pool *pool, Id name, Id kind)
+{
+  const char *n;
+  if (!kind)
+    return 1;
+  n = pool_id2str(pool, name);
+  if (kind != 1)
+    {
+      const char *kn = pool_id2str(pool, kind);
+      int knl = strlen(kn);
+      return !strncmp(n, kn, knl) && n[knl] == ':' ? 1 : 0;
+    }
+  else
+    {
+      if (*n == ':')
+       return 1;
+      while(*n >= 'a' && *n <= 'z')
+       n++;
+      return *n == ':' ? 0 : 1;
+    }
+}
+
+/*
+ * addrelproviders
+ *
+ * add packages fulfilling the relation to whatprovides array
+ *
+ * some words about REL_AND and REL_IF: we assume the best case
+ * here, so that you get a "potential" result if you ask for a match.
+ * E.g. if you ask for "whatrequires A" and package X contains
+ * "Requires: A & B", you'll get "X" as an answer.
+ */
+Id
+pool_addrelproviders(Pool *pool, Id d)
+{
+  Reldep *rd;
+  Reldep *prd;
+  Queue plist;
+  Id buf[16];
+  Id name, evr, flags;
+  Id pid, *pidp;
+  Id p, *pp;
+
+  if (!ISRELDEP(d))
+    return pool_addstdproviders(pool, d);
+  rd = GETRELDEP(pool, d);
+  name = rd->name;
+  evr = rd->evr;
+  flags = rd->flags;
+  d = GETRELID(d);
+  queue_init_buffer(&plist, buf, sizeof(buf)/sizeof(*buf));
+
+  if (flags >= 8)
+    {
+      /* special relation */
+      Id wp = 0;
+      Id *pp2, *pp3;
+
+      switch (flags)
+       {
+       case REL_WITH:
+         wp = pool_whatprovides(pool, name);
+         pp2 = pool_whatprovides_ptr(pool, evr);
+         pp = pool->whatprovidesdata + wp;
+         while ((p = *pp++) != 0)
+           {
+             for (pp3 = pp2; *pp3; pp3++)
+               if (*pp3 == p)
+                 break;
+             if (*pp3)
+               queue_push(&plist, p);  /* found it */
+             else
+               wp = 0;
+           }
+         break;
+
+       case REL_AND:
+       case REL_OR:
+         wp = pool_whatprovides(pool, name);
+         if (!pool->whatprovidesdata[wp])
+           wp = pool_whatprovides(pool, evr);
+         else
+           {
+             /* sorted merge */
+             pp2 = pool_whatprovides_ptr(pool, evr);
+             pp = pool->whatprovidesdata + wp;
+             while (*pp && *pp2)
+               {
+                 if (*pp < *pp2)
+                   queue_push(&plist, *pp++);
+                 else
+                   {
+                     if (*pp == *pp2)
+                       pp++;
+                     queue_push(&plist, *pp2++);
+                   }
+               }
+             while (*pp)
+               queue_push(&plist, *pp++);
+             while (*pp2)
+               queue_push(&plist, *pp2++);
+             /* if the number of elements did not change, we can reuse wp */
+             if (pp - (pool->whatprovidesdata + wp) != plist.count)
+               wp = 0;
+           }
+         break;
+
+       case REL_COND:
+         /* assume the condition is true */
+         wp = pool_whatprovides(pool, name);
+         break;
+
+       case REL_NAMESPACE:
+         if (name == NAMESPACE_OTHERPROVIDERS)
+           {
+             wp = pool_whatprovides(pool, evr);
+             break;
+           }
+         if (pool->nscallback)
+           {
+             /* ask callback which packages provide the dependency
+              * 0:  none
+              * 1:  the system (aka SYSTEMSOLVABLE)
+              * >1: set of packages, stored as offset on whatprovidesdata
+              */
+             p = pool->nscallback(pool, pool->nscallbackdata, name, evr);
+             if (p > 1)
+               wp = p;
+             if (p == 1)
+               queue_push(&plist, SYSTEMSOLVABLE);
+           }
+         break;
+       case REL_ARCH:
+         /* small hack: make it possible to match <pkg>.src
+          * we have to iterate over the solvables as src packages do not
+          * provide anything, thus they are not indexed in our
+          * whatprovides hash */
+         if (evr == ARCH_SRC || evr == ARCH_NOSRC)
+           {
+             Solvable *s;
+             for (p = 1, s = pool->solvables + p; p < pool->nsolvables; p++, s++)
+               {
+                 if (!s->repo)
+                   continue;
+                 if (s->arch != evr && s->arch != ARCH_NOSRC)
+                   continue;
+                 if (pool_disabled_solvable(pool, s))
+                   continue;
+                 if (!name || pool_match_nevr(pool, s, name))
+                   queue_push(&plist, p);
+               }
+             break;
+           }
+         if (!name)
+           {
+             FOR_POOL_SOLVABLES(p)
+               {
+                 Solvable *s = pool->solvables + p;
+                 if (s->repo != pool->installed && !pool_installable(pool, s))
+                   continue;
+                 if (s->arch == evr)
+                   queue_push(&plist, p);
+               }
+             break;
+           }
+         wp = pool_whatprovides(pool, name);
+         pp = pool->whatprovidesdata + wp;
+         while ((p = *pp++) != 0)
+           {
+             Solvable *s = pool->solvables + p;
+             if (s->arch == evr)
+               queue_push(&plist, p);
+             else
+               wp = 0;
+           }
+         break;
+       case REL_MULTIARCH:
+         if (evr != ARCH_ANY)
+           break;
+         /* XXX : need to check for Multi-Arch: allowed! */
+         wp = pool_whatprovides(pool, name);
+         break;
+       case REL_KIND:
+         /* package kind filtering */
+         if (!name)
+           {
+             FOR_POOL_SOLVABLES(p)
+               {
+                 Solvable *s = pool->solvables + p;
+                 if (s->repo != pool->installed && !pool_installable(pool, s))
+                   continue;
+                 if (pool_is_kind(pool, s->name, evr))
+                   queue_push(&plist, p);
+               }
+             break;
+           }
+         wp = pool_whatprovides(pool, name);
+         pp = pool->whatprovidesdata + wp;
+         while ((p = *pp++) != 0)
+           {
+             Solvable *s = pool->solvables + p;
+             if (pool_is_kind(pool, s->name, evr))
+               queue_push(&plist, p);
+             else
+               wp = 0;
+           }
+         break;
+       case REL_FILECONFLICT:
+         pp = pool_whatprovides_ptr(pool, name);
+         while ((p = *pp++) != 0)
+           {
+             Id origd = MAKERELDEP(d);
+             Solvable *s = pool->solvables + p;
+             if (!s->provides)
+               continue;
+             pidp = s->repo->idarraydata + s->provides;
+             while ((pid = *pidp++) != 0)
+               if (pid == origd)
+                 break;
+             if (pid)
+               queue_push(&plist, p);
+           }
+         break;
+       default:
+         break;
+       }
+      if (wp)
+       {
+         /* we can reuse an existing entry */
+         queue_free(&plist);
+         pool->whatprovides_rel[d] = wp;
+         return wp;
+       }
+    }
+  else if (flags)
+    {
+      /* simple version comparison relation */
+#if 0
+      POOL_DEBUG(SOLV_DEBUG_STATS, "addrelproviders: what provides %s?\n", pool_dep2str(pool, name));
+#endif
+      pp = pool_whatprovides_ptr(pool, name);
+      while (ISRELDEP(name))
+       {
+          rd = GETRELDEP(pool, name);
+         name = rd->name;
+       }
+      while ((p = *pp++) != 0)
+       {
+         Solvable *s = pool->solvables + p;
+         if (!s->provides)
+           {
+             /* no provides - check nevr */
+             if (pool_match_nevr_rel(pool, s, MAKERELDEP(d)))
+               queue_push(&plist, p);
+             continue;
+           }
+         /* solvable p provides name in some rels */
+         pidp = s->repo->idarraydata + s->provides;
+         while ((pid = *pidp++) != 0)
+           {
+             if (!ISRELDEP(pid))
+               {
+                 if (pid != name)
+                   continue;           /* wrong provides name */
+                 if (pool->disttype == DISTTYPE_DEB)
+                   continue;           /* unversioned provides can never match versioned deps */
+                 break;
+               }
+             prd = GETRELDEP(pool, pid);
+             if (prd->name != name)
+               continue;               /* wrong provides name */
+             /* right package, both deps are rels. check flags/evr */
+             if (pool_match_flags_evr(pool, prd->flags, prd->evr, flags, evr))
+               break;  /* matches */
+           }
+         if (!pid)
+           continue;   /* none of the providers matched */
+         queue_push(&plist, p);
+       }
+      /* make our system solvable provide all unknown rpmlib() stuff */
+      if (plist.count == 0 && !strncmp(pool_id2str(pool, name), "rpmlib(", 7))
+       queue_push(&plist, SYSTEMSOLVABLE);
+    }
+  /* add providers to whatprovides */
+#if 0
+  POOL_DEBUG(SOLV_DEBUG_STATS, "addrelproviders: adding %d packages to %d\n", plist.count, d);
+#endif
+  pool->whatprovides_rel[d] = pool_queuetowhatprovides(pool, &plist);
+  queue_free(&plist);
+
+  return pool->whatprovides_rel[d];
+}
+
+void
+pool_flush_namespaceproviders(Pool *pool, Id ns, Id evr)
+{
+  int nrels = pool->nrels;
+  Id d;
+  Reldep *rd;
+
+  if (!pool->whatprovides_rel)
+    return;
+  for (d = 1, rd = pool->rels + d; d < nrels; d++, rd++)
+    {
+      if (rd->flags != REL_NAMESPACE || rd->name == NAMESPACE_OTHERPROVIDERS)
+       continue;
+      if (ns && rd->name != ns)
+       continue;
+      if (evr && rd->evr != evr)
+       continue;
+      pool->whatprovides_rel[d] = 0;
+    }
+}
+
+/* intersect dependencies in keyname with dep, return list of matching packages */
+void
+pool_whatmatchesdep(Pool *pool, Id keyname, Id dep, Queue *q, int marker)
+{
+  Id p;
+
+  queue_empty(q);
+  FOR_POOL_SOLVABLES(p)
+    {
+      Solvable *s = pool->solvables + p;
+      if (s->repo->disabled)
+       continue;
+      if (s->repo != pool->installed && !pool_installable(pool, s))
+       continue;
+      if (solvable_matchesdep(s, keyname, dep, marker))
+       queue_push(q, p);
+    }
+}
+
+/*************************************************************************/
+
+void
+pool_debug(Pool *pool, int type, const char *format, ...)
+{
+  va_list args;
+  char buf[1024];
+
+  if ((type & (SOLV_FATAL|SOLV_ERROR)) == 0)
+    {
+      if ((pool->debugmask & type) == 0)
+       return;
+    }
+  va_start(args, format);
+  if (!pool->debugcallback)
+    {
+      if ((type & (SOLV_FATAL|SOLV_ERROR)) == 0 && !(pool->debugmask & SOLV_DEBUG_TO_STDERR))
+        vprintf(format, args);
+      else
+        vfprintf(stderr, format, args);
+      return;
+    }
+  vsnprintf(buf, sizeof(buf), format, args);
+  va_end(args);
+  pool->debugcallback(pool, pool->debugcallbackdata, type, buf);
+}
+
+int
+pool_error(Pool *pool, int ret, const char *format, ...)
+{
+  va_list args;
+  int l;
+  va_start(args, format);
+  if (!pool->errstr)
+    {
+      pool->errstra = 1024;
+      pool->errstr = solv_malloc(pool->errstra);
+    }
+  if (!*format)
+    {
+      *pool->errstr = 0;
+      l = 0;
+    }
+  else
+    l = vsnprintf(pool->errstr, pool->errstra, format, args);
+  va_end(args);
+  if (l >= 0 && l + 1 > pool->errstra)
+    {
+      pool->errstra = l + 256;
+      pool->errstr = solv_realloc(pool->errstr, pool->errstra);
+      va_start(args, format);
+      l = vsnprintf(pool->errstr, pool->errstra, format, args);
+      va_end(args);
+    }
+  if (l < 0)
+    strcpy(pool->errstr, "unknown error");
+  if (pool->debugmask & SOLV_ERROR)
+    pool_debug(pool, SOLV_ERROR, "%s\n", pool->errstr);
+  return ret;
+}
+
+char *
+pool_errstr(Pool *pool)
+{
+  return pool->errstr ? pool->errstr : "no error";
+}
+
+void
+pool_setdebuglevel(Pool *pool, int level)
+{
+  int mask = SOLV_DEBUG_RESULT;
+  if (level > 0)
+    mask |= SOLV_DEBUG_STATS|SOLV_DEBUG_ANALYZE|SOLV_DEBUG_UNSOLVABLE|SOLV_DEBUG_SOLVER|SOLV_DEBUG_TRANSACTION|SOLV_ERROR;
+  if (level > 1)
+    mask |= SOLV_DEBUG_JOB|SOLV_DEBUG_SOLUTIONS|SOLV_DEBUG_POLICY;
+  if (level > 2)
+    mask |= SOLV_DEBUG_PROPAGATE;
+  if (level > 3)
+    mask |= SOLV_DEBUG_RULE_CREATION;
+  mask |= pool->debugmask & SOLV_DEBUG_TO_STDERR;      /* keep bit */
+  pool->debugmask = mask;
+}
+
+void pool_setdebugcallback(Pool *pool, void (*debugcallback)(struct _Pool *, void *data, int type, const char *str), void *debugcallbackdata)
+{
+  pool->debugcallback = debugcallback;
+  pool->debugcallbackdata = debugcallbackdata;
+}
+
+void pool_setdebugmask(Pool *pool, int mask)
+{
+  pool->debugmask = mask;
+}
+
+void pool_setloadcallback(Pool *pool, int (*cb)(struct _Pool *, struct _Repodata *, void *), void *loadcbdata)
+{
+  pool->loadcallback = cb;
+  pool->loadcallbackdata = loadcbdata;
+}
+
+void pool_setnamespacecallback(Pool *pool, Id (*cb)(struct _Pool *, void *, Id, Id), void *nscbdata)
+{
+  pool->nscallback = cb;
+  pool->nscallbackdata = nscbdata;
+}
+
+/*************************************************************************/
+
+struct searchfiles {
+  Id *ids;
+  int nfiles;
+  Map seen;
+};
+
+#define SEARCHFILES_BLOCK 127
+
+static void
+pool_addfileprovides_dep(Pool *pool, Id *ida, struct searchfiles *sf, struct searchfiles *isf)
+{
+  Id dep, sid;
+  const char *s;
+  struct searchfiles *csf;
+
+  while ((dep = *ida++) != 0)
+    {
+      csf = sf;
+      while (ISRELDEP(dep))
+       {
+         Reldep *rd;
+         sid = pool->ss.nstrings + GETRELID(dep);
+         if (MAPTST(&csf->seen, sid))
+           {
+             dep = 0;
+             break;
+           }
+         MAPSET(&csf->seen, sid);
+         rd = GETRELDEP(pool, dep);
+         if (rd->flags < 8)
+           dep = rd->name;
+         else if (rd->flags == REL_NAMESPACE)
+           {
+             if (rd->name == NAMESPACE_INSTALLED || rd->name == NAMESPACE_SPLITPROVIDES)
+               {
+                 csf = isf;
+                 if (!csf || MAPTST(&csf->seen, sid))
+                   {
+                     dep = 0;
+                     break;
+                   }
+                 MAPSET(&csf->seen, sid);
                }
              dep = rd->evr;
            }
+         else if (rd->flags == REL_FILECONFLICT)
+           {
+             dep = 0;
+             break;
+           }
          else
            {
              Id ids[2];
@@ -669,20 +1369,13 @@ pool_addfileprovides_dep(Pool *pool, Id *ida, struct searchfiles *sf, struct sea
       if (MAPTST(&csf->seen, dep))
        continue;
       MAPSET(&csf->seen, dep);
-      s = id2str(pool, dep);
+      s = pool_id2str(pool, dep);
       if (*s != '/')
        continue;
-      csf->ids = sat_extend(csf->ids, csf->nfiles, 1, sizeof(Id), SEARCHFILES_BLOCK);
-      csf->dirs = sat_extend(csf->dirs, csf->nfiles, 1, sizeof(const char *), SEARCHFILES_BLOCK);
-      csf->names = sat_extend(csf->names, csf->nfiles, 1, sizeof(const char *), SEARCHFILES_BLOCK);
-      csf->ids[csf->nfiles] = dep;
-      sr = strrchr(s, '/');
-      csf->names[csf->nfiles] = strdup(sr + 1);
-      csf->dirs[csf->nfiles] = sat_malloc(sr - s + 1);
-      if (sr != s)
-        strncpy(csf->dirs[csf->nfiles], s, sr - s);
-      csf->dirs[csf->nfiles][sr - s] = 0;
-      csf->nfiles++;
+      if (csf != isf && pool->addedfileprovides == 1 && !repodata_filelistfilter_matches(0, s))
+       continue;       /* skip non-standard locations csf == isf: installed case */
+      csf->ids = solv_extend(csf->ids, csf->nfiles, 1, sizeof(Id), SEARCHFILES_BLOCK);
+      csf->ids[csf->nfiles++] = dep;
     }
 }
 
@@ -692,8 +1385,10 @@ struct addfileprovides_cbdata {
   char **dirs;
   char **names;
 
-  Repodata *olddata;
   Id *dids;
+
+  Map providedids;
+
   Map useddirs;
 };
 
@@ -703,120 +1398,198 @@ addfileprovides_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyV
   struct addfileprovides_cbdata *cbd = cbdata;
   int i;
 
-  if (data != cbd->olddata)
+  if (!cbd->useddirs.size)
     {
-      map_free(&cbd->useddirs);
-      map_init(&cbd->useddirs, data->dirpool.ndirs);
+      map_init(&cbd->useddirs, data->dirpool.ndirs + 1);
+      if (!cbd->dirs)
+       {
+         cbd->dirs = solv_malloc2(cbd->nfiles, sizeof(char *));
+         cbd->names = solv_malloc2(cbd->nfiles, sizeof(char *));
+         for (i = 0; i < cbd->nfiles; i++)
+           {
+             char *s = solv_strdup(pool_id2str(data->repo->pool, cbd->ids[i]));
+             cbd->dirs[i] = s;
+             s = strrchr(s, '/');
+             *s = 0;
+             cbd->names[i] = s + 1;
+           }
+       }
       for (i = 0; i < cbd->nfiles; i++)
        {
-         Id did = repodata_str2dir(data, cbd->dirs[i], 0);
-          cbd->dids[i] = did;
+         Id did;
+         if (MAPTST(&cbd->providedids, cbd->ids[i]))
+           {
+             cbd->dids[i] = 0;
+             continue;
+           }
+         did = repodata_str2dir(data, cbd->dirs[i], 0);
+         cbd->dids[i] = did;
          if (did)
            MAPSET(&cbd->useddirs, did);
        }
-      cbd->olddata = data;
+      repodata_free_dircache(data);
     }
-  if (!MAPTST(&cbd->useddirs, value->id))
+  if (value->id >= data->dirpool.ndirs || !MAPTST(&cbd->useddirs, value->id))
     return 0;
   for (i = 0; i < cbd->nfiles; i++)
-    {
-      if (cbd->dids[i] != value->id)
-       continue;
-      if (!strcmp(cbd->names[i], value->str))
-       break;
-    }
-  if (i == cbd->nfiles)
-    return 0;
-  s->provides = repo_addid_dep(s->repo, s->provides, cbd->ids[i], SOLVABLE_FILEMARKER);
+    if (cbd->dids[i] == value->id && !strcmp(cbd->names[i], value->str))
+      s->provides = repo_addid_dep(s->repo, s->provides, cbd->ids[i], SOLVABLE_FILEMARKER);
   return 0;
 }
 
-
 static void
 pool_addfileprovides_search(Pool *pool, struct addfileprovides_cbdata *cbd, struct searchfiles *sf, Repo *repoonly)
 {
-  Id p, start, end, *idp;
-  Solvable *s;
-  Repodata *data = 0, *nextdata;
-  Repo *oldrepo = 0;
-  int dataincludes = 0;
-  int i;
-  Map providedids;
+  Id p;
+  Repodata *data;
+  Repo *repo;
+  Queue fileprovidesq;
+  int i, j, repoid, repodataid;
+  int provstart, provend;
+  Map donemap;
+  int ndone, incomplete;
+
+  if (!pool->urepos)
+    return;
 
   cbd->nfiles = sf->nfiles;
   cbd->ids = sf->ids;
-  cbd->dirs = sf->dirs;
-  cbd->names = sf->names;
-  cbd->olddata = 0;
-  cbd->dids = sat_realloc2(cbd->dids, sf->nfiles, sizeof(Id));
-  if (repoonly)
-    {
-      start = repoonly->start;
-      end = repoonly->end;
-    }
-  else
-    {
-      start = 2;       /* skip system solvable */
-      end = pool->nsolvables;
-    }
-  for (p = start, s = pool->solvables + p; p < end; p++, s++)
+  cbd->dirs = 0;
+  cbd->names = 0;
+  cbd->dids = solv_realloc2(cbd->dids, sf->nfiles, sizeof(Id));
+  map_init(&cbd->providedids, pool->ss.nstrings);
+
+  repoid = 1;
+  repo = repoonly ? repoonly : pool->repos[repoid];
+  map_init(&donemap, pool->nsolvables);
+  queue_init(&fileprovidesq);
+  provstart = provend = 0;
+  for (;;)
     {
-      if (!s->repo || (repoonly && s->repo != repoonly))
-       continue;
-      if (s->repo != oldrepo || (data && p >= data->end))
+      if (!repo || repo->disabled)
        {
-         data = 0;
-         oldrepo = 0;
+         if (repoonly || ++repoid == pool->nrepos)
+           break;
+         repo = pool->repos[repoid];
+         continue;
        }
-      if (oldrepo == 0)
+      ndone = 0;
+      FOR_REPODATAS(repo, repodataid, data)
        {
-         nextdata = 0;
-         for (i = 0, data = s->repo->repodata; i < s->repo->nrepodata; i++, data++)
+         if (ndone >= repo->nsolvables)
+           break;
+
+         if (repodata_lookup_idarray(data, SOLVID_META, REPOSITORY_ADDEDFILEPROVIDES, &fileprovidesq))
            {
-             if (!data->addedfileprovides || p >= data->end)
-               continue;
-             if (!nextdata || nextdata->start > data->start)
-               nextdata = data;
-             if (p >= data->start)
-               break;
+             map_empty(&cbd->providedids);
+             for (i = 0; i < fileprovidesq.count; i++)
+               MAPSET(&cbd->providedids, fileprovidesq.elements[i]);
+             provstart = data->start;
+             provend = data->end;
+             for (i = 0; i < cbd->nfiles; i++)
+               if (!MAPTST(&cbd->providedids, cbd->ids[i]))
+                 break;
+             if (i == cbd->nfiles)
+               {
+                 /* great! no need to search files */
+                 for (p = data->start; p < data->end; p++)
+                   if (pool->solvables[p].repo == repo)
+                     {
+                       if (MAPTST(&donemap, p))
+                         continue;
+                       MAPSET(&donemap, p);
+                       ndone++;
+                     }
+                 continue;
+               }
            }
-         if (i == s->repo->nrepodata)
-           data = nextdata;
-         if (data)
+
+         if (!repodata_has_keyname(data, SOLVABLE_FILELIST))
+           continue;
+
+         if (data->start < provstart || data->end > provend)
            {
-             map_init(&providedids, pool->ss.nstrings);
-             for (idp = data->addedfileprovides; *idp; idp++)
-               MAPSET(&providedids, *idp);
-             for (i = 0; i < cbd->nfiles; i++)
-               if (!MAPTST(&providedids, cbd->ids[i]))
+             map_empty(&cbd->providedids);
+             provstart = provend = 0;
+           }
+
+         /* check if the data is incomplete */
+         incomplete = 0;
+         if (data->state == REPODATA_AVAILABLE)
+           {
+             for (j = 1; j < data->nkeys; j++)
+               if (data->keys[j].name != REPOSITORY_SOLVABLES && data->keys[j].name != SOLVABLE_FILELIST)
+                 break;
+             if (j < data->nkeys)
+               {
+#if 0
+                 for (i = 0; i < cbd->nfiles; i++)
+                   if (!MAPTST(&cbd->providedids, cbd->ids[i]) && !repodata_filelistfilter_matches(data, pool_id2str(pool, cbd->ids[i])))
+                     printf("need complete filelist because of %s\n", pool_id2str(pool, cbd->ids[i]));
+#endif
+                 for (i = 0; i < cbd->nfiles; i++)
+                   if (!MAPTST(&cbd->providedids, cbd->ids[i]) && !repodata_filelistfilter_matches(data, pool_id2str(pool, cbd->ids[i])))
+                     break;
+                 if (i < cbd->nfiles)
+                   incomplete = 1;
+               }
+           }
+
+         /* do the search */
+         map_init(&cbd->useddirs, 0);
+         for (p = data->start; p < data->end; p++)
+           if (pool->solvables[p].repo == repo)
+             {
+               if (MAPTST(&donemap, p))
+                 continue;
+               repodata_search(data, p, SOLVABLE_FILELIST, 0, addfileprovides_cb, cbd);
+               if (!incomplete)
                  {
-                   break;
+                   MAPSET(&donemap, p);
+                   ndone++;
                  }
-             map_free(&providedids);
-             dataincludes = i == cbd->nfiles;
-           }
-         oldrepo = s->repo;
+             }
+         map_free(&cbd->useddirs);
        }
-      if (data && p >= data->start && dataincludes)
-       continue;
-      repo_search(s->repo, p, SOLVABLE_FILELIST, 0, 0, addfileprovides_cb, cbd);
+
+      if (repoonly || ++repoid == pool->nrepos)
+       break;
+      repo = pool->repos[repoid];
+    }
+  map_free(&donemap);
+  queue_free(&fileprovidesq);
+  map_free(&cbd->providedids);
+  if (cbd->dirs)
+    {
+      for (i = 0; i < cbd->nfiles; i++)
+       solv_free(cbd->dirs[i]);
+      cbd->dirs = solv_free(cbd->dirs);
+      cbd->names = solv_free(cbd->names);
     }
 }
 
 void
-pool_addfileprovides_ids(Pool *pool, Repo *installed, Id **idp)
+pool_addfileprovides_queue(Pool *pool, Queue *idq, Queue *idqinst)
 {
   Solvable *s;
-  Repo *repo;
+  Repo *installed, *repo;
   struct searchfiles sf, isf, *isfp;
   struct addfileprovides_cbdata cbd;
   int i;
+  unsigned int now;
 
+  installed = pool->installed;
+  now = solv_timems(0);
   memset(&sf, 0, sizeof(sf));
   map_init(&sf.seen, pool->ss.nstrings + pool->nrels);
   memset(&isf, 0, sizeof(isf));
   map_init(&isf.seen, pool->ss.nstrings + pool->nrels);
+  pool->addedfileprovides = pool->addfileprovidesfiltered ? 1 : 2;
 
+  if (idq)
+    queue_empty(idq);
+  if (idqinst)
+    queue_empty(idqinst);
   isfp = installed ? &isf : 0;
   for (i = 1, s = pool->solvables + i; i < pool->nsolvables; i++, s++)
     {
@@ -837,66 +1610,48 @@ pool_addfileprovides_ids(Pool *pool, Repo *installed, Id **idp)
         pool_addfileprovides_dep(pool, repo->idarraydata + s->supplements, &sf, isfp);
       if (s->enhances)
         pool_addfileprovides_dep(pool, repo->idarraydata + s->enhances, &sf, isfp);
-      if (s->freshens)
-        pool_addfileprovides_dep(pool, repo->idarraydata + s->freshens, &sf, isfp);
     }
   map_free(&sf.seen);
   map_free(&isf.seen);
-  POOL_DEBUG(SAT_DEBUG_STATS, "found %d file dependencies\n", sf.nfiles);
-  POOL_DEBUG(SAT_DEBUG_STATS, "found %d installed file dependencies\n", isf.nfiles);
+  POOL_DEBUG(SOLV_DEBUG_STATS, "found %d file dependencies, %d installed file dependencies\n", sf.nfiles, isf.nfiles);
   cbd.dids = 0;
-  map_init(&cbd.useddirs, 1);
-  if (idp)
-    *idp = 0;
   if (sf.nfiles)
     {
 #if 0
       for (i = 0; i < sf.nfiles; i++)
-       POOL_DEBUG(SAT_DEBUG_STATS, "looking up %s in filelist\n", id2str(pool, sf.ids[i]));
+       POOL_DEBUG(SOLV_DEBUG_STATS, "looking up %s in filelist\n", pool_id2str(pool, sf.ids[i]));
 #endif
       pool_addfileprovides_search(pool, &cbd, &sf, 0);
-      if (idp)
-       {
-         sf.ids = sat_extend(sf.ids, sf.nfiles, 1, sizeof(Id), SEARCHFILES_BLOCK);
-         sf.ids[sf.nfiles] = 0;
-         *idp = sf.ids;
-         sf.ids = 0;
-       }
-      sat_free(sf.ids);
-      for (i = 0; i < sf.nfiles; i++)
-       {
-         sat_free(sf.dirs[i]);
-         sat_free(sf.names[i]);
-       }
-      sat_free(sf.dirs);
-      sat_free(sf.names);
+      if (idq)
+        for (i = 0; i < sf.nfiles; i++)
+         queue_push(idq, sf.ids[i]);
+      if (idqinst)
+        for (i = 0; i < sf.nfiles; i++)
+         queue_push(idqinst, sf.ids[i]);
+      solv_free(sf.ids);
     }
   if (isf.nfiles)
     {
 #if 0
       for (i = 0; i < isf.nfiles; i++)
-       POOL_DEBUG(SAT_DEBUG_STATS, "looking up %s in installed filelist\n", id2str(pool, isf.ids[i]));
+       POOL_DEBUG(SOLV_DEBUG_STATS, "looking up %s in installed filelist\n", pool_id2str(pool, isf.ids[i]));
 #endif
       if (installed)
         pool_addfileprovides_search(pool, &cbd, &isf, installed);
-      sat_free(isf.ids);
-      for (i = 0; i < isf.nfiles; i++)
-       {
-         sat_free(isf.dirs[i]);
-         sat_free(isf.names[i]);
-       }
-      sat_free(isf.dirs);
-      sat_free(isf.names);
+      if (installed && idqinst)
+        for (i = 0; i < isf.nfiles; i++)
+         queue_pushunique(idqinst, isf.ids[i]);
+      solv_free(isf.ids);
     }
-  map_free(&cbd.useddirs);
-  sat_free(cbd.dids);
+  solv_free(cbd.dids);
   pool_freewhatprovides(pool); /* as we have added provides */
+  POOL_DEBUG(SOLV_DEBUG_STATS, "addfileprovides took %d ms\n", solv_timems(now));
 }
 
 void
-pool_addfileprovides(Pool *pool, Repo *installed)
+pool_addfileprovides(Pool *pool)
 {
-  pool_addfileprovides_ids(pool, installed, 0);
+  pool_addfileprovides_queue(pool, 0, 0);
 }
 
 void
@@ -914,41 +1669,177 @@ pool_search(Pool *pool, Id p, Id key, const char *match, int flags, int (*callba
       repo_search(pool->solvables[p].repo, p, key, match, flags, callback, cbdata);
 }
 
-
 void
-pool_set_languages(Pool *pool, const char **languages, int nlanguages)
+pool_clear_pos(Pool *pool)
+{
+  memset(&pool->pos, 0, sizeof(pool->pos));
+}
+
+
+void
+pool_set_languages(Pool *pool, const char **languages, int nlanguages)
+{
+  int i;
+
+  pool->languagecache = solv_free(pool->languagecache);
+  pool->languagecacheother = 0;
+  for (i = 0; i < pool->nlanguages; i++)
+    free((char *)pool->languages[i]);
+  pool->languages = solv_free((void *)pool->languages);
+  pool->nlanguages = nlanguages;
+  if (!nlanguages)
+    return;
+  pool->languages = solv_calloc(nlanguages, sizeof(const char **));
+  for (i = 0; i < pool->nlanguages; i++)
+    pool->languages[i] = solv_strdup(languages[i]);
+}
+
+Id
+pool_id2langid(Pool *pool, Id id, const char *lang, int create)
+{
+  const char *n;
+  char buf[256], *p;
+  int l;
+
+  if (!lang || !*lang)
+    return id;
+  n = pool_id2str(pool, id);
+  l = strlen(n) + strlen(lang) + 2;
+  if (l > sizeof(buf))
+    p = solv_malloc(strlen(n) + strlen(lang) + 2);
+  else
+    p = buf;
+  sprintf(p, "%s:%s", n, lang);
+  id = pool_str2id(pool, p, create);
+  if (p != buf)
+    free(p);
+  return id;
+}
+
+char *
+pool_alloctmpspace(Pool *pool, int len)
+{
+  int n = pool->tmpspace.n;
+  if (!len)
+    return 0;
+  if (len > pool->tmpspace.len[n])
+    {
+      pool->tmpspace.buf[n] = solv_realloc(pool->tmpspace.buf[n], len + 32);
+      pool->tmpspace.len[n] = len + 32;
+    }
+  pool->tmpspace.n = (n + 1) % POOL_TMPSPACEBUF;
+  return pool->tmpspace.buf[n];
+}
+
+static char *
+pool_alloctmpspace_free(Pool *pool, const char *space, int len)
+{
+  if (space)
+    {
+      int n, oldn;
+      n = oldn = pool->tmpspace.n;
+      for (;;)
+       {
+         if (!n--)
+           n = POOL_TMPSPACEBUF - 1;
+         if (n == oldn)
+           break;
+         if (pool->tmpspace.buf[n] != space)
+           continue;
+         if (len > pool->tmpspace.len[n])
+           {
+             pool->tmpspace.buf[n] = solv_realloc(pool->tmpspace.buf[n], len + 32);
+             pool->tmpspace.len[n] = len + 32;
+           }
+          return pool->tmpspace.buf[n];
+       }
+    }
+  return 0;
+}
+
+void
+pool_freetmpspace(Pool *pool, const char *space)
 {
-  int i;
+  int n = pool->tmpspace.n;
+  if (!space)
+    return;
+  n = (n + (POOL_TMPSPACEBUF - 1)) % POOL_TMPSPACEBUF;
+  if (pool->tmpspace.buf[n] == space)
+    pool->tmpspace.n = n;
+}
 
-  pool->languagecache = sat_free(pool->languagecache);
-  pool->languagecacheother = 0;
-  if (pool->nlanguages)
+char *
+pool_tmpjoin(Pool *pool, const char *str1, const char *str2, const char *str3)
+{
+  int l1, l2, l3;
+  char *s, *str;
+  l1 = str1 ? strlen(str1) : 0;
+  l2 = str2 ? strlen(str2) : 0;
+  l3 = str3 ? strlen(str3) : 0;
+  s = str = pool_alloctmpspace(pool, l1 + l2 + l3 + 1);
+  if (l1)
     {
-      for (i = 0; i < pool->nlanguages; i++)
-       free((char *)pool->languages[i]);
-      free(pool->languages);
+      strcpy(s, str1);
+      s += l1;
     }
-  pool->nlanguages = nlanguages;
-  if (!nlanguages)
-    return;
-  pool->languages = sat_calloc(nlanguages, sizeof(const char **));
-  for (i = 0; i < pool->nlanguages; i++)
-    pool->languages[i] = strdup(languages[i]);
+  if (l2)
+    {
+      strcpy(s, str2);
+      s += l2;
+    }
+  if (l3)
+    {
+      strcpy(s, str3);
+      s += l3;
+    }
+  *s = 0;
+  return str;
 }
 
 char *
-pool_alloctmpspace(Pool *pool, int len)
+pool_tmpappend(Pool *pool, const char *str1, const char *str2, const char *str3)
 {
-  int n = pool->tmpspacen;
-  if (!len)
-    return 0;
-  if (len > pool->tmpspacelen[n])
+  int l1, l2, l3;
+  char *s, *str;
+
+  l1 = str1 ? strlen(str1) : 0;
+  l2 = str2 ? strlen(str2) : 0;
+  l3 = str3 ? strlen(str3) : 0;
+  str = pool_alloctmpspace_free(pool, str1, l1 + l2 + l3 + 1);
+  if (str)
+    str1 = str;
+  else
+    str = pool_alloctmpspace(pool, l1 + l2 + l3 + 1);
+  s = str;
+  if (l1)
+    {
+      if (s != str1)
+        strcpy(s, str1);
+      s += l1;
+    }
+  if (l2)
+    {
+      strcpy(s, str2);
+      s += l2;
+    }
+  if (l3)
     {
-      pool->tmpspacebuf[n] = sat_realloc(pool->tmpspacebuf[n], len + 32);
-      pool->tmpspacelen[n] = len + 32;
+      strcpy(s, str3);
+      s += l3;
     }
-  pool->tmpspacen = (n + 1) % POOL_TMPSPACEBUF;
-  return pool->tmpspacebuf[n];
+  *s = 0;
+  return str;
+}
+
+const char *
+pool_bin2hex(Pool *pool, const unsigned char *buf, int len)
+{
+  char *s;
+  if (!len)
+    return "";
+  s = pool_alloctmpspace(pool, 2 * len + 1);
+  solv_bin2hex(buf, len, s);
+  return s;
 }
 
 /*******************************************************************/
@@ -965,6 +1856,7 @@ struct ducbdata {
   DUChanges *mps;
   struct mptree *mptree;
   int addsub;
+  int hasdu;
 
   Id *dirmap;
   int nmap;
@@ -986,9 +1878,9 @@ solver_fill_DU_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyVa
       struct mptree *mptree;
 
       /* create map from dir to mptree */
-      cbd->dirmap = sat_free(cbd->dirmap);
+      cbd->dirmap = solv_free(cbd->dirmap);
       cbd->nmap = 0;
-      dirmap = sat_calloc(data->dirpool.ndirs, sizeof(Id));
+      dirmap = solv_calloc(data->dirpool.ndirs, sizeof(Id));
       mptree = cbd->mptree;
       mp = 0;
       for (dn = 2, dirs = data->dirpool.dirs + dn; dn < data->dirpool.ndirs; dn++)
@@ -1013,7 +1905,7 @@ solver_fill_DU_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyVa
          if (data->localpool)
            compstr = stringpool_id2str(&data->spool, comp);
          else
-           compstr = id2str(data->repo->pool, comp);
+           compstr = pool_id2str(data->repo->pool, comp);
          compl = strlen(compstr);
          for (i = mptree[mp].child; i; i = mptree[i].sibling)
            if (mptree[i].compl == compl && !strncmp(mptree[i].comp, compstr, compl))
@@ -1030,6 +1922,7 @@ solver_fill_DU_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyVa
       cbd->nmap = data->dirpool.ndirs;
       cbd->olddata = data;
     }
+  cbd->hasdu = 1;
   if (value->id < 0 || value->id >= cbd->nmap)
     return 0;
   mp = cbd->dirmap[value->id];
@@ -1040,7 +1933,7 @@ solver_fill_DU_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyVa
       cbd->mps[mp].kbytes += value->num;
       cbd->mps[mp].files += value->num2;
     }
-  else
+  else if (!(cbd->mps[mp].flags & DUCHANGES_ONLYADD))
     {
       cbd->mps[mp].kbytes -= value->num;
       cbd->mps[mp].files -= value->num2;
@@ -1062,24 +1955,16 @@ propagate_mountpoints(struct mptree *mptree, int pos, Id mountpoint)
 
 #define MPTREE_BLOCK 15
 
-void
-pool_calc_duchanges(Pool *pool, Queue *pkgs, DUChanges *mps, int nmps)
+static struct mptree *
+create_mptree(DUChanges *mps, int nmps)
 {
-  char *p;
-  const char *path, *compstr;
-  struct mptree *mptree;
   int i, nmptree;
+  struct mptree *mptree;
   int pos, compl;
   int mp;
-  struct ducbdata cbd;
-
-  cbd.mps = mps;
-  cbd.addsub = 0;
-  cbd.dirmap = 0;
-  cbd.nmap = 0;
-  cbd.olddata = 0;
+  const char *p, *path, *compstr;
 
-  mptree = sat_extend_resize(0, 1, sizeof(struct mptree), MPTREE_BLOCK);
+  mptree = solv_extend_resize(0, 1, sizeof(struct mptree), MPTREE_BLOCK);
 
   /* our root node */
   mptree[0].sibling = 0;
@@ -1088,7 +1973,7 @@ pool_calc_duchanges(Pool *pool, Queue *pkgs, DUChanges *mps, int nmps)
   mptree[0].compl = 0;
   mptree[0].mountpoint = -1;
   nmptree = 1;
-  
+
   /* create component tree */
   for (mp = 0; mp < nmps; mp++)
     {
@@ -1120,7 +2005,7 @@ pool_calc_duchanges(Pool *pool, Queue *pkgs, DUChanges *mps, int nmps)
          if (!i)
            {
              /* create new node */
-             mptree = sat_extend(mptree, nmptree, 1, sizeof(struct mptree), MPTREE_BLOCK);
+             mptree = solv_extend(mptree, nmptree, 1, sizeof(struct mptree), MPTREE_BLOCK);
              i = nmptree++;
              mptree[i].sibling = mptree[pos].child;
              mptree[i].child = 0;
@@ -1147,40 +2032,549 @@ pool_calc_duchanges(Pool *pool, Queue *pkgs, DUChanges *mps, int nmps)
     }
 #endif
 
+  return mptree;
+}
+
+void
+pool_calc_duchanges(Pool *pool, Map *installedmap, DUChanges *mps, int nmps)
+{
+  struct mptree *mptree;
+  struct ducbdata cbd;
+  Solvable *s;
+  int i, sp;
+  Map ignoredu;
+  Repo *oldinstalled = pool->installed;
+  int haveonlyadd = 0;
+
+  map_init(&ignoredu, 0);
+  mptree = create_mptree(mps, nmps);
+
+  for (i = 0; i < nmps; i++)
+    if ((mps[i].flags & DUCHANGES_ONLYADD) != 0)
+      haveonlyadd = 1;
+  cbd.mps = mps;
+  cbd.dirmap = 0;
+  cbd.nmap = 0;
+  cbd.olddata = 0;
   cbd.mptree = mptree;
   cbd.addsub = 1;
-  for (i = 0; i < pkgs->count; i++)
+  for (sp = 1, s = pool->solvables + sp; sp < pool->nsolvables; sp++, s++)
     {
-      Id sp = pkgs->elements[i];
-      if (sp > 0)
-        repo_search(pool->solvables[sp].repo, sp, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+      if (!s->repo || (oldinstalled && s->repo == oldinstalled))
+       continue;
+      if (!MAPTST(installedmap, sp))
+       continue;
+      cbd.hasdu = 0;
+      repo_search(s->repo, sp, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+      if (!cbd.hasdu && oldinstalled)
+       {
+         Id op, opp;
+         int didonlyadd = 0;
+         /* no du data available, ignore data of all installed solvables we obsolete */
+         if (!ignoredu.size)
+           map_grow(&ignoredu, oldinstalled->end - oldinstalled->start);
+         FOR_PROVIDES(op, opp, s->name)
+           {
+             Solvable *s2 = pool->solvables + op;
+             if (!pool->implicitobsoleteusesprovides && s->name != s2->name)
+               continue;
+             if (pool->implicitobsoleteusescolors && !pool_colormatch(pool, s, s2))
+               continue;
+             if (op >= oldinstalled->start && op < oldinstalled->end)
+               {
+                 MAPSET(&ignoredu, op - oldinstalled->start);
+                 if (haveonlyadd && pool->solvables[op].repo == oldinstalled && !didonlyadd)
+                   {
+                     repo_search(oldinstalled, op, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+                     cbd.addsub = -1;
+                     repo_search(oldinstalled, op, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+                     cbd.addsub = 1;
+                     didonlyadd = 1;
+                   }
+               }
+           }
+         if (s->obsoletes)
+           {
+             Id obs, *obsp = s->repo->idarraydata + s->obsoletes;
+             while ((obs = *obsp++) != 0)
+               FOR_PROVIDES(op, opp, obs)
+                 {
+                   Solvable *s2 = pool->solvables + op;
+                   if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, s2, obs))
+                     continue;
+                   if (pool->obsoleteusescolors && !pool_colormatch(pool, s, s2))
+                     continue;
+                   if (op >= oldinstalled->start && op < oldinstalled->end)
+                     {
+                       MAPSET(&ignoredu, op - oldinstalled->start);
+                       if (haveonlyadd && pool->solvables[op].repo == oldinstalled && !didonlyadd)
+                         {
+                           repo_search(oldinstalled, op, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+                           cbd.addsub = -1;
+                           repo_search(oldinstalled, op, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+                           cbd.addsub = 1;
+                           didonlyadd = 1;
+                         }
+                     }
+                 }
+           }
+       }
     }
   cbd.addsub = -1;
-  for (i = 0; i < pkgs->count; i++)
+  if (oldinstalled)
     {
-      Id sp = pkgs->elements[i];
-      if (sp < 0)
-        repo_search(pool->solvables[-sp].repo, -sp, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+      /* assumes we allways have du data for installed solvables */
+      FOR_REPO_SOLVABLES(oldinstalled, sp, s)
+       {
+         if (MAPTST(installedmap, sp))
+           continue;
+         if (ignoredu.map && MAPTST(&ignoredu, sp - oldinstalled->start))
+           continue;
+         repo_search(oldinstalled, sp, SOLVABLE_DISKUSAGE, 0, 0, solver_fill_DU_cb, &cbd);
+       }
     }
-  sat_free(cbd.dirmap);
-  sat_free(mptree);
+  map_free(&ignoredu);
+  solv_free(cbd.dirmap);
+  solv_free(mptree);
 }
 
 int
-pool_calc_installsizechange(Pool *pool, Queue *pkgs)
+pool_calc_installsizechange(Pool *pool, Map *installedmap)
 {
-  int i, change;
+  Id sp;
+  Solvable *s;
+  int change = 0;
+  Repo *oldinstalled = pool->installed;
 
-  change = 0;
-  for (i = 0; i < pkgs->count; i++)
+  for (sp = 1, s = pool->solvables + sp; sp < pool->nsolvables; sp++, s++)
+    {
+      if (!s->repo || (oldinstalled && s->repo == oldinstalled))
+       continue;
+      if (!MAPTST(installedmap, sp))
+       continue;
+      change += solvable_lookup_sizek(s, SOLVABLE_INSTALLSIZE, 0);
+    }
+  if (oldinstalled)
     {
-      Id sp = pkgs->elements[i];
-      if (sp > 0)
-        change += repo_lookup_num(pool->solvables + sp, SOLVABLE_INSTALLSIZE);
-      else if (sp < 0)
-        change -= repo_lookup_num(pool->solvables - sp, SOLVABLE_INSTALLSIZE);
+      FOR_REPO_SOLVABLES(oldinstalled, sp, s)
+       {
+         if (MAPTST(installedmap, sp))
+           continue;
+         change -= solvable_lookup_sizek(s, SOLVABLE_INSTALLSIZE, 0);
+       }
     }
   return change;
 }
 
-// EOF
+/* map:
+ *  1: installed
+ *  2: conflicts with installed
+ *  8: interesting (only true if installed)
+ * 16: undecided
+ */
+
+static inline Id dep2name(Pool *pool, Id dep)
+{
+  while (ISRELDEP(dep))
+    {
+      Reldep *rd = GETRELDEP(pool, dep);
+      dep = rd->name;
+    }
+  return dep;
+}
+
+static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, Id n, Id con)
+{
+  Id p, pp;
+  Solvable *sn = pool->solvables + n;
+
+  FOR_PROVIDES(p, pp, sn->name)
+    {
+      Solvable *s = pool->solvables + p;
+      if (s->name != sn->name || s->arch != sn->arch)
+        continue;
+      if ((map[p] & 9) != 9)
+        continue;
+      if (pool_match_nevr(pool, pool->solvables + p, con))
+       continue;
+      return 1;                /* found installed package that doesn't conflict */
+    }
+  return 0;
+}
+
+static inline int providedbyinstalled(Pool *pool, unsigned char *map, Id dep, int ispatch, Map *multiversionmap)
+{
+  Id p, pp;
+  int r = 0;
+  FOR_PROVIDES(p, pp, dep)
+    {
+      if (p == SYSTEMSOLVABLE)
+        return 1;      /* always boring, as never constraining */
+      if (ispatch && !pool_match_nevr(pool, pool->solvables + p, dep))
+       continue;
+      if (ispatch && multiversionmap && multiversionmap->size && MAPTST(multiversionmap, p) && ISRELDEP(dep))
+       if (providedbyinstalled_multiversion(pool, map, p, dep))
+         continue;
+      if ((map[p] & 9) == 9)
+       return 9;
+      r |= map[p] & 17;
+    }
+  return r;
+}
+
+/*
+ * pool_trivial_installable - calculate if a set of solvables is
+ * trivial installable without any other installs/deinstalls of
+ * packages not belonging to the set.
+ *
+ * the state is returned in the result queue:
+ * 1:  solvable is installable without any other package changes
+ * 0:  solvable is not installable
+ * -1: solvable is installable, but doesn't constrain any installed packages
+ */
+
+void
+pool_trivial_installable_multiversionmap(Pool *pool, Map *installedmap, Queue *pkgs, Queue *res, Map *multiversionmap)
+{
+  int i, r, m, did;
+  Id p, *dp, con, *conp, req, *reqp;
+  unsigned char *map;
+  Solvable *s;
+
+  map = solv_calloc(pool->nsolvables, 1);
+  for (p = 1; p < pool->nsolvables; p++)
+    {
+      if (!MAPTST(installedmap, p))
+       continue;
+      map[p] |= 9;
+      s = pool->solvables + p;
+      if (!s->conflicts)
+       continue;
+      conp = s->repo->idarraydata + s->conflicts;
+      while ((con = *conp++) != 0)
+       {
+         dp = pool_whatprovides_ptr(pool, con);
+         for (; *dp; dp++)
+           map[p] |= 2;        /* XXX: self conflict ? */
+       }
+    }
+  for (i = 0; i < pkgs->count; i++)
+    map[pkgs->elements[i]] = 16;
+
+  for (i = 0, did = 0; did < pkgs->count; i++, did++)
+    {
+      if (i == pkgs->count)
+       i = 0;
+      p = pkgs->elements[i];
+      if ((map[p] & 16) == 0)
+       continue;
+      if ((map[p] & 2) != 0)
+       {
+         map[p] = 2;
+         continue;
+       }
+      s = pool->solvables + p;
+      m = 1;
+      if (s->requires)
+       {
+         reqp = s->repo->idarraydata + s->requires;
+         while ((req = *reqp++) != 0)
+           {
+             if (req == SOLVABLE_PREREQMARKER)
+               continue;
+             r = providedbyinstalled(pool, map, req, 0, 0);
+             if (!r)
+               {
+                 /* decided and miss */
+                 map[p] = 2;
+                 did = 0;
+                 break;
+               }
+             if (r == 16)
+               break;  /* undecided */
+             m |= r;   /* 1 | 9 | 17 */
+           }
+         if (req)
+           continue;
+         if ((m & 9) == 9)
+           m = 9;
+       }
+      if (s->conflicts)
+       {
+         int ispatch = 0;      /* see solver.c patch handling */
+
+         if (!strncmp("patch:", pool_id2str(pool, s->name), 6))
+           ispatch = 1;
+         conp = s->repo->idarraydata + s->conflicts;
+         while ((con = *conp++) != 0)
+           {
+             if ((providedbyinstalled(pool, map, con, ispatch, multiversionmap) & 1) != 0)
+               {
+                 map[p] = 2;
+                 did = 0;
+                 break;
+               }
+             if ((m == 1 || m == 17) && ISRELDEP(con))
+               {
+                 con = dep2name(pool, con);
+                 if ((providedbyinstalled(pool, map, con, ispatch, multiversionmap) & 1) != 0)
+                   m = 9;
+               }
+           }
+         if (con)
+           continue;   /* found a conflict */
+       }
+#if 0
+      if (s->repo && s->repo != oldinstalled)
+       {
+         Id p2, obs, *obsp, *pp;
+         Solvable *s2;
+         if (s->obsoletes)
+           {
+             obsp = s->repo->idarraydata + s->obsoletes;
+             while ((obs = *obsp++) != 0)
+               {
+                 if ((providedbyinstalled(pool, map, obs, 0, 0) & 1) != 0)
+                   {
+                     map[p] = 2;
+                     break;
+                   }
+               }
+             if (obs)
+               continue;
+           }
+         FOR_PROVIDES(p2, pp, s->name)
+           {
+             s2 = pool->solvables + p2;
+             if (s2->name == s->name && (map[p2] & 1) != 0)
+               {
+                 map[p] = 2;
+                 break;
+               }
+           }
+         if (p2)
+           continue;
+       }
+#endif
+      if (m != map[p])
+       {
+         map[p] = m;
+         did = 0;
+       }
+    }
+  queue_free(res);
+  queue_init_clone(res, pkgs);
+  for (i = 0; i < pkgs->count; i++)
+    {
+      m = map[pkgs->elements[i]];
+      if ((m & 9) == 9)
+       r = 1;
+      else if (m & 1)
+       r = -1;
+      else
+       r = 0;
+      res->elements[i] = r;
+    }
+  free(map);
+}
+
+void
+pool_trivial_installable(Pool *pool, Map *installedmap, Queue *pkgs, Queue *res)
+{
+  pool_trivial_installable_multiversionmap(pool, installedmap, pkgs, res, 0);
+}
+
+const char *
+pool_lookup_str(Pool *pool, Id entry, Id keyname)
+{
+  if (entry == SOLVID_POS && pool->pos.repo)
+    return repo_lookup_str(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname);
+  if (entry <= 0)
+    return 0;
+  return solvable_lookup_str(pool->solvables + entry, keyname);
+}
+
+Id
+pool_lookup_id(Pool *pool, Id entry, Id keyname)
+{
+  if (entry == SOLVID_POS && pool->pos.repo)
+    return repo_lookup_id(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname);
+  if (entry <= 0)
+    return 0;
+  return solvable_lookup_id(pool->solvables + entry, keyname);
+}
+
+unsigned long long
+pool_lookup_num(Pool *pool, Id entry, Id keyname, unsigned long long notfound)
+{
+  if (entry == SOLVID_POS && pool->pos.repo)
+    return repo_lookup_num(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname, notfound);
+  if (entry <= 0)
+    return notfound;
+  return solvable_lookup_num(pool->solvables + entry, keyname, notfound);
+}
+
+int
+pool_lookup_void(Pool *pool, Id entry, Id keyname)
+{
+  if (entry == SOLVID_POS && pool->pos.repo)
+    return repo_lookup_void(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname);
+  if (entry <= 0)
+    return 0;
+  return solvable_lookup_void(pool->solvables + entry, keyname);
+}
+
+const unsigned char *
+pool_lookup_bin_checksum(Pool *pool, Id entry, Id keyname, Id *typep)
+{
+  if (entry == SOLVID_POS && pool->pos.repo)
+    return repo_lookup_bin_checksum(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname, typep);
+  if (entry <= 0)
+    return 0;
+  return solvable_lookup_bin_checksum(pool->solvables + entry, keyname, typep);
+}
+
+const char *
+pool_lookup_checksum(Pool *pool, Id entry, Id keyname, Id *typep)
+{
+  if (entry == SOLVID_POS && pool->pos.repo)
+    return repo_lookup_checksum(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname, typep);
+  if (entry <= 0)
+    return 0;
+  return solvable_lookup_checksum(pool->solvables + entry, keyname, typep);
+}
+
+int
+pool_lookup_idarray(Pool *pool, Id entry, Id keyname, Queue *q)
+{
+  if (entry == SOLVID_POS && pool->pos.repo)
+    return repo_lookup_idarray(pool->pos.repo, pool->pos.repodataid ? entry : pool->pos.solvid, keyname, q);
+  if (entry <= 0)
+    return 0;
+  return solvable_lookup_idarray(pool->solvables + entry, keyname, q);
+}
+
+const char *
+pool_lookup_deltalocation(Pool *pool, Id entry, unsigned int *medianrp)
+{
+  const char *loc;
+  if (medianrp)
+    *medianrp = 0;
+  if (entry != SOLVID_POS)
+    return 0;
+  loc = pool_lookup_str(pool, entry, DELTA_LOCATION_DIR);
+  loc = pool_tmpjoin(pool, loc, loc ? "/" : 0, pool_lookup_str(pool, entry, DELTA_LOCATION_NAME));
+  loc = pool_tmpappend(pool, loc, "-", pool_lookup_str(pool, entry, DELTA_LOCATION_EVR));
+  loc = pool_tmpappend(pool, loc, ".", pool_lookup_str(pool, entry, DELTA_LOCATION_SUFFIX));
+  return loc;
+}
+
+static void
+add_new_provider(Pool *pool, Id id, Id p)
+{
+  Queue q;
+  Id *pp;
+
+  while (ISRELDEP(id))
+    {
+      Reldep *rd = GETRELDEP(pool, id);
+      id = rd->name;
+    }
+
+  queue_init(&q);
+  for (pp = pool->whatprovidesdata + pool->whatprovides[id]; *pp; pp++)
+    {
+      if (*pp == p)
+       {
+         queue_free(&q);
+         return;
+       }
+      if (*pp > p)
+       {
+         queue_push(&q, p);
+         p = 0;
+       }
+      queue_push(&q, *pp);
+    }
+  if (p)
+    queue_push(&q, p);
+  pool->whatprovides[id] = pool_queuetowhatprovides(pool, &q);
+  queue_free(&q);
+}
+
+void
+pool_add_fileconflicts_deps(Pool *pool, Queue *conflicts)
+{
+  int hadhashes = pool->relhashtbl ? 1 : 0;
+  Solvable *s;
+  Id fn, p, q, md5;
+  Id id;
+  int i;
+
+  if (!conflicts->count)
+    return;
+  for (i = 0; i < conflicts->count; i += 6)
+    {
+      fn = conflicts->elements[i];
+      p = conflicts->elements[i + 1];
+      md5 = conflicts->elements[i + 2];
+      q = conflicts->elements[i + 4];
+      id = pool_rel2id(pool, fn, md5, REL_FILECONFLICT, 1);
+      s = pool->solvables + p;
+      if (!s->repo)
+       continue;
+      s->provides = repo_addid_dep(s->repo, s->provides, id, SOLVABLE_FILEMARKER);
+      if (pool->whatprovides)
+       add_new_provider(pool, fn, p);
+      if (pool->whatprovides_rel)
+       pool->whatprovides_rel[GETRELID(id)] = 0;       /* clear cache */
+      s = pool->solvables + q;
+      if (!s->repo)
+       continue;
+      s->conflicts = repo_addid_dep(s->repo, s->conflicts, id, 0);
+    }
+  if (!hadhashes)
+    pool_freeidhashes(pool);
+}
+
+char *
+pool_prepend_rootdir(Pool *pool, const char *path)
+{
+  if (!path)
+    return 0;
+  if (!pool->rootdir)
+    return solv_strdup(path);
+  return solv_dupjoin(pool->rootdir, "/", *path == '/' ? path + 1 : path);
+}
+
+const char *
+pool_prepend_rootdir_tmp(Pool *pool, const char *path)
+{
+  if (!path)
+    return 0;
+  if (!pool->rootdir)
+    return path;
+  return pool_tmpjoin(pool, pool->rootdir, "/", *path == '/' ? path + 1 : path);
+}
+
+void
+pool_set_rootdir(Pool *pool, const char *rootdir)
+{
+  solv_free(pool->rootdir);
+  pool->rootdir = solv_strdup(rootdir);
+}
+
+const char *
+pool_get_rootdir(Pool *pool)
+{
+  return pool->rootdir;
+}
+
+/* only used in libzypp */
+void
+pool_set_custom_vendorcheck(Pool *pool, int (*vendorcheck)(Pool *, Solvable *, Solvable *))
+{
+  pool->custom_vendorcheck = vendorcheck;
+}
+
+/* EOF */