rpms/gnupg2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

upgrade to 2.2.11

Browse Source
This commit is contained in:
Tomas Mraz 2018-11-30 17:01:58 +01:00
parent 5cdb295054
commit 4f419e8d2b
4 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -74,3 +74,5 @@ gnupg-2.0.16.tar.bz2.sig
/gnupg-2.2.8.tar.bz2.sig
/gnupg-2.2.9.tar.bz2
/gnupg-2.2.9.tar.bz2.sig
/gnupg-2.2.11.tar.bz2
/gnupg-2.2.11.tar.bz2.sig

38
gnupg-2.1.19-exponential.patch
View File

@ -1,38 +0,0 @@
diff -up gnupg-2.1.19/common/asshelp.c.exponential gnupg-2.1.19/common/asshelp.c
--- gnupg-2.1.19/common/asshelp.c.exponential 2017-03-01 14:04:33.000000000 +0100
+++ gnupg-2.1.19/common/asshelp.c 2017-03-15 17:18:14.279792654 +0100
@@ -434,12 +434,12 @@ start_new_gpg_agent (assuan_context_t *r
agent_program, gpg_strerror (err));
else
{
- for (i=0; i < SECS_TO_WAIT_FOR_AGENT; i++)
+ for (i=2; i < SECS_TO_WAIT_FOR_AGENT*1000; i<<=1) /* start with 2 ms */
{
- if (verbose)
+ if (verbose && i > 500)
log_info (_("waiting for the agent to come up ... (%ds)\n"),
- SECS_TO_WAIT_FOR_AGENT - i);
- gnupg_sleep (1);
+ SECS_TO_WAIT_FOR_AGENT - i/1000);
+ gnupg_usleep (i*1000);
err = assuan_socket_connect (ctx, sockname, 0, 0);
if (!err)
{
@@ -587,13 +587,13 @@ start_new_dirmngr (assuan_context_t *r_c
{
int i;
- for (i=0; i < SECS_TO_WAIT_FOR_DIRMNGR; i++)
+ for (i=2; i < SECS_TO_WAIT_FOR_DIRMNGR*1000; i<<=1) /* start with 2 ms */
{
- if (verbose)
+ if (verbose && i > 500)
log_info (_("waiting for the dirmngr "
"to come up ... (%ds)\n"),
- SECS_TO_WAIT_FOR_DIRMNGR - i);
- gnupg_sleep (1);
+ SECS_TO_WAIT_FOR_DIRMNGR - i/1000);
+ gnupg_usleep (i*1000);
err = assuan_socket_connect (ctx, sockname, 0, 0);
if (!err)
{

9
gnupg2.spec
View File

@ -1,6 +1,6 @@
Summary: Utility for secure communication and data storage
Name: gnupg2
Version: 2.2.9
Version: 2.2.11
Release: 1%{?dist}
License: GPLv3+
@ -8,8 +8,6 @@ Group: Applications/System
Source0: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2
Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2.sig
Patch1: gnupg-2.1.21-insttools.patch
# exponential backoff when waiting on gpg-agent and dirmngr to save time
Patch2: gnupg-2.1.19-exponential.patch
# needed for compatibility with system FIPS mode
Patch3: gnupg-2.1.10-secmem.patch
# non-upstreamable patch adding file-is-digest option needed for Copr
@ -90,7 +88,6 @@ to the base GnuPG package
%if 0%{?rhel} > 5
%patch1 -p1 -b .insttools
%endif
%patch2 -p1 -b .exponential
%patch3 -p1 -b .secmem
%patch4 -p1 -b .file-is-digest
%patch5 -p1 -b .keyusage
@ -187,6 +184,7 @@ make -k check
%{_bindir}/gpg-zip
%endif
%{_bindir}/watchgnupg
%{_bindir}/gpg-wks-server
%{_sbindir}/*
%{_datadir}/gnupg/
%{_libexecdir}/*
@ -201,6 +199,9 @@ make -k check
%changelog
* Fri Nov 30 2018 Tomáš Mráz <tmraz@redhat.com> - 2.2.11-1
- upgrade to 2.2.11
* Wed Aug 1 2018 Tomáš Mráz <tmraz@redhat.com> - 2.2.9-1
- upgrade to 2.2.9

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (gnupg-2.2.9.tar.bz2) = 96faf227bef78fee99ff20606f3ce74eddc407c3864b928f8676a80f50dfaf2dd291eaeeaa0d291a254275a87e4f8506df9ed31c1cfc7652999208c292a16922
SHA512 (gnupg-2.2.9.tar.bz2.sig) = 0d6adbd817846b6041a14b2d5477e111a516405a0b5b10364b9987cf5d4805debb4abd525b1c7fc4f9d9e862b744d335489b0ba494022c69472662d9bea77374
SHA512 (gnupg-2.2.11.tar.bz2) = 8aa8beea877993b6eef155e1a503ffdde9963ff04a24e6a3dea7979efeeeeeab57e942a80ad46ef254d27a83e8cb2e3008da7749afa8e39eade190c0499f95d9
SHA512 (gnupg-2.2.11.tar.bz2.sig) = 5ce421b4cee30023ddbff447414fdbd571a765c2aac27534151e9f03527d40728cdba282ed52d88fa641fbd1bf7ee90457e4ebe7ea2d1cb22af46e5f1dd9ed00