Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gnupg2.git#b6777871838fd6e28bc8a74223a37cc15f7d4848
This commit is contained in:
DistroBaker 2021-01-12 10:22:45 +00:00
parent 439a676d85
commit 94971b4b08
4 changed files with 12 additions and 7 deletions

2
.gitignore vendored
View File

@ -100,3 +100,5 @@ gnupg-2.0.16.tar.bz2.sig
/gnupg-2.2.25.tar.bz2.sig
/gnupg-2.2.26.tar.bz2
/gnupg-2.2.26.tar.bz2.sig
/gnupg-2.2.27.tar.bz2
/gnupg-2.2.27.tar.bz2.sig

View File

@ -65,15 +65,15 @@ diff -up gnupg-2.2.20/g10/sign.c.file-is-digest gnupg-2.2.20/g10/sign.c
sig->version = pk->version;
@@ -860,8 +863,11 @@ write_signature_packets (ctrl_t ctrl,
else
err = 0;
}
else
err = 0; /* Actually never reached. */
- hash_sigversion_to_magic (md, sig);
- gcry_md_final (md);
+
+ if (!opt.file_is_digest) {
+ hash_sigversion_to_magic (md, sig);
+ gcry_md_final (md);
+ hash_sigversion_to_magic (md, sig);
+ gcry_md_final (md);
+ }
if (!err)

View File

@ -6,7 +6,7 @@
Summary: Utility for secure communication and data storage
Name: gnupg2
Version: 2.2.26
Version: 2.2.27
Release: 1%{?dist}
License: GPLv3+
@ -223,6 +223,9 @@ make -k check
%changelog
* Tue Jan 12 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.27-1
- New upstream release (#1909825)
* Mon Jan 04 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.26-1
- New upstream release (#1909825)

View File

@ -1,2 +1,2 @@
SHA512 (gnupg-2.2.26.tar.bz2) = 5e9482e126c32c836064b125a18b109f0d3c96892474d3fb47dd791350cccefc56f9a5dfbd54504716487a93d9f71de2493bdfef92e29964b5bfe28b0053c265
SHA512 (gnupg-2.2.26.tar.bz2.sig) = e529a51c53d3e49d966a7bfb007f6db25961fac492275c786c508c3afca6e7d4f1e8e72b44ea7b5ef6987f56817fb08f82d519a295d0531c524d1e76d39f6adb
SHA512 (gnupg-2.2.27.tar.bz2) = cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
SHA512 (gnupg-2.2.27.tar.bz2.sig) = d8e951cd4d4db5da53b28647c61c07c05de7fedbc8014c869dee97d9014ac7041c4fcb165ff8ec1fb4f7a6cf3db67e5e4a391c7bda999c22286db6ed78f6e5a5