[packages/libgcrypt] - updated to 1.6.0 (note: new soname) - updated poll patch

[qboosh]

commit c4b9e883bb74925eaa86fb5f1ac69149da163162
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 22 09:58:25 2013 +0100

    - updated to 1.6.0 (note: new soname)
    - updated poll patch

 libgcrypt-poll.patch | 22 ++++++++++++++--------
 libgcrypt.spec       | 17 ++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/libgcrypt.spec b/libgcrypt.spec
index 3e7d12c..6ddd62d 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.5.3
+Version:	1.6.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.gnupg.org/gcrypt/libgcrypt/%{name}-%{version}.tar.bz2
-# Source0-md5:	993159b2924ae7b0e4eaff0743c2db35
+# Source0-md5:	984079ff16fb644dd80d4dddc5fc1a73
 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.8
+BuildRequires:	libgpg-error-devel >= 1.11
 BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	texinfo
-Requires:	libgpg-error >= 1.8
+Requires:	libgpg-error >= 1.11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # for some reason known only to rpm there must be "\\|" not "\|" here
@@ -64,7 +64,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.8
+Requires:	libgpg-error-devel >= 1.11
 
 %description devel
 Header files etc to develop libgcrypt applications.
@@ -128,7 +128,8 @@ Biblioteka statyczna dietlibc libgcrypt.
 %{__make} -C cipher
 %{__make} -C mpi
 %{__make} -C random
-%{__make} -C src
+%{__make} -C src \
+	PROGRAMS=
 mv src/.libs/libgcrypt.a diet-libgcrypt.a
 %{__make} clean
 %endif
@@ -171,8 +172,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
 %attr(755,root,root) %{_bindir}/dumpsexp
 %attr(755,root,root) %{_bindir}/hmac256
+%attr(755,root,root) %{_bindir}/mpicalc
 %attr(755,root,root) /%{_lib}/libgcrypt.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libgcrypt.so.11
+%attr(755,root,root) %ghost /%{_lib}/libgcrypt.so.20
+%{_mandir}/man1/hmac256.1*
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/libgcrypt-poll.patch b/libgcrypt-poll.patch
index 088a5cd..ebf1987 100644
--- a/libgcrypt-poll.patch
+++ b/libgcrypt-poll.patch
@@ -1,5 +1,5 @@
---- libgcrypt-1.5.1/random/rndlinux.c.orig	2012-11-29 15:22:35.000000000 +0100
-+++ libgcrypt-1.5.1/random/rndlinux.c	2013-03-22 22:16:30.431614318 +0100
+--- 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
 @@ -32,6 +32,7 @@
  #include <string.h>
  #include <unistd.h>
@@ -8,7 +8,7 @@
  #include "types.h"
  #include "g10lib.h"
  #include "rand-internal.h"
-@@ -130,24 +131,13 @@
+@@ -179,8 +180,7 @@
                   return with something we will actually use 100ms. */
    while (length)
      {
@@ -17,6 +17,11 @@
 +      struct pollfd fds;
        int rc;
  
+       /* If we collected some bytes update the progress indicator.  We
+@@ -195,20 +195,10 @@
+           any_need_entropy = 1;
+         }
+ 
 -      /* If the system has no limit on the number of file descriptors
 -         and we encounter an fd which is larger than the fd_set size,
 -         we don't use the select at all.  The select code is only used
@@ -25,19 +30,20 @@
 -#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)) )
              {
-               if (!any_need_entropy || last_so_far != (want - length) )
-                 {
-@@ -161,7 +151,7 @@
+               any_need_entropy = 1;
+               delay = 3; /* Use 3 seconds henceforth.  */
+@@ -216,7 +206,7 @@
              }
            else if( rc == -1 )
              {
@@ -45,4 +51,4 @@
 +              log_error ("poll() error: %s\n", strerror(errno));
                if (!delay)
                  delay = 1; /* Use 1 second if we encounter an error before
-                           we have ever blocked.  */
+                               we have ever blocked.  */
================================================================

---- gitweb:

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