summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sat-solver/sat-solver/rpm5.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/sat-solver/sat-solver/rpm5.patch')
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/rpm5.patch9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-extended/sat-solver/sat-solver/rpm5.patch b/meta/recipes-extended/sat-solver/sat-solver/rpm5.patch
index a44a07deef..5ab632155d 100644
--- a/meta/recipes-extended/sat-solver/sat-solver/rpm5.patch
+++ b/meta/recipes-extended/sat-solver/sat-solver/rpm5.patch
@@ -2,6 +2,11 @@ fix rpm5 build
2 2
38/19/2010 - created by Qing He <qing.he@intel.com> 38/19/2010 - created by Qing He <qing.he@intel.com>
4 4
5
6pgpDigNew/pgpDigFree has changed in RPM 5.4.0
7
8Signed-off-by: Qing He <qing.he@intel.com>
9
5diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c 10diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
6index 34f2b65..3c6ab9a 100644 11index 34f2b65..3c6ab9a 100644
7--- a/ext/repo_rpmdb.c 12--- a/ext/repo_rpmdb.c
@@ -33,7 +38,7 @@ index 34f2b65..3c6ab9a 100644
33 /* only rpm knows how to do the release calculation, we don't dare 38 /* only rpm knows how to do the release calculation, we don't dare
34 * to recreate all the bugs */ 39 * to recreate all the bugs */
35- dig = pgpNewDig(); 40- dig = pgpNewDig();
36+ dig = pgpDigNew(0); 41+ dig = pgpDigNew(RPMVSF_DEFAULT, 0);
37 (void) pgpPrtPkts(pkts, pktsl, dig, 0); 42 (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]; 43 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]); 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]);
@@ -42,7 +47,7 @@ index 34f2b65..3c6ab9a 100644
42 if (dig->pubkey.userid) 47 if (dig->pubkey.userid)
43 setutf8string(data, s - s->repo->pool->solvables, SOLVABLE_SUMMARY, dig->pubkey.userid); 48 setutf8string(data, s - s->repo->pool->solvables, SOLVABLE_SUMMARY, dig->pubkey.userid);
44- pgpFreeDig(dig); 49- pgpFreeDig(dig);
45+ (void) pgpDigFree(dig, ""); 50+ (void) pgpDigFree(dig);
46 sat_free((void *)pkts); 51 sat_free((void *)pkts);
47 return 1; 52 return 1;
48 } 53 }