Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libassuan for openSUSE:Factory
checked in at 2021-04-10 15:26:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libassuan (Old)
and /work/SRC/openSUSE:Factory/.libassuan.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libassuan"
Sat Apr 10 15:26:24 2021 rev:50 rq:881957 version:2.5.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/libassuan/libassuan.changes 2020-10-29
09:21:30.190641556 +0100
+++ /work/SRC/openSUSE:Factory/.libassuan.new.2401/libassuan.changes
2021-04-10 15:27:01.766353902 +0200
@@ -1,0 +2,7 @@
+Fri Mar 26 14:56:15 UTC 2021 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- update to 2.5.5:
+ * Fix a crash in the logging code
+ * Upgrade autoconf
+
+-------------------------------------------------------------------
Old:
----
libassuan-2.5.4.tar.bz2
libassuan-2.5.4.tar.bz2.sig
New:
----
libassuan-2.5.5.tar.bz2
libassuan-2.5.5.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libassuan.spec ++++++
--- /var/tmp/diff_new_pack.hQB9LH/_old 2021-04-10 15:27:02.310354542 +0200
+++ /var/tmp/diff_new_pack.hQB9LH/_new 2021-04-10 15:27:02.314354547 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libassuan
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# 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.4
+Version: 2.5.5
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.4.tar.bz2 -> libassuan-2.5.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/AUTHORS new/libassuan-2.5.5/AUTHORS
--- old/libassuan-2.5.4/AUTHORS 2019-02-11 11:27:47.000000000 +0100
+++ new/libassuan-2.5.5/AUTHORS 2021-03-22 13:05:16.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-2019 g10 Code GmbH
+ Copyright (C) 2001-2021 g10 Code GmbH
Copyright (C) 2004 Simon Josefsson
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/ChangeLog
new/libassuan-2.5.5/ChangeLog
--- old/libassuan-2.5.4/ChangeLog 2020-10-23 19:06:39.000000000 +0200
+++ new/libassuan-2.5.5/ChangeLog 2021-03-22 13:23:54.000000000 +0100
@@ -1,5 +1,49 @@
+2021-03-22 Werner Koch <w...@gnupg.org>
+
+ Release 2.5.5.
+ + commit f8cfb565ee461946901ae3bc573abc0023d821b5
+
+
+2021-03-09 Werner Koch <w...@gnupg.org>
+
+ Support Unicode when starting servers on Windows.
+ + commit 9264c2710b64e565982d77410169a3253563a647
+ * src/assuan-socket.c (utf8_to_wchar): Rename to
+ (_assuan_utf8_to_wchar): this and give global scope.
+ * src/system-w32.c (__assuan_spawn): Use CreateProcessW.
+
+2020-11-17 NIIBE Yutaka <gni...@fsij.org>
+
+ m4: Update with newer autoconf constructs.
+ + commit 05535d9863cfc4656554fa5fd8df2f4fbe695178
+ * src/libassuan.m4: Replace AC_HELP_STRING to AS_HELP_STRING.
+
+ build: Update to newer autoconf constructs.
+ + commit 12fd96a61033a587482be150a0f955615083ad43
+ * configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER.
+ Use AC_USE_SYSTEM_EXTENSIONS instead of AC_GNU_SOURCE.
+ Use AS_HELP_STRING instead of AC_HELP_STRING.
+ (AC_TYPE_SIGNAL): Remove.
+ (AC_DECL_SYS_SIGLIST): Remove.
+ * m4/Makefile.am (EXTRA_DIST): Update.
+ * m4/gnupg-pth.m4: Remove.
+ * m4/onceonly.m4: Remove.
+ * m4/socklen.m4: Update from gnulib.
+ * m4/libtool.m4: Update from libgpg-error.
+ * m4/gpg-error.m4: Update from libgpg-error.
+
+2020-11-12 Ben Kibbey <b...@luxsci.net>
+
+ Fix crash when logging.
+ + commit 0dd8ffbd32fe62b8e4bf565cbd7a9272a2891d01
+ * src/assuan-logging.c (_assuan_log_control_channel): Use gpgrt_malloc.
+
2020-10-23 Werner Koch <w...@gnupg.org>
+ Post release updates.
+ + commit 103c1e7f86de3f40c4f49e67b14376aad58ef81b
+
+
Release 2.5.4.
+ commit e368b400f276d5d9868832e7a652ab250dd57555
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/Makefile.in
new/libassuan-2.5.5/Makefile.in
--- old/libassuan-2.5.4/Makefile.in 2020-10-23 19:05:41.000000000 +0200
+++ new/libassuan-2.5.5/Makefile.in 2021-03-22 13:11:15.000000000 +0100
@@ -112,8 +112,8 @@
$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/socklen.m4 \
- $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/NEWS new/libassuan-2.5.5/NEWS
--- old/libassuan-2.5.4/NEWS 2020-10-23 18:53:48.000000000 +0200
+++ new/libassuan-2.5.5/NEWS 2021-03-22 13:04:38.000000000 +0100
@@ -1,3 +1,15 @@
+Noteworthy changes in version 2.5.5 (2021-03-22) [C8/A8/R5]
+------------------------------------------------
+
+ * Allows starting servers with Unicode names on Windows. [#4398]
+
+ * Fix a crash in the logging code. [0dd8ffbd32]
+
+ * Upgrade autoconf stuff.
+
+ Release-info: https://dev.gnupg.org/T5354
+
+
Noteworthy changes in version 2.5.4 (2020-10-23) [C8/A8/R4]
------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/README new/libassuan-2.5.5/README
--- old/libassuan-2.5.4/README 2020-10-23 18:57:37.000000000 +0200
+++ new/libassuan-2.5.5/README 2021-03-22 13:04:54.000000000 +0100
@@ -2,7 +2,7 @@
===========
Copyright (C) 2001-2013 Free Software Foundation, Inc.
- Copyright (C) 2001-2020 g10 Code GmbH
+ Copyright (C) 2001-2021 g10 Code GmbH
This is a general purpose IPC library which is for example used
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/VERSION new/libassuan-2.5.5/VERSION
--- old/libassuan-2.5.4/VERSION 2020-10-23 19:05:42.000000000 +0200
+++ new/libassuan-2.5.5/VERSION 2021-03-22 13:11:16.000000000 +0100
@@ -1 +1 @@
-2.5.4
+2.5.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/aclocal.m4
new/libassuan-2.5.5/aclocal.m4
--- old/libassuan-2.5.4/aclocal.m4 2020-10-23 19:05:40.000000000 +0200
+++ new/libassuan-2.5.5/aclocal.m4 2021-03-22 13:11:14.000000000 +0100
@@ -753,35 +753,6 @@
fi
])
-# -*- Autoconf -*-
-# Obsolete and "removed" macros, that must however still report explicit
-# error messages when used, to smooth transition.
-#
-# 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,
-# with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_DIAGNOSE([obsolete],
-['$0': this macro is obsolete.
-You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
-AC_CONFIG_HEADERS($@)])
-
-AC_DEFUN([AM_PROG_CC_STDC],
-[AC_PROG_CC
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-AC_DIAGNOSE([obsolete],
-['$0': this macro is obsolete.
-You should simply use the 'AC][_PROG_CC' macro instead.
-Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
-but upon 'ac_cv_prog_cc_stdc'.])])
-
-AC_DEFUN([AM_C_PROTOTYPES],
- [AC_FATAL([automatic de-ANSI-fication support has been removed])])
-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
-
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
@@ -1205,6 +1176,5 @@
m4_include([m4/ltsugar.m4])
m4_include([m4/ltversion.m4])
m4_include([m4/lt~obsolete.m4])
-m4_include([m4/onceonly.m4])
m4_include([m4/socklen.m4])
m4_include([m4/sys_socket_h.m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/config.h.in
new/libassuan-2.5.5/config.h.in
--- old/libassuan-2.5.4/config.h.in 2020-10-23 19:06:37.000000000 +0200
+++ new/libassuan-2.5.5/config.h.in 2021-03-22 13:23:52.000000000 +0100
@@ -18,10 +18,6 @@
/* The time this package was configured for a build */
#undef BUILD_TIMESTAMP
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
- don't. */
-#undef HAVE_DECL_SYS_SIGLIST
-
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -174,9 +170,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/configure
new/libassuan-2.5.5/configure
--- old/libassuan-2.5.4/configure 2020-10-23 19:05:42.000000000 +0200
+++ new/libassuan-2.5.5/configure 2021-03-22 13:11:16.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.4.
+# Generated by GNU Autoconf 2.69 for libassuan 2.5.5.
#
# 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.4'
-PACKAGE_STRING='libassuan 2.5.4'
+PACKAGE_VERSION='2.5.5'
+PACKAGE_STRING='libassuan 2.5.5'
PACKAGE_BUGREPORT='https://bugs.gnupg.org'
PACKAGE_URL=''
@@ -632,6 +632,7 @@
# include <unistd.h>
#endif"
+ac_header_list=
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
@@ -1365,7 +1366,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.4 to adapt to many kinds of systems.
+\`configure' configures libassuan 2.5.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1436,7 +1437,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libassuan 2.5.4:";;
+ short | recursive ) echo "Configuration of libassuan 2.5.5:";;
esac
cat <<\_ACEOF
@@ -1553,7 +1554,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libassuan configure 2.5.4
+libassuan configure 2.5.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2027,52 +2028,6 @@
} # ac_fn_c_find_uintX_t
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- as_decl_name=`echo $2|sed 's/ *(.*//'`
- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is
declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
- (void) $as_decl_use;
-#else
- (void) $as_decl_name;
-#endif
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-
# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
# ----------------------------------------------------
# Tries to find if the field MEMBER exists in type AGGR, after including
@@ -2133,7 +2088,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.4, which was
+It was created by libassuan $as_me 2.5.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2413,6 +2368,7 @@
>$cache_file
fi
+as_fn_append ac_header_list " sys/socket.h"
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -2490,7 +2446,7 @@
#
LIBASSUAN_LT_CURRENT=8
LIBASSUAN_LT_AGE=8
-LIBASSUAN_LT_REVISION=4
+LIBASSUAN_LT_REVISION=5
# If the API is changed in an incompatible way: increment the next counter.
LIBASSUAN_CONFIG_API_VERSION=2
@@ -3015,7 +2971,7 @@
# Define the identity of the package.
PACKAGE='libassuan'
- VERSION='2.5.4'
+ VERSION='2.5.5'
cat >>confdefs.h <<_ACEOF
@@ -4768,7 +4724,6 @@
-
# Taken from mpfr-4.0.1, then modified for LDADD_FOR_TESTS_KLUDGE
case $host in
*-*-linux*)
@@ -4801,7 +4756,7 @@
esac
-VERSION_NUMBER=0x020504
+VERSION_NUMBER=0x020505
# Don't default to build static libs.
@@ -13580,7 +13535,7 @@
#
# Provide information about the build.
#
-BUILD_REVISION="e368b40"
+BUILD_REVISION="f8cfb56"
cat >>confdefs.h <<_ACEOF
@@ -13589,7 +13544,7 @@
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}58216"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}63695"
# Check whether --enable-build-timestamp was given.
@@ -14000,65 +13955,18 @@
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal
handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_type_signal=int
-else
- ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist"
"#include <signal.h>
-/* NetBSD declares sys_siglist in unistd.h. */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-"
-if test "x$ac_cv_have_decl_sys_siglist" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SYS_SIGLIST $ac_have_decl
-_ACEOF
-
-
- for ac_header in sys/socket.h
+ for ac_header in $ac_header_list
do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h"
"ac_cv_header_sys_socket_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_socket_h" = xyes; then :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header"
"$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_SOCKET_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -14068,11 +13976,6 @@
- :
-
-
-
-
if test $ac_cv_header_sys_socket_h = yes; then
SYS_SOCKET_H=''
@@ -14094,37 +13997,58 @@
fi
- ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include
<sys/types.h>
- #if HAVE_SYS_SOCKET_H
- # include <sys/socket.h>
- #elif HAVE_WS2TCPIP_H
- # include <ws2tcpip.h>
- #endif
+
+ if test $ac_cv_header_sys_socket_h = no; then
+ for ac_header in ws2tcpip.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h"
"ac_cv_header_ws2tcpip_h" "$ac_includes_default"
+if test "x$ac_cv_header_ws2tcpip_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_WS2TCPIP_H 1
+_ACEOF
+
+fi
+
+done
+
+ fi
+
+ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
+/* <sys/types.h> is not needed according to POSIX, but the
+ <sys/socket.h> in i386-unknown-freebsd4.10 and
+ powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#elif HAVE_WS2TCPIP_H
+# include <ws2tcpip.h>
+#endif
+
"
if test "x$ac_cv_type_socklen_t" = xyes; then :
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent"
>&5
$as_echo_n "checking for socklen_t equivalent... " >&6; }
- if ${gl_cv_gl_cv_socklen_t_equiv+:} false; then :
+if ${gl_cv_socklen_t_equiv+:} false; then :
$as_echo_n "(cached) " >&6
else
# Systems have either "struct sockaddr *" or
- # "void *" as the second argument to getpeername
- gl_cv_socklen_t_equiv=
- for arg2 in "struct sockaddr" void; do
- for t in int size_t "unsigned int" "long int" "unsigned long int"; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ # "void *" as the second argument to getpeername
+ gl_cv_socklen_t_equiv=
+ for arg2 in "struct sockaddr" void; do
+ for t in int size_t "unsigned int" "long int" "unsigned long int";
do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
- #include <sys/socket.h>
+ #include <sys/socket.h>
- int getpeername (int, $arg2 *, $t *);
+ int getpeername (int, $arg2 *, $t *);
int
main ()
{
$t len;
- getpeername (0, 0, &len);
+ getpeername (0, 0, &len);
;
return 0;
}
@@ -14133,17 +14057,16 @@
gl_cv_socklen_t_equiv="$t"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- test "$gl_cv_socklen_t_equiv" != "" && break
- done
- test "$gl_cv_socklen_t_equiv" != "" && break
- done
+ test "$gl_cv_socklen_t_equiv" != "" && break
+ done
+ test "$gl_cv_socklen_t_equiv" != "" && break
+ done
+ if test "$gl_cv_socklen_t_equiv" = ""; then
+ as_fn_error $? "Cannot find a type to use in place of socklen_t"
"$LINENO" 5
+ fi
fi
-
- if test "$gl_cv_socklen_t_equiv" = ""; then
- as_fn_error $? "Cannot find a type to use in place of socklen_t"
"$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv"
>&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5
$as_echo "$gl_cv_socklen_t_equiv" >&6; }
cat >>confdefs.h <<_ACEOF
@@ -14955,6 +14878,7 @@
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -15422,7 +15346,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.4, which was
+This file was extended by libassuan $as_me 2.5.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15488,7 +15412,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.4
+libassuan config.status 2.5.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -16714,7 +16638,7 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# can be downloaded from https://www.gnu.org/licenses/gpl.html, or
# obtained by writing to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -17485,6 +17409,6 @@
echo "
Libassuan v${VERSION} has been configured as follows:
- Revision: e368b40 (58216)
+ Revision: f8cfb56 (63695)
Platform: $host
"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/configure.ac
new/libassuan-2.5.5/configure.ac
--- old/libassuan-2.5.4/configure.ac 2020-10-23 18:54:00.000000000 +0200
+++ new/libassuan-2.5.5/configure.ac 2021-03-22 13:06:26.000000000 +0100
@@ -22,7 +22,7 @@
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
+AC_PREREQ([2.61])
min_automake_version="1.14"
# To build a release you need to create a tag with the version number
@@ -33,7 +33,7 @@
m4_define([mym4_package],[libassuan])
m4_define([mym4_major], [2])
m4_define([mym4_minor], [5])
-m4_define([mym4_micro], [4])
+m4_define([mym4_micro], [5])
# 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
@@ -53,7 +53,7 @@
m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
m4_esyscmd([echo ]mym4_version[>VERSION])
-AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
+AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org])
# LT Version numbers, remember to change them just *before* a release.
# (Code changed: REVISION++)
@@ -63,7 +63,7 @@
#
LIBASSUAN_LT_CURRENT=8
LIBASSUAN_LT_AGE=8
-LIBASSUAN_LT_REVISION=4
+LIBASSUAN_LT_REVISION=5
# If the API is changed in an incompatible way: increment the next counter.
LIBASSUAN_CONFIG_API_VERSION=2
@@ -78,12 +78,12 @@
AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR(src/assuan.h.in)
AC_CONFIG_MACRO_DIR(m4)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
AC_CANONICAL_HOST
AM_SILENT_RULES
AB_INIT
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
# 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
@@ -291,7 +291,7 @@
AC_SUBST(BUILD_FILEVERSION)
AC_ARG_ENABLE([build-timestamp],
- AC_HELP_STRING([--enable-build-timestamp],
+ AS_HELP_STRING([--enable-build-timestamp],
[set an explicit build timestamp for reproducibility.
(default is the current time in ISO-8601 format)]),
[if test "$enableval" = "yes"; then
@@ -349,8 +349,6 @@
AC_C_CONST
AC_C_INLINE
AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
-AC_DECL_SYS_SIGLIST
gl_HEADER_SYS_SOCKET
gl_TYPE_SOCKLEN_T
@@ -460,7 +458,7 @@
# Extra features
#
build_doc=yes
-AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc],
+AC_ARG_ENABLE([doc], AS_HELP_STRING([--disable-doc],
[do not build the documentation]),
build_doc=$enableval, build_doc=yes)
AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/doc/Makefile.in
new/libassuan-2.5.5/doc/Makefile.in
--- old/libassuan-2.5.4/doc/Makefile.in 2020-10-23 19:05:41.000000000 +0200
+++ new/libassuan-2.5.5/doc/Makefile.in 2021-03-22 13:11:15.000000000 +0100
@@ -111,8 +111,8 @@
$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/socklen.m4 \
- $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/version.texi \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/doc/assuan.info
new/libassuan-2.5.5/doc/assuan.info
--- old/libassuan-2.5.4/doc/assuan.info 2020-10-23 19:06:39.000000000 +0200
+++ new/libassuan-2.5.5/doc/assuan.info 2021-03-22 13:23:54.000000000 +0100
@@ -7,8 +7,8 @@
This file documents the use and the internals of Assuan.
- This is Edition 2.5.4, last updated 7 December 2017, of 'The
-'Developing with Assuan' Manual', for Version 2.5.4.
+ This is Edition 2.5.5, last updated 7 December 2017, of 'The
+'Developing with Assuan' Manual', for Version 2.5.5.
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.4/doc/stamp-vti
new/libassuan-2.5.5/doc/stamp-vti
--- old/libassuan-2.5.4/doc/stamp-vti 2020-10-23 19:06:38.000000000 +0200
+++ new/libassuan-2.5.5/doc/stamp-vti 2021-03-22 13:23:53.000000000 +0100
@@ -1,4 +1,4 @@
@set UPDATED 7 December 2017
@set UPDATED-MONTH December 2017
-@set EDITION 2.5.4
-@set VERSION 2.5.4
+@set EDITION 2.5.5
+@set VERSION 2.5.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/doc/version.texi
new/libassuan-2.5.5/doc/version.texi
--- old/libassuan-2.5.4/doc/version.texi 2020-10-23 19:06:38.000000000
+0200
+++ new/libassuan-2.5.5/doc/version.texi 2021-03-22 13:23:53.000000000
+0100
@@ -1,4 +1,4 @@
@set UPDATED 7 December 2017
@set UPDATED-MONTH December 2017
-@set EDITION 2.5.4
-@set VERSION 2.5.4
+@set EDITION 2.5.5
+@set VERSION 2.5.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/m4/Makefile.am
new/libassuan-2.5.5/m4/Makefile.am
--- old/libassuan-2.5.4/m4/Makefile.am 2013-03-15 20:26:09.000000000 +0100
+++ new/libassuan-2.5.5/m4/Makefile.am 2021-03-09 08:46:11.000000000 +0100
@@ -1 +1 @@
-EXTRA_DIST = socklen.m4 sys_socket_h.m4 onceonly.m4 autobuild.m4 gnupg-pth.m4
+EXTRA_DIST = socklen.m4 sys_socket_h.m4 autobuild.m4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/m4/Makefile.in
new/libassuan-2.5.5/m4/Makefile.in
--- old/libassuan-2.5.4/m4/Makefile.in 2020-10-23 19:05:41.000000000 +0200
+++ new/libassuan-2.5.5/m4/Makefile.in 2021-03-22 13:11:15.000000000 +0100
@@ -93,8 +93,8 @@
$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/socklen.m4 \
- $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -263,7 +263,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = socklen.m4 sys_socket_h.m4 onceonly.m4 autobuild.m4 gnupg-pth.m4
+EXTRA_DIST = socklen.m4 sys_socket_h.m4 autobuild.m4
all: all-am
.SUFFIXES:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/m4/gnupg-pth.m4
new/libassuan-2.5.5/m4/gnupg-pth.m4
--- old/libassuan-2.5.4/m4/gnupg-pth.m4 2013-03-15 20:26:09.000000000 +0100
+++ new/libassuan-2.5.5/m4/gnupg-pth.m4 1970-01-01 01:00:00.000000000 +0100
@@ -1,105 +0,0 @@
-dnl GnuPG's check for Pth.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl
-dnl This file is free software; as a special exception the author gives
-dnl unlimited permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-dnl This file is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-# GNUPG_PTH_VERSION_CHECK(REQUIRED)
-#
-# If the version is sufficient, HAVE_PTH will be set to yes.
-#
-# Taken and modified from the m4 macros which come with Pth.
-AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
- [
- _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'`
- _req_version="ifelse([$1],,1.2.0,$1)"
-
- AC_MSG_CHECKING(for PTH - version >= $_req_version)
- for _var in _pth_version _req_version; do
- eval "_val=\"\$${_var}\""
- _major=`echo $_val | sed
's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'`
- _minor=`echo $_val | sed
's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'`
- _rtype=`echo $_val | sed
's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'`
- _micro=`echo $_val | sed
's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'`
- case $_rtype in
- "a" ) _rtype=0 ;;
- "b" ) _rtype=1 ;;
- "." ) _rtype=2 ;;
- esac
- _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype,
micro); }' \
- "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"`
- eval "${_var}_hex=\"\$_hex\""
- done
- have_pth=no
- if test ".$_pth_version_hex" != .; then
- if test ".$_req_version_hex" != .; then
- if test $_pth_version_hex -ge $_req_version_hex; then
- have_pth=yes
- fi
- fi
- fi
- if test $have_pth = yes; then
- AC_MSG_RESULT(yes)
- AC_MSG_CHECKING([whether PTH installation is sane])
- AC_CACHE_VAL(gnupg_cv_pth_is_sane,[
- _gnupg_pth_save_cflags=$CFLAGS
- _gnupg_pth_save_ldflags=$LDFLAGS
- _gnupg_pth_save_libs=$LIBS
- CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`"
- LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`"
- LIBS="$LIBS `$PTH_CONFIG --libs --all`"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h>
- ],
- [[ pth_init ();]])],
- gnupg_cv_pth_is_sane=yes,
- gnupg_cv_pth_is_sane=no)
- CFLAGS=$_gnupg_pth_save_cflags
- LDFLAGS=$_gnupg_pth_save_ldflags
- LIBS=$_gnupg_pth_save_libs
- ])
- if test $gnupg_cv_pth_is_sane != yes; then
- have_pth=no
- fi
- AC_MSG_RESULT($gnupg_cv_pth_is_sane)
- else
- AC_MSG_RESULT(no)
- fi
- ])
-
-
-
-# GNUPG_PATH_PTH([MINIMUM_VERSION])
-#
-# On return $have_pth is set as well as HAVE_PTH is defined and
-# PTH_CLFAGS and PTH_LIBS are AS_SUBST.
-#
-AC_DEFUN([GNUPG_PATH_PTH],
-[ AC_ARG_WITH(pth-prefix,
- AC_HELP_STRING([--with-pth-prefix=PFX],
- [prefix where GNU Pth is installed (optional)]),
- pth_config_prefix="$withval", pth_config_prefix="")
- if test x$pth_config_prefix != x ; then
- PTH_CONFIG="$pth_config_prefix/bin/pth-config"
- fi
- AC_PATH_PROG(PTH_CONFIG, pth-config, no)
- tmp=ifelse([$1], ,1.3.7,$1)
- if test "$PTH_CONFIG" != "no"; then
- GNUPG_PTH_VERSION_CHECK($tmp)
- if test $have_pth = yes; then
- PTH_CFLAGS=`$PTH_CONFIG --cflags`
- PTH_LIBS=`$PTH_CONFIG --ldflags`
- PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`"
- AC_DEFINE(HAVE_PTH, 1,
- [Defined if the GNU Pth is available])
- fi
- fi
- AC_SUBST(PTH_CFLAGS)
- AC_SUBST(PTH_LIBS)
-])
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/m4/gpg-error.m4
new/libassuan-2.5.5/m4/gpg-error.m4
--- old/libassuan-2.5.4/m4/gpg-error.m4 2018-12-13 08:52:39.000000000 +0100
+++ new/libassuan-2.5.5/m4/gpg-error.m4 2021-03-09 08:46:11.000000000 +0100
@@ -1,5 +1,5 @@
# gpg-error.m4 - autoconf macro to detect libgpg-error.
-# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018 g10 Code GmbH
+# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020 g10 Code GmbH
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -9,7 +9,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-# Last-changed: 2018-11-02
+# Last-changed: 2020-11-17
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@@ -31,7 +31,7 @@
dnl since that is consistent with how our three siblings use the directory/
dnl package name in --with-$dir_name-prefix=PFX.
AC_ARG_WITH(libgpg-error-prefix,
- AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
+ AS_HELP_STRING([--with-libgpg-error-prefix=PFX],
[prefix where GPG Error is installed (optional)]),
[gpg_error_config_prefix="$withval"])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/m4/libtool.m4
new/libassuan-2.5.5/m4/libtool.m4
--- old/libassuan-2.5.4/m4/libtool.m4 2014-01-06 16:12:23.000000000 +0100
+++ new/libassuan-2.5.5/m4/libtool.m4 2021-03-09 08:46:11.000000000 +0100
@@ -34,7 +34,7 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# can be downloaded from https://www.gnu.org/licenses/gpl.html, or
# obtained by writing to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
@@ -7474,7 +7474,7 @@
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_GCJ_CONFIG],
[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
+AC_LANG_PUSH([Java])
# Source file extension for Java test sources.
ac_ext=java
@@ -7530,7 +7530,7 @@
_LT_CONFIG($1)
fi
-AC_LANG_RESTORE
+AC_LANG_POP
GCC=$lt_save_GCC
CC=$lt_save_CC
@@ -7545,7 +7545,7 @@
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_GO_CONFIG],
[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
+AC_LANG_PUSH([Go])
# Source file extension for Go test sources.
ac_ext=go
@@ -7601,7 +7601,7 @@
_LT_CONFIG($1)
fi
-AC_LANG_RESTORE
+AC_LANG_POP
GCC=$lt_save_GCC
CC=$lt_save_CC
@@ -7616,7 +7616,9 @@
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_RC_CONFIG],
[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
+
+dnl Here, something like AC_LANG_PUSH([RC]) is expected.
+dnl But Resource Compiler is not supported as a language by autoconf
# Source file extension for RC test sources.
ac_ext=rc
@@ -7655,8 +7657,10 @@
_LT_CONFIG($1)
fi
+dnl Here, AC_LANG_POP is expected.
GCC=$lt_save_GCC
-AC_LANG_RESTORE
+dnl Back to C
+AC_LANG([C])
CC=$lt_save_CC
CFLAGS=$lt_save_CFLAGS
])# _LT_LANG_RC_CONFIG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/m4/onceonly.m4
new/libassuan-2.5.5/m4/onceonly.m4
--- old/libassuan-2.5.4/m4/onceonly.m4 2013-03-15 20:26:09.000000000 +0100
+++ new/libassuan-2.5.5/m4/onceonly.m4 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-# onceonly.m4 serial 4 (gettext-0.15)
-dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This file defines some "once only" variants of standard autoconf macros.
-dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS
-dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS
-dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS
-dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC
-dnl The advantage is that the check for each of the headers/functions/decls
-dnl will be put only once into the 'configure' file. It keeps the size of
-dnl the 'configure' file down, and avoids redundant output when 'configure'
-dnl is run.
-dnl The drawback is that the checks cannot be conditionalized. If you write
-dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
-dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
-dnl empty, and the check will be inserted before the body of the AC_DEFUNed
-dnl function.
-
-dnl This file is only needed in autoconf <= 2.59. Newer versions of autoconf
-dnl have this macro built-in. But about AC_CHECK_DECLS_ONCE: note that in
-dnl autoconf >= 2.60 the symbol separator is a comma, whereas here it is
-dnl whitespace.
-
-dnl Autoconf version 2.57 or newer is recommended.
-AC_PREREQ(2.54)
-
-# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
-# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
-AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
- :
- AC_FOREACH([gl_HEADER_NAME], [$1], [
- AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]),
- [-./], [___])), [
- AC_CHECK_HEADERS(gl_HEADER_NAME)
- ])
- AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
- [-./], [___])))
- ])
-])
-
-# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
-# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
-AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
- :
- AC_FOREACH([gl_FUNC_NAME], [$1], [
- AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
- AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME]))
- ])
- AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
- ])
-])
-
-# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
-# AC_CHECK_DECLS(DECL1, DECL2, ...).
-AC_DEFUN([AC_CHECK_DECLS_ONCE], [
- :
- AC_FOREACH([gl_DECL_NAME], [$1], [
- AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
- AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
- ])
- AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
- ])
-])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/m4/socklen.m4
new/libassuan-2.5.5/m4/socklen.m4
--- old/libassuan-2.5.4/m4/socklen.m4 2013-03-15 20:26:09.000000000 +0100
+++ new/libassuan-2.5.5/m4/socklen.m4 2021-03-09 08:46:11.000000000 +0100
@@ -1,5 +1,5 @@
-# socklen.m4 serial 4
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# socklen.m4 serial 11
+dnl Copyright (C) 2005-2007, 2009-2020 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -8,45 +8,69 @@
dnl Check for socklen_t: historically on BSD it is an int, and in
dnl POSIX 1g it is a type of its own, but some platforms use different
-dnl types for the argument to getsockopt, getpeername, etc. So we
-dnl have to test to find something that will work.
+dnl types for the argument to getsockopt, getpeername, etc.:
+dnl HP-UX 10.20, IRIX 6.5, OSF/1 4.0, Interix 3.5, BeOS.
+dnl So we have to test to find something that will work.
-dnl On mingw32, socklen_t is in ws2tcpip.h ('int'), so we try to find
-dnl it there first. That file is included by gnulib's socket_.h, which
-dnl all users of this module should include. Cygwin must not include
-dnl ws2tcpip.h.
AC_DEFUN([gl_TYPE_SOCKLEN_T],
- [AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl
+ [AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])dnl
AC_CHECK_TYPE([socklen_t], ,
- [AC_MSG_CHECKING([for socklen_t equivalent])
- AC_CACHE_VAL([gl_cv_gl_cv_socklen_t_equiv],
- [# Systems have either "struct sockaddr *" or
- # "void *" as the second argument to getpeername
- gl_cv_socklen_t_equiv=
- for arg2 in "struct sockaddr" void; do
- for t in int size_t "unsigned int" "long int" "unsigned long int"; do
- AC_TRY_COMPILE(
- [#include <sys/types.h>
- #include <sys/socket.h>
-
- int getpeername (int, $arg2 *, $t *);],
- [$t len;
- getpeername (0, 0, &len);],
- [gl_cv_socklen_t_equiv="$t"])
- test "$gl_cv_socklen_t_equiv" != "" && break
- done
- test "$gl_cv_socklen_t_equiv" != "" && break
- done
- ])
- if test "$gl_cv_socklen_t_equiv" = ""; then
- AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
- fi
- AC_MSG_RESULT([$gl_cv_socklen_t_equiv])
+ [AC_CACHE_CHECK([for socklen_t equivalent],
+ [gl_cv_socklen_t_equiv],
+ [# Systems have either "struct sockaddr *" or
+ # "void *" as the second argument to getpeername
+ gl_cv_socklen_t_equiv=
+ for arg2 in "struct sockaddr" void; do
+ for t in int size_t "unsigned int" "long int" "unsigned long int";
do
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+ [[#include <sys/types.h>
+ #include <sys/socket.h>
+
+ int getpeername (int, $arg2 *, $t *);]],
+ [[$t len;
+ getpeername (0, 0, &len);]])],
+ [gl_cv_socklen_t_equiv="$t"])
+ test "$gl_cv_socklen_t_equiv" != "" && break
+ done
+ test "$gl_cv_socklen_t_equiv" != "" && break
+ done
+ if test "$gl_cv_socklen_t_equiv" = ""; then
+ AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+ fi
+ ])
AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],
- [type to use in place of socklen_t if not defined])],
- [#include <sys/types.h>
- #if HAVE_SYS_SOCKET_H
- # include <sys/socket.h>
- #elif HAVE_WS2TCPIP_H
- # include <ws2tcpip.h>
- #endif])])
+ [type to use in place of socklen_t if not defined])],
+ [gl_SOCKET_HEADERS])])
+
+dnl On mingw32, socklen_t is in ws2tcpip.h ('int'), so we try to find
+dnl it there too. But on Cygwin, wc2tcpip.h must not be included. Users
+dnl of this module should use the same include pattern as gl_SOCKET_HEADERS.
+dnl When you change this macro, keep also in sync:
+dnl - gl_CHECK_SOCKET_HEADERS,
+dnl - the Include section of modules/socklen.
+AC_DEFUN([gl_SOCKET_HEADERS],
+[
+/* <sys/types.h> is not needed according to POSIX, but the
+ <sys/socket.h> in i386-unknown-freebsd4.10 and
+ powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#elif HAVE_WS2TCPIP_H
+# include <ws2tcpip.h>
+#endif
+])
+
+dnl Tests for the existence of the header for socket facilities.
+dnl Defines the C macros HAVE_SYS_SOCKET_H, HAVE_WS2TCPIP_H.
+dnl This macro must match gl_SOCKET_HEADERS.
+AC_DEFUN([gl_CHECK_SOCKET_HEADERS],
+ [AC_CHECK_HEADERS_ONCE([sys/socket.h])
+ if test $ac_cv_header_sys_socket_h = no; then
+ dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
+ dnl the check for those headers unconditional; yet cygwin reports
+ dnl that the headers are present but cannot be compiled (since on
+ dnl cygwin, all socket information should come from sys/socket.h).
+ AC_CHECK_HEADERS([ws2tcpip.h])
+ fi
+ ])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/src/Makefile.in
new/libassuan-2.5.5/src/Makefile.in
--- old/libassuan-2.5.4/src/Makefile.in 2020-10-23 19:05:41.000000000 +0200
+++ new/libassuan-2.5.5/src/Makefile.in 2021-03-22 13:11:15.000000000 +0100
@@ -123,8 +123,8 @@
$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/socklen.m4 \
- $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/src/assuan-defs.h
new/libassuan-2.5.5/src/assuan-defs.h
--- old/libassuan-2.5.4/src/assuan-defs.h 2018-07-02 17:46:50.000000000
+0200
+++ new/libassuan-2.5.5/src/assuan-defs.h 2021-03-08 15:18:35.000000000
+0100
@@ -354,6 +354,7 @@
int _assuan_sock_check_nonce (assuan_context_t ctx, assuan_fd_t fd,
assuan_sock_nonce_t *nonce);
#ifdef HAVE_W32_SYSTEM
+wchar_t *_assuan_utf8_to_wchar (const char *string);
int _assuan_sock_wsa2errno (int err);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/src/assuan-logging.c
new/libassuan-2.5.5/src/assuan-logging.c
--- old/libassuan-2.5.4/src/assuan-logging.c 2017-11-15 16:35:09.000000000
+0100
+++ new/libassuan-2.5.5/src/assuan-logging.c 2021-03-09 08:46:11.000000000
+0100
@@ -252,7 +252,7 @@
if (nbytes > maxbytes)
nbytes = maxbytes;
- if (!(outbuf = malloc (50 + 3*nbytes + 60 + 3 + 1)))
+ if (!(outbuf = gpgrt_malloc (50 + 3*nbytes + 60 + 3 + 1)))
res = -1;
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/src/assuan-socket.c
new/libassuan-2.5.5/src/assuan-socket.c
--- old/libassuan-2.5.4/src/assuan-socket.c 2020-10-21 15:54:45.000000000
+0200
+++ new/libassuan-2.5.5/src/assuan-socket.c 2021-03-08 15:22:42.000000000
+0100
@@ -215,8 +215,8 @@
}
-static wchar_t *
-utf8_to_wchar (const char *string)
+wchar_t *
+_assuan_utf8_to_wchar (const char *string)
{
int n;
size_t nbytes;
@@ -260,7 +260,7 @@
HANDLE result;
int err;
- filename = utf8_to_wchar (lpFileName);
+ filename = _assuan_utf8_to_wchar (lpFileName);
if (!filename)
return INVALID_HANDLE_VALUE;
@@ -278,7 +278,7 @@
wchar_t *filename;
int result, err;
- filename = utf8_to_wchar (lpFileName);
+ filename = _assuan_utf8_to_wchar (lpFileName);
if (!filename)
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/src/assuan.h.in
new/libassuan-2.5.5/src/assuan.h.in
--- old/libassuan-2.5.4/src/assuan.h.in 2020-10-23 18:57:00.000000000 +0200
+++ new/libassuan-2.5.5/src/assuan.h.in 2021-03-22 13:06:00.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-2020 g10 Code GmbH
+ * Copyright (C) 2001-2021 g10 Code GmbH
*
* This file is part of Assuan.
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/src/libassuan.m4
new/libassuan-2.5.5/src/libassuan.m4
--- old/libassuan-2.5.4/src/libassuan.m4 2018-12-13 08:52:39.000000000
+0100
+++ new/libassuan-2.5.5/src/libassuan.m4 2021-03-09 08:46:11.000000000
+0100
@@ -9,6 +9,7 @@
dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
dnl SPDX-License-Identifier: FSFULLR
+# Last-changed: 2020-11-17
dnl
dnl Common code used for libassuan detection [internal]
@@ -17,7 +18,7 @@
AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
[ AC_REQUIRE([AC_CANONICAL_HOST])
AC_ARG_WITH(libassuan-prefix,
- AC_HELP_STRING([--with-libassuan-prefix=PFX],
+ AS_HELP_STRING([--with-libassuan-prefix=PFX],
[prefix where LIBASSUAN is installed (optional)]),
libassuan_config_prefix="$withval", libassuan_config_prefix="")
if test x$libassuan_config_prefix != x ; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/src/system-w32.c
new/libassuan-2.5.5/src/system-w32.c
--- old/libassuan-2.5.4/src/system-w32.c 2017-12-07 12:55:01.000000000
+0100
+++ new/libassuan-2.5.5/src/system-w32.c 2021-03-08 15:26:19.000000000
+0100
@@ -419,11 +419,14 @@
0, /* Returns pid. */
0 /* Returns tid. */
};
- STARTUPINFO si;
+ STARTUPINFOW si;
assuan_fd_t fd;
assuan_fd_t *fdp;
char *cmdline;
+ wchar_t *wcmdline = NULL;
+ wchar_t *wname = NULL;
HANDLE nullfd = INVALID_HANDLE_VALUE;
+ int rc;
/* fixme: Actually we should set the "_assuan_pipe_connect_pid" env
variable. However this requires us to write a full environment
@@ -478,26 +481,35 @@
/* Note: We inherit all handles flagged as inheritable. This seems
to be a security flaw but there seems to be no way of selecting
handles to inherit. A fix for this would be to use a helper
- process like we have in gpgme. */
+ process like we have in gpgme.
+ Take care: CreateProcessW may modify wpgmname */
/* _assuan_log_printf ("CreateProcess, path=`%s' cmdline=`%s'\n", */
/* name, cmdline); */
- if (!CreateProcess (name, /* Program to start. */
- cmdline, /* Command line arguments. */
- &sec_attr, /* Process security attributes. */
- &sec_attr, /* Thread security attributes. */
- TRUE, /* Inherit handles. */
- (CREATE_DEFAULT_ERROR_MODE
- | ((flags & 128)? DETACHED_PROCESS : 0)
- | GetPriorityClass (GetCurrentProcess ())
- | CREATE_SUSPENDED), /* Creation flags. */
- NULL, /* Environment. */
- NULL, /* Use current drive/directory. */
- &si, /* Startup information. */
- &pi /* Returns process information. */
- ))
+ if (name && !(wname = _assuan_utf8_to_wchar (name)))
+ rc = 0;
+ else if (!(wcmdline = _assuan_utf8_to_wchar (cmdline)))
+ rc = 0;
+ else
+ rc = CreateProcessW (wname, /* Program to start. */
+ wcmdline, /* Command line arguments. */
+ &sec_attr, /* Process security attributes.
*/
+ &sec_attr, /* Thread security attributes. */
+ TRUE, /* Inherit handles. */
+ (CREATE_DEFAULT_ERROR_MODE
+ | ((flags & 128)? DETACHED_PROCESS : 0)
+ | GetPriorityClass (GetCurrentProcess ())
+ | CREATE_SUSPENDED), /* Creation flags. */
+ NULL, /* Environment. */
+ NULL, /* Use current drive/directory.
*/
+ &si, /* Startup information. */
+ &pi /* Returns process information.
*/
+ );
+ if (!rc)
{
TRACE1 (ctx, ASSUAN_LOG_SYSIO, "pipe_connect_w32", ctx,
- "CreateProcess failed: %s", _assuan_w32_strerror (ctx, -1));
+ "CreateProcess failed%s: %s", _assuan_w32_strerror (ctx, -1));
+ free (wname);
+ free (wcmdline);
_assuan_free (ctx, cmdline);
if (nullfd != INVALID_HANDLE_VALUE)
CloseHandle (nullfd);
@@ -506,6 +518,8 @@
return -1;
}
+ free (wname);
+ free (wcmdline);
_assuan_free (ctx, cmdline);
if (nullfd != INVALID_HANDLE_VALUE)
CloseHandle (nullfd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libassuan-2.5.4/src/versioninfo.rc.in
new/libassuan-2.5.5/src/versioninfo.rc.in
--- old/libassuan-2.5.4/src/versioninfo.rc.in 2020-10-23 18:55:52.000000000
+0200
+++ new/libassuan-2.5.5/src/versioninfo.rc.in 2021-03-22 13:05:41.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-2020 g10 Code GmbH\0"
+ VALUE "LegalCopyright", "Copyright ? 2001-2021 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.4/tests/Makefile.in
new/libassuan-2.5.5/tests/Makefile.in
--- old/libassuan-2.5.4/tests/Makefile.in 2020-10-23 19:05:41.000000000
+0200
+++ new/libassuan-2.5.5/tests/Makefile.in 2021-03-22 13:11:15.000000000
+0100
@@ -117,8 +117,8 @@
$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/socklen.m4 \
- $(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
