examples/solv: factor out downloadchecksig function
[platform/upstream/libsolv.git] / examples / solv.c
index a7ce9b8..55d7313 100644 (file)
@@ -7,7 +7,18 @@
 
 /* solv, a little software installer demoing the sat solver library */
 
-/* things missing:
+/* things it does:
+ * - understands globs for package names / dependencies
+ * - understands .arch suffix
+ * - installation of commandline packages
+ * - repository data caching
+ * - on demand loading of secondary repository data
+ * - gpg and checksum verification
+ * - file conflicts
+ * - deltarpm support
+ * - fastestmirror implementation
+ *
+ * things available in the library but missing from solv:
  * - vendor policy loading
  * - soft locks file handling
  * - multi version handling
 #include <sys/utsname.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/dir.h>
+#include <sys/stat.h>
+
+#include <sys/socket.h>
+#include <netdb.h>
+#include <poll.h>
+#include <errno.h>
 
 #include "pool.h"
 #include "poolarch.h"
 #include "repo_solv.h"
 
 #include "repo_write.h"
+#ifdef ENABLE_RPMDB
 #include "repo_rpmdb.h"
-#include "repo_products.h"
+#include "pool_fileconflicts.h"
+#endif
+#ifdef ENABLE_DEBIAN
+#include "repo_deb.h"
+#endif
+#ifdef ENABLE_RPMMD
 #include "repo_rpmmd.h"
-#include "repo_susetags.h"
 #include "repo_repomdxml.h"
 #include "repo_updateinfoxml.h"
 #include "repo_deltainfoxml.h"
+#endif
+#ifdef ENABLE_SUSEREPO
+#include "repo_products.h"
+#include "repo_susetags.h"
 #include "repo_content.h"
-#include "pool_fileconflicts.h"
-
+#endif
+#include "solv_xfopen.h"
 
 #ifdef FEDORA
 # define REPOINFO_PATH "/etc/yum.repos.d"
-#else
+#endif
+#ifdef SUSE
 # define REPOINFO_PATH "/etc/zypp/repos.d"
 # define PRODUCTS_PATH "/etc/products.d"
+# define SOFTLOCKS_PATH "/var/lib/zypp/SoftLocks"
 #endif
 
 #define SOLVCACHE_PATH "/var/cache/solv"
 
+#define METADATA_EXPIRE (60 * 15)
 
 struct repoinfo {
   Repo *repo;
@@ -69,12 +101,18 @@ struct repoinfo {
   int autorefresh;
   char *baseurl;
   char *metalink;
+  char *mirrorlist;
   char *path;
   int type;
-  int gpgcheck;
+  int pkgs_gpgcheck;
+  int repo_gpgcheck;
   int priority;
   int keeppackages;
+  int metadata_expire;
+  char **components;
+  int ncomponents;
 
+  unsigned char cookie[32];
   unsigned char extcookie[32];
 };
 
@@ -83,32 +121,45 @@ char *
 yum_substitute(Pool *pool, char *line)
 {
   char *p, *p2;
+  static char *releaseevr;
+  static char *basearch;
 
+  if (!line)
+    {
+      solv_free(releaseevr);
+      releaseevr = 0;
+      solv_free(basearch);
+      basearch = 0;
+      return 0;
+    }
   p = line;
   while ((p2 = strchr(p, '$')) != 0)
     {
       if (!strncmp(p2, "$releasever", 11))
        {
-         static char *releaseevr;
          if (!releaseevr)
            {
              Queue q;
+             const char *rootdir = pool_get_rootdir(pool);
        
              queue_init(&q);
-             rpm_installedrpmdbids(0, "Providename", "redhat-release", &q);
+             rpm_installedrpmdbids(rootdir, "Providename", "redhat-release", &q);
              if (q.count)
                {
                  void *handle, *state = 0;
                  char *p;
-                 handle = rpm_byrpmdbid(q.elements[0], 0, &state);
+                 handle = rpm_byrpmdbid(q.elements[0], rootdir, &state);
                  releaseevr = rpm_query(handle, SOLVABLE_EVR);
                  rpm_byrpmdbid(0, 0, &state);
-                 if (p = strchr(releaseevr, '-'))
+                 if ((p = strchr(releaseevr, '-')) != 0)
                    *p = 0;
                }
              queue_free(&q);
              if (!releaseevr)
-               releaseevr = strdup("?");
+               {
+                 fprintf(stderr, "no installed package provides 'redhat-release', cannot determine $releasever\n");
+                 exit(1);
+               }
            }
          *p2 = 0;
          p = pool_tmpjoin(pool, line, releaseevr, p2 + 11);
@@ -119,7 +170,6 @@ yum_substitute(Pool *pool, char *line)
        }
       if (!strncmp(p2, "$basearch", 9))
        {
-         static char *basearch;
          if (!basearch)
            {
              struct utsname un;
@@ -149,7 +199,9 @@ yum_substitute(Pool *pool, char *line)
 #define TYPE_SUSETAGS  1
 #define TYPE_RPMMD     2
 #define TYPE_PLAINDIR  3
+#define TYPE_DEBIAN     4
 
+#ifndef NOSYSTEM
 static int
 read_repoinfos_sort(const void *ap, const void *bp)
 {
@@ -157,10 +209,14 @@ read_repoinfos_sort(const void *ap, const void *bp)
   const struct repoinfo *b = bp;
   return strcmp(a->alias, b->alias);
 }
+#endif
+
+#if defined(SUSE) || defined(FEDORA)
 
 struct repoinfo *
-read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp)
+read_repoinfos(Pool *pool, int *nrepoinfosp)
 {
+  const char *reposdir = REPOINFO_PATH;
   char buf[4096];
   char buf2[4096], *kp, *vp, *kpe;
   DIR *dir;
@@ -179,6 +235,8 @@ read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp)
     }
   while ((ent = readdir(dir)) != 0)
     {
+      if (ent->d_name[0] == '.')
+       continue;
       l = strlen(ent->d_name);
       if (l < 6 || rdlen + 2 + l >= sizeof(buf) || strcmp(ent->d_name + l - 5, ".repo") != 0)
        continue;
@@ -194,7 +252,7 @@ read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp)
          l = strlen(buf2);
          if (l == 0)
            continue;
-         while (buf2[l - 1] == '\n' || buf2[l - 1] == ' ' || buf2[l - 1] == '\t')
+         while (l && (buf2[l - 1] == '\n' || buf2[l - 1] == ' ' || buf2[l - 1] == '\t'))
            buf2[--l] = 0;
          kp = buf2;
          while (*kp == ' ' || *kp == '\t')
@@ -211,12 +269,17 @@ read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp)
              if (!vp)
                continue;
              *vp = 0;
-             repoinfos = sat_extend(repoinfos, nrepoinfos, 1, sizeof(*repoinfos), 15);
+             repoinfos = solv_extend(repoinfos, nrepoinfos, 1, sizeof(*repoinfos), 15);
              cinfo = repoinfos + nrepoinfos++;
              memset(cinfo, 0, sizeof(*cinfo));
              cinfo->alias = strdup(kp + 1);
              cinfo->type = TYPE_RPMMD;
              cinfo->autorefresh = 1;
+             cinfo->priority = 99;
+#ifndef FEDORA
+             cinfo->repo_gpgcheck = 1;
+#endif
+             cinfo->metadata_expire = METADATA_EXPIRE;
              continue;
            }
          if (!cinfo)
@@ -240,13 +303,17 @@ read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp)
          else if (!strcmp(kp, "autorefresh"))
            cinfo->autorefresh = *vp == '0' ? 0 : 1;
          else if (!strcmp(kp, "gpgcheck"))
-           cinfo->gpgcheck = *vp == '0' ? 0 : 1;
+           cinfo->pkgs_gpgcheck = *vp == '0' ? 0 : 1;
+         else if (!strcmp(kp, "repo_gpgcheck"))
+           cinfo->repo_gpgcheck = *vp == '0' ? 0 : 1;
          else if (!strcmp(kp, "baseurl"))
            cinfo->baseurl = strdup(vp);
          else if (!strcmp(kp, "mirrorlist"))
            {
              if (strstr(vp, "metalink"))
                cinfo->metalink = strdup(vp);
+             else
+               cinfo->mirrorlist = strdup(vp);
            }
          else if (!strcmp(kp, "path"))
            {
@@ -278,20 +345,152 @@ read_repoinfos(Pool *pool, const char *reposdir, int *nrepoinfosp)
   return repoinfos;
 }
 
+#endif
+
+#ifdef DEBIAN
+
+struct repoinfo *
+read_repoinfos(Pool *pool, int *nrepoinfosp)
+{
+  FILE *fp;
+  char buf[4096];
+  char buf2[4096];
+  int l;
+  char *kp, *url, *distro;
+  struct repoinfo *repoinfos = 0, *cinfo;
+  int nrepoinfos = 0;
+  DIR *dir = 0;
+  struct dirent *ent;
+
+  fp = fopen("/etc/apt/sources.list", "r");
+  while (1)
+    {
+      if (!fp)
+       {
+         if (!dir)
+           {
+             dir = opendir("/etc/apt/sources.list.d");
+             if (!dir)
+               break;
+           }
+         if ((ent = readdir(dir)) == 0)
+           {
+             closedir(dir);
+             break;
+           }
+         if (ent->d_name[0] == '.')
+           continue;
+         l = strlen(ent->d_name);
+         if (l < 5 || strcmp(ent->d_name + l - 5, ".list") != 0)
+           continue;
+         snprintf(buf, sizeof(buf), "%s/%s", "/etc/apt/sources.list.d", ent->d_name);
+         if (!(fp = fopen(buf, "r")))
+           continue;
+       }
+      while(fgets(buf2, sizeof(buf2), fp))
+       {
+         l = strlen(buf2);
+         if (l == 0)
+           continue;
+         while (l && (buf2[l - 1] == '\n' || buf2[l - 1] == ' ' || buf2[l - 1] == '\t'))
+           buf2[--l] = 0;
+         kp = buf2;
+         while (*kp == ' ' || *kp == '\t')
+           kp++;
+         if (!*kp || *kp == '#')
+           continue;
+         if (strncmp(kp, "deb", 3) != 0)
+           continue;
+         kp += 3;
+         if (*kp != ' ' && *kp != '\t')
+           continue;
+         while (*kp == ' ' || *kp == '\t')
+           kp++;
+         if (!*kp)
+           continue;
+         url = kp;
+         while (*kp && *kp != ' ' && *kp != '\t')
+           kp++;
+         if (*kp)
+           *kp++ = 0;
+         while (*kp == ' ' || *kp == '\t')
+           kp++;
+         if (!*kp)
+           continue;
+         distro = kp;
+         while (*kp && *kp != ' ' && *kp != '\t')
+           kp++;
+         if (*kp)
+           *kp++ = 0;
+         while (*kp == ' ' || *kp == '\t')
+           kp++;
+         if (!*kp)
+           continue;
+         repoinfos = solv_extend(repoinfos, nrepoinfos, 1, sizeof(*repoinfos), 15);
+         cinfo = repoinfos + nrepoinfos++;
+         memset(cinfo, 0, sizeof(*cinfo));
+         cinfo->baseurl = strdup(url);
+         cinfo->alias = solv_dupjoin(url, "/", distro);
+         cinfo->name = strdup(distro);
+         cinfo->type = TYPE_DEBIAN;
+         cinfo->enabled = 1;
+         cinfo->autorefresh = 1;
+         cinfo->repo_gpgcheck = 1;
+         cinfo->metadata_expire = METADATA_EXPIRE;
+         while (*kp)
+           {
+             char *compo;
+             while (*kp == ' ' || *kp == '\t')
+               kp++;
+             if (!*kp)
+               break;
+             compo = kp;
+             while (*kp && *kp != ' ' && *kp != '\t')
+               kp++;
+             if (*kp)
+               *kp++ = 0;
+             cinfo->components = solv_extend(cinfo->components, cinfo->ncomponents, 1, sizeof(*cinfo->components), 15);
+             cinfo->components[cinfo->ncomponents++] = strdup(compo);
+           }
+       }
+      fclose(fp);
+      fp = 0;
+    }
+  qsort(repoinfos, nrepoinfos, sizeof(*repoinfos), read_repoinfos_sort);
+  *nrepoinfosp = nrepoinfos;
+  return repoinfos;
+}
+
+#endif
+
+#ifdef NOSYSTEM
+struct repoinfo *
+read_repoinfos(Pool *pool, int *nrepoinfosp)
+{
+  *nrepoinfosp = 0;
+  return 0;
+}
+#endif
+
+
 void
 free_repoinfos(struct repoinfo *repoinfos, int nrepoinfos)
 {
-  int i;
+  int i, j;
   for (i = 0; i < nrepoinfos; i++)
     {
       struct repoinfo *cinfo = repoinfos + i;
-      sat_free(cinfo->name);
-      sat_free(cinfo->alias);
-      sat_free(cinfo->path);
-      sat_free(cinfo->metalink);
-      sat_free(cinfo->baseurl);
-    }
-  sat_free(repoinfos);
+      solv_free(cinfo->name);
+      solv_free(cinfo->alias);
+      solv_free(cinfo->path);
+      solv_free(cinfo->metalink);
+      solv_free(cinfo->mirrorlist);
+      solv_free(cinfo->baseurl);
+      for (j = 0; j < cinfo->ncomponents; j++)
+        solv_free(cinfo->components[j]);
+      solv_free(cinfo->components);
+    }
+  solv_free(repoinfos);
 }
 
 static inline int
@@ -315,37 +514,187 @@ static int
 verify_checksum(int fd, const char *file, const unsigned char *chksum, Id chksumtype)
 {
   char buf[1024];
-  unsigned char *sum;
+  const unsigned char *sum;
   void *h;
   int l;
 
-  h = sat_chksum_create(chksumtype);
+  h = solv_chksum_create(chksumtype);
   if (!h)
     {
       printf("%s: unknown checksum type\n", file);
       return 0;
     }
   while ((l = read(fd, buf, sizeof(buf))) > 0)
-    sat_chksum_add(h, buf, l);
+    solv_chksum_add(h, buf, l);
   lseek(fd, 0, SEEK_SET);
   l = 0;
-  sum = sat_chksum_get(h, &l);
+  sum = solv_chksum_get(h, &l);
   if (memcmp(sum, chksum, l))
     {
       printf("%s: checksum mismatch\n", file);
+      solv_chksum_free(h, 0);
       return 0;
     }
+  solv_chksum_free(h, 0);
   return 1;
 }
 
+void
+findfastest(char **urls, int nurls)
+{
+  int i, j, port;
+  int *socks, qc;
+  struct pollfd *fds;
+  char *p, *p2, *q;
+  char portstr[16];
+  struct addrinfo hints, *result;;
+
+  fds = solv_calloc(nurls, sizeof(*fds));
+  socks = solv_calloc(nurls, sizeof(*socks));
+  for (i = 0; i < nurls; i++)
+    {
+      socks[i] = -1;
+      p = strchr(urls[i], '/');
+      if (!p)
+       continue;
+      if (p[1] != '/')
+       continue;
+      p += 2;
+      q = strchr(p, '/');
+      qc = 0;
+      if (q)
+       {
+         qc = *q;
+         *q = 0;
+       }
+      if ((p2 = strchr(p, '@')) != 0)
+       p = p2 + 1;
+      port = 80;
+      if (!strncmp("https:", urls[i], 6))
+       port = 443;
+      else if (!strncmp("ftp:", urls[i], 4))
+       port = 21;
+      if ((p2 = strrchr(p, ':')) != 0)
+       {
+         port = atoi(p2 + 1);
+         if (q)
+           *q = qc;
+         q = p2;
+         qc = *q;
+         *q = 0;
+       }
+      sprintf(portstr, "%d", port);
+      memset(&hints, 0, sizeof(struct addrinfo));
+      hints.ai_family = AF_UNSPEC;
+      hints.ai_socktype = SOCK_STREAM;
+      hints.ai_flags = AI_NUMERICSERV;
+      result = 0;
+      if (!getaddrinfo(p, portstr, &hints, &result))
+       {
+         socks[i] = socket(result->ai_family, result->ai_socktype, result->ai_protocol);
+         if (socks[i] >= 0)
+           {
+             fcntl(socks[i], F_SETFL, O_NONBLOCK);
+             if (connect(socks[i], result->ai_addr, result->ai_addrlen) == -1)
+               {
+                 if (errno != EINPROGRESS)
+                   {
+                     close(socks[i]);
+                     socks[i] = -1;
+                   }
+               }
+           }
+         freeaddrinfo(result);
+       }
+      if (q)
+       *q = qc;
+    }
+  for (;;)
+    {
+      for (i = j = 0; i < nurls; i++)
+       {
+         if (socks[i] < 0)
+           continue;
+         fds[j].fd = socks[i];
+         fds[j].events = POLLOUT;
+         j++;
+       }
+      if (j < 2)
+       {
+         i = j - 1;
+         break;
+       }
+      if (poll(fds, j, 10000) <= 0)
+       {
+         i = -1;       /* something is wrong */
+         break;
+       }
+      for (i = 0; i < j; i++)
+       if ((fds[i].revents & POLLOUT) != 0)
+         {
+           int soe = 0;
+           socklen_t soel = sizeof(int);
+           if (getsockopt(fds[i].fd, SOL_SOCKET, SO_ERROR, &soe, &soel) == -1 || soe != 0)
+             {
+               /* connect failed, kill socket */
+               for (j = 0; j < nurls; j++)
+                 if (socks[j] == fds[i].fd)
+                   {
+                     close(socks[j]);
+                     socks[j] = -1;
+                   }
+               i = j + 1;
+               break;
+             }
+           break;      /* horray! */
+         }
+      if (i == j + 1)
+       continue;
+      if (i == j)
+        i = -1;                /* something is wrong, no bit was set */
+      break;
+    }
+  /* now i contains the fastest fd index */
+  if (i >= 0)
+    {
+      for (j = 0; j < nurls; j++)
+       if (socks[j] == fds[i].fd)
+         break;
+      if (j != 0)
+       {
+         char *url0 = urls[0];
+         urls[0] = urls[j];
+         urls[j] = url0;
+       }
+    }
+  for (i = j = 0; i < nurls; i++)
+    if (socks[i] >= 0)
+      close(socks[i]);
+  free(socks);
+  free(fds);
+}
+
 char *
