diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2014-07-02 19:57:47 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-08 11:19:49 +0100 |
| commit | c461454d7f3a20ccf9ca20c5c41c80c9becd985c (patch) | |
| tree | b58ea274cc87070ba001462505f32da1fdae502f /meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch | |
| parent | 0fa1eb5c1296a38b332b63d539608da7ef56c3c0 (diff) | |
| download | openembedded-core-c461454d7f3a20ccf9ca20c5c41c80c9becd985c.tar.gz | |
rpm_5.4+cvs: Add RPM community tree for future development
Enable the rpm-5_4 branch via a specific recipe to help track the latest
community development. This should allow us to more quickly move to the next
release when it is available.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch new file mode 100644 index 0000000000..fcbc25df0e --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch @@ -0,0 +1,67 @@ +rpmpgp.c: Add missing if defs around crypto implementations + +Without these, the system will error trying to find the correct crypto +library to use. + +Upstream-status: Pending + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: rpm/rpmio/rpmpgp.c +=================================================================== +--- rpm.orig/rpmio/rpmpgp.c ++++ rpm/rpmio/rpmpgp.c +@@ -1339,16 +1339,26 @@ int pgpExportPubkey(pgpDig dig) + { + int rc = 0; /* assume failure */ + ++#if defined(WITH_BEECRYPT) + if (pgpImplVecs == &rpmbcImplVecs) + rc = rpmbcExportPubkey(dig); ++#endif ++#if defined(WITH_SSL) + if (pgpImplVecs == &rpmsslImplVecs) + rc = rpmsslExportPubkey(dig); ++#endif ++#if defined(WITH_NSS) + if (pgpImplVecs == &rpmnssImplVecs) + rc = rpmnssExportPubkey(dig); ++#endif ++#if defined(WITH_GCRYPT) + if (pgpImplVecs == &rpmgcImplVecs) + rc = rpmgcExportPubkey(dig); ++#endif ++#if defined(WITH_TOMCRYPT) + if (pgpImplVecs == &rpmltcImplVecs) + rc = rpmltcExportPubkey(dig); ++#endif + return rc; + } + +@@ -1356,16 +1366,26 @@ int pgpExportSignature(pgpDig dig, DIGES + { + int rc = 0; /* assume failure */ + ++#if defined(WITH_BEECRYPT) + if (pgpImplVecs == &rpmbcImplVecs) + rc = rpmbcExportSignature(dig, ctx); ++#endif ++#if defined(WITH_SSL) + if (pgpImplVecs == &rpmsslImplVecs) + rc = rpmsslExportSignature(dig, ctx); ++#endif ++#if defined(WITH_NSS) + if (pgpImplVecs == &rpmnssImplVecs) + rc = rpmnssExportSignature(dig, ctx); ++#endif ++#if defined(WITH_GCRYPT) + if (pgpImplVecs == &rpmgcImplVecs) + rc = rpmgcExportSignature(dig, ctx); ++#endif ++#if defined(WITH_TOMCRYPT) + if (pgpImplVecs == &rpmltcImplVecs) + rc = rpmltcExportSignature(dig, ctx); ++#endif + return rc; + } + |