[packages/libgcrypt] - updated to 1.8.0 - updated poll patch
qboosh
qboosh at pld-linux.org
Sat Jul 29 10:57:15 CEST 2017
commit e7d292115324f5cee94e63d79f3212dbfaf6e6ba
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jul 29 10:59:12 2017 +0200
- updated to 1.8.0
- updated poll patch
libgcrypt-poll.patch | 21 +++++++++++----------
libgcrypt.spec | 10 +++++-----
2 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/libgcrypt.spec b/libgcrypt.spec
index 125a09b..6fdd6f0 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -8,12 +8,12 @@ Summary(es.UTF-8): Libgcrypt es una biblioteca general de desarrole embasada em
Summary(pl.UTF-8): Biblioteka kryptograficzna oparta na kodzie GnuPG
Summary(pt_BR.UTF-8): libgcrypt é uma biblioteca de criptografia de uso geral baseada no GnuPG
Name: libgcrypt
-Version: 1.7.8
+Version: 1.8.0
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: ftp://ftp.gnupg.org/gcrypt/libgcrypt/%{name}-%{version}.tar.bz2
-# Source0-md5: 34fd2e6d230cbe56799cdf7df05f56c5
+# Source0-md5: 530db74602b558209f9ad7356a680971
Patch0: %{name}-info.patch
Patch1: %{name}-libgcrypt_config.patch
Patch2: %{name}-poll.patch
@@ -24,10 +24,10 @@ BuildRequires: binutils >= 2:2.12
%{?with_dietlibc:BuildRequires: dietlibc-static >= 2:0.31-5}
BuildRequires: gcc >= 5:3.2
%{?with_libcap:BuildRequires: libcap-devel}
-BuildRequires: libgpg-error-devel >= 1.13
+BuildRequires: libgpg-error-devel >= 1.25
BuildRequires: libtool >= 2:2.2.6
BuildRequires: texinfo
-Requires: libgpg-error >= 1.13
+Requires: libgpg-error >= 1.25
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# for some reason known only to rpm there must be "\\|" not "\|" here
@@ -76,7 +76,7 @@ Summary(pt_BR.UTF-8): Arquivos de desenvolvimento da libgcrypt
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%{?with_libcap:Requires: libcap-devel}
-Requires: libgpg-error-devel >= 1.13
+Requires: libgpg-error-devel >= 1.25
%description devel
Header files etc to develop libgcrypt applications.
diff --git a/libgcrypt-poll.patch b/libgcrypt-poll.patch
index dadb1e0..e8b4a47 100644
--- a/libgcrypt-poll.patch
+++ b/libgcrypt-poll.patch
@@ -1,5 +1,5 @@
---- libgcrypt-1.7.1/random/rndlinux.c.orig 2016-06-08 18:18:17.000000000 +0200
-+++ libgcrypt-1.7.1/random/rndlinux.c 2016-06-22 22:26:14.692219129 +0200
+--- libgcrypt-1.8.0/random/rndlinux.c.orig 2017-06-24 13:34:29.000000000 +0200
++++ libgcrypt-1.8.0/random/rndlinux.c 2017-07-29 10:42:28.147643001 +0200
@@ -32,6 +32,7 @@
#include <string.h>
#include <unistd.h>
@@ -8,7 +8,7 @@
#if defined(__linux__) && defined(HAVE_SYSCALL)
# include <sys/syscall.h>
#endif
-@@ -191,8 +192,7 @@
+@@ -216,8 +217,7 @@
return with something we will actually use 100ms. */
while (length)
{
@@ -17,8 +17,8 @@
+ struct pollfd fds;
int rc;
- /* If we collected some bytes update the progress indicator. We
-@@ -207,20 +207,10 @@
+ /* If we have a modern Linux kernel and we want to read from the
+@@ -276,21 +276,11 @@
any_need_entropy = 1;
}
@@ -35,14 +35,15 @@
- FD_SET(fd, &rfds);
- tv.tv_sec = delay;
- tv.tv_usec = delay? 0 : 100000;
-- if ( !(rc=select(fd+1, &rfds, NULL, NULL, &tv)) )
+ fds.fd = fd;
+ fds.events = POLLIN;
-+ if ( !(rc=poll(&fds, 1, delay ? (delay*1000) : 100)) )
+ _gcry_pre_syscall ();
+- rc = select (fd+1, &rfds, NULL, NULL, &tv);
++ rc = poll(&fds, 1, delay ? (delay*1000) : 100);
+ _gcry_post_syscall ();
+ if (!rc)
{
- any_need_entropy = 1;
- delay = 3; /* Use 3 seconds henceforth. */
-@@ -228,7 +218,7 @@
+@@ -300,7 +290,7 @@
}
else if( rc == -1 )
{
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgcrypt.git/commitdiff/e7d292115324f5cee94e63d79f3212dbfaf6e6ba
More information about the pld-cvs-commit
mailing list