Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2025-09-23 16:06:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.27445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Tue Sep 23 16:06:08 2025 rev:313 rq:1306544 version:25.8.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2025-09-03 21:06:22.369952883 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.27445/libreoffice.changes 2025-09-23 16:06:34.133819448 +0200 @@ -1,0 +2,23 @@ +Mon Sep 22 12:32:57 UTC 2025 - Fridrich Strba <[email protected]> + +- Fix build with boost 1.89.0 +- Upgrade bundled libraries + * curl-8.11.1.tar.xz -> curl-8.14.1.tar.xz + * harfbuzz-8.5.0.tar.xz -> harfbuzz-11.4.3.tar.xz + * boost_1_85_0.tar.xz -> boost_1_89_0.tar.xz + * poppler-24.08.0.tar.xz -> poppler-25.08.0.tar.xz + * icu4c-74_2-src.tgz -> icu4c-77_1-src.tgz + * icu4c-74_2-data.zip -> icu4c-77_1-data.zip + * fontconfig-2.15.0.tar.xz -> fontconfig-2.17.1.tar.xz + * freetype-2.13.2.tar.xz -> freetype-2.13.3.tar.xz + * gpgme-1.24.0.tar.bz2 -> gpgme-1.24.3.tar.bz2 + * libgpg-error-1.51.tar.bz2 -> libgpg-error-1.55.tar.bz2 + * libassuan-3.0.1.tar.bz2 -> libassuan-3.0.2.tar.bz2 +- Fix build on SLE-12-SP5 +- Added patches: + * boost-1_89_0.patch + + upstream patch porting libreoffice to boost 1.89.0 + * python-detection.patch + + fix to python detection upstream error + +------------------------------------------------------------------- @@ -13 +36,2 @@ - * skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz -> skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz + * skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz + -> skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz Old: ---- boost_1_85_0.tar.xz curl-8.11.1.tar.xz fontconfig-2.15.0.tar.xz freetype-2.13.2.tar.xz gpgme-1.24.0.tar.bz2 harfbuzz-8.5.0.tar.xz icu4c-74_2-data.zip icu4c-74_2-src.tgz libassuan-3.0.1.tar.bz2 libgpg-error-1.51.tar.bz2 poppler-24.08.0.tar.xz New: ---- boost-1_89_0.patch boost_1_89_0.tar.xz curl-8.14.1.tar.xz fontconfig-2.17.1.tar.xz freetype-2.13.3.tar.xz gpgme-1.24.3.tar.bz2 harfbuzz-11.4.3.tar.xz icu4c-77_1-data.zip icu4c-77_1-src.tgz libassuan-3.0.2.tar.bz2 libgpg-error-1.55.tar.bz2 meson-1.8.0.tar.gz poppler-25.08.0.tar.xz python-detection.patch ----------(New B)---------- New:- Added patches: * boost-1_89_0.patch + upstream patch porting libreoffice to boost 1.89.0 New: + upstream patch porting libreoffice to boost 1.89.0 * python-detection.patch + fix to python detection upstream error ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.JRUMxJ/_old 2025-09-23 16:06:39.550046336 +0200 +++ /var/tmp/diff_new_pack.JRUMxJ/_new 2025-09-23 16:06:39.554046503 +0200 @@ -66,11 +66,16 @@ %bcond_without system_abseil_cpp %endif +%if 0%{?suse_version} >= 1300 +%bcond_without system_harfbuzz +%else +%bcond_with system_harfbuzz +%endif + # Use system gpgme and curl on TW and SLE15-SP4 or newer %if 0%{?suse_version} > 1500 %bcond_without system_gpgme %bcond_without system_curl -%bcond_without system_harfbuzz %else # Hack in the bundled libs to not pop up on requires/provides to avoid # faking libreoffice provide some system packages @@ -79,7 +84,6 @@ %global __requires_exclude ^libgpgmepp\\.so.*$ %bcond_with system_gpgme %bcond_with system_curl -%bcond_with system_harfbuzz %endif %if 0%{?gcc_version} < 12 %global with_gcc 12 @@ -126,6 +130,7 @@ # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff +Patch4: python-detection.patch # PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error Patch6: gcc11-fix-error.patch Patch9: fix_math_desktop_file.patch @@ -133,6 +138,8 @@ Patch11: fix_webp_on_sle12_sp5.patch # PATCH-FIX-SUSE Fix make distro-pack-install Patch15: fix-sdk-idl.patch +# PATCH-FIX-UPSTREAM +Patch16: boost-1_89_0.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -161,8 +168,8 @@ %if %{with system_curl} BuildRequires: curl-devel >= 7.68.0 %else -Source2013: %{external_url}/curl-8.11.1.tar.xz -Provides: bundled(curl) = 8.11.1 +Source2013: %{external_url}/curl-8.14.1.tar.xz +Provides: bundled(curl) = 8.14.1 %endif # Needed for tests BuildRequires: dejavu-fonts @@ -195,6 +202,7 @@ BuildRequires: librepository BuildRequires: libserializer BuildRequires: libtool +BuildRequires: libzstd-devel BuildRequires: lpsolve-devel BuildRequires: make BuildRequires: openldap2-devel @@ -230,13 +238,15 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 %if %{with system_harfbuzz} BuildRequires: pkgconfig(graphite2) >= 0.9.3 -BuildRequires: pkgconfig(harfbuzz) >= 2.6.8 -BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8 +BuildRequires: pkgconfig(harfbuzz) >= 5.1.0 +BuildRequires: pkgconfig(harfbuzz-icu) >= 5.1.0 %else -Source2025: %{external_url}/harfbuzz-8.5.0.tar.xz +Source2025: %{external_url}/harfbuzz-11.4.3.tar.xz Source2026: %{external_url}/graphite2-minimal-1.3.14.tgz +Source2032: %{external_url}/meson-1.8.0.tar.gz Provides: bundled(graphite2) = 1.3.14 Provides: bundled(harfbuzz) = 8.5.0 +BuildRequires: ninja %endif # Java-WebSocket Source3000: %{external_url}/Java-WebSocket-1.6.0.tar.gz @@ -311,21 +321,24 @@ Obsoletes: %{name}-icon-theme-oxygen < %{version} %if 0%{?suse_version} < 1550 # Too old boost on the system -Source2020: %{external_url}/boost_1_85_0.tar.xz -Source2023: %{external_url}/poppler-24.08.0.tar.xz +Source2020: %{external_url}/boost_1_89_0.tar.xz +Source2023: %{external_url}/poppler-25.08.0.tar.xz Source2024: %{external_url}/poppler-data-0.4.12.tar.gz Source2030: %{external_url}/tiff-4.7.0.tar.xz -Provides: bundled(boost) = 1.85.0 -Provides: bundled(poppler) = 24.08.0 -Provides: bundled(poppler-data) = 0.4.12 Source2031: %{external_url}/libcmis-0.6.2.tar.xz +Provides: bundled(boost) = 1.89.0 Provides: bundled(libcmis) = 0.6.2 +Provides: bundled(poppler) = 25.08.0 +Provides: bundled(poppler-data) = 0.4.12 +Provides: bundled(tiff) = 4.7.0 %else BuildRequires: libboost_date_time-devel BuildRequires: libboost_filesystem-devel BuildRequires: libboost_iostreams-devel BuildRequires: libboost_locale-devel +%if 0%{?suse_version} <= 1550 BuildRequires: libboost_system-devel +%endif BuildRequires: libcmis-devel BuildRequires: pkgconfig(libtiff-4) >= 4.0.10 BuildRequires: pkgconfig(poppler) >= 21.01.0 @@ -333,12 +346,12 @@ %endif %if 0%{?suse_version} < 1500 # Too old icu on the system -Source2021: %{external_url}/icu4c-74_2-src.tgz -Source2022: %{external_url}/icu4c-74_2-data.zip +Source2021: %{external_url}/icu4c-77_1-src.tgz +Source2022: %{external_url}/icu4c-77_1-data.zip Source2027: %{external_url}/phc-winner-argon2-20190702.tar.gz -Source2028: %{external_url}/fontconfig-2.15.0.tar.xz -Source2029: %{external_url}/freetype-2.13.2.tar.xz -Provides: bundled(icu) = 74.2 +Source2028: %{external_url}/fontconfig-2.17.1.tar.xz +Source2029: %{external_url}/freetype-2.13.3.tar.xz +Provides: bundled(icu) = 77.1 BuildRequires: libBox2D-devel BuildRequires: libmysqlclient-devel Requires(post): update-desktop-files @@ -362,12 +375,12 @@ %if %{with system_gpgme} BuildRequires: libgpgmepp-devel >= 1.14 %else -Source1000: %{external_url}/gpgme-1.24.0.tar.bz2 -Source1001: %{external_url}/libgpg-error-1.51.tar.bz2 -Source1002: %{external_url}/libassuan-3.0.1.tar.bz2 -Provides: bundled(gpgme) = 1.24.0 -Provides: bundled(libassuan) = 3.0.1 -Provides: bundled(libgpg-error) = 1.51 +Source1000: %{external_url}/gpgme-1.24.3.tar.bz2 +Source1001: %{external_url}/libgpg-error-1.55.tar.bz2 +Source1002: %{external_url}/libassuan-3.0.2.tar.bz2 +Provides: bundled(gpgme) = 1.24.3 +Provides: bundled(libassuan) = 3.0.2 +Provides: bundled(libgpg-error) = 1.55 %endif %if %{with firebird} BuildRequires: pkgconfig(fbclient) @@ -1094,6 +1107,7 @@ %endif # Leap 42/SLE-12 %patch -P 2 %patch -P 3 +%patch -P 4 -p1 %patch -P 6 -p1 %patch -P 9 -p1 %if 0%{?suse_version} < 1500 @@ -1101,6 +1115,7 @@ %patch -P 11 -p1 %endif %patch -P 15 -p1 +%patch -P 16 -p1 %patch -P 990 -p1 %patch -P 991 -p1 %if 0%{?suse_version} < 1550 @@ -1229,7 +1244,11 @@ --disable-kf5 \ --disable-qt5 \ %endif +%if 0%{?suse_version} >= 1500 --enable-introspection \ +%else + --disable-introspection \ +%endif --with-doxygen \ --enable-release-build \ --enable-split-app-modules \ @@ -1276,8 +1295,6 @@ --without-system-argon2 \ --without-system-icu \ --without-system-openjpeg \ - --without-system-fontconfig \ - --without-system-freetype \ %else --with-system-openjpeg \ %endif @@ -1526,11 +1543,13 @@ mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/ install -m 0644 include/LibreOfficeKit/* %{buildroot}%{_includedir}/LibreOfficeKit/ +%if 0%{?suse_version} >= 1500 # typelib data mkdir -p %{buildroot}%{_libdir}/girepository-1.0/ install -m 0644 workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.typelib %{buildroot}%{_libdir}/girepository-1.0/ mkdir -p %{buildroot}%{_datadir}/gir-1.0/ install -m 0644 workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.gir %{buildroot}%{_datadir}/gir-1.0/ +%endif # Symlink uno.py and unohelper.py so that python can find them # This is done after the cache files generating on purpose @@ -1649,8 +1668,10 @@ %endif %files -n libreofficekit +%if 0%{?suse_version} >= 1500 %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/LOKDocView-0.1.typelib +%endif %{_libdir}/liblibreofficekitgtk.so %dir %{_libdir}/libreoffice/share/libreofficekit %{_libdir}/libreoffice/share/libreofficekit/handle_image_end.png @@ -1658,8 +1679,10 @@ %{_libdir}/libreoffice/share/libreofficekit/handle_image_start.png %files -n libreofficekit-devel +%if 0%{?suse_version} >= 1500 %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/LOKDocView-0.1.gir +%endif %dir %{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit/* ++++++ boost-1_89_0.patch ++++++ --- libreoffice-25.8.1.1/configure.ac 2025-09-22 14:13:25.041830340 +0200 +++ libreoffice-25.8.1.1/configure.ac 2025-09-22 14:14:49.646073237 +0200 @@ -11454,18 +11454,9 @@ dnl Orcus dnl =================================================================== libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.20 >= 0.20.0]) -if test "$with_system_orcus" != "yes"; then - if test "$SYSTEM_BOOST" = "TRUE"; then - dnl Link with Boost.System - dnl This seems to be necessary since boost 1.50 (1.48 does not need it, - dnl 1.49 is untested). The macro BOOST_THREAD_DONT_USE_SYSTEM mentioned - dnl in documentation has no effect. - AX_BOOST_SYSTEM - fi -fi + dnl FIXME by renaming SYSTEM_LIBORCUS to SYSTEM_ORCUS in the build system world SYSTEM_LIBORCUS=$SYSTEM_ORCUS -AC_SUBST([BOOST_SYSTEM_LIB]) AC_SUBST(SYSTEM_LIBORCUS) dnl =================================================================== --- libreoffice-25.8.1.1/download.lst 2025-09-22 14:13:25.041777281 +0200 +++ libreoffice-25.8.1.1/download.lst 2025-09-22 14:13:43.018676839 +0200 @@ -14,8 +14,8 @@ # so that git cherry-pick # will not run into conflicts # please repack the tarball using external/boost/repack_tarball.sh -BOOST_SHA256SUM := 5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8 -BOOST_TARBALL := boost_1_88_0.tar.xz +BOOST_SHA256SUM := b3a976c659961f1d7fae9a8e58d6729a11f5473abaf2ef0e623f53777c86475d +BOOST_TARBALL := boost_1_89_0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts --- libreoffice-25.8.1.1/external/boost/Module_boost.mk 2025-09-22 14:13:28.872533899 +0200 +++ libreoffice-25.8.1.1/external/boost/Module_boost.mk 2025-09-22 14:13:43.018824985 +0200 @@ -13,7 +13,6 @@ StaticLibrary_boost_date_time \ StaticLibrary_boost_filesystem \ StaticLibrary_boost_locale \ - StaticLibrary_boost_system \ StaticLibrary_boost_iostreams \ UnpackedTarball_boost \ )) --- libreoffice-25.8.1.1/external/boost/StaticLibrary_boost_system.mk 2025-09-22 14:13:28.872428076 +0200 +++ libreoffice-25.8.1.1/external/boost/StaticLibrary_boost_system.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,boost_system)) - -$(eval $(call gb_StaticLibrary_use_unpacked,boost_system,boost)) - -$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_system)) - -# disable "auto link" "feature" on MSVC -$(eval $(call gb_StaticLibrary_add_defs,boost_system,\ - -DBOOST_ALL_NO_LIB \ -)) - -$(eval $(call gb_StaticLibrary_use_external,boost_system,boost_headers)) - -$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_system,cpp)) - -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_system,\ - UnpackedTarball/boost/libs/system/src/error_code \ -)) - -# vim: set noet sw=4 ts=4: --- libreoffice-25.8.1.1/external/liborcus/ExternalProject_liborcus.mk 2025-09-22 14:13:28.855001846 +0200 +++ libreoffice-25.8.1.1/external/liborcus/ExternalProject_liborcus.mk 2025-09-22 14:13:43.019032964 +0200 @@ -15,7 +15,6 @@ boost_headers \ boost_filesystem \ boost_iostreams \ - boost_system \ mdds_headers \ zlib \ )) @@ -41,7 +40,7 @@ ifneq ($(SYSTEM_BOOST),) liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB) $(BOOST_FILESYSTEM_LIB) else -liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams -lboost_filesystem +liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_iostreams -lboost_filesystem endif ifeq ($(OS),ANDROID) liborcus_LIBS+=$(gb_STDLIBS) --- libreoffice-25.8.1.1/external/liborcus/Library_orcus.mk 2025-09-22 14:13:28.854964977 +0200 +++ libreoffice-25.8.1.1/external/liborcus/Library_orcus.mk 2025-09-22 14:13:43.019228720 +0200 @@ -15,7 +15,6 @@ boost_headers \ boost_filesystem \ boost_iostreams \ - boost_system \ mdds_headers \ zlib \ )) --- libreoffice-25.8.1.1/external/liborcus/Library_orcus-parser.mk 2025-09-22 14:13:28.854984598 +0200 +++ libreoffice-25.8.1.1/external/liborcus/Library_orcus-parser.mk 2025-09-22 14:13:43.019124949 +0200 @@ -14,7 +14,6 @@ $(eval $(call gb_Library_use_externals,orcus-parser,\ boost_headers \ boost_filesystem \ - boost_system \ mdds_headers \ zlib \ )) --- libreoffice-25.8.1.1/m4/ax_boost_system.m4 2025-09-22 14:13:26.500469831 +0200 +++ libreoffice-25.8.1.1/m4/ax_boost_system.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,121 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_boost_system.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_BOOST_SYSTEM -# -# DESCRIPTION -# -# Test for System library from the Boost C++ libraries. The macro requires -# a preceding call to AX_BOOST_BASE. Further documentation is available at -# <http://randspringer.de/boost/index.html>. -# -# This macro calls: -# -# AC_SUBST(BOOST_SYSTEM_LIB) -# -# And sets: -# -# HAVE_BOOST_SYSTEM -# -# LICENSE -# -# Copyright (c) 2008 Thomas Porschberg <[email protected]> -# Copyright (c) 2008 Michael Tindal -# Copyright (c) 2008 Daniel Casimiro <[email protected]> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 20 - -AC_DEFUN([AX_BOOST_SYSTEM], -[ - AC_ARG_WITH([boost-system], - AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@], - [use the System library from boost - it is possible to specify a certain library for the linker - e.g. --with-boost-system=boost_system-gcc-mt ]), - [ - if test "$withval" = "no"; then - want_boost="no" - elif test "$withval" = "yes"; then - want_boost="yes" - ax_boost_user_system_lib="" - else - want_boost="yes" - ax_boost_user_system_lib="$withval" - fi - ], - [want_boost="yes"] - ) - - if test "x$want_boost" = "xyes"; then - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_BUILD]) - CPPFLAGS_SAVED="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS - - LDFLAGS_SAVED="$LDFLAGS" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS - - AC_CACHE_CHECK(whether the Boost::System library is available, - ax_cv_boost_system, - [AC_LANG_PUSH([C++]) - CXXFLAGS_SAVE=$CXXFLAGS - CXXFLAGS= - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]], - [[boost::system::error_category *a = 0;]])], - ax_cv_boost_system=yes, ax_cv_boost_system=no) - CXXFLAGS=$CXXFLAGS_SAVE - AC_LANG_POP([C++]) - ]) - if test "x$ax_cv_boost_system" = "xyes"; then - AC_SUBST(BOOST_CPPFLAGS) - - AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available]) - BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` - - LDFLAGS_SAVE=$LDFLAGS - if test "x$ax_boost_user_system_lib" = "x"; then - for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do - ax_lib=${libextension} - AC_CHECK_LIB($ax_lib, exit, - [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], - [link_system="no"]) - done - if test "x$link_system" != "xyes"; then - for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do - ax_lib=${libextension} - AC_CHECK_LIB($ax_lib, exit, - [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], - [link_system="no"]) - done - fi - - else - for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do - AC_CHECK_LIB($ax_lib, exit, - [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], - [link_system="no"]) - done - - fi - if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the Boost::System library!) - fi - if test "x$link_system" = "xno"; then - AC_MSG_ERROR(Could not link against $ax_lib !) - fi - fi - - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" - fi -]) --- libreoffice-25.8.1.1/RepositoryExternal.mk 2025-09-22 14:13:25.042299860 +0200 +++ libreoffice-25.8.1.1/RepositoryExternal.mk 2025-09-22 14:13:43.014101360 +0200 @@ -642,13 +642,6 @@ gb_ExternalProject__use_boost_iostreams := -define gb_LinkTarget__use_boost_system -$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_SYSTEM_LIB)) - -endef - -gb_ExternalProject__use_boost_system := - define gb_LinkTarget__use_boost_headers $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ @@ -701,15 +694,6 @@ $(call gb_ExternalProject_use_static_libraries,$(1),boost_iostreams) endef -define gb_LinkTarget__use_boost_system -$(call gb_LinkTarget__use_boost_lib,$(1),boost_system) - -endef - -define gb_ExternalProject__use_boost_system -$(call gb_ExternalProject_use_static_libraries,$(1),boost_system) -endef - define gb_LinkTarget__use_boost_headers $(call gb_LinkTarget_use_unpacked,$(1),boost) $(call gb_LinkTarget_set_include,$(1),\ --- libreoffice-25.8.1.1/solenv/gbuild/platform/com_GCC_defs.mk 2025-09-22 14:13:25.836830662 +0200 +++ libreoffice-25.8.1.1/solenv/gbuild/platform/com_GCC_defs.mk 2025-09-22 14:13:43.019495970 +0200 @@ -46,7 +46,6 @@ gb_AFLAGS := $(AFLAGS) gb_COMPILERDEFS := \ - -DBOOST_SYSTEM_NO_DEPRECATED \ -DCPPU_ENV=$(CPPU_ENV) \ $(if $(filter EMSCRIPTEN,$(OS)),-U_FORTIFY_SOURCE) \ --- libreoffice-25.8.1.1/solenv/gbuild/platform/com_MSC_defs.mk 2025-09-22 14:13:25.836779011 +0200 +++ libreoffice-25.8.1.1/solenv/gbuild/platform/com_MSC_defs.mk 2025-09-22 14:13:43.019619007 +0200 @@ -47,7 +47,6 @@ gb_COMPILERDEFS := \ -DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE \ - -DBOOST_SYSTEM_NO_DEPRECATED \ -D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING \ -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ -D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING \ --- libreoffice-25.8.1.1/vcl/commonfuzzer.mk 2025-09-22 14:13:25.356666892 +0200 +++ libreoffice-25.8.1.1/vcl/commonfuzzer.mk 2025-09-22 14:13:43.019748430 +0200 @@ -14,7 +14,6 @@ orcus-parser \ boost_locale \ boost_filesystem \ - boost_system \ boost_iostreams \ curl \ dtoa \ ++++++ boost_1_85_0.tar.xz -> boost_1_89_0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/boost_1_85_0.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.27445/boost_1_89_0.tar.xz differ: char 25, line 1 ++++++ curl-8.11.1.tar.xz -> curl-8.14.1.tar.xz ++++++ ++++ 258159 lines of diff (skipped) ++++++ fontconfig-2.15.0.tar.xz -> fontconfig-2.17.1.tar.xz ++++++ ++++ 193653 lines of diff (skipped) ++++++ freetype-2.13.2.tar.xz -> freetype-2.13.3.tar.xz ++++++ ++++ 187412 lines of diff (skipped) ++++++ gpgme-1.24.0.tar.bz2 -> gpgme-1.24.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/AUTHORS new/gpgme-1.24.3/AUTHORS --- old/gpgme-1.24.0/AUTHORS 2024-11-06 11:38:13.000000000 +0100 +++ new/gpgme-1.24.3/AUTHORS 2025-05-05 16:32:11.000000000 +0200 @@ -22,7 +22,7 @@ Copyright (C) 1991-2013 Free Software Foundation, Inc. Copyright (C) 2000-2001 Werner Koch - Copyright (C) 2001-2024 g10 Code GmbH + Copyright (C) 2001-2025 g10 Code GmbH Copyright (C) 2002 Klarälvdalens Datakonsult AB Copyright (C) 2004-2008 Igor Belyi Copyright (C) 2002 John Goerzen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/ChangeLog new/gpgme-1.24.3/ChangeLog --- old/gpgme-1.24.0/ChangeLog 2024-11-06 11:45:55.000000000 +0100 +++ new/gpgme-1.24.3/ChangeLog 2025-05-19 16:32:56.000000000 +0200 @@ -1,3 +1,110 @@ +2025-05-19 Werner Koch <[email protected]> + + Release 1.24.3. + + commit 6403435fa18758f44abdc679779de85201afc509 + + +2025-05-05 Ingo Klöcker <[email protected]> + + cpp: Ensure correct expiration time on 32-bit arch with 64-bit time_t. + + commit f23cef6f66a44c5c1cc8717f74b658d14fde04e5 + * lang/cpp/src/key.cpp (Subkey::expirationTime): Cast away the + signedness of _gpgme_subkey.expires before casting to time_t. + +2025-04-15 Ingo Klöcker <[email protected]> + + cpp: Add missing transition, remove two ignored (and wrong) transitions. + + commit e327305b9669107235ebe5e1e929988c1adefce9 + * lang/cpp/src/gpgsignkeyeditinteractor.cpp (makeTable): Remove two + transitions. Add one transition. + + * lang/cpp/src/gpgsignkeyeditinteractor.cpp (makeTable) + <sign_uid.dupe_okay>: Add one more transition. + +2025-04-11 Ingo Klöcker <[email protected]> + + cpp: Validate the transition map. + + commit 64bb704a25ea1384666d5f0d5202363f4271d948 + * lang/cpp/src/gpgsignkeyeditinteractor.cpp (makeTable): Assert that + all transitions go from one state to a different state. + + cpp: Ensure that all transitions go from one state to a different state. + + commit a4945675ece2c1e915fc49298adfd927737ede3d + * src/gpgsignkeyeditinteractor.cpp (makeTable): Replace transitions from + CONFIRM to CONFIRM with transitions from CONFIRM to CONFIRM2 and vice + versa. Add transitions from CONFIRM2 to some other state for all + transitions from CONFIRM to some other state. + +2025-02-10 Werner Koch <[email protected]> + + Release 1.24.2. + + commit 5214a34ba766d5eba4d0c1ce53be51e118382476 + + +2025-02-04 Werner Koch <[email protected]> + + core: Fix regression for RSA in gpgme_pubkey_algo_string. + + commit a6e8f961436dd470b819ff3fa3ed0da946dafc87 + * src/gpgme.c (gpgme_pubkey_algo_string): Consider all RSA variants. + +2025-01-15 Ingo Klöcker <[email protected]> + + build: Fix generation of ChangeLog on secondary working trees. + + commit f6403a998f812b95534c1b6911b4ae5590c0d970 + * Makefile.am (gen-ChangeLog): Use test -e instead of test -d to check + for git working trees. + +2025-01-15 NIIBE Yutaka <[email protected]> + + build: Remove defining GPG_ERR_ENABLE_ERRNO_MACROS. + + commit fa17f2aaedb50cb576c47b191b3599e384272bc2 + * configure.ac (GPG_ERR_ENABLE_ERRNO_MACROS): Remove. + +2025-01-02 Ingo Klöcker <[email protected]> + + tests,json: Prevent failing tests after 2027-05-15. + + commit b9f9e24c00448851027683757ee5cf3f8c569ff1 + * tests/json/key-with-revokers.asc: Replace with new public key. + * tests/json/t-keylist-revokers.out.json: Update to new public key. + +2024-12-04 Ingo Klöcker <[email protected]> + + build,python: Fix uninstalling in distcheck. + + commit 7a42ec5d466dfb5d4571773e22a51d0786b76d85 + * lang/python/Makefile.am (uninstall-local): Get platlib path relative + to data path. + + build,python: Add Python 3.13 and remove Python 3.8. + + commit 27da4ec6350d803354d691c06a31c47176ec1064 + * configure.ac: Look for Python 3.13. Don't look for Python 3.8 anymore. + * lang/python/setup.py.in: Update Python versions in classifiers. + * m4/python.m4: Add python3.13 as valid interpreter. Remove python3.8. + +2024-12-04 Werner Koch <[email protected]> + lgh1 + + Add a configure test for gettid. + + commit 4a62318422ca3f0f72b6fd00031daba556a10687 + * configure.ac (HAVE_GETTID,HAVE_SYS_GETTID): New test. + * src/debug.c: Include syscall.h if needed. + (tid_log_callback) [HAVE_SYS_GETTID]: Use SYS_gettid + +2024-11-14 Ingo Klöcker <[email protected]> + + cpp: Add Kyber algorithm. + + commit 56718f8d204f8a5895feb1a99c4b8ecd42b78010 + * lang/cpp/src/key.h (enum Subkey::PubkeyAlgo): Add AlgoKyber with + same value as GPGME_PK_KYBER. + +2024-11-14 Werner Koch <[email protected]> + + Support the Kyber algorithm in key listings. + + commit 62b6c1f16ae0ed7b0eb1b095ee383aa0910314bb + * src/gpgme.h.in (GPGME_PK_KYBER): New. + * src/conversion.c (_gpgme_map_pk_algo): Handle Kyber. + * src/gpgme.c (gpgme_pubkey_algo_string): Support Kyber. + (gpgme_pubkey_algo_name): Add Kyber. + 2024-11-06 Werner Koch <[email protected]> Release 1.24.0. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/Makefile.am new/gpgme-1.24.3/Makefile.am --- old/gpgme-1.24.0/Makefile.am 2024-05-21 17:03:58.000000000 +0200 +++ new/gpgme-1.24.3/Makefile.am 2025-05-05 16:32:11.000000000 +0200 @@ -74,7 +74,7 @@ gen_start_date = 2011-12-01T00:00:00 gen-ChangeLog: - if test -d $(top_srcdir)/.git; then \ + if test -e $(top_srcdir)/.git; then \ (cd $(top_srcdir) && \ $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \ --amend=build-aux/git-log-fix \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/Makefile.in new/gpgme-1.24.3/Makefile.in --- old/gpgme-1.24.0/Makefile.in 2024-11-06 11:45:37.000000000 +0100 +++ new/gpgme-1.24.3/Makefile.in 2025-05-19 16:32:38.000000000 +0200 @@ -1005,7 +1005,7 @@ .PHONY: gen-ChangeLog release sign-release gen-ChangeLog: - if test -d $(top_srcdir)/.git; then \ + if test -e $(top_srcdir)/.git; then \ (cd $(top_srcdir) && \ $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \ --amend=build-aux/git-log-fix \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/NEWS new/gpgme-1.24.3/NEWS --- old/gpgme-1.24.0/NEWS 2024-11-06 11:37:47.000000000 +0100 +++ new/gpgme-1.24.3/NEWS 2025-05-19 16:28:40.000000000 +0200 @@ -1,3 +1,53 @@ +Noteworthy changes in version 1.24.3 (2025-05-19) +------------------------------------------------- + + Take care: This version is from a legacy branch of gpgme created + just before we split out the C++, Qt, and Python bindings to + separate repositories and bumped the version number up to 2.0. + + * cpp: Ensure that all transitions go from one state to a different + state. [T7600] + + * cpp: Ensure correct expiration time on 32-bit arch with 64-bit + time_t. [T7627] + + [c=C44/A33/R2 cpp=C27/A21/R3 qt=C21/A6/R2] + + Release-info: https://dev.gnupg.org/T7524 + + +Noteworthy changes in version 1.24.2 (2025-02-10) +------------------------------------------------- + + Take care: This version is from a legacy branch of gpgme created + just before we split out the C++, Qt, and Python bindings to + separate repositories and bumped the version number up to 2.0. + + * Fix regression for RSA in gpgme_pubkey_algo_string. [T7508] + + * Prevent failing tests after 2027-05-15. [T7471] + + [c=C44/A33/R2 cpp=C27/A21/R2 qt=C21/A6/R2] + + Release-info: https://dev.gnupg.org/T7524 + + +Noteworthy changes in version 1.24.1 (2024-12-04) +------------------------------------------------- + + * Support the Kyber algorithm in key listings. + + * Allow building on some older Linux platforms. [rM4a62318422] + + * Interface changes relative to the 1.24.0 release: + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + GPGME_PK_KYBER NEW enum value. + + [c=C44/A33/R1 cpp=C27/A21/R1 qt=C21/A6/R1] + + Release-info: https://dev.gnupg.org/T7440 + + Noteworthy changes in version 1.24.0 (2024-11-06) ------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/README new/gpgme-1.24.3/README --- old/gpgme-1.24.0/README 2024-11-06 11:37:58.000000000 +0100 +++ new/gpgme-1.24.3/README 2025-05-19 16:14:42.000000000 +0200 @@ -1,7 +1,7 @@ GPGME - GnuPG Made Easy --------------------------- -Copyright 2001-2024 g10 Code GmbH +Copyright 2001-2025 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 @@ -13,6 +13,12 @@ PURPOSE. + Take care: This version is from a legacy branch of gpgme created + just before we split out the C++, Qt, and Python bindings to + separate repositories and bumped the version number up to 2.0. + + + Introduction -------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/VERSION new/gpgme-1.24.3/VERSION --- old/gpgme-1.24.0/VERSION 2024-11-06 11:45:37.000000000 +0100 +++ new/gpgme-1.24.3/VERSION 2025-05-19 16:32:38.000000000 +0200 @@ -1,2 +1,2 @@ -1.24.0 -98b10fbc63b323a146e66a2ea8f7ff8f216b31d7 +1.24.3 +6403435fa18758f44abdc679779de85201afc509 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/conf/config.h.in new/gpgme-1.24.3/conf/config.h.in --- old/gpgme-1.24.0/conf/config.h.in 2024-11-06 11:45:50.000000000 +0100 +++ new/gpgme-1.24.3/conf/config.h.in 2025-05-19 16:31:31.000000000 +0200 @@ -77,6 +77,9 @@ /* Define to 1 if you have the `getgid' function. */ #undef HAVE_GETGID +/* Defined if gettid is available. */ +#undef HAVE_GETTID + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H @@ -122,6 +125,9 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Defined is the system call gettid is available */ +#undef HAVE_SYS_GETTID + /* Define to 1 if you have the <sys/select.h> header file. */ #undef HAVE_SYS_SELECT_H @@ -363,9 +369,6 @@ /* Under Windows we use the gettext code from gpgrt. */ #define GPG_ERR_ENABLE_GETTEXT_MACROS 1 -/* Under WindowsCE we need gpg-error's strerror macro. */ -#define GPG_ERR_ENABLE_ERRNO_MACROS 1 - #define CRIGHTBLURB "Copyright (C) 2000 Werner Koch\n" \ - "Copyright (C) 2001--2021 g10 Code GmbH\n" + "Copyright (C) 2001--2025 g10 Code GmbH\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/configure new/gpgme-1.24.3/configure --- old/gpgme-1.24.0/configure 2024-11-06 11:45:38.000000000 +0100 +++ new/gpgme-1.24.3/configure 2025-05-19 16:32:39.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for gpgme 1.24.0. +# Generated by GNU Autoconf 2.71 for gpgme 1.24.3. # # Report bugs to <https://bugs.gnupg.org>. # @@ -621,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='gpgme' PACKAGE_TARNAME='gpgme' -PACKAGE_VERSION='1.24.0' -PACKAGE_STRING='gpgme 1.24.0' +PACKAGE_VERSION='1.24.3' +PACKAGE_STRING='gpgme 1.24.3' PACKAGE_BUGREPORT='https://bugs.gnupg.org' PACKAGE_URL='' @@ -1527,7 +1527,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 gpgme 1.24.0 to adapt to many kinds of systems. +\`configure' configures gpgme 1.24.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1598,7 +1598,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gpgme 1.24.0:";; + short | recursive ) echo "Configuration of gpgme 1.24.3:";; esac cat <<\_ACEOF @@ -1771,7 +1771,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gpgme configure 1.24.0 +gpgme configure 1.24.3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2552,7 +2552,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gpgme $as_me 1.24.0, which was +It was created by gpgme $as_me 1.24.3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3540,18 +3540,18 @@ # LIBGPGME_LT_CURRENT=44 LIBGPGME_LT_AGE=33 -LIBGPGME_LT_REVISION=0 +LIBGPGME_LT_REVISION=2 # If there is an ABI break in gpgmepp or qgpgme also bump the # version in IMPORTED_LOCATION in the GpgmeppConfig-w32.cmake.in.in LIBGPGMEPP_LT_CURRENT=27 LIBGPGMEPP_LT_AGE=21 -LIBGPGMEPP_LT_REVISION=0 +LIBGPGMEPP_LT_REVISION=3 LIBQGPGME_LT_CURRENT=21 LIBQGPGME_LT_AGE=6 -LIBQGPGME_LT_REVISION=0 +LIBQGPGME_LT_REVISION=2 ################################################ @@ -3577,7 +3577,7 @@ VERSION_MAJOR=1 VERSION_MINOR=24 -VERSION_MICRO=0 +VERSION_MICRO=3 @@ -4098,7 +4098,7 @@ # Define the identity of the package. PACKAGE='gpgme' - VERSION='1.24.0' + VERSION='1.24.3' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -7469,7 +7469,7 @@ -VERSION_NUMBER=0x011800 +VERSION_NUMBER=0x011803 # We need to compile and run a program on the build machine. A @@ -24043,13 +24043,13 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.8" >&5 -printf %s "checking whether $PYTHON version is >= 3.8... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.9" >&5 +printf %s "checking whether $PYTHON version is >= 3.9... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.8'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -24071,20 +24071,20 @@ else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.8" >&5 -printf %s "checking for a Python interpreter with version >= 3.8... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.9" >&5 +printf %s "checking for a Python interpreter with version >= 3.9... " >&6; } if test ${am_cv_pathless_PYTHON+y} then : printf %s "(cached) " >&6 else $as_nop - for am_cv_pathless_PYTHON in python3.8 none; do + for am_cv_pathless_PYTHON in python3.9 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.8'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -24982,13 +24982,13 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.9" >&5 -printf %s "checking whether $PYTHON version is >= 3.9... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5 +printf %s "checking whether $PYTHON version is >= 3.10... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -25010,20 +25010,20 @@ else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.9" >&5 -printf %s "checking for a Python interpreter with version >= 3.9... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5 +printf %s "checking for a Python interpreter with version >= 3.10... " >&6; } if test ${am_cv_pathless_PYTHON+y} then : printf %s "(cached) " >&6 else $as_nop - for am_cv_pathless_PYTHON in python3.9 none; do + for am_cv_pathless_PYTHON in python3.10 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -25921,13 +25921,13 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5 -printf %s "checking whether $PYTHON version is >= 3.10... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.11" >&5 +printf %s "checking whether $PYTHON version is >= 3.11... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.11'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -25949,20 +25949,20 @@ else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5 -printf %s "checking for a Python interpreter with version >= 3.10... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.11" >&5 +printf %s "checking for a Python interpreter with version >= 3.11... " >&6; } if test ${am_cv_pathless_PYTHON+y} then : printf %s "(cached) " >&6 else $as_nop - for am_cv_pathless_PYTHON in python3.10 none; do + for am_cv_pathless_PYTHON in python3.11 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.11'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -26860,13 +26860,13 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.11" >&5 -printf %s "checking whether $PYTHON version is >= 3.11... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.12" >&5 +printf %s "checking whether $PYTHON version is >= 3.12... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.11'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.12'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -26888,20 +26888,20 @@ else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.11" >&5 -printf %s "checking for a Python interpreter with version >= 3.11... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.12" >&5 +printf %s "checking for a Python interpreter with version >= 3.12... " >&6; } if test ${am_cv_pathless_PYTHON+y} then : printf %s "(cached) " >&6 else $as_nop - for am_cv_pathless_PYTHON in python3.11 none; do + for am_cv_pathless_PYTHON in python3.12 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.11'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.12'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -27799,13 +27799,13 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.12" >&5 -printf %s "checking whether $PYTHON version is >= 3.12... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.13" >&5 +printf %s "checking whether $PYTHON version is >= 3.13... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.12'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.13'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -27827,20 +27827,20 @@ else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.12" >&5 -printf %s "checking for a Python interpreter with version >= 3.12... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.13" >&5 +printf %s "checking for a Python interpreter with version >= 3.13... " >&6; } if test ${am_cv_pathless_PYTHON+y} then : printf %s "(cached) " >&6 else $as_nop - for am_cv_pathless_PYTHON in python3.12 none; do + for am_cv_pathless_PYTHON in python3.13 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.12'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.13'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -29691,8 +29691,8 @@ # # Provide information about the build. # -BUILD_REVISION="98b10fbc" -BUILD_COMMITID="98b10fbc63b323a146e66a2ea8f7ff8f216b31d7" +BUILD_REVISION="6403435f" +BUILD_COMMITID="6403435fa18758f44abdc679779de85201afc509" printf "%s\n" "#define BUILD_REVISION \"$BUILD_REVISION\"" >>confdefs.h @@ -29702,7 +29702,7 @@ BUILD_VERSION=`echo "$PACKAGE_VERSION" | sed 's/\([0-9.]*\).*/\1./'` -BUILD_VERSION="${BUILD_VERSION}39089" +BUILD_VERSION="${BUILD_VERSION}25603" BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,` @@ -31339,6 +31339,48 @@ fi +# Check for gettid - test taken from strongswan git +ac_fn_c_check_func "$LINENO" "gettid" "ac_cv_func_gettid" +if test "x$ac_cv_func_gettid" = xyes +then : + +printf "%s\n" "#define HAVE_GETTID 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYS_gettid" >&5 +printf %s "checking for SYS_gettid... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _GNU_SOURCE + #include <unistd.h> + #include <sys/syscall.h> + +int +main (void) +{ +int main() { + return syscall(SYS_gettid);} + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HAVE_SYS_GETTID 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi + + # Replacement functions. ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy" @@ -32287,7 +32329,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gpgme $as_me 1.24.0, which was +This file was extended by gpgme $as_me 1.24.3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32355,7 +32397,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -gpgme config.status 1.24.0 +gpgme config.status 1.24.3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" @@ -34710,7 +34752,7 @@ echo " GPGME v${VERSION} has been configured as follows: - Revision: 98b10fbc (39089) + Revision: 6403435f (25603) Platform: $host UI Server: $uiserver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/configure.ac new/gpgme-1.24.3/configure.ac --- old/gpgme-1.24.0/configure.ac 2024-11-06 11:36:54.000000000 +0100 +++ new/gpgme-1.24.3/configure.ac 2025-05-19 16:29:47.000000000 +0200 @@ -1,6 +1,6 @@ # configure.ac for GPGME # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001-2021 g10 Code GmbH +# Copyright (C) 2001-2025 g10 Code GmbH # # This file is part of GPGME. # @@ -32,7 +32,7 @@ m4_define([mym4_package],[gpgme]) m4_define([mym4_major], [1]) m4_define([mym4_minor], [24]) -m4_define([mym4_micro], [0]) +m4_define([mym4_micro], [3]) # Below is m4 magic to extract and compute the git revision number, # the decimalized short revision number, a beta version string and a @@ -57,18 +57,18 @@ # LIBGPGME_LT_CURRENT=44 LIBGPGME_LT_AGE=33 -LIBGPGME_LT_REVISION=0 +LIBGPGME_LT_REVISION=2 # If there is an ABI break in gpgmepp or qgpgme also bump the # version in IMPORTED_LOCATION in the GpgmeppConfig-w32.cmake.in.in LIBGPGMEPP_LT_CURRENT=27 LIBGPGMEPP_LT_AGE=21 -LIBGPGMEPP_LT_REVISION=0 +LIBGPGMEPP_LT_REVISION=3 LIBQGPGME_LT_CURRENT=21 LIBQGPGME_LT_AGE=6 -LIBQGPGME_LT_REVISION=0 +LIBQGPGME_LT_REVISION=2 ################################################ AC_SUBST(LIBGPGME_LT_CURRENT) @@ -614,7 +614,7 @@ if test "$found_py" = "1" -o "$found_py3" = "1"; then # Reset everything, so that we can look for another Python. m4_foreach([mym4pythonver], - [[2.7],[3.6],[3.8],[3.9],[3.10],[3.11],[3.12],[all]], + [[2.7],[3.6],[3.9],[3.10],[3.11],[3.12],[3.13],[all]], [unset PYTHON unset PYTHON_VERSION unset PYTHON_CPPFLAGS @@ -919,6 +919,25 @@ # Check for getgid etc AC_CHECK_FUNCS(getgid getegid closefrom nanosleep) +# Check for gettid - test taken from strongswan git +AC_CHECK_FUNC(gettid, + [AC_DEFINE(HAVE_GETTID, 1, [Defined if gettid is available.])], + [AC_MSG_CHECKING([for SYS_gettid]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#define _GNU_SOURCE + #include <unistd.h> + #include <sys/syscall.h> + ]], + [[int main() { + return syscall(SYS_gettid);}]])], + [AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_SYS_GETTID,1, + [Defined is the system call gettid is available])], + [AC_MSG_RESULT([no])] + )] +) + # Replacement functions. AC_REPLACE_FUNCS(stpcpy) @@ -1020,11 +1039,8 @@ /* Under Windows we use the gettext code from gpgrt. */ #define GPG_ERR_ENABLE_GETTEXT_MACROS 1 -/* Under WindowsCE we need gpg-error's strerror macro. */ -#define GPG_ERR_ENABLE_ERRNO_MACROS 1 - #define CRIGHTBLURB "Copyright (C) 2000 Werner Koch\n" \ - "Copyright (C) 2001--2021 g10 Code GmbH\n" + "Copyright (C) 2001--2025 g10 Code GmbH\n" ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/doc/gpgme.info new/gpgme-1.24.3/doc/gpgme.info --- old/gpgme-1.24.0/doc/gpgme.info 2024-10-29 12:00:22.000000000 +0100 +++ new/gpgme-1.24.3/doc/gpgme.info 2025-05-19 16:32:51.000000000 +0200 @@ -19,8 +19,8 @@ This file documents the GPGME library. - This is Edition 1.24.0-beta635, last updated 29 October 2024, of ‘The -‘GnuPG Made Easy’ Reference Manual’, for Version 1.24.0-beta635. + This is Edition 1.24.3, last updated 29 October 2024, of ‘The ‘GnuPG +Made Easy’ Reference Manual’, for Version 1.24.3. Copyright © 2002–2008, 2010, 2012–2018 g10 Code GmbH. @@ -37,129 +37,129 @@ Indirect: -gpgme.info-1: 1689 -gpgme.info-2: 303777 +gpgme.info-1: 1673 +gpgme.info-2: 303729 Tag Table: (Indirect) -Node: Top1689 -Node: Introduction9069 -Node: Getting Started9859 -Node: Features11320 -Node: Overview12632 -Node: Preparation13741 -Node: Header14738 -Node: Building the Source15485 -Node: Largefile Support (LFS)17875 -Node: Using Automake23292 -Node: Using Libtool25004 -Node: Library Version Check25301 -Node: Signal Handling31760 -Node: Multi-Threading33030 -Ref: Multi-Threading-Footnote-134446 -Node: Protocols and Engines34869 -Node: Engine Version Check37620 -Node: Engine Information40669 -Node: Engine Configuration44529 -Node: OpenPGP45833 -Node: Cryptographic Message Syntax46173 -Node: Assuan46486 -Node: Algorithms46860 -Ref: Algorithms-Footnote-147339 -Node: Public Key Algorithms47467 -Node: Hash Algorithms50069 -Node: Error Handling51283 -Node: Error Values53157 -Node: Error Sources58360 -Node: Error Codes60800 -Node: Error Strings65821 -Node: Exchanging Data67628 -Node: Creating Data Buffers69513 -Node: Memory Based Data Buffers70029 -Node: File Based Data Buffers73462 -Node: Callback Based Data Buffers76575 -Node: Destroying Data Buffers80766 -Node: Manipulating Data Buffers82273 -Node: Data Buffer I/O Operations82765 -Node: Data Buffer Meta-Data85138 -Node: Data Buffer Convenience90719 -Node: Contexts92993 -Node: Creating Contexts94112 -Node: Destroying Contexts94959 -Node: Result Management95298 -Node: Context Attributes96879 -Node: Protocol Selection98046 -Node: Crypto Engine99092 -Node: Setting the Sender100981 -Node: ASCII Armor102495 -Node: Text Mode103124 -Node: Offline Mode104058 -Node: Pinentry Mode105589 -Node: Included Certificates107483 -Node: Key Listing Mode108929 -Node: Passphrase Callback115251 -Node: Progress Meter Callback118813 -Node: Status Message Callback120798 -Node: Context Flags122563 -Node: Locale131035 -Node: Additional Logs132627 -Node: Key Management134825 -Node: Key objects136049 -Node: Listing Keys153543 -Node: Information About Keys162196 -Node: Manipulating Keys163504 -Node: Generating Keys167492 -Node: Signing Keys186287 -Node: Exporting Keys192046 -Node: Importing Keys199635 -Ref: Importing Keys-Footnote-1208503 -Node: Deleting Keys208631 -Node: Changing Passphrases211054 -Node: Changing TOFU Data212381 -Node: Advanced Key Editing214489 -Node: Crypto Operations217222 -Node: Decrypt218479 -Node: Verify226857 -Node: Decrypt and Verify242692 -Node: Sign245547 -Node: Selecting Signers246111 -Node: Creating a Signature247517 -Node: Signature Notation Data253994 -Node: Encrypt256279 -Node: Encrypting a Plaintext256635 -Node: Miscellaneous273465 -Node: Running other Programs273877 -Node: Using the Assuan protocol276040 -Node: Checking for updates278838 -Node: Run Control283655 -Node: Waiting For Completion284399 -Node: Using External Event Loops286524 -Node: I/O Callback Interface288496 -Node: Registering I/O Callbacks293424 -Node: I/O Callback Example295463 -Node: I/O Callback Example GTK+303777 -Node: I/O Callback Example GDK305566 -Node: I/O Callback Example Qt307208 -Node: Cancellation309496 -Node: UI Server Protocol311804 -Ref: UI Server Protocol-Footnote-1313239 -Node: UI Server Encrypt313358 -Node: UI Server Sign318716 -Node: UI Server Decrypt321069 -Node: UI Server Verify322724 -Node: UI Server Set Input Files326296 -Node: UI Server Sign/Encrypt Files327366 -Node: UI Server Verify/Decrypt Files329174 -Node: UI Server Import/Export Keys331050 -Node: UI Server Checksum Files332112 -Node: Miscellaneous UI Server Commands334330 -Ref: command SENDER336261 -Node: Debugging337963 -Node: Deprecated Functions340122 -Node: Library Copying363131 -Node: Copying391351 -Node: Concept Index429101 -Node: Function and Data Index443813 +Node: Top1673 +Node: Introduction9037 +Node: Getting Started9827 +Node: Features11288 +Node: Overview12600 +Node: Preparation13709 +Node: Header14706 +Node: Building the Source15453 +Node: Largefile Support (LFS)17843 +Node: Using Automake23260 +Node: Using Libtool24972 +Node: Library Version Check25269 +Node: Signal Handling31728 +Node: Multi-Threading32998 +Ref: Multi-Threading-Footnote-134414 +Node: Protocols and Engines34837 +Node: Engine Version Check37588 +Node: Engine Information40637 +Node: Engine Configuration44497 +Node: OpenPGP45801 +Node: Cryptographic Message Syntax46141 +Node: Assuan46454 +Node: Algorithms46828 +Ref: Algorithms-Footnote-147307 +Node: Public Key Algorithms47435 +Node: Hash Algorithms50037 +Node: Error Handling51251 +Node: Error Values53125 +Node: Error Sources58328 +Node: Error Codes60768 +Node: Error Strings65789 +Node: Exchanging Data67596 +Node: Creating Data Buffers69481 +Node: Memory Based Data Buffers69997 +Node: File Based Data Buffers73430 +Node: Callback Based Data Buffers76543 +Node: Destroying Data Buffers80734 +Node: Manipulating Data Buffers82241 +Node: Data Buffer I/O Operations82733 +Node: Data Buffer Meta-Data85106 +Node: Data Buffer Convenience90687 +Node: Contexts92961 +Node: Creating Contexts94080 +Node: Destroying Contexts94927 +Node: Result Management95266 +Node: Context Attributes96847 +Node: Protocol Selection98014 +Node: Crypto Engine99060 +Node: Setting the Sender100949 +Node: ASCII Armor102463 +Node: Text Mode103092 +Node: Offline Mode104026 +Node: Pinentry Mode105557 +Node: Included Certificates107451 +Node: Key Listing Mode108897 +Node: Passphrase Callback115219 +Node: Progress Meter Callback118781 +Node: Status Message Callback120766 +Node: Context Flags122531 +Node: Locale131003 +Node: Additional Logs132595 +Node: Key Management134793 +Node: Key objects136017 +Node: Listing Keys153511 +Node: Information About Keys162164 +Node: Manipulating Keys163472 +Node: Generating Keys167460 +Node: Signing Keys186255 +Node: Exporting Keys192014 +Node: Importing Keys199603 +Ref: Importing Keys-Footnote-1208471 +Node: Deleting Keys208599 +Node: Changing Passphrases211022 +Node: Changing TOFU Data212349 +Node: Advanced Key Editing214457 +Node: Crypto Operations217190 +Node: Decrypt218447 +Node: Verify226825 +Node: Decrypt and Verify242660 +Node: Sign245515 +Node: Selecting Signers246079 +Node: Creating a Signature247485 +Node: Signature Notation Data253962 +Node: Encrypt256247 +Node: Encrypting a Plaintext256603 +Node: Miscellaneous273433 +Node: Running other Programs273845 +Node: Using the Assuan protocol276008 +Node: Checking for updates278806 +Node: Run Control283623 +Node: Waiting For Completion284367 +Node: Using External Event Loops286492 +Node: I/O Callback Interface288464 +Node: Registering I/O Callbacks293392 +Node: I/O Callback Example295431 +Node: I/O Callback Example GTK+303729 +Node: I/O Callback Example GDK305518 +Node: I/O Callback Example Qt307160 +Node: Cancellation309448 +Node: UI Server Protocol311756 +Ref: UI Server Protocol-Footnote-1313191 +Node: UI Server Encrypt313310 +Node: UI Server Sign318668 +Node: UI Server Decrypt321021 +Node: UI Server Verify322676 +Node: UI Server Set Input Files326248 +Node: UI Server Sign/Encrypt Files327318 +Node: UI Server Verify/Decrypt Files329126 +Node: UI Server Import/Export Keys331002 +Node: UI Server Checksum Files332064 +Node: Miscellaneous UI Server Commands334282 +Ref: command SENDER336213 +Node: Debugging337915 +Node: Deprecated Functions340074 +Node: Library Copying363083 +Node: Copying391303 +Node: Concept Index429053 +Node: Function and Data Index443765 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/doc/gpgme.info-1 new/gpgme-1.24.3/doc/gpgme.info-1 --- old/gpgme-1.24.0/doc/gpgme.info-1 2024-10-29 12:00:22.000000000 +0100 +++ new/gpgme-1.24.3/doc/gpgme.info-1 2025-05-19 16:32:51.000000000 +0200 @@ -19,8 +19,8 @@ This file documents the GPGME library. - This is Edition 1.24.0-beta635, last updated 29 October 2024, of ‘The -‘GnuPG Made Easy’ Reference Manual’, for Version 1.24.0-beta635. + This is Edition 1.24.3, last updated 29 October 2024, of ‘The ‘GnuPG +Made Easy’ Reference Manual’, for Version 1.24.3. Copyright © 2002–2008, 2010, 2012–2018 g10 Code GmbH. @@ -41,9 +41,8 @@ Main Menu ********* -This is Edition 1.24.0-beta635, last updated 29 October 2024, of ‘The -‘GnuPG Made Easy’ Reference Manual’, for Version 1.24.0-beta635 of the -GPGME library. +This is Edition 1.24.3, last updated 29 October 2024, of ‘The ‘GnuPG +Made Easy’ Reference Manual’, for Version 1.24.3 of the GPGME library. * Menu: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/doc/gpgme.info-2 new/gpgme-1.24.3/doc/gpgme.info-2 --- old/gpgme-1.24.0/doc/gpgme.info-2 2024-10-29 12:00:22.000000000 +0100 +++ new/gpgme-1.24.3/doc/gpgme.info-2 2025-05-19 16:32:51.000000000 +0200 @@ -19,8 +19,8 @@ This file documents the GPGME library. - This is Edition 1.24.0-beta635, last updated 29 October 2024, of ‘The -‘GnuPG Made Easy’ Reference Manual’, for Version 1.24.0-beta635. + This is Edition 1.24.3, last updated 29 October 2024, of ‘The ‘GnuPG +Made Easy’ Reference Manual’, for Version 1.24.3. Copyright © 2002–2008, 2010, 2012–2018 g10 Code GmbH. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/gpgme.spec new/gpgme-1.24.3/gpgme.spec --- old/gpgme-1.24.0/gpgme.spec 2024-11-06 11:45:55.000000000 +0100 +++ new/gpgme-1.24.3/gpgme.spec 2025-05-19 16:32:56.000000000 +0200 @@ -1,7 +1,7 @@ # This is a template. The dist target uses it to create the real file. Summary: GPGME - GnuPG Made Easy Name: gpgme -Version: 1.24.0 +Version: 1.24.3 Release: 1 URL: https://gnupg.org/gpgme.html Source: https://www.gnupg.org/ftp/gcrypt/gpgme/%{name}-%{version}.tar.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/lang/cl/gpgme.asd new/gpgme-1.24.3/lang/cl/gpgme.asd --- old/gpgme-1.24.0/lang/cl/gpgme.asd 2024-11-06 11:45:47.000000000 +0100 +++ new/gpgme-1.24.3/lang/cl/gpgme.asd 2025-05-19 16:32:47.000000000 +0200 @@ -27,7 +27,7 @@ (defsystem gpgme :description "GnuPG Made Easy." :author "g10 Code GmbH" - :version "1.24.0" + :version "1.24.3" :licence "GPL" :defsystem-depends-on ("cffi-grovel") :depends-on ("cffi" "gpg-error" "trivial-garbage") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/lang/cpp/src/gpgsignkeyeditinteractor.cpp new/gpgme-1.24.3/lang/cpp/src/gpgsignkeyeditinteractor.cpp --- old/gpgme-1.24.0/lang/cpp/src/gpgsignkeyeditinteractor.cpp 2023-02-01 17:50:48.000000000 +0100 +++ new/gpgme-1.24.3/lang/cpp/src/gpgsignkeyeditinteractor.cpp 2025-05-19 16:14:42.000000000 +0200 @@ -196,7 +196,7 @@ addEntry(COMMAND, GET_BOOL, "keyedit.sign_all.okay", UIDS_ANSWER_SIGN_ALL); addEntry(COMMAND, GET_BOOL, "sign_uid.expired_okay", REJECT_SIGN_EXPIRED); addEntry(COMMAND, GET_BOOL, "sign_uid.okay", CONFIRM); - addEntry(COMMAND, GET_BOOL, "sign_uid.local_promote_okay", CONFIRM2); + addEntry(COMMAND, GET_BOOL, "sign_uid.local_promote_okay", CONFIRM); addEntry(COMMAND, GET_BOOL, "sign_uid.dupe_okay", DUPE_OK); addEntry(COMMAND, GET_LINE, "trustsig_prompt.trust_value", SET_TRUST_VALUE); addEntry(UIDS_ANSWER_SIGN_ALL, GET_BOOL, "sign_uid.okay", CONFIRM); @@ -209,17 +209,20 @@ addEntry(SET_TRUST_REGEXP, GET_BOOL, "sign_uid.okay", CONFIRM); addEntry(SET_CHECK_LEVEL, GET_BOOL, "sign_uid.okay", CONFIRM); addEntry(SET_EXPIRE, GET_BOOL, "sign_uid.class", SET_CHECK_LEVEL); - addEntry(CONFIRM, GET_BOOL, "sign_uid.local_promote_okay", CONFIRM); + addEntry(CONFIRM, GET_BOOL, "sign_uid.local_promote_okay", CONFIRM2); + addEntry(CONFIRM2, GET_BOOL, "sign_uid.local_promote_okay", CONFIRM); addEntry(DUPE_OK, GET_BOOL, "sign_uid.okay", CONFIRM); addEntry(DUPE_OK2, GET_BOOL, "sign_uid.okay", CONFIRM); addEntry(DUPE_OK, GET_LINE, "trustsig_prompt.trust_value", SET_TRUST_VALUE); addEntry(DUPE_OK2, GET_LINE, "trustsig_prompt.trust_value", SET_TRUST_VALUE); - addEntry(CONFIRM, GET_BOOL, "sign_uid.okay", CONFIRM); + addEntry(CONFIRM, GET_BOOL, "sign_uid.okay", CONFIRM2); addEntry(CONFIRM2, GET_BOOL, "sign_uid.okay", CONFIRM); - addEntry(CONFIRM, GET_LINE, "keyedit.prompt", COMMAND); addEntry(CONFIRM, GET_LINE, "trustsig_prompt.trust_value", SET_TRUST_VALUE); + addEntry(CONFIRM2, GET_LINE, "trustsig_prompt.trust_value", SET_TRUST_VALUE); addEntry(CONFIRM, GET_LINE, "sign_uid.expire", SET_EXPIRE); + addEntry(CONFIRM2, GET_LINE, "sign_uid.expire", SET_EXPIRE); addEntry(CONFIRM, GET_LINE, "sign_uid.class", SET_CHECK_LEVEL); + addEntry(CONFIRM2, GET_LINE, "sign_uid.class", SET_CHECK_LEVEL); addEntry(UIDS_LIST_SEPARATELY_DONE, GET_BOOL, "sign_uid.local_promote_okay", CONFIRM); addEntry(UIDS_LIST_SEPARATELY_DONE, GET_LINE, "keyedit.prompt", COMMAND); addEntry(UIDS_LIST_SEPARATELY_DONE, GET_LINE, "trustsig_prompt.trust_value", SET_TRUST_VALUE); @@ -229,11 +232,17 @@ addEntry(UIDS_LIST_SEPARATELY_DONE, GET_BOOL, "sign_uid.dupe_okay", DUPE_OK); addEntry(DUPE_OK, GET_BOOL, "sign_uid.dupe_okay", DUPE_OK2); addEntry(DUPE_OK2, GET_BOOL, "sign_uid.dupe_okay", DUPE_OK); + addEntry(CONFIRM, GET_BOOL, "sign_uid.dupe_okay", DUPE_OK); addEntry(CONFIRM, GET_LINE, "keyedit.prompt", QUIT); + addEntry(CONFIRM2, GET_LINE, "keyedit.prompt", QUIT); addEntry(REJECT_SIGN_EXPIRED, GET_LINE, "keyedit.prompt", QUIT); addEntry(ERROR, GET_LINE, "keyedit.prompt", QUIT); addEntry(QUIT, GET_BOOL, "keyedit.save.okay", SAVE); #undef addEntry + // validate the transition map; there must not be a transition without state change + for (auto it = tab.cbegin(); it != tab.cend(); ++it) { + assert(std::get<0>(it->first) != it->second); + } return tab; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/lang/cpp/src/key.cpp new/gpgme-1.24.3/lang/cpp/src/key.cpp --- old/gpgme-1.24.0/lang/cpp/src/key.cpp 2024-10-29 12:00:11.000000000 +0100 +++ new/gpgme-1.24.3/lang/cpp/src/key.cpp 2025-05-19 16:14:42.000000000 +0200 @@ -633,7 +633,7 @@ time_t Subkey::expirationTime() const { - return static_cast<time_t>(subkey ? subkey->expires : 0); + return static_cast<time_t>(static_cast<unsigned long int>(subkey ? subkey->expires : 0)); } bool Subkey::neverExpires() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/lang/cpp/src/key.h new/gpgme-1.24.3/lang/cpp/src/key.h --- old/gpgme-1.24.0/lang/cpp/src/key.h 2024-10-29 12:00:11.000000000 +0100 +++ new/gpgme-1.24.3/lang/cpp/src/key.h 2025-05-19 16:14:42.000000000 +0200 @@ -301,6 +301,7 @@ AlgoRSA = 1, AlgoRSA_E = 2, AlgoRSA_S = 3, + AlgoKyber = 8, AlgoELG_E = 16, AlgoDSA = 17, AlgoECC = 18, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/lang/python/Makefile.am new/gpgme-1.24.3/lang/python/Makefile.am --- old/gpgme-1.24.0/lang/python/Makefile.am 2024-06-24 16:51:19.000000000 +0200 +++ new/gpgme-1.24.3/lang/python/Makefile.am 2025-05-19 16:14:42.000000000 +0200 @@ -105,7 +105,7 @@ GV=$$(echo $(VERSION) | tr - _); \ normalizedGV=$$(echo $$GV | sed s/_beta/b/); \ for PYTHON in $(PYTHONS); do \ - PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_config_var("prefix")))')" ; \ + PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_path("data", scheme="posix_prefix")))')" ; \ rm -rf -- "$(DESTDIR)$${PLATLIB}/gpg" \ "$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info \ "$(DESTDIR)$${PLATLIB}"/gpg-$$normalizedGV-py*.egg ; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/lang/python/Makefile.in new/gpgme-1.24.3/lang/python/Makefile.in --- old/gpgme-1.24.0/lang/python/Makefile.in 2024-11-06 11:45:37.000000000 +0100 +++ new/gpgme-1.24.3/lang/python/Makefile.in 2025-05-19 16:32:38.000000000 +0200 @@ -827,7 +827,7 @@ GV=$$(echo $(VERSION) | tr - _); \ normalizedGV=$$(echo $$GV | sed s/_beta/b/); \ for PYTHON in $(PYTHONS); do \ - PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_config_var("prefix")))')" ; \ + PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_path("data", scheme="posix_prefix")))')" ; \ rm -rf -- "$(DESTDIR)$${PLATLIB}/gpg" \ "$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info \ "$(DESTDIR)$${PLATLIB}"/gpg-$$normalizedGV-py*.egg ; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/lang/python/setup.py.in new/gpgme-1.24.3/lang/python/setup.py.in --- old/gpgme-1.24.0/lang/python/setup.py.in 2024-09-09 16:58:10.000000000 +0200 +++ new/gpgme-1.24.3/lang/python/setup.py.in 2025-05-19 16:14:42.000000000 +0200 @@ -286,11 +286,11 @@ 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Operating System :: POSIX', 'Operating System :: Microsoft :: Windows', 'Topic :: Communications :: Email', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/m4/python.m4 new/gpgme-1.24.3/m4/python.m4 --- old/gpgme-1.24.0/m4/python.m4 2024-06-24 16:51:19.000000000 +0200 +++ new/gpgme-1.24.3/m4/python.m4 2025-05-19 16:14:42.000000000 +0200 @@ -36,12 +36,12 @@ # numbers and dots only. AC_DEFUN([AM_PATH_PYTHON], [ - dnl Find a Python interpreter. Python versions prior to 3.8 are + dnl Find a Python interpreter. Python versions prior to 3.9 are dnl end-of-life and not supported, with the exception of 2.7 and 3.6. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], [python2 python2.7 dnl python dnl - python3 python3.12 python3.11 python3.10 python3.9 python3.8 python3.6 + python3 python3.13 python3.12 python3.11 python3.10 python3.9 python3.6 ]) AC_ARG_VAR([PYTHON], [the Python interpreter]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/src/conversion.c new/gpgme-1.24.3/src/conversion.c --- old/gpgme-1.24.0/src/conversion.c 2024-10-29 12:00:11.000000000 +0100 +++ new/gpgme-1.24.3/src/conversion.c 2025-05-05 16:32:11.000000000 +0200 @@ -650,7 +650,7 @@ { switch (algo) { - case 1: case 2: case 3: case 16: case 17: break; + case 1: case 2: case 3: case 8: case 16: case 17: break; case 18: algo = GPGME_PK_ECDH; break; case 19: algo = GPGME_PK_ECDSA; break; case 20: break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/src/debug.c new/gpgme-1.24.3/src/debug.c --- old/gpgme-1.24.0/src/debug.c 2024-08-13 08:49:35.000000000 +0200 +++ new/gpgme-1.24.3/src/debug.c 2025-05-05 16:32:11.000000000 +0200 @@ -29,6 +29,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#if defined(__linux) && defined(HAVE_SYS_GETTID) +# include <syscall.h> +#endif #include <ctype.h> #include <errno.h> #include <time.h> @@ -147,12 +150,16 @@ tid_log_callback (unsigned long *rvalue) { int len = sizeof (*rvalue); - uintptr_t thread; + uintptr_t thread = 0; #ifdef HAVE_W32_SYSTEM thread = (uintptr_t)GetCurrentThreadId (); #elif defined(__linux) - thread = (uintptr_t)gettid (); +# ifdef HAVE_GETTID + thread = (uintptr_t)gettid (); +# elif defined(HAVE_SYS_GETTID) + thread = (uintptr_t)syscall(SYS_gettid); +# endif #endif if (sizeof (thread) < len) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/src/gpgme.c new/gpgme-1.24.3/src/gpgme.c --- old/gpgme-1.24.0/src/gpgme.c 2024-10-29 12:00:11.000000000 +0100 +++ new/gpgme-1.24.3/src/gpgme.c 2025-05-05 16:32:11.000000000 +0200 @@ -1295,6 +1295,7 @@ { const char *prefix = NULL; char *result; + int composite = 0; if (!subkey) { @@ -1307,6 +1308,7 @@ case GPGME_PK_RSA: case GPGME_PK_RSA_E: case GPGME_PK_RSA_S: prefix = "rsa"; break; + case GPGME_PK_KYBER: composite = 1; break; case GPGME_PK_ELG_E: prefix = "elg"; break; case GPGME_PK_DSA: prefix = "dsa"; break; case GPGME_PK_ELG: prefix = "xxx"; break; @@ -1316,9 +1318,12 @@ case GPGME_PK_EDDSA: prefix = ""; break; } - if (prefix && *prefix) + if (composite && subkey->curve) + result = strdup (subkey->curve); + else if (prefix && *prefix) { char buffer[40]; + snprintf (buffer, sizeof buffer, "%s%u", prefix, subkey->length); result = strdup (buffer); } @@ -1341,6 +1346,7 @@ case GPGME_PK_RSA: return "RSA"; case GPGME_PK_RSA_E: return "RSA-E"; case GPGME_PK_RSA_S: return "RSA-S"; + case GPGME_PK_KYBER: return "KYBER"; case GPGME_PK_ELG_E: return "ELG-E"; case GPGME_PK_DSA: return "DSA"; case GPGME_PK_ECC: return "ECC"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/src/gpgme.h.in new/gpgme-1.24.3/src/gpgme.h.in --- old/gpgme-1.24.0/src/gpgme.h.in 2024-10-07 08:38:08.000000000 +0200 +++ new/gpgme-1.24.3/src/gpgme.h.in 2025-05-19 16:14:42.000000000 +0200 @@ -270,6 +270,7 @@ GPGME_PK_RSA = 1, GPGME_PK_RSA_E = 2, GPGME_PK_RSA_S = 3, + GPGME_PK_KYBER = 8, GPGME_PK_ELG_E = 16, GPGME_PK_DSA = 17, GPGME_PK_ECC = 18, @@ -616,7 +617,8 @@ /* The serial number of a smart card holding this key or NULL. */ char *card_number; - /* The name of the curve for ECC algorithms or NULL. */ + /* The name of the curve for ECC algorithms, or the entire algorithm + * string for composite algorithms, or NULL. */ char *curve; /* The keygrip of the subkey in hex digit form or NULL if not available. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/src/versioninfo.rc.in new/gpgme-1.24.3/src/versioninfo.rc.in --- old/gpgme-1.24.0/src/versioninfo.rc.in 2024-11-06 11:38:41.000000000 +0100 +++ new/gpgme-1.24.3/src/versioninfo.rc.in 2025-05-05 16:32:11.000000000 +0200 @@ -39,7 +39,7 @@ VALUE "FileDescription", "GPGME - GnuPG Made Easy\0" VALUE "FileVersion", "@LIBGPGME_LT_CURRENT@.@LIBGPGME_LT_AGE@.@LIBGPGME_LT_REVISION@.@BUILD_REVISION@\0" VALUE "InternalName", "gpgme\0" - VALUE "LegalCopyright", "Copyright � 2001-2024 g10 Code GmbH\0" + VALUE "LegalCopyright", "Copyright � 2001-2025 g10 Code GmbH\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "gpgme.dll\0" VALUE "PrivateBuild", "\0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/tests/json/key-with-revokers.asc new/gpgme-1.24.3/tests/json/key-with-revokers.asc --- old/gpgme-1.24.0/tests/json/key-with-revokers.asc 2024-06-24 16:51:19.000000000 +0200 +++ new/gpgme-1.24.3/tests/json/key-with-revokers.asc 2025-05-05 16:32:11.000000000 +0200 @@ -1,19 +1,19 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -mDMEZkTFQxYJKwYBBAHaRw8BAQdATFay6x2u19PsF5P7YDj2WW9KproKIqAMAqHR -cnkiebiIkAQfFgoAOBYhBMlchkt3X3HQL1LO9r0HuCiy91BxBQJmRMVDFwzAEaD/ -RZC7YSLt7248VC1yfMdoaXc0AgcAAAoJEL0HuCiy91BxhCMBAKtymj/0Q/XDKO3c -9mlz5ycll8MfT/a6H2WFWGV6L9SEAPwN3/n4qR9bBiReT9Xo3q58e2efoXoFXz86 -BXv1rCYJAYiQBB8WCgA4FiEEyVyGS3dfcdAvUs72vQe4KLL3UHEFAmZExUMXDIAR -I/00ekGUKbrM1ecta8R3gFSs0kYCBwAACgkQvQe4KLL3UHFlBwEA1JL4yE/sWOKr -BfbHbUI4ffS6s+oh7sQxHEQy0pJN7LoA/RSKUIThOl5apOVhd/dYOPj+4aGZ9ZP1 -ARqeXIWYxpwCtB1rZXktd2l0aC1yZXZva2Vyc0BleGFtcGxlLm5ldIiZBBMWCgBB -FiEEyVyGS3dfcdAvUs72vQe4KLL3UHEFAmZExUMCGwMFCQWjmoAFCwkIBwICIgIG -FQoJCAsCBBYCAwECHgcCF4AACgkQvQe4KLL3UHFcjwD/ZpSNHKpGV99sKlxbzABg -msIGKLgcuFLUsT1QCV3yE4cA/iS4NW9Y508uUqoJfFH0lBpJ4+US6VQevVpRNe6N -KqYEuDgEZkTFQxIKKwYBBAGXVQEFAQEHQFDZXf9Y1Y6A00CDcYw8RO73idcn/d7B -ifTuBfYpXVJjAwEIB4h4BBgWCgAgFiEEyVyGS3dfcdAvUs72vQe4KLL3UHEFAmZE -xUMCGwwACgkQvQe4KLL3UHEZrQD/SWYkwCFtqaxbYQUcSJ+v2+wA28RUm7KrgJ+A -PsdiNJsBAIjUUsYlf+J/d4Ia0tccfzPBqVpyeWZ52bBD0pH/Eu8N -=JTll +mDMEZkTFQxYJKwYBBAHaRw8BAQdApgZAhIh3+NFiBeVAvKCPj9OxuO5LW7TXyKlQ +nm+N+n+IkAQfFgoAOBYhBJqVhuvPPf7z+/Er2IsiFlFyHN5RBQJmRMVDFwzAEaD/ +RZC7YSLt7248VC1yfMdoaXc0AgcAAAoJEIsiFlFyHN5RprYBALLUmpXhjsOwhbi7 +MQ3OU1vq+EXh/D2xNqTshbTmhjhLAQDlzsjRpNkqjRdGVnCB0kJ9dpgJ9UkXSuUR +npnR7ok7BIiQBB8WCgA4FiEEmpWG6889/vP78SvYiyIWUXIc3lEFAmZExUMXDIAR +I/00ekGUKbrM1ecta8R3gFSs0kYCBwAACgkQiyIWUXIc3lFM/AEAiaiJFQCO/5yo +3um8OBOkDNOVB8F9q7B3Htm7eejsL98BAObrBoBrLj5/rYWJgOh8wzlllvWgScMT +G/o1sZB+AWwMtB1rZXktd2l0aC1yZXZva2Vyc0BleGFtcGxlLm5ldIiTBBMWCgA7 +FiEEmpWG6889/vP78SvYiyIWUXIc3lEFAmZExUMCGwMFCwkIBwICIgIGFQoJCAsC +BBYCAwECHgcCF4AACgkQiyIWUXIc3lGZfQD/WRE+fUZj8nbc/Gy2gGjtTOsXRvny +Ibd4WW46SGrT35gA/2PlO9qWsRLwyom1GnVFniXs3CmyGIQPkcIA1Q9pPBoGuDgE +ZkTFQxIKKwYBBAGXVQEFAQEHQA5dJyq7Yr/9tLObqow5dHsKlr1JW2T/WGbJvR+O +dO8pAwEIB4h4BBgWCgAgFiEEmpWG6889/vP78SvYiyIWUXIc3lEFAmZExUMCGwwA +CgkQiyIWUXIc3lFalwD/WrgY63p78C9Szor0kgsJxe7bJyDl9iERsvMUBw+qg2IA +/AuiTiG0YL9iTSsZLIbWEDrALbEG2ALQXV/ihI50YEcD +=xCgr -----END PGP PUBLIC KEY BLOCK----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/tests/json/t-keylist-revokers.out.json new/gpgme-1.24.3/tests/json/t-keylist-revokers.out.json --- old/gpgme-1.24.0/tests/json/t-keylist-revokers.out.json 2024-06-24 16:51:19.000000000 +0200 +++ new/gpgme-1.24.3/tests/json/t-keylist-revokers.out.json 2025-05-05 16:32:11.000000000 +0200 @@ -12,7 +12,7 @@ "secret": false, "is_qualified": false, "protocol": "OpenPGP", - "fingerprint": "C95C864B775F71D02F52CEF6BD07B828B2F75071", + "fingerprint": "9A9586EBCF3DFEF3FBF12BD88B221651721CDE51", "owner_trust": "unknown", "origin": 0, "last_update": 0, @@ -32,12 +32,12 @@ "is_de_vs": false, "pubkey_algo_name": "EdDSA", "pubkey_algo_string": "ed25519", - "keyid": "BD07B828B2F75071", + "keyid": "8B221651721CDE51", "curve": "ed25519", "pubkey_algo": 303, "length": 255, "timestamp": 1715782979, - "expires": 1810390979 + "expires": 0 }, { "revoked": false, @@ -54,7 +54,7 @@ "is_de_vs": false, "pubkey_algo_name": "ECDH", "pubkey_algo_string": "cv25519", - "keyid": "94C2E4C722CADAF9", + "keyid": "E201FFED82819B33", "curve": "cv25519", "pubkey_algo": 302, "length": 255, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gpgme-1.24.0/tests/run-keylist.c new/gpgme-1.24.3/tests/run-keylist.c --- old/gpgme-1.24.0/tests/run-keylist.c 2024-10-07 08:46:19.000000000 +0200 +++ new/gpgme-1.24.3/tests/run-keylist.c 2025-05-19 16:14:42.000000000 +0200 @@ -347,13 +347,17 @@ subkey = key->subkeys; for (nsub=0; subkey; subkey = subkey->next, nsub++) { + char *algostr; + printf ("fpr %2d: %s\n", nsub, nonnull (subkey->fpr)); if (subkey->v5fpr) printf ("v5fpr %2d: %s\n", nsub, nonnull (subkey->v5fpr)); if (subkey->keygrip) printf ("grip %2d: %s\n", nsub, subkey->keygrip); - if (subkey->curve) - printf ("curve %2d: %s\n", nsub, subkey->curve); + algostr = gpgme_pubkey_algo_string (subkey); + printf ("algo %2d: %s (%s)\n", nsub, algostr, + gpgme_pubkey_algo_name (subkey->pubkey_algo)); + gpgme_free (algostr); printf ("caps %2d: %s%s%s%s%s%s\n", nsub, subkey->can_encrypt? "e":"", ++++++ harfbuzz-8.5.0.tar.xz -> harfbuzz-11.4.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/harfbuzz-8.5.0.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.27445/harfbuzz-11.4.3.tar.xz differ: char 26, line 1 ++++++ icu4c-74_2-data.zip -> icu4c-77_1-data.zip ++++++ /work/SRC/openSUSE:Factory/libreoffice/icu4c-74_2-data.zip /work/SRC/openSUSE:Factory/.libreoffice.new.27445/icu4c-77_1-data.zip differ: char 11, line 2 ++++++ icu4c-74_2-src.tgz -> icu4c-77_1-src.tgz ++++++ /work/SRC/openSUSE:Factory/libreoffice/icu4c-74_2-src.tgz /work/SRC/openSUSE:Factory/.libreoffice.new.27445/icu4c-77_1-src.tgz differ: char 5, line 1 ++++++ libassuan-3.0.1.tar.bz2 -> libassuan-3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/AUTHORS new/libassuan-3.0.2/AUTHORS --- old/libassuan-3.0.1/AUTHORS 2024-06-18 15:31:20.000000000 +0200 +++ new/libassuan-3.0.2/AUTHORS 2025-02-18 12:33:54.000000000 +0100 @@ -55,19 +55,5 @@ Copyright (C) 1992-2013 Free Software Foundation, Inc. Copyright (C) 1994 X Consortium Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001-2021,2023-2024 g10 Code GmbH + Copyright (C) 2001-2021,2023-2025 g10 Code GmbH Copyright (C) 2004 Simon Josefsson - - -========== - - Copyright 2003-2013 Free Software Foundation, Inc. - Copyright (C) 2013-2016 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 - modifications, as long as this notice is preserved. - - This file is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/ChangeLog new/libassuan-3.0.2/ChangeLog --- old/libassuan-3.0.1/ChangeLog 2024-06-24 11:26:09.000000000 +0200 +++ new/libassuan-3.0.2/ChangeLog 2025-02-18 13:44:10.000000000 +0100 @@ -1,3 +1,75 @@ +2025-02-18 Werner Koch <[email protected]> + + Release 3.0.2. + + commit 0f84595a4bc706d3afb969d59618244c7db3b59f + + + Put full commit id into VERSION. + + commit 27b58fd6674c58405a3acc162b21a03931227174 + * autogen.sh: Update from current libgpg-error. + * configure.ac: Append commit id to the VERSION file. + (BUILD_REVISION): New ac_define. + * src/sysutils.c (_assuan_sysutils_blurb): Replace revision by full + commit id. + +2024-12-16 NIIBE Yutaka <[email protected]> + + w32: Enable "w32_error" for assuan_sock_get_flag. + + commit 70d454e1ff48d5fe5765645a7bec1c27b3b8ad38 + * src/assuan-defs.h (struct assuan_context_s): Have w32_error field. + (_assuan_sock_wsa2errno): Supply CTX argument. + * src/assuan-socket.c (_assuan_sock_wsa2errno): Put ERR to the field + in CTX argument. + (_assuan_sock_get_flag): Support "w32_error" string. + (_assuan_sock_accept, _assuan_sock_bind): Follow the change. + * src/assuan-uds.c (uds_reader, uds_writer): Likewise. + * src/system-w32.c (__assuan_close, __assuan_socket): Likewise. + (__assuan_connect): Likewise. + +2024-12-13 NIIBE Yutaka <[email protected]> + + w32: Fix errno for assuan_sock_bind failure. + + commit cc6c29735d59e832be67f487e0c74e049ceaea94 + * src/assuan-socket.c (_assuan_sock_bind): Use WSAGetLastError and the + mapping to set ERRNO. + +2024-09-16 Ben Kibbey <[email protected]> + + Fix FreeBSD to set the pid of assuan_peercred_t. + + commit dfa5e6532d7eecc25841666010004d278e9e4542 + * configure.ac: Check for struct xucred.cr_pid. + * src/assuan-socket-server.c (accept_connection_bottom): Obtain the pid + via LOCAL_PEERCRED. + +2024-07-11 NIIBE Yutaka <[email protected]> + + Use socklen_t for the length of socket address. + + commit 69a703446b61d9e139e693dbcc22d2d80083a788 + * src/assuan-defs.h (_assuan_sock_connect): Use socklen_t. + (_assuan_sock_bind, _assuan_sock_get_nonce): Likewise. + * src/assuan-socket.c (_assuan_sock_connect): Likewise. + (_assuan_sock_bind, _assuan_sock_get_nonce, assuan_sock_connect) + (assuan_sock_bind, assuan_sock_get_nonce): Likewise. + * src/assuan.h.in (assuan_sock_connect, assuan_sock_bind) + (assuan_sock_get_nonce): Likewise. + + Fix typo in assuan.h. + + commit b8148b4f5735e1215eb72f208e1ae2891213247e + * src/assuan.h.in (ASSUAN_NO_NPTH_SYSTEM_HOOKS_ANY_MORE): Fix. + +2024-07-07 Ben Kibbey <[email protected]> + + libassuan.m4: Fix AC_DEFINE variable expansion. + + commit b9b7f1cf3fd0228fd31cb62a144628ee8ad26953 + * src/libassuan.m4 (_AM_PATH_LIBASSUAN_COMMON): Use AC_DEFINE_UNQUOTED() + to expand $req_libassuan_api. + +2024-06-25 Werner Koch <[email protected]> + + Remove an declaration for an unused function. + + commit 69069bc63e6b1152e34e39bc322132fd4fd7284d + * src/assuan-defs.h (putc_unlocked): Remove declaration. + 2024-06-24 Werner Koch <[email protected]> Release 3.0.1. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/NEWS new/libassuan-3.0.2/NEWS --- old/libassuan-3.0.1/NEWS 2024-06-24 11:10:58.000000000 +0200 +++ new/libassuan-3.0.2/NEWS 2025-02-18 13:41:27.000000000 +0100 @@ -1,3 +1,19 @@ +Noteworthy changes in version 3.0.2 (2025-02-18) [C9/A0/R2] +------------------------------------------------ + + * Fix for FreeBSD to set the pid of assuan_peercred_t. + [rAdfa5e6532d] + + * Use socklen_t for the length of socket address. [T5924] + + * Fix errno setting on Widnows for assuan_sock_bind failure. [T7456] + + * New assuan_sock_get_flag "w32_error" to get the actual Windows + error after a system call and not just the mapped errno. [T7456] + + Release-info: https://dev.gnupg.org/T7163 + + Noteworthy changes in version 3.0.1 (2024-06-24) [C9/A0/R1] ------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/README new/libassuan-3.0.2/README --- old/libassuan-3.0.1/README 2024-06-18 15:32:45.000000000 +0200 +++ new/libassuan-3.0.2/README 2025-02-18 12:31:52.000000000 +0100 @@ -2,7 +2,7 @@ =========== Copyright (C) 2001-2013 Free Software Foundation, Inc. - Copyright (C) 2001-2021,2023-2024 g10 Code GmbH + Copyright (C) 2001-2021,2023-2025 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-3.0.1/VERSION new/libassuan-3.0.2/VERSION --- old/libassuan-3.0.1/VERSION 2024-06-24 11:26:02.000000000 +0200 +++ new/libassuan-3.0.2/VERSION 2025-02-18 13:44:03.000000000 +0100 @@ -1 +1,2 @@ -3.0.1 +3.0.2 +0f84595a4bc706d3afb969d59618244c7db3b59f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/autogen.sh new/libassuan-3.0.2/autogen.sh --- old/libassuan-3.0.1/autogen.sh 2018-12-13 08:52:39.000000000 +0100 +++ new/libassuan-3.0.2/autogen.sh 2025-02-18 12:29:32.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # autogen.sh -# Copyright (C) 2003, 2014, 2017, 2018 g10 Code GmbH +# Copyright (C) 2003, 2014, 2017, 2018, 2022 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 @@ -15,7 +15,7 @@ # configure it for the respective package. It is maintained as part of # GnuPG and source copied by other packages. # -# Version: 2018-07-10 +# Version: 2024-12-03 configure_ac="configure.ac" @@ -72,6 +72,7 @@ SILENT= PRINT_HOST=no PRINT_BUILD=no +PRINT_TSDIR=no tmp=$(dirname "$0") tsdir=$(cd "${tmp}"; pwd) @@ -84,9 +85,10 @@ echo " --silent Silent operation" echo " --force Pass --force to autoconf" echo " --find-version Helper for configure.ac" - echo " --git-build Run all commands to build from a Git" + echo " --git-build Run all commands to build from a Git" echo " --print-host Print only the host triplet" echo " --print-build Print only the build platform triplet" + echo " --print-tsdir Print only the dir of this script" echo " --build-TYPE Configure to cross build for TYPE" echo "" echo " ARGS are passed to configure in --build-TYPE mode." @@ -135,18 +137,17 @@ configure_opts= extraoptions= # List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc +maintainer_mode_option= w32_toolprefixes= w32_extraoptions= -w32ce_toolprefixes= -w32ce_extraoptions= w64_toolprefixes= w64_extraoptions= amd64_toolprefixes= +disable_gettext_checks= # End list of optional variables sourced from ~/.gnupg-autogen.rc # What follows are variables which are sourced but default to # environment variables or lacking them hardcoded values. #w32root= -#w32ce_root= #w64root= #amd64root= @@ -159,6 +160,11 @@ SILENT=" --silent" shift ;; + --print-tsdir) + myhost="print-tsdir" + SILENT=" --silent" + shift + ;; --git-build) myhost="git-build" shift @@ -167,11 +173,6 @@ myhost="w32" shift ;; - --build-w32ce) - myhost="w32" - myhostsub="ce" - shift - ;; --build-w64) myhost="w32" myhostsub="64" @@ -203,7 +204,7 @@ die_p make || fatal "error running make" die_p - make check || fatal "error running male check" + make check || fatal "error running make check" die_p exit 0 fi @@ -221,6 +222,12 @@ . "$HOME/.gnupg-autogen.rc" fi +# Disable the --enable-maintainer_mode option. +if [ "${maintainer_mode_option}" = off ]; then + maintainer_mode_option= +elif [ -z "${maintainer_mode_option}" ]; then + maintainer_mode_option=--enable-maintainer-mode +fi # **** FIND VERSION **** # This is a helper for the configure.ac M4 magic @@ -241,10 +248,12 @@ if [ -z "$micro" ]; then matchstr1="$package-$major.[0-9]*" matchstr2="$package-$major-base" + matchstr3="" vers="$major.$minor" else matchstr1="$package-$major.$minor.[0-9]*" - matchstr2="$package-$major.$minor-base" + matchstr2="$package-$major.[0-9]*-base" + matchstr3="$package-$major-base" vers="$major.$minor.$micro" fi @@ -252,30 +261,49 @@ if [ -e .git ]; then ingit=yes tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null) - tmp=$(echo "$tmp" | sed s/^"$package"//) if [ -n "$tmp" ]; then - tmp=$(echo "$tmp" | sed s/^"$package"// \ - | awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}') + tmp=$(echo "$tmp" | sed s/^"$package"// \ + | awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}') else - tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \ - | awk -F- '$4!=0{print"-beta"$4}') + # (due tof "-base" in the tag we need to take the 4th field) + tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null) + if [ -n "$tmp" ]; then + tmp=$(echo "$tmp" | sed s/^"$package"// \ + | awk -F- '$4!=0 && $4 !~ /^beta/ {print"-beta"$4}') + elif [ -n "${matchstr3}" ]; then + tmp=$(git describe --match "${matchstr3}" --long 2>/dev/null) + if [ -n "$tmp" ]; then + tmp=$(echo "$tmp" | sed s/^"$package"// \ + | awk -F- '$4!=0 && $4 !~ /^beta/ {print"-beta"$4}') + fi + fi fi [ -n "$tmp" ] && beta=yes + cid=$(git rev-parse --verify HEAD | tr -d '\n\r') rev=$(git rev-parse --short HEAD | tr -d '\n\r') rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) else ingit=no beta=yes tmp="-unknown" + cid="0000000" rev="0000000" rvd="0" fi - echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:" + echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:$cid:" exit 0 fi # **** end FIND VERSION **** +# **** PRINT TSDIR VERSION **** +# This is a helper used by some configure.ac M4 magic +if [ "$myhost" = "print-tsdir" ]; then + echo "$tsdir" + exit 0 +fi +# **** end PRINT TSDIR **** + if [ ! -f "$tsdir/build-aux/config.guess" ]; then fatal "$tsdir/build-aux/config.guess not found" @@ -294,12 +322,6 @@ # ****************** if [ "$myhost" = "w32" ]; then case $myhostsub in - ce) - w32root="$w32ce_root" - [ -z "$w32root" ] && w32root="$HOME/w32ce_root" - toolprefixes="$w32ce_toolprefixes arm-mingw32ce" - extraoptions="$extraoptions $w32ce_extraoptions" - ;; 64) w32root="$w64root" [ -z "$w32root" ] && w32root="$HOME/w64root" @@ -313,6 +335,7 @@ extraoptions="$extraoptions $w32_extraoptions" ;; esac + w32root=$(echo "$w32root" | sed s,^//,/,) info "Using $w32root as standard install directory" replace_sysroot @@ -345,7 +368,7 @@ fi fi - $tsdir/configure --enable-maintainer-mode ${SILENT} \ + $tsdir/configure "${maintainer_mode_option}" ${SILENT} \ --prefix=${w32root} \ --host=${host} --build=${build} SYSROOT=${w32root} \ PKG_CONFIG_LIBDIR=${w32root}/lib/pkgconfig \ @@ -390,7 +413,7 @@ fi fi - $tsdir/configure --enable-maintainer-mode ${SILENT} \ + $tsdir/configure "${maintainer_mode_option}" ${SILENT} \ --prefix=${amd64root} \ --host=${host} --build=${build} \ ${configure_opts} ${extraoptions} "$@" @@ -413,17 +436,16 @@ }' ${configure_ac}` automake_vers_num=`echo "$automake_vers" | cvtver` +gettext_vers="n/a" if [ -d "${tsdir}/po" ]; then gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ { s/^.*\[\(.*\)])/\1/p q }' ${configure_ac}` gettext_vers_num=`echo "$gettext_vers" | cvtver` -else - gettext_vers="n/a" fi -if [ -z "$autoconf_vers" -o -z "$automake_vers" -o -z "$gettext_vers" ] +if [ -z "$autoconf_vers" -o -z "$automake_vers" ] then echo "**Error**: version information not found in "\`${configure_ac}\'"." >&2 exit 1 @@ -501,12 +523,21 @@ if [ -n "${ACLOCAL_FLAGS}" ]; then aclocal_flags="${aclocal_flags} ${ACLOCAL_FLAGS}" fi + +automake_flags="--gnu" +if [ -n "${extra_automake_flags}" ]; then + automake_flags="${automake_flags} ${extra_automake_flags}" +fi +if [ -n "${AUTOMAKE_FLAGS}" ]; then + automake_flags="${automake_flags} ${AUTOMAKE_FLAGS}" +fi + info "Running $ACLOCAL ${aclocal_flags} ..." $ACLOCAL ${aclocal_flags} info "Running autoheader..." $AUTOHEADER -info "Running automake --gnu ..." -$AUTOMAKE --gnu; +info "Running $AUTOMAKE ${automake_flags} ..." +$AUTOMAKE ${automake_flags}; info "Running autoconf${FORCE} ..." $AUTOCONF${FORCE} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/config.h.in new/libassuan-3.0.2/config.h.in --- old/libassuan-3.0.1/config.h.in 2024-06-24 11:26:08.000000000 +0200 +++ new/libassuan-3.0.2/config.h.in 2025-02-18 13:44:09.000000000 +0100 @@ -9,6 +9,9 @@ +/* Git commit id used to build this package */ +#undef BUILD_COMMITID + /* GIT commit id revision used to build this package */ #undef BUILD_REVISION @@ -142,6 +145,9 @@ /* Define to 1 if you have the <ws2tcpip.h> header file. */ #undef HAVE_WS2TCPIP_H +/* Define if struct xucred contains the cr_pid member. */ +#undef HAVE_XUCRED_CR_PID + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/configure new/libassuan-3.0.2/configure --- old/libassuan-3.0.1/configure 2024-06-24 11:26:02.000000000 +0200 +++ new/libassuan-3.0.2/configure 2025-02-18 13:44:03.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for libassuan 3.0.1. +# Generated by GNU Autoconf 2.71 for libassuan 3.0.2. # # Report bugs to <https://bugs.gnupg.org>. # @@ -621,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='libassuan' PACKAGE_TARNAME='libassuan' -PACKAGE_VERSION='3.0.1' -PACKAGE_STRING='libassuan 3.0.1' +PACKAGE_VERSION='3.0.2' +PACKAGE_STRING='libassuan 3.0.2' PACKAGE_BUGREPORT='https://bugs.gnupg.org' PACKAGE_URL='' @@ -1393,7 +1393,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 3.0.1 to adapt to many kinds of systems. +\`configure' configures libassuan 3.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1464,7 +1464,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libassuan 3.0.1:";; + short | recursive ) echo "Configuration of libassuan 3.0.2:";; esac cat <<\_ACEOF @@ -1582,7 +1582,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libassuan configure 3.0.1 +libassuan configure 3.0.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2012,7 +2012,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 3.0.1, which was +It was created by libassuan $as_me 3.0.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2779,7 +2779,7 @@ # LIBASSUAN_LT_CURRENT=9 LIBASSUAN_LT_AGE=0 -LIBASSUAN_LT_REVISION=1 +LIBASSUAN_LT_REVISION=2 # If the API is changed in an incompatible way: increment the next counter. LIBASSUAN_CONFIG_API_VERSION=3 @@ -3304,7 +3304,7 @@ # Define the identity of the package. PACKAGE='libassuan' - VERSION='3.0.1' + VERSION='3.0.2' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -5029,7 +5029,7 @@ esac -VERSION_NUMBER=0x030001 +VERSION_NUMBER=0x030002 # Don't default to build static libs. @@ -14395,14 +14395,18 @@ # # Provide information about the build. # -BUILD_REVISION="c9e9027" +BUILD_REVISION="0f84595" printf "%s\n" "#define BUILD_REVISION \"$BUILD_REVISION\"" >>confdefs.h +BUILD_COMMITID="0f84595a4bc706d3afb969d59618244c7db3b59f" + +printf "%s\n" "#define BUILD_COMMITID \"$BUILD_COMMITID\"" >>confdefs.h + BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` -BUILD_FILEVERSION="${BUILD_FILEVERSION}51689" +BUILD_FILEVERSION="${BUILD_FILEVERSION}3972" # Check whether --enable-build-timestamp was given. @@ -15518,6 +15522,16 @@ fi +ac_fn_c_check_member "$LINENO" "struct xucred" "cr_pid" "ac_cv_member_struct_xucred_cr_pid" "#include <sys/ucred.h> +#include <sys/ucred.h> +" +if test "x$ac_cv_member_struct_xucred_cr_pid" = xyes +then : + +printf "%s\n" "#define HAVE_XUCRED_CR_PID 1" >>confdefs.h + +fi + # @@ -16117,7 +16131,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 3.0.1, which was +This file was extended by libassuan $as_me 3.0.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16185,7 +16199,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libassuan config.status 3.0.1 +libassuan config.status 3.0.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" @@ -18201,7 +18215,7 @@ echo " Libassuan v${VERSION} has been configured as follows: - Revision: c9e9027 (51689) + Revision: 0f84595 (3972) Platform: $host " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/configure.ac new/libassuan-3.0.2/configure.ac --- old/libassuan-3.0.1/configure.ac 2024-06-24 11:11:19.000000000 +0200 +++ new/libassuan-3.0.2/configure.ac 2025-02-18 13:42:06.000000000 +0100 @@ -33,7 +33,7 @@ m4_define([mym4_package],[libassuan]) m4_define([mym4_major], [3]) m4_define([mym4_minor], [0]) -m4_define([mym4_micro], [1]) +m4_define([mym4_micro], [2]) # 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 @@ -51,7 +51,9 @@ m4_define([mym4_version], m4_argn(4, mym4_verslist)) m4_define([mym4_revision], m4_argn(7, mym4_verslist)) m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist)) +m4_define([mym4_commitid], m4_argn(9, mym4_verslist)) m4_esyscmd([echo ]mym4_version[>VERSION]) +m4_esyscmd([echo ]mym4_commitid[>>VERSION]) AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org]) @@ -63,7 +65,7 @@ # LIBASSUAN_LT_CURRENT=9 LIBASSUAN_LT_AGE=0 -LIBASSUAN_LT_REVISION=1 +LIBASSUAN_LT_REVISION=2 # If the API is changed in an incompatible way: increment the next counter. LIBASSUAN_CONFIG_API_VERSION=3 @@ -292,6 +294,9 @@ AC_SUBST(BUILD_REVISION) AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", [GIT commit id revision used to build this package]) +BUILD_COMMITID="mym4_commitid" +AC_DEFINE_UNQUOTED(BUILD_COMMITID, "$BUILD_COMMITID", + [Git commit id used to build this package]) changequote(,)dnl BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` @@ -468,6 +473,11 @@ # FreeBSD AC_CHECK_FUNCS([getpeereid]) +AC_CHECK_MEMBER(struct xucred.cr_pid, + [AC_DEFINE(HAVE_XUCRED_CR_PID, 1, + Define if struct xucred contains the cr_pid member.)], + [], [#include <sys/ucred.h> +#include <sys/ucred.h> ]) # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/doc/assuan.info new/libassuan-3.0.2/doc/assuan.info --- old/libassuan-3.0.1/doc/assuan.info 2024-06-24 11:26:08.000000000 +0200 +++ new/libassuan-3.0.2/doc/assuan.info 2025-02-18 13:44:10.000000000 +0100 @@ -7,8 +7,8 @@ This file documents the use and the internals of Assuan. - This is Edition 3.0.1, last updated 18 June 2024, of 'The 'Developing -with Assuan' Manual', for Version 3.0.1. + This is Edition 3.0.2, last updated 18 June 2024, of 'The 'Developing +with Assuan' Manual', for Version 3.0.2. Published by the Free Software Foundation 51 Franklin Street, Fifth Floor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/doc/stamp-vti new/libassuan-3.0.2/doc/stamp-vti --- old/libassuan-3.0.1/doc/stamp-vti 2024-06-24 11:26:08.000000000 +0200 +++ new/libassuan-3.0.2/doc/stamp-vti 2025-02-18 13:44:09.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 18 June 2024 @set UPDATED-MONTH June 2024 -@set EDITION 3.0.1 -@set VERSION 3.0.1 +@set EDITION 3.0.2 +@set VERSION 3.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/doc/version.texi new/libassuan-3.0.2/doc/version.texi --- old/libassuan-3.0.1/doc/version.texi 2024-06-24 11:26:08.000000000 +0200 +++ new/libassuan-3.0.2/doc/version.texi 2025-02-18 13:44:09.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 18 June 2024 @set UPDATED-MONTH June 2024 -@set EDITION 3.0.1 -@set VERSION 3.0.1 +@set EDITION 3.0.2 +@set VERSION 3.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/src/assuan-defs.h new/libassuan-3.0.2/src/assuan-defs.h --- old/libassuan-3.0.1/src/assuan-defs.h 2024-06-18 15:16:53.000000000 +0200 +++ new/libassuan-3.0.2/src/assuan-defs.h 2025-02-12 15:42:39.000000000 +0100 @@ -76,6 +76,7 @@ #ifdef HAVE_W32_SYSTEM /* The per-context w32 error string. */ char w32_strerror[256]; + int w32_error; #endif /* The allocation hooks. */ @@ -391,18 +392,18 @@ assuan_fd_t _assuan_sock_new (assuan_context_t ctx, int domain, int type, int proto); int _assuan_sock_connect (assuan_context_t ctx, assuan_fd_t sockfd, - struct sockaddr *addr, int addrlen); + struct sockaddr *addr, socklen_t addrlen); int _assuan_sock_bind (assuan_context_t ctx, assuan_fd_t sockfd, - struct sockaddr *addr, int addrlen); + struct sockaddr *addr, socklen_t addrlen); int _assuan_sock_set_sockaddr_un (const char *fname, struct sockaddr *addr, int *r_redirected); int _assuan_sock_get_nonce (assuan_context_t ctx, struct sockaddr *addr, - int addrlen, assuan_sock_nonce_t *nonce); + socklen_t addrlen, assuan_sock_nonce_t *nonce); 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); +int _assuan_sock_wsa2errno (assuan_context_t ctx, int err); #endif #ifdef HAVE_FOPENCOOKIE @@ -431,9 +432,6 @@ #define clearenv _assuan_clearenv int setenv (const char *name, const char *value, int replace); #endif -#ifndef HAVE_PUTC_UNLOCKED -int putc_unlocked (int c, FILE *stream); -#endif #define DIM(v) (sizeof(v)/sizeof((v)[0])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/src/assuan-socket-server.c new/libassuan-3.0.2/src/assuan-socket-server.c --- old/libassuan-3.0.1/src/assuan-socket-server.c 2024-06-18 15:16:53.000000000 +0200 +++ new/libassuan-3.0.2/src/assuan-socket-server.c 2024-09-16 10:58:25.000000000 +0200 @@ -135,6 +135,15 @@ { ctx->peercred_valid = 1; ctx->peercred.pid = ASSUAN_INVALID_PID; +#if defined (HAVE_XUCRED_CR_PID) + { + struct xucred cr; + socklen_t len = sizeof (struct xucred); + + if (!getsockopt (fd, SOL_LOCAL, LOCAL_PEERCRED, &cr, &len)) + ctx->peercred.pid = cr.cr_pid; + } +#endif } } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/src/assuan-socket.c new/libassuan-3.0.2/src/assuan-socket.c --- old/libassuan-3.0.1/src/assuan-socket.c 2024-06-18 15:20:59.000000000 +0200 +++ new/libassuan-3.0.2/src/assuan-socket.c 2025-02-12 15:42:39.000000000 +0100 @@ -289,7 +289,7 @@ int -_assuan_sock_wsa2errno (int err) +_assuan_sock_wsa2errno (assuan_context_t ctx, int err) { switch (err) { @@ -306,6 +306,8 @@ default: return EIO; } + + ctx->w32_error = err; } @@ -674,6 +676,10 @@ } *r_value = !!i; } +#ifdef HAVE_W32_SYSTEM + else if (!strcmp (name, "w32_error")) + *r_value = ctx->w32_error; +#endif else { gpg_err_set_errno (EINVAL); @@ -1076,7 +1082,7 @@ #ifdef HAVE_W32_SYSTEM res = SOCKET2HANDLE (accept (HANDLE2SOCKET (sockfd), addr, p_addrlen)); if (res == SOCKET2HANDLE (INVALID_SOCKET)) - gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ())); + gpg_err_set_errno (_assuan_sock_wsa2errno (ctx, WSAGetLastError ())); #else res = accept (sockfd, addr, p_addrlen); #endif @@ -1089,7 +1095,7 @@ int _assuan_sock_connect (assuan_context_t ctx, assuan_fd_t sockfd, - struct sockaddr *addr, int addrlen) + struct sockaddr *addr, socklen_t addrlen) { #ifdef HAVE_W32_SYSTEM if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX) @@ -1260,7 +1266,7 @@ int _assuan_sock_bind (assuan_context_t ctx, assuan_fd_t sockfd, - struct sockaddr *addr, int addrlen) + struct sockaddr *addr, socklen_t addrlen) { int res; @@ -1312,7 +1318,7 @@ (struct sockaddr *)&myaddr, &len); if (rc) { - int save_e = errno; + int save_e = _assuan_sock_wsa2errno (ctx, WSAGetLastError ()); CloseHandle (filehd); MyDeleteFile (unaddr->sun_path); gpg_err_set_errno (save_e); @@ -1351,7 +1357,7 @@ { res = bind (HANDLE2SOCKET(sockfd), addr, addrlen); if (res < 0) - gpg_err_set_errno ( _assuan_sock_wsa2errno (WSAGetLastError ())); + gpg_err_set_errno ( _assuan_sock_wsa2errno (ctx, WSAGetLastError ())); } leave: #else @@ -1427,7 +1433,7 @@ int _assuan_sock_get_nonce (assuan_context_t ctx, struct sockaddr *addr, - int addrlen, assuan_sock_nonce_t *nonce) + socklen_t addrlen, assuan_sock_nonce_t *nonce) { #ifdef HAVE_W32_SYSTEM if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX) @@ -1604,7 +1610,8 @@ } int -assuan_sock_connect (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen) +assuan_sock_connect (assuan_fd_t sockfd, struct sockaddr *addr, + socklen_t addrlen) { return _assuan_sock_connect (sock_ctx, sockfd, addr, addrlen); } @@ -1619,7 +1626,8 @@ } int -assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen) +assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, + socklen_t addrlen) { return _assuan_sock_bind (sock_ctx, sockfd, addr, addrlen); } @@ -1632,7 +1640,7 @@ } int -assuan_sock_get_nonce (struct sockaddr *addr, int addrlen, +assuan_sock_get_nonce (struct sockaddr *addr, socklen_t addrlen, assuan_sock_nonce_t *nonce) { return _assuan_sock_get_nonce (sock_ctx, addr, addrlen, nonce); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/src/assuan-uds.c new/libassuan-3.0.2/src/assuan-uds.c --- old/libassuan-3.0.1/src/assuan-uds.c 2023-05-17 08:54:14.000000000 +0200 +++ new/libassuan-3.0.2/src/assuan-uds.c 2025-02-12 15:42:39.000000000 +0100 @@ -148,7 +148,7 @@ #else /*HAVE_W32_SYSTEM*/ int res = recvfrom (HANDLE2SOCKET(ctx->inbound.fd), buf, buflen, 0, NULL, NULL); if (res < 0) - gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ())); + gpg_err_set_errno (_assuan_sock_wsa2errno (ctx, WSAGetLastError ())); return res; #endif /*HAVE_W32_SYSTEM*/ } @@ -180,7 +180,7 @@ (struct sockaddr *)&ctx->serveraddr, sizeof (struct sockaddr_in)); if (res < 0) - gpg_err_set_errno ( _assuan_sock_wsa2errno (WSAGetLastError ())); + gpg_err_set_errno ( _assuan_sock_wsa2errno (ctx, WSAGetLastError ())); return res; #endif /*HAVE_W32_SYSTEM*/ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/src/assuan.h.in new/libassuan-3.0.2/src/assuan.h.in --- old/libassuan-3.0.1/src/assuan.h.in 2024-06-18 15:30:52.000000000 +0200 +++ new/libassuan-3.0.2/src/assuan.h.in 2024-09-16 10:58:25.000000000 +0200 @@ -511,15 +511,16 @@ assuan_fd_t assuan_sock_accept (assuan_fd_t sockfd, struct sockaddr *addr, socklen_t *p_addrlen); int assuan_sock_connect (assuan_fd_t sockfd, - struct sockaddr *addr, int addrlen); + struct sockaddr *addr, socklen_t addrlen); assuan_fd_t assuan_sock_connect_byname (const char *host, unsigned short port, int timeout, const char *credentials, unsigned int flags); -int assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen); +int assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, + socklen_t addrlen); int assuan_sock_set_sockaddr_un (const char *fname, struct sockaddr *addr, int *r_redirected); -int assuan_sock_get_nonce (struct sockaddr *addr, int addrlen, +int assuan_sock_get_nonce (struct sockaddr *addr, socklen_t addrlen, assuan_sock_nonce_t *nonce); int assuan_sock_check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce); void assuan_sock_set_system_hooks (assuan_system_hooks_t system_hooks); @@ -566,7 +567,7 @@ int nowait, int *status, int options); #if defined(LIBASSUAN_API_REQUESTED) && LIBASSUAN_API_REQUESTED >= 3 -#defined ASSUAN_NO_NPTH_SYSTEM_HOOKS_ANY_MORE 1 +#define ASSUAN_NO_NPTH_SYSTEM_HOOKS_ANY_MORE 1 #endif #if defined(ASSUAN_REALLY_REQUIRE_V2_NPTH_SYSTEM_HOOKS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/src/libassuan.m4 new/libassuan-3.0.2/src/libassuan.m4 --- old/libassuan-3.0.1/src/libassuan.m4 2024-06-18 15:16:53.000000000 +0200 +++ new/libassuan-3.0.2/src/libassuan.m4 2024-09-16 10:58:25.000000000 +0200 @@ -9,7 +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: 2024-06-13 +# Last-changed: 2024-07-11 dnl dnl Find gpgrt-config, which uses .pc file @@ -175,7 +175,7 @@ if test $ok = yes; then AC_MSG_RESULT([yes ($libassuan_config_version)]) - AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan) + AC_DEFINE_UNQUOTED(LIBASSUAN_API_REQUESTED, $req_libassuan_api, [Requested API version for libassuan]) else AC_MSG_RESULT(no) fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/src/system-w32.c new/libassuan-3.0.2/src/system-w32.c --- old/libassuan-3.0.1/src/system-w32.c 2024-06-18 15:16:53.000000000 +0200 +++ new/libassuan-3.0.2/src/system-w32.c 2025-02-12 15:42:39.000000000 +0100 @@ -149,7 +149,7 @@ { int rc = closesocket (HANDLE2SOCKET(fd)); if (rc) - gpg_err_set_errno ( _assuan_sock_wsa2errno (WSAGetLastError ()) ); + gpg_err_set_errno ( _assuan_sock_wsa2errno (ctx, WSAGetLastError ()) ); if (rc && WSAGetLastError () == WSAENOTSOCK) { rc = CloseHandle (fd); @@ -647,7 +647,7 @@ res = SOCKET2HANDLE (socket (domain, type, proto)); if (res == SOCKET2HANDLE (INVALID_SOCKET)) - gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ())); + gpg_err_set_errno (_assuan_sock_wsa2errno (ctx, WSAGetLastError ())); return res; } @@ -660,7 +660,7 @@ res = connect (HANDLE2SOCKET (sock), addr, length); if (res < 0) - gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ())); + gpg_err_set_errno (_assuan_sock_wsa2errno (ctx, WSAGetLastError ())); return res; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/src/sysutils.c new/libassuan-3.0.2/src/sysutils.c --- old/libassuan-3.0.1/src/sysutils.c 2024-06-18 15:30:22.000000000 +0200 +++ new/libassuan-3.0.2/src/sysutils.c 2025-02-18 12:25:20.000000000 +0100 @@ -44,10 +44,10 @@ "\n\n" "This is Libassuan " PACKAGE_VERSION " - The GnuPG IPC Library\n" "Copyright 2001-2013 Free Software Foundation, Inc.\n" - "Copyright 2001-2021,2023-2024 g10 Code GmbH\n" + "Copyright 2001-2021,2023-2025 g10 Code GmbH\n" "\n" "SPDX-License-Identifier: LGPL-2.1-or-later\n" - "(" BUILD_REVISION " " BUILD_TIMESTAMP ")\n" + "(" BUILD_COMMITID " " BUILD_TIMESTAMP ")\n" "\n\n"; return blurb; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-3.0.1/src/versioninfo.rc.in new/libassuan-3.0.2/src/versioninfo.rc.in --- old/libassuan-3.0.1/src/versioninfo.rc.in 2021-03-22 13:05:41.000000000 +0100 +++ new/libassuan-3.0.2/src/versioninfo.rc.in 2025-02-18 12:33:21.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-2021 g10 Code GmbH\0" + VALUE "LegalCopyright", "Copyright � 2001-2021,2023-2025 g10 Code GmbH\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libassuan.dll\0" VALUE "PrivateBuild", "\0" ++++++ libgpg-error-1.51.tar.bz2 -> libgpg-error-1.55.tar.bz2 ++++++ ++++ 11141 lines of diff (skipped) ++++++ poppler-24.08.0.tar.xz -> poppler-25.08.0.tar.xz ++++++ ++++ 63163 lines of diff (skipped) ++++++ python-detection.patch ++++++ diff --git a/configure.ac b/configure.ac index ad4582421331..3f0b979794db 100644 --- a/configure.ac +++ b/configure.ac @@ -10574,7 +10574,7 @@ if test $enable_python = system; then # This causes an error if no python command is found # the version found here also sets PYTHON_FOR_BUILD below, so the python picked here # needs to be suitable for meson/the harfbuzz build - if test "$with_system_harfbuzz" = "yes" -o -n "$NEED_MESON" ; then + if test "$with_system_harfbuzz" != "yes" -o -n "$NEED_MESON" ; then AM_PATH_PYTHON([3.7]) else AM_PATH_PYTHON([3.3])
