diff -Nru libassuan-2.5.3/aclocal.m4 libassuan-2.5.4/aclocal.m4 --- libassuan-2.5.3/aclocal.m4 2019-02-11 10:33:42.000000000 +0000 +++ libassuan-2.5.4/aclocal.m4 2020-10-23 17:05:40.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,13 +332,12 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -346,49 +345,41 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -397,18 +388,17 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -495,8 +485,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -563,7 +553,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -605,7 +595,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -626,7 +616,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -648,7 +638,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -683,7 +673,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -691,49 +681,42 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -774,7 +757,7 @@ # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -801,7 +784,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -830,7 +813,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -877,7 +860,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -896,7 +879,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -977,7 +960,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1037,7 +1020,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1065,7 +1048,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1084,7 +1067,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru libassuan-2.5.3/ChangeLog libassuan-2.5.4/ChangeLog --- libassuan-2.5.3/ChangeLog 2019-02-11 10:34:51.000000000 +0000 +++ libassuan-2.5.4/ChangeLog 2020-10-23 17:06:39.000000000 +0000 @@ -1,3 +1,44 @@ +2020-10-23 Werner Koch + + Release 2.5.4. + + commit e368b400f276d5d9868832e7a652ab250dd57555 + + +2020-10-20 Werner Koch + + Support Unicode socket file names under Windows. + + commit 397316e9d0fb7c6a0daf163bf252edb996ffba46 + * src/assuan-socket.c [W32]: Always use CreateFileW. Drop support for + Windows-CE + (read_port_and_nonce): Use gpgrt_fopen. + +2020-02-25 NIIBE Yutaka + + build: Use Requires.private and Libs.private. + + commit 034e5450cdd5d886d9f333ef3872d4263b435dbb + * configure.ac (LIBASSUAN_CONFIG_LIBS): Remove NETLIBS. + * src/libassuan.pc.in: Distinguish static link. + * tests/Makefile.am: Don't need to link NETLIBS. + +2019-11-27 Werner Koch + + w32: Fix bad-function-cast warning. + + commit 16d3ffa15906037863110f4157ab84e13f579752 + * src/w32-fd-t.inc.h (assuan_fd_from_posix_fd): Avoid compiler warning. + +2019-08-20 NIIBE Yutaka + + libassuan.pc: Fix to have -I for Cflags and -L for Libs. + + commit 909133baad498ca395a01336f3b49d85322a1d12 + * src/libassuan.pc.in (Cflags): Add -I flag. + (Libs): Add -L flag. + +2019-07-18 Daniel Kahn Gillmor + + build: Use {CFLAGS,CPPFLAGS,LDFLAGS}_FOR_BUILD for helper programs. + + commit 98d7c7ea3f37cf359f7e90192dedee7b1a791172 + * src/Makefile.am: pass distinct build flags to CC_FOR_BUILD. + 2019-02-11 Werner Koch Release 2.5.3. diff -Nru libassuan-2.5.3/configure libassuan-2.5.4/configure --- libassuan-2.5.3/configure 2019-02-11 10:33:45.000000000 +0000 +++ libassuan-2.5.4/configure 2020-10-23 17:05:42.000000000 +0000 @@ -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.3. +# Generated by GNU Autoconf 2.69 for libassuan 2.5.4. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libassuan' PACKAGE_TARNAME='libassuan' -PACKAGE_VERSION='2.5.3' -PACKAGE_STRING='libassuan 2.5.3' +PACKAGE_VERSION='2.5.4' +PACKAGE_STRING='libassuan 2.5.4' PACKAGE_BUGREPORT='https://bugs.gnupg.org' PACKAGE_URL='' @@ -697,7 +697,6 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -767,6 +766,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -785,7 +785,8 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -852,6 +853,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1104,6 +1106,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1241,7 +1252,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1354,7 +1365,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.3 to adapt to many kinds of systems. +\`configure' configures libassuan 2.5.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1394,6 +1405,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1424,7 +1436,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libassuan 2.5.3:";; + short | recursive ) echo "Configuration of libassuan 2.5.4:";; esac cat <<\_ACEOF @@ -1541,7 +1553,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libassuan configure 2.5.3 +libassuan configure 2.5.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2121,7 +2133,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.3, which was +It was created by libassuan $as_me 2.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2478,7 +2490,7 @@ # LIBASSUAN_LT_CURRENT=8 LIBASSUAN_LT_AGE=8 -LIBASSUAN_LT_REVISION=3 +LIBASSUAN_LT_REVISION=4 # If the API is changed in an incompatible way: increment the next counter. LIBASSUAN_CONFIG_API_VERSION=2 @@ -2517,7 +2529,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.15' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3003,7 +3015,7 @@ # Define the identity of the package. PACKAGE='libassuan' - VERSION='2.5.3' + VERSION='2.5.4' cat >>confdefs.h <<_ACEOF @@ -3033,8 +3045,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -3085,7 +3097,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3261,45 +3273,45 @@ ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -4789,7 +4801,7 @@ esac -VERSION_NUMBER=0x020503 +VERSION_NUMBER=0x020504 # Don't default to build static libs. @@ -13568,7 +13580,7 @@ # # Provide information about the build. # -BUILD_REVISION="4de3154" +BUILD_REVISION="e368b40" cat >>confdefs.h <<_ACEOF @@ -13577,7 +13589,7 @@ BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` -BUILD_FILEVERSION="${BUILD_FILEVERSION}19939" +BUILD_FILEVERSION="${BUILD_FILEVERSION}58216" # Check whether --enable-build-timestamp was given. @@ -13666,9 +13678,6 @@ LIBASSUAN_CONFIG_LIBS="-lassuan" LIBASSUAN_CONFIG_CFLAGS="" LIBASSUAN_CONFIG_HOST="$host" -if test x"$NETLIBS" != x; then - LIBASSUAN_CONFIG_LIBS="$LIBASSUAN_CONFIG_LIBS $NETLIBS" -fi @@ -15413,7 +15422,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.3, which was +This file was extended by libassuan $as_me 2.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15479,7 +15488,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.3 +libassuan config.status 2.5.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15598,7 +15607,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -16571,29 +16580,35 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -16611,53 +16626,48 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) @@ -17475,6 +17485,6 @@ echo " Libassuan v${VERSION} has been configured as follows: - Revision: 4de3154 (19939) + Revision: e368b40 (58216) Platform: $host " diff -Nru libassuan-2.5.3/configure.ac libassuan-2.5.4/configure.ac --- libassuan-2.5.3/configure.ac 2019-02-11 10:27:16.000000000 +0000 +++ libassuan-2.5.4/configure.ac 2020-10-23 16:54:00.000000000 +0000 @@ -33,7 +33,7 @@ m4_define([mym4_package],[libassuan]) m4_define([mym4_major], [2]) m4_define([mym4_minor], [5]) -m4_define([mym4_micro], [3]) +m4_define([mym4_micro], [4]) # 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=3 +LIBASSUAN_LT_REVISION=4 # If the API is changed in an incompatible way: increment the next counter. LIBASSUAN_CONFIG_API_VERSION=2 @@ -328,9 +328,6 @@ LIBASSUAN_CONFIG_LIBS="-lassuan" LIBASSUAN_CONFIG_CFLAGS="" LIBASSUAN_CONFIG_HOST="$host" -if test x"$NETLIBS" != x; then - LIBASSUAN_CONFIG_LIBS="$LIBASSUAN_CONFIG_LIBS $NETLIBS" -fi AC_SUBST(LIBASSUAN_CONFIG_LIBS) AC_SUBST(LIBASSUAN_CONFIG_CFLAGS) AC_SUBST(LIBASSUAN_CONFIG_HOST) diff -Nru libassuan-2.5.3/debian/changelog libassuan-2.5.4/debian/changelog --- libassuan-2.5.3/debian/changelog 2020-06-10 09:57:10.000000000 +0000 +++ libassuan-2.5.4/debian/changelog 2021-02-11 11:27:42.000000000 +0000 @@ -1,3 +1,22 @@ +libassuan (2.5.4-1ubuntu1) hirsute; urgency=medium + + [ Andreas Metzler ] + * libassuan pkg-config requires libgpg-error > 1.33. - Tighten + (build-)dependencies. + * Fix CI error by linking test binary explicitly against libgpg-error. + Closes: #982170 + + -- Julian Andres Klode Thu, 11 Feb 2021 12:27:42 +0100 + +libassuan (2.5.4-1) unstable; urgency=medium + + * New upstream release + * Update signing key from https://gnupg.org/signature_key.html + * Standards-Version to 4.5.1.0 + * Drop upstreamed 0003-build-Use-CFLAGS-CPPFLAGS-LDFLAGS-_FOR_BUILD-for-hel.patch + + -- Eric Dorland Fri, 15 Jan 2021 23:40:32 -0500 + libassuan (2.5.3-7.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru libassuan-2.5.3/debian/control libassuan-2.5.4/debian/control --- libassuan-2.5.3/debian/control 2019-07-15 22:38:27.000000000 +0000 +++ libassuan-2.5.4/debian/control 2021-02-11 11:27:42.000000000 +0000 @@ -1,17 +1,18 @@ Source: libassuan Section: libs Priority: optional -Maintainer: Debian GnuPG-Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GnuPG-Maintainers Uploaders: Eric Dorland , Daniel Kahn Gillmor , Build-Depends: debhelper-compat (= 12), - libgpg-error-dev (>= 1.17), + libgpg-error-dev (>= 1.33), Build-Depends-Indep: libgpg-error-mingw-w64-dev, mingw-w64, -Standards-Version: 4.4.0 +Standards-Version: 4.5.1.0 Vcs-Git: https://salsa.debian.org/debian/libassuan.git -b debian/master Vcs-Browser: https://salsa.debian.org/debian/libassuan Homepage: https://www.gnupg.org/related_software/libassuan/index.html @@ -36,7 +37,7 @@ Depends: dpkg (>= 1.15.4) | install-info, libassuan0 (= ${binary:Version}), - libgpg-error-dev (>= 1.17), + libgpg-error-dev (>= 1.33), ${misc:Depends}, Description: IPC library for the GnuPG components -- header files Libassuan is a small library implementing the so-called "Assuan @@ -50,7 +51,7 @@ Architecture: all Section: libdevel Depends: - libgpg-error-mingw-w64-dev (>= 1.17), + libgpg-error-mingw-w64-dev (>= 1.33), ${misc:Depends}, Recommends: mingw-w64, diff -Nru libassuan-2.5.3/debian/patches/0003-pass-through-CFLAGS-CPPFLAGS-LDFLAGS-_FOR_BUILD-when.patch libassuan-2.5.4/debian/patches/0003-pass-through-CFLAGS-CPPFLAGS-LDFLAGS-_FOR_BUILD-when.patch --- libassuan-2.5.3/debian/patches/0003-pass-through-CFLAGS-CPPFLAGS-LDFLAGS-_FOR_BUILD-when.patch 2019-07-17 15:08:11.000000000 +0000 +++ libassuan-2.5.4/debian/patches/0003-pass-through-CFLAGS-CPPFLAGS-LDFLAGS-_FOR_BUILD-when.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: Daniel Kahn Gillmor -Date: Tue, 16 Jul 2019 14:01:27 -0400 -Subject: pass through {CFLAGS,CPPFLAGS,LDFLAGS}_FOR_BUILD when creating - helper programs - -See https://bugs.debian.org/932213 for more details about the -situation. ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 089bc97..9bd65e9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -149,7 +149,7 @@ install-exec-hook: - endif - - mkheader: mkheader.c Makefile -- $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c - - assuan.h: assuan.h.in mkheader $(parts_of_assuan_h) - ./mkheader $(host_os) $(srcdir)/assuan.h.in \ diff -Nru libassuan-2.5.3/debian/patches/series libassuan-2.5.4/debian/patches/series --- libassuan-2.5.3/debian/patches/series 2019-07-17 15:08:11.000000000 +0000 +++ libassuan-2.5.4/debian/patches/series 2021-02-11 11:27:42.000000000 +0000 @@ -1,3 +1,2 @@ 0001-avoid-linker-errors-when-cross-building-for-win32.patch 0002-avoid-self-describing-as-a-beta.patch -0003-pass-through-CFLAGS-CPPFLAGS-LDFLAGS-_FOR_BUILD-when.patch diff -Nru libassuan-2.5.3/debian/tests/build libassuan-2.5.4/debian/tests/build --- libassuan-2.5.3/debian/tests/build 2019-07-15 04:52:27.000000000 +0000 +++ libassuan-2.5.4/debian/tests/build 2021-02-11 11:27:42.000000000 +0000 @@ -4,7 +4,7 @@ gcc -pedantic -Wall -Werror -o test-run \ debian/tests/simple-build.c \ - $(pkg-config --cflags --libs libassuan) + $(pkg-config --cflags --libs libassuan gpg-error) ./test-run rm -f test-run diff -Nru libassuan-2.5.3/debian/tests/build-windows libassuan-2.5.4/debian/tests/build-windows --- libassuan-2.5.3/debian/tests/build-windows 2020-06-10 09:57:10.000000000 +0000 +++ libassuan-2.5.4/debian/tests/build-windows 2021-02-11 11:27:42.000000000 +0000 @@ -31,6 +31,6 @@ extra_libs=(-lws2_32) # build a static windows binary around libassuan and run it: -"$GCC" -pedantic -Wall -Werror -static -o test-run.exe debian/tests/simple-build.c $(pkg-config --cflags --static --libs libassuan) "${extra_libs[@]}" +"$GCC" -pedantic -Wall -Werror -static -o test-run.exe debian/tests/simple-build.c $(pkg-config --cflags --static --libs libassuan gpg-error) "${extra_libs[@]}" "$WINE" ./test-run.exe rm -f ./test-run.exe diff -Nru libassuan-2.5.3/debian/upstream/signing-key.asc libassuan-2.5.4/debian/upstream/signing-key.asc --- libassuan-2.5.3/debian/upstream/signing-key.asc 2019-03-20 13:37:10.000000000 +0000 +++ libassuan-2.5.4/debian/upstream/signing-key.asc 2021-02-11 11:27:42.000000000 +0000 @@ -6,49 +6,61 @@ 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 -=jIGA +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 +l7ErThn6owVH9szWrUt6jkKOBg== +=h7e4 -----END PGP PUBLIC KEY BLOCK----- + diff -Nru libassuan-2.5.3/doc/assuan.info libassuan-2.5.4/doc/assuan.info --- libassuan-2.5.3/doc/assuan.info 2019-02-11 10:34:51.000000000 +0000 +++ libassuan-2.5.4/doc/assuan.info 2020-10-23 17:06:39.000000000 +0000 @@ -1,4 +1,4 @@ -This is assuan.info, produced by makeinfo version 6.3 from assuan.texi. +This is assuan.info, produced by makeinfo version 6.5 from assuan.texi. INFO-DIR-SECTION GNU Libraries START-INFO-DIR-ENTRY @@ -7,8 +7,8 @@ This file documents the use and the internals of Assuan. - This is Edition 2.5.3, last updated 7 December 2017, of 'The -'Developing with Assuan' Manual', for Version 2.5.3. + This is Edition 2.5.4, last updated 7 December 2017, of 'The +'Developing with Assuan' Manual', for Version 2.5.4. Published by the Free Software Foundation 51 Franklin Street, Fifth Floor diff -Nru libassuan-2.5.3/doc/Makefile.in libassuan-2.5.4/doc/Makefile.in --- libassuan-2.5.3/doc/Makefile.in 2019-02-11 10:33:44.000000000 +0000 +++ libassuan-2.5.4/doc/Makefile.in 2020-10-23 17:05:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -344,6 +344,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -376,8 +377,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -562,7 +563,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru libassuan-2.5.3/doc/stamp-vti libassuan-2.5.4/doc/stamp-vti --- libassuan-2.5.3/doc/stamp-vti 2019-02-11 10:34:50.000000000 +0000 +++ libassuan-2.5.4/doc/stamp-vti 2020-10-23 17:06:38.000000000 +0000 @@ -1,4 +1,4 @@ @set UPDATED 7 December 2017 @set UPDATED-MONTH December 2017 -@set EDITION 2.5.3 -@set VERSION 2.5.3 +@set EDITION 2.5.4 +@set VERSION 2.5.4 diff -Nru libassuan-2.5.3/doc/version.texi libassuan-2.5.4/doc/version.texi --- libassuan-2.5.3/doc/version.texi 2019-02-11 10:34:50.000000000 +0000 +++ libassuan-2.5.4/doc/version.texi 2020-10-23 17:06:38.000000000 +0000 @@ -1,4 +1,4 @@ @set UPDATED 7 December 2017 @set UPDATED-MONTH December 2017 -@set EDITION 2.5.3 -@set VERSION 2.5.3 +@set EDITION 2.5.4 +@set VERSION 2.5.4 diff -Nru libassuan-2.5.3/m4/Makefile.in libassuan-2.5.4/m4/Makefile.in --- libassuan-2.5.3/m4/Makefile.in 2019-02-11 10:33:44.000000000 +0000 +++ libassuan-2.5.4/m4/Makefile.in 2020-10-23 17:05:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -254,6 +254,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -283,8 +284,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -308,7 +309,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru libassuan-2.5.3/Makefile.in libassuan-2.5.4/Makefile.in --- libassuan-2.5.3/Makefile.in 2019-02-11 10:33:44.000000000 +0000 +++ libassuan-2.5.4/Makefile.in 2020-10-23 17:05:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -158,7 +158,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, @@ -365,6 +365,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -412,8 +413,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -555,7 +556,10 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -623,7 +627,7 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 @@ -648,7 +652,7 @@ @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -666,7 +670,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -676,7 +680,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff -Nru libassuan-2.5.3/NEWS libassuan-2.5.4/NEWS --- libassuan-2.5.3/NEWS 2019-02-11 10:27:01.000000000 +0000 +++ libassuan-2.5.4/NEWS 2020-10-23 16:53:48.000000000 +0000 @@ -1,3 +1,13 @@ +Noteworthy changes in version 2.5.4 (2020-10-23) [C8/A8/R4] +------------------------------------------------ + + * Support Unicode socket names on Windows. + + * Fix some minor build annoyances. + + Release-info: https://dev.gnupg.org/T5112 + + Noteworthy changes in version 2.5.3 (2019-02-11) [C8/A8/R3] ------------------------------------------------ diff -Nru libassuan-2.5.3/README libassuan-2.5.4/README --- libassuan-2.5.3/README 2018-12-13 08:04:29.000000000 +0000 +++ libassuan-2.5.4/README 2020-10-23 16:57:37.000000000 +0000 @@ -2,7 +2,7 @@ =========== Copyright (C) 2001-2013 Free Software Foundation, Inc. - Copyright (C) 2001-2018 g10 Code GmbH + Copyright (C) 2001-2020 g10 Code GmbH This is a general purpose IPC library which is for example used diff -Nru libassuan-2.5.3/src/assuan-handler.c libassuan-2.5.4/src/assuan-handler.c --- libassuan-2.5.3/src/assuan-handler.c 2017-11-15 15:34:13.000000000 +0000 +++ libassuan-2.5.4/src/assuan-handler.c 2020-05-27 09:40:50.000000000 +0000 @@ -408,7 +408,7 @@ * HELPSTRING * * Register a handler to be used for a given command. Note that - * several default handlers are already regsitered with a new context. + * several default handlers are already registered with a new context. * This function however allows to override them. * * Return value: 0 on success or an error code diff -Nru libassuan-2.5.3/src/assuan.h.in libassuan-2.5.4/src/assuan.h.in --- libassuan-2.5.3/src/assuan.h.in 2019-02-11 10:28:56.000000000 +0000 +++ libassuan-2.5.4/src/assuan.h.in 2020-10-23 16:57:00.000000000 +0000 @@ -1,6 +1,6 @@ /* assuan.h - Definitions for the Assuan IPC library -*- c -*- * Copyright (C) 2001-2013 Free Software Foundation, Inc. - * Copyright (C) 2001-2019 g10 Code GmbH + * Copyright (C) 2001-2020 g10 Code GmbH * * This file is part of Assuan. * @@ -21,6 +21,13 @@ * @configure_input@ */ +/* Compile time configuration: + * + * #define _ASSUAN_NO_SOCKET_WRAPPER + * + * Do not include the definitions for the socket wrapper feature. + */ + #ifndef ASSUAN_H #define ASSUAN_H @@ -37,13 +44,6 @@ #include -/* Compile time configuration: - - #define _ASSUAN_NO_SOCKET_WRAPPER - - Do not include the definitions for the socket wrapper feature. */ - - #ifdef __cplusplus extern "C" { @@ -53,12 +53,12 @@ #endif /* The version of this header should match the one of the library. Do - not use this symbol in your application; use assuan_check_version - instead. */ + * not use this symbol in your application; use assuan_check_version + * instead. */ #define ASSUAN_VERSION @version@ /* The version number of this header. It may be used to handle minor - API incompatibilities. */ + * API incompatibilities. */ #define ASSUAN_VERSION_NUMBER @version-number@ @@ -88,7 +88,9 @@ @include:sock-nonce@ -/* Global interface. */ +/* + * Global interface. + */ struct assuan_malloc_hooks { @@ -107,8 +109,8 @@ #define ASSUAN_LOG_CONTROL 8 /* If MSG is NULL, return true/false depending on if this category is - logged. This is used to probe before expensive log message - generation (buffer dumps). */ + * logged. This is used to probe before expensive log message + * generation (buffer dumps). */ typedef int (*assuan_log_cb_t) (assuan_context_t ctx, void *hook, unsigned int cat, const char *msg); @@ -137,7 +139,7 @@ /* Create a new Assuan context. The initial parameters are all needed - in the creation of the context. */ + * in the creation of the context. */ gpg_error_t assuan_new_ext (assuan_context_t *ctx, gpg_err_source_t errsource, assuan_malloc_hooks_t malloc_hooks, assuan_log_cb_t log_cb, void *log_cb_data); @@ -149,7 +151,7 @@ void assuan_release (assuan_context_t ctx); /* Release the memory at PTR using the allocation handler of the - context CTX. This is a convenience function. */ + * context CTX. This is a convenience function. */ void assuan_free (assuan_context_t ctx, void *ptr); @@ -164,33 +166,38 @@ typedef unsigned int assuan_flag_t; /* When using a pipe server, by default Assuan will wait for the - forked process to die in assuan_release. In certain cases this - is not desirable. By setting this flag, the waitpid will be - skipped and the caller is responsible to cleanup a forked - process. */ + * forked process to die in assuan_release. In certain cases this + * is not desirable. By setting this flag, the waitpid will be + * skipped and the caller is responsible to cleanup a forked + * process. */ #define ASSUAN_NO_WAITPID 1 + /* This flag indicates whether Assuan logging is in confidential mode. You can use assuan_{begin,end}_condidential to change the mode. */ #define ASSUAN_CONFIDENTIAL 2 + /* This flag suppresses fix up of signal handlers for pipes. */ #define ASSUAN_NO_FIXSIGNALS 3 + /* This flag changes assuan_transact to return comment lines via the - status callback. The default is to skip comment lines. */ + * status callback. The default is to skip comment lines. */ #define ASSUAN_CONVEY_COMMENTS 4 + /* This flag disables logging for one context. */ #define ASSUAN_NO_LOGGING 5 + /* This flag forces a connection close. */ #define ASSUAN_FORCE_CLOSE 6 + /* For context CTX, set the flag FLAG to VALUE. Values for flags - are usually 1 or 0 but certain flags might allow for other values; - see the description of the type assuan_flag_t for details. */ + * are usually 1 or 0 but certain flags might allow for other values; + * see the description of the type assuan_flag_t for details. */ void assuan_set_flag (assuan_context_t ctx, assuan_flag_t flag, int value); /* Return the VALUE of FLAG in context CTX. */ int assuan_get_flag (assuan_context_t ctx, assuan_flag_t flag); - /* Same as assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 1). */ void assuan_begin_confidential (assuan_context_t ctx); @@ -207,7 +214,7 @@ #define ASSUAN_IO_MONITOR_IGNORE 2 /* The IO monitor gets to see all I/O on the context, and can return - ASSUAN_IO_MONITOR_* bits to control actions on it. */ + * ASSUAN_IO_MONITOR_* bits to control actions on it. */ typedef unsigned int (*assuan_io_monitor_t) (assuan_context_t ctx, void *hook, int inout, const char *line, size_t linelen); @@ -216,7 +223,7 @@ void assuan_set_io_monitor (assuan_context_t ctx, assuan_io_monitor_t io_monitor, void *hook_data); - +/* The system hooks. See assuan_set_system_hooks et al. */ #define ASSUAN_SYSTEM_HOOKS_VERSION 2 #define ASSUAN_SPAWN_DETACHED 128 struct assuan_system_hooks @@ -265,18 +272,21 @@ }; typedef struct assuan_system_hooks *assuan_system_hooks_t; + -/* Configuration of the default log handler. */ +/* + * Configuration of the default log handler. + */ /* Set the prefix to be used at the start of a line emitted by assuan - on the log stream. The default is the empty string. Note, that - this function is not thread-safe and should in general be used - right at startup. */ + * on the log stream. The default is the empty string. Note, that + * this function is not thread-safe and should in general be used + * right at startup. */ void assuan_set_assuan_log_prefix (const char *text); /* Return a prefix to be used at the start of a line emitted by assuan - on the log stream. The default implementation returns the empty - string, i.e. "" */ + * on the log stream. The default implementation returns the empty + * string, i.e. "". */ const char *assuan_get_assuan_log_prefix (void); /* Global default log stream. */ @@ -286,6 +296,7 @@ void assuan_set_log_stream (assuan_context_t ctx, FILE *fp); +/* The type for assuan command handlers. */ typedef gpg_error_t (*assuan_handler_t) (assuan_context_t, char *); /*-- assuan-handler.c --*/ @@ -294,7 +305,9 @@ assuan_handler_t handler, const char *help_string); gpg_error_t assuan_register_pre_cmd_notify (assuan_context_t ctx, - gpg_error_t (*fnc)(assuan_context_t, const char *cmd)); + gpg_error_t (*fnc)(assuan_context_t, + const char *cmd)); + gpg_error_t assuan_register_post_cmd_notify (assuan_context_t ctx, void (*fnc)(assuan_context_t, gpg_error_t)); @@ -328,10 +341,10 @@ const char *keyword, const char *text); /* Negotiate a file descriptor. If LINE contains "FD=N", returns N - assuming a local file descriptor. If LINE contains "FD" reads a - file descriptor via CTX and stores it in *RDF (the CTX must be - capable of passing file descriptors). Under W32 the returned FD is - a libc-type one. */ + * assuming a local file descriptor. If LINE contains "FD" reads a + * file descriptor via CTX and stores it in *RDF (the CTX must be + * capable of passing file descriptors). Under Windows the returned + * FD is a libc-type one. */ gpg_error_t assuan_command_parse_fd (assuan_context_t ctx, char *line, assuan_fd_t *rfd); @@ -397,7 +410,11 @@ -/* Client interface. */ +/* + * Client interface. + */ + +/* Client response codes. */ #define ASSUAN_RESPONSE_ERROR 0 #define ASSUAN_RESPONSE_OK 1 #define ASSUAN_RESPONSE_DATA 2 @@ -448,8 +465,8 @@ const void *buffer, size_t length); /* The file descriptor must be pending before assuan_receivefd is - called. This means that assuan_sendfd should be called *before* the - trigger is sent (normally via assuan_write_line ("INPUT FD")). */ + * called. This means that assuan_sendfd should be called *before* the + * trigger is sent (normally via assuan_write_line ("INPUT FD")). */ gpg_error_t assuan_sendfd (assuan_context_t ctx, assuan_fd_t fd); gpg_error_t assuan_receivefd (assuan_context_t ctx, assuan_fd_t *fd); @@ -463,15 +480,16 @@ /*-- assuan-socket.c --*/ /* This flag is used with assuan_sock_connect_byname to - connect via SOCKS. */ + * connect via SOCKS. */ #define ASSUAN_SOCK_SOCKS 1 + /* This flag is used with assuan_sock_connect_byname to force a connection via Tor even if the socket subsystem has not been swicthed into Tor mode. This flags overrides ASSUAN_SOCK_SOCKS. */ #define ASSUAN_SOCK_TOR 2 /* These are socket wrapper functions to support an emulation of Unix - domain sockets on Windows W32. */ + * domain sockets on Windows. */ gpg_error_t assuan_sock_init (void); void assuan_sock_deinit (void); int assuan_sock_close (assuan_fd_t fd); @@ -522,7 +540,7 @@ int __assuan_sendmsg (assuan_context_t ctx, assuan_fd_t fd, const assuan_msghdr_t msg, int flags); pid_t __assuan_waitpid (assuan_context_t ctx, pid_t pid, int nowait, int *status, int options); - +/* Standard system hooks for the legacy GNU Pth. */ #define ASSUAN_SYSTEM_PTH_IMPL \ static void _assuan_pth_usleep (assuan_context_t ctx, unsigned int usec) \ { (void) ctx; pth_usleep (usec); } \ @@ -549,6 +567,7 @@ extern struct assuan_system_hooks _assuan_system_pth; #define ASSUAN_SYSTEM_PTH &_assuan_system_pth +/* Standard system hooks for nPth. */ #define ASSUAN_SYSTEM_NPTH_IMPL \ static void _assuan_npth_usleep (assuan_context_t ctx, unsigned int usec) \ { npth_unprotect(); \ diff -Nru libassuan-2.5.3/src/assuan-socket.c libassuan-2.5.4/src/assuan-socket.c --- libassuan-2.5.3/src/assuan-socket.c 2019-01-25 12:52:14.000000000 +0000 +++ libassuan-2.5.4/src/assuan-socket.c 2020-10-21 13:54:45.000000000 +0000 @@ -215,7 +215,6 @@ } -#ifdef HAVE_W32CE_SYSTEM static wchar_t * utf8_to_wchar (const char *string) { @@ -289,10 +288,7 @@ SetLastError (err); return result; } -#else /*!HAVE_W32CE_SYSTEM*/ -#define MyCreateFile CreateFileA -#define MyDeleteFile DeleteFileA -#endif /*!HAVE_W32CE_SYSTEM*/ + int _assuan_sock_wsa2errno (int err) @@ -345,17 +341,17 @@ read_port_and_nonce (const char *fname, unsigned short *port, char *nonce, int *cygwin) { - FILE *fp; + estream_t fp; char buffer[50], *p; size_t nread; int aval; *cygwin = 0; - fp = fopen (fname, "rb"); + fp = gpgrt_fopen (fname, "rb"); if (!fp) return -1; - nread = fread (buffer, 1, sizeof buffer - 1, fp); - fclose (fp); + nread = gpgrt_fread (buffer, 1, sizeof buffer - 1, fp); + gpgrt_fclose (fp); if (!nread) { gpg_err_set_errno (ENOENT); diff -Nru libassuan-2.5.3/src/assuan-socket-connect.c libassuan-2.5.4/src/assuan-socket-connect.c --- libassuan-2.5.3/src/assuan-socket-connect.c 2017-11-15 15:36:07.000000000 +0000 +++ libassuan-2.5.4/src/assuan-socket-connect.c 2019-11-27 14:15:28.000000000 +0000 @@ -78,7 +78,7 @@ /* Returns true if STR represents a valid port number in decimal - notation and no garbage is following. */ + * notation and no garbage is following. */ static int parse_portno (const char *str, uint16_t *r_port) { @@ -168,26 +168,25 @@ /* Make a connection to the Unix domain socket NAME and return a new - Assuan context in CTX. SERVER_PID is currently not used but may - become handy in the future. Defined flag bits are: - - ASSUAN_SOCKET_CONNECT_FDPASSING - sendmsg and recvmsg are used. - - NAME must either start with a slash and optional with a drive - prefix ("c:") or use one of these URL schemata: - - file:// - - This is the same as the default just with an explicit schemata. - - assuan://: - assuan://[]: - - Connect using TCP to PORT of the server with the numerical - IPADDR. Note that '[' and ']' are literal characters. - - */ + * Assuan context in CTX. SERVER_PID is currently not used but may + * become handy in the future. Defined flag bits are: + * + * ASSUAN_SOCKET_CONNECT_FDPASSING + * sendmsg and recvmsg are used. + * + * NAME must either start with a slash and optional with a drive + * prefix ("c:") or use one of these URL schemata: + * + * file:// + * + * This is the same as the default just with an explicit schemata. + * + * assuan://: + * assuan://[]: + * + * Connect using TCP to PORT of the server with the numerical + * IPADDR. Note that '[' and ']' are literal characters. + */ gpg_error_t assuan_socket_connect (assuan_context_t ctx, const char *name, pid_t server_pid, unsigned int flags) diff -Nru libassuan-2.5.3/src/libassuan.pc.in libassuan-2.5.4/src/libassuan.pc.in --- libassuan-2.5.3/src/libassuan.pc.in 2018-10-25 09:20:28.000000000 +0000 +++ libassuan-2.5.4/src/libassuan.pc.in 2020-10-20 14:01:29.000000000 +0000 @@ -7,8 +7,9 @@ Name: libassuan Description: IPC library for the GnuPG components -Requires: gpg-error +Requires.private: gpg-error Version: @PACKAGE_VERSION@ -Cflags: @LIBASSUAN_CONFIG_CFLAGS@ -Libs: @LIBASSUAN_CONFIG_LIBS@ +Cflags: -I${includedir} @LIBASSUAN_CONFIG_CFLAGS@ +Libs: -L${libdir} @LIBASSUAN_CONFIG_LIBS@ +Libs.private: @NETLIBS@ URL: https://www.gnupg.org/related_software/libassuan/index.html diff -Nru libassuan-2.5.3/src/Makefile.am libassuan-2.5.4/src/Makefile.am --- libassuan-2.5.3/src/Makefile.am 2018-10-25 09:20:28.000000000 +0000 +++ libassuan-2.5.4/src/Makefile.am 2019-11-27 14:15:27.000000000 +0000 @@ -149,7 +149,8 @@ endif mkheader: mkheader.c Makefile - $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ + $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c assuan.h: assuan.h.in mkheader $(parts_of_assuan_h) ./mkheader $(host_os) $(srcdir)/assuan.h.in \ diff -Nru libassuan-2.5.3/src/Makefile.in libassuan-2.5.4/src/Makefile.in --- libassuan-2.5.3/src/Makefile.in 2019-02-11 10:33:44.000000000 +0000 +++ libassuan-2.5.4/src/Makefile.in 2020-10-23 17:05:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -132,6 +132,10 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = libassuan-config versioninfo.rc libassuan.pc CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" +PROGRAMS = $(bin_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -159,9 +163,6 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)" \ - "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__libassuan_la_SOURCES_DIST = assuan.h.in posix-includes.inc.h \ w32-includes.inc.h posix-types.inc.h w32-types.inc.h \ @@ -214,7 +215,6 @@ $(AM_CFLAGS) $(CFLAGS) $(libgpgcedev_la_LDFLAGS) $(LDFLAGS) -o \ $@ @HAVE_W32CE_SYSTEM_TRUE@am_libgpgcedev_la_rpath = -rpath $(libdir) -PROGRAMS = $(bin_PROGRAMS) am__gpgcemgr_SOURCES_DIST = gpgcemgr.c @HAVE_W32CE_SYSTEM_TRUE@am_gpgcemgr_OBJECTS = \ @HAVE_W32CE_SYSTEM_TRUE@ gpgcemgr-gpgcemgr.$(OBJEXT) @@ -235,7 +235,36 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = $(DEPDIR)/funopen.Plo $(DEPDIR)/isascii.Plo \ + $(DEPDIR)/memrchr.Plo $(DEPDIR)/putc_unlocked.Plo \ + $(DEPDIR)/setenv.Plo $(DEPDIR)/stpcpy.Plo \ + ./$(DEPDIR)/gpgcemgr-gpgcemgr.Po \ + ./$(DEPDIR)/libassuan_la-assuan-buffer.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-error.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-handler.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-inquire.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-io.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-listen.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-logging.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-pipe-connect.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-pipe-server.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-socket-connect.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-socket-server.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-socket.Plo \ + ./$(DEPDIR)/libassuan_la-assuan-uds.Plo \ + ./$(DEPDIR)/libassuan_la-assuan.Plo \ + ./$(DEPDIR)/libassuan_la-client.Plo \ + ./$(DEPDIR)/libassuan_la-context.Plo \ + ./$(DEPDIR)/libassuan_la-conversion.Plo \ + ./$(DEPDIR)/libassuan_la-debug.Plo \ + ./$(DEPDIR)/libassuan_la-server.Plo \ + ./$(DEPDIR)/libassuan_la-system-posix.Plo \ + ./$(DEPDIR)/libassuan_la-system-w32.Plo \ + ./$(DEPDIR)/libassuan_la-system-w32ce.Plo \ + ./$(DEPDIR)/libassuan_la-system.Plo \ + ./$(DEPDIR)/libassuan_la-sysutils.Plo \ + ./$(DEPDIR)/libgpgcedev_la-gpgcedev.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -421,6 +450,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -517,8 +547,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -535,47 +565,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ libassuan.pc: $(top_builddir)/config.status $(srcdir)/libassuan.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libassuan.la: $(libassuan_la_OBJECTS) $(libassuan_la_DEPENDENCIES) $(EXTRA_libassuan_la_DEPENDENCIES) - $(AM_V_CCLD)$(libassuan_la_LINK) -rpath $(libdir) $(libassuan_la_OBJECTS) $(libassuan_la_LIBADD) $(LIBS) - -libgpgcedev.la: $(libgpgcedev_la_OBJECTS) $(libgpgcedev_la_DEPENDENCIES) $(EXTRA_libgpgcedev_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgpgcedev_la_LINK) $(am_libgpgcedev_la_rpath) $(libgpgcedev_la_OBJECTS) $(libgpgcedev_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -626,6 +615,47 @@ echo " rm -f" $$list; \ rm -f $$list +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libassuan.la: $(libassuan_la_OBJECTS) $(libassuan_la_DEPENDENCIES) $(EXTRA_libassuan_la_DEPENDENCIES) + $(AM_V_CCLD)$(libassuan_la_LINK) -rpath $(libdir) $(libassuan_la_OBJECTS) $(libassuan_la_LIBADD) $(LIBS) + +libgpgcedev.la: $(libgpgcedev_la_OBJECTS) $(libgpgcedev_la_DEPENDENCIES) $(EXTRA_libgpgcedev_la_DEPENDENCIES) + $(AM_V_CCLD)$(libgpgcedev_la_LINK) $(am_libgpgcedev_la_rpath) $(libgpgcedev_la_OBJECTS) $(libgpgcedev_la_LIBADD) $(LIBS) + gpgcemgr$(EXEEXT): $(gpgcemgr_OBJECTS) $(gpgcemgr_DEPENDENCIES) $(EXTRA_gpgcemgr_DEPENDENCIES) @rm -f gpgcemgr$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gpgcemgr_OBJECTS) $(gpgcemgr_LDADD) $(LIBS) @@ -671,38 +701,44 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/funopen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/isascii.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memrchr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/putc_unlocked.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgcemgr-gpgcemgr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-handler.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-inquire.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-io.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-listen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-logging.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-pipe-connect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-pipe-server.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-socket-connect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-socket-server.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-socket.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-uds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-client.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-conversion.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-debug.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-server.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-system-posix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-system-w32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-system-w32ce.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-system.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-sysutils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgcedev_la-gpgcedev.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/funopen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/isascii.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memrchr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/putc_unlocked.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setenv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgcemgr-gpgcemgr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-buffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-handler.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-inquire.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-io.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-listen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-logging.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-pipe-connect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-pipe-server.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-socket-connect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-socket-server.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-socket.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan-uds.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-assuan.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-client.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-conversion.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-debug.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-server.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-system-posix.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-system-w32.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-system-w32ce.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-system.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libassuan_la-sysutils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgcedev_la-gpgcedev.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1035,7 +1071,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1068,12 +1107,12 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \ +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) \ $(HEADERS) install-binPROGRAMS: install-libLTLIBRARIES installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1116,7 +1155,38 @@ clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf $(DEPDIR) ./$(DEPDIR) + -rm -f $(DEPDIR)/funopen.Plo + -rm -f $(DEPDIR)/isascii.Plo + -rm -f $(DEPDIR)/memrchr.Plo + -rm -f $(DEPDIR)/putc_unlocked.Plo + -rm -f $(DEPDIR)/setenv.Plo + -rm -f $(DEPDIR)/stpcpy.Plo + -rm -f ./$(DEPDIR)/gpgcemgr-gpgcemgr.Po + -rm -f ./$(DEPDIR)/libassuan_la-assuan-buffer.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-error.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-handler.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-inquire.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-io.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-listen.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-logging.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-pipe-connect.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-pipe-server.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-socket-connect.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-socket-server.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-socket.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-uds.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan.Plo + -rm -f ./$(DEPDIR)/libassuan_la-client.Plo + -rm -f ./$(DEPDIR)/libassuan_la-context.Plo + -rm -f ./$(DEPDIR)/libassuan_la-conversion.Plo + -rm -f ./$(DEPDIR)/libassuan_la-debug.Plo + -rm -f ./$(DEPDIR)/libassuan_la-server.Plo + -rm -f ./$(DEPDIR)/libassuan_la-system-posix.Plo + -rm -f ./$(DEPDIR)/libassuan_la-system-w32.Plo + -rm -f ./$(DEPDIR)/libassuan_la-system-w32ce.Plo + -rm -f ./$(DEPDIR)/libassuan_la-system.Plo + -rm -f ./$(DEPDIR)/libassuan_la-sysutils.Plo + -rm -f ./$(DEPDIR)/libgpgcedev_la-gpgcedev.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1165,7 +1235,38 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf $(DEPDIR) ./$(DEPDIR) + -rm -f $(DEPDIR)/funopen.Plo + -rm -f $(DEPDIR)/isascii.Plo + -rm -f $(DEPDIR)/memrchr.Plo + -rm -f $(DEPDIR)/putc_unlocked.Plo + -rm -f $(DEPDIR)/setenv.Plo + -rm -f $(DEPDIR)/stpcpy.Plo + -rm -f ./$(DEPDIR)/gpgcemgr-gpgcemgr.Po + -rm -f ./$(DEPDIR)/libassuan_la-assuan-buffer.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-error.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-handler.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-inquire.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-io.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-listen.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-logging.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-pipe-connect.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-pipe-server.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-socket-connect.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-socket-server.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-socket.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan-uds.Plo + -rm -f ./$(DEPDIR)/libassuan_la-assuan.Plo + -rm -f ./$(DEPDIR)/libassuan_la-client.Plo + -rm -f ./$(DEPDIR)/libassuan_la-context.Plo + -rm -f ./$(DEPDIR)/libassuan_la-conversion.Plo + -rm -f ./$(DEPDIR)/libassuan_la-debug.Plo + -rm -f ./$(DEPDIR)/libassuan_la-server.Plo + -rm -f ./$(DEPDIR)/libassuan_la-system-posix.Plo + -rm -f ./$(DEPDIR)/libassuan_la-system-w32.Plo + -rm -f ./$(DEPDIR)/libassuan_la-system-w32ce.Plo + -rm -f ./$(DEPDIR)/libassuan_la-system.Plo + -rm -f ./$(DEPDIR)/libassuan_la-sysutils.Plo + -rm -f ./$(DEPDIR)/libgpgcedev_la-gpgcedev.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1188,7 +1289,7 @@ .MAKE: all check install install-am install-exec-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ @@ -1229,7 +1330,8 @@ @HAVE_W32CE_SYSTEM_TRUE@ $(DESTDIR)$(bindir)/gpgcedev.dll mkheader: mkheader.c Makefile - $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ + $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c assuan.h: assuan.h.in mkheader $(parts_of_assuan_h) ./mkheader $(host_os) $(srcdir)/assuan.h.in \ diff -Nru libassuan-2.5.3/src/sysutils.c libassuan-2.5.4/src/sysutils.c --- libassuan-2.5.3/src/sysutils.c 2019-02-11 10:28:23.000000000 +0000 +++ libassuan-2.5.4/src/sysutils.c 2020-10-23 16:56:20.000000000 +0000 @@ -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-2019 g10 Code GmbH\n" + "Copyright 2001-2020 g10 Code GmbH\n" "\n" "SPDX-License-Identifier: LGPL-2.1-or-later\n" "(" BUILD_REVISION " " BUILD_TIMESTAMP ")\n" diff -Nru libassuan-2.5.3/src/versioninfo.rc.in libassuan-2.5.4/src/versioninfo.rc.in --- libassuan-2.5.3/src/versioninfo.rc.in 2019-02-11 10:27:34.000000000 +0000 +++ libassuan-2.5.4/src/versioninfo.rc.in 2020-10-23 16:55:52.000000000 +0000 @@ -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-2019 g10 Code GmbH\0" + VALUE "LegalCopyright", "Copyright © 2001-2020 g10 Code GmbH\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libassuan.dll\0" VALUE "PrivateBuild", "\0" diff -Nru libassuan-2.5.3/src/w32-fd-t.inc.h libassuan-2.5.4/src/w32-fd-t.inc.h --- libassuan-2.5.3/src/w32-fd-t.inc.h 2017-11-15 15:59:19.000000000 +0000 +++ libassuan-2.5.4/src/w32-fd-t.inc.h 2019-11-27 19:25:06.000000000 +0000 @@ -28,6 +28,10 @@ typedef void *assuan_fd_t; #define ASSUAN_INVALID_FD ((void*)(-1)) #define ASSUAN_INVALID_PID ((pid_t) -1) +#if GPGRT_HAVE_PRAGMA_GCC_PUSH +# pragma GCC push_options +# pragma GCC diagnostic ignored "-Wbad-function-cast" +#endif static GPG_ERR_INLINE assuan_fd_t assuan_fd_from_posix_fd (int fd) { @@ -36,5 +40,8 @@ else return (assuan_fd_t) _get_osfhandle (fd); } +#if GPGRT_HAVE_PRAGMA_GCC_PUSH +# pragma GCC pop_options +#endif ##EOF## diff -Nru libassuan-2.5.3/tests/Makefile.am libassuan-2.5.4/tests/Makefile.am --- libassuan-2.5.3/tests/Makefile.am 2019-01-25 12:50:55.000000000 +0000 +++ libassuan-2.5.4/tests/Makefile.am 2020-10-20 14:01:29.000000000 +0000 @@ -47,6 +47,5 @@ noinst_HEADERS = common.h noinst_PROGRAMS = $(TESTS) $(w32cetools) $(testtools) -LDADD = ../src/libassuan.la $(NETLIBS) $(GPG_ERROR_LIBS) \ +LDADD = ../src/libassuan.la $(GPG_ERROR_LIBS) \ @LDADD_FOR_TESTS_KLUDGE@ - diff -Nru libassuan-2.5.3/tests/Makefile.in libassuan-2.5.4/tests/Makefile.in --- libassuan-2.5.3/tests/Makefile.in 2019-02-11 10:33:44.000000000 +0000 +++ libassuan-2.5.4/tests/Makefile.in 2020-10-23 17:05:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -138,8 +138,7 @@ ce_createpipe_OBJECTS = ce-createpipe.$(OBJEXT) ce_createpipe_LDADD = $(LDADD) am__DEPENDENCIES_1 = -ce_createpipe_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +ce_createpipe_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -147,28 +146,23 @@ ce_server_SOURCES = ce-server.c ce_server_OBJECTS = ce-server.$(OBJEXT) ce_server_LDADD = $(LDADD) -ce_server_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +ce_server_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) fdpassing_SOURCES = fdpassing.c fdpassing_OBJECTS = fdpassing.$(OBJEXT) fdpassing_LDADD = $(LDADD) -fdpassing_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +fdpassing_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) pipeconnect_SOURCES = pipeconnect.c pipeconnect_OBJECTS = pipeconnect.$(OBJEXT) pipeconnect_LDADD = $(LDADD) -pipeconnect_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +pipeconnect_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) socks5_SOURCES = socks5.c socks5_OBJECTS = socks5.$(OBJEXT) socks5_LDADD = $(LDADD) -socks5_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +socks5_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) version_SOURCES = version.c version_OBJECTS = version.$(OBJEXT) version_LDADD = $(LDADD) -version_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +version_DEPENDENCIES = ../src/libassuan.la $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -183,7 +177,11 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/ce-createpipe.Po \ + ./$(DEPDIR)/ce-server.Po ./$(DEPDIR)/fdpassing.Po \ + ./$(DEPDIR)/pipeconnect.Po ./$(DEPDIR)/socks5.Po \ + ./$(DEPDIR)/version.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -387,6 +385,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -405,7 +404,7 @@ 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 $(GPG_ERROR_LIBS) \ @LDADD_FOR_TESTS_KLUDGE@ all: $(BUILT_SOURCES) @@ -430,8 +429,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -482,12 +481,18 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ce-createpipe.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ce-server.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdpassing.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipeconnect.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socks5.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ce-createpipe.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ce-server.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdpassing.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipeconnect.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socks5.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -661,7 +666,10 @@ test "$$failed" -eq 0; \ else :; fi -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -736,7 +744,12 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/ce-createpipe.Po + -rm -f ./$(DEPDIR)/ce-server.Po + -rm -f ./$(DEPDIR)/fdpassing.Po + -rm -f ./$(DEPDIR)/pipeconnect.Po + -rm -f ./$(DEPDIR)/socks5.Po + -rm -f ./$(DEPDIR)/version.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -782,7 +795,12 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/ce-createpipe.Po + -rm -f ./$(DEPDIR)/ce-server.Po + -rm -f ./$(DEPDIR)/fdpassing.Po + -rm -f ./$(DEPDIR)/pipeconnect.Po + -rm -f ./$(DEPDIR)/socks5.Po + -rm -f ./$(DEPDIR)/version.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -803,19 +821,19 @@ .MAKE: all check check-am install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ + check-am clean clean-generic clean-libtool \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am .PRECIOUS: Makefile diff -Nru libassuan-2.5.3/VERSION libassuan-2.5.4/VERSION --- libassuan-2.5.3/VERSION 2019-02-11 10:33:44.000000000 +0000 +++ libassuan-2.5.4/VERSION 2020-10-23 17:05:42.000000000 +0000 @@ -1 +1 @@ -2.5.3 +2.5.4