diff options
Diffstat (limited to 'meta/recipes-extended/sat-solver/sat-solver/rpm5.patch')
-rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver/rpm5.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-extended/sat-solver/sat-solver/rpm5.patch b/meta/recipes-extended/sat-solver/sat-solver/rpm5.patch new file mode 100644 index 0000000000..a44a07deef --- /dev/null +++ b/meta/recipes-extended/sat-solver/sat-solver/rpm5.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | fix rpm5 build | ||
2 | |||
3 | 8/19/2010 - created by Qing He <qing.he@intel.com> | ||
4 | |||
5 | diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c | ||
6 | index 34f2b65..3c6ab9a 100644 | ||
7 | --- a/ext/repo_rpmdb.c | ||
8 | +++ b/ext/repo_rpmdb.c | ||
9 | @@ -21,10 +21,11 @@ | ||
10 | #include <string.h> | ||
11 | #include <unistd.h> | ||
12 | #include <assert.h> | ||
13 | +#include <stdint.h> | ||
14 | |||
15 | #include <rpm/rpmio.h> | ||
16 | #include <rpm/rpmpgp.h> | ||
17 | -#include <rpm/header.h> | ||
18 | +//#include <rpm/header.h> | ||
19 | #include <rpm/rpmdb.h> | ||
20 | |||
21 | #ifndef DB_CREATE | ||
22 | @@ -2466,7 +2467,7 @@ rpm_byrpmh(Header h, void **statep) | ||
23 | int sigdsize, sigcnt, l; | ||
24 | RpmHead *rpmhead; | ||
25 | |||
26 | - uh = headerUnload(h); | ||
27 | + uh = headerUnload(h, NULL); | ||
28 | if (!uh) | ||
29 | return 0; | ||
30 | sigcnt = getu32(uh); | ||
31 | @@ -2982,7 +2983,7 @@ pubkey2solvable(Solvable *s, Repodata *data, char *pubkey) | ||
32 | parsekeydata(s, data, pkts, pktsl); | ||
33 | /* only rpm knows how to do the release calculation, we don't dare | ||
34 | * to recreate all the bugs */ | ||
35 | - dig = pgpNewDig(); | ||
36 | + dig = pgpDigNew(0); | ||
37 | (void) pgpPrtPkts(pkts, pktsl, dig, 0); | ||
38 | btime = dig->pubkey.time[0] << 24 | dig->pubkey.time[1] << 16 | dig->pubkey.time[2] << 8 | dig->pubkey.signid[3]; | ||
39 | sprintf(evrbuf, "%02x%02x%02x%02x-%02x%02x%02x%02x", dig->pubkey.signid[4], dig->pubkey.signid[5], dig->pubkey.signid[6], dig->pubkey.signid[7], dig->pubkey.time[0], dig->pubkey.time[1], dig->pubkey.time[2], dig->pubkey.time[3]); | ||
40 | @@ -2996,7 +2997,7 @@ pubkey2solvable(Solvable *s, Repodata *data, char *pubkey) | ||
41 | repodata_set_str(data, s - s->repo->pool->solvables, PUBKEY_KEYID, keyid); | ||
42 | if (dig->pubkey.userid) | ||
43 | setutf8string(data, s - s->repo->pool->solvables, SOLVABLE_SUMMARY, dig->pubkey.userid); | ||
44 | - pgpFreeDig(dig); | ||
45 | + (void) pgpDigFree(dig, ""); | ||
46 | sat_free((void *)pkts); | ||
47 | return 1; | ||
48 | } | ||