-findmetalinkurl(FILE *fp)
+findmetalinkurl(FILE *fp, unsigned char *chksump, Id *chksumtypep)
 {
   char buf[4096], *bp, *ep;
+  char **urls = 0;
+  int nurls = 0;
+  int i;
+
+  if (chksumtypep)
+    *chksumtypep = 0;
   while((bp = fgets(buf, sizeof(buf), fp)) != 0)
     {
       while (*bp == ' ' || *bp == '\t')
        bp++;
+      if (chksumtypep && !*chksumtypep && !strncmp(bp, "<hash type=\"sha256\">", 20))
+       {
+         bp += 20;
+         if (solv_hex2bin((const char **)&bp, chksump, 32) == 32)
+           *chksumtypep = REPOKEY_TYPE_SHA256;
+         continue;
+       }
       if (strncmp(bp, "<url", 4))
        continue;
       bp = strchr(bp, '>');
@@ -358,25 +707,80 @@ findmetalinkurl(FILE *fp)
       *ep = 0;
       if (strncmp(bp, "http", 4))
        continue;
-      return strdup(bp);
+      urls = solv_extend(urls, nurls, 1, sizeof(*urls), 15);
+      urls[nurls++] = strdup(bp);
+    }
+  if (nurls)
+    {
+      if (nurls > 1)
+        findfastest(urls, nurls > 5 ? 5 : nurls);
+      bp = urls[0];
+      urls[0] = 0;
+      for (i = 0; i < nurls; i++)
+        solv_free(urls[i]);
+      solv_free(urls);
+      ep = strchr(bp, '/');
+      if ((ep = strchr(ep + 2, '/')) != 0)
+       {
+         *ep = 0;
+         printf("[using mirror %s]\n", bp);
+         *ep = '/';
+       }
+      return bp;
     }
   return 0;
 }
 
-static ssize_t
-cookie_gzread(void *cookie, char *buf, size_t nbytes)
+char *
+findmirrorlisturl(FILE *fp)
 {
-  return gzread((gzFile *)cookie, buf, nbytes);
+  char buf[4096], *bp, *ep;
+  int i, l;
+  char **urls = 0;
+  int nurls = 0;
+
+  while((bp = fgets(buf, sizeof(buf), fp)) != 0)
+    {
+      while (*bp == ' ' || *bp == '\t')
+       bp++;
+      if (!*bp || *bp == '#')
+       continue;
+      l = strlen(bp);
+      while (l > 0 && (bp[l - 1] == ' ' || bp[l - 1] == '\t' || bp[l - 1] == '\n'))
+       bp[--l] = 0;
+      urls = solv_extend(urls, nurls, 1, sizeof(*urls), 15);
+      urls[nurls++] = strdup(bp);
+    }
+  if (nurls)
+    {
+      if (nurls > 1)
+        findfastest(urls, nurls > 5 ? 5 : nurls);
+      bp = urls[0];
+      urls[0] = 0;
+      for (i = 0; i < nurls; i++)
+        solv_free(urls[i]);
+      solv_free(urls);
+      ep = strchr(bp, '/');
+      if ((ep = strchr(ep + 2, '/')) != 0)
+       {
+         *ep = 0;
+         printf("[using mirror %s]\n", bp);
+         *ep = '/';
+       }
+      return bp;
+    }
+  return 0;
 }
 
-static int
-cookie_gzclose(void *cookie)
+static inline int
+iscompressed(const char *name)
 {
-  return gzclose((gzFile *)cookie);
+  int l = strlen(name);
+  return l > 3 && !strcmp(name + l - 3, ".gz") ? 1 : 0;
 }
 
 FILE *
-curlfopen(struct repoinfo *cinfo, const char *file, int uncompress, const unsigned char *chksum, Id chksumtype)
+curlfopen(struct repoinfo *cinfo, const char *file, int uncompress, const unsigned char *chksum, Id chksumtype, int *badchecksump)
 {
   pid_t pid;
   int fd, l;
@@ -386,18 +790,36 @@ curlfopen(struct repoinfo *cinfo, const char *file, int uncompress, const unsign
 
   if (!baseurl)
     {
-      if (!cinfo->metalink)
+      if (!cinfo->metalink && !cinfo->mirrorlist)
         return 0;
-      if (file != cinfo->metalink)
+      if (file != cinfo->metalink && file != cinfo->mirrorlist)
        {
-         FILE *fp = curlfopen(cinfo, cinfo->metalink, 0, 0, 0);
+         FILE *fp = curlfopen(cinfo, cinfo->metalink ? cinfo->metalink : cinfo->mirrorlist, 0, 0, 0, 0);
+         unsigned char mlchksum[32];
+         Id mlchksumtype = 0;
          if (!fp)
            return 0;
-         cinfo->baseurl = findmetalinkurl(fp);
+         if (cinfo->metalink)
+           cinfo->baseurl = findmetalinkurl(fp, mlchksum, &mlchksumtype);
+         else
+           cinfo->baseurl = findmirrorlisturl(fp);
          fclose(fp);
          if (!cinfo->baseurl)
            return 0;
-         return curlfopen(cinfo, file, uncompress, chksum, chksumtype);
+#ifdef FEDORA
+         if (strchr(cinfo->baseurl, '$'))
+           {
+             char *b = yum_substitute(cinfo->repo->pool, cinfo->baseurl);
+             free(cinfo->baseurl);
+             cinfo->baseurl = strdup(b);
+           }
+#endif
+         if (!chksumtype && mlchksumtype && !strcmp(file, "repodata/repomd.xml"))
+           {
+             chksumtype = mlchksumtype;
+             chksum = mlchksum;
+           }
+         return curlfopen(cinfo, file, uncompress, chksum, chksumtype, badchecksump);
        }
       snprintf(url, sizeof(url), "%s", file);
     }
@@ -410,6 +832,7 @@ curlfopen(struct repoinfo *cinfo, const char *file, int uncompress, const unsign
        snprintf(url, sizeof(url), "%s/%s", baseurl, file);
     }
   fd = opentmpfile();
+  // printf("url: %s\n", url);
   if ((pid = fork()) == (pid_t)-1)
     {
       perror("fork");
@@ -426,40 +849,39 @@ curlfopen(struct repoinfo *cinfo, const char *file, int uncompress, const unsign
       perror("curl");
       _exit(0);
     }
+  status = 0;
   while (waitpid(pid, &status, 0) != pid)
     ;
-  if (lseek(fd, 0, SEEK_END) == 0)
+  if (lseek(fd, 0, SEEK_END) == 0 && (!status || !chksumtype))
     {
       /* empty file */
       close(fd);
       return 0;
     }
   lseek(fd, 0, SEEK_SET);
-  if (chksumtype && !verify_checksum(fd, file, chksum, chksumtype))
+  if (status)
     {
+      printf("%s: download error %d\n", file, status >> 8 ? status >> 8 : status);
+      if (badchecksump)
+       *badchecksump = 1;
       close(fd);
       return 0;
     }
-  if (uncompress)
+  if (chksumtype && !verify_checksum(fd, file, chksum, chksumtype))
     {
-      char tmpl[100];
-      cookie_io_functions_t cio;
-      gzFile *gzf;
-
-      sprintf(tmpl, "/dev/fd/%d", fd);
-      gzf = gzopen(tmpl, "r");
+      if (badchecksump)
+       *badchecksump = 1;
       close(fd);
-      if (!gzf)
-       return 0;
-      memset(&cio, 0, sizeof(cio));
-      cio.read = cookie_gzread;
-      cio.close = cookie_gzclose;
-      return fopencookie(gzf, "r", cio);
+      return 0;
     }
+  if (uncompress)
+    return solv_xfopen_fd(".gz", fd, "r");
   fcntl(fd, F_SETFD, FD_CLOEXEC);
   return fdopen(fd, "r");
 }
 
+#ifndef DEBIAN
+
 static void
 cleanupgpg(char *gpgdir)
 {
@@ -542,32 +964,84 @@ checksig(Pool *sigpool, FILE *fp, FILE *sigfp)
   return r == 0 ? 1 : 0;
 }
 
+#else
+
+static int
+checksig(Pool *sigpool, FILE *fp, FILE *sigfp)
+{
+  char cmd[256];
+  int r;
+
+  snprintf(cmd, sizeof(cmd), "gpgv -q --keyring /etc/apt/trusted.gpg /dev/fd/%d /dev/fd/%d >/dev/null 2>&1", fileno(sigfp), fileno(fp));
+  fcntl(fileno(fp), F_SETFD, 0);       /* clear CLOEXEC */
+  fcntl(fileno(sigfp), F_SETFD, 0);    /* clear CLOEXEC */
+  r = system(cmd);
+  fcntl(fileno(fp), F_SETFD, FD_CLOEXEC);
+  fcntl(fileno(sigfp), F_SETFD, FD_CLOEXEC);
+  return r == 0 ? 1 : 0;
+}
+
+#endif
+
+static Pool *
+read_sigs()
+{
+  Pool *sigpool = pool_create();
+#if defined(ENABLE_RPMDB_PUBKEY)
+  Repo *repo = repo_create(sigpool, "rpmdbkeys");
+  repo_add_rpmdb_pubkeys(repo, 0);
+#endif
+  return sigpool;
+}
+
+static int
+downloadchecksig(struct repoinfo *cinfo, FILE *fp, const char *sigurl, Pool **sigpool)
+{
+  FILE *sigfp;
+  sigfp = curlfopen(cinfo, sigurl, 0, 0, 0, 0);
+  if (!sigfp)
+    {
+      printf(" unsigned, skipped\n");
+      return 0;
+    }
+  if (!*sigpool)
+    *sigpool = read_sigs();
+  if (!checksig(*sigpool, fp, sigfp))
+    {
+      printf(" checksig failed, skipped\n");
+      fclose(sigfp);
+      return 0;
+    }
+  fclose(sigfp);
+  return 1;
+}
+
 #define CHKSUM_IDENT "1.1"
 
 void
 calc_checksum_fp(FILE *fp, Id chktype, unsigned char *out)
 {
   char buf[4096];
-  void *h = sat_chksum_create(chktype);
+  void *h = solv_chksum_create(chktype);
   int l;
 
-  sat_chksum_add(h, CHKSUM_IDENT, strlen(CHKSUM_IDENT));
+  solv_chksum_add(h, CHKSUM_IDENT, strlen(CHKSUM_IDENT));
   while ((l = fread(buf, 1, sizeof(buf), fp)) > 0)
-    sat_chksum_add(h, buf, l);
+    solv_chksum_add(h, buf, l);
   rewind(fp);
-  sat_chksum_free(h, out);
+  solv_chksum_free(h, out);
 }
 
 void
 calc_checksum_stat(struct stat *stb, Id chktype, unsigned char *out)
 {
-  void *h = sat_chksum_create(chktype);
-  sat_chksum_add(h, CHKSUM_IDENT, strlen(CHKSUM_IDENT));
-  sat_chksum_add(h, &stb->st_dev, sizeof(stb->st_dev));
-  sat_chksum_add(h, &stb->st_ino, sizeof(stb->st_ino));
-  sat_chksum_add(h, &stb->st_size, sizeof(stb->st_size));
-  sat_chksum_add(h, &stb->st_mtime, sizeof(stb->st_mtime));
-  sat_chksum_free(h, out);
+  void *h = solv_chksum_create(chktype);
+  solv_chksum_add(h, CHKSUM_IDENT, strlen(CHKSUM_IDENT));
+  solv_chksum_add(h, &stb->st_dev, sizeof(stb->st_dev));
+  solv_chksum_add(h, &stb->st_ino, sizeof(stb->st_ino));
+  solv_chksum_add(h, &stb->st_size, sizeof(stb->st_size));
+  solv_chksum_add(h, &stb->st_mtime, sizeof(stb->st_mtime));
+  solv_chksum_free(h, out);
 }
 
 void
@@ -587,11 +1061,11 @@ char *calccachepath(Repo *repo, const char *repoext)
   char *q, *p = pool_tmpjoin(repo->pool, SOLVCACHE_PATH, "/", repo->name);
   if (repoext)
     {
-      p = pool_tmpjoin(repo->pool, p, "_", repoext);
-      p = pool_tmpjoin(repo->pool, p, ".solvx", 0);
+      p = pool_tmpappend(repo->pool, p, "_", repoext);
+      p = pool_tmpappend(repo->pool, p, ".solvx", 0);
     }
   else
-    p = pool_tmpjoin(repo->pool, p, ".solv", 0);
+    p = pool_tmpappend(repo->pool, p, ".solv", 0);
   q = p + strlen(SOLVCACHE_PATH) + 1;
   if (*q == '.')
     *q = '_';
@@ -602,10 +1076,11 @@ char *calccachepath(Repo *repo, const char *repoext)
 }
 
 int
-usecachedrepo(Repo *repo, const char *repoext, unsigned char *cookie)
+usecachedrepo(Repo *repo, const char *repoext, unsigned char *cookie, int mark)
 {
   FILE *fp;
   unsigned char mycookie[32];
+  unsigned char myextcookie[32];
   struct repoinfo *cinfo;
   int flags;
 
@@ -622,56 +1097,53 @@ usecachedrepo(Repo *repo, const char *repoext, unsigned char *cookie)
       fclose(fp);
       return 0;
     }
+  if (cinfo && !repoext)
+    {
+      if (fseek(fp, -sizeof(mycookie) * 2, SEEK_END) || fread(myextcookie, sizeof(myextcookie), 1, fp) != 1)
+       {
+         fclose(fp);
+         return 0;
+       }
+    }
   rewind(fp);
 
   flags = 0;
   if (repoext)
-    flags = REPO_USE_LOADING|REPO_EXTEND_SOLVABLES;
-  if (repoext && strcmp(repoext, "DL") != 0)
-    flags |= REPO_LOCALPOOL;   /* no local pool for DL so that we can compare IDs */
+    {
+      flags = REPO_USE_LOADING|REPO_EXTEND_SOLVABLES;
+      if (strcmp(repoext, "DL") != 0)
+        flags |= REPO_LOCALPOOL;       /* no local pool for DL so that we can compare IDs */
+    }
 
-  if (repo_add_solv_flags(repo, fp, flags))
+  if (repo_add_solv(repo, fp, flags))
     {
       fclose(fp);
       return 0;
     }
   if (cinfo && !repoext)
     {
-      /* set the checksum so that we can use it with the stub loads */
-      struct stat stb;
-      if (!fstat(fileno(fp), &stb))
-        calc_checksum_stat(&stb, REPOKEY_TYPE_SHA256, cinfo->extcookie);
+      memcpy(cinfo->cookie, mycookie, sizeof(mycookie));
+      memcpy(cinfo->extcookie, myextcookie, sizeof(myextcookie));
     }
+  if (mark)
+    futimes(fileno(fp), 0);    /* try to set modification time */
   fclose(fp);
   return 1;
 }
 
