Hello community, here is the log from the commit of package libassuan for openSUSE:Factory checked in at 2019-02-24 16:58:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libassuan (Old) and /work/SRC/openSUSE:Factory/.libassuan.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libassuan" Sun Feb 24 16:58:38 2019 rev:48 rq:673326 version:2.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libassuan/libassuan.changes 2018-12-24 11:35:52.265746153 +0100 +++ /work/SRC/openSUSE:Factory/.libassuan.new.28833/libassuan.changes 2019-02-24 16:58:41.756814576 +0100 @@ -1,0 +2,7 @@ +Mon Feb 11 12:17:05 UTC 2019 - Karol Babioch <[email protected]> + +- Update to 2.5.3: + * Add a timeout for writing to a SOCKS5 proxy. + * Add workaround for a problem with LD_LIBRARY_PATH on newer systems. + +------------------------------------------------------------------- Old: ---- libassuan-2.5.2.tar.bz2 libassuan-2.5.2.tar.bz2.sig New: ---- libassuan-2.5.3.tar.bz2 libassuan-2.5.3.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libassuan.spec ++++++ --- /var/tmp/diff_new_pack.cn6dlf/_old 2019-02-24 16:58:42.184814372 +0100 +++ /var/tmp/diff_new_pack.cn6dlf/_new 2019-02-24 16:58:42.188814370 +0100 @@ -1,7 +1,7 @@ # # spec file for package libassuan # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libassuan -Version: 2.5.2 +Version: 2.5.3 Release: 0 Summary: IPC library used by GnuPG version 2 License: GPL-3.0-or-later AND LGPL-2.1-or-later ++++++ libassuan-2.5.2.tar.bz2 -> libassuan-2.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/AUTHORS new/libassuan-2.5.3/AUTHORS --- old/libassuan-2.5.2/AUTHORS 2018-12-13 09:04:55.000000000 +0100 +++ new/libassuan-2.5.3/AUTHORS 2019-02-11 11:27:47.000000000 +0100 @@ -55,7 +55,7 @@ Copyright (C) 1992-2013 Free Software Foundation, Inc. Copyright (C) 1994 X Consortium Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001-2018 g10 Code GmbH + Copyright (C) 2001-2019 g10 Code GmbH Copyright (C) 2004 Simon Josefsson diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/ChangeLog new/libassuan-2.5.3/ChangeLog --- old/libassuan-2.5.2/ChangeLog 2018-12-13 09:09:52.000000000 +0100 +++ new/libassuan-2.5.3/ChangeLog 2019-02-11 11:34:51.000000000 +0100 @@ -1,3 +1,31 @@ +2019-02-11 Werner Koch <[email protected]> + + Release 2.5.3. + + commit 4de3154ea6e6e89e34760b7b9e0eed5123bb81f9 + + +2019-01-25 Werner Koch <[email protected]> + + socks5: Fix compiler warning on Windows. + + commit 75770b1131e11075c82031bdb220591154df9e64 + * src/assuan-socket.c (socks5_connect): Use cast macro to get the + hightest socket number. + +2019-01-25 NIIBE Yutaka <[email protected]> + + socks5: Implement timeout to detect bogus service. + + commit 5e48116051a476e1dcf5f66d9e21d8003b27ad20 + * src/assuan-socket.c (TIMEOUT_NOT_WAITING_SOCKS5_FOREVER): New. + (socks5_connect): Call 'select' in order to not waiting response + forever. + +2019-01-16 NIIBE Yutaka <[email protected]> + + build: With LD_LIBRARY_PATH defined, use --disable-new-dtags. + + commit 23bf875954329458c0ac6c31e253cba44db8a648 + * configure.ac (LDADD_FOR_TESTS_KLUDGE): New for --disable-new-dtags. + * tests/Makefile.am (LDADD): Use LDADD_FOR_TESTS_KLUDGE. + 2018-12-13 Werner Koch <[email protected]> Release 2.5.2. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/Makefile.in new/libassuan-2.5.3/Makefile.in --- old/libassuan-2.5.2/Makefile.in 2018-12-13 09:09:06.000000000 +0100 +++ new/libassuan-2.5.3/Makefile.in 2019-02-11 11:33:44.000000000 +0100 @@ -278,6 +278,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ +LDADD_FOR_TESTS_KLUDGE = @LDADD_FOR_TESTS_KLUDGE@ LDFLAGS = @LDFLAGS@ LIBASSUAN_CONFIG_API_VERSION = @LIBASSUAN_CONFIG_API_VERSION@ LIBASSUAN_CONFIG_CFLAGS = @LIBASSUAN_CONFIG_CFLAGS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/NEWS new/libassuan-2.5.3/NEWS --- old/libassuan-2.5.2/NEWS 2018-12-13 09:01:38.000000000 +0100 +++ new/libassuan-2.5.3/NEWS 2019-02-11 11:27:01.000000000 +0100 @@ -1,3 +1,16 @@ +Noteworthy changes in version 2.5.3 (2019-02-11) [C8/A8/R3] +------------------------------------------------ + + * Add a timeout for writing to a SOCKS5 proxy. This helps if another + service is running on the standard tor socket (e.g. Windows 10). + [#3381] + + * Add workaround for a problem with LD_LIBRARY_PATH on newer systems. + [#4298] + + Release-info: https://dev.gnupg.org/T4361 + + Noteworthy changes in version 2.5.2 (2018-12-13) [C8/A8/R2] ------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/VERSION new/libassuan-2.5.3/VERSION --- old/libassuan-2.5.2/VERSION 2018-12-13 09:09:06.000000000 +0100 +++ new/libassuan-2.5.3/VERSION 2019-02-11 11:33:44.000000000 +0100 @@ -1 +1 @@ -2.5.2 +2.5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/configure new/libassuan-2.5.3/configure --- old/libassuan-2.5.2/configure 2018-12-13 09:09:07.000000000 +0100 +++ new/libassuan-2.5.3/configure 2019-02-11 11:33:45.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.5.2. +# Generated by GNU Autoconf 2.69 for libassuan 2.5.3. # # Report bugs to <https://bugs.gnupg.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libassuan' PACKAGE_TARNAME='libassuan' -PACKAGE_VERSION='2.5.2' -PACKAGE_STRING='libassuan 2.5.2' +PACKAGE_VERSION='2.5.3' +PACKAGE_STRING='libassuan 2.5.3' PACKAGE_BUGREPORT='https://bugs.gnupg.org' PACKAGE_URL='' @@ -686,6 +686,7 @@ DLLTOOL AS VERSION_NUMBER +LDADD_FOR_TESTS_KLUDGE EGREP GREP CPP @@ -1353,7 +1354,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.5.2 to adapt to many kinds of systems. +\`configure' configures libassuan 2.5.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1423,7 +1424,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libassuan 2.5.2:";; + short | recursive ) echo "Configuration of libassuan 2.5.3:";; esac cat <<\_ACEOF @@ -1540,7 +1541,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libassuan configure 2.5.2 +libassuan configure 2.5.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2120,7 +2121,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.5.2, which was +It was created by libassuan $as_me 2.5.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2477,7 +2478,7 @@ # LIBASSUAN_LT_CURRENT=8 LIBASSUAN_LT_AGE=8 -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 @@ -3002,7 +3003,7 @@ # Define the identity of the package. PACKAGE='libassuan' - VERSION='2.5.2' + VERSION='2.5.3' cat >>confdefs.h <<_ACEOF @@ -4756,7 +4757,39 @@ -VERSION_NUMBER=0x020502 +# Taken from mpfr-4.0.1, then modified for LDADD_FOR_TESTS_KLUDGE +case $host in + *-*-linux*) + if test -n "$LD_LIBRARY_PATH"; then + saved_LDFLAGS="$LDFLAGS" + LDADD_FOR_TESTS_KLUDGE="-Wl,--disable-new-dtags" + LDFLAGS="$LDFLAGS $LDADD_FOR_TESTS_KLUDGE" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether --disable-new-dtags is supported by the linker" >&5 +$as_echo_n "checking whether --disable-new-dtags is supported by the linker... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int main (void) { return 0; } + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (use it since LD_LIBRARY_PATH is set)" >&5 +$as_echo "yes (use it since LD_LIBRARY_PATH is set)" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LDADD_FOR_TESTS_KLUDGE="" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$saved_LDFLAGS" + fi + ;; +esac + + +VERSION_NUMBER=0x020503 # Don't default to build static libs. @@ -13535,7 +13568,7 @@ # # Provide information about the build. # -BUILD_REVISION="86e1d17" +BUILD_REVISION="4de3154" cat >>confdefs.h <<_ACEOF @@ -13544,7 +13577,7 @@ BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` -BUILD_FILEVERSION="${BUILD_FILEVERSION}34529" +BUILD_FILEVERSION="${BUILD_FILEVERSION}19939" # Check whether --enable-build-timestamp was given. @@ -15380,7 +15413,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.5.2, which was +This file was extended by libassuan $as_me 2.5.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15446,7 +15479,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.5.2 +libassuan config.status 2.5.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17442,6 +17475,6 @@ echo " Libassuan v${VERSION} has been configured as follows: - Revision: 86e1d17 (34529) + Revision: 4de3154 (19939) Platform: $host " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/configure.ac new/libassuan-2.5.3/configure.ac --- old/libassuan-2.5.2/configure.ac 2018-12-13 08:58:00.000000000 +0100 +++ new/libassuan-2.5.3/configure.ac 2019-02-11 11:27:16.000000000 +0100 @@ -33,7 +33,7 @@ m4_define([mym4_package],[libassuan]) m4_define([mym4_major], [2]) m4_define([mym4_minor], [5]) -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 @@ -63,7 +63,7 @@ # LIBASSUAN_LT_CURRENT=8 LIBASSUAN_LT_AGE=8 -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 @@ -85,6 +85,41 @@ AC_GNU_SOURCE +# Taken from mpfr-4.0.1, then modified for LDADD_FOR_TESTS_KLUDGE +dnl Under Linux, make sure that the old dtags are used if LD_LIBRARY_PATH +dnl is defined. The issue is that with the new dtags, LD_LIBRARY_PATH has +dnl the precedence over the run path, so that if a compatible MPFR library +dnl is installed in some directory from $LD_LIBRARY_PATH, then the tested +dnl MPFR library will be this library instead of the MPFR library from the +dnl build tree. Other OS with the same issue might be added later. +dnl +dnl References: +dnl https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859732 +dnl http://lists.gnu.org/archive/html/libtool/2017-05/msg00000.html +dnl +dnl We need to check whether --disable-new-dtags is supported as alternate +dnl linkers may be used (e.g., with tcc: CC=tcc LD=tcc). +dnl +case $host in + *-*-linux*) + if test -n "$LD_LIBRARY_PATH"; then + saved_LDFLAGS="$LDFLAGS" + LDADD_FOR_TESTS_KLUDGE="-Wl,--disable-new-dtags" + LDFLAGS="$LDFLAGS $LDADD_FOR_TESTS_KLUDGE" + AC_MSG_CHECKING(whether --disable-new-dtags is supported by the linker) + AC_LINK_IFELSE([AC_LANG_SOURCE([[ +int main (void) { return 0; } + ]])], + [AC_MSG_RESULT(yes (use it since LD_LIBRARY_PATH is set))], + [AC_MSG_RESULT(no) + LDADD_FOR_TESTS_KLUDGE="" + ]) + LDFLAGS="$saved_LDFLAGS" + fi + ;; +esac +AC_SUBST([LDADD_FOR_TESTS_KLUDGE]) + VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x%02x" mym4_major \ mym4_minor mym4_micro) AC_SUBST(VERSION_NUMBER) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/doc/Makefile.in new/libassuan-2.5.3/doc/Makefile.in --- old/libassuan-2.5.2/doc/Makefile.in 2018-12-13 09:09:06.000000000 +0100 +++ new/libassuan-2.5.3/doc/Makefile.in 2019-02-11 11:33:44.000000000 +0100 @@ -257,6 +257,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ +LDADD_FOR_TESTS_KLUDGE = @LDADD_FOR_TESTS_KLUDGE@ LDFLAGS = @LDFLAGS@ LIBASSUAN_CONFIG_API_VERSION = @LIBASSUAN_CONFIG_API_VERSION@ LIBASSUAN_CONFIG_CFLAGS = @LIBASSUAN_CONFIG_CFLAGS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/doc/assuan.info new/libassuan-2.5.3/doc/assuan.info --- old/libassuan-2.5.2/doc/assuan.info 2018-12-13 09:09:52.000000000 +0100 +++ new/libassuan-2.5.3/doc/assuan.info 2019-02-11 11:34:51.000000000 +0100 @@ -7,8 +7,8 @@ This file documents the use and the internals of Assuan. - This is Edition 2.5.2, last updated 7 December 2017, of 'The -'Developing with Assuan' Manual', for Version 2.5.2. + This is Edition 2.5.3, last updated 7 December 2017, of 'The +'Developing with Assuan' Manual', for Version 2.5.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.5.2/doc/stamp-vti new/libassuan-2.5.3/doc/stamp-vti --- old/libassuan-2.5.2/doc/stamp-vti 2018-12-13 09:09:50.000000000 +0100 +++ new/libassuan-2.5.3/doc/stamp-vti 2019-02-11 11:34:50.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 7 December 2017 @set UPDATED-MONTH December 2017 -@set EDITION 2.5.2 -@set VERSION 2.5.2 +@set EDITION 2.5.3 +@set VERSION 2.5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/doc/version.texi new/libassuan-2.5.3/doc/version.texi --- old/libassuan-2.5.2/doc/version.texi 2018-12-13 09:09:50.000000000 +0100 +++ new/libassuan-2.5.3/doc/version.texi 2019-02-11 11:34:50.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 7 December 2017 @set UPDATED-MONTH December 2017 -@set EDITION 2.5.2 -@set VERSION 2.5.2 +@set EDITION 2.5.3 +@set VERSION 2.5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/m4/Makefile.in new/libassuan-2.5.3/m4/Makefile.in --- old/libassuan-2.5.2/m4/Makefile.in 2018-12-13 09:09:06.000000000 +0100 +++ new/libassuan-2.5.3/m4/Makefile.in 2019-02-11 11:33:44.000000000 +0100 @@ -167,6 +167,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ +LDADD_FOR_TESTS_KLUDGE = @LDADD_FOR_TESTS_KLUDGE@ LDFLAGS = @LDFLAGS@ LIBASSUAN_CONFIG_API_VERSION = @LIBASSUAN_CONFIG_API_VERSION@ LIBASSUAN_CONFIG_CFLAGS = @LIBASSUAN_CONFIG_CFLAGS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/src/Makefile.in new/libassuan-2.5.3/src/Makefile.in --- old/libassuan-2.5.2/src/Makefile.in 2018-12-13 09:09:06.000000000 +0100 +++ new/libassuan-2.5.3/src/Makefile.in 2019-02-11 11:33:44.000000000 +0100 @@ -334,6 +334,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ +LDADD_FOR_TESTS_KLUDGE = @LDADD_FOR_TESTS_KLUDGE@ LDFLAGS = @LDFLAGS@ LIBASSUAN_CONFIG_API_VERSION = @LIBASSUAN_CONFIG_API_VERSION@ LIBASSUAN_CONFIG_CFLAGS = @LIBASSUAN_CONFIG_CFLAGS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/src/assuan-socket.c new/libassuan-2.5.3/src/assuan-socket.c --- old/libassuan-2.5.2/src/assuan-socket.c 2018-12-13 08:52:39.000000000 +0100 +++ new/libassuan-2.5.3/src/assuan-socket.c 2019-01-25 13:52:14.000000000 +0100 @@ -690,6 +690,8 @@ } +#define TIMEOUT_NOT_WAITING_SOCKS5_FOREVER 1 /* in second(s) */ + /* Connect using the SOCKS5 protocol. */ static int socks5_connect (assuan_context_t ctx, assuan_fd_t sock, @@ -713,9 +715,14 @@ hostname. */ size_t buflen, hostnamelen; int method; + fd_set fds; + struct timeval tv = { TIMEOUT_NOT_WAITING_SOCKS5_FOREVER, 0 }; addru.addr = addr; + FD_ZERO (&fds); + FD_SET (HANDLE2SOCKET (sock), &fds); + /* memset (&proxyaddr_in6, 0, sizeof proxyaddr_in6); */ memset (&proxyaddr_in, 0, sizeof proxyaddr_in); @@ -770,6 +777,25 @@ ret = do_writen (ctx, sock, buffer, 3); if (ret) return ret; + + /* There may be a different service at the port, which doesn't + respond. Not to be bothred by such a service. */ + /* FIXME: Since the process may block on select, it should be + npth_select to release thread scheduling if nPth is enabled. + Ideally, select is better to be in the system hooks. However, it + is considered OK to use select directly; Normal use case is three + steps: detect SOCKS5 service before nPth use, configure nPth + system hooks, and then use socks5_connect. For the first call, + select indeed blocks, but it's only single thread. For + succeeding calls, this select should soon return successfully. + */ + ret = select (HANDLE2SOCKET (sock)+1, &fds, NULL, NULL, &tv); + if (!ret) + { + gpg_err_set_errno (ETIMEDOUT); + return -1; + } + ret = do_readn (ctx, sock, buffer, 2); if (ret) return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/src/assuan.h.in new/libassuan-2.5.3/src/assuan.h.in --- old/libassuan-2.5.2/src/assuan.h.in 2018-07-02 17:54:56.000000000 +0200 +++ new/libassuan-2.5.3/src/assuan.h.in 2019-02-11 11:28:56.000000000 +0100 @@ -1,6 +1,6 @@ /* assuan.h - Definitions for the Assuan IPC library -*- c -*- * Copyright (C) 2001-2013 Free Software Foundation, Inc. - * Copyright (C) 2001-2017 g10 Code GmbH + * Copyright (C) 2001-2019 g10 Code GmbH * * This file is part of Assuan. * @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, see <http://www.gnu.org/licenses/>. - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later * * @configure_input@ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/src/sysutils.c new/libassuan-2.5.3/src/sysutils.c --- old/libassuan-2.5.2/src/sysutils.c 2018-12-13 09:04:09.000000000 +0100 +++ new/libassuan-2.5.3/src/sysutils.c 2019-02-11 11:28:23.000000000 +0100 @@ -47,7 +47,7 @@ "\n\n" "This is Libassuan " PACKAGE_VERSION " - The GnuPG IPC Library\n" "Copyright 2001-2013 Free Software Foundation, Inc.\n" - "Copyright 2001-2018 g10 Code GmbH\n" + "Copyright 2001-2019 g10 Code GmbH\n" "\n" "SPDX-License-Identifier: LGPL-2.1-or-later\n" "(" BUILD_REVISION " " BUILD_TIMESTAMP ")\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/src/versioninfo.rc.in new/libassuan-2.5.3/src/versioninfo.rc.in --- old/libassuan-2.5.2/src/versioninfo.rc.in 2018-12-13 09:02:17.000000000 +0100 +++ new/libassuan-2.5.3/src/versioninfo.rc.in 2019-02-11 11:27:34.000000000 +0100 @@ -40,7 +40,7 @@ VALUE "FileDescription", "Assuan - GnuPG IPC\0" VALUE "FileVersion", "@LIBASSUAN_LT_CURRENT@.@LIBASSUAN_LT_AGE@.@LIBASSUAN_LT_REVISION@.@BUILD_REVISION@\0" VALUE "InternalName", "libassuan\0" - VALUE "LegalCopyright", "Copyright � 2001-2018 g10 Code GmbH\0" + VALUE "LegalCopyright", "Copyright � 2001-2019 g10 Code GmbH\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libassuan.dll\0" VALUE "PrivateBuild", "\0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/tests/Makefile.am new/libassuan-2.5.3/tests/Makefile.am --- old/libassuan-2.5.2/tests/Makefile.am 2018-07-02 17:46:50.000000000 +0200 +++ new/libassuan-2.5.3/tests/Makefile.am 2019-01-25 13:50:55.000000000 +0100 @@ -47,5 +47,6 @@ noinst_HEADERS = common.h noinst_PROGRAMS = $(TESTS) $(w32cetools) $(testtools) -LDADD = ../src/libassuan.la $(NETLIBS) $(GPG_ERROR_LIBS) +LDADD = ../src/libassuan.la $(NETLIBS) $(GPG_ERROR_LIBS) \ + @LDADD_FOR_TESTS_KLUDGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.5.2/tests/Makefile.in new/libassuan-2.5.3/tests/Makefile.in --- old/libassuan-2.5.2/tests/Makefile.in 2018-12-13 09:09:06.000000000 +0100 +++ new/libassuan-2.5.3/tests/Makefile.in 2019-02-11 11:33:44.000000000 +0100 @@ -300,6 +300,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ +LDADD_FOR_TESTS_KLUDGE = @LDADD_FOR_TESTS_KLUDGE@ LDFLAGS = @LDFLAGS@ LIBASSUAN_CONFIG_API_VERSION = @LIBASSUAN_CONFIG_API_VERSION@ LIBASSUAN_CONFIG_CFLAGS = @LIBASSUAN_CONFIG_CFLAGS@ @@ -404,7 +405,9 @@ AM_CFLAGS = $(GPG_ERROR_CFLAGS) AM_LDFLAGS = -no-install noinst_HEADERS = common.h -LDADD = ../src/libassuan.la $(NETLIBS) $(GPG_ERROR_LIBS) +LDADD = ../src/libassuan.la $(NETLIBS) $(GPG_ERROR_LIBS) \ + @LDADD_FOR_TESTS_KLUDGE@ + all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am
