Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2023-08-09 17:24:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.11712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Wed Aug 9 17:24:32 2023 rev:280 rq:1103064 version:7.6.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2023-08-08 15:54:22.528783425 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.11712/libreoffice.changes 2023-08-09 17:24:44.489189093 +0200 @@ -1,0 +2,31 @@ +Tue Aug 8 21:34:27 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Update to 7.6.0.2: + https://wiki.documentfoundation.org/ReleaseNotes/7.6 + https://wiki.documentfoundation.org/Releases/7.6.0/RC1 +- Update bundled dependencies: + * boost_1_80_0.tar.xz - > boost_1_82_0.tar.xz + * curl-8.0.1.tar.xz -> curl-8.1.2.tar.xz + * icu4c-72_1-data.zip -> icu4c-73_2-data.zip + * icu4c-72_1-src.tgz -> icu4c-73_2-src.tgz + * libassuan-2.5.5.tar.bz2 -> libassuan-2.5.6.tar.bz2 + * poppler-22.12.0.tar.xz -> poppler-23.06.0.tar.xz + * poppler-data-0.4.11.tar.gz -> poppler-data-0.4.12.tar.gz +- New bundled dependencies: + * graphite2-minimal-1.3.14.tgz + * harfbuzz-8.0.0.tar.xz + + needed for SLE12-SP2, where harfbuzz is really old +- Removed patches: + * atklistener-32bit-type-mismatch.patch + + integrated upstream + * fix_harfbuzz_on_sle12_sp5.patch + + not needed, since SLE12-SP5 uses now the bundled harfbuzz +- Added patch: + * python34-no-f-strings.patch + + Applied on SLE12-SP5 + + Do not format using F-strings, since it is python 3.6+ feature + and SLE12-SP5 has python 3.4 +- Refreshed patch: + * 0002-Revert-Require-HarfBuzz-5.1.0.patch + +------------------------------------------------------------------- Old: ---- atklistener-32bit-type-mismatch.patch boost_1_80_0.tar.xz curl-8.0.1.tar.xz fix_harfbuzz_on_sle12_sp5.patch icu4c-72_1-data.zip icu4c-72_1-src.tgz libassuan-2.5.5.tar.bz2 libreoffice-7.6.0.1.tar.xz libreoffice-7.6.0.1.tar.xz.asc libreoffice-help-7.6.0.1.tar.xz libreoffice-help-7.6.0.1.tar.xz.asc libreoffice-translations-7.6.0.1.tar.xz libreoffice-translations-7.6.0.1.tar.xz.asc poppler-22.12.0.tar.xz poppler-data-0.4.11.tar.gz New: ---- boost_1_82_0.tar.xz curl-8.1.2.tar.xz graphite2-minimal-1.3.14.tgz harfbuzz-8.0.0.tar.xz icu4c-73_2-data.zip icu4c-73_2-src.tgz libassuan-2.5.6.tar.bz2 libreoffice-7.6.0.2.tar.xz libreoffice-7.6.0.2.tar.xz.asc libreoffice-help-7.6.0.2.tar.xz libreoffice-help-7.6.0.2.tar.xz.asc libreoffice-translations-7.6.0.2.tar.xz libreoffice-translations-7.6.0.2.tar.xz.asc poppler-23.06.0.tar.xz poppler-data-0.4.12.tar.gz python34-no-f-strings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.GisEhO/_old 2023-08-09 17:24:54.805253319 +0200 +++ /var/tmp/diff_new_pack.GisEhO/_new 2023-08-09 17:24:54.813253369 +0200 @@ -16,6 +16,7 @@ # +%{!?aarch64:%global aarch64 aarch64 arm64 armv8} # extensions %define numbertext_version 0.9.5 # Urls @@ -38,6 +39,7 @@ %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 %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 @@ -46,10 +48,11 @@ %global __requires_exclude ^libgpgmepp\\.so.*$ %bcond_with system_gpgme %bcond_with system_curl +%bcond_with system_harfbuzz %endif %bcond_with firebird Name: libreoffice -Version: 7.6.0.1 +Version: 7.6.0.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -75,7 +78,7 @@ # GPGME bundle list Source1000: %{external_url}/gpgme-1.18.0.tar.bz2 Source1001: %{external_url}/libgpg-error-1.43.tar.bz2 -Source1002: %{external_url}/libassuan-2.5.5.tar.bz2 +Source1002: %{external_url}/libassuan-2.5.6.tar.bz2 # Internal bundled stuff we can't remove # To build this we would pull cygwin; not worth it Source2001: https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -108,7 +111,6 @@ Patch9: fix_math_desktop_file.patch Patch10: fix_gtk_popover_on_3.20.patch Patch11: fix_webp_on_sle12_sp5.patch -Patch12: fix_harfbuzz_on_sle12_sp5.patch # PATCH-FIX-SUSE use fixmath shared library Patch14: use-fixmath-shared-library.patch # PATCH-FIX-SUSE Fix make distro-pack-install @@ -121,8 +123,8 @@ Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep Patch991: libreoffice-no-destdircheck.patch -# Fix build on i586 -Patch992: atklistener-32bit-type-mismatch.patch +# Fix build on sle12 +Patch992: python34-no-f-strings.patch BuildRequires: %{name}-share-linker BuildRequires: ant BuildRequires: autoconf @@ -137,7 +139,7 @@ %if %{with system_curl} BuildRequires: curl-devel >= 7.68.0 %else -Source2013: %{external_url}/curl-8.0.1.tar.xz +Source2013: %{external_url}/curl-8.1.2.tar.xz %endif # Needed for tests BuildRequires: dejavu-fonts @@ -198,12 +200,17 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 -BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 -BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42 +%if %{with system_harfbuzz} +BuildRequires: pkgconfig(graphite2) >= 0.9.3 +BuildRequires: pkgconfig(harfbuzz) >= 2.6.8 +BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8 +%else +Source2025: %{external_url}/harfbuzz-8.0.0.tar.xz +Source2026: %{external_url}/graphite2-minimal-1.3.14.tgz +%endif BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(lcms2) @@ -279,9 +286,9 @@ Obsoletes: %{name}-icon-theme-oxygen < %{version} %if 0%{?suse_version} < 1550 # Too old boost on the system -Source2020: %{external_url}/boost_1_80_0.tar.xz -Source2023: %{external_url}/poppler-22.12.0.tar.xz -Source2024: %{external_url}/poppler-data-0.4.11.tar.gz +Source2020: %{external_url}/boost_1_82_0.tar.xz +Source2023: %{external_url}/poppler-23.06.0.tar.xz +Source2024: %{external_url}/poppler-data-0.4.12.tar.gz %else BuildRequires: libboost_date_time-devel BuildRequires: libboost_filesystem-devel @@ -293,8 +300,8 @@ %endif %if 0%{?suse_version} < 1500 # Too old icu on the system -Source2021: %{external_url}/icu4c-72_1-src.tgz -Source2022: %{external_url}/icu4c-72_1-data.zip +Source2021: %{external_url}/icu4c-73_2-src.tgz +Source2022: %{external_url}/icu4c-73_2-data.zip BuildRequires: java-devel >= 1.8 BuildRequires: libBox2D-devel BuildRequires: libmysqlclient-devel @@ -318,13 +325,13 @@ BuildConflicts: java-headless < 9 BuildRequires: pkgconfig(libopenjp2) %endif -# Dragonbox requires gcc11 -%if 0%{?suse_version} > 1550 -BuildRequires: gcc >= 11 -BuildRequires: gcc-c++ >= 11 +# Dragonbox requires C++17 +%if 0%{?is_opensuse} || 0%{?sle_version} >= 150000 +BuildRequires: gcc >= 7 +BuildRequires: gcc-c++ >= 7 %else -BuildRequires: gcc11 -BuildRequires: gcc11-c++ +BuildRequires: gcc7 +BuildRequires: gcc7-c++ %endif %if 0%{?suse_version} # needed by python3_sitelib @@ -457,12 +464,7 @@ %if %{with firebird} Requires: %{name}-base-drivers-firebird %else -%ifarch %{ix86} -Requires: jre-32 >= 1.8 -%endif -%ifarch x86_64 aarch64 riscv64 -Requires: jre-64 >= 1.8 -%endif +Requires: jre >= 1.8 %endif %description base @@ -675,12 +677,7 @@ Summary: OfficeBean Java Bean component for LibreOffice Group: Productivity/Office/Suite Requires: %{name} = %{version} -%ifarch %{ix86} -Requires: jre-32 >= 1.8 -%endif -%ifarch x86_64 aarch64 ppc64le riscv64 -Requires: jre-64 >= 1.8 -%endif +Requires: jre >= 1.8 %description officebean With the OfficeBean, a developer can easily write Java applications, @@ -706,12 +703,7 @@ Requires: libreoffice-pyuno = %{version} Requires(pre): libreoffice = %{version} # the watchWindow extension is written in java -%ifarch %{ix86} -Requires: jre-32 >= 1.8 -%endif -%ifarch x86_64 aarch64 ppc64le riscv64 -Requires: jre-64 >= 1.8 -%endif +Requires: jre >= 1.8 %description calc-extensions This package provides extensions for LibreOffice Calc: @@ -726,12 +718,7 @@ Requires: libreoffice-writer = %{version} Requires(pre): libreoffice = %{version} # the wiki extension is written in java -%ifarch %{ix86} -Requires: jre-32 >= 1.8 -%endif -%ifarch x86_64 aarch64 ppc64le riscv64 -Requires: jre-64 >= 1.8 -%endif +Requires: jre >= 1.8 %description writer-extensions This package provides extensions for LibreOffice Writer: @@ -1035,7 +1022,6 @@ %if 0%{?suse_version} < 1500 %patch10 -p1 %patch11 -p1 -%patch12 -p1 %patch101 -p1 %endif %patch14 -p1 @@ -1045,7 +1031,9 @@ %endif %patch990 -p1 %patch991 -p1 +%if 0%{?suse_version} < 1550 %patch992 -p1 +%endif # Disable some of the failing tests (some are random) %if 0%{?suse_version} < 1330 @@ -1095,12 +1083,12 @@ ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`" %endif CFLAGS="$ARCH_FLAGS" -CXXFLAGS="$ARCH_FLAGS" +CXXFLAGS="-std=c++17 $ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS -%if 0%{?suse_version} < 1550 -export CC=gcc-11 -export CXX=g++-11 +%if !0%{?is_opensuse} && 0%{?sle_version} < 150000 +export CC=gcc-7 +export CXX=g++-7 %endif # Fake the epoch stuff in generated zip files @@ -1203,6 +1191,13 @@ %else --without-system-curl \ %endif +%if %{with system_harfbuzz} + --with-system-harfbuzz \ + --with-system-graphite \ +%else + --without-system-harfbuzz \ + --without-system-graphite \ +%endif --enable-evolution2 \ --enable-dbus \ --enable-ext-ct2n \ @@ -1217,7 +1212,16 @@ --enable-symbols \ --with-gdrive-client-secret="${google_default_client_secret}" \ --with-gdrive-client-id="${google_default_client_id}" \ +%ifnarch s390x ppc64 ppc --enable-skia \ +%else + --disable-skia \ +%endif +%ifarch %{aarch64} +%if 0%{?suse_version} < 1550 + --disable-pdfium \ +%endif +%endif --with-libbase-jar=/usr/share/java/libbase.jar \ --with-libxml-jar=/usr/share/java/libxml.jar \ --with-flute-jar=/usr/share/java/flute.jar \ ++++++ 0002-Revert-Require-HarfBuzz-5.1.0.patch ++++++ --- /var/tmp/diff_new_pack.GisEhO/_old 2023-08-09 17:24:54.861253667 +0200 +++ /var/tmp/diff_new_pack.GisEhO/_new 2023-08-09 17:24:54.865253692 +0200 @@ -1,21 +1,6 @@ -From 187d3e94f0bd28b63c934bac84ba7c5fb7beb049 Mon Sep 17 00:00:00 2001 -From: Danilo Spinella <o...@danyspin97.org> -Date: Tue, 14 Mar 2023 16:31:09 +0100 -Subject: [PATCH 2/2] Revert "Require HarfBuzz 5.1.0" - -This reverts commit cbdcc18778f9736ca6f186e2bbb9f0db456b1cee. ---- - configure.ac | 1 - - vcl/inc/font/LogicalFontInstance.hxx | 2 ++ - vcl/source/font/LogicalFontInstance.cxx | 13 ++++++++++++- - vcl/source/gdi/CommonSalLayout.cxx | 9 +++++++-- - 4 files changed, 21 insertions(+), 4 deletions(-) - -Index: libreoffice-7.5.3.2/configure.ac -=================================================================== ---- libreoffice-7.5.3.2.orig/configure.ac -+++ libreoffice-7.5.3.2/configure.ac -@@ -10848,7 +10848,7 @@ AC_SUBST(SYSTEM_LIBORCUS) +--- libreoffice-7.6.0.1/configure.ac 2023-08-07 21:28:19.740514309 +0200 ++++ libreoffice-7.6.0.1/configure.ac 2023-08-07 21:28:32.847268581 +0200 +@@ -10868,7 +10868,7 @@ dnl =================================================================== dnl HarfBuzz dnl =================================================================== @@ -23,12 +8,10 @@ +harfbuzz_required_version=0.93 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC" - GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite" -Index: libreoffice-7.5.3.2/vcl/inc/font/LogicalFontInstance.hxx -=================================================================== ---- libreoffice-7.5.3.2.orig/vcl/inc/font/LogicalFontInstance.hxx -+++ libreoffice-7.5.3.2/vcl/inc/font/LogicalFontInstance.hxx -@@ -156,8 +156,10 @@ private: + HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src" +--- libreoffice-7.6.0.1/vcl/inc/font/LogicalFontInstance.hxx 2023-08-07 21:28:16.093823265 +0200 ++++ libreoffice-7.6.0.1/vcl/inc/font/LogicalFontInstance.hxx 2023-08-07 21:28:32.847268581 +0200 +@@ -156,8 +156,10 @@ // The value is initialized and used in NeedOffsetCorrection(). std::optional<FontFamilyEnum> m_xeFontFamilyEnum; @@ -39,11 +22,9 @@ }; inline hb_font_t* LogicalFontInstance::GetHbFont() -Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx -=================================================================== ---- libreoffice-7.5.3.2.orig/vcl/source/font/LogicalFontInstance.cxx -+++ libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx -@@ -54,8 +54,10 @@ LogicalFontInstance::~LogicalFontInstanc +--- libreoffice-7.6.0.1/vcl/source/font/LogicalFontInstance.cxx 2023-08-07 21:28:15.910488707 +0200 ++++ libreoffice-7.6.0.1/vcl/source/font/LogicalFontInstance.cxx 2023-08-07 21:31:44.758551351 +0200 +@@ -54,8 +54,10 @@ if (m_pHbFontUntransformed) hb_font_destroy(m_pHbFontUntransformed); @@ -54,7 +35,7 @@ } hb_font_t* LogicalFontInstance::InitHbFont() -@@ -73,10 +75,12 @@ hb_font_t* LogicalFontInstance::InitHbFo +@@ -73,10 +75,12 @@ if (!aVariations.empty()) hb_font_set_variations(pHbFont, aVariations.data(), aVariations.size()); @@ -67,7 +48,7 @@ ImplInitHbFont(pHbFont); -@@ -87,6 +91,7 @@ hb_font_t* LogicalFontInstance::GetHbFon +@@ -87,6 +91,7 @@ { auto* pHbFont = const_cast<LogicalFontInstance*>(this)->GetHbFont(); @@ -75,7 +56,7 @@ if (NeedsArtificialItalic()) // || NeedsArtificialBold() { if (!m_pHbFontUntransformed) -@@ -98,7 +103,7 @@ hb_font_t* LogicalFontInstance::GetHbFon +@@ -98,7 +103,7 @@ } return m_pHbFontUntransformed; } @@ -84,7 +65,7 @@ return pHbFont; } -@@ -254,6 +259,7 @@ bool LogicalFontInstance::NeedsArtificia +@@ -254,6 +259,7 @@ return m_aFontSelData.GetItalic() != ITALIC_NONE && m_pFontFace->GetItalic() == ITALIC_NONE; } @@ -92,34 +73,36 @@ namespace { void move_to_func(hb_draw_funcs_t*, void* /*pDrawData*/, hb_draw_state_t*, float to_x, float to_y, -@@ -288,10 +294,12 @@ void close_path_func(hb_draw_funcs_t*, v +@@ -288,9 +294,12 @@ pPoly->clear(); } } +#endif - bool LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph, - basegfx::B2DPolyPolygon& rPolyPoly) const + basegfx::B2DPolyPolygon LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph) const { ++ basegfx::B2DPolyPolygon aPolyPoly; +#if HB_VERSION_ATLEAST(4, 0, 0) if (!m_pHbDrawFuncs) { m_pHbDrawFuncs = hb_draw_funcs_create(); -@@ -312,6 +320,9 @@ bool LogicalFontInstance::GetGlyphOutlin - hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, &rPolyPoly); +@@ -305,12 +314,12 @@ + hb_draw_funcs_set_close_path_func(m_pHbDrawFuncs, close_path_func, pUserData, nullptr); + } + +- basegfx::B2DPolyPolygon aPolyPoly; + #if HB_VERSION_ATLEAST(7, 0, 0) + hb_font_draw_glyph(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, &aPolyPoly); + #else + hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, &aPolyPoly); #endif - return true; -+#else -+ return false; +#endif + return aPolyPoly; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -Index: libreoffice-7.5.3.2/vcl/source/gdi/CommonSalLayout.cxx -=================================================================== ---- libreoffice-7.5.3.2.orig/vcl/source/gdi/CommonSalLayout.cxx -+++ libreoffice-7.5.3.2/vcl/source/gdi/CommonSalLayout.cxx -@@ -421,10 +421,10 @@ bool GenericSalLayout::LayoutText(vcl::t +--- libreoffice-7.6.0.1/vcl/source/gdi/CommonSalLayout.cxx 2023-08-07 21:28:15.910488707 +0200 ++++ libreoffice-7.6.0.1/vcl/source/gdi/CommonSalLayout.cxx 2023-08-07 21:28:32.850601937 +0200 +@@ -421,10 +421,10 @@ const int nRunLen = nEndRunPos - nMinRunPos; int nHbFlags = HB_BUFFER_FLAGS_DEFAULT; @@ -132,7 +115,7 @@ if (nMinRunPos == 0) nHbFlags |= HB_BUFFER_FLAG_BOT; /* Beginning-of-text */ if (nEndRunPos == nLength) -@@ -545,8 +545,13 @@ bool GenericSalLayout::LayoutText(vcl::t +@@ -545,8 +545,13 @@ if (hb_glyph_info_get_glyph_flags(&pHbGlyphInfos[i]) & HB_GLYPH_FLAG_UNSAFE_TO_BREAK) nGlyphFlags |= GlyphItemFlags::IS_UNSAFE_TO_BREAK; ++++++ boost_1_80_0.tar.xz -> boost_1_82_0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/boost_1_80_0.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.11712/boost_1_82_0.tar.xz differ: char 27, line 1 ++++++ curl-8.0.1.tar.xz -> curl-8.1.2.tar.xz ++++++ ++++ 104551 lines of diff (skipped) ++++++ icu4c-72_1-src.tgz -> icu4c-73_2-src.tgz ++++++ /work/SRC/openSUSE:Factory/libreoffice/icu4c-72_1-src.tgz /work/SRC/openSUSE:Factory/.libreoffice.new.11712/icu4c-73_2-src.tgz differ: char 13, line 1 ++++++ libassuan-2.5.5.tar.bz2 -> libassuan-2.5.6.tar.bz2 ++++++ ++++ 7619 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/ChangeLog new/libassuan-2.5.6/ChangeLog --- old/libassuan-2.5.5/ChangeLog 2021-03-22 13:23:54.000000000 +0100 +++ new/libassuan-2.5.6/ChangeLog 2023-06-19 10:44:15.000000000 +0200 @@ -1,3 +1,107 @@ +2023-06-19 Werner Koch <w...@gnupg.org> + + Release 2.5.6. + + commit 6b50ee6bcdd6aa81bd7cc3fb2379864c3ed479b8 + + +2023-06-16 Werner Koch <w...@gnupg.org> + + Flush data before clearing the confidential flag. + + commit 0fc31770fa6277c57940b774d4049d7a3ad148e8 + * src/context.c (assuan_end_confidential): Flush data. + +2023-06-16 NIIBE Yutaka <gni...@fsij.org> + + build: Fix listing m4 files. + + commit e686c85e207e52130388c68018ac2e75b7fb574a + * m4/Makefile.am (EXTRA_DIST): Add ax_cc_for_build.m4 and + gpg-error.m4. Remove sys_socket_h.m4. + + build: Better cross build support. + + commit 1939b040ca2301270a7f5be4e3049c551bf73dab + * configure.ac: Use AX_CC_FOR_BUILD. + * src/Makefile.am: Use EXEEXT_FOR_BUILD. + * m4/ax_cc_for_build.m4: New from libgpg-error. + + tests: Use -no-fast-install LDFLAGS for Windows. + + commit 32d9abf299ec5b217c5751d8dcf8cbb5989bdd9c + * tests/Makefile.am [HAVE_W32_SYSTEM] (AM_LDFLAGS): Conditionalize. + + build: Update gpg-error.m4. + + commit dbd5c48a36e6b6a28d12119a43ff2a65208dc152 + * m4/gpg-error.m4: Update from libgpg-error master. + + build: Update gpg-error.m4. + + commit d7533c4333bfa93537eaf639fd18a6b1377df11e + * m4/gpg-error.m4: Update from libgpg-error 1.46. + + build: Update config.guess, config.sub, and config.rpath. + + commit 84d5349d23031c13762a0d59c105a9dec8cc9e90 + * build-aux/config.guess: Update from upstream. + * build-aux/config.sub: Ditto. + * build-aux/config.rpath: Update from gettext 0.21. + + build: Update gpg-error.m4. + + commit f16fcb14c3661ff94e06612f3a3e46a5e98a62a8 + * m4/gpg-error.m4: Update from libgpg-error. + + Don't access NULL by wipememory. + + commit ff1f8ee7a8fb9729e08fb51419de9a8c93a4fdb6 + * src/assuan-inquire.c (assuan_inquire): Check mb->buf. + + client: Wipe the inbound buffer when CONFIDENTIAL. + + commit aac300389210031588a1f4c6d7f1efb4b45c4c95 + * src/client.c (assuan_transact): Wipe the buffer. + + server,client: Wipe the outbound buffer when CONFIDENTIAL. + + commit 5ac7e6ba19fa5ed472b50c1b12ba7cf94015c734 + * src/assuan-buffer.c (assuan_send_data): Wipe the buffer. + + server: Wipe out the memory used by assuan_inquire if CONFIDENTIAL. + + commit 4bfcd8a0f6f314581b40bed0cffe5f91441f4dff + * src/assuan-inquire.c (assuan_inquire): Wipe the memory and + inbound buffer. + +2021-12-22 NIIBE Yutaka <gni...@fsij.org> + + build: Update for newer autoconf. + + commit 66d5fe281c8dcbbbc13edc8630aaf631b6cb5e85 + * configure.ac (AC_PREREQ): Require >= 2.69. + (AC_HEADER_STDC): Remove. + * m4/sys_socket_h.m4: Remove. + +2021-12-17 NIIBE Yutaka <gni...@fsij.org> + + build,w32: Update configure script. + + commit 576fbb033805b077ffe2270cb8a17c3f2dc830ae + * configure.ac: Don't use gl_HEADER_SYS_SOCKET, but check winsock2.h. + +2021-11-10 NIIBE Yutaka <gni...@fsij.org> + + libtool: Link without -flat_namespace for macOS. + + commit e342b58b6230d22c1225ed680f05e9d134a8f657 + * m4/libtool.m4: Not setting 10.0 to MACOSX_DEPLOYMENT_TARGET when not + defined. Only specify -flat_namespace to linker for specific + (older) versions and hosts. + +2021-08-05 NIIBE Yutaka <gni...@fsij.org> + + build: Simplify configure.ac. + + commit 669c76ee28c0b10c418bb47f95b1401631478c5a + * configure.ac (AC_CHECK_HEADERS): Remove string.h. + +2021-05-27 NIIBE Yutaka <gni...@fsij.org> + + build: _DARWIN_C_SOURCE should be 1. + + commit 335030e3d204afe33873df83c29302ff1caa0217 + * configure.ac (*-apple-darwin*): Set _DARWIN_C_SOURCE 1. + +2021-04-21 NIIBE Yutaka <gni...@fsij.org> + + build: Update gpg-error.m4. + + commit 8ec3e9f1dd88e14f42f31e8692a8664bd894226b + * m4/gpg-error.m4: Update from libgpg-error. + 2021-03-22 Werner Koch <w...@gnupg.org> Release 2.5.5. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/NEWS new/libassuan-2.5.6/NEWS --- old/libassuan-2.5.5/NEWS 2021-03-22 13:04:38.000000000 +0100 +++ new/libassuan-2.5.6/NEWS 2023-06-19 09:46:08.000000000 +0200 @@ -1,3 +1,17 @@ +Noteworthy changes in version 2.5.6 (2023-06-19) [C8/A8/R6] +------------------------------------------------ + + * Fix logging of confidential data. [rA0fc31770fa] + + * Fix memory wiping. [T5977] + + * Fix macOS build problem. [T5440,T5610] + + * Upgrade autoconf stuff. + + Release-info: https://dev.gnupg.org/T6542 + + Noteworthy changes in version 2.5.5 (2021-03-22) [C8/A8/R5] ------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/VERSION new/libassuan-2.5.6/VERSION --- old/libassuan-2.5.5/VERSION 2021-03-22 13:11:16.000000000 +0100 +++ new/libassuan-2.5.6/VERSION 2023-06-19 10:43:04.000000000 +0200 @@ -1 +1 @@ -2.5.5 +2.5.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/build-aux/config.rpath new/libassuan-2.5.6/build-aux/config.rpath --- old/libassuan-2.5.5/build-aux/config.rpath 2015-01-28 09:59:11.000000000 +0100 +++ new/libassuan-2.5.6/build-aux/config.rpath 2023-06-16 10:07:13.000000000 +0200 @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2013 Free Software Foundation, Inc. +# Copyright 1996-2020 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <g...@gnu.ai.mit.edu>, 1996 # @@ -367,11 +367,7 @@ dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) + freebsd2.[01]*) hardcode_direct=yes hardcode_minus_L=yes ;; @@ -548,13 +544,11 @@ dgux*) library_names_spec='$libname$shrext' ;; + freebsd[23].*) + library_names_spec='$libname$shrext$versuffix' + ;; freebsd* | dragonfly*) - case "$host_os" in - freebsd[123]*) - library_names_spec='$libname$shrext$versuffix' ;; - *) - library_names_spec='$libname$shrext' ;; - esac + library_names_spec='$libname$shrext' ;; gnu*) library_names_spec='$libname$shrext' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/configure.ac new/libassuan-2.5.6/configure.ac --- old/libassuan-2.5.5/configure.ac 2021-03-22 13:06:26.000000000 +0100 +++ new/libassuan-2.5.6/configure.ac 2023-06-19 10:41:36.000000000 +0200 @@ -22,7 +22,7 @@ # Process this file with autoconf to produce a configure script. -AC_PREREQ([2.61]) +AC_PREREQ([2.69]) min_automake_version="1.14" # To build a release you need to create a tag with the version number @@ -33,7 +33,7 @@ m4_define([mym4_package],[libassuan]) m4_define([mym4_major], [2]) m4_define([mym4_minor], [5]) -m4_define([mym4_micro], [5]) +m4_define([mym4_micro], [6]) # To start a new development series, i.e a new major or minor number # you need to mark an arbitrary commit before the first beta release @@ -63,7 +63,7 @@ # LIBASSUAN_LT_CURRENT=8 LIBASSUAN_LT_AGE=8 -LIBASSUAN_LT_REVISION=5 +LIBASSUAN_LT_REVISION=6 # If the API is changed in an incompatible way: increment the next counter. LIBASSUAN_CONFIG_API_VERSION=2 @@ -145,7 +145,7 @@ ;; *-apple-darwin*) AC_DEFINE(_XOPEN_SOURCE, 500, Activate POSIX interface on MacOS X) - AC_DEFINE(_DARWIN_C_SOURCE, 900000L, + AC_DEFINE(_DARWIN_C_SOURCE, 1, Expose all libc features (__DARWIN_C_FULL)) ;; esac @@ -189,21 +189,8 @@ AC_PROG_MAKE_SET #AC_ARG_PROGRAM -# We need to compile and run a program on the build machine. A -# comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in -# the AC archive is broken for autoconf 2.57. Given that there is no -# newer version of that macro, we assume that it is also broken for -# autoconf 2.61 and thus we use a simple but usually sufficient -# approach. -AC_MSG_CHECKING(for cc for build) -if test "$cross_compiling" = "yes"; then - CC_FOR_BUILD="${CC_FOR_BUILD-cc}" -else - CC_FOR_BUILD="${CC_FOR_BUILD-$CC}" -fi -AC_MSG_RESULT($CC_FOR_BUILD) -AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) - +# We need to compile and run a program on the build machine. +AX_CC_FOR_BUILD if test "$GCC" = yes; then CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes" @@ -270,6 +257,7 @@ if test "$have_w32ce_system" = yes; then AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE]) fi + AC_CHECK_HEADERS([winsock2.h]) fi AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes) AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes) @@ -336,8 +324,7 @@ # # Checks for header files. # -AC_HEADER_STDC -AC_CHECK_HEADERS([string.h locale.h sys/uio.h stdint.h inttypes.h \ +AC_CHECK_HEADERS([locale.h sys/uio.h stdint.h inttypes.h \ sys/types.h sys/stat.h unistd.h sys/time.h fcntl.h \ sys/select.h ucred.h sys/ucred.h]) AC_TYPE_UINTPTR_T @@ -350,7 +337,6 @@ AC_C_INLINE AC_TYPE_SIZE_T -gl_HEADER_SYS_SOCKET gl_TYPE_SOCKLEN_T if test $check_descriptor_passing != yes; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/doc/assuan.info new/libassuan-2.5.6/doc/assuan.info --- old/libassuan-2.5.5/doc/assuan.info 2021-03-22 13:23:54.000000000 +0100 +++ new/libassuan-2.5.6/doc/assuan.info 2023-06-19 10:44:15.000000000 +0200 @@ -7,8 +7,8 @@ This file documents the use and the internals of Assuan. - This is Edition 2.5.5, last updated 7 December 2017, of 'The -'Developing with Assuan' Manual', for Version 2.5.5. + This is Edition 2.5.6, last updated 16 June 2023, of 'The 'Developing +with Assuan' Manual', for Version 2.5.6. Published by the Free Software Foundation 51 Franklin Street, Fifth Floor @@ -370,35 +370,35 @@ path (via the '-I' option). However, the path to the include file is determined at the time the -source is configured. To solve this problem, 'libassuan' ships with a -small helper program 'libassuan-config' that knows the path to the -include file and other configuration options. The options that need to -be added to the compiler invocation at compile time are output by the -'--cflags' option to 'libassuan-config'. The following example shows -how it can be used at the command line: - - gcc -c foo.c $(libassuan-config --cflags) - - Adding the output of 'libassuan-config --cflags' to the compiler's -command line will ensure that the compiler can find the 'assuan.h' -header file. +source is configured. To solve this problem, 'libassuan' ships with +'libassuan.pc' file, that knows the path to the include file and other +configuration options. The options that need to be added to the +compiler invocation at compile time are output by the '--cflags' option +to 'pkg-config libassuan'. The following example shows how it can be +used at the command line: + + gcc -c foo.c $(pkg-config --cflags libassuan) + + Adding the output of 'pkg-config --cflags libassuan' to the +compiler's command line will ensure that the compiler can find the +'assuan.h' header file. A similar problem occurs when linking the program with the library. Again, the compiler/linker has to find the library files. For this to work, the path to the library files has to be added to the library search path (via the '-L' option). For this, the option '--libs' to -'libassuan-config' can be used. For convenience, this option also +'pkg-config libassuan' can be used. For convenience, this option also outputs all other options that are required to link the program with the 'libassuan' libraries (in particular, the '-lassuan' option). The example shows how to link 'foo.o' with the 'libassuan' library to a program 'foo'. - gcc -o foo foo.o $(libassuan-config --libs) + gcc -o foo foo.o $(pkg-config --libs libassuan) You can also combine both examples to a single command by specifying -both options to 'libassuan-config': +both options to 'pkg-config libassuan': - gcc -o foo foo.c $(libassuan-config --cflags --libs) + gcc -o foo foo.c $(pkg-config --cflags --libs libassuan) File: assuan.info, Node: Automake, Next: Multi Threading, Prev: Building sources, Up: Preparation @@ -408,8 +408,10 @@ It is much easier if you use GNU Automake instead of writing your own Makefiles. If you do that you do not have to worry about finding and -invoking the 'libassuan-config' script at all. 'libassuan' provides an -Automake macro that does all the work for you. +invoking the 'pkg-config' script at all. + + You can use 'PKG_CHECK_MODULES' macro, or, 'libassuan' also provides +an Automake macro that does all the work for you. -- Macro: AM_PATH_LIBASSUAN ([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) @@ -3148,7 +3150,7 @@ [index] * Menu: -* AM_PATH_LIBASSUAN: Automake. (line 11) +* AM_PATH_LIBASSUAN: Automake. (line 13) * assuan_accept: Server code. (line 267) * assuan_begin_confidential: Contexts. (line 110) * assuan_close_input_fd: Utilities. (line 93) @@ -3256,38 +3258,38 @@ Tag Table: -Node: Top907 -Node: Introduction1973 -Node: Assuan4228 -Node: Implementation5272 -Node: Server responses6451 -Node: Client requests8741 -Node: Error codes11779 -Node: Preparation12118 -Node: Header12693 -Node: Building sources13479 -Node: Automake15378 -Node: Multi Threading16526 -Node: Generalities17485 -Node: Data Types17889 -Node: Initializing the library18997 -Ref: function assuan_set_gpg_err_source21693 -Node: Default Log Handler24012 -Node: Contexts25778 -Ref: function assuan_new26358 -Node: Reading and Writing36930 -Node: Client code40405 -Ref: function assuan_sendfd45402 -Ref: function assuan_receivefd45993 -Node: Server code46368 -Node: External I/O Loop58493 -Node: External I/O Loop Client60318 -Node: External I/O Loop Server63403 -Node: Utilities67987 -Ref: Utilities-Footnote-176088 -Node: Socket wrappers76152 -Node: Library Copying83133 -Node: Copying111245 -Node: Index148759 +Node: Top904 +Node: Introduction1970 +Node: Assuan4225 +Node: Implementation5269 +Node: Server responses6448 +Node: Client requests8738 +Node: Error codes11776 +Node: Preparation12115 +Node: Header12690 +Node: Building sources13476 +Node: Automake15382 +Node: Multi Threading16575 +Node: Generalities17534 +Node: Data Types17938 +Node: Initializing the library19046 +Ref: function assuan_set_gpg_err_source21742 +Node: Default Log Handler24061 +Node: Contexts25827 +Ref: function assuan_new26407 +Node: Reading and Writing36979 +Node: Client code40454 +Ref: function assuan_sendfd45451 +Ref: function assuan_receivefd46042 +Node: Server code46417 +Node: External I/O Loop58542 +Node: External I/O Loop Client60367 +Node: External I/O Loop Server63452 +Node: Utilities68036 +Ref: Utilities-Footnote-176137 +Node: Socket wrappers76201 +Node: Library Copying83182 +Node: Copying111294 +Node: Index148808 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/doc/assuan.texi new/libassuan-2.5.6/doc/assuan.texi --- old/libassuan-2.5.5/doc/assuan.texi 2017-12-07 13:23:45.000000000 +0100 +++ new/libassuan-2.5.6/doc/assuan.texi 2023-06-16 10:33:14.000000000 +0200 @@ -464,18 +464,18 @@ file search path (via the @option{-I} option). However, the path to the include file is determined at the time the -source is configured. To solve this problem, @code{libassuan} ships with -a small helper program @command{libassuan-config} that knows the path to -the include file and other configuration options. The options that need -to be added to the compiler invocation at compile time are output by the -@option{--cflags} option to @command{libassuan-config}. The following +source is configured. To solve this problem, @code{libassuan} ships +with @code{libassuan.pc} file, that knows the path to the include file +and other configuration options. The options that need to be added to +the compiler invocation at compile time are output by the +@option{--cflags} option to @command{pkg-config libassuan}. The following example shows how it can be used at the command line: @example -gcc -c foo.c $(libassuan-config --cflags) +gcc -c foo.c $(pkg-config --cflags libassuan) @end example -Adding the output of @samp{libassuan-config --cflags} to the compiler's +Adding the output of @samp{pkg-config --cflags libassuan} to the compiler's command line will ensure that the compiler can find the @file{assuan.h} header file. @@ -483,7 +483,7 @@ Again, the compiler/linker has to find the library files. For this to work, the path to the library files has to be added to the library search path (via the @option{-L} option). For this, the option -@option{--libs} to @command{libassuan-config} can be used. For +@option{--libs} to @command{pkg-config libassuan} can be used. For convenience, this option also outputs all other options that are required to link the program with the @code{libassuan} libraries (in particular, the @option{-lassuan} option). The example shows how to @@ -491,14 +491,14 @@ @command{foo}. @example -gcc -o foo foo.o $(libassuan-config --libs) +gcc -o foo foo.o $(pkg-config --libs libassuan) @end example You can also combine both examples to a single command by specifying -both options to @command{libassuan-config}: +both options to @command{pkg-config libassuan}: @example -gcc -o foo foo.c $(libassuan-config --cflags --libs) +gcc -o foo foo.c $(pkg-config --cflags --libs libassuan) @end example @@ -507,7 +507,9 @@ It is much easier if you use GNU Automake instead of writing your own Makefiles. If you do that you do not have to worry about finding and -invoking the @command{libassuan-config} script at all. @code{libassuan} +invoking the @command{pkg-config} script at all. + +You can use @code{PKG_CHECK_MODULES} macro, or, @code{libassuan} also provides an Automake macro that does all the work for you. @defmac AM_PATH_LIBASSUAN (@ovar{minimum-version}, @ovar{action-if-found}, @ovar{action-if-not-found}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/doc/stamp-vti new/libassuan-2.5.6/doc/stamp-vti --- old/libassuan-2.5.5/doc/stamp-vti 2021-03-22 13:23:53.000000000 +0100 +++ new/libassuan-2.5.6/doc/stamp-vti 2023-06-19 10:44:14.000000000 +0200 @@ -1,4 +1,4 @@ -@set UPDATED 7 December 2017 -@set UPDATED-MONTH December 2017 -@set EDITION 2.5.5 -@set VERSION 2.5.5 +@set UPDATED 16 June 2023 +@set UPDATED-MONTH June 2023 +@set EDITION 2.5.6 +@set VERSION 2.5.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/doc/version.texi new/libassuan-2.5.6/doc/version.texi --- old/libassuan-2.5.5/doc/version.texi 2021-03-22 13:23:53.000000000 +0100 +++ new/libassuan-2.5.6/doc/version.texi 2023-06-19 10:44:14.000000000 +0200 @@ -1,4 +1,4 @@ -@set UPDATED 7 December 2017 -@set UPDATED-MONTH December 2017 -@set EDITION 2.5.5 -@set VERSION 2.5.5 +@set UPDATED 16 June 2023 +@set UPDATED-MONTH June 2023 +@set EDITION 2.5.6 +@set VERSION 2.5.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/m4/Makefile.am new/libassuan-2.5.6/m4/Makefile.am --- old/libassuan-2.5.5/m4/Makefile.am 2021-03-09 08:46:11.000000000 +0100 +++ new/libassuan-2.5.6/m4/Makefile.am 2023-06-16 11:01:37.000000000 +0200 @@ -1 +1 @@ -EXTRA_DIST = socklen.m4 sys_socket_h.m4 autobuild.m4 +EXTRA_DIST = autobuild.m4 ax_cc_for_build.m4 gpg-error.m4 socklen.m4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/m4/ax_cc_for_build.m4 new/libassuan-2.5.6/m4/ax_cc_for_build.m4 --- old/libassuan-2.5.5/m4/ax_cc_for_build.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/libassuan-2.5.6/m4/ax_cc_for_build.m4 2023-06-16 11:01:36.000000000 +0200 @@ -0,0 +1,77 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CC_FOR_BUILD +# +# DESCRIPTION +# +# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD. +# +# LICENSE +# +# Copyright (c) 2010 Reuben Thomas <r...@sc3d.org> +# Copyright (c) 1999 Richard Henderson <r...@redhat.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <https://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +dnl Get a default for CC_FOR_BUILD to put into Makefile. +AC_DEFUN([AX_CC_FOR_BUILD], +[# Put a plausible default for CC_FOR_BUILD in Makefile. +if test -z "$CC_FOR_BUILD"; then + if test "x$cross_compiling" = "xno"; then + CC_FOR_BUILD='$(CC)' + else + CC_FOR_BUILD=gcc + fi +fi +AC_SUBST(CC_FOR_BUILD) +# Also set EXEEXT_FOR_BUILD. +if test "x$cross_compiling" = "xno"; then + EXEEXT_FOR_BUILD='$(EXEEXT)' +else + AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext, + [rm -f conftest* + echo 'int main () { return 0; }' > conftest.c + bfd_cv_build_exeext= + ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5 + for file in conftest.*; do + case $file in + *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + rm -f conftest* + test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no]) + EXEEXT_FOR_BUILD="" + test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext} +fi +AC_SUBST(EXEEXT_FOR_BUILD)])dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/m4/gpg-error.m4 new/libassuan-2.5.6/m4/gpg-error.m4 --- old/libassuan-2.5.5/m4/gpg-error.m4 2021-03-09 08:46:11.000000000 +0100 +++ new/libassuan-2.5.6/m4/gpg-error.m4 2023-06-16 10:09:07.000000000 +0200 @@ -1,5 +1,6 @@ # gpg-error.m4 - autoconf macro to detect libgpg-error. -# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020 g10 Code GmbH +# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020, 2021, 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 @@ -9,23 +10,13 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# Last-changed: 2020-11-17 +# Last-changed: 2023-04-01 - -dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, -dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl -dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, -dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are -dnl used for programs requireing real multi thread support. dnl -dnl If a prefix option is not used, the config script is first -dnl searched in $SYSROOT/bin and then along $PATH. If the used -dnl config script does not match the host specification the script -dnl is added to the gpg_config_script_warn variable. +dnl Find gpg-error-config, for backward compatibility dnl -AC_DEFUN([AM_PATH_GPG_ERROR], -[ AC_REQUIRE([AC_CANONICAL_HOST]) +dnl _AM_PATH_POSSIBLE_GPG_ERROR_CONFIG +AC_DEFUN([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG],[dnl gpg_error_config_prefix="" dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, dnl since that is consistent with how our three siblings use the directory/ @@ -61,50 +52,112 @@ fi AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) - min_gpg_error_version=ifelse([$1], ,1.33,$1) - ok=no +]) - if test "$prefix" = NONE ; then - prefix_option_expanded=/usr/local - else - prefix_option_expanded="$prefix" - fi - if test "$exec_prefix" = NONE ; then - exec_prefix_option_expanded=$prefix_option_expanded - else - exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix) - fi - libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir) +dnl +dnl Find gpgrt-config, which uses .pc file +dnl (minimum pkg-config functionality, supporting cross build) +dnl +dnl _AM_PATH_GPGRT_CONFIG +AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl + AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH]) + if test "$GPGRT_CONFIG" != "no"; then + # Determine gpgrt_libdir + # + # Get the prefix of gpgrt-config assuming it's something like: + # <PREFIX>/bin/gpgrt-config + gpgrt_prefix=${GPGRT_CONFIG%/*/*} + possible_libdir1=${gpgrt_prefix}/lib + # Determine by using system libdir-format with CC, it's like: + # Normal style: /usr/lib + # GNU cross style: /usr/<triplet>/lib + # Debian style: /usr/lib/<multiarch-name> + # Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64 + # It is assumed that CC is specified to the one of host on cross build. + if libdir_candidates=$(${CC:-cc} -print-search-dirs | \ + sed -n -e "/^libraries/{s/libraries: =//;s/:/\\ +/g;p;}"); then + # From the output of -print-search-dirs, select valid pkgconfig dirs. + libdir_candidates=$(for dir in $libdir_candidates; do + if p=$(cd $dir 2>/dev/null && pwd); then + test -d "$p/pkgconfig" && echo $p; + fi + done) - if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then - gpgrt_libdir=$libdir_option_expanded - else - if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then - if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then - if test -f $possible_libdir/pkgconfig/gpg-error.pc; then - gpgrt_libdir=$possible_libdir + for possible_libdir0 in $libdir_candidates; do + # possible_libdir0: + # Fallback candidate, the one of system-installed (by $CC) + # (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32) + # possible_libdir1: + # Another candidate, user-locally-installed + # (<gpgrt_prefix>/lib) + # possible_libdir2 + # Most preferred + # (<gpgrt_prefix>/<triplet>/lib, + # <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32) + if test "${possible_libdir0##*/}" = "lib"; then + possible_prefix0=${possible_libdir0%/lib} + possible_prefix0_triplet=${possible_prefix0##*/} + if test -z "$possible_prefix0_triplet"; then + continue + fi + possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib + else + possible_prefix0=${possible_libdir0%%/lib*} + possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0} + fi + if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then + gpgrt_libdir=${possible_libdir2} + elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then + gpgrt_libdir=${possible_libdir1} + elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then + gpgrt_libdir=${possible_libdir0} fi - fi + if test -n "$gpgrt_libdir"; then break; fi + done fi + if test -z "$gpgrt_libdir"; then + # No valid pkgconfig dir in any of the system directories, fallback + gpgrt_libdir=${possible_libdir1} + fi + else + unset GPGRT_CONFIG fi - if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) - if test "$GPGRT_CONFIG" = "no"; then - unset GPGRT_CONFIG + if test -n "$gpgrt_libdir"; then + GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" + if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then + GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" + AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) + gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` else - GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" - if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then - GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" - AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) - gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` - else - unset GPGRT_CONFIG - fi + gpg_error_config_version=`$GPG_ERROR_CONFIG --version` + unset GPGRT_CONFIG fi - else + elif test "$GPG_ERROR_CONFIG" != "no"; then gpg_error_config_version=`$GPG_ERROR_CONFIG --version` + unset GPGRT_CONFIG fi +]) + +dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl +dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, +dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are +dnl used for programs requireing real multi thread support. +dnl +dnl If a prefix option is not used, the config script is first +dnl searched in $SYSROOT/bin and then along $PATH. If the used +dnl config script does not match the host specification the script +dnl is added to the gpg_config_script_warn variable. +dnl +AC_DEFUN([AM_PATH_GPG_ERROR],[dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl +AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl + min_gpg_error_version=ifelse([$1], ,1.33,$1) + ok=no if test "$GPG_ERROR_CONFIG" != "no"; then req_major=`echo $min_gpg_error_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` @@ -123,22 +176,6 @@ fi fi fi - if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then - if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) - if test "$GPGRT_CONFIG" = "no"; then - unset GPGRT_CONFIG - else - GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" - if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then - GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" - AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) - else - unset GPGRT_CONFIG - fi - fi - fi - fi fi AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) if test $ok = yes; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/m4/libtool.m4 new/libassuan-2.5.6/m4/libtool.m4 --- old/libassuan-2.5.5/m4/libtool.m4 2021-03-09 08:46:11.000000000 +0100 +++ new/libassuan-2.5.6/m4/libtool.m4 2023-06-15 15:54:39.000000000 +0200 @@ -1045,16 +1045,11 @@ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) + darwin*) + case ${MACOSX_DEPLOYMENT_TARGET},$host in + 10.[[012]]*,*|,*powerpc*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) + *) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; esac ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/m4/sys_socket_h.m4 new/libassuan-2.5.6/m4/sys_socket_h.m4 --- old/libassuan-2.5.5/m4/sys_socket_h.m4 2013-03-15 20:26:09.000000000 +0100 +++ new/libassuan-2.5.6/m4/sys_socket_h.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# sys_socket_h.m4 serial 2 -dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Simon Josefsson. - -AC_DEFUN([gl_HEADER_SYS_SOCKET], -[ - AC_CHECK_HEADERS_ONCE([sys/socket.h]) - if test $ac_cv_header_sys_socket_h = yes; then - SYS_SOCKET_H='' - else - dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make - dnl the check for those headers unconditional; yet cygwin reports - dnl that the headers are present but cannot be compiled (since on - dnl cygwin, all socket information should come from sys/socket.h). - AC_CHECK_HEADERS([winsock2.h ws2tcpip.h]) - SYS_SOCKET_H='sys/socket.h' - fi - AC_SUBST(SYS_SOCKET_H) -]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/src/Makefile.am new/libassuan-2.5.6/src/Makefile.am --- old/libassuan-2.5.5/src/Makefile.am 2019-11-27 15:15:27.000000000 +0100 +++ new/libassuan-2.5.6/src/Makefile.am 2023-06-16 11:01:36.000000000 +0200 @@ -148,10 +148,10 @@ $(DESTDIR)$(bindir)/gpgcedev.dll endif -mkheader: mkheader.c Makefile +mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c -assuan.h: assuan.h.in mkheader $(parts_of_assuan_h) - ./mkheader $(host_os) $(srcdir)/assuan.h.in \ +assuan.h: assuan.h.in mkheader$(EXEEXT_FOR_BUILD) $(parts_of_assuan_h) + ./mkheader$(EXEEXT_FOR_BUILD) $(host_os) $(srcdir)/assuan.h.in \ $(PACKAGE_VERSION) $(VERSION_NUMBER) >$@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/src/assuan-buffer.c new/libassuan-2.5.6/src/assuan-buffer.c --- old/libassuan-2.5.5/src/assuan-buffer.c 2017-11-15 16:32:47.000000000 +0100 +++ new/libassuan-2.5.6/src/assuan-buffer.c 2023-06-16 10:33:14.000000000 +0200 @@ -499,6 +499,8 @@ if (!buffer) { /* flush what we have */ _assuan_cookie_write_flush (ctx); + if (ctx->flags.confidential) + wipememory (ctx->outbound.data.line, LINELENGTH); if (ctx->outbound.data.error) return ctx->outbound.data.error; if (!ctx->is_server) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/src/assuan-inquire.c new/libassuan-2.5.6/src/assuan-inquire.c --- old/libassuan-2.5.5/src/assuan-inquire.c 2017-11-15 16:34:30.000000000 +0100 +++ new/libassuan-2.5.6/src/assuan-inquire.c 2023-06-16 10:33:14.000000000 +0200 @@ -254,7 +254,13 @@ out: if (!nodataexpected) - free_membuf (ctx, &mb); + { + if (ctx->flags.confidential && mb.buf) + wipememory (mb.buf, mb.len); + free_membuf (ctx, &mb); + } + if (ctx->flags.confidential) + wipememory (ctx->inbound.line, LINELENGTH); ctx->in_inquire = 0; return rc; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/src/assuan-socket.c new/libassuan-2.5.6/src/assuan-socket.c --- old/libassuan-2.5.5/src/assuan-socket.c 2021-03-08 15:22:42.000000000 +0100 +++ new/libassuan-2.5.6/src/assuan-socket.c 2023-06-16 10:33:14.000000000 +0200 @@ -365,7 +365,7 @@ * * "!<socket >%u %c %08x-%08x-%08x-%08x\x00" * - * %d for port number, %c for kind of socket (s for STREAM), and + * %u for port number, %c for kind of socket (s for STREAM), and * we have 16-byte random bytes for nonce. We only support * stream mode. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/src/client.c new/libassuan-2.5.6/src/client.c --- old/libassuan-2.5.5/src/client.c 2017-11-15 16:37:39.000000000 +0100 +++ new/libassuan-2.5.6/src/client.c 2023-06-16 10:33:14.000000000 +0200 @@ -275,6 +275,8 @@ else { rc = data_cb (data_cb_arg, line, linelen); + if (ctx->flags.confidential) + wipememory (ctx->inbound.line, LINELENGTH); if (!rc) goto again; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/src/context.c new/libassuan-2.5.6/src/context.c --- old/libassuan-2.5.5/src/context.c 2017-11-15 16:37:51.000000000 +0100 +++ new/libassuan-2.5.6/src/context.c 2023-06-16 11:01:38.000000000 +0200 @@ -147,10 +147,12 @@ } -/* Same as assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 0). */ +/* Same as assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 0) but first + * flushes pending data. */ void assuan_end_confidential (assuan_context_t ctx) { + _assuan_cookie_write_flush (ctx); assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libassuan-2.5.5/tests/Makefile.am new/libassuan-2.5.6/tests/Makefile.am --- old/libassuan-2.5.5/tests/Makefile.am 2020-10-20 16:01:29.000000000 +0200 +++ new/libassuan-2.5.6/tests/Makefile.am 2023-06-16 10:33:14.000000000 +0200 @@ -43,7 +43,11 @@ endif AM_CFLAGS = $(GPG_ERROR_CFLAGS) +if HAVE_W32_SYSTEM +AM_LDFLAGS = -no-fast-install +else AM_LDFLAGS = -no-install +endif noinst_HEADERS = common.h noinst_PROGRAMS = $(TESTS) $(w32cetools) $(testtools) ++++++ libreoffice-7.6.0.1.tar.xz -> libreoffice-7.6.0.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-7.6.0.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.11712/libreoffice-7.6.0.2.tar.xz differ: char 15, line 1 ++++++ libreoffice-help-7.6.0.1.tar.xz -> libreoffice-help-7.6.0.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-7.6.0.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.11712/libreoffice-help-7.6.0.2.tar.xz differ: char 15, line 1 ++++++ libreoffice-translations-7.6.0.1.tar.xz -> libreoffice-translations-7.6.0.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-7.6.0.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.11712/libreoffice-translations-7.6.0.2.tar.xz differ: char 15, line 1 ++++++ poppler-22.12.0.tar.xz -> poppler-23.06.0.tar.xz ++++++ ++++ 13323 lines of diff (skipped) ++++++ poppler-data-0.4.11.tar.gz -> poppler-data-0.4.12.tar.gz ++++++ ++++ 33081 lines of diff (skipped) ++++++ python34-no-f-strings.patch ++++++ --- libreoffice-7.6.0.1/solenv/bin/desktop-translate.py 2023-08-08 19:29:16.088847384 +0200 +++ libreoffice-7.6.0.1/solenv/bin/desktop-translate.py 2023-08-08 19:36:37.413324064 +0200 @@ -62,7 +62,7 @@ o = parser.parse_args() if o.template_dir is None: - template_dir = f"{o.workdir}/{o.prefix}" + template_dir = '{}/{}'.format(o.workdir, o.prefix) else: template_dir = o.template_dir @@ -85,7 +85,7 @@ entry = {} # For every section in the specified ulf file there should exist # a template file in $workdir .. - entry["outfile"] = f"{template_dir}{template}.{o.ext}" + entry["outfile"] = "{}{}.{}".format(template_dir, template, o.ext) entry["translations"] = {} entry["key"] = key templates[heading] = entry @@ -130,12 +130,12 @@ if o.ext == "str": continue sys.exit( - f"Warning: No template found for item '{template}' : '{outfilename}'\n" + "Warning: No template found for item '{}' : '{}'\n".format(template, outfilename) ) processed += 1 # open output file - tmpfilename = f"{outfilename}.tmp" + tmpfilename = '{}.tmp'.format(outfilename) outfile = io.open(tmpfilename, "w", encoding="utf-8") # emit the template to the output file @@ -157,9 +157,9 @@ if o.ext in ("desktop", "str"): if o.ext == "desktop": value = encode_desktop_string(value) - outfile.write(f"{OUTKEY}[{locale}]={value}\n") + outfile.write("{}[{}]={}\n".format(OUTKEY, locale, value)) else: - outfile.write(f"\t[{locale}]{OUTKEY}={value}\n") + outfile.write("\t[{}]{}={}\n".format(locale, OUTKEY, value)) template_file.close()
