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