From d7a49e44094a3163edc484618317edfadd43ada6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 16 Aug 2017 16:44:16 +0200 Subject: add support to rpm-4.14 thus breaking support for rpm <= 4.13 --- URPM.xs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/URPM.xs b/URPM.xs index c273550..2338cff 100644 --- a/URPM.xs +++ b/URPM.xs @@ -3030,11 +3030,11 @@ Urpm_parse_rpm(urpm, filename, ...) else if (SvIV(ST(i+1))) { if (len == 5) { if (!memcmp(s, "nopgp", 5)) - vsflags |= (RPMVSF_NOSHA1 | RPMVSF_NOSHA1HEADER); + vsflags |= (RPMVSF_NOPAYLOAD | RPMVSF_NOSHA1HEADER); else if (!memcmp(s, "nogpg", 5)) - vsflags |= (RPMVSF_NOSHA1 | RPMVSF_NOSHA1HEADER); + vsflags |= (RPMVSF_NOPAYLOAD | RPMVSF_NOSHA1HEADER); else if (!memcmp(s, "nomd5", 5)) - vsflags |= (RPMVSF_NOMD5 | RPMVSF_NOMD5HEADER); + vsflags |= (RPMVSF_NOMD5 | RPMVSF_NOSHA256HEADER); else if (!memcmp(s, "norsa", 5)) vsflags |= (RPMVSF_NORSA | RPMVSF_NORSAHEADER); else if (!memcmp(s, "nodsa", 5)) @@ -3122,7 +3122,7 @@ Urpm_get_gpg_fingerprint(filename) pktlen = 0; else { unsigned int i; - pgpPubkeyFingerprint (pkt, pktlen, fingerprint); + pgpPubkeyKeyID (pkt, pktlen, fingerprint); for (i = 0; i < sizeof (pgpKeyID_t); i++) sprintf(&fingerprint_str[i*2], "%02x", fingerprint[i]); } -- cgit v1.2.1