Hello community, here is the log from the commit of package libassuan for openSUSE:Factory checked in at 2014-11-24 11:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libassuan (Old) and /work/SRC/openSUSE:Factory/.libassuan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libassuan" Changes: -------- --- /work/SRC/openSUSE:Factory/libassuan/libassuan.changes 2014-08-25 11:03:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libassuan.new/libassuan.changes 2014-11-24 11:18:47.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Nov 8 20:19:39 UTC 2014 - [email protected] + +- update to 2.1.3: + + Performance fix for a platform other than GNU/Linux + +------------------------------------------------------------------- Old: ---- libassuan-2.1.2.tar.bz2 libassuan-2.1.2.tar.bz2.sig New: ---- libassuan-2.1.3.tar.bz2 libassuan-2.1.3.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libassuan.spec ++++++ --- /var/tmp/diff_new_pack.h4iNLf/_old 2014-11-24 11:18:48.000000000 +0100 +++ /var/tmp/diff_new_pack.h4iNLf/_new 2014-11-24 11:18:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: libassuan -Version: 2.1.2 +Version: 2.1.3 Release: 0 Summary: IPC library used by GnuPG version 2 License: GPL-3.0+ and LGPL-2.1+ ++++++ libassuan-2.1.2.tar.bz2 -> libassuan-2.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/ChangeLog new/libassuan-2.1.3/ChangeLog --- old/libassuan-2.1.2/ChangeLog 2014-08-17 13:52:07.000000000 +0200 +++ new/libassuan-2.1.3/ChangeLog 2014-11-07 18:06:06.000000000 +0100 @@ -1,3 +1,14 @@ +2014-11-07 Werner Koch <[email protected]> + + Release 2.1.3. + * configure.ac: Set LT version to C4/A4/R3. + + w32: Remove I/O delays due to our 100ms delay after an EAGAIN. + * src/system-w32.c (__assuan_read): Retry using select. Map + WSAECONNRESET to EPIPE. + (__assuan_write): Retry using select. + * src/assuan-buffer.c (readline) [W32]: Return EOF instead of EPIPE. + 2014-08-17 Werner Koch <[email protected]> Release 2.1.2. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/NEWS new/libassuan-2.1.3/NEWS --- old/libassuan-2.1.2/NEWS 2014-08-17 13:47:17.000000000 +0200 +++ new/libassuan-2.1.3/NEWS 2014-11-07 18:01:12.000000000 +0100 @@ -1,3 +1,9 @@ +Noteworthy changes in version 2.1.3 (2014-11-07) [C4/A4/R3] +------------------------------------------------ + + * Performance fix for Windows. + + Noteworthy changes in version 2.1.2 (2014-08-17) [C4/A4/R2] ------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/VERSION new/libassuan-2.1.3/VERSION --- old/libassuan-2.1.2/VERSION 2014-08-17 13:52:08.000000000 +0200 +++ new/libassuan-2.1.3/VERSION 2014-11-07 18:06:06.000000000 +0100 @@ -1 +1 @@ -2.1.2 +2.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/configure new/libassuan-2.1.3/configure --- old/libassuan-2.1.2/configure 2014-08-17 13:51:35.000000000 +0200 +++ new/libassuan-2.1.3/configure 2014-11-07 18:05:30.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libassuan 2.1.2. +# Generated by GNU Autoconf 2.69 for libassuan 2.1.3. # # Report bugs to <http://bugs.gnupg.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libassuan' PACKAGE_TARNAME='libassuan' -PACKAGE_VERSION='2.1.2' -PACKAGE_STRING='libassuan 2.1.2' +PACKAGE_VERSION='2.1.3' +PACKAGE_STRING='libassuan 2.1.3' PACKAGE_BUGREPORT='http://bugs.gnupg.org' PACKAGE_URL='' @@ -1347,7 +1347,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libassuan 2.1.2 to adapt to many kinds of systems. +\`configure' configures libassuan 2.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1417,7 +1417,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libassuan 2.1.2:";; + short | recursive ) echo "Configuration of libassuan 2.1.3:";; esac cat <<\_ACEOF @@ -1527,7 +1527,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libassuan configure 2.1.2 +libassuan configure 2.1.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2107,7 +2107,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libassuan $as_me 2.1.2, which was +It was created by libassuan $as_me 2.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2464,7 +2464,7 @@ # LIBASSUAN_LT_CURRENT=4 LIBASSUAN_LT_AGE=4 -LIBASSUAN_LT_REVISION=2 +LIBASSUAN_LT_REVISION=3 # If the API is changed in an incompatible way: increment the next counter. LIBASSUAN_CONFIG_API_VERSION=2 @@ -2944,7 +2944,7 @@ # Define the identity of the package. PACKAGE='libassuan' - VERSION='2.1.2' + VERSION='2.1.3' cat >>confdefs.h <<_ACEOF @@ -4604,7 +4604,7 @@ #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF -VERSION_NUMBER=0x020102 +VERSION_NUMBER=0x020103 @@ -13446,7 +13446,7 @@ # # Provide information about the build. # -BUILD_REVISION="a5d7f49" +BUILD_REVISION="3003c5d" cat >>confdefs.h <<_ACEOF @@ -13455,7 +13455,7 @@ BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` -BUILD_FILEVERSION="${BUILD_FILEVERSION}42455" +BUILD_FILEVERSION="${BUILD_FILEVERSION}12291" BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date` @@ -15153,7 +15153,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libassuan $as_me 2.1.2, which was +This file was extended by libassuan $as_me 2.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15219,7 +15219,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libassuan config.status 2.1.2 +libassuan config.status 2.1.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17216,6 +17216,6 @@ echo " Libassuan v${VERSION} has been configured as follows: - Revision: a5d7f49 (42455) + Revision: 3003c5d (12291) Platform: $host " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/configure.ac new/libassuan-2.1.3/configure.ac --- old/libassuan-2.1.2/configure.ac 2014-08-17 13:47:24.000000000 +0200 +++ new/libassuan-2.1.3/configure.ac 2014-11-07 18:01:43.000000000 +0100 @@ -31,7 +31,7 @@ m4_define([mym4_package],[libassuan]) m4_define([mym4_major], [2]) m4_define([mym4_minor], [1]) -m4_define([mym4_micro], [2]) +m4_define([mym4_micro], [3]) # To start a new development series, i.e a new major or minor number # you need to mark an arbitrary commit before the first beta release @@ -60,7 +60,7 @@ # LIBASSUAN_LT_CURRENT=4 LIBASSUAN_LT_AGE=4 -LIBASSUAN_LT_REVISION=2 +LIBASSUAN_LT_REVISION=3 # If the API is changed in an incompatible way: increment the next counter. LIBASSUAN_CONFIG_API_VERSION=2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/doc/assuan.info new/libassuan-2.1.3/doc/assuan.info --- old/libassuan-2.1.2/doc/assuan.info 2014-08-17 13:52:07.000000000 +0200 +++ new/libassuan-2.1.3/doc/assuan.info 2014-11-07 18:06:06.000000000 +0100 @@ -7,8 +7,8 @@ END-INFO-DIR-ENTRY This file documents the use and the internals of Assuan. - This is Edition 2.1.2, last updated 15 March 2013, of `The -`Developing with Assuan' Manual', for Version 2.1.2. + This is Edition 2.1.3, last updated 15 March 2013, of `The +`Developing with Assuan' Manual', for Version 2.1.3. Published by the Free Software Foundation 51 Franklin Street, Fifth Floor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/doc/stamp-vti new/libassuan-2.1.3/doc/stamp-vti --- old/libassuan-2.1.2/doc/stamp-vti 2014-08-17 13:52:07.000000000 +0200 +++ new/libassuan-2.1.3/doc/stamp-vti 2014-11-07 18:06:06.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 15 March 2013 @set UPDATED-MONTH March 2013 -@set EDITION 2.1.2 -@set VERSION 2.1.2 +@set EDITION 2.1.3 +@set VERSION 2.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/doc/version.texi new/libassuan-2.1.3/doc/version.texi --- old/libassuan-2.1.2/doc/version.texi 2014-08-17 13:52:07.000000000 +0200 +++ new/libassuan-2.1.3/doc/version.texi 2014-11-07 18:06:06.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 15 March 2013 @set UPDATED-MONTH March 2013 -@set EDITION 2.1.2 -@set VERSION 2.1.2 +@set EDITION 2.1.3 +@set VERSION 2.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/src/assuan-buffer.c new/libassuan-2.1.3/src/assuan-buffer.c --- old/libassuan-2.1.2/src/assuan-buffer.c 2013-03-15 20:26:09.000000000 +0100 +++ new/libassuan-2.1.3/src/assuan-buffer.c 2014-11-07 17:12:45.000000000 +0100 @@ -80,6 +80,15 @@ { if (errno == EINTR) continue; +#ifdef HAVE_W32_SYSTEM + if (errno == EPIPE) + { + /* Under Windows we get EPIPE (actually ECONNRESET) + after termination of the client. Assume an EOF. */ + *r_eof = 1; + break; /* allow incomplete lines */ + } +#endif /*HAVE_W32_SYSTEM*/ return -1; /* read error */ } else if (!n) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/src/system-w32.c new/libassuan-2.1.3/src/system-w32.c --- old/libassuan-2.1.2/src/system-w32.c 2013-03-15 20:26:09.000000000 +0100 +++ new/libassuan-2.1.3/src/system-w32.c 2014-11-07 16:40:32.000000000 +0100 @@ -197,9 +197,27 @@ if (is_socket (fd)) { + int tries = 3; + + again: + ec = 0; res = recv (HANDLE2SOCKET (fd), buffer, size, 0); if (res == -1) ec = WSAGetLastError (); + if (ec == WSAEWOULDBLOCK && tries--) + { + /* EAGAIN: Use select to wait for resources and try again. + We do this 3 times and then give up. The higher level + layer then needs to take care of EAGAIN. No need to + specify a timeout - the socket is not expected to be in + blocking mode. */ + fd_set fds; + + FD_ZERO (&fds); + FD_SET (HANDLE2SOCKET (fd), &fds); + select (0, &fds, NULL, NULL, NULL); + goto again; + } } else { @@ -224,6 +242,7 @@ gpg_err_set_errno (EAGAIN); break; + case WSAECONNRESET: /* Due to the use of recv. */ case ERROR_BROKEN_PIPE: gpg_err_set_errno (EPIPE); break; @@ -247,9 +266,27 @@ if (is_socket (fd)) { + int tries = 3; + + again: + ec = 0; res = send (HANDLE2SOCKET (fd), buffer, size, 0); if (res == -1) ec = WSAGetLastError (); + if (ec == WSAEWOULDBLOCK && tries--) + { + /* EAGAIN: Use select to wait for resources and try again. + We do this 3 times and then give up. The higher level + layer then needs to take care of EAGAIN. No need to + specify a timeout - the socket is not expected to be in + blocking mode. */ + fd_set fds; + + FD_ZERO (&fds); + FD_SET (HANDLE2SOCKET (fd), &fds); + select (0, NULL, &fds, NULL, NULL); + goto again; + } } else { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
