From 0b989774f356a43c8a795d0548ae2c76132c8e60 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 10 Oct 2017 14:40:05 +0300 Subject: [PATCH 06/33] Unbreak file signing from previous commit Commit f558e886050c4e98f6cdde391df679a411b3f62c essentially broke file signing because signatures never get migrated into the package header. This is what happens when you play around with too many variants of the same thing and forget to test what ultimately got committed, which was subtly different from anything else so far... :( --- lib/package.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/package.c b/lib/package.c index 8ee0e9e7c..db70d13f8 100644 --- a/lib/package.c +++ b/lib/package.c @@ -65,12 +65,16 @@ void headerMergeLegacySigs(Header h, Header sigh) case RPMSIGTAG_PAYLOADSIZE: td.tag = RPMTAG_ARCHIVESIZE; break; + case RPMSIGTAG_FILESIGNATURES: + td.tag = RPMTAG_FILESIGNATURES; + break; + case RPMSIGTAG_FILESIGNATURELENGTH: + td.tag = RPMTAG_FILESIGNATURELENGTH; + break; case RPMSIGTAG_SHA1: case RPMSIGTAG_SHA256: case RPMSIGTAG_DSA: case RPMSIGTAG_RSA: - case RPMSIGTAG_FILESIGNATURELENGTH: - case RPMSIGTAG_FILESIGNATURES: default: if (!(td.tag >= HEADER_SIGBASE && td.tag < HEADER_TAGBASE)) continue; -- 2.13.5