From 5f27f553ebfe4b4c4e47b44d42466a7992bd66b9 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Jul 2014 19:57:47 -0500 Subject: 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. (From OE-Core rev: c461454d7f3a20ccf9ca20c5c41c80c9becd985c) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch (limited to 'meta/recipes-devtools/rpm/rpm') 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 + +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; + } + -- cgit v1.2.3-54-g00ecf