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