-static int
-myrepodatafilter(Repo *repo, Repokey *key, void *kfdata)
-{
-  Repodata *data = kfdata;
-
-  /* XXX: special repodata selection hack */
-  if (key->name == 1 && key->size != data - repo->repodata)
-    return -1;
-  if (key->storage == KEY_STORAGE_SOLVABLE)
-    return KEY_STORAGE_DROPPED;
-  return repo_write_stdkeyfilter(repo, key, kfdata);
-}
-
 void
 writecachedrepo(Repo *repo, Repodata *info, const char *repoext, unsigned char *cookie)
 {
-  Id *addedfileprovides = 0;
   FILE *fp;
   int i, fd;
   char *tmpl;
-  int myinfo = 0;
   struct repoinfo *cinfo;
+  int onepiece;
 
   cinfo = repo->appdata;
   mkdir(SOLVCACHE_PATH, 0755);
-  tmpl = sat_dupjoin(SOLVCACHE_PATH, "/", ".newsolv-XXXXXX");
+  /* use dupjoin instead of tmpjoin because tmpl must survive repo_write */
+  tmpl = solv_dupjoin(SOLVCACHE_PATH, "/", ".newsolv-XXXXXX");
   fd = mkstemp(tmpl);
   if (fd < 0)
     {
@@ -686,27 +1158,54 @@ writecachedrepo(Repo *repo, Repodata *info, const char *repoext, unsigned char *
       free(tmpl);
       return;
     }
-  if (!repoext)
+
+  onepiece = 1;
+  for (i = repo->start; i < repo->end; i++)
+   if (repo->pool->solvables[i].repo != repo)
+     break;
+  if (i < repo->end)
+    onepiece = 0;
+
+  if (!info)
+    repo_write(repo, fp);
+  else if (repoext)
+    repodata_write(info, fp);
+  else
+    {
+      int oldnrepodata = repo->nrepodata;
+      repo->nrepodata = oldnrepodata > 2 ? 2 : oldnrepodata;   /* XXX: do this right */
+      repo_write(repo, fp);
+      repo->nrepodata = oldnrepodata;
+      onepiece = 0;
+    }
+
+  if (!repoext && cinfo)
     {
-      if (!info)
+      if (!cinfo->extcookie[0])
        {
-         info = repo_add_repodata(repo, 0);
-         myinfo = 1;
+         /* create the ext cookie and append it */
+         /* we just need some unique ID */
+         struct stat stb;
+         if (!fstat(fileno(fp), &stb))
+           {
+             int i;
+
+             calc_checksum_stat(&stb, REPOKEY_TYPE_SHA256, cinfo->extcookie);
+             for (i = 0; i < 32; i++)
+               cinfo->extcookie[i] ^= cookie[i];
+           }
+         if (cinfo->extcookie[0] == 0)
+           cinfo->extcookie[0] = 1;
        }
-      pool_addfileprovides_ids(repo->pool, 0, &addedfileprovides);
-      if (addedfileprovides && *addedfileprovides)
+      if (fwrite(cinfo->extcookie, 32, 1, fp) != 1)
        {
-         for (i = 0; addedfileprovides[i]; i++)
-           repodata_add_idarray(info, SOLVID_META, REPOSITORY_ADDEDFILEPROVIDES, addedfileprovides[i]);
+         fclose(fp);
+         unlink(tmpl);
+         free(tmpl);
+         return;
        }
-      sat_free(addedfileprovides);
-      repodata_internalize(info);
-      repo_write(repo, fp, repo_write_stdkeyfilter, 0, 0);
     }
-  else
-    repo_write(repo, fp, myrepodatafilter, info, 0);
-  if (myinfo)
-    repodata_free(info);
+  /* append our cookie describing the metadata state */
   if (fwrite(cookie, 32, 1, fp) != 1)
     {
       fclose(fp);
@@ -720,12 +1219,35 @@ writecachedrepo(Repo *repo, Repodata *info, const char *repoext, unsigned char *
       free(tmpl);
       return;
     }
-  if (!repoext && cinfo)
+  if (onepiece)
     {
-      /* set the checksum so that we can use it with the stub loads */
-      struct stat stb;
-      if (!stat(tmpl, &stb))
-        calc_checksum_stat(&stb, REPOKEY_TYPE_SHA256, cinfo->extcookie);
+      /* switch to just saved repo to activate paging and save memory */
+      FILE *fp = fopen(tmpl, "r");
+      if (fp)
+       {
+         if (!repoext)
+           {
+             /* main repo */
+             repo_empty(repo, 1);
+             if (repo_add_solv(repo, fp, SOLV_ADD_NO_STUBS))
+               {
+                 /* oops, no way to recover from here */
+                 fprintf(stderr, "internal error\n");
+                 exit(1);
+               }
+           }
+         else
+           {
+             /* make sure repodata contains complete repo */
+             /* (this is how repodata_write saves it) */
+             repodata_extend_block(info, repo->start, repo->end - repo->start);
+             info->state = REPODATA_LOADING;
+             /* no need for LOCALPOOL as pool already contains ids */
+             repo_add_solv(repo, fp, REPO_USE_LOADING|REPO_EXTEND_SOLVABLES);
+             info->state = REPODATA_AVAILABLE; /* in case the load failed */
+           }
+         fclose(fp);
+       }
     }
   if (!rename(tmpl, calccachepath(repo, repoext)))
     unlink(tmpl);
@@ -733,16 +1255,7 @@ writecachedrepo(Repo *repo, Repodata *info, const char *repoext, unsigned char *
 }
 
 
-static Pool *
-read_sigs()
-{
-  Pool *sigpool = pool_create();
-  Repo *repo = repo_create(sigpool, "rpmdbkeys");
-  repo_add_rpmdb_pubkeys(repo, 0, 0);
-  return sigpool;
-}
-
-
+#ifdef ENABLE_RPMMD
 /* repomd helpers */
 
 static inline const char *
@@ -775,34 +1288,19 @@ repomd_find(Repo *repo, const char *what, const unsigned char **chksump, Id *chk
 int
 repomd_add_ext(Repo *repo, Repodata *data, const char *what)
 {
-  Pool *pool = repo->pool;
-  Dataiterator di;
   Id chksumtype, handle;
   const unsigned char *chksum;
   const char *filename;
 
-  dataiterator_init(&di, pool, repo, SOLVID_META, REPOSITORY_REPOMD_TYPE, what, SEARCH_STRING);
-  dataiterator_prepend_keyname(&di, REPOSITORY_REPOMD);
-  if (!dataiterator_step(&di))
-    {
-      dataiterator_free(&di);
-      return 0;
-    }
+  filename = repomd_find(repo, what, &chksum, &chksumtype);
+  if (!filename)
+    return 0;
   if (!strcmp(what, "prestodelta"))
     what = "deltainfo";
-  dataiterator_setpos_parent(&di);
-  filename = pool_lookup_str(pool, SOLVID_POS, REPOSITORY_REPOMD_LOCATION);
-  chksum = pool_lookup_bin_checksum(pool, SOLVID_POS, REPOSITORY_REPOMD_CHECKSUM, &chksumtype);
-  if (!filename || !chksum)
-    {
-      dataiterator_free(&di);
-      return 0;
-    }
   handle = repodata_new_handle(data);
   repodata_set_poolstr(data, handle, REPOSITORY_REPOMD_TYPE, what);
   repodata_set_str(data, handle, REPOSITORY_REPOMD_LOCATION, filename);
-  if (chksumtype)
-    repodata_set_bin_checksum(data, handle, REPOSITORY_REPOMD_CHECKSUM, chksumtype, chksum);
+  repodata_set_bin_checksum(data, handle, REPOSITORY_REPOMD_CHECKSUM, chksumtype, chksum);
   if (!strcmp(what, "deltainfo"))
     {
       repodata_add_idarray(data, handle, REPOSITORY_KEYS, REPOSITORY_DELTAINFO);
@@ -813,12 +1311,63 @@ repomd_add_ext(Repo *repo, Repodata *data, const char *what)
       repodata_add_idarray(data, handle, REPOSITORY_KEYS, SOLVABLE_FILELIST);
       repodata_add_idarray(data, handle, REPOSITORY_KEYS, REPOKEY_TYPE_DIRSTRARRAY);
     }
-  dataiterator_free(&di);
   repodata_add_flexarray(data, SOLVID_META, REPOSITORY_EXTERNAL, handle);
   return 1;
 }
 
+int
+repomd_load_ext(Repo *repo, Repodata *data)
+{
+  const char *filename, *repomdtype;
+  char ext[3];
+  FILE *fp;
+  struct repoinfo *cinfo;
+  const unsigned char *filechksum;
+  Id filechksumtype;
+  int r = 0;
+
+  cinfo = repo->appdata;
+  repomdtype = repodata_lookup_str(data, SOLVID_META, REPOSITORY_REPOMD_TYPE);
+  if (!repomdtype)
+    return 0;
+  if (!strcmp(repomdtype, "filelists"))
+    strcpy(ext, "FL");
+  else if (!strcmp(repomdtype, "deltainfo"))
+    strcpy(ext, "DL");
+  else
+    return 0;
+#if 1
+  printf("[%s:%s", repo->name, ext);
+#endif
+  if (usecachedrepo(repo, ext, cinfo->extcookie, 0))
+    {
+      printf(" cached]\n");fflush(stdout);
+      return 1;
+    }
+  printf(" fetching]\n"); fflush(stdout);
+  filename = repodata_lookup_str(data, SOLVID_META, REPOSITORY_REPOMD_LOCATION);
+  filechksumtype = 0;
+  filechksum = repodata_lookup_bin_checksum(data, SOLVID_META, REPOSITORY_REPOMD_CHECKSUM, &filechksumtype);
+  if ((fp = curlfopen(cinfo, filename, iscompressed(filename), filechksum, filechksumtype, 0)) == 0)
+    return 0;
+  if (!strcmp(ext, "FL"))
+    r = repo_add_rpmmd(repo, fp, ext, REPO_USE_LOADING|REPO_EXTEND_SOLVABLES);
+  else if (!strcmp(ext, "DL"))
+    r = repo_add_deltainfoxml(repo, fp, REPO_USE_LOADING);
+  fclose(fp);
+  if (r)
+    {
+      printf("%s\n", pool_errstr(repo->pool));
+      return 0;
+    }
+  writecachedrepo(repo, data, ext, cinfo->extcookie);
+  return 1;
+}
+
+#endif
+
 
+#ifdef ENABLE_SUSEREPO
 /* susetags helpers */
 
 static inline const char *
@@ -874,11 +1423,15 @@ susetags_add_ext(Repo *repo, Repodata *data)
     {
       if (strncmp(di.kv.str, "packages.", 9) != 0)
        continue;
+      if (!strcmp(di.kv.str + 9, "gz"))
+       continue;
       if (!di.kv.str[9] || !di.kv.str[10] || (di.kv.str[11] && di.kv.str[11] != '.'))
        continue;
       ext[0] = di.kv.str[9];
       ext[1] = di.kv.str[10];
       ext[2] = 0;
+      if (!strcmp(ext, "en"))
+       continue;
       if (!susetags_find(repo, di.kv.str, &filechksum, &filechksumtype))
        continue;
       handle = repodata_new_handle(data);
@@ -890,7 +1443,7 @@ susetags_add_ext(Repo *repo, Repodata *data)
          repodata_add_idarray(data, handle, REPOSITORY_KEYS, SOLVABLE_DISKUSAGE);
          repodata_add_idarray(data, handle, REPOSITORY_KEYS, REPOKEY_TYPE_DIRNUMNUMARRAY);
        }
-      if (!strcmp(ext, "FL"))
+      else if (!strcmp(ext, "FL"))
        {
          repodata_add_idarray(data, handle, REPOSITORY_KEYS, SOLVABLE_FILELIST);
          repodata_add_idarray(data, handle, REPOSITORY_KEYS, REPOKEY_TYPE_DIRSTRARRAY);
@@ -908,96 +1461,200 @@ susetags_add_ext(Repo *repo, Repodata *data)
   dataiterator_free(&di);
 }
 
-
-static inline int
-iscompressed(const char *name)
-{
-  int l = strlen(name);
-  return l > 3 && !strcmp(name + l - 3, ".gz") ? 1 : 0;
-}
-
-
-/* load callback */
-
 int
-load_stub(Pool *pool, Repodata *data, void *dp)
+susetags_load_ext(Repo *repo, Repodata *data)
 {
-  const char *filename, *descrdir, *repomdtype;
-  const unsigned char *filechksum;
-  Id filechksumtype;
-  struct repoinfo *cinfo;
-  FILE *fp;
+  const char *filename, *descrdir;
   Id defvendor;
   char ext[3];
+  FILE *fp;
+  struct repoinfo *cinfo;
+  const unsigned char *filechksum;
+  Id filechksumtype;
 
-  cinfo = data->repo->appdata;
-
+  cinfo = repo->appdata;
   filename = repodata_lookup_str(data, SOLVID_META, SUSETAGS_FILE_NAME);
-  if (filename)
-    {
-      /* susetags load */
-      ext[0] = filename[9];
-      ext[1] = filename[10];
-      ext[2] = 0;
+  if (!filename)
+    return 0;
+  /* susetags load */
+  ext[0] = filename[9];
+  ext[1] = filename[10];
+  ext[2] = 0;
 #if 1
-      printf("[%s:%s", data->repo->name, ext);
+  printf("[%s:%s", repo->name, ext);
 #endif
-      if (usecachedrepo(data->repo, ext, cinfo->extcookie))
-       {
-          printf(" cached]\n"); fflush(stdout);
-         return 1;
-       }
+  if (usecachedrepo(repo, ext, cinfo->extcookie, 0))
+    {
+      printf(" cached]\n"); fflush(stdout);
+      return 1;
+    }
 #if 1
-      printf(" loading]\n"); fflush(stdout);
+  printf(" fetching]\n"); fflush(stdout);
 #endif
-      defvendor = repo_lookup_id(data->repo, SOLVID_META, SUSETAGS_DEFAULTVENDOR);
-      descrdir = repo_lookup_str(data->repo, SOLVID_META, SUSETAGS_DESCRDIR);
-      if (!descrdir)
-       descrdir = "suse/setup/descr";
-      filechksumtype = 0;
-      filechksum = repodata_lookup_bin_checksum(data, SOLVID_META, SUSETAGS_FILE_CHECKSUM, &filechksumtype);
-      if ((fp = curlfopen(cinfo, pool_tmpjoin(pool, descrdir, "/", filename), iscompressed(filename), filechksum, filechksumtype)) == 0)
-       return 0;
-      repo_add_susetags(data->repo, fp, defvendor, ext, REPO_USE_LOADING|REPO_EXTEND_SOLVABLES);
+  defvendor = repo_lookup_id(repo, SOLVID_META, SUSETAGS_DEFAULTVENDOR);
+  descrdir = repo_lookup_str(repo, SOLVID_META, SUSETAGS_DESCRDIR);
+  if (!descrdir)
+    descrdir = "suse/setup/descr";
+  filechksumtype = 0;
+  filechksum = repodata_lookup_bin_checksum(data, SOLVID_META, SUSETAGS_FILE_CHECKSUM, &filechksumtype);
+  if ((fp = curlfopen(cinfo, pool_tmpjoin(repo->pool, descrdir, "/", filename), iscompressed(filename), filechksum, filechksumtype, 0)) == 0)
+    return 0;
+  if (repo_add_susetags(repo, fp, defvendor, ext, REPO_USE_LOADING|REPO_EXTEND_SOLVABLES))
+    {
       fclose(fp);
-      writecachedrepo(data->repo, data, ext, cinfo->extcookie);
-      return 1;
+      printf("%s\n", pool_errstr(repo->pool));
+      return 0;
     }
+  fclose(fp);
+  writecachedrepo(repo, data, ext, cinfo->extcookie);
+  return 1;
+}
+#endif
 
-  repomdtype = repodata_lookup_str(data, SOLVID_META, REPOSITORY_REPOMD_TYPE);
-  if (repomdtype)
+
+
+/* load callback */
+
+int
+load_stub(Pool *pool, Repodata *data, void *dp)
+{
+  struct repoinfo *cinfo = data->repo->appdata;
+  switch (cinfo->type)
     {
-      if (!strcmp(repomdtype, "filelists"))
-       strcpy(ext, "FL");
-      else if (!strcmp(repomdtype, "deltainfo"))
-       strcpy(ext, "DL");
-      else
-       return 0;
-#if 1
-      printf("[%s:%s", data->repo->name, ext);
+#ifdef ENABLE_SUSEREPO
+    case TYPE_SUSETAGS:
+      return susetags_load_ext(data->repo, data);
 #endif
-      if (usecachedrepo(data->repo, ext, cinfo->extcookie))
+#ifdef ENABLE_RPMMD
+    case TYPE_RPMMD:
+      return repomd_load_ext(data->repo, data);
+#endif
+    default:
+      return 0;
+    }
+}
+
+static unsigned char installedcookie[32];
+
+#ifdef ENABLE_DEBIAN
+
+const char *
+debian_find_component(struct repoinfo *cinfo, FILE *fp, char *comp, const unsigned char **chksump, Id *chksumtypep)
+{
+  char buf[4096];
+  Id chksumtype;
+  unsigned char *chksum;
+  Id curchksumtype;
+  int l, compl;
+  char *ch, *fn, *bp;
+  char *filename;
+  static char *basearch;
+  char *binarydir;
+  int lbinarydir;
+
+  if (!basearch)
+    {
+      struct utsname un;
+      if (uname(&un))
        {
-         printf(" cached]\n");fflush(stdout);
-         return 1;
+         perror("uname");
+         exit(1);
        }
-      printf(" loading]\n"); fflush(stdout);
-      filename = repodata_lookup_str(data, SOLVID_META, REPOSITORY_REPOMD_LOCATION);
-      filechksumtype = 0;
-      filechksum = repodata_lookup_bin_checksum(data, SOLVID_META, SUSETAGS_FILE_CHECKSUM, &filechksumtype);
-      if ((fp = curlfopen(cinfo, filename, iscompressed(filename), filechksum, filechksumtype)) == 0)
-       return 0;
-      if (!strcmp(ext, "FL"))
-        repo_add_rpmmd(data->repo, fp, ext, REPO_USE_LOADING|REPO_EXTEND_SOLVABLES);
-      else if (!strcmp(ext, "DL"))
-        repo_add_deltainfoxml(data->repo, fp, REPO_USE_LOADING);
-      fclose(fp);
-      writecachedrepo(data->repo, data, ext, cinfo->extcookie);
-      return 1;
+      basearch = strdup(un.machine);
+      if (basearch[0] == 'i' && basearch[1] && !strcmp(basearch + 2, "86"))
+       basearch[1] = '3';
     }
-
-  return 0;
+  binarydir = solv_dupjoin("binary-", basearch, "/");
+  lbinarydir = strlen(binarydir);
+  compl = strlen(comp);
+  rewind(fp);
+  curchksumtype = 0;
+  filename = 0;
+  chksum = solv_malloc(32);
+  chksumtype = 0;
+  while(fgets(buf, sizeof(buf), fp))
+    {
+      l = strlen(buf);
+      if (l == 0)
+       continue;
+      while (l && (buf[l - 1] == '\n' || buf[l - 1] == ' ' || buf[l - 1] == '\t'))
+       buf[--l] = 0;
+      if (!strncasecmp(buf, "MD5Sum:", 7))
+       {
+         curchksumtype = REPOKEY_TYPE_MD5;
+         continue;
+       }
+      if (!strncasecmp(buf, "SHA1:", 5))
+       {
+         curchksumtype = REPOKEY_TYPE_SHA1;
+         continue;
+       }
+      if (!strncasecmp(buf, "SHA256:", 7))
+       {
+         curchksumtype = REPOKEY_TYPE_SHA256;
+         continue;
+       }
+      if (!curchksumtype)
+       continue;
+      bp = buf;
+      if (*bp++ != ' ')
+       {
+         curchksumtype = 0;
+         continue;
+       }
+      ch = bp;
+      while (*bp && *bp != ' ' && *bp != '\t')
+       bp++;
+      if (!*bp)
+       continue;
+      *bp++ = 0;
+      while (*bp == ' ' || *bp == '\t')
+       bp++;
+      while (*bp && *bp != ' ' && *bp != '\t')
+       bp++;
+      if (!*bp)
+       continue;
+      while (*bp == ' ' || *bp == '\t')
+       bp++;
+      fn = bp;
+      if (strncmp(fn, comp, compl) != 0 || fn[compl] != '/')
+       continue;
+      bp += compl + 1;
+      if (strncmp(bp, binarydir, lbinarydir))
+       continue;
+      bp += lbinarydir;
+      if (!strcmp(bp, "Packages") || !strcmp(bp, "Packages.gz"))
+       {
+         unsigned char curchksum[32];
+         int curl;
+         if (filename && !strcmp(bp, "Packages"))
+           continue;
+         curl = solv_chksum_len(curchksumtype);
+         if (!curl || (chksumtype && solv_chksum_len(chksumtype) > curl))
+           continue;
+          if (solv_hex2bin((const char **)&ch, curchksum, sizeof(curchksum)) != curl)
+           continue;
+         solv_free(filename);
+         filename = strdup(fn);
+         chksumtype = curchksumtype;
+         memcpy(chksum, curchksum, curl);
+       }
+    }
+  free(binarydir);
+  if (filename)
+    {
+      fn = solv_dupjoin("/", filename, 0);
+      solv_free(filename);
+      filename = solv_dupjoin("dists/", cinfo->name, fn);
+      solv_free(fn);
+    }
+  if (!chksumtype)
+    chksum = solv_free(chksum);
+  *chksump = chksum;
+  *chksumtypep = chksumtype;
+  return filename;
 }
+#endif
 
 void
 read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos)
@@ -1006,47 +1663,85 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos)
   struct repoinfo *cinfo;
   int i;
   FILE *fp;
-  FILE *sigfp;
   const char *filename;
   const unsigned char *filechksum;
   Id filechksumtype;
+#ifdef ENABLE_SUSEREPO
   const char *descrdir;
   int defvendor;
+#endif
   struct stat stb;
-  unsigned char cookie[32];
   Pool *sigpool = 0;
+#if defined(ENABLE_SUSEREPO) || defined(ENABLE_RPMMD)
   Repodata *data;
+#endif
+  int badchecksum;
+  int dorefresh;
+#if defined(ENABLE_DEBIAN)
+  FILE *fpr;
+  int j;
+#endif
 
   repo = repo_create(pool, "@System");
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
   printf("rpm database:");
-  if (stat("/var/lib/rpm/Packages", &stb))
+  if (stat(pool_prepend_rootdir_tmp(pool, "/var/lib/rpm/Packages"), &stb))
+    memset(&stb, 0, sizeof(&stb));
+#endif
+#if defined(ENABLE_DEBIAN) && defined(DEBIAN)
+  printf("dpgk database:");
+  if (stat(pool_prepend_rootdir_tmp(pool, "/var/lib/dpkg/status"), &stb))
     memset(&stb, 0, sizeof(&stb));
-  calc_checksum_stat(&stb, REPOKEY_TYPE_SHA256, cookie);
-  if (usecachedrepo(repo, 0, cookie))
+#endif
+#ifdef NOSYSTEM
+  printf("no installed database:");
+  memset(&stb, 0, sizeof(&stb));
+#endif
+  calc_checksum_stat(&stb, REPOKEY_TYPE_SHA256, installedcookie);
+  if (usecachedrepo(repo, 0, installedcookie, 0))
     printf(" cached\n");
   else
     {
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
       FILE *ofp;
+      Repo *ref = 0;
+#endif
       printf(" reading\n");
-      int done = 0;
 
-#ifdef PRODUCTS_PATH
-      repo_add_products(repo, PRODUCTS_PATH, 0, REPO_NO_INTERNALIZE);
-#endif
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
+# if defined(ENABLE_SUSEREPO) && defined(PRODUCTS_PATH)
+      if (repo_add_products(repo, PRODUCTS_PATH, REPO_NO_INTERNALIZE | REPO_USE_ROOTDIR))
+       {
+         fprintf(stderr, "product reading failed: %s\n", pool_errstr(pool));
+         exit(1);
+       }
+# endif
       if ((ofp = fopen(calccachepath(repo, 0), "r")) != 0)
        {
-         Repo *ref = repo_create(pool, "@System.old");
-         if (!repo_add_solv(ref, ofp))
+         ref = repo_create(pool, "@System.old");
+         if (repo_add_solv(ref, ofp, 0))
            {
-             repo_add_rpmdb(repo, ref, 0, REPO_REUSE_REPODATA);
-             done = 1;
+             repo_free(ref, 1);
+             ref = 0;
            }
          fclose(ofp);
-         repo_free(ref, 1);
        }
-      if (!done)
-        repo_add_rpmdb(repo, 0, 0, REPO_REUSE_REPODATA);
-      writecachedrepo(repo, 0, 0, cookie);
+      if (repo_add_rpmdb(repo, ref, REPO_REUSE_REPODATA | REPO_USE_ROOTDIR))
+       {
+         fprintf(stderr, "installed db: %s\n", pool_errstr(pool));
+         exit(1);
+       }
+      if (ref)
+        repo_free(ref, 1);
+#endif
+#if defined(ENABLE_DEBIAN) && defined(DEBIAN)
+      if (repo_add_debdb(repo, REPO_REUSE_REPODATA | REPO_USE_ROOTDIR))
+       {
+         fprintf(stderr, "installed db: %s\n", pool_errstr(pool));
+         exit(1);
+       }
+#endif
+      writecachedrepo(repo, 0, 0, installedcookie);
     }
   pool_set_installed(pool, repo);
 
@@ -1061,119 +1756,118 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos)
       repo->appdata = cinfo;
       repo->priority = 99 - cinfo->priority;
 
-      if (!cinfo->autorefresh && usecachedrepo(repo, 0, 0))
+      dorefresh = cinfo->autorefresh;
+      if (dorefresh && cinfo->metadata_expire && stat(calccachepath(repo, 0), &stb) == 0)
+       {
+         if (cinfo->metadata_expire == -1 || time(0) - stb.st_mtime < cinfo->metadata_expire)
+           dorefresh = 0;
+       }
+      if (!dorefresh && usecachedrepo(repo, 0, 0, 0))
        {
          printf("repo '%s':", cinfo->alias);
          printf(" cached\n");
          continue;
        }
+      badchecksum = 0;
       switch (cinfo->type)
        {
+#ifdef ENABLE_RPMMD
         case TYPE_RPMMD:
          printf("rpmmd repo '%s':", cinfo->alias);
          fflush(stdout);
-         if ((fp = curlfopen(cinfo, "repodata/repomd.xml", 0, 0, 0)) == 0)
+         if ((fp = curlfopen(cinfo, "repodata/repomd.xml", 0, 0, 0, 0)) == 0)
            {
              printf(" no repomd.xml file, skipped\n");
              repo_free(repo, 1);
              cinfo->repo = 0;
              break;
            }
-         calc_checksum_fp(fp, REPOKEY_TYPE_SHA256, cookie);
-         if (usecachedrepo(repo, 0, cookie))
+         calc_checksum_fp(fp, REPOKEY_TYPE_SHA256, cinfo->cookie);
+         if (usecachedrepo(repo, 0, cinfo->cookie, 1))
            {
              printf(" cached\n");
               fclose(fp);
              break;
            }
-         sigfp = curlfopen(cinfo, "repodata/repomd.xml.asc", 0, 0, 0);
-#ifndef FEDORA
-         if (!sigfp)
+         if (cinfo->repo_gpgcheck && !downloadchecksig(cinfo, fp, "repodata/repomd.xml.asc", &sigpool))
            {
-             printf(" unsigned, skipped\n");
              fclose(fp);
              break;
            }
-#endif
-         if (sigfp)
+         if (repo_add_repomdxml(repo, fp, 0))
            {
-             if (!sigpool)
-               sigpool = read_sigs();
-             if (!checksig(sigpool, fp, sigfp))
-               {
-                 printf(" checksig failed, skipped\n");
-                 fclose(sigfp);
-                 fclose(fp);
-                 break;
-               }
-             fclose(sigfp);
+             printf("repomd.xml: %s\n", pool_errstr(pool));
+             fclose(fp);
+             break;    /* hopeless */
            }
-         repo_add_repomdxml(repo, fp, 0);
          fclose(fp);
-         printf(" reading\n");
+         printf(" fetching\n");
          filename = repomd_find(repo, "primary", &filechksum, &filechksumtype);
-         if (filename && (fp = curlfopen(cinfo, filename, iscompressed(filename), filechksum, filechksumtype)) != 0)
+         if (filename && (fp = curlfopen(cinfo, filename, iscompressed(filename), filechksum, filechksumtype, &badchecksum)) != 0)
            {
-             repo_add_rpmmd(repo, fp, 0, 0);
+             if (repo_add_rpmmd(repo, fp, 0, 0))
+               {
+                 printf("primary: %s\n", pool_errstr(pool));
+                 badchecksum = 1;
+               }
              fclose(fp);
            }
+         if (badchecksum)
+           break;      /* hopeless */
 
          filename = repomd_find(repo, "updateinfo", &filechksum, &filechksumtype);
-         if (filename && (fp = curlfopen(cinfo, filename, iscompressed(filename), filechksum, filechksumtype)) != 0)
+         if (filename && (fp = curlfopen(cinfo, filename, iscompressed(filename), filechksum, filechksumtype, &badchecksum)) != 0)
            {
-             repo_add_updateinfoxml(repo, fp, 0);
+             if (repo_add_updateinfoxml(repo, fp, 0))
+               {
+                 printf("updateinfo: %s\n", pool_errstr(pool));
+                 badchecksum = 1;
+               }
              fclose(fp);
            }
 
-         data = repo_last_repodata(repo);
+         data = repo_add_repodata(repo, 0);
          if (!repomd_add_ext(repo, data, "deltainfo"))
            repomd_add_ext(repo, data, "prestodelta");
          repomd_add_ext(repo, data, "filelists");
          repodata_internalize(data);
-         writecachedrepo(repo, data, 0, cookie);
-         repodata_create_stubs(data);
+         if (!badchecksum)
+           writecachedrepo(repo, 0, 0, cinfo->cookie);
+         repodata_create_stubs(repo_last_repodata(repo));
          break;
+#endif
 
+#ifdef ENABLE_SUSEREPO
         case TYPE_SUSETAGS:
          printf("susetags repo '%s':", cinfo->alias);
          fflush(stdout);
          descrdir = 0;
          defvendor = 0;
-         if ((fp = curlfopen(cinfo, "content", 0, 0, 0)) == 0)
+         if ((fp = curlfopen(cinfo, "content", 0, 0, 0, 0)) == 0)
            {
              printf(" no content file, skipped\n");
              repo_free(repo, 1);
              cinfo->repo = 0;
              break;
            }
-         calc_checksum_fp(fp, REPOKEY_TYPE_SHA256, cookie);
-         if (usecachedrepo(repo, 0, cookie))
+         calc_checksum_fp(fp, REPOKEY_TYPE_SHA256, cinfo->cookie);
+         if (usecachedrepo(repo, 0, cinfo->cookie, 1))
            {
              printf(" cached\n");
              fclose(fp);
              break;
            }
-         sigfp = curlfopen(cinfo, "content.asc", 0, 0, 0);
-         if (!sigfp)
+         if (cinfo->repo_gpgcheck && !downloadchecksig(cinfo, fp, "content.asc", &sigpool))
            {
-             printf(" unsigned, skipped\n");
              fclose(fp);
              break;
            }
-         if (sigfp)
+         if (repo_add_content(repo, fp, 0))
            {
-             if (!sigpool)
-               sigpool = read_sigs();
-             if (!checksig(sigpool, fp, sigfp))
-               {
-                 printf(" checksig failed, skipped\n");
-                 fclose(sigfp);
-                 fclose(fp);
-                 break;
-               }
-             fclose(sigfp);
+             printf("content: %s\n", pool_errstr(pool));
+             fclose(fp);
+             break;    /* hopeless */
            }
-         repo_add_content(repo, fp, 0);
          fclose(fp);
          defvendor = repo_lookup_id(repo, SOLVID_META, SUSETAGS_DEFAULTVENDOR);
          descrdir = repo_lookup_str(repo, SOLVID_META, SUSETAGS_DESCRDIR);
@@ -1187,17 +1881,128 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos)
              printf(" no packages file entry, skipped\n");
              break;
            }
-         printf(" reading\n");
-         if ((fp = curlfopen(cinfo, pool_tmpjoin(pool, descrdir, "/", filename), iscompressed(filename), filechksum, filechksumtype)) == 0)
-           break;
-         repo_add_susetags(repo, fp, defvendor, 0, 0);
+         printf(" fetching\n");
+         if ((fp = curlfopen(cinfo, pool_tmpjoin(pool, descrdir, "/", filename), iscompressed(filename), filechksum, filechksumtype, &badchecksum)) == 0)
+           break;      /* hopeless */
+         if (repo_add_susetags(repo, fp, defvendor, 0, REPO_NO_INTERNALIZE|SUSETAGS_RECORD_SHARES))
+           {
+             printf("packages: %s\n", pool_errstr(pool));
+             fclose(fp);
+             break;    /* hopeless */
+           }
          fclose(fp);
-         data = repo_last_repodata(repo);
+         /* add default language */
+         filename = susetags_find(repo, "packages.en.gz", &filechksum, &filechksumtype);
+          if (!filename)
+           filename = susetags_find(repo, "packages.en", &filechksum, &filechksumtype);
+         if (filename)
+           {
+             if ((fp = curlfopen(cinfo, pool_tmpjoin(pool, descrdir, "/", filename), iscompressed(filename), filechksum, filechksumtype, &badchecksum)) != 0)
+               {
+                 if (repo_add_susetags(repo, fp, defvendor, 0, REPO_NO_INTERNALIZE|REPO_REUSE_REPODATA|REPO_EXTEND_SOLVABLES))
+                   {
+                     printf("packages.en: %s\n", pool_errstr(pool));
+                     badchecksum = 1;
+                   }
+                 fclose(fp);
+               }
+           }
+         filename = susetags_find(repo, "patterns", &filechksum, &filechksumtype);
+         if (filename)
+           {
+             if ((fp = curlfopen(cinfo, pool_tmpjoin(pool, descrdir, "/", filename), iscompressed(filename), filechksum, filechksumtype, &badchecksum)) != 0)
+               {
+                 char pbuf[256];
+                 while (fgets(pbuf, sizeof(pbuf), fp))
+                   {
+                     int l = strlen(pbuf);
+                     FILE *fp2;
+                     if (l && pbuf[l - 1] == '\n')
+                       pbuf[--l] = 0;
+                     if (!*pbuf || *pbuf == '.' || strchr(pbuf, '/') != 0)
+                       continue;
+                     filename = susetags_find(repo, pbuf, &filechksum, &filechksumtype);
+                     if (filename && (fp2 = curlfopen(cinfo, pool_tmpjoin(pool, descrdir, "/", filename), iscompressed(filename), filechksum, filechksumtype, &badchecksum)) != 0)
+                       {
+                         if (repo_add_susetags(repo, fp2, defvendor, 0, REPO_NO_INTERNALIZE))
+                           {
+                             printf("%s: %s\n", pbuf, pool_errstr(pool));
+                             badchecksum = 1;
+                           }
+                         fclose(fp2);
+                       }
+                   }
+                 fclose(fp);
+               }
+           }
+          repo_internalize(repo);
+         data = repo_add_repodata(repo, 0);
          susetags_add_ext(repo, data);
          repodata_internalize(data);
-         writecachedrepo(repo, data, 0, cookie);
-         repodata_create_stubs(data);
+         if (!badchecksum)
+           writecachedrepo(repo, 0, 0, cinfo->cookie);
+         repodata_create_stubs(repo_last_repodata(repo));
+         break;
+#endif
+
+#if defined(ENABLE_DEBIAN)
+        case TYPE_DEBIAN:
+         printf("debian repo '%s':", cinfo->alias);
+         fflush(stdout);
+         filename = solv_dupjoin("dists/", cinfo->name, "/Release");
+         if ((fpr = curlfopen(cinfo, filename, 0, 0, 0, 0)) == 0)
+           {
+             printf(" no Release file, skipped\n");
+             repo_free(repo, 1);
+             cinfo->repo = 0;
+             free((char *)filename);
+             break;
+           }
+         solv_free((char *)filename);
+         if (cinfo->repo_gpgcheck)
+           {
+             filename = solv_dupjoin("dists/", cinfo->name, "/Release.gpg");
+             if (!downloadchecksig(cinfo, fp, filename, &sigpool))
+               {
+                 fclose(fpr);
+                 solv_free((char *)filename);
+                 break;
+               }
+             solv_free((char *)filename);
+           }
+         calc_checksum_fp(fpr, REPOKEY_TYPE_SHA256, cinfo->cookie);
+         if (usecachedrepo(repo, 0, cinfo->cookie, 1))
+           {
+             printf(" cached\n");
+              fclose(fpr);
+             break;
+           }
+         printf(" fetching\n");
+          for (j = 0; j < cinfo->ncomponents; j++)
+           {
+             if (!(filename = debian_find_component(cinfo, fpr, cinfo->components[j], &filechksum, &filechksumtype)))
+               {
+                 printf("[component %s not found]\n", cinfo->components[j]);
+                 continue;
+               }
+             if ((fp = curlfopen(cinfo, filename, iscompressed(filename), filechksum, filechksumtype, &badchecksum)) != 0)
+               {
+                 if (repo_add_debpackages(repo, fp, 0))
+                   {
+                     printf("component %s: %s\n", cinfo->components[j], pool_errstr(pool));
+                     badchecksum = 1;
+                   }
+                 fclose(fp);
+               }
+             solv_free((char *)filechksum);
+             solv_free((char *)filename);
+           }
+         fclose(fpr);
+         if (!badchecksum)
+           writecachedrepo(repo, 0, 0, cinfo->cookie);
          break;
+#endif
+
        default:
          printf("unsupported repo '%s': skipped\n", cinfo->alias);
          repo_free(repo, 1);
@@ -1216,7 +2021,7 @@ str2archid(Pool *pool, char *arch)
   Id id;
   if (!*arch)
     return 0;
-  id = str2id(pool, arch, 0);
+  id = pool_str2id(pool, arch, 0);
   if (id == ARCH_SRC || id == ARCH_NOSRC || id == ARCH_NOARCH)
     return id;
   if (pool->id2arch && (id > pool->lastarch || !pool->id2arch[id]))
@@ -1224,11 +2029,16 @@ str2archid(Pool *pool, char *arch)
   return id;
 }
 
