Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2022-02-24 18:20:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Thu Feb 24 18:20:10 2022 rev:246 rq:956520 version:7.3.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2022-02-09
20:39:04.562358174 +0100
+++ /work/SRC/openSUSE:Factory/.libreoffice.new.1958/libreoffice.changes
2022-02-24 18:23:15.358661465 +0100
@@ -1,0 +2,17 @@
+Thu Feb 17 10:10:53 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Add upstream change to fix KDE Frameworks detection (boo#1196017)
+ * 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch
+
+-------------------------------------------------------------------
+Fri Feb 14 10:22:01 UTC 2022 - Danilo Spinella <danilo.spine...@suse.com>
+
+- Update to 7.3.1.1
+- Removed uneeded patches:
+ * 0001-Missing-includes-for-libstdc-12.patch
+ * bsc1183308.patch
+ * fix-wayland-scaling-in-plasma.patch
+ * pld-skia-patches.patch
+ * skia-freetype2.11.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Missing-includes-for-libstdc-12.patch
boost_1_75_0.tar.xz
bsc1183308.patch
fix-wayland-scaling-in-plasma.patch
gpgme-1.13.1.tar.bz2
icu4c-69_1-data.zip
icu4c-69_1-src.tgz
libassuan-2.5.3.tar.bz2
libgpg-error-1.37.tar.bz2
libreoffice-7.2.5.1.tar.xz
libreoffice-7.2.5.1.tar.xz.asc
libreoffice-help-7.2.5.1.tar.xz
libreoffice-help-7.2.5.1.tar.xz.asc
libreoffice-translations-7.2.5.1.tar.xz
libreoffice-translations-7.2.5.1.tar.xz.asc
pdfium-4500.tar.bz2
pld-skia-patches.patch
skia-freetype2.11.patch
skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
New:
----
0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch
boost_1_77_0.tar.xz
gpgme-1.16.0.tar.bz2
icu4c-70_1-data.zip
icu4c-70_1-src.tgz
libassuan-2.5.5.tar.bz2
libgpg-error-1.43.tar.bz2
libreoffice-7.3.1.1.tar.xz
libreoffice-7.3.1.1.tar.xz.asc
libreoffice-help-7.3.1.1.tar.xz
libreoffice-help-7.3.1.1.tar.xz.asc
libreoffice-translations-7.3.1.1.tar.xz
libreoffice-translations-7.3.1.1.tar.xz.asc
pdfium-4699.tar.bz2
skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.aYVDu8/_old 2022-02-24 18:23:22.518659553 +0100
+++ /var/tmp/diff_new_pack.aYVDu8/_new 2022-02-24 18:23:22.526659551 +0100
@@ -46,7 +46,7 @@
%endif
%bcond_with firebird
Name: libreoffice
-Version: 7.2.5.1
+Version: 7.3.1.1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@@ -70,9 +70,9 @@
Source450:
%{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
Source452:
%{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
# GPGME bundle list
-Source1000: %{external_url}/gpgme-1.13.1.tar.bz2
-Source1001: %{external_url}/libgpg-error-1.37.tar.bz2
-Source1002: %{external_url}/libassuan-2.5.3.tar.bz2
+Source1000: %{external_url}/gpgme-1.16.0.tar.bz2
+Source1001: %{external_url}/libgpg-error-1.43.tar.bz2
+Source1002: %{external_url}/libassuan-2.5.5.tar.bz2
# Internal bundled stuff we can't remove
# To build this we would pull cygwin; not worth it
Source2001:
https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -87,13 +87,11 @@
Source2006:
https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
Source2007:
https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
# PDFium is bundled everywhere
-Source2008: %{external_url}/pdfium-4500.tar.bz2
+Source2008: %{external_url}/pdfium-4699.tar.bz2
# Single C file with patches from LO
Source2009: %{external_url}/dtoa-20180411.tgz
# Skia is part of chromium and bundled everywhere as by google only way is
monorepo way
-Source2010:
%{external_url}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
-# Fix the build with freetype-2.11
-Source2011: skia-freetype2.11.patch
+Source2010:
%{external_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
Source2012: %{external_url}/libcmis-0.5.2.tar.xz
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build
@@ -104,14 +102,10 @@
Patch3: mediawiki-no-broken-help.diff
# PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error
Patch6: gcc11-fix-error.patch
-Patch7: pld-skia-patches.patch
-# PATCH-FIX-UPSTREAM
https://bugs.documentfoundation.org/show_bug.cgi?id=137924 Use proper DPI
without requiring window handle
-Patch8: fix-wayland-scaling-in-plasma.patch
Patch9: fix_math_desktop_file.patch
Patch10: fix_gtk_popover_on_3.20.patch
-# LO-L3: bsc#1183308 Simple, seven page slide deck of 3.7MB takes looong to
open, start presentation mode, or move back to slide 1
-Patch11: bsc1183308.patch
-Patch12: 0001-Missing-includes-for-libstdc-12.patch
+# PATCH-FIX-UPSTREAM boo#1196017 Fix KDE Frameworks 5.91 detection
+Patch11: 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch
# Build with java 8
Patch101: 0001-Revert-java-9-changes.patch
# try to save space by using hardlinks
@@ -127,7 +121,7 @@
BuildRequires: bsh2
BuildRequires: commons-logging
BuildRequires: cups-devel
-BuildRequires: curl-devel
+BuildRequires: curl-devel >= 7.68.0
# Needed for tests
BuildRequires: dejavu-fonts
BuildRequires: doxygen >= 1.8.4
@@ -138,12 +132,14 @@
BuildRequires: glm-devel
# Needed for tests
BuildRequires: google-carlito-fonts
+BuildRequires: abseil-cpp-devel
BuildRequires: gperf >= 3.1
BuildRequires: graphviz
BuildRequires: hyphen-devel
BuildRequires: junit4
BuildRequires: libbase
BuildRequires: libcppunit-devel >= 1.14.0
+BuildRequires: libcuckoo-devel
BuildRequires: liberation-fonts
BuildRequires: libexif
BuildRequires: libfonts
@@ -205,7 +201,8 @@
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.19
BuildRequires: pkgconfig(libnumbertext) >= 1.0.6
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4
-BuildRequires: pkgconfig(liborcus-0.16)
+BuildRequires: pkgconfig(libopenjp2)
+BuildRequires: pkgconfig(liborcus-0.17)
BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libpq)
@@ -220,14 +217,13 @@
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(libzmf-0.0)
-BuildRequires: pkgconfig(mdds-1.5) >= 1.5.0
+BuildRequires: pkgconfig(mdds-2.0)
BuildRequires: pkgconfig(mythes)
BuildRequires: pkgconfig(nspr) >= 4.8
BuildRequires: pkgconfig(nss) >= 3.9.3
BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends)
-BuildRequires: pkgconfig(serf-1) >= 1.3.9
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.28
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xt)
@@ -264,7 +260,7 @@
ExclusiveArch: aarch64 %{ix86} x86_64 ppc64le
%if 0%{?suse_version} < 1550
# Too old boost on the system
-Source2020: %{external_url}/boost_1_75_0.tar.xz
+Source2020: %{external_url}/boost_1_77_0.tar.xz
Source2023: %{external_url}/poppler-21.11.0.tar.xz
Source2024: %{external_url}/poppler-data-0.4.10.tar.gz
%else
@@ -278,8 +274,8 @@
%endif
%if 0%{?suse_version} < 1500
# Too old icu on the system
-Source2021: %{external_url}/icu4c-69_1-src.tgz
-Source2022: %{external_url}/icu4c-69_1-data.zip
+Source2021: %{external_url}/icu4c-70_1-src.tgz
+Source2022: %{external_url}/icu4c-70_1-data.zip
BuildRequires: gcc7
BuildRequires: gcc7-c++
BuildRequires: java-devel >= 1.8
@@ -1011,22 +1007,15 @@
%patch2
%patch3
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%patch9 -p1
-%if 0%{?suse_version} < 1500
-%patch10 -p1
%patch11 -p1
-%endif
-%patch12 -p1
%if 0%{?suse_version} < 1500
+%patch10 -p1
%patch101 -p1
%endif
%patch990 -p1
%patch991 -p1
-cp %{SOURCE2011} external/skia
-
# Disable some of the failing tests (some are random)
%if 0%{?suse_version} < 1330
sed -i -e '/CppunitTest_desktop_lib/d' desktop/Module_desktop.mk
@@ -1042,6 +1031,8 @@
sed -i -e /CPPUNIT_TEST\(testODFEncryptedGPG\)/d
xmlsecurity/qa/unit/signing/signing.cxx
# breaks on LTO https://bugs.documentfoundation.org/show_bug.cgi?id=126442
sed -i -e /CppunitTest_sw_apitests/d sw/Module_sw.mk
+# -flto=thin is not supported by gcc
+sed -i -e s/-flto=thin/-flto/ solenv/gbuild/platform/com_GCC_defs.mk
# Disable failing tests on ppc64le for now
%ifarch ppc64le
sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
@@ -1145,7 +1136,7 @@
--without-fonts \
--without-myspell-dicts \
--with-jdk-home=$JAVA_HOME \
- --with-webdav=serf \
+ --with-webdav=curl \
--with-beanshell-jar=%{_datadir}/java/bsh2/bsh.jar \
--with-ant-home=%{_datadir}/ant \
--with-external-dict-dir=%{_datadir}/hunspell \
@@ -1585,11 +1576,17 @@
%files -f file-lists/sdk_doc_list.txt sdk-doc
%files calc-extensions
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/share
+%dir %{_libdir}/%{name}/share/extensions
%{_libdir}/%{name}/share/extensions/ConvertTextToNumber
%{_libdir}/%{name}/share/extensions/nlpsolver
%{_libdir}/%{name}/share/extensions/numbertext
%files writer-extensions
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/share
+%dir %{_libdir}/%{name}/share/extensions
%{_libdir}/%{name}/share/extensions/wiki-publisher
%files icon-themes
++++++ 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch ++++++
>From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed, 16 Feb 2022 13:38:47 +0100
Subject: [PATCH] configure.ac: Update kf5 include/lib check to work with KF5
>= 5.91
The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
subdirectory in kcoreaddons commit
commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
Author: Ahmad Samir <a.samir...@gmail.com>
Date: Sat Jan 15 14:14:13 2022 +0200
Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
Instead of /usr/include/KF5/kcoreaddons_version.h.
For more details see:
https://invent.kde.org/frameworks/kservice/-/merge_requests/79
GIT_SILENT
Adapt the KF5 check to check for the 'KFileWidget' header and
the 'libKF5KIOFileWidgets.so' library instead.
This is more exact anyway, since we require KIOFileWidgets,
and the previous check didn't ensure that.
(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
configure would previously pass, but the build fail.)
[1]
https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6acb3107cea3..4e84f9a33980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13017,8 +13017,8 @@ then
kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5
/usr/lib64/kf5/devel"
fi
- kf5_test_include="KF5/kcoreaddons_version.h"
- kf5_test_library="libKF5CoreAddons.so"
+ kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
+ kf5_test_library="libKF5KIOFileWidgets.so"
kf5_libdirs="$qt5_libdir $kf5_libdirs"
dnl kf5 KDE4 support compatibility installed
--
2.35.1
++++++ boost_1_75_0.tar.xz -> boost_1_77_0.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/boost_1_75_0.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new.1958/boost_1_77_0.tar.xz differ:
char 26, line 1
++++++ gpgme-1.13.1.tar.bz2 -> gpgme-1.16.0.tar.bz2 ++++++
++++ 41563 lines of diff (skipped)
++++++ icu4c-69_1-src.tgz -> icu4c-70_1-src.tgz ++++++
/work/SRC/openSUSE:Factory/libreoffice/icu4c-69_1-src.tgz
/work/SRC/openSUSE:Factory/.libreoffice.new.1958/icu4c-70_1-src.tgz differ:
char 12, line 1
++++++ libassuan-2.5.3.tar.bz2 -> libassuan-2.5.5.tar.bz2 ++++++
++++ 3345 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/AUTHORS new/libassuan-2.5.5/AUTHORS
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/ChangeLog new/libassuan-2.5.5/ChangeLog
--- old/libassuan-2.5.3/ChangeLog 2019-02-11 11:34:51.000000000 +0100
+++ new/libassuan-2.5.5/ChangeLog 2021-03-22 13:23:54.000000000 +0100
@@ -1,3 +1,88 @@
+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
+
+
+2020-10-20 Werner Koch <w...@gnupg.org>
+
+ 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 <gni...@fsij.org>
+
+ 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 <w...@gnupg.org>
+
+ 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 <gni...@fsij.org>
+
+ 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 <d...@fifthhorseman.net>
+
+ 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 <w...@gnupg.org>
Release 2.5.3.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/NEWS new/libassuan-2.5.5/NEWS
--- old/libassuan-2.5.3/NEWS 2019-02-11 11:27:01.000000000 +0100
+++ new/libassuan-2.5.5/NEWS 2021-03-22 13:04:38.000000000 +0100
@@ -1,3 +1,25 @@
+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]
+------------------------------------------------
+
+ * 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/README new/libassuan-2.5.5/README
--- old/libassuan-2.5.3/README 2018-12-13 09:04:29.000000000 +0100
+++ 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-2018 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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/VERSION new/libassuan-2.5.5/VERSION
--- old/libassuan-2.5.3/VERSION 2019-02-11 11:33:44.000000000 +0100
+++ new/libassuan-2.5.5/VERSION 2021-03-22 13:11:16.000000000 +0100
@@ -1 +1 @@
-2.5.3
+2.5.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/config.h.in new/libassuan-2.5.5/config.h.in
--- old/libassuan-2.5.3/config.h.in 2019-02-11 11:34:49.000000000 +0100
+++ 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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/configure.ac new/libassuan-2.5.5/configure.ac
--- old/libassuan-2.5.3/configure.ac 2019-02-11 11:27:16.000000000 +0100
+++ 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], [3])
+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=3
+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
@@ -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)
@@ -352,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
@@ -463,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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/doc/assuan.info new/libassuan-2.5.5/doc/assuan.info
--- old/libassuan-2.5.3/doc/assuan.info 2019-02-11 11:34:51.000000000 +0100
+++ new/libassuan-2.5.5/doc/assuan.info 2021-03-22 13:23:54.000000000 +0100
@@ -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.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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/doc/stamp-vti new/libassuan-2.5.5/doc/stamp-vti
--- old/libassuan-2.5.3/doc/stamp-vti 2019-02-11 11:34:50.000000000 +0100
+++ 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.3
-@set VERSION 2.5.3
+@set EDITION 2.5.5
+@set VERSION 2.5.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/doc/version.texi new/libassuan-2.5.5/doc/version.texi
--- old/libassuan-2.5.3/doc/version.texi 2019-02-11 11:34:50.000000000
+0100
+++ 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.3
-@set VERSION 2.5.3
+@set EDITION 2.5.5
+@set VERSION 2.5.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/m4/Makefile.am new/libassuan-2.5.5/m4/Makefile.am
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/m4/gnupg-pth.m4 new/libassuan-2.5.5/m4/gnupg-pth.m4
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/m4/gpg-error.m4 new/libassuan-2.5.5/m4/gpg-error.m4
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/m4/libtool.m4 new/libassuan-2.5.5/m4/libtool.m4
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/m4/onceonly.m4 new/libassuan-2.5.5/m4/onceonly.m4
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/m4/socklen.m4 new/libassuan-2.5.5/m4/socklen.m4
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/Makefile.am new/libassuan-2.5.5/src/Makefile.am
--- old/libassuan-2.5.3/src/Makefile.am 2018-10-25 11:20:28.000000000 +0200
+++ new/libassuan-2.5.5/src/Makefile.am 2019-11-27 15:15:27.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/assuan-defs.h new/libassuan-2.5.5/src/assuan-defs.h
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/assuan-handler.c
new/libassuan-2.5.5/src/assuan-handler.c
--- old/libassuan-2.5.3/src/assuan-handler.c 2017-11-15 16:34:13.000000000
+0100
+++ new/libassuan-2.5.5/src/assuan-handler.c 2020-05-27 11:40:50.000000000
+0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/assuan-logging.c
new/libassuan-2.5.5/src/assuan-logging.c
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/assuan-socket-connect.c
new/libassuan-2.5.5/src/assuan-socket-connect.c
--- old/libassuan-2.5.3/src/assuan-socket-connect.c 2017-11-15
16:36:07.000000000 +0100
+++ new/libassuan-2.5.5/src/assuan-socket-connect.c 2019-11-27
15:15:28.000000000 +0100
@@ -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://<fname>
-
- This is the same as the default just with an explicit schemata.
-
- assuan://<ipaddr>:<port>
- assuan://[<ip6addr>]:<port>
-
- 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://<fname>
+ *
+ * This is the same as the default just with an explicit schemata.
+ *
+ * assuan://<ipaddr>:<port>
+ * assuan://[<ip6addr>]:<port>
+ *
+ * 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/assuan-socket.c new/libassuan-2.5.5/src/assuan-socket.c
--- old/libassuan-2.5.3/src/assuan-socket.c 2019-01-25 13:52:14.000000000
+0100
+++ new/libassuan-2.5.5/src/assuan-socket.c 2021-03-08 15:22:42.000000000
+0100
@@ -215,9 +215,8 @@
}
-#ifdef HAVE_W32CE_SYSTEM
-static wchar_t *
-utf8_to_wchar (const char *string)
+wchar_t *
+_assuan_utf8_to_wchar (const char *string)
{
int n;
size_t nbytes;
@@ -261,7 +260,7 @@
HANDLE result;
int err;
- filename = utf8_to_wchar (lpFileName);
+ filename = _assuan_utf8_to_wchar (lpFileName);
if (!filename)
return INVALID_HANDLE_VALUE;
@@ -279,7 +278,7 @@
wchar_t *filename;
int result, err;
- filename = utf8_to_wchar (lpFileName);
+ filename = _assuan_utf8_to_wchar (lpFileName);
if (!filename)
return 0;
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/assuan.h.in new/libassuan-2.5.5/src/assuan.h.in
--- old/libassuan-2.5.3/src/assuan.h.in 2019-02-11 11:28:56.000000000 +0100
+++ 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-2019 g10 Code GmbH
+ * Copyright (C) 2001-2021 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 <gpg-error.h>
-/* 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/libassuan.m4 new/libassuan-2.5.5/src/libassuan.m4
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/libassuan.pc.in new/libassuan-2.5.5/src/libassuan.pc.in
--- old/libassuan-2.5.3/src/libassuan.pc.in 2018-10-25 11:20:28.000000000
+0200
+++ new/libassuan-2.5.5/src/libassuan.pc.in 2020-10-20 16:01:29.000000000
+0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/system-w32.c new/libassuan-2.5.5/src/system-w32.c
--- old/libassuan-2.5.3/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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/sysutils.c new/libassuan-2.5.5/src/sysutils.c
--- old/libassuan-2.5.3/src/sysutils.c 2019-02-11 11:28:23.000000000 +0100
+++ new/libassuan-2.5.5/src/sysutils.c 2020-10-23 18:56:20.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/versioninfo.rc.in
new/libassuan-2.5.5/src/versioninfo.rc.in
--- old/libassuan-2.5.3/src/versioninfo.rc.in 2019-02-11 11:27:34.000000000
+0100
+++ 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-2019 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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/src/w32-fd-t.inc.h new/libassuan-2.5.5/src/w32-fd-t.inc.h
--- old/libassuan-2.5.3/src/w32-fd-t.inc.h 2017-11-15 16:59:19.000000000
+0100
+++ new/libassuan-2.5.5/src/w32-fd-t.inc.h 2019-11-27 20:25:06.000000000
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libassuan-2.5.3/tests/Makefile.am new/libassuan-2.5.5/tests/Makefile.am
--- old/libassuan-2.5.3/tests/Makefile.am 2019-01-25 13:50:55.000000000
+0100
+++ new/libassuan-2.5.5/tests/Makefile.am 2020-10-20 16:01:29.000000000
+0200
@@ -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@
-
++++++ libgpg-error-1.37.tar.bz2 -> libgpg-error-1.43.tar.bz2 ++++++
++++ 21653 lines of diff (skipped)
++++++ libreoffice-7.2.5.1.tar.xz -> libreoffice-7.3.1.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-7.2.5.1.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new.1958/libreoffice-7.3.1.1.tar.xz
differ: char 26, line 1
++++++ libreoffice-help-7.2.5.1.tar.xz -> libreoffice-help-7.3.1.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-7.2.5.1.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new.1958/libreoffice-help-7.3.1.1.tar.xz
differ: char 26, line 1
++++++ libreoffice-translations-7.2.5.1.tar.xz ->
libreoffice-translations-7.3.1.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-7.2.5.1.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new.1958/libreoffice-translations-7.3.1.1.tar.xz
differ: char 27, line 1
++++++ pdfium-4500.tar.bz2 -> pdfium-4699.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/pdfium-4500.tar.bz2
/work/SRC/openSUSE:Factory/.libreoffice.new.1958/pdfium-4699.tar.bz2 differ:
char 11, line 1
++++++ skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz ->
skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new.1958/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
differ: char 15, line 1
