X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=ext%2Frepo_rpmdb.c;h=d78893ee22506684404a4e6a2a439e32fd68206c;hb=de92b8ea19562961f973960c0f8f5aec7f6d9c75;hp=034198c67faaa903a19aaf0cb0a2f8681be0b6b0;hpb=22e701e553344eeb22f88ed0906d76c9a5e39d83;p=platform%2Fupstream%2Flibsolv.git diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c index 034198c..d78893e 100644 --- a/ext/repo_rpmdb.c +++ b/ext/repo_rpmdb.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012, Novell Inc. + * Copyright (c) 2007-2018, SUSE Inc. * * This program is licensed under the BSD license, read LICENSE.BSD * for further information @@ -33,14 +33,6 @@ #endif #include -#ifndef DB_CREATE -# if defined(SUSE) || defined(HAVE_RPM_DB_H) -# include -# else -# include -# endif -#endif - #endif #include "pool.h" @@ -144,6 +136,7 @@ #define TAG_SIGBASE 256 #define TAG_SIGMD5 (TAG_SIGBASE + 5) #define TAG_SHA1HEADER (TAG_SIGBASE + 13) +#define TAG_SHA256HEADER (TAG_SIGBASE + 17) #define SIGTAG_SIZE 1000 #define SIGTAG_PGP 1002 /* RSA signature */ @@ -157,31 +150,37 @@ #define DEP_PRE_IN ((1 << 6) | (1 << 9) | (1 << 10)) #define DEP_PRE_UN ((1 << 6) | (1 << 11) | (1 << 12)) -#define FILEFLAG_GHOST (1 << 6) - +#define FILEFLAG_GHOST (1 << 6) -#ifdef RPM5 -# define RPM_INDEX_SIZE 4 /* just the rpmdbid */ -#else -# define RPM_INDEX_SIZE 8 /* rpmdbid + array index */ -#endif /* some limits to guard against corrupt rpms */ -#define MAX_SIG_CNT 0x100000 -#define MAX_SIG_DSIZE 0x100000 +/* dsize limits taken from rpm's lib/header.c */ +#define MAX_SIG_CNT 0x10000 +#define MAX_SIG_DSIZE 0x4000000 + +#define MAX_HDR_CNT 0x10000 +#define MAX_HDR_DSIZE 0x10000000 + -#define MAX_HDR_CNT 0x100000 -#define MAX_HDR_DSIZE 0x2000000 +#ifndef ENABLE_RPMPKG_LIBRPM typedef struct rpmhead { int cnt; unsigned int dcnt; unsigned char *dp; - int forcebinary; /* sigh, see rh#478907 */ unsigned char data[1]; } RpmHead; +static inline void +headinit(RpmHead *h, unsigned int cnt, unsigned int dcnt) +{ + h->cnt = (int)cnt; + h->dcnt = dcnt; + h->dp = h->data + 16 * cnt; + h->dp[dcnt] = 0; +} + static inline unsigned char * headfindtag(RpmHead *h, int tag) { @@ -204,10 +203,11 @@ headexists(RpmHead *h, int tag) return headfindtag(h, tag) ? 1 : 0; } -static unsigned int * +static uint32_t * headint32array(RpmHead *h, int tag, int *cnt) { - unsigned int i, o, *r; + uint32_t *r; + unsigned int i, o; unsigned char *d = headfindtag(h, tag); if (!d || d[4] != 0 || d[5] != 0 || d[6] != 0 || d[7] != 4) @@ -217,7 +217,7 @@ headint32array(RpmHead *h, int tag, int *cnt) if (o > h->dcnt || i > h->dcnt || o + 4 * i > h->dcnt) return 0; d = h->dp + o; - r = solv_calloc(i ? i : 1, sizeof(unsigned int)); + r = solv_calloc(i ? i : 1, sizeof(uint32_t)); if (cnt) *cnt = i; for (o = 0; o < i; o++, d += 4) @@ -226,7 +226,7 @@ headint32array(RpmHead *h, int tag, int *cnt) } /* returns the first entry of an integer array */ -static unsigned int +static uint32_t headint32(RpmHead *h, int tag) { unsigned int i, o; @@ -242,11 +242,11 @@ headint32(RpmHead *h, int tag) return d[0] << 24 | d[1] << 16 | d[2] << 8 | d[3]; } -static unsigned long long * +static uint64_t * headint64array(RpmHead *h, int tag, int *cnt) { + uint64_t *r; unsigned int i, o; - unsigned long long *r; unsigned char *d = headfindtag(h, tag); if (!d || d[4] != 0 || d[5] != 0 || d[6] != 0 || d[7] != 5) @@ -256,23 +256,25 @@ headint64array(RpmHead *h, int tag, int *cnt) if (o > h->dcnt || i > h->dcnt || o + 8 * i > h->dcnt) return 0; d = h->dp + o; - r = solv_calloc(i ? i : 1, sizeof(unsigned long long)); + r = solv_calloc(i ? i : 1, sizeof(uint64_t)); if (cnt) *cnt = i; for (o = 0; o < i; o++, d += 8) { - unsigned int x = d[0] << 24 | d[1] << 16 | d[2] << 8 | d[3]; - r[o] = (unsigned long long)x << 32 | (d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7]); + uint32_t x = d[0] << 24 | d[1] << 16 | d[2] << 8 | d[3]; + r[o] = (uint64_t)x << 32 | (uint32_t)(d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7]); } return r; } /* returns the first entry of an 64bit integer array */ -static unsigned long long +static uint64_t headint64(RpmHead *h, int tag) { + uint32_t x; unsigned int i, o; unsigned char *d = headfindtag(h, tag); + if (!d || d[4] != 0 || d[5] != 0 || d[6] != 0 || d[7] != 5) return 0; o = d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11]; @@ -280,14 +282,15 @@ headint64(RpmHead *h, int tag) if (i == 0 || o > h->dcnt || i > h->dcnt || o + 8 * i > h->dcnt) return 0; d = h->dp + o; - i = d[0] << 24 | d[1] << 16 | d[2] << 8 | d[3]; - return (unsigned long long)i << 32 | (d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7]); + x = d[0] << 24 | d[1] << 16 | d[2] << 8 | d[3]; + return (uint64_t)x << 32 | (uint32_t)(d[4] << 24 | d[5] << 16 | d[6] << 8 | d[7]); } -static unsigned int * +static uint16_t * headint16array(RpmHead *h, int tag, int *cnt) { - unsigned int i, o, *r; + uint16_t *r; + unsigned int i, o; unsigned char *d = headfindtag(h, tag); if (!d || d[4] != 0 || d[5] != 0 || d[6] != 0 || d[7] != 3) @@ -297,7 +300,7 @@ headint16array(RpmHead *h, int tag, int *cnt) if (o > h->dcnt || i > h->dcnt || o + 2 * i > h->dcnt) return 0; d = h->dp + o; - r = solv_calloc(i ? i : 1, sizeof(unsigned int)); + r = solv_calloc(i ? i : 1, sizeof(uint16_t)); if (cnt) *cnt = i; for (o = 0; o < i; o++, d += 2) @@ -366,6 +369,120 @@ headbinary(RpmHead *h, int tag, unsigned int *sizep) return h->dp + o; } +static int +headissourceheuristic(RpmHead *h) +{ + unsigned int i, o; + unsigned char *d = headfindtag(h, TAG_DIRNAMES); + if (!d || d[4] != 0 || d[5] != 0 || d[6] != 0 || d[7] != 8) + return 0; + o = d[8] << 24 | d[9] << 16 | d[10] << 8 | d[11]; + i = d[12] << 24 | d[13] << 16 | d[14] << 8 | d[15]; + return i == 1 && o < h->dcnt && !h->dp[o] ? 1 : 0; +} + +static inline void +headfree(RpmHead *h) +{ + solv_free(h); +} + +#else + +typedef struct headerToken_s RpmHead; + +static int +headexists(RpmHead *h, int tag) +{ + return headerIsEntry(h, tag); +} + +static void *headget(RpmHead *h, int tag, int *cnt, int alloc) +{ + struct rpmtd_s td; + if (!headerGet(h, tag, &td, alloc ? HEADERGET_ALLOC : HEADERGET_MINMEM)) + return 0; + if (cnt) + *cnt = td.count; + return td.data; +} + +static uint32_t * +headint32array(RpmHead *h, int tag, int *cnt) +{ + return headget(h, tag, cnt, 1); +} + +static uint32_t +headint32(RpmHead *h, int tag) +{ + uint32_t *arr = headget(h, tag, 0, 0); + return arr ? arr[0] : 0; +} + +static uint64_t * +headint64array(RpmHead *h, int tag, int *cnt) +{ + return headget(h, tag, cnt, 1); +} + +/* returns the first entry of an 64bit integer array */ +static uint64_t +headint64(RpmHead *h, int tag) +{ + uint64_t *arr = headget(h, tag, 0, 0); + return arr ? arr[0] : 0; +} + +static uint16_t * +headint16array(RpmHead *h, int tag, int *cnt) +{ + return headget(h, tag, cnt, 1); +} + +static char * +headstring(RpmHead *h, int tag) +{ + return headget(h, tag, 0, 0); +} + +static char ** +headstringarray(RpmHead *h, int tag, int *cnt) +{ + return headget(h, tag, cnt, 1); +} + +static unsigned char * +headbinary(RpmHead *h, int tag, unsigned int *sizep) +{ + unsigned char *b = headget(h, tag, (int *)sizep, 0); + if (b && sizep && (tag == TAG_SIGMD5 || tag == SIGTAG_MD5) && *sizep > 16) { + /* due to a bug in rpm the count may be bigger if HEADERIMPORT_FAST is used */ + *sizep = 16; + } + return b; +} + +static int +headissourceheuristic(RpmHead *h) +{ + struct rpmtd_s td; + int issource; + if (!headerGet(h, TAG_DIRNAMES, &td, HEADERGET_MINMEM)) + return 0; + issource = td.count == 1 && td.data && ((char **)td.data)[0] && !((char **)td.data)[0][0]; + rpmtdFreeData(&td); + return issource; +} + +static inline void +headfree(RpmHead *h) +{ + headerFree(h); +} + +#endif + static char *headtoevr(RpmHead *h) { unsigned int epoch; @@ -378,10 +495,7 @@ static char *headtoevr(RpmHead *h) release = headstring(h, TAG_RELEASE); epoch = headint32(h, TAG_EPOCH); if (!version || !release) - { - fprintf(stderr, "headtoevr: bad rpm header\n"); - return 0; - } + return 0; for (v = version; *v >= '0' && *v <= '9'; v++) ; if (epoch || (v != version && *v == ':')) @@ -439,7 +553,7 @@ static unsigned int makedeps(Pool *pool, Repo *repo, RpmHead *rpmhead, int tagn, int tagv, int tagf, int flags, Queue *ignq) { char **n, **v; - unsigned int *f; + uint32_t *f; int i, cc, nc, vc, fc; int haspre, premask, has_ign; unsigned int olddeps; @@ -624,14 +738,34 @@ makedeps(Pool *pool, Repo *repo, RpmHead *rpmhead, int tagn, int tagv, int tagf, return olddeps; } +static Id +repodata_str2dir_rooted(Repodata *data, char *str, int create) +{ + char buf[256], *bp; + int l = strlen(str); + Id id; + + if (l + 2 <= sizeof(buf)) + bp = buf; + else + bp = solv_malloc(l + 2); + bp[0] = '/'; + strcpy(bp + 1, str); + id = repodata_str2dir(data, bp, create); + if (bp != buf) + solv_free(bp); + return id; +} static void -adddudata(Repodata *data, Id handle, RpmHead *rpmhead, char **dn, unsigned int *di, int fc, int dc) +adddudata(Repodata *data, Id handle, RpmHead *rpmhead, char **dn, uint32_t *di, int fc, int dc) { Id did; int i, fszc; - unsigned int *fkb, *fn, *fsz, *fm, *fino; - unsigned long long *fsz64; + unsigned int *fkb, *fn; + uint64_t *fsz64; + uint32_t *fsz, *fino; + uint16_t *fm; unsigned int inotest[256], inotestok; if (!fc) @@ -765,13 +899,13 @@ adddudata(Repodata *data, Id handle, RpmHead *rpmhead, char **dn, unsigned int * { if (!fn[i]) continue; - if (!*dn[i]) + if (dn[i][0] != '/') { - Solvable *s = data->repo->pool->solvables + handle; + Solvable *s = data->repo->pool->solvables + handle; if (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC) did = repodata_str2dir(data, "/usr/src", 1); else - continue; /* work around rpm bug */ + did = repodata_str2dir_rooted(data, dn[i], 1); } else did = repodata_str2dir(data, dn[i], 1); @@ -801,11 +935,11 @@ addfilelist(Repodata *data, Id handle, RpmHead *rpmhead, int flags) { char **bn; char **dn; - unsigned int *di; + uint32_t *di; int bnc, dnc, dic; int i; - Id lastdid = 0; - unsigned int lastdii = -1; + Id did; + uint32_t lastdii = -1; int lastfiltered = 0; if (!data) @@ -834,17 +968,16 @@ addfilelist(Repodata *data, Id handle, RpmHead *rpmhead, int flags) adddudata(data, handle, rpmhead, dn, di, bnc, dnc); + did = -1; for (i = 0; i < bnc; i++) { - Id did; char *b = bn[i]; - if (lastdid && di[i] == lastdii) - did = lastdid; - else + if (did < 0 || di[i] != lastdii) { if (di[i] >= dnc) continue; /* corrupt entry */ + did = 0; lastdii = di[i]; if ((flags & RPM_ADD_FILTERED_FILELIST) != 0) { @@ -852,18 +985,17 @@ addfilelist(Repodata *data, Id handle, RpmHead *rpmhead, int flags) if (lastfiltered == 1) continue; } - did = repodata_str2dir(data, dn[lastdii], 1); - if (!did) - did = repodata_str2dir(data, "/", 1); - lastdid = did; + if (dn[lastdii][0] != '/') + did = repodata_str2dir_rooted(data, dn[lastdii], 1); + else + did = repodata_str2dir(data, dn[lastdii], 1); } - if (b && *b == '/') /* work around rpm bug */ + if (!b) + continue; + if (*b == '/') /* work around rpm bug */ b++; - if (lastfiltered) - { - if (lastfiltered != 2 || strcmp(b, "sendmail")) - continue; - } + if (lastfiltered && (lastfiltered != 2 || strcmp(b, "sendmail"))) + continue; repodata_add_dirstr(data, handle, SOLVABLE_FILELIST, did, b); } solv_free(bn); @@ -876,8 +1008,8 @@ addchangelog(Repodata *data, Id handle, RpmHead *rpmhead) { char **cn; char **cx; - unsigned int *ct; - int i, cnc, cxc, ctc; + uint32_t *ct; + int i, cnc, cxc, ctc = 0; Queue hq; ct = headint32array(rpmhead, TAG_CHANGELOGTIME, &ctc); @@ -969,11 +1101,11 @@ rpmhead2solv(Pool *pool, Repo *repo, Repodata *data, Solvable *s, RpmHead *rpmhe pool_error(pool, 0, "package has no name"); return 0; } - if (!strcmp(name, "gpg-pubkey")) + if (!(flags & RPMDB_KEEP_GPG_PUBKEY) && !strcmp(name, "gpg-pubkey")) return 0; s->name = pool_str2id(pool, name, 1); sourcerpm = headstring(rpmhead, TAG_SOURCERPM); - if (sourcerpm || (rpmhead->forcebinary && !headexists(rpmhead, TAG_SOURCEPACKAGE))) + if (sourcerpm || !(headexists(rpmhead, TAG_SOURCEPACKAGE) || headissourceheuristic(rpmhead))) s->arch = pool_str2id(pool, headstring(rpmhead, TAG_ARCH), 1); else { @@ -986,6 +1118,7 @@ rpmhead2solv(Pool *pool, Repo *repo, Repodata *data, Solvable *s, RpmHead *rpmhe s->arch = ARCH_NOARCH; evr = headtoevr(rpmhead); s->evr = pool_str2id(pool, evr, 1); + solv_free(evr); s->vendor = pool_str2id(pool, headstring(rpmhead, TAG_VENDOR), 1); queue_init_buffer(&ignq, ignqbuf, sizeof(ignqbuf)/sizeof(*ignqbuf)); @@ -1056,6 +1189,9 @@ rpmhead2solv(Pool *pool, Repo *repo, Repodata *data, Solvable *s, RpmHead *rpmhe u32 = headint32(rpmhead, TAG_BUILDTIME); if (u32) repodata_set_num(data, handle, SOLVABLE_BUILDTIME, u32); + str = headstring(rpmhead, TAG_BUILDHOST); + if (str) + repodata_set_str(data, handle, SOLVABLE_BUILDHOST, str); u32 = headint32(rpmhead, TAG_INSTALLTIME); if (u32) repodata_set_num(data, handle, SOLVABLE_INSTALLTIME, u32); @@ -1083,7 +1219,6 @@ rpmhead2solv(Pool *pool, Repo *repo, Repodata *data, Solvable *s, RpmHead *rpmhe if ((flags & RPM_ADD_WITH_CHANGELOG) != 0) addchangelog(data, handle, rpmhead); } - solv_free(evr); return 1; } @@ -1093,27 +1228,6 @@ getu32(const unsigned char *dp) return dp[0] << 24 | dp[1] << 16 | dp[2] << 8 | dp[3]; } - -/******************************************************************/ -/* Rpm Database stuff - */ - -struct rpmdbstate { - Pool *pool; - char *rootdir; - - RpmHead *rpmhead; /* header storage space */ - int rpmheadsize; - -#ifdef ENABLE_RPMDB - int dbopened; - DB_ENV *dbenv; /* database environment */ - DB *db; /* packages database */ - int byteswapped; /* endianess of packages database */ - int is_ostree; /* read-only db that lives in /usr/share/rpm */ -#endif -}; - #ifdef ENABLE_RPMDB struct rpmdbentry { @@ -1124,139 +1238,106 @@ struct rpmdbentry { #define ENTRIES_BLOCK 255 #define NAMEDATA_BLOCK 1023 - -static inline Id -db2rpmdbid(unsigned char *db, int byteswapped) -{ -#ifdef RPM5 - return db[0] << 24 | db[1] << 16 | db[2] << 8 | db[3]; -#else -# if defined(WORDS_BIGENDIAN) - if (!byteswapped) +# ifdef ENABLE_RPMDB_LIBRPM +# include "repo_rpmdb_librpm.h" # else - if (byteswapped) +# include "repo_rpmdb_bdb.h" # endif - return db[0] << 24 | db[1] << 16 | db[2] << 8 | db[3]; - else - return db[3] << 24 | db[2] << 16 | db[1] << 8 | db[0]; -#endif -} -static inline void -rpmdbid2db(unsigned char *db, Id id, int byteswapped) -{ -#ifdef RPM5 - db[0] = id >> 24, db[1] = id >> 16, db[2] = id >> 8, db[3] = id; #else -# if defined(WORDS_BIGENDIAN) - if (!byteswapped) -# else - if (byteswapped) -# endif - db[0] = id >> 24, db[1] = id >> 16, db[2] = id >> 8, db[3] = id; - else - db[3] = id >> 24, db[2] = id >> 16, db[1] = id >> 8, db[0] = id; + +/* dummy state just to store pool/rootdir and header data */ +struct rpmdbstate { + Pool *pool; + char *rootdir; + + RpmHead *rpmhead; /* header storage space */ + unsigned int rpmheadsize; +}; + #endif -} -#ifdef FEDORA -int -serialize_dbenv_ops(struct rpmdbstate *state) -{ - char lpath[PATH_MAX]; - mode_t oldmask; - int fd; - struct flock fl; - - snprintf(lpath, PATH_MAX, "%s/var/lib/rpm/.dbenv.lock", state->rootdir ? state->rootdir : ""); - oldmask = umask(022); - fd = open(lpath, (O_RDWR|O_CREAT), 0644); - umask(oldmask); - if (fd < 0) - return -1; - memset(&fl, 0, sizeof(fl)); - fl.l_type = F_WRLCK; - fl.l_whence = SEEK_SET; - for (;;) + +#ifndef ENABLE_RPMPKG_LIBRPM + +static inline RpmHead * +realloc_head(struct rpmdbstate *state, unsigned int len) +{ + if (len > state->rpmheadsize) { - if (fcntl(fd, F_SETLKW, &fl) != -1) - return fd; - if (errno != EINTR) - break; + state->rpmheadsize = len + 128; + state->rpmhead = solv_realloc(state->rpmhead, sizeof(*state->rpmhead) + state->rpmheadsize); } - close(fd); - return -1; + return state->rpmhead; } -#endif -/* should look in /usr/lib/rpm/macros instead, but we want speed... */ static int -opendbenv(struct rpmdbstate *state) +headfromfp(struct rpmdbstate *state, const char *name, FILE *fp, unsigned char *lead, unsigned int cnt, unsigned int dsize, unsigned int pad, Chksum *chk1, Chksum *chk2) { - const char *rootdir = state->rootdir; - char dbpath[PATH_MAX]; - DB_ENV *dbenv = 0; - int r; - - if (db_env_create(&dbenv, 0)) - return pool_error(state->pool, 0, "db_env_create: %s", strerror(errno)); -#if defined(FEDORA) && (DB_VERSION_MAJOR >= 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 5)) - dbenv->set_thread_count(dbenv, 8); -#endif - snprintf(dbpath, PATH_MAX, "%s/var/lib/rpm", rootdir ? rootdir : ""); - if (access(dbpath, W_OK) == -1) - { - snprintf(dbpath, PATH_MAX, "%s/usr/share/rpm/Packages", rootdir ? rootdir : ""); - if (access(dbpath, R_OK) == 0) - state->is_ostree = 1; - snprintf(dbpath, PATH_MAX, "%s%s", rootdir ? rootdir : "", state->is_ostree ? "/usr/share/rpm" : "/var/lib/rpm"); - r = dbenv->open(dbenv, dbpath, DB_CREATE|DB_PRIVATE|DB_INIT_MPOOL, 0); - } - else - { -#ifdef FEDORA - int serialize_fd = serialize_dbenv_ops(state); - r = dbenv->open(dbenv, dbpath, DB_CREATE|DB_INIT_CDB|DB_INIT_MPOOL, 0644); - if (serialize_fd >= 0) - close(serialize_fd); -#else - r = dbenv->open(dbenv, dbpath, DB_CREATE|DB_PRIVATE|DB_INIT_MPOOL, 0); -#endif - } - if (r) - { - pool_error(state->pool, 0, "dbenv->open: %s", strerror(errno)); - dbenv->close(dbenv, 0); - return 0; - } - state->dbenv = dbenv; + unsigned int len = 16 * cnt + dsize + pad; + RpmHead *rpmhead = realloc_head(state, len + 1); + if (fread(rpmhead->data, len, 1, fp) != 1) + return pool_error(state->pool, 0, "%s: unexpected EOF", name); + if (chk1) + solv_chksum_add(chk1, rpmhead->data, len); + if (chk2) + solv_chksum_add(chk2, rpmhead->data, len); + headinit(rpmhead, cnt, dsize); return 1; } -static void -closedbenv(struct rpmdbstate *state) +# if defined(ENABLE_RPMDB) && (!defined(ENABLE_RPMDB_LIBRPM) || defined(HAVE_RPMDBNEXTITERATORHEADERBLOB)) + +static int +headfromhdrblob(struct rpmdbstate *state, const unsigned char *data, unsigned int size) { -#ifdef FEDORA - uint32_t eflags = 0; -#endif + unsigned int dsize, cnt, len; + RpmHead *rpmhead; + if (size < 8) + return pool_error(state->pool, 0, "corrupt rpm database (size)"); + cnt = getu32(data); + dsize = getu32(data + 4); + if (cnt >= MAX_HDR_CNT || dsize >= MAX_HDR_DSIZE) + return pool_error(state->pool, 0, "corrupt rpm database (cnt/dcnt)"); + if (8 + cnt * 16 + dsize > size) + return pool_error(state->pool, 0, "corrupt rpm database (data size)"); + len = 16 * cnt + dsize; + rpmhead = realloc_head(state, len + 1); + memcpy(rpmhead->data, data + 8, len); + headinit(rpmhead, cnt, dsize); + return 1; +} + +# endif - if (!state->dbenv) - return; -#ifdef FEDORA - (void)state->dbenv->get_open_flags(state->dbenv, &eflags); - if (!(eflags & DB_PRIVATE)) - { - int serialize_fd = serialize_dbenv_ops(state); - state->dbenv->close(state->dbenv, 0); - if (serialize_fd >= 0) - close(serialize_fd); - } - else - state->dbenv->close(state->dbenv, 0); #else - state->dbenv->close(state->dbenv, 0); -#endif - state->dbenv = 0; + +static int +headfromfp(struct rpmdbstate *state, const char *name, FILE *fp, unsigned char *lead, unsigned int cnt, unsigned int dsize, unsigned int pad, Chksum *chk1, Chksum *chk2) +{ + unsigned int len = 16 * cnt + dsize + pad; + char *buf = solv_malloc(8 + len); + Header h; + memcpy(buf, lead + 8, 8); + if (fread(buf + 8, len, 1, fp) != 1) + { + solv_free(buf); + return pool_error(state->pool, 0, "%s: unexpected EOF", name); + } + if (chk1) + solv_chksum_add(chk1, buf + 8, len); + if (chk2) + solv_chksum_add(chk2, buf + 8, len); + h = headerImport(buf, 8 + len - pad, HEADERIMPORT_FAST); + if (!h) + { + solv_free(buf); + return pool_error(state->pool, 0, "%s: headerImport error", name); + } + if (state->rpmhead) + headfree(state->rpmhead); + state->rpmhead = h; + return 1; } #endif @@ -1265,17 +1346,15 @@ static void freestate(struct rpmdbstate *state) { /* close down */ - if (!state) - return; #ifdef ENABLE_RPMDB - if (state->db) - state->db->close(state->db, 0); - if (state->dbenv) + if (state->dbenvopened) closedbenv(state); + if (state->dbpath_allocated) + solv_free((char *)state->dbpath); #endif if (state->rootdir) solv_free(state->rootdir); - solv_free(state->rpmhead); + headfree(state->rpmhead); } void * @@ -1292,258 +1371,14 @@ rpm_state_create(Pool *pool, const char *rootdir) void * rpm_state_free(void *state) { - freestate(state); + if (state) + freestate(state); return solv_free(state); } #ifdef ENABLE_RPMDB -static int -openpkgdb(struct rpmdbstate *state) -{ - if (state->dbopened) - return state->dbopened > 0 ? 1 : 0; - state->dbopened = -1; - if (!state->dbenv && !opendbenv(state)) - return 0; - if (db_create(&state->db, state->dbenv, 0)) - { - pool_error(state->pool, 0, "db_create: %s", strerror(errno)); - state->db = 0; - closedbenv(state); - return 0; - } - if (state->db->open(state->db, 0, "Packages", 0, DB_UNKNOWN, DB_RDONLY, 0664)) - { - pool_error(state->pool, 0, "db->open Packages: %s", strerror(errno)); - state->db->close(state->db, 0); - state->db = 0; - closedbenv(state); - return 0; - } - if (state->db->get_byteswapped(state->db, &state->byteswapped)) - { - pool_error(state->pool, 0, "db->get_byteswapped: %s", strerror(errno)); - state->db->close(state->db, 0); - state->db = 0; - closedbenv(state); - return 0; - } - state->dbopened = 1; - return 1; -} - -/* get the rpmdbids of all installed packages from the Name index database. - * This is much faster then querying the big Packages database */ -static struct rpmdbentry * -getinstalledrpmdbids(struct rpmdbstate *state, const char *index, const char *match, int *nentriesp, char **namedatap) -{ - DB_ENV *dbenv = 0; - DB *db = 0; - DBC *dbc = 0; - int byteswapped; - DBT dbkey; - DBT dbdata; - unsigned char *dp; - int dl; - Id nameoff; - - char *namedata = 0; - int namedatal = 0; - struct rpmdbentry *entries = 0; - int nentries = 0; - - *nentriesp = 0; - if (namedatap) - *namedatap = 0; - - if (!state->dbenv && !opendbenv(state)) - return 0; - dbenv = state->dbenv; - if (db_create(&db, dbenv, 0)) - { - pool_error(state->pool, 0, "db_create: %s", strerror(errno)); - return 0; - } - if (db->open(db, 0, index, 0, DB_UNKNOWN, DB_RDONLY, 0664)) - { - pool_error(state->pool, 0, "db->open %s: %s", index, strerror(errno)); - db->close(db, 0); - return 0; - } - if (db->get_byteswapped(db, &byteswapped)) - { - pool_error(state->pool, 0, "db->get_byteswapped: %s", strerror(errno)); - db->close(db, 0); - return 0; - } - if (db->cursor(db, NULL, &dbc, 0)) - { - pool_error(state->pool, 0, "db->cursor: %s", strerror(errno)); - db->close(db, 0); - return 0; - } - memset(&dbkey, 0, sizeof(dbkey)); - memset(&dbdata, 0, sizeof(dbdata)); - if (match) - { - dbkey.data = (void *)match; - dbkey.size = strlen(match); - } - while (dbc->c_get(dbc, &dbkey, &dbdata, match ? DB_SET : DB_NEXT) == 0) - { - if (!match && dbkey.size == 10 && !memcmp(dbkey.data, "gpg-pubkey", 10)) - continue; - dl = dbdata.size; - dp = dbdata.data; - nameoff = namedatal; - if (namedatap) - { - namedata = solv_extend(namedata, namedatal, dbkey.size + 1, 1, NAMEDATA_BLOCK); - memcpy(namedata + namedatal, dbkey.data, dbkey.size); - namedata[namedatal + dbkey.size] = 0; - namedatal += dbkey.size + 1; - } - while(dl >= RPM_INDEX_SIZE) - { - entries = solv_extend(entries, nentries, 1, sizeof(*entries), ENTRIES_BLOCK); - entries[nentries].rpmdbid = db2rpmdbid(dp, byteswapped); - entries[nentries].nameoff = nameoff; - nentries++; - dp += RPM_INDEX_SIZE; - dl -= RPM_INDEX_SIZE; - } - if (match) - break; - } - dbc->c_close(dbc); - db->close(db, 0); - /* make sure that enteries is != 0 if there was no error */ - if (!entries) - entries = solv_extend(entries, 1, 1, sizeof(*entries), ENTRIES_BLOCK); - *nentriesp = nentries; - if (namedatap) - *namedatap = namedata; - return entries; -} - -/* common code, return dbid on success, -1 on error */ -static int -getrpm_dbdata(struct rpmdbstate *state, DBT *dbdata, int dbid) -{ - unsigned int dsize, cnt, l; - RpmHead *rpmhead; - - if (dbdata->size < 8) - return pool_error(state->pool, -1, "corrupt rpm database (size)"); - cnt = getu32((const unsigned char *)dbdata->data); - dsize = getu32((const unsigned char *)dbdata->data + 4); - if (cnt >= MAX_HDR_CNT || dsize >= MAX_HDR_DSIZE) - return pool_error(state->pool, -1, "corrupt rpm database (cnt/dcnt)"); - l = cnt * 16 + dsize; - if (8 + l > dbdata->size) - return pool_error(state->pool, -1, "corrupt rpm database (data size)"); - if (l + 1 > state->rpmheadsize) - { - state->rpmheadsize = l + 128; - state->rpmhead = solv_realloc(state->rpmhead, sizeof(*rpmhead) + state->rpmheadsize); - } - rpmhead = state->rpmhead; - rpmhead->forcebinary = 1; - rpmhead->cnt = cnt; - rpmhead->dcnt = dsize; - memcpy(rpmhead->data, (unsigned char *)dbdata->data + 8, l); - rpmhead->data[l] = 0; - rpmhead->dp = rpmhead->data + cnt * 16; - return dbid; -} - -/* retrive header by rpmdbid, returns 0 if not found, -1 on error */ -static int -getrpm_dbid(struct rpmdbstate *state, Id dbid) -{ - unsigned char buf[4]; - DBT dbkey; - DBT dbdata; - - if (dbid <= 0) - return pool_error(state->pool, -1, "illegal rpmdbid %d", dbid); - if (state->dbopened != 1 && !openpkgdb(state)) - return -1; - rpmdbid2db(buf, dbid, state->byteswapped); - memset(&dbkey, 0, sizeof(dbkey)); - memset(&dbdata, 0, sizeof(dbdata)); - dbkey.data = buf; - dbkey.size = 4; - dbdata.data = 0; - dbdata.size = 0; - if (state->db->get(state->db, NULL, &dbkey, &dbdata, 0)) - return 0; - return getrpm_dbdata(state, &dbdata, dbid); -} - -/* retrive header by berkeleydb cursor, returns 0 on EOF, -1 on error */ -static Id -getrpm_cursor(struct rpmdbstate *state, DBC *dbc) -{ - DBT dbkey; - DBT dbdata; - Id dbid; - - memset(&dbkey, 0, sizeof(dbkey)); - memset(&dbdata, 0, sizeof(dbdata)); - while (dbc->c_get(dbc, &dbkey, &dbdata, DB_NEXT) == 0) - { - if (dbkey.size != 4) - return pool_error(state->pool, -1, "corrupt Packages database (key size)"); - dbid = db2rpmdbid(dbkey.data, state->byteswapped); - if (dbid) /* ignore join key */ - return getrpm_dbdata(state, &dbdata, dbid); - } - return 0; -} - -static int -count_headers(struct rpmdbstate *state) -{ - Pool *pool = state->pool; - char dbpath[PATH_MAX]; - struct stat statbuf; - DB *db = 0; - DBC *dbc = 0; - int count = 0; - DBT dbkey; - DBT dbdata; - - snprintf(dbpath, PATH_MAX, "%s%s/Name", state->rootdir ? state->rootdir : "", state->is_ostree ? "/usr/share/rpm" : "/var/lib/rpm"); - if (stat(dbpath, &statbuf)) - return 0; - memset(&dbkey, 0, sizeof(dbkey)); - memset(&dbdata, 0, sizeof(dbdata)); - if (db_create(&db, state->dbenv, 0)) - { - pool_error(pool, 0, "db_create: %s", strerror(errno)); - return 0; - } - if (db->open(db, 0, "Name", 0, DB_UNKNOWN, DB_RDONLY, 0664)) - { - pool_error(pool, 0, "db->open Name: %s", strerror(errno)); - db->close(db, 0); - return 0; - } - if (db->cursor(db, NULL, &dbc, 0)) - { - db->close(db, 0); - pool_error(pool, 0, "db->cursor: %s", strerror(errno)); - return 0; - } - while (dbc->c_get(dbc, &dbkey, &dbdata, DB_NEXT) == 0) - count += dbdata.size / RPM_INDEX_SIZE; - dbc->c_close(dbc); - db->close(db, 0); - return count; -} /******************************************************************/ @@ -1568,125 +1403,66 @@ copydeps(Pool *pool, Repo *repo, Offset fromoff, Repo *fromrepo) return ido; } -#define COPYDIR_DIRCACHE_SIZE 512 - -static Id copydir_complex(Pool *pool, Repodata *data, Repodata *fromdata, Id did, Id *cache); - -static inline Id -copydir(Pool *pool, Repodata *data, Repodata *fromdata, Id did, Id *cache) -{ - if (cache && cache[did & 255] == did) - return cache[(did & 255) + 256]; - return copydir_complex(pool, data, fromdata, did, cache); -} - -static Id -copydir_complex(Pool *pool, Repodata *data, Repodata *fromdata, Id did, Id *cache) -{ - Id parent = dirpool_parent(&fromdata->dirpool, did); - Id compid = dirpool_compid(&fromdata->dirpool, did); - if (parent) - parent = copydir(pool, data, fromdata, parent, cache); - if (data->localpool || fromdata->localpool) - compid = repodata_translate_id(data, fromdata, compid, 1); - compid = dirpool_add_dir(&data->dirpool, parent, compid, 1); - if (cache) - { - cache[did & 255] = did; - cache[(did & 255) + 256] = compid; - } - return compid; -} - struct solvable_copy_cbdata { Repodata *data; Id handle; Id subhandle; Id *dircache; + int bad; }; static int solvable_copy_cb(void *vcbdata, Solvable *r, Repodata *fromdata, Repokey *key, KeyValue *kv) { struct solvable_copy_cbdata *cbdata = vcbdata; - Id id, keyname; Repodata *data = cbdata->data; Id handle = cbdata->handle; - Pool *pool = data->repo->pool; - keyname = key->name; - switch(key->type) + switch (key->type) { case REPOKEY_TYPE_ID: case REPOKEY_TYPE_CONSTANTID: case REPOKEY_TYPE_IDARRAY: /* used for triggers */ - id = kv->id; if (data->localpool || fromdata->localpool) - id = repodata_translate_id(data, fromdata, id, 1); - if (key->type == REPOKEY_TYPE_ID) - repodata_set_id(data, handle, keyname, id); - else if (key->type == REPOKEY_TYPE_CONSTANTID) - repodata_set_constantid(data, handle, keyname, id); - else - repodata_add_idarray(data, handle, keyname, id); - break; - case REPOKEY_TYPE_STR: - repodata_set_str(data, handle, keyname, kv->str); - break; - case REPOKEY_TYPE_VOID: - repodata_set_void(data, handle, keyname); - break; - case REPOKEY_TYPE_NUM: - repodata_set_num(data, handle, keyname, SOLV_KV_NUM64(kv)); - break; - case REPOKEY_TYPE_CONSTANT: - repodata_set_constant(data, handle, keyname, kv->num); + kv->id = repodata_translate_id(data, fromdata, kv->id, 1); break; case REPOKEY_TYPE_DIRNUMNUMARRAY: - id = kv->id; - id = copydir(pool, data, fromdata, id, cbdata->dircache); - repodata_add_dirnumnum(data, handle, keyname, id, kv->num, kv->num2); - break; case REPOKEY_TYPE_DIRSTRARRAY: - id = kv->id; - id = copydir(pool, data, fromdata, id, cbdata->dircache); - repodata_add_dirstr(data, handle, keyname, id, kv->str); - break; - case REPOKEY_TYPE_FLEXARRAY: - if (kv->eof == 2) + kv->id = repodata_translate_dir(data, fromdata, kv->id, 1, fromdata->repodataid == 1 ? cbdata->dircache : 0); + if (!kv->id) { - assert(cbdata->subhandle); - cbdata->handle = cbdata->subhandle; - cbdata->subhandle = 0; - break; - } - if (!kv->entry) - { - assert(!cbdata->subhandle); - cbdata->subhandle = cbdata->handle; + cbdata->bad = 1; /* oops, cannot copy this */ + return 0; } - cbdata->handle = repodata_new_handle(data); - repodata_add_flexarray(data, cbdata->subhandle, keyname, cbdata->handle); break; + case REPOKEY_TYPE_FIXARRAY: + cbdata->handle = repodata_new_handle(data); + repodata_add_fixarray(data, handle, key->name, cbdata->handle); + repodata_search_arrayelement(fromdata, 0, 0, 0, kv, &solvable_copy_cb, cbdata); + cbdata->handle = handle; + return 0; + case REPOKEY_TYPE_FLEXARRAY: + cbdata->handle = repodata_new_handle(data); + repodata_add_flexarray(data, handle, key->name, cbdata->handle); + repodata_search_arrayelement(fromdata, 0, 0, 0, kv, &solvable_copy_cb, cbdata); + cbdata->handle = handle; + return 0; default: - if (solv_chksum_len(key->type)) - { - repodata_set_bin_checksum(data, handle, keyname, key->type, (const unsigned char *)kv->str); - break; - } break; } + repodata_set_kv(data, handle, key->name, key->type, kv); return 0; } -static void -solvable_copy(Solvable *s, Solvable *r, Repodata *data, Id *dircache) +static int +solvable_copy(Solvable *s, Solvable *r, Repodata *data, Id *dircache, Id **oldkeyskip) { int p, i; Repo *repo = s->repo; Pool *pool = repo->pool; Repo *fromrepo = r->repo; struct solvable_copy_cbdata cbdata; + Id *keyskip; /* copy solvable data */ s->name = r->name; @@ -1703,23 +1479,37 @@ solvable_copy(Solvable *s, Solvable *r, Repodata *data, Id *dircache) s->enhances = copydeps(pool, repo, r->enhances, fromrepo); /* copy all attributes */ - if (!data) - return; + if (!data || fromrepo->nrepodata < 2) + return 1; cbdata.data = data; cbdata.handle = s - pool->solvables; cbdata.subhandle = 0; cbdata.dircache = dircache; + cbdata.bad = 0; p = r - fromrepo->pool->solvables; -#if 0 - repo_search(fromrepo, p, 0, 0, SEARCH_NO_STORAGE_SOLVABLE | SEARCH_SUB | SEARCH_ARRAYSENTINEL, solvable_copy_cb, &cbdata); -#else - FOR_REPODATAS(fromrepo, i, data) + if (fromrepo->nrepodata == 2) { - if (p >= data->start && p < data->end) - repodata_search(data, p, 0, SEARCH_SUB | SEARCH_ARRAYSENTINEL, solvable_copy_cb, &cbdata); - cbdata.dircache = 0; /* only for first repodata */ + Repodata *fromdata = repo_id2repodata(fromrepo, 1); + if (p >= fromdata->start && p < fromdata->end) + repodata_search(fromdata, p, 0, 0, solvable_copy_cb, &cbdata); } -#endif + else + { + keyskip = repo_create_keyskip(repo, p, oldkeyskip); + FOR_REPODATAS(fromrepo, i, data) + { + if (p >= data->start && p < data->end) + repodata_search_keyskip(data, p, 0, 0, keyskip, solvable_copy_cb, &cbdata); + } + } + if (cbdata.bad) + { + repodata_unset_uninternalized(data, cbdata.handle, 0); + memset(s, 0, sizeof(*s)); + s->repo = repo; + return 0; + } + return 1; } /* used to sort entries by package name that got returned in some database order */ @@ -1800,7 +1590,6 @@ int repo_add_rpmdb(Repo *repo, Repo *ref, int flags) { Pool *pool = repo->pool; - char dbpath[PATH_MAX]; struct stat packagesstat; unsigned char newcookie[32]; const unsigned char *oldcookie = 0; @@ -1834,10 +1623,8 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags) } /* XXX: should get ro lock of Packages database! */ - snprintf(dbpath, PATH_MAX, "%s%s/Packages", state.rootdir ? state.rootdir : "", state.is_ostree ? "/usr/share/rpm" : "/var/lib/rpm"); - if (stat(dbpath, &packagesstat)) + if (stat_database(&state, &packagesstat)) { - pool_error(pool, -1, "%s: %s", dbpath, strerror(errno)); freestate(&state); return -1; } @@ -1850,29 +1637,23 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags) { int solvstart = 0, solvend = 0; Id dbid; - DBC *dbc = 0; if (ref && (flags & RPMDB_EMPTY_REFREPO) != 0) repo_empty(ref, 1); /* get it out of the way */ if ((flags & RPMDB_REPORT_PROGRESS) != 0) count = count_headers(&state); - if (!openpkgdb(&state)) + if (pkgdb_cursor_open(&state)) { freestate(&state); return -1; } - if (state.db->cursor(state.db, NULL, &dbc, 0)) - { - freestate(&state); - return pool_error(pool, -1, "db->cursor failed"); - } i = 0; s = 0; - while ((dbid = getrpm_cursor(&state, dbc)) != 0) + while ((dbid = pkgdb_cursor_getrpm(&state)) != 0) { if (dbid == -1) { - dbc->c_close(dbc); + pkgdb_cursor_close(&state); freestate(&state); return -1; } @@ -1906,13 +1687,12 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags) pool_debug(pool, SOLV_ERROR, "%%%% %d\n", done * 100 / count); } } - dbc->c_close(dbc); + pkgdb_cursor_close(&state); if (s) { /* oops, could not reuse. free it instead */ - repo_free_solvable(repo, s - pool->solvables, 1); + s = solvable_free(s, 1); solvend--; - s = 0; } /* now sort all solvables in the new solvstart..solvend block */ if (solvend - solvstart > 1) @@ -1935,7 +1715,8 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags) } else { - Id dircache[COPYDIR_DIRCACHE_SIZE]; /* see copydir */ + Id *dircache; + Id *oldkeyskip = 0; struct rpmdbentry *entries = 0, *rp; int nentries = 0; char *namedata = 0; @@ -1943,10 +1724,8 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags) Id id, *refhash; int res; - memset(dircache, 0, sizeof(dircache)); - /* get ids of installed rpms */ - entries = getinstalledrpmdbids(&state, "Name", 0, &nentries, &namedata); + entries = getinstalledrpmdbids(&state, "Name", 0, &nentries, &namedata, flags & RPMDB_KEEP_GPG_PUBKEY); if (!entries) { freestate(&state); @@ -1999,10 +1778,11 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags) if (!repo->rpmdbid) repo->rpmdbid = repo_sidedata_create(repo, sizeof(Id)); + dircache = repodata_create_dirtranscache(data); for (i = 0, rp = entries; i < nentries; i++, rp++, s++) { Id dbid = rp->rpmdbid; - repo->rpmdbid[(s - pool->solvables) - repo->start] = rp->rpmdbid; + repo->rpmdbid[(s - pool->solvables) - repo->start] = dbid; if (refhash) { h = dbid & refmask; @@ -2015,11 +1795,8 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags) if (id) { Solvable *r = ref->pool->solvables + ref->start + (id - 1); - if (r->repo == ref) - { - solvable_copy(s, r, data, dircache); - continue; - } + if (r->repo == ref && solvable_copy(s, r, data, dircache, &oldkeyskip)) + continue; } } res = getrpm_dbid(&state, dbid); @@ -2031,6 +1808,7 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags) solv_free(entries); solv_free(namedata); solv_free(refhash); + dircache = repodata_free_dirtranscache(dircache); return -1; } rpmhead2solv(pool, repo, data, s, state.rpmhead, flags | RPM_ADD_TRIGGERS); @@ -2042,7 +1820,9 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags) pool_debug(pool, SOLV_ERROR, "%%%% %d\n", done * 100 / count); } } + dircache = repodata_free_dirtranscache(dircache); + solv_free(oldkeyskip); solv_free(entries); solv_free(namedata); solv_free(refhash); @@ -2088,16 +1868,15 @@ repo_add_rpmdb_reffp(Repo *repo, FILE *fp, int flags) return res; } -#endif +#endif /* ENABLE_RPMDB */ Id repo_add_rpm(Repo *repo, const char *rpm, int flags) { - unsigned int sigdsize, sigcnt, l; + unsigned int sigdsize, sigcnt, sigpad, l; Pool *pool = repo->pool; Solvable *s; - RpmHead *rpmhead = 0; - int rpmheadsize = 0; + struct rpmdbstate state; char *payloadformat; FILE *fp; unsigned char lead[4096]; @@ -2111,7 +1890,6 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) Id chksumtype = 0; Chksum *chksumh = 0; Chksum *leadsigchksumh = 0; - int forcebinary = 0; data = repo_add_repodata(repo, flags); @@ -2120,6 +1898,7 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) else if ((flags & RPM_ADD_WITH_SHA1SUM) != 0) chksumtype = REPOKEY_TYPE_SHA1; + /* open rpm */ if ((fp = fopen(flags & REPO_USE_ROOTDIR ? pool_prepend_rootdir_tmp(pool, rpm) : rpm, "r")) == 0) { pool_error(pool, -1, "%s: %s", rpm, strerror(errno)); @@ -2131,6 +1910,12 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) fclose(fp); return 0; } + + /* setup state */ + memset(&state, 0, sizeof(state)); + state.pool = pool; + + /* process lead */ if (chksumtype) chksumh = solv_chksum_create(chksumtype); if ((flags & RPM_ADD_WITH_LEADSIGID) != 0) @@ -2138,23 +1923,30 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) if (fread(lead, 96 + 16, 1, fp) != 1 || getu32(lead) != 0xedabeedb) { pool_error(pool, -1, "%s: not a rpm", rpm); + solv_chksum_free(leadsigchksumh, 0); + solv_chksum_free(chksumh, 0); fclose(fp); return 0; } - forcebinary = lead[6] != 0 || lead[7] != 1; if (chksumh) solv_chksum_add(chksumh, lead, 96 + 16); if (leadsigchksumh) solv_chksum_add(leadsigchksumh, lead, 96 + 16); + + /* process signature header */ if (lead[78] != 0 || lead[79] != 5) { pool_error(pool, -1, "%s: not a rpm v5 header", rpm); + solv_chksum_free(leadsigchksumh, 0); + solv_chksum_free(chksumh, 0); fclose(fp); return 0; } if (getu32(lead + 96) != 0x8eade801) { pool_error(pool, -1, "%s: bad signature header", rpm); + solv_chksum_free(leadsigchksumh, 0); + solv_chksum_free(chksumh, 0); fclose(fp); return 0; } @@ -2163,41 +1955,28 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) if (sigcnt >= MAX_SIG_CNT || sigdsize >= MAX_SIG_DSIZE) { pool_error(pool, -1, "%s: bad signature header", rpm); + solv_chksum_free(leadsigchksumh, 0); + solv_chksum_free(chksumh, 0); fclose(fp); return 0; } - sigdsize += sigcnt * 16; - sigdsize = (sigdsize + 7) & ~7; - headerstart = 96 + 16 + sigdsize; + sigpad = sigdsize & 7 ? 8 - (sigdsize & 7) : 0; + headerstart = 96 + 16 + sigcnt * 16 + sigdsize + sigpad; pkgidtype = leadsigidtype = hdridtype = 0; if ((flags & (RPM_ADD_WITH_PKGID | RPM_ADD_WITH_HDRID)) != 0) { - /* extract pkgid or hdrid from the signature header */ - if (sigdsize + 1 > rpmheadsize) - { - rpmheadsize = sigdsize + 128; - rpmhead = solv_realloc(rpmhead, sizeof(*rpmhead) + rpmheadsize); - } - if (fread(rpmhead->data, sigdsize, 1, fp) != 1) + if (!headfromfp(&state, rpm, fp, lead + 96, sigcnt, sigdsize, sigpad, chksumh, leadsigchksumh)) { - pool_error(pool, -1, "%s: unexpected EOF", rpm); + solv_chksum_free(leadsigchksumh, 0); + solv_chksum_free(chksumh, 0); fclose(fp); return 0; } - rpmhead->data[sigdsize] = 0; - if (chksumh) - solv_chksum_add(chksumh, rpmhead->data, sigdsize); - if (leadsigchksumh) - solv_chksum_add(leadsigchksumh, rpmhead->data, sigdsize); - rpmhead->forcebinary = 0; - rpmhead->cnt = sigcnt; - rpmhead->dcnt = sigdsize - sigcnt * 16; - rpmhead->dp = rpmhead->data + rpmhead->cnt * 16; if ((flags & RPM_ADD_WITH_PKGID) != 0) { unsigned char *chksum; unsigned int chksumsize; - chksum = headbinary(rpmhead, SIGTAG_MD5, &chksumsize); + chksum = headbinary(state.rpmhead, SIGTAG_MD5, &chksumsize); if (chksum && chksumsize == 16) { pkgidtype = REPOKEY_TYPE_MD5; @@ -2206,7 +1985,7 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) } if ((flags & RPM_ADD_WITH_HDRID) != 0) { - const char *str = headstring(rpmhead, TAG_SHA1HEADER); + const char *str = headstring(state.rpmhead, TAG_SHA1HEADER); if (str && strlen(str) == 40) { if (solv_hex2bin(&str, hdrid, 20) == 20) @@ -2222,12 +2001,15 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) else { /* just skip the signature header */ - while (sigdsize) + unsigned int len = sigcnt * 16 + sigdsize + sigpad; + while (len) { - l = sigdsize > 4096 ? 4096 : sigdsize; + l = len > 4096 ? 4096 : len; if (fread(lead, l, 1, fp) != 1) { pool_error(pool, -1, "%s: unexpected EOF", rpm); + solv_chksum_free(leadsigchksumh, 0); + solv_chksum_free(chksumh, 0); fclose(fp); return 0; } @@ -2235,7 +2017,7 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) solv_chksum_add(chksumh, lead, l); if (leadsigchksumh) solv_chksum_add(leadsigchksumh, lead, l); - sigdsize -= l; + len -= l; } } if (leadsigchksumh) @@ -2243,9 +2025,12 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) leadsigchksumh = solv_chksum_free(leadsigchksumh, leadsigid); leadsigidtype = REPOKEY_TYPE_MD5; } + + /* process main header */ if (fread(lead, 16, 1, fp) != 1) { pool_error(pool, -1, "%s: unexpected EOF", rpm); + solv_chksum_free(chksumh, 0); fclose(fp); return 0; } @@ -2254,6 +2039,7 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) if (getu32(lead) != 0x8eade801) { pool_error(pool, -1, "%s: bad header", rpm); + solv_chksum_free(chksumh, 0); fclose(fp); return 0; } @@ -2262,46 +2048,35 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) if (sigcnt >= MAX_HDR_CNT || sigdsize >= MAX_HDR_DSIZE) { pool_error(pool, -1, "%s: bad header", rpm); + solv_chksum_free(chksumh, 0); fclose(fp); return 0; } - l = sigdsize + sigcnt * 16; - headerend = headerstart + 16 + l; - if (l + 1 > rpmheadsize) - { - rpmheadsize = l + 128; - rpmhead = solv_realloc(rpmhead, sizeof(*rpmhead) + rpmheadsize); - } - if (fread(rpmhead->data, l, 1, fp) != 1) + headerend = headerstart + 16 + sigdsize + sigcnt * 16; + + if (!headfromfp(&state, rpm, fp, lead, sigcnt, sigdsize, 0, chksumh, 0)) { - pool_error(pool, -1, "%s: unexpected EOF", rpm); + solv_chksum_free(chksumh, 0); fclose(fp); return 0; } - rpmhead->data[l] = 0; - if (chksumh) - solv_chksum_add(chksumh, rpmhead->data, l); - rpmhead->forcebinary = forcebinary; - rpmhead->cnt = sigcnt; - rpmhead->dcnt = sigdsize; - rpmhead->dp = rpmhead->data + rpmhead->cnt * 16; - if (headexists(rpmhead, TAG_PATCHESNAME)) + if (headexists(state.rpmhead, TAG_PATCHESNAME)) { /* this is a patch rpm, ignore */ pool_error(pool, -1, "%s: is patch rpm", rpm); fclose(fp); solv_chksum_free(chksumh, 0); - solv_free(rpmhead); + headfree(state.rpmhead); return 0; } - payloadformat = headstring(rpmhead, TAG_PAYLOADFORMAT); + payloadformat = headstring(state.rpmhead, TAG_PAYLOADFORMAT); if (payloadformat && !strcmp(payloadformat, "drpm")) { /* this is a delta rpm */ pool_error(pool, -1, "%s: is delta rpm", rpm); fclose(fp); solv_chksum_free(chksumh, 0); - solv_free(rpmhead); + headfree(state.rpmhead); return 0; } if (chksumh) @@ -2309,11 +2084,11 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) solv_chksum_add(chksumh, lead, l); fclose(fp); s = pool_id2solvable(pool, repo_add_solvable(repo)); - if (!rpmhead2solv(pool, repo, data, s, rpmhead, flags & ~(RPM_ADD_WITH_HDRID | RPM_ADD_WITH_PKGID))) + if (!rpmhead2solv(pool, repo, data, s, state.rpmhead, flags & ~(RPM_ADD_WITH_HDRID | RPM_ADD_WITH_PKGID))) { - repo_free_solvable(repo, s - pool->solvables, 1); + s = solvable_free(s, 1); solv_chksum_free(chksumh, 0); - solv_free(rpmhead); + headfree(state.rpmhead); return 0; } if (!(flags & REPO_NO_LOCATION)) @@ -2332,7 +2107,7 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags) repodata_set_bin_checksum(data, s - pool->solvables, SOLVABLE_CHECKSUM, chksumtype, solv_chksum_get(chksumh, 0)); chksumh = solv_chksum_free(chksumh, 0); } - solv_free(rpmhead); + headfree(state.rpmhead); if (!(flags & REPO_NO_INTERNALIZE)) repodata_internalize(data); return s - pool->solvables; @@ -2363,7 +2138,7 @@ repo_add_rpm_handle(Repo *repo, void *rpmhandle, int flags) s = pool_id2solvable(pool, repo_add_solvable(repo)); if (!rpmhead2solv(pool, repo, data, s, rpmhead, flags)) { - repo_free_solvable(repo, s - pool->solvables, 1); + s = solvable_free(s, 1); return 0; } if (!(flags & REPO_NO_INTERNALIZE)) @@ -2392,12 +2167,12 @@ rpm_iterate_filelist(void *rpmhandle, int flags, void (*cb)(void *, const char * char **dn; char **md = 0; char **lt = 0; - unsigned int *di, diidx; - unsigned int *co = 0; - unsigned int *ff = 0; + uint32_t *di, diidx; + uint32_t *co = 0; + uint32_t *ff = 0; + uint16_t *fm; unsigned int lastdir; int lastdirl; - unsigned int *fm; int cnt, dcnt, cnt2; int i, l1, l; char *space = 0; @@ -2557,12 +2332,12 @@ rpm_query(void *rpmhandle, Id what) r = 0; switch (what) { - case 0: + case 0: /* return canonical name of rpm */ name = headstring(rpmhead, TAG_NAME); if (!name) name = ""; sourcerpm = headstring(rpmhead, TAG_SOURCERPM); - if (sourcerpm || (rpmhead->forcebinary && !headexists(rpmhead, TAG_SOURCEPACKAGE))) + if (sourcerpm || !(headexists(rpmhead, TAG_SOURCEPACKAGE) || headissourceheuristic(rpmhead))) arch = headstring(rpmhead, TAG_ARCH); else { @@ -2621,7 +2396,7 @@ rpm_installedrpmdbids(void *rpmstate, const char *index, const char *match, Queu struct rpmdbentry *entries; int nentries, i; - entries = getinstalledrpmdbids(rpmstate, index ? index : "Name", match, &nentries, 0); + entries = getinstalledrpmdbids(rpmstate, index ? index : "Name", match, &nentries, 0, 0); if (rpmdbidq) { queue_empty(rpmdbidq); @@ -2632,6 +2407,28 @@ rpm_installedrpmdbids(void *rpmstate, const char *index, const char *match, Queu return nentries; } +int +rpm_hash_database_state(void *rpmstate, Chksum *chk) +{ + struct rpmdbstate *state = rpmstate; + struct stat stb; + if (stat_database(state, &stb)) + return -1; + if (state->dbenvopened != 1 && !opendbenv(state)) + return -1; + solv_chksum_add(chk, &stb.st_mtime, sizeof(stb.st_mtime)); + solv_chksum_add(chk, &stb.st_size, sizeof(stb.st_size)); + solv_chksum_add(chk, &stb.st_ino, sizeof(stb.st_ino)); + hash_name_index(rpmstate, chk); + return 0; +} + +int +rpm_stat_database(void *rpmstate, void *stb) +{ + return stat_database((struct rpmdbstate *)rpmstate, (struct stat *)stb) ? -1 : 0; +} + void * rpm_byrpmdbid(void *rpmstate, Id rpmdbid) { @@ -2644,29 +2441,27 @@ rpm_byrpmdbid(void *rpmstate, Id rpmdbid) return r <= 0 ? 0 : state->rpmhead; } -#endif +#endif /* ENABLE_RPMDB */ void * rpm_byfp(void *rpmstate, FILE *fp, const char *name) { struct rpmdbstate *state = rpmstate; - /* int headerstart, headerend; */ - RpmHead *rpmhead; unsigned int sigdsize, sigcnt, l; unsigned char lead[4096]; - int forcebinary = 0; if (fread(lead, 96 + 16, 1, fp) != 1 || getu32(lead) != 0xedabeedb) { pool_error(state->pool, 0, "%s: not a rpm", name); return 0; } - forcebinary = lead[6] != 0 || lead[7] != 1; if (lead[78] != 0 || lead[79] != 5) { pool_error(state->pool, 0, "%s: not a V5 header", name); return 0; } + + /* skip signature header */ if (getu32(lead + 96) != 0x8eade801) { pool_error(state->pool, 0, "%s: bad signature header", name); @@ -2681,7 +2476,6 @@ rpm_byfp(void *rpmstate, FILE *fp, const char *name) } sigdsize += sigcnt * 16; sigdsize = (sigdsize + 7) & ~7; - /* headerstart = 96 + 16 + sigdsize; */ while (sigdsize) { l = sigdsize > 4096 ? 4096 : sigdsize; @@ -2692,6 +2486,7 @@ rpm_byfp(void *rpmstate, FILE *fp, const char *name) } sigdsize -= l; } + if (fread(lead, 16, 1, fp) != 1) { pool_error(state->pool, 0, "%s: unexpected EOF", name); @@ -2709,37 +2504,24 @@ rpm_byfp(void *rpmstate, FILE *fp, const char *name) pool_error(state->pool, 0, "%s: bad header", name); return 0; } - l = sigdsize + sigcnt * 16; - /* headerend = headerstart + 16 + l; */ - if (l + 1 > state->rpmheadsize) - { - state->rpmheadsize = l + 128; - state->rpmhead = solv_realloc(state->rpmhead, sizeof(*state->rpmhead) + state->rpmheadsize); - } - rpmhead = state->rpmhead; - if (fread(rpmhead->data, l, 1, fp) != 1) - { - pool_error(state->pool, 0, "%s: unexpected EOF", name); - return 0; - } - rpmhead->data[l] = 0; - rpmhead->forcebinary = forcebinary; - rpmhead->cnt = sigcnt; - rpmhead->dcnt = sigdsize; - rpmhead->dp = rpmhead->data + rpmhead->cnt * 16; - return rpmhead; + if (!headfromfp(state, name, fp, lead, sigcnt, sigdsize, 0, 0, 0)) + return 0; + return state->rpmhead; } -#ifdef ENABLE_RPMDB_BYRPMHEADER +#if defined(ENABLE_RPMDB_BYRPMHEADER) || defined(ENABLE_RPMDB_LIBRPM) void * rpm_byrpmh(void *rpmstate, Header h) { struct rpmdbstate *state = rpmstate; +#ifndef ENABLE_RPMPKG_LIBRPM const unsigned char *uh; - unsigned int sigdsize, sigcnt, l; + unsigned int dsize, cnt, len; RpmHead *rpmhead; + if (!h) + return 0; #ifndef RPM5 uh = headerUnload(h); #else @@ -2747,26 +2529,27 @@ rpm_byrpmh(void *rpmstate, Header h) #endif if (!uh) return 0; - sigcnt = getu32(uh); - sigdsize = getu32(uh + 4); - if (sigcnt >= MAX_HDR_CNT || sigdsize >= MAX_HDR_DSIZE) - return 0; - l = sigdsize + sigcnt * 16; - if (l + 1 > state->rpmheadsize) + cnt = getu32(uh); + dsize = getu32(uh + 4); + if (cnt >= MAX_HDR_CNT || dsize >= MAX_HDR_DSIZE) { - state->rpmheadsize = l + 128; - state->rpmhead = solv_realloc(state->rpmhead, sizeof(*state->rpmhead) + state->rpmheadsize); + free((void *)uh); + return 0; } - rpmhead = state->rpmhead; - memcpy(rpmhead->data, uh + 8, l); - rpmhead->data[l] = 0; + len = 16 * cnt + dsize; + rpmhead = realloc_head(state, len + 1);; + memcpy(rpmhead->data, uh + 8, len); + headinit(rpmhead, cnt, dsize); free((void *)uh); - rpmhead->forcebinary = 0; - rpmhead->cnt = sigcnt; - rpmhead->dcnt = sigdsize; - rpmhead->dp = rpmhead->data + sigcnt * 16; - return rpmhead; +#else + if (!h) + return 0; + if (state->rpmhead) + headfree(state->rpmhead); + state->rpmhead = headerLink(h); +#endif + return state->rpmhead; } -#endif +#endif /* defined(ENABLE_RPMDB_BYRPMHEADER) || defined(ENABLE_RPMDB_LIBRPM) */