alexk / rpms / rpm

Forked from rpms/rpm 2 years ago
Clone
Blob Blame History Raw
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 10 Oct 2017 14:40:05 +0300
Subject: [PATCH 05/33] Unbreak file signing from previous commit
From cabecd35ff6842c029103732ca5e5ea7dcdce256 Mon Sep 17 00:00:00 2001

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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/package.c b/lib/package.c
index 211fd3902..b7d996a12 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -43,6 +43,8 @@ struct taglate_s {
     { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0, 0 },
     /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0, 0 }, */ /* long obsolete, dont use */
     { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1, 1 },
+    { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0, 1 },
+    { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1, 1 },
     { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1, 0 },
     { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1, 0 },
     { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0, 0 },
-- 
2.27.0