[packages/libgcrypt] - updated to 1.7.1 - updated poll patch

qboosh qboosh at pld-linux.org
Thu Jun 23 16:26:35 CEST 2016


commit a6d774272fea3ba347e1e0e10982d217e88ad350
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jun 23 16:26:31 2016 +0200

    - updated to 1.7.1
    - updated poll patch

 libgcrypt-poll.patch | 19 +++++++++----------
 libgcrypt.spec       |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/libgcrypt.spec b/libgcrypt.spec
index bd25316..a8c34fb 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.0
+Version:	1.7.1
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.gnupg.org/gcrypt/libgcrypt/%{name}-%{version}.tar.bz2
-# Source0-md5:	67ec79bdde8fd815c9cdd55aa9555935
+# Source0-md5:	8b8e002bcab29c1f1f1940ada831eb49
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-libgcrypt_config.patch
 Patch2:		%{name}-poll.patch
diff --git a/libgcrypt-poll.patch b/libgcrypt-poll.patch
index ebf1987..dadb1e0 100644
--- a/libgcrypt-poll.patch
+++ b/libgcrypt-poll.patch
@@ -1,14 +1,14 @@
---- libgcrypt-1.6.0/random/rndlinux.c.orig	2013-12-16 11:44:25.000000000 +0100
-+++ libgcrypt-1.6.0/random/rndlinux.c	2013-12-22 08:41:51.366559962 +0100
+--- 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
 @@ -32,6 +32,7 @@
  #include <string.h>
  #include <unistd.h>
  #include <fcntl.h>
 +#include <poll.h>
- #include "types.h"
- #include "g10lib.h"
- #include "rand-internal.h"
-@@ -179,8 +180,7 @@
+ #if defined(__linux__) && defined(HAVE_SYSCALL)
+ # include <sys/syscall.h>
+ #endif
+@@ -191,8 +192,7 @@
                   return with something we will actually use 100ms. */
    while (length)
      {
@@ -18,7 +18,7 @@
        int rc;
  
        /* If we collected some bytes update the progress indicator.  We
-@@ -195,20 +195,10 @@
+@@ -207,20 +207,10 @@
            any_need_entropy = 1;
          }
  
@@ -30,20 +30,19 @@
 -#ifdef FD_SETSIZE
 -      if (fd < FD_SETSIZE)
 -#endif
--        {
+         {
 -          FD_ZERO(&rfds);
 -          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)) )
              {
                any_need_entropy = 1;
                delay = 3; /* Use 3 seconds henceforth.  */
-@@ -216,7 +206,7 @@
+@@ -228,7 +218,7 @@
              }
            else if( rc == -1 )
              {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgcrypt.git/commitdiff/a6d774272fea3ba347e1e0e10982d217e88ad350



More information about the pld-cvs-commit mailing list