+
+#define DEPGLOB_NAME     1
+#define DEPGLOB_DEP      2
+#define DEPGLOB_NAMEDEP  3
+
 int
-depglob(Pool *pool, char *name, Queue *job)
+depglob(Pool *pool, char *name, Queue *job, int what)
 {
   Id p, pp;
-  Id id = str2id(pool, name, 0);
+  Id id = pool_str2id(pool, name, 0);
   int i, match = 0;
 
   if (id)
@@ -1237,7 +2047,7 @@ depglob(Pool *pool, char *name, Queue *job)
        {
          Solvable *s = pool->solvables + p;
          match = 1;
-         if (s->name == id)
+         if (s->name == id && (what & DEPGLOB_NAME) != 0)
            {
              queue_push2(job, SOLVER_SOLVABLE_NAME, id);
              return 1;
@@ -1245,7 +2055,8 @@ depglob(Pool *pool, char *name, Queue *job)
        }
       if (match)
        {
-         printf("[using capability match for '%s']\n", name);
+         if (what == DEPGLOB_NAMEDEP)
+           printf("[using capability match for '%s']\n", name);
          queue_push2(job, SOLVER_SOLVABLE_PROVIDES, id);
          return 1;
        }
@@ -1254,141 +2065,153 @@ depglob(Pool *pool, char *name, Queue *job)
   if (strpbrk(name, "[*?") == 0)
     return 0;
 
-  /* looks like a name glob. hard work. */
-  for (p = 1; p < pool->nsolvables; p++)
+  if ((what & DEPGLOB_NAME) != 0)
     {
-      Solvable *s = pool->solvables + p;
-      if (!s->repo || !pool_installable(pool, s))
-       continue;
-      id = s->name;
-      if (fnmatch(name, id2str(pool, id), 0) == 0)
+      /* looks like a name glob. hard work. */
+      for (p = 1; p < pool->nsolvables; p++)
        {
-         for (i = 0; i < job->count; i += 2)
-           if (job->elements[i] == SOLVER_SOLVABLE_NAME && job->elements[i + 1] == id)
-             break;
-         if (i == job->count)
-           queue_push2(job, SOLVER_SOLVABLE_NAME, id);
-         match = 1;
+         Solvable *s = pool->solvables + p;
+         if (!s->repo || !pool_installable(pool, s))
+           continue;
+         id = s->name;
+         if (fnmatch(name, pool_id2str(pool, id), 0) == 0)
+           {
+             for (i = 0; i < job->count; i += 2)
+               if (job->elements[i] == SOLVER_SOLVABLE_NAME && job->elements[i + 1] == id)
+                 break;
+             if (i == job->count)
+               queue_push2(job, SOLVER_SOLVABLE_NAME, id);
+             match = 1;
+           }
        }
+      if (match)
+       return 1;
     }
-  if (match)
-    return 1;
-  /* looks like a dep glob. really hard work. */
-  for (id = 1; id < pool->ss.nstrings; id++)
+  if ((what & DEPGLOB_DEP))
     {
-      if (!pool->whatprovides[id])
-       continue;
-      if (fnmatch(name, id2str(pool, id), 0) == 0)
+      /* looks like a dep glob. really hard work. */
+      for (id = 1; id < pool->ss.nstrings; id++)
        {
-         if (!match)
-           printf("[using capability match for '%s']\n", name);
-         for (i = 0; i < job->count; i += 2)
-           if (job->elements[i] == SOLVER_SOLVABLE_PROVIDES && job->elements[i + 1] == id)
-             break;
-         if (i == job->count)
-           queue_push2(job, SOLVER_SOLVABLE_PROVIDES, id);
-         match = 1;
+         if (!pool->whatprovides[id])
+           continue;
+         if (fnmatch(name, pool_id2str(pool, id), 0) == 0)
+           {
+             if (!match && what == DEPGLOB_NAMEDEP)
+               printf("[using capability match for '%s']\n", name);
+             for (i = 0; i < job->count; i += 2)
+               if (job->elements[i] == SOLVER_SOLVABLE_PROVIDES && job->elements[i + 1] == id)
+                 break;
+             if (i == job->count)
+               queue_push2(job, SOLVER_SOLVABLE_PROVIDES, id);
+             match = 1;
+           }
        }
+      if (match)
+       return 1;
     }
-  if (match)
-    return 1;
   return 0;
 }
 
-void
-addrelation(Pool *pool, Queue *job, int flags, Id evr)
+int
+limitrelation(Pool *pool, Queue *job, int flags, Id evr)
 {
-  int i;
-  for (i = 0; i < job->count; i += 2)
+  int i, j;
+  Id p, pp;
+  for (i = j = 0; i < job->count; i += 2)
     {
-      if (job->elements[i] != SOLVER_SOLVABLE_NAME && job->elements[i] != SOLVER_SOLVABLE_PROVIDES)
-       continue;
-      job->elements[i + 1] = rel2id(pool, job->elements[i + 1], evr, flags, 1);
+      Id select = job->elements[i] & SOLVER_SELECTMASK;
+      if (select != SOLVER_SOLVABLE_NAME && select != SOLVER_SOLVABLE_PROVIDES)
+       {
+         fprintf(stderr, "limitrelation only works on name/provides jobs\n");
+         exit(1);
+       }
+      job->elements[i + 1] = pool_rel2id(pool, job->elements[i + 1], evr, flags, 1);
+      if (flags == REL_ARCH)
+       job->elements[i] |= SOLVER_SETARCH;
+      if (flags == REL_EQ && select == SOLVER_SOLVABLE_NAME && job->elements[i])
+       {
+#ifndef DEBIAN
+         const char *evrstr = pool_id2str(pool, evr);
+         if (!strchr(evrstr, '-'))
+           job->elements[i] |= SOLVER_SETEV;
+         else
+#endif
+           job->elements[i] |= SOLVER_SETEVR;
+       }
+      /* make sure we still have matches */
+      FOR_JOB_SELECT(p, pp, job->elements[i], job->elements[i + 1])
+       break;
+      if (p)
+       {
+         job->elements[j] = job->elements[i];
+         job->elements[j + 1] = job->elements[i + 1];
+         j += 2;
+       }
     }
+  queue_truncate(job, j);
+  return j / 2;
+}
+
+int
+limitrelation_arch(Pool *pool, Queue *job, int flags, char *evr)
+{
+  char *r;
+  Id archid;
+  if ((r = strrchr(evr, '.')) != 0 && r[1] && (archid = str2archid(pool, r + 1)) != 0)
+    {
+      *r = 0;
+      limitrelation(pool, job, REL_ARCH, archid);
+      limitrelation(pool, job, flags, pool_str2id(pool, evr, 1));
+      *r = '.';
+    }
+  else
+    limitrelation(pool, job, flags, pool_str2id(pool, evr, 1));
+  return job->count / 2;
 }
 
 int
-limitevr(Pool *pool, char *evr, Queue *job, Id archid)
+limitrepo(Pool *pool, Id repofilter, Queue *job)
 {
   Queue mq;
-  Id p, pp, evrid;
-  int matched = 0;
+  Id p, pp;
   int i, j;
   Solvable *s;
 
   queue_init(&mq);
-  for (i = 0; i < job->count; i += 2)
+  for (i = j = 0; i < job->count; i += 2)
     {
       queue_empty(&mq);
       FOR_JOB_SELECT(p, pp, job->elements[i], job->elements[i + 1])
        {
          s = pool_id2solvable(pool, p);
-         if (archid && s->arch != archid)
-           continue;
-         if (evrcmp_str(pool, id2str(pool, s->evr), evr, EVRCMP_MATCH) == 0)
+         if (s->repo && s->repo->repoid == repofilter)
             queue_push(&mq, p);
        }
       if (mq.count)
        {
-         if (!matched && i)
-           {
-             queue_deleten(job, 0, i);
-             i = 0;
-           }
-         matched = 1;
-         /* if all solvables have the same evr */
-         s = pool_id2solvable(pool, mq.elements[0]);
-         evrid = s->evr;
-         for (j = 0; j < mq.count; j++)
-           {
-             s = pool_id2solvable(pool, mq.elements[j]);
-             if (s->evr != evrid)
-               break;
-           }
-         if (j == mq.count && j > 1)
-           {
-             prune_to_best_arch(pool, &mq);
-             // prune_to_highest_prio(pool, &mq);
-             mq.count = 1;
-           }
-         if (mq.count > 1)
+         /* here we assume that repo == vendor, so we also set SOLVER_SETVENDOR */
+         Id flags = (job->elements[i] & SOLVER_SETMASK) | SOLVER_SETVENDOR | SOLVER_SETREPO;
+         if ((job->elements[i] & SOLVER_SELECTMASK) == SOLVER_SOLVABLE_NAME)
+           flags |= SOLVER_SETNAME;
+         if (mq.count == 1)
            {
-             job->elements[i] = SOLVER_SOLVABLE_ONE_OF;
-             job->elements[i + 1] = pool_queuetowhatprovides(pool, &mq);
+             job->elements[j] = SOLVER_SOLVABLE | SOLVER_NOAUTOSET | flags;
+             job->elements[j + 1] = mq.elements[0];
            }
          else
            {
-             job->elements[i] = SOLVER_SOLVABLE;
-             job->elements[i + 1] = mq.elements[0];
+             job->elements[j] = SOLVER_SOLVABLE_ONE_OF | flags;
+             job->elements[j + 1] = pool_queuetowhatprovides(pool, &mq);
            }
-       }
-      else if (matched)
-       {
-         queue_deleten(job, i, 2);
-         i -= 2;
+         j += 2;
        }
     }
+  queue_truncate(job, j);
   queue_free(&mq);
-  if (matched)
-    return 1;
-  if (!archid)
-    {
-      char *r;
-      if ((r = strrchr(evr, '.')) != 0 && r[1] && (archid = str2archid(pool, r + 1)) != 0)
-       {
-         *r = 0;
-         if (limitevr(pool, evr, job, archid))
-           {
-             *r = '.';
-             return 1;
-           }
-         *r = '.';
-       }
-    }
-  return 0;
+  return j / 2;
 }
 
-void
+int
 mkselect(Pool *pool, int mode, char *name, Queue *job)
 {
   char *r, *r2;
@@ -1397,11 +2220,10 @@ mkselect(Pool *pool, int mode, char *name, Queue *job)
   if (*name == '/')
     {
       Dataiterator di;
+      int type = strpbrk(name, "[*?") == 0 ? SEARCH_STRING : SEARCH_GLOB;
       Queue q;
-      int match = 0;
-
       queue_init(&q);
-      dataiterator_init(&di, pool, mode == SOLVER_ERASE ? pool->installed : 0, 0, SOLVABLE_FILELIST, name, SEARCH_STRING|SEARCH_FILES|SEARCH_COMPLETE_FILELIST);
+      dataiterator_init(&di, pool, mode == SOLVER_ERASE ? pool->installed : 0, 0, SOLVABLE_FILELIST, name, type|SEARCH_FILES|SEARCH_COMPLETE_FILELIST);
       while (dataiterator_step(&di))
        {
          Solvable *s = pool->solvables + di.solvid;
@@ -1414,24 +2236,23 @@ mkselect(Pool *pool, int mode, char *name, Queue *job)
       if (q.count)
        {
          printf("[using file list match for '%s']\n", name);
-         match = 1;
          if (q.count > 1)
            queue_push2(job, SOLVER_SOLVABLE_ONE_OF, pool_queuetowhatprovides(pool, &q));
          else
-           queue_push2(job, SOLVER_SOLVABLE, q.elements[0]);
+           queue_push2(job, SOLVER_SOLVABLE | SOLVER_NOAUTOSET, q.elements[0]);
+         queue_free(&q);
+         return job->count / 2;
        }
-      queue_free(&q);
-      if (match)
-       return;
     }
   if ((r = strpbrk(name, "<=>")) != 0)
     {
       /* relation case, support:
        * depglob rel
-       * depglob.rpm rel
+       * depglob.arch rel
        */
       int rflags = 0;
       int nend = r - name;
+      char oldnend;
       for (; *r; r++)
        {
          if (*r == '<')
@@ -1447,79 +2268,84 @@ mkselect(Pool *pool, int mode, char *name, Queue *job)
        r++;
       while (nend && (name[nend - 1] == ' ' || name[nend -1 ] == '\t'))
        nend--;
-      name[nend] = 0;
       if (!*name || !*r)
        {
          fprintf(stderr, "bad relation\n");
          exit(1);
        }
-      if (depglob(pool, name, job))
+      oldnend = name[nend];
+      name[nend] = 0;
+      if (depglob(pool, name, job, DEPGLOB_NAMEDEP))
        {
-         addrelation(pool, job, rflags, str2id(pool, r, 1));
-         return;
+         name[nend] = oldnend;
+         limitrelation(pool, job, rflags, pool_str2id(pool, r, 1));
+         return job->count / 2;
        }
       if ((r2 = strrchr(name, '.')) != 0 && r2[1] && (archid = str2archid(pool, r2 + 1)) != 0)
        {
          *r2 = 0;
-         if (depglob(pool, name, job))
+         if (depglob(pool, name, job, DEPGLOB_NAMEDEP))
            {
+             name[nend] = oldnend;
              *r2 = '.';
-             addrelation(pool, job, REL_ARCH, archid);
-             addrelation(pool, job, rflags, str2id(pool, r, 1));
-             return;
+             limitrelation(pool, job, REL_ARCH, archid);
+             limitrelation(pool, job, rflags, pool_str2id(pool, r, 1));
+             return job->count / 2;
            }
          *r2 = '.';
        }
+      name[nend] = oldnend;
     }
   else
     {
       /* no relation case, support:
        * depglob
        * depglob.arch
-       * depglob-version-release
-       * depglob-version-release.arch
+       * nameglob-version
+       * nameglob-version.arch
+       * nameglob-version-release
+       * nameglob-version-release.arch
        */
-      if (depglob(pool, name, job))
-       return;
-      archid = 0;
+      if (depglob(pool, name, job, DEPGLOB_NAMEDEP))
+       return job->count / 2;
       if ((r = strrchr(name, '.')) != 0 && r[1] && (archid = str2archid(pool, r + 1)) != 0)
        {
          *r = 0;
-         if (depglob(pool, name, job))
+         if (depglob(pool, name, job, DEPGLOB_NAMEDEP))
            {
              *r = '.';
-             addrelation(pool, job, REL_ARCH, archid);
-             return;
+             limitrelation(pool, job, REL_ARCH, archid);
+             return job->count / 2;
            }
          *r = '.';
        }
       if ((r = strrchr(name, '-')) != 0)
        {
          *r = 0;
-         if (depglob(pool, name, job))
+         if (depglob(pool, name, job, DEPGLOB_NAME))
            {
              /* have just the version */
+             limitrelation_arch(pool, job, REL_EQ, r + 1);
              *r = '-';
-             if (limitevr(pool, r + 1, job, 0))
-               return;
+             return job->count / 2;
            }
          if ((r2 = strrchr(name, '-')) != 0)
            {
              *r = '-';
              *r2 = 0;
-             if (depglob(pool, name, job))
+             r = r2;
+             if (depglob(pool, name, job, DEPGLOB_NAME))
                {
-                 *r2 = '-';
-                 if (limitevr(pool, r2 + 1, job, 0))
-                   return;
+                 /* have version-release */
+                 limitrelation_arch(pool, job, REL_EQ, r + 1);
+                 *r = '-';
+                 return job->count / 2;
                }
-             *r2 = '-';
            }
          *r = '-';
        }
     }
-  fprintf(stderr, "nothing matches '%s'\n", name);
-  exit(1);
+  return 0;
 }
 
 
@@ -1550,6 +2376,8 @@ yesno(const char *str)
     }
 }
 
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
+
 struct fcstate {
   FILE **newpkgsfps;
   Queue *checkq;
@@ -1558,7 +2386,7 @@ struct fcstate {
 };
 
 static void *
-fc_cb(Pool *pool, Id p, void *cbdata)
+fileconflict_cb(Pool *pool, Id p, void *cbdata)
 {
   struct fcstate *fcstate = cbdata;
   Solvable *s;
@@ -1590,11 +2418,12 @@ fc_cb(Pool *pool, Id p, void *cbdata)
   if (!fp)
     return 0;
   rewind(fp);
-  return rpm_byfp(fp, solvable2str(pool, s), &fcstate->rpmdbstate);
+  return rpm_byfp(fp, pool_solvable2str(pool, s), &fcstate->rpmdbstate);
 }
 
+
 void
-runrpm(const char *arg, const char *name, int dupfd3)
+runrpm(const char *arg, const char *name, int dupfd3, const char *rootdir)
 {
   pid_t pid;
   int status;
@@ -1606,6 +2435,8 @@ runrpm(const char *arg, const char *name, int dupfd3)
     }
   if (pid == 0)
     {
+      if (!rootdir)
+       rootdir = "/";
       if (dupfd3 != -1 && dupfd3 != 3)
        {
          dup2(dupfd3, 3);
@@ -1614,47 +2445,285 @@ runrpm(const char *arg, const char *name, int dupfd3)
       if (dupfd3 != -1)
        fcntl(3, F_SETFD, 0);   /* clear CLOEXEC */
       if (strcmp(arg, "-e") == 0)
-        execlp("rpm", "rpm", arg, "--nodeps", "--nodigest", "--nosignature", name, (char *)0);
+        execlp("rpm", "rpm", arg, "--nodeps", "--nodigest", "--nosignature", "--root", rootdir, name, (char *)0);
+      else
+        execlp("rpm", "rpm", arg, "--force", "--nodeps", "--nodigest", "--nosignature", "--root", rootdir, name, (char *)0);
+      perror("rpm");
+      _exit(0);
+    }
+  while (waitpid(pid, &status, 0) != pid)
+    ;
+  if (status)
+    {
+      printf("rpm failed\n");
+      exit(1);
+    }
+}
+
+#endif
+
+#if defined(ENABLE_DEBIAN) && defined(DEBIAN)
+
+void
+rundpkg(const char *arg, const char *name, int dupfd3, const char *rootdir)
+{
+  pid_t pid;
+  int status;
+
+  if ((pid = fork()) == (pid_t)-1)
+    {
+      perror("fork");
+      exit(1);
+    }
+  if (pid == 0)
+    {
+      if (!rootdir)
+       rootdir = "/";
+      if (dupfd3 != -1 && dupfd3 != 3)
+       {
+         dup2(dupfd3, 3);
+         close(dupfd3);
+       }
+      if (dupfd3 != -1)
+       fcntl(3, F_SETFD, 0);   /* clear CLOEXEC */
+      if (strcmp(arg, "--install") == 0)
+        execlp("dpkg", "dpkg", "--install", "--root", rootdir, "--force", "all", name, (char *)0);
       else
-        execlp("rpm", "rpm", arg, "--force", "--nodeps", "--nodigest", "--nosignature", name, (char *)0);
-      perror("rpm");
+        execlp("dpkg", "dpkg", "--remove", "--root", rootdir, "--force", "all", name, (char *)0);
+      perror("dpkg");
       _exit(0);
     }
   while (waitpid(pid, &status, 0) != pid)
     ;
   if (status)
     {
-      printf("rpm failed\n");
+      printf("dpkg failed\n");
       exit(1);
     }
 }
 
+#endif
+
 static Id
 nscallback(Pool *pool, void *data, Id name, Id evr)
 {
   if (name == NAMESPACE_PRODUCTBUDDY)
-    {    
+    {
       /* SUSE specific hack: each product has an associated rpm */
-      Solvable *s = pool->solvables + evr; 
-      Id p, pp, cap; 
-      
-      cap = str2id(pool, pool_tmpjoin(pool, "product(", id2str(pool, s->name) + 8, ")"), 0);
+      Solvable *s = pool->solvables + evr;
+      Id p, pp, cap;
+      Id bestp = 0;
+
+      cap = pool_str2id(pool, pool_tmpjoin(pool, "product(", pool_id2str(pool, s->name) + 8, ")"), 0);
       if (!cap)
         return 0;
-      cap = rel2id(pool, cap, s->evr, REL_EQ, 0);
+      cap = pool_rel2id(pool, cap, s->evr, REL_EQ, 0);
       if (!cap)
         return 0;
-      FOR_PROVIDES(p, pp, cap) 
+      FOR_PROVIDES(p, pp, cap)
         {
-          Solvable *ps = pool->solvables + p; 
+          Solvable *ps = pool->solvables + p;
           if (ps->repo == s->repo && ps->arch == s->arch)
-            break;
+            if (!bestp || pool_evrcmp(pool, pool->solvables[bestp].evr, ps->evr, EVRCMP_COMPARE) < 0)
+             bestp = p;
         }
-      return p;
+      return bestp;
     }
   return 0;
 }
 
+#ifdef SOFTLOCKS_PATH
+
+void
+addsoftlocks(Pool *pool, Queue *job)
+{
+  FILE *fp;
+  Id type, id, p, pp;
+  char *bp, *ep, buf[4096];
+
+  if ((fp = fopen(SOFTLOCKS_PATH, "r")) == 0)
+    return;
+  while((bp = fgets(buf, sizeof(buf), fp)) != 0)
+    {
+      while (*bp == ' ' || *bp == '\t')
+       bp++;
+      if (!*bp || *bp == '#')
+       continue;
+      for (ep = bp; *ep; ep++)
+       if (*ep == ' ' || *ep == '\t' || *ep == '\n')
+         break;
+      *ep = 0;
+      type = SOLVER_SOLVABLE_NAME;
+      if (!strncmp(bp, "provides:", 9) && bp[9])
+       {
+         type = SOLVER_SOLVABLE_PROVIDES;
+         bp += 9;
+       }
+      id = pool_str2id(pool, bp, 1);
+      if (pool->installed)
+       {
+         FOR_JOB_SELECT(p, pp, type, id)
+           if (pool->solvables[p].repo == pool->installed)
+             break;
+         if (p)
+           continue;   /* ignore, as it is already installed */
+       }
+      queue_push2(job, SOLVER_LOCK|SOLVER_WEAK|type, id);
+    }
+  fclose(fp);
+}
+
+#endif
+
+
+void
+rewrite_repos(Pool *pool, Queue *addedfileprovides, Queue *addedfileprovides_inst)
+{
+  Repo *repo;
+  Repodata *data;
+  Map providedids;
+  Queue fileprovidesq;
+  int i, j, n;
+  struct repoinfo *cinfo;
+
+  map_init(&providedids, pool->ss.nstrings);
+  queue_init(&fileprovidesq);
+  for (i = 0; i < addedfileprovides->count; i++)
+    MAPSET(&providedids, addedfileprovides->elements[i]);
+  FOR_REPOS(i, repo)
+    {
+      /* make sure all repodatas but the first are extensions */
+      if (repo->nrepodata < 2)
+       continue;
+      data = repo_id2repodata(repo, 1);
+      if (data->loadcallback)
+        continue;
+      for (j = 2; j < repo->nrepodata; j++)
+       {
+         Repodata *edata = repo_id2repodata(repo, j);
+         if (!edata->loadcallback)
+           break;
+       }
+      if (j < repo->nrepodata)
+       continue;       /* found a non-externsion repodata, can't rewrite  */
+      if (repodata_lookup_idarray(data, SOLVID_META, REPOSITORY_ADDEDFILEPROVIDES, &fileprovidesq))
+       {
+         if (repo == pool->installed && addedfileprovides_inst)
+           {
+             for (j = 0; j < addedfileprovides->count; j++)
+               MAPCLR(&providedids, addedfileprovides->elements[j]);
+             for (j = 0; j < addedfileprovides_inst->count; j++)
+               MAPSET(&providedids, addedfileprovides_inst->elements[j]);
+           }
+         n = 0;
+         for (j = 0; j < fileprovidesq.count; j++)
+           if (MAPTST(&providedids, fileprovidesq.elements[j]))
+             n++;
+         if (repo == pool->installed && addedfileprovides_inst)
+           {
+             for (j = 0; j < addedfileprovides_inst->count; j++)
+               MAPCLR(&providedids, addedfileprovides_inst->elements[j]);
+             for (j = 0; j < addedfileprovides->count; j++)
+               MAPSET(&providedids, addedfileprovides->elements[j]);
+             if (n == addedfileprovides_inst->count)
+               continue;       /* nothing new added */
+           }
+         else if (n == addedfileprovides->count)
+           continue;   /* nothing new added */
+       }
+      repodata_set_idarray(data, SOLVID_META, REPOSITORY_ADDEDFILEPROVIDES, repo == pool->installed && addedfileprovides_inst ? addedfileprovides_inst : addedfileprovides);
+      repodata_internalize(data);
+      cinfo = repo->appdata;
+      writecachedrepo(repo, data, 0, cinfo ? cinfo->cookie : installedcookie);
+    }
+  queue_free(&fileprovidesq);
+  map_free(&providedids);
+}
+
+static void
+select_patches(Pool *pool, Queue *job)
+{
+  Id p, pp;
+  int pruneyou = 0;
+  Map installedmap, noobsmap;
+  Solvable *s;
+
+  map_init(&noobsmap, 0);
+  map_init(&installedmap, pool->nsolvables);
+  solver_calculate_noobsmap(pool, job, &noobsmap);
+  if (pool->installed)
+    FOR_REPO_SOLVABLES(pool->installed, p, s)
+      MAPSET(&installedmap, p);
+
+  /* install all patches */
+  for (p = 1; p < pool->nsolvables; p++)
+    {
+      const char *type;
+      int r;
+      Id p2;
+
+      s = pool->solvables + p;
+      if (strncmp(pool_id2str(pool, s->name), "patch:", 6) != 0)
+       continue;
+      FOR_PROVIDES(p2, pp, s->name)
+       {
+         Solvable *s2 = pool->solvables + p2;
+         if (s2->name != s->name)
+           continue;
+         r = pool_evrcmp(pool, s->evr, s2->evr, EVRCMP_COMPARE);
+         if (r < 0 || (r == 0 && p > p2))
+           break;
+       }
+      if (p2)
+       continue;
+      type = solvable_lookup_str(s, SOLVABLE_PATCHCATEGORY);
+      if (type && !strcmp(type, "optional"))
+       continue;
+      r = solvable_trivial_installable_map(s, &installedmap, 0, &noobsmap);
+      if (r == -1)
+       continue;
+      if (solvable_lookup_bool(s, UPDATE_RESTART) && r == 0)
+       {
+         if (!pruneyou++)
+           queue_empty(job);
+       }
+      else if (pruneyou)
+       continue;
+      queue_push2(job, SOLVER_SOLVABLE, p);
+    }
+  map_free(&installedmap);
+  map_free(&noobsmap);
+}
+
+#define MODE_LIST        0
+#define MODE_INSTALL     1
+#define MODE_ERASE       2
+#define MODE_UPDATE      3
+#define MODE_DISTUPGRADE 4
+#define MODE_VERIFY      5
+#define MODE_PATCH       6
+#define MODE_INFO        7
+#define MODE_REPOLIST    8
+#define MODE_SEARCH     9
+
+void
+usage(int r)
+{
+  fprintf(stderr, "Usage: solv COMMAND <select>\n");
+  fprintf(stderr, "\n");
+  fprintf(stderr, "    dist-upgrade: replace installed packages with\n");
+  fprintf(stderr, "                  versions from the repositories\n");
+  fprintf(stderr, "    erase:        erase installed packages\n");
+  fprintf(stderr, "    info:         display package information\n");
+  fprintf(stderr, "    install:      install packages\n");
+  fprintf(stderr, "    list:         list packages\n");
+  fprintf(stderr, "    repos:        list enabled repositories\n");
+  fprintf(stderr, "    search:       search name/summary/description\n");
+  fprintf(stderr, "    update:       update installed packages\n");
+  fprintf(stderr, "    verify:       check dependencies of installed packages\n");
+  fprintf(stderr, "\n");
+  exit(r);
+}
 
 int
 main(int argc, char **argv)
@@ -1665,75 +2734,234 @@ main(int argc, char **argv)
   Id p, pp;
   struct repoinfo *repoinfos;
   int nrepoinfos = 0;
-  int i, mode, newpkgs;
+  int mainmode = 0, mode = 0;
+  int i, newpkgs;
   Queue job, checkq;
   Solver *solv = 0;
   Transaction *trans;
   char inbuf[128], *ip;
-  int updateall = 0;
-  int distupgrade = 0;
-  int patchmode = 0;
+  int allpkgs = 0;
   FILE **newpkgsfps;
-  struct fcstate fcstate;
+  Queue addedfileprovides;
+  Queue addedfileprovides_inst;
+  Id repofilter = 0;
+  int cleandeps = 0;
+  char *rootdir = 0;
 
   argc--;
   argv++;
   if (!argv[0])
+    usage(1);
+  if (!strcmp(argv[0], "install") || !strcmp(argv[0], "in"))
     {
-      fprintf(stderr, "Usage: solv install|erase|update|show <select>\n");
-      exit(1);
+      mainmode = MODE_INSTALL;
+      mode = SOLVER_INSTALL;
     }
-  if (!strcmp(argv[0], "install") || !strcmp(argv[0], "in"))
-    mode = SOLVER_INSTALL;
   else if (!strcmp(argv[0], "patch"))
     {
-      mode = SOLVER_UPDATE;
-      patchmode = 1;
+      mainmode = MODE_PATCH;
+      mode = SOLVER_INSTALL;
     }
   else if (!strcmp(argv[0], "erase") || !strcmp(argv[0], "rm"))
-    mode = SOLVER_ERASE;
-  else if (!strcmp(argv[0], "show"))
-    mode = 0;
+    {
+      mainmode = MODE_ERASE;
+      mode = SOLVER_ERASE;
+    }
+  else if (!strcmp(argv[0], "list"))
+    {
+      mainmode = MODE_LIST;
+      mode = 0;
+    }
+  else if (!strcmp(argv[0], "info"))
+    {
+      mainmode = MODE_INFO;
+      mode = 0;
+    }
+  else if (!strcmp(argv[0], "search"))
+    {
+      mainmode = MODE_SEARCH;
+      mode = 0;
+    }
+  else if (!strcmp(argv[0], "verify"))
+    {
+      mainmode = MODE_VERIFY;
+      mode = SOLVER_VERIFY;
+    }
   else if (!strcmp(argv[0], "update") || !strcmp(argv[0], "up"))
-    mode = SOLVER_UPDATE;
+    {
+      mainmode = MODE_UPDATE;
+      mode = SOLVER_UPDATE;
+    }
   else if (!strcmp(argv[0], "dist-upgrade") || !strcmp(argv[0], "dup"))
     {
+      mainmode = MODE_DISTUPGRADE;
       mode = SOLVER_UPDATE;
-      distupgrade = 1;
+    }
+  else if (!strcmp(argv[0], "repos") || !strcmp(argv[0], "repolist") || !strcmp(argv[0], "lr"))
+    {
+      mainmode = MODE_REPOLIST;
+      mode = 0;
     }
   else
+    usage(1);
+
+  for (;;)
     {
-      fprintf(stderr, "Usage: solv install|erase|update|show <select>\n");
-      exit(1);
+      if (argc > 2 && !strcmp(argv[1], "--root"))
+       {
+         rootdir = argv[2];
+         argc -= 2;
+         argv += 2;
+       }
+
+      else if (argc > 1 && !strcmp(argv[1], "--clean"))
+       {
+         cleandeps = 1;
+         argc--;
+         argv++;
+       }
+      else
+       break;
     }
 
   pool = pool_create();
+  pool_set_rootdir(pool, rootdir);
+
+#if 0
+  {
+    const char *langs[] = {"de_DE", "de", "en"};
+    pool_set_languages(pool, langs, sizeof(langs)/sizeof(*langs));
+  }
+#endif
+
   pool_setloadcallback(pool, load_stub, 0);
   pool->nscallback = nscallback;
   // pool_setdebuglevel(pool, 2);
   setarch(pool);
-  repoinfos = read_repoinfos(pool, REPOINFO_PATH, &nrepoinfos);
+  repoinfos = read_repoinfos(pool, &nrepoinfos);
+
+  if (mainmode == MODE_REPOLIST)
+    {
+      int j = 1;
+      for (i = 0; i < nrepoinfos; i++)
+       {
+         struct repoinfo *cinfo = repoinfos + i;
+         if (!cinfo->enabled)
+           continue;
+         printf("%d: %-20s %s (prio %d)\n", j++, cinfo->alias, cinfo->name, cinfo->priority);
+       }
+      exit(0);
+    }
+
   read_repos(pool, repoinfos, nrepoinfos);
 
-  if (mode == 0 || mode == SOLVER_INSTALL)
+  if (argc > 2 && !strcmp(argv[1], "-r"))
+    {
+      const char *rname = argv[2], *rp;
+      for (rp = rname; *rp; rp++)
+       if (*rp <= '0' || *rp >= '9')
+         break;
+      if (!*rp)
+       {
+         /* repo specified by number */
+         int rnum = atoi(rname);
+         for (i = 0; i < nrepoinfos; i++)
+           {
+             struct repoinfo *cinfo = repoinfos + i;
+             if (!cinfo->enabled)
+               continue;
+             if (--rnum == 0)
+               repofilter = cinfo->repo->repoid;
+           }
+       }
+      else
+       {
+         /* repo specified by alias */
+         Repo *repo;
+         FOR_REPOS(i, repo)
+           {
+             if (!strcasecmp(rname, repo->name))
+               repofilter = repo->repoid;
+           }
+       }
+      if (!repofilter)
+       {
+         fprintf(stderr, "%s: no such repo\n", rname);
+         exit(1);
+       }
+      argc -= 2;
+      argv += 2;
+    }
+  if (mainmode == MODE_SEARCH)
+    {
+      Dataiterator di;
+      Map m;
+      if (argc != 2)
+       usage(1);
+      map_init(&m, pool->nsolvables);
+      dataiterator_init(&di, pool, 0, 0, 0, argv[1], SEARCH_SUBSTRING|SEARCH_NOCASE);
+      dataiterator_set_keyname(&di, SOLVABLE_NAME);
+      dataiterator_set_search(&di, 0, 0);
+      while (dataiterator_step(&di))
+       MAPSET(&m, di.solvid);
+      dataiterator_set_keyname(&di, SOLVABLE_SUMMARY);
+      dataiterator_set_search(&di, 0, 0);
+      while (dataiterator_step(&di))
+       MAPSET(&m, di.solvid);
+      dataiterator_set_keyname(&di, SOLVABLE_DESCRIPTION);
+      dataiterator_set_search(&di, 0, 0);
+      while (dataiterator_step(&di))
+       MAPSET(&m, di.solvid);
+      dataiterator_free(&di);
+
+      for (p = 1; p < pool->nsolvables; p++)
+       {
+         Solvable *s = pool_id2solvable(pool, p);
+         if (!MAPTST(&m, p))
+           continue;
+         printf("  - %s: %s\n", pool_solvable2str(pool, s), solvable_lookup_str(s, SOLVABLE_SUMMARY));
+       }
+      map_free(&m);
+      exit(0);
+    }
+
+
+  if (mainmode == MODE_LIST || mainmode == MODE_INSTALL)
     {
       for (i = 1; i < argc; i++)
        {
          int l;
           l = strlen(argv[i]);
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
          if (l <= 4 || strcmp(argv[i] + l - 4, ".rpm"))
            continue;
+#endif
+#if defined(ENABLE_DEBIAN) && defined(DEBIAN)
+         if (l <= 4 || strcmp(argv[i] + l - 4, ".deb"))
+           continue;
+#endif
          if (access(argv[i], R_OK))
            {
              perror(argv[i]);
              exit(1);
            }
          if (!commandlinepkgs)
-           commandlinepkgs = sat_calloc(argc, sizeof(Id));
+           commandlinepkgs = solv_calloc(argc, sizeof(Id));
          if (!commandlinerepo)
            commandlinerepo = repo_create(pool, "@commandline");
-         repo_add_rpms(commandlinerepo, (const char **)argv + i, 1, REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE);
-         commandlinepkgs[i] = commandlinerepo->end - 1;
+         p = 0;
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
+         p = repo_add_rpm(commandlinerepo, (const char *)argv[i], REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE);
+#endif
+#if defined(ENABLE_DEBIAN) && defined(DEBIAN)
+         p = repo_add_deb(commandlinerepo, (const char *)argv[i], REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE);
+#endif
+         if (!p)
+           {
+             fprintf(stderr, "could not add '%s'\n", argv[i]);
+             exit(1);
+           }
+         commandlinepkgs[i] = p;
        }
       if (commandlinerepo)
        repo_internalize(commandlinerepo);
@@ -1741,142 +2969,168 @@ main(int argc, char **argv)
 
   // FOR_REPOS(i, repo)
   //   printf("%s: %d solvables\n", repo->name, repo->nsolvables);
-  pool_addfileprovides(pool);
+  queue_init(&addedfileprovides);
+  queue_init(&addedfileprovides_inst);
+  pool_addfileprovides_queue(pool, &addedfileprovides, &addedfileprovides_inst);
+  if (addedfileprovides.count || addedfileprovides_inst.count)
+    rewrite_repos(pool, &addedfileprovides, &addedfileprovides_inst);
+  queue_free(&addedfileprovides);
+  queue_free(&addedfileprovides_inst);
   pool_createwhatprovides(pool);
 
   queue_init(&job);
   for (i = 1; i < argc; i++)
     {
+      Queue job2;
+      int j;
+
       if (commandlinepkgs && commandlinepkgs[i])
        {
          queue_push2(&job, SOLVER_SOLVABLE, commandlinepkgs[i]);
          continue;
        }
-      mkselect(pool, mode, argv[i], &job);
+      queue_init(&job2);
+      if (!mkselect(pool, mode, argv[i], &job2))
+       {
+         fprintf(stderr, "nothing matches '%s'\n", argv[i]);
+         exit(1);
+       }
+      if (repofilter && !limitrepo(pool, repofilter, &job2))
+        {
+         fprintf(stderr, "nothing in repo matches '%s'\n", argv[i]);
+         exit(1);
+        }
+      for (j = 0; j < job2.count; j++)
+       queue_push(&job, job2.elements[j]);
+      queue_free(&job2);
     }
-  if (!job.count && mode == SOLVER_UPDATE)
-    updateall = 1;
-  else if (!job.count)
+
+  if (!job.count && mainmode != MODE_UPDATE && mainmode != MODE_DISTUPGRADE && mainmode != MODE_VERIFY && mainmode != MODE_PATCH)
     {
       printf("no package matched\n");
       exit(1);
     }
 
-  if (!mode)
+  if (!job.count)
+    allpkgs = 1;
+
+  if (mainmode == MODE_LIST || mainmode == MODE_INFO)
     {
-      /* show mode, no solver needed */
+      /* list mode, no solver needed */
       for (i = 0; i < job.count; i += 2)
        {
-         FOR_JOB_SELECT(p, pp, job.elements[i], job.elements[i + 1])
+         Id how = job.elements[i] & SOLVER_SELECTMASK;
+         FOR_JOB_SELECT(p, pp, how, job.elements[i + 1])
            {
              Solvable *s = pool_id2solvable(pool, p);
-             const char *sum = solvable_lookup_str_lang(s, SOLVABLE_SUMMARY, "de");
-             printf("  - %s [%s]\n", solvable2str(pool, s), s->repo->name);
-             if (sum)
-                printf("    %s\n", sum);
+             if (mainmode == MODE_INFO)
+               {
+                 const char *str;
+                 printf("Name:        %s\n", pool_solvable2str(pool, s));
+                 printf("Repo:        %s\n", s->repo->name);
+                 printf("Summary:     %s\n", solvable_lookup_str(s, SOLVABLE_SUMMARY));
+                 str = solvable_lookup_str(s, SOLVABLE_URL);
+                 if (str)
+                   printf("Url:         %s\n", str);
+                 str = solvable_lookup_str(s, SOLVABLE_LICENSE);
+                 if (str)
+                   printf("License:     %s\n", str);
+                 printf("Description:\n%s\n", solvable_lookup_str(s, SOLVABLE_DESCRIPTION));
+                 printf("\n");
+               }
+             else
+               {
+#if 1
+                 const char *sum = solvable_lookup_str_lang(s, SOLVABLE_SUMMARY, "de", 1);
+#else
+                 const char *sum = solvable_lookup_str_poollang(s, SOLVABLE_SUMMARY);
+#endif
+                 printf("  - %s [%s]\n", pool_solvable2str(pool, s), s->repo->name);
+                 if (sum)
+                   printf("    %s\n", sum);
+               }
            }
        }
       queue_free(&job);
       pool_free(pool);
       free_repoinfos(repoinfos, nrepoinfos);
-      sat_free(commandlinepkgs);
+      solv_free(commandlinepkgs);
+#ifdef FEDORA
+      yum_substitute(pool, 0);
+#endif
       exit(0);
     }
 
-  if (updateall && patchmode)
-    {
-      int pruneyou = 0;
-      Map installedmap;
-      Solvable *s;
-
-      map_init(&installedmap, pool->nsolvables);
-      if (pool->installed)
-        FOR_REPO_SOLVABLES(pool->installed, p, s)
-         MAPSET(&installedmap, p);
-
-      /* install all patches */
-      updateall = 0;
-      mode = SOLVER_INSTALL;
-      for (p = 1; p < pool->nsolvables; p++)
-       {
-         const char *type;
-         int r;
-         Id p2;
-
-         s = pool->solvables + p;
-         if (strncmp(id2str(pool, s->name), "patch:", 6) != 0)
-           continue;
-         FOR_PROVIDES(p2, pp, s->name)
-           {
-             Solvable *s2 = pool->solvables + p2;
-             if (s2->name != s->name)
-               continue;
-             r = evrcmp(pool, s->evr, s2->evr, EVRCMP_COMPARE);
-             if (r < 0 || (r == 0 && p > p2))
-               break;
-           }
-         if (p2)
-           continue;
-         type = solvable_lookup_str(s, SOLVABLE_PATCHCATEGORY);
-         if (type && !strcmp(type, "optional"))
-           continue;
-         r = solvable_trivial_installable_map(s, &installedmap, 0);
-         if (r == -1)
-           continue;
-         if (solvable_lookup_bool(s, UPDATE_RESTART) && r == 0)
-           {
-             if (!pruneyou++)
-               queue_empty(&job);
-           }
-         else if (pruneyou)
-           continue;
-         queue_push2(&job, SOLVER_SOLVABLE, p);
-       }
-      map_free(&installedmap);
-    }
+  if (mainmode == MODE_PATCH)
+    select_patches(pool, &job);
 
   // add mode
   for (i = 0; i < job.count; i += 2)
     {
       if (mode == SOLVER_UPDATE)
        {
+         /* make update of not installed packages an install */
          FOR_JOB_SELECT(p, pp, job.elements[i], job.elements[i + 1])
            if (pool->installed && pool->solvables[p].repo == pool->installed)
              break;
          if (!p)
            {
              job.elements[i] |= SOLVER_INSTALL;
+             if (cleandeps)
+               job.elements[i] |= SOLVER_CLEANDEPS;
              continue;
            }
        }
       job.elements[i] |= mode;
+      if (cleandeps)
+        job.elements[i] |= SOLVER_CLEANDEPS;
+    }
+
+  if (mainmode == MODE_DISTUPGRADE && allpkgs)
+    {
+      if (repofilter)
+        queue_push2(&job, SOLVER_DISTUPGRADE|SOLVER_SOLVABLE_REPO, repofilter);
+      else
+        queue_push2(&job, SOLVER_DISTUPGRADE|SOLVER_SOLVABLE_ALL, 0);
+    }
+  if (mainmode == MODE_UPDATE && allpkgs)
+    {
+      if (repofilter)
+        queue_push2(&job, SOLVER_UPDATE|SOLVER_SOLVABLE_REPO, repofilter);
+      else
+        queue_push2(&job, SOLVER_UPDATE|SOLVER_SOLVABLE_ALL, 0);
+    }
+  if (mainmode == MODE_VERIFY && allpkgs)
+    {
+      if (repofilter)
+        queue_push2(&job, SOLVER_VERIFY|SOLVER_SOLVABLE_REPO, repofilter);
+      else
+        queue_push2(&job, SOLVER_VERIFY|SOLVER_SOLVABLE_ALL, 0);
     }
 
   // multiversion test
-  // queue_push2(&job, SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_NAME, str2id(pool, "kernel-pae", 1));
-  // queue_push2(&job, SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_NAME, str2id(pool, "kernel-pae-base", 1));
-  // queue_push2(&job, SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_NAME, str2id(pool, "kernel-pae-extra", 1));
+  // queue_push2(&job, SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_NAME, pool_str2id(pool, "kernel-pae", 1));
+  // queue_push2(&job, SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_NAME, pool_str2id(pool, "kernel-pae-base", 1));
+  // queue_push2(&job, SOLVER_NOOBSOLETES|SOLVER_SOLVABLE_NAME, pool_str2id(pool, "kernel-pae-extra", 1));
+
+#ifdef SOFTLOCKS_PATH
+  addsoftlocks(pool, &job);
+#endif
 
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
 rerunsolver:
+#endif
   for (;;)
     {
       Id problem, solution;
       int pcnt, scnt;
 
       solv = solver_create(pool);
-      solv->ignorealreadyrecommended = 1;
-      solv->updatesystem = updateall;
-      solv->dosplitprovides = updateall;
-      if (updateall && distupgrade)
-       {
-         solv->distupgrade = 1;
-          solv->allowdowngrade = 1;
-          solv->allowarchchange = 1;
-          solv->allowvendorchange = 1;
-       }
-      // queue_push2(&job, SOLVER_DISTUPGRADE, 3);
-      solver_solve(solv, &job);
-      if (!solv->problems.count)
+      solver_set_flag(solv, SOLVER_FLAG_SPLITPROVIDES, 1);
+      if (mainmode == MODE_ERASE)
+        solver_set_flag(solv, SOLVER_FLAG_ALLOW_UNINSTALL, 1); /* don't nag */
+
+      if (!solver_solve(solv, &job))
        break;
       pcnt = solver_problem_count(solv);
       printf("Found %d problems:\n", pcnt);
@@ -1930,17 +3184,26 @@ rerunsolver:
       solv = 0;
     }
 
-  trans = &solv->trans;
+  trans = solver_create_transaction(solv);
   if (!trans->steps.count)
     {
       printf("Nothing to do.\n");
+      transaction_free(trans);
+      solver_free(solv);
+      queue_free(&job);
+      pool_free(pool);
+      free_repoinfos(repoinfos, nrepoinfos);
+      solv_free(commandlinepkgs);
+#ifdef FEDORA
+      yum_substitute(pool, 0);
+#endif
       exit(1);
     }
   printf("\n");
   printf("Transaction summary:\n\n");
-  solver_printtransaction(solv);
+  transaction_print(trans);
 
-#if 1
+#if defined(SUSE)
   if (1)
     {
       DUChanges duc[4];
@@ -1952,14 +3215,24 @@ rerunsolver:
       duc[3].path = "/etc";
       transaction_calc_duchanges(trans, duc, 4);
       for (i = 0; i < 4; i++)
-        printf("duchanges %s: %d K  %d\n", duc[i].path, duc[i].kbytes, duc[i].files);
-      printf("install size change: %d K\n", transaction_calc_installsizechange(trans));
+        printf("duchanges %s: %d K  %d inodes\n", duc[i].path, duc[i].kbytes, duc[i].files);
     }
 #endif
+  printf("install size change: %d K\n", transaction_calc_installsizechange(trans));
+  printf("\n");
 
   if (!yesno("OK to continue (y/n)? "))
     {
       printf("Abort.\n");
+      transaction_free(trans);
+      solver_free(solv);
+      queue_free(&job);
+      pool_free(pool);
+      free_repoinfos(repoinfos, nrepoinfos);
+      solv_free(commandlinepkgs);
+#ifdef FEDORA
+      yum_substitute(pool, 0);
+#endif
       exit(1);
     }
 
@@ -1969,12 +3242,21 @@ rerunsolver:
 
   if (newpkgs)
     {
-      printf("Downloading %d packages\n", newpkgs);
-      newpkgsfps = sat_calloc(newpkgs, sizeof(*newpkgsfps));
+      int downloadsize = 0;
+      for (i = 0; i < newpkgs; i++)
+       {
+         Solvable *s;
+
+         p = checkq.elements[i];
+         s = pool_id2solvable(pool, p);
+         downloadsize += solvable_lookup_sizek(s, SOLVABLE_DOWNLOADSIZE, 0);
+       }
+      printf("Downloading %d packages, %d K\n", newpkgs, downloadsize);
+      newpkgsfps = solv_calloc(newpkgs, sizeof(*newpkgsfps));
       for (i = 0; i < newpkgs; i++)
        {
          unsigned int medianr;
-         char *loc;
+         const char *loc;
          Solvable *s;
          struct repoinfo *cinfo;
          const unsigned char *chksum;
@@ -2007,7 +3289,8 @@ rerunsolver:
          if (pool->installed && pool->installed->nsolvables)
            {
              /* try a delta first */
-             dataiterator_init(&di, pool, s->repo, SOLVID_META, DELTA_PACKAGE_NAME, id2str(pool, s->name), SEARCH_STRING);
+             char *matchname = strdup(pool_id2str(pool, s->name));
+             dataiterator_init(&di, pool, s->repo, SOLVID_META, DELTA_PACKAGE_NAME, matchname, SEARCH_STRING);
              dataiterator_prepend_keyname(&di, REPOSITORY_DELTAINFO);
              while (dataiterator_step(&di))
                {
@@ -2032,16 +3315,28 @@ rerunsolver:
                      const char *seqnum;
                      const char *seq;
                      const char *dloc;
+                     const char *archstr;
                      FILE *fp;
                      char cmd[128];
                      int newfd;
 
+                     archstr = pool_id2str(pool, s->arch);
+                     if (strlen(archstr) > 10 || strchr(archstr, '\'') != 0)
+                       continue;
+
                      seqname = pool_lookup_str(pool, SOLVID_POS, DELTA_SEQ_NAME);
                      seqevr = pool_lookup_str(pool, SOLVID_POS, DELTA_SEQ_EVR);
                      seqnum = pool_lookup_str(pool, SOLVID_POS, DELTA_SEQ_NUM);
                      seq = pool_tmpjoin(pool, seqname, "-", seqevr);
-                     seq = pool_tmpjoin(pool, seq, "-", seqnum);
-                     if (system(pool_tmpjoin(pool, "/usr/bin/applydeltarpm -c -s ", seq, 0)) != 0)
+                     seq = pool_tmpappend(pool, seq, "-", seqnum);
+                     if (strchr(seq, '\'') != 0)
+                       continue;
+#ifdef FEDORA
+                     sprintf(cmd, "/usr/bin/applydeltarpm -a '%s' -c -s '", archstr);
+#else
+                     sprintf(cmd, "/usr/bin/applydeltarpm -c -s '");
+#endif
+                     if (system(pool_tmpjoin(pool, cmd, seq, "'")) != 0)
                        continue;       /* didn't match */
                      /* looks good, download delta */
                      chksumtype = 0;
@@ -2049,14 +3344,18 @@ rerunsolver:
                      if (!chksumtype)
                        continue;       /* no way! */
                      dloc = pool_lookup_str(pool, SOLVID_POS, DELTA_LOCATION_DIR);
-                     dloc = pool_tmpjoin(pool, dloc, "/", pool_lookup_str(pool, SOLVID_POS, DELTA_LOCATION_NAME));
-                     dloc = pool_tmpjoin(pool, dloc, "-", pool_lookup_str(pool, SOLVID_POS, DELTA_LOCATION_EVR));
-                     dloc = pool_tmpjoin(pool, dloc, ".", pool_lookup_str(pool, SOLVID_POS, DELTA_LOCATION_SUFFIX));
-                     if ((fp = curlfopen(cinfo, dloc, 0, chksum, chksumtype)) == 0)
+                     dloc = pool_tmpappend(pool, dloc, "/", pool_lookup_str(pool, SOLVID_POS, DELTA_LOCATION_NAME));
+                     dloc = pool_tmpappend(pool, dloc, "-", pool_lookup_str(pool, SOLVID_POS, DELTA_LOCATION_EVR));
+                     dloc = pool_tmpappend(pool, dloc, ".", pool_lookup_str(pool, SOLVID_POS, DELTA_LOCATION_SUFFIX));
+                     if ((fp = curlfopen(cinfo, dloc, 0, chksum, chksumtype, 0)) == 0)
                        continue;
                      /* got it, now reconstruct */
                      newfd = opentmpfile();
+#ifdef FEDORA
+                     sprintf(cmd, "applydeltarpm -a '%s' /dev/fd/%d /dev/fd/%d", archstr, fileno(fp), newfd);
+#else
                      sprintf(cmd, "applydeltarpm /dev/fd/%d /dev/fd/%d", fileno(fp), newfd);
+#endif
                      fcntl(fileno(fp), F_SETFD, 0);
                      if (system(cmd))
                        {
@@ -2079,8 +3378,9 @@ rerunsolver:
                    }
                }
              dataiterator_free(&di);
+             solv_free(matchname);
            }
-         
+
          if (newpkgsfps[i])
            {
              putchar('d');
@@ -2094,7 +3394,7 @@ rerunsolver:
            }
          chksumtype = 0;
          chksum = solvable_lookup_bin_checksum(s, SOLVABLE_CHECKSUM, &chksumtype);
-         if ((newpkgsfps[i] = curlfopen(cinfo, loc, 0, chksum, chksumtype)) == 0)
+         if ((newpkgsfps[i] = curlfopen(cinfo, loc, 0, chksum, chksumtype, 0)) == 0)
            {
              printf("\n%s: %s not found in repository\n", s->repo->name, loc);
              exit(1);
@@ -2105,9 +3405,11 @@ rerunsolver:
       putchar('\n');
     }
 
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
   if (newpkgs)
     {
       Queue conflicts;
+      struct fcstate fcstate;
 
       printf("Searching for file conflicts\n");
       queue_init(&conflicts);
@@ -2115,19 +3417,19 @@ rerunsolver:
       fcstate.newpkgscnt = newpkgs;
       fcstate.checkq = &checkq;
       fcstate.newpkgsfps = newpkgsfps;
-      pool_findfileconflicts(pool, &checkq, newpkgs, &conflicts, &fc_cb, &fcstate);
+      pool_findfileconflicts(pool, &checkq, newpkgs, &conflicts, &fileconflict_cb, &fcstate);
       if (conflicts.count)
        {
          printf("\n");
          for (i = 0; i < conflicts.count; i += 5)
-           printf("file %s of package %s conflicts with package %s\n", id2str(pool, conflicts.elements[i]), solvid2str(pool, conflicts.elements[i + 1]), solvid2str(pool, conflicts.elements[i + 3]));
+           printf("file %s of package %s conflicts with package %s\n", pool_id2str(pool, conflicts.elements[i]), pool_solvid2str(pool, conflicts.elements[i + 1]), pool_solvid2str(pool, conflicts.elements[i + 3]));
          printf("\n");
          if (yesno("Re-run solver (y/n/q)? "))
            {
              for (i = 0; i < newpkgs; i++)
                if (newpkgsfps[i])
                  fclose(newpkgsfps[i]);
-             newpkgsfps = sat_free(newpkgsfps);
+             newpkgsfps = solv_free(newpkgsfps);
              solver_free(solv);
              pool_add_fileconflicts_deps(pool, &conflicts);
              pool_createwhatprovides(pool);    /* Hmm... */
@@ -2136,12 +3438,15 @@ rerunsolver:
        }
       queue_free(&conflicts);
     }
+#endif
 
   printf("Committing transaction:\n\n");
   transaction_order(trans, 0);
   for (i = 0; i < trans->steps.count; i++)
     {
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
       const char *evr, *evrp, *nvra;
+#endif
       Solvable *s;
       int j;
       FILE *fp;
@@ -2152,22 +3457,27 @@ rerunsolver:
       switch(type)
        {
        case SOLVER_TRANSACTION_ERASE:
-         printf("erase %s\n", solvid2str(pool, p));
+         printf("erase %s\n", pool_solvid2str(pool, p));
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
          if (!s->repo->rpmdbid || !s->repo->rpmdbid[p - s->repo->start])
            continue;
          /* strip epoch from evr */
-         evr = evrp = id2str(pool, s->evr);
+         evr = evrp = pool_id2str(pool, s->evr);
          while (*evrp >= '0' && *evrp <= '9')
            evrp++;
          if (evrp > evr && evrp[0] == ':' && evrp[1])
            evr = evrp + 1;
-         nvra = pool_tmpjoin(pool, id2str(pool, s->name), "-", evr);
-         nvra = pool_tmpjoin(pool, nvra, ".", id2str(pool, s->arch));
-         runrpm("-e", nvra, -1);       /* to bad that --querybynumber doesn't work */
+         nvra = pool_tmpjoin(pool, pool_id2str(pool, s->name), "-", evr);
+         nvra = pool_tmpappend(pool, nvra, ".", pool_id2str(pool, s->arch));
+         runrpm("-e", nvra, -1, rootdir);      /* too bad that --querybynumber doesn't work */
+#endif
+#if defined(ENABLE_DEBIAN) && defined(DEBIAN)
+         rundpkg("--remove", pool_id2str(pool, s->name), 0, rootdir);
+#endif
          break;
        case SOLVER_TRANSACTION_INSTALL:
        case SOLVER_TRANSACTION_MULTIINSTALL:
-         printf("install %s\n", solvid2str(pool, p));
+         printf("install %s\n", pool_solvid2str(pool, p));
          for (j = 0; j < newpkgs; j++)
            if (checkq.elements[j] == p)
              break;
@@ -2176,7 +3486,12 @@ rerunsolver:
            continue;
          rewind(fp);
          lseek(fileno(fp), 0, SEEK_SET);
-         runrpm(type == SOLVER_TRANSACTION_MULTIINSTALL ? "-i" : "-U", "/dev/fd/3", fileno(fp));
+#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
+         runrpm(type == SOLVER_TRANSACTION_MULTIINSTALL ? "-i" : "-U", "/dev/fd/3", fileno(fp), rootdir);
+#endif
+#if defined(ENABLE_DEBIAN) && defined(DEBIAN)
+         rundpkg("--install", "/dev/fd/3", fileno(fp), rootdir);
+#endif
          fclose(fp);
          newpkgsfps[j] = 0;
          break;
@@ -2188,12 +3503,16 @@ rerunsolver:
   for (i = 0; i < newpkgs; i++)
     if (newpkgsfps[i])
       fclose(newpkgsfps[i]);
-  sat_free(newpkgsfps);
+  solv_free(newpkgsfps);
   queue_free(&checkq);
+  transaction_free(trans);
   solver_free(solv);
   queue_free(&job);
   pool_free(pool);
   free_repoinfos(repoinfos, nrepoinfos);
-  sat_free(commandlinepkgs);
+  solv_free(commandlinepkgs);
+#ifdef FEDORA
+  yum_substitute(pool, 0);
+#endif
   exit(0);
 }